summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/Outliner.hxx38
-rwxr-xr-x[-rw-r--r--]sd/inc/anminfo.hxx20
-rw-r--r--sd/inc/app.hrc44
-rw-r--r--sd/inc/drawdoc.hxx155
-rwxr-xr-xsd/inc/glob.hrc2
-rw-r--r--sd/inc/glob.hxx8
-rwxr-xr-x[-rw-r--r--]sd/inc/helpids.h475
-rwxr-xr-x[-rw-r--r--]sd/inc/pch/precompiled_sd.hxx6
-rw-r--r--sd/inc/sdabstdlg.hxx34
-rwxr-xr-x[-rw-r--r--]sd/inc/sdattr.hxx22
-rw-r--r--sd/inc/sdcommands.h310
-rwxr-xr-x[-rw-r--r--]sd/inc/sderror.hxx4
-rwxr-xr-x[-rw-r--r--]sd/inc/sdgrffilter.hxx2
-rwxr-xr-x[-rw-r--r--]sd/inc/sdhtmlfilter.hxx2
-rwxr-xr-x[-rw-r--r--]sd/inc/sdiocmpt.hxx20
-rw-r--r--sd/inc/sdmod.hxx16
-rw-r--r--sd/inc/sdpage.hxx80
-rwxr-xr-x[-rw-r--r--]sd/inc/sdresid.hxx2
-rwxr-xr-x[-rw-r--r--]sd/inc/sdxmlwrp.hxx4
-rw-r--r--sd/inc/shapelist.hxx2
-rw-r--r--sd/inc/stlpool.hxx2
-rwxr-xr-x[-rw-r--r--]sd/inc/stlsheet.hxx20
-rwxr-xr-x[-rw-r--r--]sd/inc/undo/undomanager.hxx20
-rw-r--r--sd/prj/build.lst4
-rwxr-xr-xsd/prj/d.lst2
-rwxr-xr-x[-rw-r--r--]sd/qa/unoapi/knownissues.xcl7
-rwxr-xr-x[-rw-r--r--]sd/qa/unoapi/sd.sce0
-rwxr-xr-x[-rw-r--r--]sd/sdi/SlideSorterController.sdi20
-rw-r--r--sd/sdi/ToolPanelViewShell.sdi177
-rwxr-xr-xsd/sdi/ViewShellBase.sdi213
-rwxr-xr-xsd/sdi/_drvwsh.sdi5
-rwxr-xr-xsd/sdi/sdraw.sdi391
-rwxr-xr-x[-rw-r--r--]sd/source/core/CustomAnimationPreset.cxx8
-rwxr-xr-x[-rw-r--r--]sd/source/core/anminfo.cxx16
-rw-r--r--sd/source/core/cusshow.cxx4
-rwxr-xr-x[-rw-r--r--]sd/source/core/drawdoc.cxx88
-rw-r--r--sd/source/core/drawdoc2.cxx271
-rwxr-xr-x[-rw-r--r--]sd/source/core/drawdoc3.cxx356
-rw-r--r--sd/source/core/drawdoc4.cxx124
-rwxr-xr-x[-rw-r--r--]sd/source/core/drawdoc_animations.cxx2
-rw-r--r--[-rwxr-xr-x]sd/source/core/glob.src0
-rwxr-xr-x[-rw-r--r--]sd/source/core/pglink.cxx16
-rwxr-xr-x[-rw-r--r--]sd/source/core/sdattr.cxx14
-rwxr-xr-x[-rw-r--r--]sd/source/core/sdiocmpt.cxx14
-rw-r--r--sd/source/core/sdpage.cxx216
-rwxr-xr-x[-rw-r--r--]sd/source/core/sdpage2.cxx32
-rw-r--r--sd/source/core/shapelist.cxx38
-rw-r--r--sd/source/core/stlpool.cxx98
-rwxr-xr-x[-rw-r--r--]sd/source/core/stlsheet.cxx107
-rwxr-xr-x[-rw-r--r--]sd/source/core/undo/undomanager.cxx45
-rwxr-xr-x[-rw-r--r--]sd/source/core/undo/undoobjects.cxx6
-rwxr-xr-x[-rw-r--r--]sd/source/filter/cgm/sdcgmfilter.cxx10
-rwxr-xr-x[-rw-r--r--]sd/source/filter/eppt/eppt.cxx79
-rw-r--r--sd/source/filter/eppt/eppt.hxx6
-rwxr-xr-x[-rw-r--r--]sd/source/filter/eppt/epptdef.hxx2
-rw-r--r--sd/source/filter/eppt/epptso.cxx100
-rw-r--r--sd/source/filter/eppt/escherex.cxx34
-rwxr-xr-x[-rw-r--r--]sd/source/filter/eppt/escherex.hxx6
-rwxr-xr-x[-rw-r--r--]sd/source/filter/grf/sdgrffilter.cxx22
-rw-r--r--sd/source/filter/html/htmlex.cxx158
-rw-r--r--sd/source/filter/html/htmlex.hxx36
-rw-r--r--sd/source/filter/html/pubdlg.cxx150
-rw-r--r--sd/source/filter/html/pubdlg.src47
-rw-r--r--sd/source/filter/ppt/ppt97animations.cxx2
-rw-r--r--sd/source/filter/ppt/ppt97animations.hxx30
-rw-r--r--sd/source/filter/ppt/pptin.cxx230
-rwxr-xr-x[-rw-r--r--]sd/source/filter/ppt/pptin.hxx2
-rw-r--r--sd/source/filter/ppt/pptinanimations.cxx24
-rw-r--r--sd/source/filter/ppt/propread.cxx4
-rwxr-xr-x[-rw-r--r--]sd/source/filter/ppt/propread.hxx10
-rwxr-xr-x[-rw-r--r--]sd/source/filter/sdpptwrp.cxx8
-rwxr-xr-x[-rw-r--r--]sd/source/filter/xml/sdxmlwrp.cxx16
-rwxr-xr-x[-rw-r--r--]sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx4
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx15
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterView.cxx78
-rw-r--r--sd/source/ui/accessibility/AccessibleTreeNode.cxx25
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.cxx38
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.src4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/CustomAnimationDialog.cxx96
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/CustomAnimationDialog.hxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.src41
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/CustomAnimationList.cxx34
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/CustomAnimationList.hxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/CustomAnimationPane.cxx70
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/CustomAnimationPane.hxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/DialogListBox.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/SlideTransitionPane.cxx36
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/motionpathtag.cxx70
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/motionpathtag.hxx16
-rw-r--r--sd/source/ui/annotations/annotationmanager.cxx38
-rw-r--r--sd/source/ui/annotations/annotationmanagerimpl.hxx4
-rw-r--r--sd/source/ui/annotations/annotations.src29
-rwxr-xr-x[-rw-r--r--]sd/source/ui/annotations/annotationtag.cxx38
-rwxr-xr-x[-rw-r--r--]sd/source/ui/annotations/annotationtag.hxx10
-rw-r--r--sd/source/ui/annotations/annotationwindow.cxx24
-rw-r--r--sd/source/ui/annotations/annotationwindow.hxx2
-rw-r--r--sd/source/ui/app/accel_tmpl.src117
-rw-r--r--sd/source/ui/app/app.img120
-rwxr-xr-xsd/source/ui/app/makefile.mk1
-rwxr-xr-xsd/source/ui/app/menuids2_tmpl.src190
-rw-r--r--sd/source/ui/app/menuids3_tmpl.src38
-rw-r--r--sd/source/ui/app/menuids4_tmpl.src2
-rw-r--r--sd/source/ui/app/menuids_tmpl.src274
-rw-r--r--sd/source/ui/app/optsitem.cxx375
-rw-r--r--sd/source/ui/app/popup.src57
-rw-r--r--sd/source/ui/app/popup2_tmpl.src28
-rw-r--r--sd/source/ui/app/sdmod.cxx48
-rw-r--r--sd/source/ui/app/sdmod1.cxx70
-rw-r--r--sd/source/ui/app/sdmod2.cxx84
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/sdpopup.cxx24
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/sdresid.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/sdxfer.cxx58
-rwxr-xr-xsd/source/ui/app/strings.src14
-rw-r--r--sd/source/ui/app/tbx_ww.src1123
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/tbxww.cxx30
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/tmplctrl.cxx18
-rw-r--r--sd/source/ui/app/toolbox.src737
-rw-r--r--sd/source/ui/controller/slidelayoutcontroller.cxx10
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/AnimationChildWindow.cxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/LayerDialogChildWindow.cxx2
-rw-r--r--sd/source/ui/dlg/LayerDialogContent.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/LayerTabBar.cxx34
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/NavigatorChildWindow.cxx2
-rw-r--r--sd/source/ui/dlg/PaneChildWindows.cxx14
-rw-r--r--sd/source/ui/dlg/PaneDockingWindow.cxx68
-rw-r--r--[-rwxr-xr-x]sd/source/ui/dlg/PaneDockingWindow.src6
-rw-r--r--sd/source/ui/dlg/SpellDialogChildWindow.cxx4
-rw-r--r--sd/source/ui/dlg/animobjs.cxx168
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/animobjs.src24
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/assclass.cxx0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/brkdlg.cxx10
-rw-r--r--sd/source/ui/dlg/brkdlg.src1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/celltempl.cxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/copydlg.cxx38
-rw-r--r--sd/source/ui/dlg/copydlg.src14
-rw-r--r--sd/source/ui/dlg/custsdlg.cxx92
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/custsdlg.src16
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/diactrl.cxx6
-rw-r--r--sd/source/ui/dlg/dlgass.cxx190
-rw-r--r--sd/source/ui/dlg/dlgass.src25
-rw-r--r--sd/source/ui/dlg/dlgassim.cxx26
-rw-r--r--sd/source/ui/dlg/dlgassim.hxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/dlgchar.cxx2
-rw-r--r--sd/source/ui/dlg/dlgctrls.cxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/dlgfield.cxx14
-rw-r--r--sd/source/ui/dlg/dlgfield.src5
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/dlgolbul.cxx36
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/dlgpage.cxx10
-rw-r--r--sd/source/ui/dlg/dlgsnap.cxx14
-rw-r--r--sd/source/ui/dlg/dlgsnap.src10
-rw-r--r--sd/source/ui/dlg/docprev.cxx16
-rw-r--r--sd/source/ui/dlg/filedlg.cxx20
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/gluectrl.cxx14
-rw-r--r--sd/source/ui/dlg/headerfooterdlg.cxx47
-rw-r--r--sd/source/ui/dlg/headerfooterdlg.src14
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/ins_paste.cxx4
-rw-r--r--sd/source/ui/dlg/ins_paste.src3
-rw-r--r--sd/source/ui/dlg/inspagob.cxx8
-rw-r--r--sd/source/ui/dlg/inspagob.src4
-rw-r--r--sd/source/ui/dlg/layeroptionsdlg.src9
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/masterlayoutdlg.cxx4
-rw-r--r--sd/source/ui/dlg/masterlayoutdlg.src5
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/morphdlg.cxx8
-rw-r--r--sd/source/ui/dlg/morphdlg.src8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/navigatr.cxx130
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/navigatr.src5
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/paragr.cxx24
-rw-r--r--sd/source/ui/dlg/paragr.src6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/present.cxx28
-rw-r--r--sd/source/ui/dlg/present.src19
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/prltempl.cxx16
-rw-r--r--sd/source/ui/dlg/prntopts.cxx17
-rw-r--r--sd/source/ui/dlg/prntopts.src18
-rw-r--r--sd/source/ui/dlg/sddlgfact.cxx50
-rw-r--r--sd/source/ui/dlg/sddlgfact.hxx46
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/sdpreslt.cxx42
-rw-r--r--sd/source/ui/dlg/sdpreslt.src7
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx143
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/tabtempl.cxx4
-rw-r--r--sd/source/ui/dlg/tpaction.cxx91
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/tpaction.src16
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/tpoption.cxx90
-rw-r--r--sd/source/ui/dlg/tpoption.src19
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/unchss.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/vectdlg.cxx41
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/vectdlg.src11
-rwxr-xr-x[-rw-r--r--]sd/source/ui/docshell/docshel2.cxx34
-rwxr-xr-x[-rw-r--r--]sd/source/ui/docshell/docshel3.cxx8
-rw-r--r--sd/source/ui/docshell/docshel4.cxx98
-rw-r--r--sd/source/ui/docshell/docshell.cxx48
-rwxr-xr-x[-rw-r--r--]sd/source/ui/docshell/grdocsh.cxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx3
-rwxr-xr-x[-rw-r--r--]sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/framework/configuration/ConfigurationClassifier.hxx0
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationUpdater.hxx6
-rw-r--r--sd/source/ui/framework/factories/BasicPaneFactory.cxx2
-rw-r--r--sd/source/ui/framework/factories/BasicViewFactory.cxx18
-rw-r--r--sd/source/ui/framework/factories/BasicViewFactory.hxx6
-rw-r--r--sd/source/ui/framework/factories/ChildWindowPane.cxx12
-rwxr-xr-x[-rw-r--r--]sd/source/ui/framework/factories/ChildWindowPane.hxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/framework/factories/FrameWindowPane.hxx0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/framework/factories/FullScreenPane.cxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/framework/factories/Pane.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/framework/module/ShellStackGuard.hxx0
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx25
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/bulmaper.cxx12
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuarea.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fubullet.cxx28
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuchar.cxx12
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fucon3d.cxx28
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuconarc.cxx44
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuconbez.cxx44
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuconcs.cxx18
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuconrec.cxx54
-rw-r--r--sd/source/ui/func/fuconstr.cxx156
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuconuno.cxx28
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fucopy.cxx64
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fucushow.cxx4
-rw-r--r--sd/source/ui/func/fudraw.cxx186
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fudspord.cxx12
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuediglu.cxx56
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuexpand.cxx51
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuformatpaintbrush.cxx46
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuhhconv.cxx20
-rw-r--r--sd/source/ui/func/fuinsert.cxx23
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuinsfil.cxx100
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuline.cxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fulinend.cxx14
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fumorph.cxx30
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuoaprms.cxx70
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuolbull.cxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuoltext.cxx28
-rw-r--r--sd/source/ui/func/fuoutl.cxx6
-rw-r--r--sd/source/ui/func/fupage.cxx99
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuparagr.cxx4
-rw-r--r--sd/source/ui/func/fupoor.cxx102
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuprlout.cxx36
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuprobjs.cxx14
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuscale.cxx12
-rw-r--r--sd/source/ui/func/fusearch.cxx14
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fusel.cxx214
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fusldlg.cxx10
-rw-r--r--sd/source/ui/func/fusnapln.cxx22
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fusumry.cxx28
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/futempl.cxx54
-rw-r--r--sd/source/ui/func/futext.cxx201
-rw-r--r--sd/source/ui/func/futransf.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/futxtatt.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuzoom.cxx30
-rw-r--r--sd/source/ui/func/sdundogr.cxx16
-rw-r--r--sd/source/ui/func/smarttag.cxx34
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/unprlout.cxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/3dchld.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/AccessibleOutlineEditSource.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/AccessibleSlideView.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/AccessibleTreeNode.hxx24
-rw-r--r--sd/source/ui/inc/AccessibleViewForwarder.hxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/AnimationChildWindow.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/BreakDlg.hxx6
-rw-r--r--sd/source/ui/inc/DrawDocShell.hxx71
-rw-r--r--sd/source/ui/inc/DrawViewShell.hxx75
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/FrameView.hxx86
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/GraphicDocShell.hxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/GraphicObjectBar.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/LayerDialogChildWindow.hxx2
-rw-r--r--sd/source/ui/inc/LayerDialogContent.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/NavigatorChildWindow.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/NotesChildWindow.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/OutlineBulletDlg.hxx4
-rw-r--r--sd/source/ui/inc/OutlineView.hxx24
-rw-r--r--sd/source/ui/inc/OutlineViewShell.hxx22
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/OutlinerIteratorImpl.hxx0
-rw-r--r--sd/source/ui/inc/PaneChildWindows.hxx12
-rw-r--r--sd/source/ui/inc/PaneDockingWindow.hxx20
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/PresentationViewShell.hxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/PreviewRenderer.hxx16
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/Ruler.hxx6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/SlideSorter.hxx33
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/SlideSorterChildWindow.hxx2
-rw-r--r--sd/source/ui/inc/SlideSorterViewShell.hxx19
-rw-r--r--sd/source/ui/inc/SlideView.hxx48
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/SlideViewShell.hxx24
-rw-r--r--sd/source/ui/inc/SpellDialogChildWindow.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/TabControl.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/TemplateScanner.hxx0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/UpdateLockManager.hxx0
-rw-r--r--sd/source/ui/inc/View.hxx54
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/ViewClipboard.hxx6
-rw-r--r--sd/source/ui/inc/ViewShell.hxx113
-rw-r--r--sd/source/ui/inc/ViewShellBase.hxx30
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/ViewTabControl.hxx2
-rw-r--r--sd/source/ui/inc/Window.hxx11
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/animobjs.hrc3
-rw-r--r--sd/source/ui/inc/animobjs.hxx19
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/celltempl.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/copydlg.hxx6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/custsdlg.hxx10
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/diactrl.hxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/dlg_char.hxx2
-rw-r--r--sd/source/ui/inc/dlgass.hxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/dlgfield.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/dlgpage.hxx6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/dlgsnap.hxx4
-rw-r--r--sd/source/ui/inc/docprev.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/drawview.hxx10
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/framework/Configuration.hxx0
-rw-r--r--sd/source/ui/inc/framework/FrameworkHelper.hxx13
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/framework/Pane.hxx0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fucon3d.hxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fuconarc.hxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fuconbez.hxx14
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fuconcs.hxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fuconrec.hxx8
-rw-r--r--sd/source/ui/inc/fuconstr.hxx10
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fuconuno.hxx12
-rw-r--r--sd/source/ui/inc/fudraw.hxx24
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fudspord.hxx6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fuediglu.hxx10
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fuformatpaintbrush.hxx12
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fuhhconv.hxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fuinsfil.hxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fumorph.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fuoltext.hxx8
-rw-r--r--sd/source/ui/inc/fuoutl.hxx2
-rw-r--r--sd/source/ui/inc/fupoor.hxx34
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fusearch.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fusel.hxx26
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fuslid.hxx6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/futext.hxx18
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fuzoom.hxx12
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/gluectrl.hxx6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/ins_paste.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/inspagob.hxx6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/masterlayoutdlg.hxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/morphdlg.hxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/navigatr.hrc7
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/navigatr.hxx26
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/optdlg.hxx2
-rw-r--r--sd/source/ui/inc/optsitem.hxx543
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/prltempl.hxx10
-rw-r--r--sd/source/ui/inc/prntopts.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/pubdlg.hxx10
-rw-r--r--sd/source/ui/inc/sdtreelb.hxx25
-rw-r--r--sd/source/ui/inc/sdundogr.hxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/sdxfer.hxx26
-rw-r--r--sd/source/ui/inc/smarttag.hxx22
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/sprite.hxx8
-rwxr-xr-xsd/source/ui/inc/strings.hrc3
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/tabtempl.hxx8
-rw-r--r--sd/source/ui/inc/taskpane/ControlContainer.hxx14
-rw-r--r--sd/source/ui/inc/taskpane/ScrollPanel.hxx6
-rw-r--r--sd/source/ui/inc/taskpane/SubToolPanel.hxx1
-rw-r--r--sd/source/ui/inc/taskpane/TitleBar.hxx2
-rw-r--r--sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx5
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/tbx_ww.hxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/tmplctrl.hxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/tools/AsynchronousTask.hxx0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/tools/IconCache.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/tpaction.hrc3
-rw-r--r--sd/source/ui/inc/tpaction.hxx10
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/tpoption.hxx14
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/undopage.hxx80
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/unmodpg.hxx15
-rw-r--r--sd/source/ui/inc/unoaprms.hxx64
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/unprlout.hxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/vectdlg.hxx2
-rw-r--r--sd/source/ui/inc/view/viewoverlaymanager.hxx2
-rw-r--r--sd/source/ui/inc/zoomlist.hxx6
-rw-r--r--sd/source/ui/notes/EditWindow.cxx50
-rw-r--r--sd/source/ui/notes/EditWindow.hxx8
-rw-r--r--sd/source/ui/notes/NotesChildWindow.cxx2
-rwxr-xr-xsd/source/ui/notes/NotesChildWindow.src3
-rw-r--r--sd/source/ui/notes/TextLogger.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/presenter/CanvasUpdateRequester.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/presenter/PresenterHelper.cxx6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/presenter/PresenterPreviewCache.cxx11
-rw-r--r--sd/source/ui/presenter/PresenterTextView.cxx18
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slideshow/makefile.mk3
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slideshow/showwin.cxx62
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slideshow/showwindow.hxx14
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx23
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slideshow/slideshow.hrc33
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slideshow/slideshow.src70
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx623
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx14
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx150
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx44
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx81
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx28
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx41
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx6
-rw-r--r--sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx141
-rw-r--r--sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx66
-rw-r--r--sd/source/ui/slidesorter/cache/SlsPageCache.cxx64
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx51
-rw-r--r--sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx18
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx46
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx0
-rw-r--r--sd/source/ui/slidesorter/controller/SlideSorterController.cxx357
-rw-r--r--sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx294
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/controller/SlsAnimator.cxx299
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/controller/SlsClipboard.cxx366
-rw-r--r--sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx149
-rw-r--r--sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx199
-rw-r--r--sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx100
-rw-r--r--sd/source/ui/slidesorter/controller/SlsFocusManager.cxx136
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx8
-rw-r--r--sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx327
-rw-r--r--sd/source/ui/slidesorter/controller/SlsListener.cxx139
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/controller/SlsListener.hxx11
-rw-r--r--sd/source/ui/slidesorter/controller/SlsPageSelector.cxx254
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/controller/SlsProperties.cxx46
-rw-r--r--sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx422
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx2025
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx411
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx173
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx14
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSlotManager.cxx565
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/controller/SlsTransferable.cxx17
-rw-r--r--sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx305
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/controller/makefile.mk14
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx4
-rw-r--r--sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx61
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx13
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx46
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx180
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx61
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx39
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx29
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx18
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx153
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx122
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx16
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx70
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx145
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx88
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx85
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx6
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx25
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx (renamed from sd/source/ui/slidesorter/controller/SlsTransferable.hxx)40
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx100
-rw-r--r--sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx70
-rw-r--r--sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx124
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx0
-rw-r--r--sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx101
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx214
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx362
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx60
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx71
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx131
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx330
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx145
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx138
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx0
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsResource.hrc111
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsTheme.hxx236
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx97
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx276
-rw-r--r--sd/source/ui/slidesorter/model/SlideSorterModel.cxx407
-rw-r--r--sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx240
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx4
-rw-r--r--sd/source/ui/slidesorter/model/SlsVisualState.cxx236
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/model/makefile.mk1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/shell/SlideSorter.cxx139
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx4
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterService.cxx60
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx124
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/shell/makefile.mk0
-rw-r--r--sd/source/ui/slidesorter/view/SlideSorterView.cxx1041
-rw-r--r--sd/source/ui/slidesorter/view/SlsButtonBar.cxx1558
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/view/SlsFontProvider.cxx2
-rw-r--r--sd/source/ui/slidesorter/view/SlsFramePainter.cxx265
-rw-r--r--sd/source/ui/slidesorter/view/SlsFramePainter.hxx121
-rw-r--r--sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx537
-rw-r--r--sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx448
-rw-r--r--sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx565
-rw-r--r--sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx99
-rw-r--r--sd/source/ui/slidesorter/view/SlsLayouter.cxx1684
-rw-r--r--sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx287
-rw-r--r--sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx584
-rw-r--r--sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx128
-rw-r--r--sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx1402
-rw-r--r--sd/source/ui/slidesorter/view/SlsResource.hxx50
-rw-r--r--sd/source/ui/slidesorter/view/SlsResource.src314
-rw-r--r--sd/source/ui/slidesorter/view/SlsTheme.cxx536
-rw-r--r--sd/source/ui/slidesorter/view/SlsToolTip.cxx230
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx30
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx14
-rw-r--r--sd/source/ui/slidesorter/view/SlsViewOverlay.cxx609
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/view/makefile.mk32
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx32
-rw-r--r--sd/source/ui/table/TableDesignPane.src1
-rw-r--r--sd/source/ui/table/tablefunction.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/table/tableobjectbar.cxx10
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/ControlContainer.cxx61
-rw-r--r--sd/source/ui/toolpanel/LayoutMenu.cxx38
-rw-r--r--sd/source/ui/toolpanel/LayoutMenu.hxx2
-rw-r--r--sd/source/ui/toolpanel/ScrollPanel.cxx33
-rw-r--r--sd/source/ui/toolpanel/SubToolPanel.cxx29
-rw-r--r--sd/source/ui/toolpanel/TaskPaneTreeNode.cxx2
-rw-r--r--sd/source/ui/toolpanel/TestMenu.cxx10
-rw-r--r--sd/source/ui/toolpanel/TestPanel.cxx6
-rw-r--r--sd/source/ui/toolpanel/TitleBar.cxx16
-rw-r--r--sd/source/ui/toolpanel/ToolPanel.cxx2
-rw-r--r--sd/source/ui/toolpanel/ToolPanelViewShell.cxx48
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx12
-rw-r--r--sd/source/ui/toolpanel/controls/DocumentHelper.cxx48
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/DocumentHelper.hxx2
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageContainer.cxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/MasterPageContainerFiller.hxx0
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx0
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageObserver.cxx8
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx19
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx38
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx13
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/PreviewValueSet.cxx16
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/PreviewValueSet.hxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/tools/IconCache.cxx8
-rw-r--r--sd/source/ui/tools/PreviewRenderer.cxx191
-rw-r--r--sd/source/ui/unoidl/DrawController.cxx18
-rw-r--r--sd/source/ui/unoidl/SdUnoDrawView.cxx2
-rw-r--r--sd/source/ui/unoidl/SdUnoSlideView.cxx24
-rw-r--r--sd/source/ui/unoidl/UnoDocumentSettings.cxx38
-rwxr-xr-x[-rw-r--r--]sd/source/ui/unoidl/detreg.cxx24
-rw-r--r--sd/source/ui/unoidl/facreg.cxx109
-rw-r--r--sd/source/ui/unoidl/sddetect.cxx28
-rw-r--r--sd/source/ui/unoidl/unocpres.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/unoidl/unodoc.cxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/unoidl/unolayer.cxx6
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx20
-rw-r--r--sd/source/ui/unoidl/unoobj.cxx6
-rw-r--r--sd/source/ui/unoidl/unopage.cxx40
-rwxr-xr-x[-rw-r--r--]sd/source/ui/unoidl/unopool.cxx2
-rw-r--r--sd/source/ui/unoidl/unosrch.cxx4
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx202
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/DocumentRenderer.hrc15
-rwxr-xr-xsd/source/ui/view/DocumentRenderer.src94
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/GraphicObjectBar.cxx4
-rw-r--r--sd/source/ui/view/GraphicViewShellBase.cxx10
-rw-r--r--sd/source/ui/view/ImpressViewShellBase.cxx10
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/MediaObjectBar.cxx4
-rw-r--r--sd/source/ui/view/OutlineViewShellBase.cxx8
-rw-r--r--sd/source/ui/view/Outliner.cxx142
-rw-r--r--sd/source/ui/view/OutlinerIterator.cxx4
-rw-r--r--sd/source/ui/view/PresentationViewShellBase.cxx9
-rw-r--r--sd/source/ui/view/SlideSorterViewShellBase.cxx8
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx4
-rw-r--r--sd/source/ui/view/ViewClipboard.cxx42
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx94
-rw-r--r--sd/source/ui/view/ViewShellImplementation.cxx52
-rw-r--r--sd/source/ui/view/ViewShellManager.cxx21
-rw-r--r--sd/source/ui/view/ViewTabBar.cxx14
-rw-r--r--sd/source/ui/view/drawview.cxx62
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drbezob.cxx26
-rw-r--r--sd/source/ui/view/drtxtob.cxx80
-rw-r--r--sd/source/ui/view/drtxtob1.cxx52
-rw-r--r--sd/source/ui/view/drviews1.cxx146
-rw-r--r--sd/source/ui/view/drviews2.cxx111
-rw-r--r--sd/source/ui/view/drviews3.cxx52
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviews4.cxx66
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviews5.cxx40
-rw-r--r--sd/source/ui/view/drviews6.cxx64
-rw-r--r--sd/source/ui/view/drviews7.cxx232
-rw-r--r--sd/source/ui/view/drviews8.cxx21
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviews9.cxx114
-rw-r--r--sd/source/ui/view/drviewsa.cxx75
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviewsb.cxx112
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviewsc.cxx55
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviewsd.cxx26
-rw-r--r--sd/source/ui/view/drviewse.cxx104
-rw-r--r--sd/source/ui/view/drviewsf.cxx40
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviewsg.cxx14
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviewsh.cxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviewsi.cxx14
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviewsj.cxx68
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/frmview.cxx46
-rw-r--r--sd/source/ui/view/outlnvs2.cxx18
-rw-r--r--sd/source/ui/view/outlnvsh.cxx345
-rw-r--r--sd/source/ui/view/outlview.cxx270
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/presvish.cxx6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/sdruler.cxx16
-rw-r--r--sd/source/ui/view/sdview.cxx98
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/sdview2.cxx118
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/sdview3.cxx141
-rw-r--r--sd/source/ui/view/sdview4.cxx24
-rw-r--r--sd/source/ui/view/sdwindow.cxx58
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/tabcontr.cxx40
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/unmodpg.cxx24
-rw-r--r--sd/source/ui/view/viewoverlaymanager.cxx24
-rw-r--r--sd/source/ui/view/viewshe2.cxx56
-rw-r--r--sd/source/ui/view/viewshe3.cxx64
-rw-r--r--sd/source/ui/view/viewshel.cxx119
-rw-r--r--sd/source/ui/view/zoomlist.cxx24
-rwxr-xr-x[-rw-r--r--]sd/uiconfig/sdraw/menubar/menubar.xml0
-rwxr-xr-x[-rw-r--r--]sd/util/exports.dxp1
-rwxr-xr-x[-rw-r--r--]sd/util/hidother.src26
-rwxr-xr-xsd/util/makefile.mk18
-rw-r--r--sd/util/sd.component102
-rw-r--r--sd/util/sdd.component34
611 files changed, 26092 insertions, 17593 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index a04cf7763174..aa75c763a459 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -121,7 +121,7 @@ public:
<const>OUTLINERMODE_OUTLINEVIEW</const> are defined in
editeng/outliner.hxx.
*/
- Outliner( SdDrawDocument* pDoc, USHORT nMode );
+ Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode );
virtual ~Outliner();
/** Despite the name this method is called prior to spell cheking *and*
@@ -142,8 +142,8 @@ public:
/** Initiate a find and/or replace on the next relevant text object.
@return
- Returns </TRUE> when the search/replace is finished (as
- indicated by user input to the search dialog). A </FALSE> value
+ Returns </sal_True> when the search/replace is finished (as
+ indicated by user input to the search dialog). A </sal_False> value
indicates that another call to this method is required.
*/
bool StartSearchAndReplace (const SvxSearchItem* pSearchItem);
@@ -164,8 +164,8 @@ public:
/** Starts the text conversion (hangul/hanja or Chinese simplified/traditional)
for the current viewshell */
- void StartConversion( INT16 nSourceLanguage, INT16 nTargetLanguage,
- const Font *pTargetFont, INT32 nOptions, BOOL bIsInteractive );
+ void StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage,
+ const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive );
/** This is called internaly when text conversion is started.
The position of current view mode/page/object/caret position
@@ -204,7 +204,7 @@ private:
/** this is the language that is used for current text conversion.
Only valid if meMode is TEXT_CONVERSION.
*/
- INT16 mnConversionLanguage;
+ sal_Int16 mnConversionLanguage;
/** While the value of this flag is greater than 0 changes of the current page
do not lead to selecting the corresponding text in the outliner.
@@ -216,17 +216,17 @@ private:
/** This flag indicates whether there may exist a match of the search
string before/after the current position in the document. It can be
- set to </FALSE> only when starting from the beginning/end of the
+ set to </sal_False> only when starting from the beginning/end of the
document. When reaching the end/beginning with it still be set to
- </FALSE> then there exists no match and the search can be terminated.
+ </sal_False> then there exists no match and the search can be terminated.
*/
bool mbMatchMayExist;
/// The number of pages in the current view.
- USHORT mnPageCount;
+ sal_uInt16 mnPageCount;
/// Number of objects on the current page / in the current selection.
- INT32 mnObjectCount;
+ sal_Int32 mnObjectCount;
/** A <TRUE/> value indicates that the end of the find&replace or spell
check has been reached.
@@ -235,7 +235,7 @@ private:
/** Set to <TRUE/> when an object has been prepared successfully for
searching/spell checking. This flag directs the internal iteration
- which stops when set to </TRUE>.
+ which stops when set to </sal_True>.
*/
bool mbFoundObject;
@@ -297,7 +297,7 @@ private:
EditMode meStartEditMode;
/// The current page index on starting to search/spell check.
- USHORT mnStartPageIndex;
+ sal_uInt16 mnStartPageIndex;
/// The object in edit mode when searching /spell checking was started
/// (if any).
@@ -370,8 +370,8 @@ private:
/** Do search and replace for next match.
@return
- The return value specifies whether the search ended (</TRUE>) or
- another call to this method is required (</FALSE>).
+ The return value specifies whether the search ended (</sal_True>) or
+ another call to this method is required (</sal_False>).
*/
bool SearchAndReplaceOnce (void);
@@ -410,7 +410,7 @@ private:
/** Handle the situation that the iterator has reached the last object.
This may result in setting the <member>mbEndOfSearch</member> flag
- back to </FALSE>. This method may show either the end-of-search
+ back to </sal_False>. This method may show either the end-of-search
dialog or the wrap-arround dialog.
*/
void EndOfSearch (void);
@@ -470,11 +470,11 @@ private:
@param nPageIndex
The new page index.
*/
- void SetPage (EditMode eEditMode, USHORT nPageIndex);
+ void SetPage (EditMode eEditMode, sal_uInt16 nPageIndex);
/** Switch on edit mode for the currently selected text object.
*/
- void EnterEditMode (BOOL bGrabFocus=TRUE);
+ void EnterEditMode (sal_Bool bGrabFocus=sal_True);
/** Return the position at which a new search is started with respect to
the search direction as specified by the argument.
@@ -538,14 +538,14 @@ private:
required. When all text objects have been processed then
<FALSE/> is returned.
*/
- virtual BOOL SpellNextDocument (void);
+ virtual sal_Bool SpellNextDocument (void);
/** Show the given message box and make it modal. It is assumed that
the parent of the given dialog is NULL, i.e. the application
window. This function makes sure that the otherwise non-modal
search dialog, if visible, is locked, too.
*/
- USHORT ShowModalMessageBox (Dialog& rMessageBox);
+ sal_uInt16 ShowModalMessageBox (Dialog& rMessageBox);
};
} // end of namespace sd
diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx
index 326cccef37d8..54aacefdf79f 100644..100755
--- a/sd/inc/anminfo.hxx
+++ b/sd/inc/anminfo.hxx
@@ -55,24 +55,24 @@ public:
::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
+ sal_Bool mbActive; // eingeschaltet ?
+ sal_Bool mbDimPrevious; // Objekt abblenden
+ sal_Bool mbIsMovie; // wenn Gruppenobjekt, dann Sequenz aus den
+ sal_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
+ sal_Bool mbSoundOn; // Sound ein/aus
+ sal_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
- USHORT mnVerb; // fuer OLE-Objekt
- ULONG mnPresOrder;
+ sal_Bool mbSecondSoundOn; // fuer Objekt ausblenden
+ sal_Bool mbSecondPlayFull;// fuer Objekt ausblenden
+ sal_uInt16 mnVerb; // fuer OLE-Objekt
+ sal_uLong mnPresOrder;
SdrObject& mrObject;
SD_DLLPUBLIC void SetBookmark( const String& rBookmark );
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index eb622351dc1b..707a62fd791d 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -32,6 +32,50 @@
#include <sfx2/sfx.hrc>
#endif
+// HelpIDs fuer Vorlagen
+#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)
+#define HID_POOLSHEET_TEXT (HID_SD_START + 74)
+#define HID_POOLSHEET_TEXTBODY (HID_SD_START + 75)
+#define HID_POOLSHEET_TEXTBODY_JUSTIFY (HID_SD_START + 76)
+#define HID_POOLSHEET_TEXTBODY_INDENT (HID_SD_START + 77)
+#define HID_POOLSHEET_TITLE (HID_SD_START + 78)
+#define HID_POOLSHEET_TITLE1 (HID_SD_START + 79)
+#define HID_POOLSHEET_TITLE2 (HID_SD_START + 80)
+#define HID_POOLSHEET_HEADLINE (HID_SD_START + 81)
+#define HID_POOLSHEET_HEADLINE1 (HID_SD_START + 82)
+#define HID_POOLSHEET_HEADLINE2 (HID_SD_START + 83)
+#define HID_POOLSHEET_MEASURE (HID_SD_START + 84)
+#define HID_PSEUDOSHEET_TITLE (HID_SD_START + 85)
+#define HID_PSEUDOSHEET_OUTLINE (HID_SD_START + 86)
+#define HID_PSEUDOSHEET_OUTLINE1 (HID_SD_START + 87)
+#define HID_PSEUDOSHEET_OUTLINE2 (HID_SD_START + 88)
+#define HID_PSEUDOSHEET_OUTLINE3 (HID_SD_START + 89)
+#define HID_PSEUDOSHEET_OUTLINE4 (HID_SD_START + 90)
+#define HID_PSEUDOSHEET_OUTLINE5 (HID_SD_START + 91)
+#define HID_PSEUDOSHEET_OUTLINE6 (HID_SD_START + 92)
+#define HID_PSEUDOSHEET_OUTLINE7 (HID_SD_START + 93)
+#define HID_PSEUDOSHEET_OUTLINE8 (HID_SD_START + 94)
+#define HID_PSEUDOSHEET_OUTLINE9 (HID_SD_START + 95)
+#define HID_PSEUDOSHEET_BACKGROUNDOBJECTS (HID_SD_START + 96)
+#define HID_PSEUDOSHEET_BACKGROUND (HID_SD_START + 97)
+#define HID_PSEUDOSHEET_NOTES (HID_SD_START + 98)
+#define HID_PSEUDOSHEET_SUBTITLE (HID_SD_START + 101)
+
+#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 SHELLID_SD_TASK_PANE_PREVIEW_CURRENT (HID_SD_START + 174)
+#define SHELLID_SD_TASK_PANE_PREVIEW_RECENT (HID_SD_START + 175)
+#define SHELLID_SD_TASK_PANE_PREVIEW_ALL (HID_SD_START + 176)
+#define SHELLID_SD_TASK_PANE_PREVIEW_LAYOUTS (HID_SD_START + 177)
+
#define SID_BACKGROUND (SID_SD_START)
#define SID_LASTVERSION (SID_SD_START+1)
#define SID_PAGESETUP (SID_SD_START+2)
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 47cf7eddb0a9..7c74a3dc6524 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -171,8 +171,8 @@ private:
List* mpCustomShowList;
::sd::DrawDocShell* mpDocSh;
SdTransferable * mpCreatingTransferable;
- BOOL mbHasOnlineSpellErrors;
- BOOL mbInitialOnlineSpellingEnabled;
+ sal_Bool mbHasOnlineSpellErrors;
+ sal_Bool mbInitialOnlineSpellingEnabled;
String maBookmarkFile;
::sd::DrawDocShellRef mxBookmarkDocShRef;
@@ -180,17 +180,17 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation2 > mxPresentation;
- BOOL mbNewOrLoadCompleted;
+ sal_Bool mbNewOrLoadCompleted;
- BOOL mbOnlineSpell;
- BOOL mbSummationOfParagraphs;
+ sal_Bool mbOnlineSpell;
+ sal_Bool mbSummationOfParagraphs;
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()
+ sal_Bool mbAllocDocSh; // => AllocModel()
DocumentType meDocType;
CharClass* mpCharClass;
::com::sun::star::lang::Locale* mpLocale;
@@ -198,8 +198,8 @@ private:
::std::auto_ptr<ImpDrawPageListWatcher> mpDrawPageListWatcher;
::std::auto_ptr<ImpMasterPageListWatcher> mpMasterPageListWatcher;
- void UpdatePageObjectsInNotes(USHORT nStartPos);
- void UpdatePageRelativeURLs(SdPage* pPage, USHORT nPos, sal_Int32 nIncrement);
+ void UpdatePageObjectsInNotes(sal_uInt16 nStartPos);
+ void UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos, sal_Int32 nIncrement);
void FillOnlineSpellingList(SdPage* pPage);
void SpellObject(SdrTextObj* pObj);
@@ -232,21 +232,21 @@ public:
SfxItemPool& GetPool() { return( *pItemPool ); }
- ::sd::Outliner* GetOutliner(BOOL bCreateOutliner=TRUE);
- SD_DLLPUBLIC ::sd::Outliner* GetInternalOutliner(BOOL bCreateOutliner=TRUE);
+ ::sd::Outliner* GetOutliner(sal_Bool bCreateOutliner=sal_True);
+ SD_DLLPUBLIC ::sd::Outliner* GetInternalOutliner(sal_Bool bCreateOutliner=sal_True);
::sd::DrawDocShell* GetDocSh() const { return mpDocSh; }
- LanguageType GetLanguage( const USHORT nId ) const;
- void SetLanguage( const LanguageType eLang, const USHORT nId );
+ LanguageType GetLanguage( const sal_uInt16 nId ) const;
+ void SetLanguage( const LanguageType eLang, const sal_uInt16 nId );
SvxNumType GetPageNumType() const;
void SetPageNumType(SvxNumType eType) { mePageNumType = eType; }
- SD_DLLPUBLIC String CreatePageNumValue(USHORT nNum) const;
+ SD_DLLPUBLIC String CreatePageNumValue(sal_uInt16 nNum) const;
DocumentType GetDocumentType() const { return meDocType; }
- void SetAllocDocSh(BOOL bAlloc);
+ void SetAllocDocSh(sal_Bool bAlloc);
void CreatingDataObj( SdTransferable* pTransferable ) { mpCreatingTransferable = pTransferable; }
@@ -256,25 +256,25 @@ public:
for newly created slides.
*/
SD_DLLPUBLIC void CreateFirstPages( SdDrawDocument* pRefDocument = 0 );
- SD_DLLPUBLIC BOOL CreateMissingNotesAndHandoutPages();
+ SD_DLLPUBLIC sal_Bool CreateMissingNotesAndHandoutPages();
- void MovePage(USHORT nPgNum, USHORT nNewPos);
- void InsertPage(SdrPage* pPage, USHORT nPos=0xFFFF);
- void DeletePage(USHORT nPgNum);
- SdrPage* RemovePage(USHORT nPgNum);
+ void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos);
+ void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF);
+ void DeletePage(sal_uInt16 nPgNum);
+ SdrPage* RemovePage(sal_uInt16 nPgNum);
- virtual void InsertMasterPage(SdrPage* pPage, USHORT nPos=0xFFFF);
- virtual SdrPage* RemoveMasterPage(USHORT nPgNum);
+ virtual void InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF);
+ virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum);
- 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);
+ void RemoveUnnecessaryMasterPages( SdPage* pMaster=NULL, sal_Bool bOnlyDuplicatePages=sal_False, sal_Bool bUndo=sal_True );
+ SD_DLLPUBLIC void SetMasterPage(sal_uInt16 nSdPageNum, const String& rLayoutName,
+ SdDrawDocument* pSourceDoc, sal_Bool bMaster, sal_Bool bCheckMasters);
SD_DLLPUBLIC SdDrawDocument* OpenBookmarkDoc(const String& rBookmarkFile);
SdDrawDocument* OpenBookmarkDoc(SfxMedium& rMedium);
- BOOL InsertBookmark(List* pBookmarkList, List* pExchangeList, BOOL bLink,
- BOOL bReplace, USHORT nPgPos, BOOL bNoDialogs,
- ::sd::DrawDocShell* pBookmarkDocSh, BOOL bCopy,
+ sal_Bool InsertBookmark(List* pBookmarkList, List* pExchangeList, sal_Bool bLink,
+ sal_Bool bReplace, sal_uInt16 nPgPos, sal_Bool bNoDialogs,
+ ::sd::DrawDocShell* pBookmarkDocSh, sal_Bool bCopy,
Point* pObjPos);
bool IsStartWithPresentation() const;
@@ -288,7 +288,7 @@ public:
@attention Beware! This method in it's current state does not
handle all combinations of their input parameters
- correctly. For example, for pBookmarkList=NULL, bReplace=TRUE
+ correctly. For example, for pBookmarkList=NULL, bReplace=sal_True
is ignored (no replace happens).
@param pBookmarkList
@@ -325,16 +325,16 @@ public:
Whether the replace operation should take the name from the new
page, or preserve the old name
*/
- BOOL InsertBookmarkAsPage(List* pBookmarkList, List* pExchangeList,
- BOOL bLink, BOOL bReplace, USHORT nPgPos,
- BOOL bNoDialogs, ::sd::DrawDocShell* pBookmarkDocSh,
- BOOL bCopy, BOOL bMergeMasterPages,
- BOOL bPreservePageNames);
- BOOL InsertBookmarkAsObject(List* pBookmarkList, List* pExchangeListL,
- BOOL bLink, ::sd::DrawDocShell* pBookmarkDocSh,
+ sal_Bool InsertBookmarkAsPage(List* pBookmarkList, List* pExchangeList,
+ sal_Bool bLink, sal_Bool bReplace, sal_uInt16 nPgPos,
+ sal_Bool bNoDialogs, ::sd::DrawDocShell* pBookmarkDocSh,
+ sal_Bool bCopy, sal_Bool bMergeMasterPages,
+ sal_Bool bPreservePageNames);
+ sal_Bool InsertBookmarkAsObject(List* pBookmarkList, List* pExchangeListL,
+ sal_Bool bLink, ::sd::DrawDocShell* pBookmarkDocSh,
Point* pObjPos);
void IterateBookmarkPages( SdDrawDocument* pBookmarkDoc, List* pBookmarkList,
- USHORT nBMSdPageCount,
+ sal_uInt16 nBMSdPageCount,
InsertBookmarkAsPage_PageFunctorBase& rPageIterator );
SD_DLLPUBLIC void CloseBookmarkDoc();
@@ -353,25 +353,25 @@ public:
Returns the index of the page with the given name or
SDRPAGE_NOTFOUND (=0xffff) when such a page does not exist.
*/
- USHORT GetPageByName(const String& rPgName, BOOL& rbIsMasterPage ) const;
- SD_DLLPUBLIC SdPage*GetSdPage(USHORT nPgNum, PageKind ePgKind) const;
- SD_DLLPUBLIC USHORT GetSdPageCount(PageKind ePgKind) const;
+ sal_uInt16 GetPageByName(const String& rPgName, sal_Bool& rbIsMasterPage ) const;
+ SD_DLLPUBLIC SdPage*GetSdPage(sal_uInt16 nPgNum, PageKind ePgKind) const;
+ SD_DLLPUBLIC sal_uInt16 GetSdPageCount(PageKind ePgKind) const;
- void SetSelected(SdPage* pPage, BOOL bSelect);
- BOOL MovePages(USHORT nTargetPage);
+ void SetSelected(SdPage* pPage, sal_Bool bSelect);
+ sal_Bool MovePages(sal_uInt16 nTargetPage);
- SD_DLLPUBLIC SdPage*GetMasterSdPage(USHORT nPgNum, PageKind ePgKind);
- SD_DLLPUBLIC USHORT GetMasterSdPageCount(PageKind ePgKind) const;
+ SD_DLLPUBLIC SdPage*GetMasterSdPage(sal_uInt16 nPgNum, PageKind ePgKind);
+ SD_DLLPUBLIC sal_uInt16 GetMasterSdPageCount(PageKind ePgKind) const;
- USHORT GetMasterPageUserCount(SdrPage* pMaster) const;
+ sal_uInt16 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; }
+ void SetSummationOfParagraphs( sal_Bool bOn = sal_True ) { mbSummationOfParagraphs = bOn; }
+ sal_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.
@@ -395,20 +395,20 @@ public:
*/
sal_Int32 GetPrinterIndependentLayout (void);
- void SetOnlineSpell( BOOL bIn );
- BOOL GetOnlineSpell() const { return mbOnlineSpell; }
+ void SetOnlineSpell( sal_Bool bIn );
+ sal_Bool GetOnlineSpell() const { return mbOnlineSpell; }
void StopOnlineSpelling();
- void StartOnlineSpelling(BOOL bForceSpelling=TRUE);
+ void StartOnlineSpelling(sal_Bool bForceSpelling=sal_True);
void ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject* pObj, SdrOutliner* pOutl);
void InsertObject(SdrObject* pObj, SdPage* pPage);
void RemoveObject(SdrObject* pObj, SdPage* pPage);
- ULONG GetLinkCount();
+ sal_uLong GetLinkCount();
List* GetFrameViewList() const { return mpFrameViewList; }
- SD_DLLPUBLIC List* GetCustomShowList(BOOL bCreate = FALSE);
+ SD_DLLPUBLIC List* GetCustomShowList(sal_Bool bCreate = sal_False);
void NbcSetChanged(sal_Bool bFlag = sal_True);
@@ -423,9 +423,9 @@ public:
void NewOrLoadCompleted(DocCreationMode eMode);
void NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool );
- BOOL IsNewOrLoadCompleted() const {return mbNewOrLoadCompleted; }
+ sal_Bool IsNewOrLoadCompleted() const {return mbNewOrLoadCompleted; }
- ::sd::FrameView* GetFrameView(ULONG nPos) {
+ ::sd::FrameView* GetFrameView(sal_uLong nPos) {
return static_cast< ::sd::FrameView*>(
mpFrameViewList->GetObject(nPos));}
@@ -446,8 +446,8 @@ public:
void CheckMasterPages();
void Merge(SdrModel& rSourceModel,
- USHORT nFirstPageNum=0, USHORT nLastPageNum=0xFFFF,
- USHORT nDestPos=0xFFFF,
+ sal_uInt16 nFirstPageNum=0, sal_uInt16 nLastPageNum=0xFFFF,
+ sal_uInt16 nDestPos=0xFFFF,
bool bMergeMasterPages = false, bool bAllMasterPages = false,
bool bUndo = true, bool bTreadSourceAsConst = false);
@@ -492,20 +492,24 @@ public:
This flag indicates whether to show the background shape.
@param bIsPageObj
This flag indicates whether to show the shapes on the master page.
+ @param nInsertPosition
+ Position where to insert the standard page. When -1 then the
+ new page set is inserted after the current page.
@return
Returns an index of the inserted pages that can be used with the
<member>GetSdPage()</member> method.
*/
- USHORT CreatePage (
+ sal_uInt16 CreatePage (
SdPage* pCurrentPage,
PageKind ePageKind,
const String& sStandardPageName,
const String& sNotesPageName,
AutoLayout eStandardLayout,
AutoLayout eNotesLayout,
- BOOL bIsPageBack,
- BOOL bIsPageObj);
+ sal_Bool bIsPageBack,
+ sal_Bool bIsPageObj,
+ const sal_Int32 nInsertPosition = -1);
/** This method acts as a simplified front end for the more complex
<member>DuplicatePage()</member> method.
@@ -517,7 +521,7 @@ public:
Returns an index of the inserted pages that can be used with the
<member>GetSdPage()</member> method.
*/
- USHORT DuplicatePage (USHORT nPageNum);
+ sal_uInt16 DuplicatePage (sal_uInt16 nPageNum);
/** Create and insert a set of two new pages that are copies of the
given <argument>pCurrentPage</argument> and its associated notes
@@ -548,20 +552,24 @@ public:
This flag indicates whether to show the background shape.
@param bIsPageObj
This flag indicates whether to show the shapes on the master page.
+ @param nInsertPosition
+ Position where to insert the standard page. When -1 then the
+ new page set is inserted after the current page.
@return
Returns an index of the inserted pages that can be used with the
<member>GetSdPage()</member> method.
*/
- USHORT DuplicatePage (
+ sal_uInt16 DuplicatePage (
SdPage* pCurrentPage,
PageKind ePageKind,
const String& sStandardPageName,
const String& sNotesPageName,
AutoLayout eStandardLayout,
AutoLayout eNotesLayout,
- BOOL bIsPageBack,
- BOOL bIsPageObj);
+ sal_Bool bIsPageBack,
+ sal_Bool bIsPageObj,
+ const sal_Int32 nInsertPosition = -1);
/** return the document fonts for latin, cjk and ctl according to the current
languages set at this document */
@@ -619,23 +627,26 @@ private:
The standard page to insert.
@param pNotesPage
The notes page to insert.
+ @param nInsertPosition
+ Position where to insert the standard page. When -1 then the
+ new page set is inserted after the current page.
@return
Returns an index of the inserted pages that can be used with the
<member>GetSdPage()</member> method.
*/
- USHORT InsertPageSet (
+ sal_uInt16 InsertPageSet (
SdPage* pCurrentPage,
PageKind ePageKind,
const String& sStandardPageName,
const String& sNotesPageName,
AutoLayout eStandardLayout,
AutoLayout eNotesLayout,
- BOOL bIsPageBack,
- BOOL bIsPageObj,
-
+ sal_Bool bIsPageBack,
+ sal_Bool bIsPageObj,
SdPage* pStandardPage,
- SdPage* pNotesPage);
+ SdPage* pNotesPage,
+ sal_Int32 nInsertPosition = -1);
/** Set up a newly created page and insert it into the list of pages.
@param pPreviousPage
@@ -656,9 +667,9 @@ private:
SdPage* pPreviousPage,
SdPage* pPage,
const String& sPageName,
- USHORT nInsertionPoint,
- BOOL bIsPageBack,
- BOOL bIsPageObj);
+ sal_uInt16 nInsertionPoint,
+ sal_Bool bIsPageBack,
+ sal_Bool bIsPageObj);
virtual void PageListChanged();
virtual void MasterPageListChanged();
@@ -680,8 +691,8 @@ private:
DrawDocShell* mpDocShell;
SdDrawDocument* mpDoc;
- BOOL mbIsEnableSetModified;
- BOOL mbIsDocumentChanged;
+ sal_Bool mbIsEnableSetModified;
+ sal_Bool mbIsDocumentChanged;
};
}
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index 73189f135e62..89b2b670adf9 100755
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
@@ -154,5 +154,7 @@
#define STR_CUSTOMANIMATIONPANE RID_GLOB_START+227
#define STR_SLIDE_TRANSITION_PANE RID_GLOB_START+228
+#define RID_SLIDESORTER_ICONS RID_GLOB_START+227
+
diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx
index 77adcd8503eb..20b264651847 100644
--- a/sd/inc/glob.hxx
+++ b/sd/inc/glob.hxx
@@ -71,10 +71,10 @@
#define SD_IF_SDTOOLPANELSHELL SFX_INTERFACE_SD_START + 30
// Inventor-Id fuer StarDraw UserData
-const UINT32 SdUDInventor=UINT32('S')*0x00000001+
- UINT32('D')*0x00000100+
- UINT32('U')*0x00010000+
- UINT32('D')*0x01000000;
+const sal_uInt32 SdUDInventor=sal_uInt32('S')*0x00000001+
+ sal_uInt32('D')*0x00000100+
+ sal_uInt32('U')*0x00010000+
+ sal_uInt32('D')*0x01000000;
// Object-Ids fuer StarDraw UserData
#define SD_ANIMATIONINFO_ID 1
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index 9a0bad271409..9056d9eb2051 100644..100755
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -25,259 +25,230 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _SOLAR_HRC
-#include <svl/solar.hrc>
-#endif
-
-#define HID_SD_PRINT_OPTIONS (HID_SD_START + 0)
-#define HID_SD_OPTIONS_SNAP (HID_SD_START + 1)
-#define HID_SD_OPTIONS_VIEW (HID_SD_START + 2)
-
-#define HID_SD_AUTOPILOT_PAGE1 (HID_SD_START + 3)
-#define HID_SD_AUTOPILOT_PAGE2 (HID_SD_START + 4)
-#define HID_SD_AUTOPILOT_PAGE3 (HID_SD_START + 5)
-#define HID_SD_AUTOPILOT_PAGE4 (HID_SD_START + 6)
-#define HID_SD_AUTOPILOT_PAGE5 (HID_SD_START + 7)
-#define HID_SD_AUTOPILOT_PAGE6 (HID_SD_START + 8)
-
-#define HID_SD_CBX_ONLYSELECTED (HID_SD_START + 9)
-#define HID_SD_BTN_FILTERDIALOG (HID_SD_START + 10)
-
-#define HID_SD_BTN_PAGE (HID_SD_START + 11)
-#define HID_SD_BTN_MASTERPAGE (HID_SD_START + 12)
-#define HID_SD_BTN_LAYER (HID_SD_START + 13)
-
-#define HID_SD_BTN_DRAW (HID_SD_START + 14)
-#define HID_SD_BTN_SLIDE (HID_SD_START + 15)
-#define HID_SD_BTN_OUTLINE (HID_SD_START + 16)
-#define HID_SD_BTN_NOTES (HID_SD_START + 17)
-#define HID_SD_BTN_HANDOUT (HID_SD_START + 18)
-
-#define HID_SD_WIN_DOCUMENT (HID_SD_START + 19)
-
-#define HID_SD_OPTIONS_LAYOUT (HID_SD_START + 20)
-#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_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_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_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_SHAPE_FILTER (HID_SD_START + 39)
+#include <sfx2/sfxcommands.h>
+#include <svx/svxcommands.h>
+#include "sdcommands.h"
+
+#define HID_SDDRAWVIEWSHELL "SD_HID_SDDRAWVIEWSHELL"
+#define HID_SDGRAPHICVIEWSHELL "SD_HID_SDGRAPHICVIEWSHELL"
+#define HID_SDOUTLINEVIEWSHELL "SD_HID_SDOUTLINEVIEWSHELL"
+#define HID_SD_PRINT_OPTIONS "SD_HID_SD_PRINT_OPTIONS"
+#define HID_SD_OPTIONS_SNAP "SD_HID_SD_OPTIONS_SNAP"
+#define HID_SD_OPTIONS_VIEW "SD_HID_SD_OPTIONS_VIEW"
+#define HID_SD_AUTOPILOT_PAGE1 "SD_HID_SD_AUTOPILOT_PAGE1"
+#define HID_SD_AUTOPILOT_PAGE2 "SD_HID_SD_AUTOPILOT_PAGE2"
+#define HID_SD_AUTOPILOT_PAGE3 "SD_HID_SD_AUTOPILOT_PAGE3"
+#define HID_SD_AUTOPILOT_PAGE4 "SD_HID_SD_AUTOPILOT_PAGE4"
+#define HID_SD_AUTOPILOT_PAGE5 "SD_HID_SD_AUTOPILOT_PAGE5"
+#define HID_SD_AUTOPILOT_PAGE6 "SD_HID_SD_AUTOPILOT_PAGE6"
+#define HID_SD_CBX_ONLYSELECTED "SD_HID_SD_CBX_ONLYSELECTED"
+#define HID_SD_BTN_FILTERDIALOG "SD_HID_SD_BTN_FILTERDIALOG"
+#define HID_SD_BTN_PAGE "SD_HID_SD_BTN_PAGE"
+#define HID_SD_BTN_MASTERPAGE "SD_HID_SD_BTN_MASTERPAGE"
+#define HID_SD_BTN_LAYER "SD_HID_SD_BTN_LAYER"
+#define HID_SD_BTN_DRAW "SD_HID_SD_BTN_DRAW"
+#define HID_SD_BTN_SLIDE "SD_HID_SD_BTN_SLIDE"
+#define HID_SD_BTN_OUTLINE "SD_HID_SD_BTN_OUTLINE"
+#define HID_SD_BTN_NOTES "SD_HID_SD_BTN_NOTES"
+#define HID_SD_BTN_HANDOUT "SD_HID_SD_BTN_HANDOUT"
+#define HID_SD_WIN_DOCUMENT "SD_HID_SD_WIN_DOCUMENT"
+#define HID_SD_OPTIONS_LAYOUT "SD_HID_SD_OPTIONS_LAYOUT"
+#define HID_SD_OPTIONS_CONTENTS "SD_HID_SD_OPTIONS_CONTENTS"
+#define HID_SD_OPTIONS_MISC "SD_HID_SD_OPTIONS_MISC"
+#define HID_SD_EFFECT_PREVIEW "SD_HID_SD_EFFECT_PREVIEW"
+#define HID_SD_CTL_NEWFOIL "SD_HID_SD_CTL_NEWFOIL"
+#define HID_SD_NAVIGATOR_TLB "SD_HID_SD_NAVIGATOR_TLB"
+#define HID_SD_NAVIGATOR "SD_HID_SD_NAVIGATOR"
+#define HID_SD_CTL_EFFECTS "SD_HID_SD_CTL_EFFECTS"
+#define HID_SD_CTL_TEXT_EFFECTS "SD_HID_SD_CTL_TEXT_EFFECTS"
+#define HID_SD_CTL_SLIDE_CHANGE "SD_HID_SD_CTL_SLIDE_CHANGE"
+#define HID_SD_NAVIGATOR_TBX "SD_HID_SD_NAVIGATOR_TBX"
+#define HID_SD_NAVIGATOR_LB "SD_HID_SD_NAVIGATOR_LB"
+#define HID_SD_NAVIGATOR_TBI_PEN "SD_HID_SD_NAVIGATOR_TBI_PEN"
+#define HID_SD_NAVIGATOR_TBI_FIRST "SD_HID_SD_NAVIGATOR_TBI_FIRST"
+#define HID_SD_NAVIGATOR_TBI_PREV "SD_HID_SD_NAVIGATOR_TBI_PREV"
+#define HID_SD_NAVIGATOR_TBI_NEXT "SD_HID_SD_NAVIGATOR_TBI_NEXT"
+#define HID_SD_NAVIGATOR_TBI_LAST "SD_HID_SD_NAVIGATOR_TBI_LAST"
+#define HID_SD_NAVIGATOR_TBI_DRAGTYPE "SD_HID_SD_NAVIGATOR_TBI_DRAGTYPE"
+#define HID_SD_NAVIGATOR_TBI_SHAPE_FILTER "SD_HID_SD_NAVIGATOR_TBI_SHAPE_FILTER"
// 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 "SD_HID_SD_DRAW_DEFAULTTOOLBOX"
+#define HID_SD_PLUGINTOOLBOX "SD_HID_SD_PLUGINTOOLBOX"
+#define HID_SD_DRAW_TOOLBOX "SD_HID_SD_DRAW_TOOLBOX"
+#define HID_SD_SLIDE_TOOLBOX "SD_HID_SD_SLIDE_TOOLBOX"
+#define HID_SD_OUTLINE_TOOLBOX "SD_HID_SD_OUTLINE_TOOLBOX"
+#define HID_SD_DRAW_OBJ_TOOLBOX "SD_HID_SD_DRAW_OBJ_TOOLBOX"
+#define HID_SD_DRAW_OPTIONS_TOOLBOX "SD_HID_SD_DRAW_OPTIONS_TOOLBOX"
+#define HID_SD_DRAW_COMMONTASK_TOOLBOX "SD_HID_SD_DRAW_COMMONTASK_TOOLBOX"
+#define HID_SD_BEZIER_TOOLBOX "SD_HID_SD_BEZIER_TOOLBOX"
+#define HID_SD_TEXT_TOOLBOX "SD_HID_SD_TEXT_TOOLBOX"
+#define HID_SD_GLUEPOINTS_TOOLBOX "SD_HID_SD_GLUEPOINTS_TOOLBOX"
+#define HID_SD_SLIDE_OBJ_TOOLBOX "SD_HID_SD_SLIDE_OBJ_TOOLBOX"
// 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)
-
-// HelpIDs fuer Vorlagen
-#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)
-#define HID_POOLSHEET_TEXT (HID_SD_START + 74)
-#define HID_POOLSHEET_TEXTBODY (HID_SD_START + 75)
-#define HID_POOLSHEET_TEXTBODY_JUSTIFY (HID_SD_START + 76)
-#define HID_POOLSHEET_TEXTBODY_INDENT (HID_SD_START + 77)
-#define HID_POOLSHEET_TITLE (HID_SD_START + 78)
-#define HID_POOLSHEET_TITLE1 (HID_SD_START + 79)
-#define HID_POOLSHEET_TITLE2 (HID_SD_START + 80)
-#define HID_POOLSHEET_HEADLINE (HID_SD_START + 81)
-#define HID_POOLSHEET_HEADLINE1 (HID_SD_START + 82)
-#define HID_POOLSHEET_HEADLINE2 (HID_SD_START + 83)
-#define HID_POOLSHEET_MEASURE (HID_SD_START + 84)
-
-#define HID_PSEUDOSHEET_TITLE (HID_SD_START + 85)
-#define HID_PSEUDOSHEET_OUTLINE (HID_SD_START + 86)
-#define HID_PSEUDOSHEET_OUTLINE1 (HID_SD_START + 87)
-#define HID_PSEUDOSHEET_OUTLINE2 (HID_SD_START + 88)
-#define HID_PSEUDOSHEET_OUTLINE3 (HID_SD_START + 89)
-#define HID_PSEUDOSHEET_OUTLINE4 (HID_SD_START + 90)
-#define HID_PSEUDOSHEET_OUTLINE5 (HID_SD_START + 91)
-#define HID_PSEUDOSHEET_OUTLINE6 (HID_SD_START + 92)
-#define HID_PSEUDOSHEET_OUTLINE7 (HID_SD_START + 93)
-#define HID_PSEUDOSHEET_OUTLINE8 (HID_SD_START + 94)
-#define HID_PSEUDOSHEET_OUTLINE9 (HID_SD_START + 95)
-#define HID_PSEUDOSHEET_BACKGROUNDOBJECTS (HID_SD_START + 96)
-#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_PSEUDOSHEET_SUBTITLE (HID_SD_START + 101)
-
-#define HID_CTL_ACTION_DLG_1 (HID_SD_START + 102)
-#define HID_CTL_ACTION_DLG_2 (HID_SD_START + 103)
-
-#define HID_SD_BTN_PRESENTATION (HID_SD_START + 104)
-
-#define HID_SD_HTMLEXPORT_PAGE1 (HID_SD_START + 105)
-#define HID_SD_HTMLEXPORT_PAGE2 (HID_SD_START + 106)
-#define HID_SD_HTMLEXPORT_PAGE3 (HID_SD_START + 107)
-#define HID_SD_HTMLEXPORT_PAGE4 (HID_SD_START + 108)
-#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_HTMLEXPORT_DLG_DNAME (HID_SD_START + 115)
-
-#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_DRAW_GRAF_TOOLBOX (HID_SD_START + 121)
-
-#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)
-
-#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_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_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_TASK_PANE (HID_SD_START + 136)
-#define HID_SD_SLIDE_DESIGNS (HID_SD_START + 137)
-#define HID_SD_CURRENT_MASTERS (HID_SD_START + 138)
-#define HID_SD_RECENT_MASTERS (HID_SD_START + 139)
-#define HID_SD_ALL_MASTERS (HID_SD_START + 140)
-#define HID_SD_SLIDE_LAYOUTS (HID_SD_START + 141)
-#define HID_SD_CUSTOM_ANIMATIONS (HID_SD_START + 142)
-#define HID_SD_SLIDE_TRANSITIONS (HID_SD_START + 143)
-
-#define HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT (HID_SD_START + 144)
-#define HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT (HID_SD_START + 145)
-#define HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT (HID_SD_START + 146)
-#define HID_SD_CUSTOMANIMATIONPANE_LB_START (HID_SD_START + 147)
-#define HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY (HID_SD_START + 148)
-#define HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE (HID_SD_START + 149)
-#define HID_SD_CUSTOMANIMATIONPANE_CB_SPEED (HID_SD_START + 150)
-#define HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST (HID_SD_START + 151)
-#define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP (HID_SD_START + 152)
-#define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN (HID_SD_START + 153)
-#define HID_SD_CUSTOMANIMATIONPANE_PB_PLAY (HID_SD_START + 154)
-#define HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW (HID_SD_START + 155)
-#define HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW (HID_SD_START + 156)
-
-#define HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES (HID_SD_START + 157)
-#define HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL (HID_SD_START + 158)
-#define HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY (HID_SD_START + 159)
-#define HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW (HID_SD_START + 160)
-#define HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW (HID_SD_START + 161)
-
-#define HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS (HID_SD_START + 162)
-#define HID_SD_SLIDETRANSITIONPANE_LB_SPEED (HID_SD_START + 163)
-#define HID_SD_SLIDETRANSITIONPANE_LB_SOUND (HID_SD_START + 164)
-#define HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND (HID_SD_START + 165)
-#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE (HID_SD_START + 166)
-#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO (HID_SD_START + 167)
-#define HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER (HID_SD_START + 168)
-#define HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL (HID_SD_START + 169)
-#define HID_SD_SLIDETRANSITIONPANE_PB_PLAY (HID_SD_START + 170)
-#define HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW (HID_SD_START + 171)
-#define HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW (HID_SD_START + 172)
-
-#define HID_SD_TASK_PANE_VIEW_MENU (HID_SD_START + 173)
-#define HID_SD_TASK_PANE_PREVIEW_CURRENT (HID_SD_START + 174)
-#define HID_SD_TASK_PANE_PREVIEW_RECENT (HID_SD_START + 175)
-#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)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+#define HID_SD_FW_ALIGNMENT "SD_HID_SD_FW_ALIGNMENT"
+#define HID_SD_FW_ZOOM "SD_HID_SD_FW_ZOOM"
+#define HID_SD_FW_CHOOSE_MODE "SD_HID_SD_FW_CHOOSE_MODE"
+#define HID_SD_FW_TEXT "SD_HID_SD_FW_TEXT"
+#define HID_SD_FW_RECTANGLES "SD_HID_SD_FW_RECTANGLES"
+#define HID_SD_FW_ELLIPSES "SD_HID_SD_FW_ELLIPSES"
+#define HID_SD_FW_LINES "SD_HID_SD_FW_LINES"
+#define HID_SD_FW_ARROWS "SD_HID_SD_FW_ARROWS"
+#define HID_SD_FW_3D_OBJECTS "SD_HID_SD_FW_3D_OBJECTS"
+#define HID_SD_FW_CONNECTORS "SD_HID_SD_FW_CONNECTORS"
+#define HID_SD_FW_INSERT "SD_HID_SD_FW_INSERT"
+#define HID_SD_FW_POSITION "SD_HID_SD_FW_POSITION"
+
+#define HID_SD_BTN_PREVIEW "SD_HID_SD_BTN_PREVIEW"
+
+#define HID_SD_NAVIGATOR_MENU1 "SD_HID_SD_NAVIGATOR_MENU1"
+#define HID_SD_NAVIGATOR_MENU2 "SD_HID_SD_NAVIGATOR_MENU2"
+#define HID_SD_NAVIGATOR_MENU3 "SD_HID_SD_NAVIGATOR_MENU3"
+
+#define HID_SD_WIN_PRESENTATION "SD_HID_SD_WIN_PRESENTATION"
+
+#define HID_DLG_DEFINE_CUSTOMSHOW "SD_HID_DLG_DEFINE_CUSTOMSHOW"
+#define HID_DLG_DEFINE_CUSTOMSHOW_CTL "SD_HID_DLG_DEFINE_CUSTOMSHOW_CTL"
+
+#define HID_CTL_ACTION_DLG_1 "SD_HID_CTL_ACTION_DLG_1"
+#define HID_CTL_ACTION_DLG_2 "SD_HID_CTL_ACTION_DLG_2"
+
+#define HID_SD_BTN_PRESENTATION "SD_HID_SD_BTN_PRESENTATION"
+
+#define HID_SD_HTMLEXPORT_PAGE1 "SD_HID_SD_HTMLEXPORT_PAGE1"
+#define HID_SD_HTMLEXPORT_PAGE2 "SD_HID_SD_HTMLEXPORT_PAGE2"
+#define HID_SD_HTMLEXPORT_PAGE3 "SD_HID_SD_HTMLEXPORT_PAGE3"
+#define HID_SD_HTMLEXPORT_PAGE4 "SD_HID_SD_HTMLEXPORT_PAGE4"
+#define HID_SD_HTMLEXPORT_PAGE5 "SD_HID_SD_HTMLEXPORT_PAGE5"
+#define HID_SD_HTMLEXPORT_PAGE6 "SD_HID_SD_HTMLEXPORT_PAGE6"
+
+#define HID_SD_CHGFOIL_LAYOUT "SD_HID_SD_CHGFOIL_LAYOUT"
+#define HID_SD_CHGFOIL_BACKGROUND "SD_HID_SD_CHGFOIL_BACKGROUND"
+#define HID_SD_CHGFOIL_OBJECTS "SD_HID_SD_CHGFOIL_OBJECTS"
+#define HID_SD_CHGFOIL_NAME "SD_HID_SD_CHGFOIL_NAME"
+
+#define HID_SD_HTMLEXPORT_DLG_DNAME "SD_HID_SD_HTMLEXPORT_DLG_DNAME"
+
+#define HID_FM_CTL_SELECTION "SD_HID_FM_CTL_SELECTION"
+
+#define HID_SD_AUTOPILOT_REGION "SD_HID_SD_AUTOPILOT_REGION"
+#define HID_SD_AUTOPILOT_TEMPLATES "SD_HID_SD_AUTOPILOT_TEMPLATES"
+#define HID_SD_AUTOPILOT_OPEN "SD_HID_SD_AUTOPILOT_OPEN"
+#define HID_SD_AUTOPILOT_PAGETEMPLATES "SD_HID_SD_AUTOPILOT_PAGETEMPLATES"
+
+#define HID_SD_DRAW_GRAF_TOOLBOX "SD_HID_SD_DRAW_GRAF_TOOLBOX"
+
+#define HID_SD_FW_GRAFFILTERS "SD_HID_SD_FW_GRAFFILTERS"
+
+#define HID_SD_TABBAR_PAGES "SD_HID_SD_TABBAR_PAGES"
+#define HID_SD_TABBAR_LAYERS "SD_HID_SD_TABBAR_LAYERS"
+
+#define HID_SD_UNDODELETEWARNING_DLG "SD_HID_SD_UNDODELETEWARNING_DLG"
+#define HID_SD_UNDODELETEWARNING_CBX "SD_HID_SD_UNDODELETEWARNING_CBX"
+
+#define HID_SD_PAGEOBJSTLB "SD_HID_SD_PAGEOBJSTLB"
+
+#define HID_SD_NAMEDIALOG_OBJECT "SD_HID_SD_NAMEDIALOG_OBJECT"
+#define HID_SD_NAMEDIALOG_PAGE "SD_HID_SD_NAMEDIALOG_PAGE"
+#define HID_SD_NAMEDIALOG_LINEEND "SD_HID_SD_NAMEDIALOG_LINEEND"
+
+#define HID_SD_DRAW_3D_TOOLBOX "SD_HID_SD_DRAW_3D_TOOLBOX"
+#define HID_SD_DRAW_FONTWORK_TOOLBOX "SD_HID_SD_DRAW_FONTWORK_TOOLBOX"
+
+#define HID_SD_TABPAGE_HEADERFOOTER_SLIDE "SD_HID_SD_TABPAGE_HEADERFOOTER_SLIDE"
+#define HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT "SD_HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT"
+
+#define HID_SD_DRAW_MEDIA_TOOLBOX "SD_HID_SD_DRAW_MEDIA_TOOLBOX"
+
+#define HID_SD_TASK_PANE "SD_HID_SD_TASK_PANE"
+#define HID_SD_SLIDE_DESIGNS "SD_HID_SD_SLIDE_DESIGNS"
+#define HID_SD_CURRENT_MASTERS "SD_HID_SD_CURRENT_MASTERS"
+#define HID_SD_RECENT_MASTERS "SD_HID_SD_RECENT_MASTERS"
+#define HID_SD_ALL_MASTERS "SD_HID_SD_ALL_MASTERS"
+#define HID_SD_SLIDE_LAYOUTS "SD_HID_SD_SLIDE_LAYOUTS"
+#define HID_SD_CUSTOM_ANIMATIONS "SD_HID_SD_CUSTOM_ANIMATIONS"
+#define HID_SD_SLIDE_TRANSITIONS "SD_HID_SD_SLIDE_TRANSITIONS"
+
+#define HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT "SD_HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT"
+#define HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT "SD_HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT"
+#define HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT "SD_HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT"
+#define HID_SD_CUSTOMANIMATIONPANE_LB_START "SD_HID_SD_CUSTOMANIMATIONPANE_LB_START"
+#define HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY "SD_HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY"
+#define HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE "SD_HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE"
+#define HID_SD_CUSTOMANIMATIONPANE_CB_SPEED "SD_HID_SD_CUSTOMANIMATIONPANE_CB_SPEED"
+#define HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST "SD_HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST"
+#define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP "SD_HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP"
+#define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN "SD_HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN"
+#define HID_SD_CUSTOMANIMATIONPANE_PB_PLAY "SD_HID_SD_CUSTOMANIMATIONPANE_PB_PLAY"
+#define HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW "SD_HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW"
+#define HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW "SD_HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW"
+
+#define HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES "SD_HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES"
+#define HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL"
+#define HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY"
+#define HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW"
+#define HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW "SD_HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW"
+
+#define HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS "SD_HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS"
+#define HID_SD_SLIDETRANSITIONPANE_LB_SPEED "SD_HID_SD_SLIDETRANSITIONPANE_LB_SPEED"
+#define HID_SD_SLIDETRANSITIONPANE_LB_SOUND "SD_HID_SD_SLIDETRANSITIONPANE_LB_SOUND"
+#define HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND "SD_HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND"
+#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE "SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE"
+#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO "SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO"
+#define HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER "SD_HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER"
+#define HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL "SD_HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL"
+#define HID_SD_SLIDETRANSITIONPANE_PB_PLAY "SD_HID_SD_SLIDETRANSITIONPANE_PB_PLAY"
+#define HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW "SD_HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW"
+#define HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW "SD_HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW"
+
+#define HID_SD_TASK_PANE_VIEW_MENU "SD_HID_SD_TASK_PANE_VIEW_MENU"
+#define HID_SD_TASK_PANE_PREVIEW_CURRENT "SD_HID_SD_TASK_PANE_PREVIEW_CURRENT"
+#define HID_SD_TASK_PANE_PREVIEW_RECENT "SD_HID_SD_TASK_PANE_PREVIEW_RECENT"
+#define HID_SD_TASK_PANE_PREVIEW_ALL "SD_HID_SD_TASK_PANE_PREVIEW_ALL"
+#define HID_SD_TASK_PANE_PREVIEW_LAYOUTS "SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS"
+
+#define HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE "SD_HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE"
+#define HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS "SD_HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS"
+#define HID_SD_CUSTOMANIMATIONDIALOG_EXIT "SD_HID_SD_CUSTOMANIMATIONDIALOG_EXIT"
+#define HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH "SD_HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH"
+#define HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS "SD_HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS"
+
+#define HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX"
+#define HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX"
+#define HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX"
+#define HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX"
+#define HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX"
+#define HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX"
+#define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX"
+#define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX"
+
+#define HID_SD_SLIDESHOW_DISPLAY "SD_HID_SD_SLIDESHOW_DISPLAY"
+
+#define HID_SD_RULER_HORIZONTAL "SD_HID_SD_RULER_HORIZONTAL"
+#define HID_SD_RULER_VERTICAL "SD_HID_SD_RULER_VERTICAL"
+
+#define HID_SD_TABLE_DESIGN "SD_HID_SD_TABLE_DESIGN"
+#define HID_SD_ANNOTATIONS "SD_HID_SD_ANNOTATIONS"
+
+#define HID_DLG_INSERT_PAGES_OBJS "SD_HID_DLG_INSERT_PAGES_OBJS"
+#define HID_TABPAGE_PARA_NUMBERING "SD_HID_TABPAGE_PARA_NUMBERING"
+#define HID_VECTORIZE_DLG "SD_HID_VECTORIZE_DLG"
+#define HID_UNDO_DELETE_WARNING "SD_HID_UNDO_DELETE_WARNING"
+
+#define HID_MN_SUB_GROUP "SD_HID_MN_SUB_GROUP"
+#define HID_MN_SUB_GRAPHIC "SD_HID_MN_SUB_GRAPHIC"
+#define HID_MN_SUB_SEND "SD_HID_MN_SUB_SEND"
+#define HID_MN_SUB_MASTER_LAYOUTS "SD_HID_MN_SUB_MASTER_LAYOUTS"
+#define HID_MN_SUB_VIEW "SD_HID_MN_SUB_VIEW"
+#define HID_MN_SUB_MASTERPAGE "SD_HID_MN_SUB_MASTERPAGE"
+#define HID_MN_SUB_FIELD "SD_HID_MN_SUB_FIELD"
+#define HID_MN_SUB_TEMPLATES "SD_HID_MN_SUB_TEMPLATES"
+#define HID_MN_SUB_SPELLING "SD_HID_MN_SUB_SPELLING"
+#define HID_MN_SUB_POSITION "SD_HID_MN_SUB_POSITION"
+#define HID_MN_SUB_OUTPUT_QUALITY "SD_HID_MN_SUB_OUTPUT_QUALITY"
+#define HID_MN_SUB_PREVIEW_OUTPUT_QUALITY "SD_HID_MN_SUB_PREVIEW_OUTPUT_QUALITY"
+#define HID_MN_SUB_CONVERT "SD_HID_MN_SUB_CONVERT"
+#define HID_MN_SUB_MIRROR "SD_HID_MN_SUB_MIRROR"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 6b3ed86c68f0..8c8f7f0feba6 100644..100755
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -531,7 +531,6 @@
#include "unotools/pathoptions.hxx"
#include "svl/poolitem.hxx"
#include "svtools/prgsbar.hxx"
-#include "svtools/printdlg.hxx"
#include "svl/ptitem.hxx"
#include "svl/rectitem.hxx"
#include "unotools/saveopt.hxx"
@@ -618,7 +617,6 @@
#include "svx/galbrws.hxx"
#include "svx/gallery.hxx"
#include "svx/globl3d.hxx"
-#include "svx/globlac.hrc"
#include "svx/globlmn.hrc"
#include "svx/grafctrl.hxx"
#include "svx/hlnkitem.hxx"
@@ -864,7 +862,7 @@
#include "vcl/group.hxx"
#include "vcl/help.hxx"
#include "vcl/image.hxx"
-#include "vcl/imagebtn.hxx"
+#include "vcl/button.hxx"
#include "vcl/jobset.hxx"
#include "vcl/lineinfo.hxx"
#include "vcl/lstbox.hxx"
@@ -901,7 +899,7 @@
#include "vcl/virdev.hxx"
#include "vcl/waitobj.hxx"
#include "vcl/window.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
#include "vcl/wrkwin.hxx"
#include "osl/diagnose.h"
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 936f0d11dc30..0fb8f600113c 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -81,8 +81,8 @@ public:
class AbstractSdCustomShowDlg : public VclAbstractDialog //add for SdCustomShowDlg
{
public:
- virtual BOOL IsModified() const = 0;
- virtual BOOL IsCustomShow() const = 0;
+ virtual sal_Bool IsModified() const = 0;
+ virtual sal_Bool IsCustomShow() const = 0;
};
class AbstractAssistentDlg : public VclAbstractDialog //add for AssistentDlg
@@ -90,11 +90,11 @@ class AbstractAssistentDlg : public VclAbstractDialog //add for AssistentDlg
public:
virtual SfxObjectShellLock GetDocument() = 0;
virtual OutputType GetOutputMedium() const = 0;
- virtual BOOL IsSummary() const = 0;
+ virtual sal_Bool IsSummary() const = 0;
virtual StartType GetStartType() const = 0;
virtual String GetDocPath() const = 0;
- virtual BOOL GetStartWithFlag() const = 0;
- virtual BOOL IsDocEmpty() const = 0;
+ virtual sal_Bool GetStartWithFlag() const = 0;
+ virtual sal_Bool IsDocEmpty() const = 0;
virtual String GetPassword() = 0;
};
@@ -111,7 +111,7 @@ public:
virtual void GetAttr(SfxItemSet& rOutAttrs) = 0;
virtual void HideRadioGroup() = 0;
virtual void HideDeleteBtn() = 0;
- virtual void SetInputFields(BOOL bEnableX, BOOL bEnableY) = 0;
+ virtual void SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY) = 0;
//from class ::Window
virtual void SetText( const XubString& rStr ) = 0;
};
@@ -121,31 +121,31 @@ class AbstractSdInsertLayerDlg : public VclAbstractDialog //add for SdInsertLay
public:
virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0;
//from class ::Window
- virtual void SetHelpId( ULONG nHelpId ) = 0;
+ virtual void SetHelpId( const rtl::OString& rHelpId ) = 0;
};
class AbstractSdInsertPasteDlg : public VclAbstractDialog //add for SdInsertPasteDlg
{
public:
- virtual BOOL IsInsertBefore() const = 0;
+ virtual sal_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 List* GetList( sal_uInt16 nType ) = 0;
+ virtual sal_Bool IsLink() = 0;
+ virtual sal_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 sal_uInt16 GetFadeSteps() const = 0;
+ virtual sal_Bool IsAttributeFade() const = 0;
+ virtual sal_Bool IsOrientationFade() const = 0;
};
class AbstractSdStartPresDlg : public VclAbstractDialog //add for SdStartPresentationDlg
@@ -186,12 +186,12 @@ class SdAbstractDialogFactory
public:
static SdAbstractDialogFactory* Create();
- virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, ULONG nSumActionCount, ULONG nObjCount ) = 0;
+ virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_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 SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage = sal_True ) = 0;
+ virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, sal_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;
diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx
index 7f055caf633a..3f9b927fd567 100644..100755
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.hxx
@@ -79,7 +79,7 @@ public:
class SdAttrLayerVisible : public SfxBoolItem
{
public:
- SdAttrLayerVisible( BOOL bValue = TRUE ) :
+ SdAttrLayerVisible( sal_Bool bValue = sal_True ) :
SfxBoolItem( ATTR_LAYER_VISIBLE, bValue ) {}
};
@@ -88,7 +88,7 @@ public:
class SdAttrLayerPrintable : public SfxBoolItem
{
public:
- SdAttrLayerPrintable( BOOL bValue = TRUE ) :
+ SdAttrLayerPrintable( sal_Bool bValue = sal_True ) :
SfxBoolItem( ATTR_LAYER_PRINTABLE, bValue ) {}
};
@@ -97,7 +97,7 @@ public:
class SdAttrLayerLocked : public SfxBoolItem
{
public:
- SdAttrLayerLocked( BOOL bValue = FALSE ) :
+ SdAttrLayerLocked( sal_Bool bValue = sal_False ) :
SfxBoolItem( ATTR_LAYER_LOCKED, bValue ) {}
};
@@ -106,7 +106,7 @@ public:
class SdAttrLayerThisPage : public SfxBoolItem
{
public:
- SdAttrLayerThisPage( BOOL bValue = FALSE ) :
+ SdAttrLayerThisPage( sal_Bool bValue = sal_False ) :
SfxBoolItem( ATTR_LAYER_THISPAGE, bValue ) {}
};
@@ -120,8 +120,8 @@ public:
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; }
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
+ sal_uInt16 GetValueCount() const { return FADE_EFFECT_COUNT; }
::com::sun::star::presentation::FadeEffect GetValue() const
{ return (::com::sun::star::presentation::FadeEffect) SfxEnumItem::GetValue(); }
};
@@ -136,8 +136,8 @@ public:
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; }
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
+ sal_uInt16 GetValueCount() const { return FADE_SPEED_COUNT; }
FadeSpeed GetValue() const
{ return (FadeSpeed) SfxEnumItem::GetValue(); }
};
@@ -152,8 +152,8 @@ public:
DiaAutoItem( SvStream& rIn );
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
- USHORT GetValueCount() const { return PRESCHANGE_COUNT; }
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
+ sal_uInt16 GetValueCount() const { return PRESCHANGE_COUNT; }
PresChange GetValue() const { return (PresChange) SfxEnumItem::GetValue(); }
};
@@ -163,7 +163,7 @@ class DiaTimeItem : public SfxUInt32Item
{
public:
TYPEINFO();
- DiaTimeItem( UINT32 nValue = 0L );
+ DiaTimeItem( sal_uInt32 nValue = 0L );
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual int operator==( const SfxPoolItem& ) const;
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
new file mode 100644
index 000000000000..d0c1c059cdbe
--- /dev/null
+++ b/sd/inc/sdcommands.h
@@ -0,0 +1,310 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef SD_SDCOMMANDS_HRC
+#define SD_SDCOMMANDS_HRC
+
+#define CMD_SID_OBJECT_MIRROR ".uno:Mirror"
+#define CMD_SID_OBJECT_CHOOSE_MODE ".uno:AdvancedMode"
+#define CMD_SID_ANIMATION_EFFECTS ".uno:AnimationEffects"
+#define CMD_SID_ANIMATION_OBJECTS ".uno:AnimationObjects"
+#define CMD_SID_ANIMATOR_ADD ".uno:AnimatorAddObject"
+#define CMD_SID_ANIMATOR_CREATE ".uno:AnimatorCreateObject"
+#define CMD_SID_ANIMATOR_INIT ".uno:AnimatorInit"
+#define CMD_SID_ANIMATOR_STATE ".uno:AnimatorState"
+#define CMD_SID_DRAWTBX_ARROWS ".uno:ArrowsToolbox"
+#define CMD_SID_MOREBACK ".uno:Backward"
+#define CMD_SID_BEFORE_OBJ ".uno:BeforeObject"
+#define CMD_SID_BEHIND_OBJ ".uno:BehindObject"
+#define CMD_SID_BIG_HANDLES ".uno:BigHandles"
+#define CMD_SID_BREAK ".uno:Break"
+#define CMD_SID_CAPTUREPOINT ".uno:CapturePoint"
+#define CMD_SID_CHANGEBEZIER ".uno:ChangeBezier"
+#define CMD_SID_CHANGEPOLYGON ".uno:ChangePolygon"
+#define CMD_SID_CLICK_CHANGE_ROTATION ".uno:ClickChangeRotation"
+#define CMD_SID_OBJECT_CLOSE ".uno:CloseObject"
+#define CMD_SID_COLORVIEW ".uno:ColorView"
+#define CMD_SID_COMBINE ".uno:Combine"
+#define CMD_SID_3D_CONE ".uno:Cone"
+#define CMD_SID_CONNECT ".uno:Connect"
+#define CMD_SID_TOOL_CONNECTOR ".uno:Connector"
+#define CMD_SID_CONNECTOR_ARROW_END ".uno:ConnectorArrowEnd"
+#define CMD_SID_CONNECTOR_ARROWS ".uno:ConnectorArrows"
+#define CMD_SID_CONNECTOR_ARROW_START ".uno:ConnectorArrowStart"
+#define CMD_SID_CONNECTION_DLG ".uno:ConnectorAttributes"
+#define CMD_SID_CONNECTOR_CIRCLE_END ".uno:ConnectorCircleEnd"
+#define CMD_SID_CONNECTOR_CIRCLES ".uno:ConnectorCircles"
+#define CMD_SID_CONNECTOR_CIRCLE_START ".uno:ConnectorCircleStart"
+#define CMD_SID_CONNECTOR_CURVE ".uno:ConnectorCurve"
+#define CMD_SID_CONNECTOR_CURVE_ARROW_END ".uno:ConnectorCurveArrowEnd"
+#define CMD_SID_CONNECTOR_CURVE_ARROWS ".uno:ConnectorCurveArrows"
+#define CMD_SID_CONNECTOR_CURVE_ARROW_START ".uno:ConnectorCurveArrowStart"
+#define CMD_SID_CONNECTOR_CURVE_CIRCLE_END ".uno:ConnectorCurveCircleEnd"
+#define CMD_SID_CONNECTOR_CURVE_CIRCLES ".uno:ConnectorCurveCircles"
+#define CMD_SID_CONNECTOR_CURVE_CIRCLE_START ".uno:ConnectorCurveCircleStart"
+#define CMD_SID_CONNECTOR_LINE ".uno:ConnectorLine"
+#define CMD_SID_CONNECTOR_LINE_ARROW_END ".uno:ConnectorLineArrowEnd"
+#define CMD_SID_CONNECTOR_LINE_ARROWS ".uno:ConnectorLineArrows"
+#define CMD_SID_CONNECTOR_LINE_ARROW_START ".uno:ConnectorLineArrowStart"
+#define CMD_SID_CONNECTOR_LINE_CIRCLE_END ".uno:ConnectorLineCircleEnd"
+#define CMD_SID_CONNECTOR_LINE_CIRCLES ".uno:ConnectorLineCircles"
+#define CMD_SID_CONNECTOR_LINE_CIRCLE_START ".uno:ConnectorLineCircleStart"
+#define CMD_SID_CONNECTOR_LINES ".uno:ConnectorLines"
+#define CMD_SID_CONNECTOR_LINES_ARROW_END ".uno:ConnectorLinesArrowEnd"
+#define CMD_SID_CONNECTOR_LINES_ARROWS ".uno:ConnectorLinesArrows"
+#define CMD_SID_CONNECTOR_LINES_ARROW_START ".uno:ConnectorLinesArrowStart"
+#define CMD_SID_CONNECTOR_LINES_CIRCLE_END ".uno:ConnectorLinesCircleEnd"
+#define CMD_SID_CONNECTOR_LINES_CIRCLES ".uno:ConnectorLinesCircles"
+#define CMD_SID_CONNECTOR_LINES_CIRCLE_START ".uno:ConnectorLinesCircleStart"
+#define CMD_SID_DRAWTBX_CONNECTORS ".uno:ConnectorToolbox"
+#define CMD_SID_CONVERT_TO_CONTOUR ".uno:convert_to_contour"
+#define CMD_SID_CONVERT_TO_3D ".uno:ConvertInto3D"
+#define CMD_SID_CONVERT_TO_3D_LATHE ".uno:ConvertInto3DLathe"
+#define CMD_SID_CONVERT_TO_3D_LATHE_FAST ".uno:ConvertInto3DLatheFast"
+#define CMD_SID_CONVERT_TO_BITMAP ".uno:ConvertIntoBitmap"
+#define CMD_SID_CONVERT_TO_METAFILE ".uno:ConvertIntoMetaFile"
+#define CMD_SID_CONVERT_TO_1BIT_MATRIX ".uno:ConvertTo1BitMatrix"
+#define CMD_SID_CONVERT_TO_1BIT_THRESHOLD ".uno:ConvertTo1BitThreshold"
+#define CMD_SID_CONVERT_TO_4BIT_COLORS ".uno:ConvertTo4BitColors"
+#define CMD_SID_CONVERT_TO_4BIT_GRAYS ".uno:ConvertTo4BitGrays"
+#define CMD_SID_CONVERT_TO_8BIT_COLORS ".uno:ConvertTo8BitColors"
+#define CMD_SID_CONVERT_TO_8BIT_GRAYS ".uno:ConvertTo8BitGrays"
+#define CMD_SID_CONVERT_TO_24BIT ".uno:ConvertToTrueColor"
+#define CMD_SID_COPYOBJECTS ".uno:CopyObjects"
+#define CMD_SID_OBJECT_CROOK_ROTATE ".uno:CrookRotate"
+#define CMD_SID_OBJECT_CROOK_SLANT ".uno:CrookSlant"
+#define CMD_SID_OBJECT_CROOK_STRETCH ".uno:CrookStretch"
+#define CMD_SID_3D_CUBE ".uno:Cube"
+#define CMD_SID_CUSTOMSHOW_DLG ".uno:CustomShowDialog"
+#define CMD_SID_3D_CYLINDER ".uno:Cylinder"
+#define CMD_SID_3D_PYRAMID ".uno:Cyramid"
+#define CMD_SID_DELETE_LAYER ".uno:DeleteLayer"
+#define CMD_SID_DELETE_PAGE ".uno:DeletePage"
+#define CMD_SID_DELETE_SNAPITEM ".uno:DeleteSnapItem"
+#define CMD_SID_UNSELECT ".uno:DeSelect"
+#define CMD_SID_DIAMODE ".uno:DiaMode"
+#define CMD_SID_DISMANTLE ".uno:Dismantle"
+#define CMD_SID_DOUBLECLICK_TEXTEDIT ".uno:DoubleClickTextEdit"
+#define CMD_SID_DRAWINGMODE ".uno:DrawingMode"
+#define CMD_SID_DUPLICATE_PAGE ".uno:DuplicatePage"
+#define CMD_SID_EDIT_HYPERLINK ".uno:EditHyperlink"
+#define CMD_SID_EDIT_OUTLINER ".uno:EditOutline"
+#define CMD_SID_CUSTOM_ANIMATION_PANEL ".uno:CustomAnimation"
+#define CMD_SID_CUSTOM_ANIMATION_SCHEMES_PANEL ".uno:CustomAnimationSchemes"
+#define CMD_SID_DRAWTBX_ELLIPSES ".uno:EllipseToolbox"
+#define CMD_SID_EXPAND_PAGE ".uno:ExpandPage"
+#define CMD_SID_SETFILLCOLOR ".uno:SetFillColor"
+#define CMD_SID_MOREFRONT ".uno:Forward"
+#define CMD_SID_GETBLUE ".uno:GetBlue"
+#define CMD_SID_GETFILLSTYLE ".uno:GetFillStyle"
+#define CMD_SID_GETGREEN ".uno:GetGreen"
+#define CMD_SID_GETLINESTYLE ".uno:GetLineStyle"
+#define CMD_SID_GETLINEWIDTH ".uno:GetLineWidth"
+#define CMD_SID_GETRED ".uno:GetRed"
+#define CMD_SID_GLUE_EDITMODE ".uno:GlueEditMode"
+#define CMD_SID_GLUE_ESCDIR ".uno:GlueEscapeDirection"
+#define CMD_SID_GLUE_ESCDIR_BOTTOM ".uno:GlueEscapeDirectionBottom"
+#define CMD_SID_GLUE_ESCDIR_LEFT ".uno:GlueEscapeDirectionLeft"
+#define CMD_SID_GLUE_ESCDIR_RIGHT ".uno:GlueEscapeDirectionRight"
+#define CMD_SID_GLUE_ESCDIR_TOP ".uno:GlueEscapeDirectionTop"
+#define CMD_SID_GLUE_HORZALIGN_CENTER ".uno:GlueHorzAlignCenter"
+#define CMD_SID_GLUE_HORZALIGN_LEFT ".uno:GlueHorzAlignLeft"
+#define CMD_SID_GLUE_HORZALIGN_RIGHT ".uno:GlueHorzAlignRight"
+#define CMD_SID_GLUE_INSERT_POINT ".uno:GlueInsertPoint"
+#define CMD_SID_GLUE_PERCENT ".uno:GluePercent"
+#define CMD_SID_GLUE_VERTALIGN_BOTTOM ".uno:GlueVertAlignBottom"
+#define CMD_SID_GLUE_VERTALIGN_CENTER ".uno:GlueVertAlignCenter"
+#define CMD_SID_GLUE_VERTALIGN_TOP ".uno:GlueVertAlignTop"
+#define CMD_SID_GRADIENT ".uno:Gradient"
+#define CMD_SID_SETGRADENDCOLOR ".uno:GradientEndColor"
+#define CMD_SID_SETGRADSTARTCOLOR ".uno:GradientStartColor"
+#define CMD_SID_GRAPHIC_EXPORT ".uno:GraphicExport"
+#define CMD_SID_GRID_FRONT ".uno:GridFront"
+#define CMD_SID_3D_HALF_SPHERE ".uno:HalfSphere"
+#define CMD_SID_HANDLES_DRAFT ".uno:HandlesDraft"
+#define CMD_SID_HANDOUT_MASTERPAGE ".uno:HandoutMasterPage"
+#define CMD_SID_HANDOUTMODE ".uno:HandoutMode"
+#define CMD_SID_HATCH ".uno:Hatch"
+#define CMD_SID_SETHATCHCOLOR ".uno:HatchColor"
+#define CMD_SID_HELPLINES_FRONT ".uno:HelplinesFront"
+#define CMD_SID_HELPLINES_USE ".uno:HelplinesUse"
+#define CMD_SID_HELPLINES_VISIBLE ".uno:HelplinesVisible"
+#define CMD_SID_HIDE_SLIDE ".uno:HideSlide"
+#define CMD_SID_SHOW_SLIDE ".uno:ShowSlide"
+#define CMD_SID_HYPHENATION ".uno:Hyphenation"
+#define CMD_SID_INSERTFILE ".uno:ImportFromFile"
+#define CMD_SID_INSERT_FLD_AUTHOR ".uno:InsertAuthorField"
+#define CMD_SID_INSERT_FLD_DATE_FIX ".uno:InsertDateFieldFix"
+#define CMD_SID_INSERT_FLD_DATE_VAR ".uno:InsertDateFieldVar"
+#define CMD_SID_INSERT_FLD_FILE ".uno:InsertFileField"
+#define CMD_SID_INSERTLAYER ".uno:InsertLayer"
+#define CMD_SID_INSERTPAGE ".uno:InsertPage"
+#define CMD_SID_INSERT_FLD_PAGE ".uno:InsertPageField"
+#define CMD_SID_INSERT_FLD_PAGES ".uno:InsertPagesField"
+#define CMD_SID_INSERTPAGE_QUICK ".uno:InsertPageQuick"
+#define CMD_SID_INSERT_FLD_TIME_FIX ".uno:InsertTimeFieldFix"
+#define CMD_SID_INSERT_FLD_TIME_VAR ".uno:InsertTimeFieldVar"
+#define CMD_SID_DRAWTBX_INSERT ".uno:InsertToolbox"
+#define CMD_SID_OBJECT_GRADIENT ".uno:InteractiveGradient"
+#define CMD_SID_OBJECT_TRANSPARENCE ".uno:InteractiveTransparence"
+#define CMD_SID_LAYERMODE ".uno:LayerMode"
+#define CMD_SID_STATUS_LAYOUT ".uno:LayoutStatus"
+#define CMD_SID_LEAVE_ALL_GROUPS ".uno:LeaveAllGroups"
+#define CMD_SID_LINE_ARROW_CIRCLE ".uno:LineArrowCircle"
+#define CMD_SID_LINE_ARROW_END ".uno:LineArrowEnd"
+#define CMD_SID_LINE_ARROWS ".uno:LineArrows"
+#define CMD_SID_LINE_ARROW_SQUARE ".uno:LineArrowSquare"
+#define CMD_SID_LINE_ARROW_START ".uno:LineArrowStart"
+#define CMD_SID_LINE_CIRCLE_ARROW ".uno:LineCircleArrow"
+#define CMD_SID_SETLINECOLOR ".uno:LineColor"
+#define CMD_SID_LINEEND_POLYGON ".uno:LineEndPolygon"
+#define CMD_SID_LINE_SQUARE_ARROW ".uno:LineSquareArrow"
+#define CMD_SID_LINETO ".uno:LineTo"
+#define CMD_SID_DRAWTBX_LINES ".uno:LineToolbox"
+#define CMD_SID_MANAGE_LINKS ".uno:ManageLinks"
+#define CMD_SID_MASTERPAGE ".uno:MasterPage"
+#define CMD_SID_MEASURE_DLG ".uno:MeasureAttributes"
+#define CMD_SID_DRAW_MEASURELINE ".uno:MeasureLine"
+#define CMD_SID_HORIZONTAL ".uno:MirrorHorz"
+#define CMD_SID_VERTICAL ".uno:MirrorVert"
+#define CMD_SID_MODIFY_FIELD ".uno:ModifyField"
+#define CMD_SID_MODIFYLAYER ".uno:ModifyLayer"
+#define CMD_SID_MODIFYPAGE ".uno:ModifyPage"
+#define CMD_SID_ASSIGN_LAYOUT ".uno:AssignLayout"
+#define CMD_SID_PRESENTATIONOBJECT ".uno:ModifyPresentationObject"
+#define CMD_SID_POLYGON_MORPHING ".uno:Morphing"
+#define CMD_SID_MOVETO ".uno:MoveTo"
+#define CMD_SID_NAME_GROUP ".uno:NameGroup"
+#define CMD_SID_OBJECT_TITLE_DESCRIPTION ".uno:ObjectTitleDescription"
+#define CMD_SID_NAVIGATOR_INIT ".uno:NavigatorInit"
+#define CMD_SID_NAVIGATOR_OBJECT ".uno:NavigatorObject"
+#define CMD_SID_NAVIGATOR_PAGE ".uno:NavigatorPage"
+#define CMD_SID_NAVIGATOR_PAGENAME ".uno:NavigatorPageName"
+#define CMD_SID_NAVIGATOR_PEN ".uno:NavigatorPen"
+#define CMD_SID_NAVIGATOR_STATE ".uno:NavigatorState"
+#define CMD_SID_CONNECTION_NEW_ROUTING ".uno:NewRouting"
+#define CMD_SID_NOTES_MASTERPAGE ".uno:NotesMasterPage"
+#define CMD_SID_NOTESMODE ".uno:NotesMode"
+#define CMD_SID_POSITION ".uno:ObjectPosition"
+#define CMD_SID_DRAWTBX_3D_OBJECTS ".uno:Objects3DToolbox"
+#define CMD_SID_ORIGINAL_SIZE ".uno:OriginalSize"
+#define CMD_SID_SAVEGRAPHIC ".uno:SaveGraphic"
+#define CMD_SID_OUTLINEMODE ".uno:OutlineMode"
+#define CMD_SID_OUTPUT_QUALITY_BLACKWHITE ".uno:OutputQualityBlackWhite"
+#define CMD_SID_OUTPUT_QUALITY_COLOR ".uno:OutputQualityColor"
+#define CMD_SID_OUTPUT_QUALITY_CONTRAST ".uno:OutputQualityContrast"
+#define CMD_SID_OUTPUT_QUALITY_GRAYSCALE ".uno:OutputQualityGrayscale"
+#define CMD_SID_PACKNGO ".uno:PackAndGo"
+#define CMD_SID_PAGEMARGIN ".uno:PageMargin"
+#define CMD_SID_PAGEMODE ".uno:PageMode"
+#define CMD_SID_PAGESETUP ".uno:PageSetup"
+#define CMD_SID_PAGESIZE ".uno:PageSize"
+#define CMD_SID_PAGES_PER_ROW ".uno:PagesPerRow"
+#define CMD_SID_STATUS_PAGE ".uno:PageStatus"
+#define CMD_SID_PARASPACE_DECREASE ".uno:ParaspaceDecrease"
+#define CMD_SID_PARASPACE_INCREASE ".uno:ParaspaceIncrease"
+#define CMD_SID_PICK_THROUGH ".uno:PickThrough"
+#define CMD_SID_DRAW_POLYGON ".uno:Polygon"
+#define CMD_SID_PRESENTATION ".uno:Presentation"
+#define CMD_SID_PRESENTATION_DLG ".uno:PresentationDialog"
+#define CMD_SID_PRESENTATION_END ".uno:PresentationEnd"
+#define CMD_SID_CLEAR_UNDO_STACK ".uno:ClearUndoStack"
+#define CMD_SID_PRESENTATION_LAYOUT ".uno:PresentationLayout"
+#define CMD_SID_PREVIEW_STATE ".uno:PreviewState"
+#define CMD_SID_PREVIEW_WIN ".uno:PreviewWindow"
+#define CMD_SID_QUICKEDIT ".uno:QuickEdit"
+#define CMD_SID_DRAWTBX_RECTANGLES ".uno:RectangleToolbox"
+#define CMD_SID_REHEARSE_TIMINGS ".uno:RehearseTimings"
+#define CMD_SID_RENAMELAYER ".uno:RenameLayer"
+#define CMD_SID_RENAMEPAGE ".uno:RenamePage"
+#define CMD_SID_RENAMEPAGE_QUICK ".uno:RenamePageQuick"
+#define CMD_SID_REVERSE_ORDER ".uno:ReverseOrder"
+#define CMD_SID_RULER_OBJECT ".uno:RulerObject"
+#define CMD_SID_SELECTAT ".uno:SelectAt"
+#define CMD_SID_SELECTGRADIENT ".uno:SelectGradient"
+#define CMD_SID_SELECTHATCH ".uno:SelectHatch"
+#define CMD_SID_SETFILLSTYLE ".uno:SetFillStyle"
+#define CMD_SID_SETLINESTYLE ".uno:SetLineStyle"
+#define CMD_SID_SETLINEWIDTH ".uno:SetLineWidth"
+#define CMD_SID_SET_SNAPITEM ".uno:SetSnapItem"
+#define CMD_SID_OBJECT_SHEAR ".uno:Shear"
+#define CMD_SID_3D_SHELL ".uno:Shell3D"
+#define CMD_SID_SLIDE_TRANSITIONS_PANEL ".uno:SlideChangeWindow"
+#define CMD_SID_SLIDE_MASTERPAGE ".uno:SlideMasterPage"
+#define CMD_SID_SNAP_BORDER ".uno:SnapBorder"
+#define CMD_SID_SNAP_FRAME ".uno:SnapFrame"
+#define CMD_SID_SNAP_POINTS ".uno:SnapPoints"
+#define CMD_SID_SOLID_CREATE ".uno:SolidCreate"
+#define CMD_SID_3D_SPHERE ".uno:Sphere"
+#define CMD_SID_STARTAPP ".uno:StartApplication"
+#define CMD_SID_SUMMARY_PAGE ".uno:SummaryPage"
+#define CMD_SID_SWITCHLAYER ".uno:SwitchLayer"
+#define CMD_SID_SWITCHPAGE ".uno:SwitchPage"
+#define CMD_SID_SWITCH_POINTEDIT ".uno:SwitchPointEdit"
+#define CMD_SID_TEXTALIGNMENT ".uno:TextAlignment"
+#define CMD_SID_TEXTATTR_DLG ".uno:TextAttributes"
+#define CMD_SID_TEXT_FITTOSIZE ".uno:TextFitToSizeTool"
+#define CMD_SID_DRAWTBX_TEXT ".uno:TextToolbox"
+#define CMD_SID_TITLE_MASTERPAGE ".uno:TitleMasterPage"
+#define CMD_SID_3D_TORUS ".uno:Torus"
+#define CMD_SID_TEXT_FITTOSIZE_VERTICAL ".uno:VerticalTextFitToSizeTool"
+#define CMD_SID_ZOOM_PANNING ".uno:ZoomPanning"
+#define CMD_SID_OBJECT_CROP ".uno:Crop"
+#define CMD_SID_HEADER_AND_FOOTER ".uno:HeaderAndFooter"
+#define CMD_SID_INSERT_PAGE_NUMBER ".uno:InsertPageNumber"
+#define CMD_SID_INSERT_DATE_TIME ".uno:InsertDateAndTime"
+#define CMD_SID_MASTER_LAYOUTS ".uno:MasterLayouts"
+#define CMD_SID_DRAW_FONTWORK ".uno:DrawFontwork"
+#define CMD_SID_DRAW_FONTWORK_VERTICAL ".uno:DrawFontworkVertical"
+#define CMD_SID_LAYER_DIALOG_WIN ".uno:LayerDialogChildWindow"
+#define CMD_SID_INSERT_MASTER_PAGE ".uno:InsertMasterPage"
+#define CMD_SID_DELETE_MASTER_PAGE ".uno:DeleteMasterPage"
+#define CMD_SID_RENAME_MASTER_PAGE ".uno:RenameMasterPage"
+#define CMD_SID_CLOSE_MASTER_VIEW ".uno:CloseMasterView"
+#define CMD_SID_SELECT_BACKGROUND ".uno:SelectBackground"
+#define CMD_SID_DISPLAY_MASTER_BACKGROUND ".uno:DisplayMasterBackground"
+#define CMD_SID_DISPLAY_MASTER_OBJECTS ".uno:DisplayMasterObjects"
+#define CMD_SID_TABLE_TOOLBOX ".uno:TableToolBox"
+#define CMD_SID_TABLE_DISTRIBUTE_COLUMNS ".uno:DistributeColumns"
+#define CMD_SID_TABLE_DISTRIBUTE_ROWS ".uno:DistributeRows"
+#define CMD_SID_TP_APPLY_TO_ALL_SLIDES ".uno:TaskPaneApplyToAllSlides"
+#define CMD_SID_TP_APPLY_TO_SELECTED_SLIDES ".uno:TaskPaneApplyToSelectedSlides"
+#define CMD_SID_TP_USE_FOR_NEW_PRESENTATIONS ".uno:TaskPaneUseForNewPresentations"
+#define CMD_SID_TP_SHOW_SMALL_PREVIEW ".uno:TaskPaneShowSmallPreview"
+#define CMD_SID_TP_SHOW_LARGE_PREVIEW ".uno:TaskPaneShowLargePreview"
+#define CMD_SID_TP_EDIT_MASTER ".uno:TaskPaneEditMaster"
+#define CMD_SID_INSERTPAGE_LAYOUT_MENU ".uno:TaskPaneInsertPage"
+#define CMD_SID_SWITCH_SHELL ".uno:SwitchViewShell"
+#define CMD_SID_SWITCH_SHELL_PANE ".uno:SwitchViewShellPane"
+#define CMD_SID_LEFT_PANE_IMPRESS ".uno:LeftPaneImpress"
+#define CMD_SID_LEFT_PANE_DRAW ".uno:LeftPaneDraw"
+#define CMD_SID_RIGHT_PANE ".uno:RightPane"
+#define CMD_SID_NOTES_WINDOW ".uno:NotesChildWindow"
+#define CMD_SID_NORMAL_MULTI_PANE_GUI ".uno:NormalMultiPaneGUI"
+#define CMD_SID_SLIDE_SORTER_MULTI_PANE_GUI ".uno:SlideSorterMultiPaneGUI"
+#define CMD_SID_TASK_PANE ".uno:TaskPaneShowPanel"
+
+#endif
diff --git a/sd/inc/sderror.hxx b/sd/inc/sderror.hxx
index 1eb815eef6e1..e98f419b73b6 100644..100755
--- a/sd/inc/sderror.hxx
+++ b/sd/inc/sderror.hxx
@@ -50,12 +50,12 @@
#ifndef __RSC
-inline bool IsWarning( ULONG nErr )
+inline bool IsWarning( sal_uLong nErr )
{
return 0 != ( nErr & ERRCODE_WARNING_MASK & nErr );
}
-inline bool IsError( ULONG nErr )
+inline bool IsError( sal_uLong nErr )
{
return nErr && 0 == ( ERRCODE_WARNING_MASK & nErr );
}
diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx
index 83d4eae50800..d9c0446cc98e 100644..100755
--- a/sd/inc/sdgrffilter.hxx
+++ b/sd/inc/sdgrffilter.hxx
@@ -51,7 +51,7 @@ public:
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 HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong nStreamError = ERRCODE_NONE );
};
#endif // _SD_SDGRFFILTER_HXX
diff --git a/sd/inc/sdhtmlfilter.hxx b/sd/inc/sdhtmlfilter.hxx
index 28f8df649a10..e2c52c1655d6 100644..100755
--- a/sd/inc/sdhtmlfilter.hxx
+++ b/sd/inc/sdhtmlfilter.hxx
@@ -48,7 +48,7 @@ public:
virtual sal_Bool Export();
private:
- DECL_LINK( IOProgressHdl, USHORT* );
+ DECL_LINK( IOProgressHdl, sal_uInt16* );
};
diff --git a/sd/inc/sdiocmpt.hxx b/sd/inc/sdiocmpt.hxx
index 36fd3eb8e39b..7c25924ff009 100644..100755
--- a/sd/inc/sdiocmpt.hxx
+++ b/sd/inc/sdiocmpt.hxx
@@ -38,17 +38,17 @@ class old_SdrDownCompat
{
protected:
SvStream& rStream;
- UINT32 nSubRecSiz;
- UINT32 nSubRecPos;
- UINT16 nMode;
- BOOL bOpen;
+ sal_uInt32 nSubRecSiz;
+ sal_uInt32 nSubRecPos;
+ sal_uInt16 nMode;
+ sal_Bool bOpen;
protected:
void Read();
void Write();
public:
- old_SdrDownCompat(SvStream& rNewStream, UINT16 nNewMode);
+ old_SdrDownCompat(SvStream& rNewStream, sal_uInt16 nNewMode);
~old_SdrDownCompat();
void OpenSubRecord();
void CloseSubRecord();
@@ -56,20 +56,20 @@ public:
//////////////////////////////////////////////////////////////////////////////
#include "sddllapi.h"
-#define SDIOCOMPAT_VERSIONDONTKNOW (UINT16)0xffff
+#define SDIOCOMPAT_VERSIONDONTKNOW (sal_uInt16)0xffff
class SD_DLLPUBLIC SdIOCompat : public old_SdrDownCompat
{
private:
- UINT16 nVersion;
+ sal_uInt16 nVersion;
public:
// nNewMode: STREAM_READ oder STREAM_WRITE
// nVer: nur beim Schreiben angeben
- SdIOCompat(SvStream& rNewStream, USHORT nNewMode,
- UINT16 nVer = SDIOCOMPAT_VERSIONDONTKNOW);
+ SdIOCompat(SvStream& rNewStream, sal_uInt16 nNewMode,
+ sal_uInt16 nVer = SDIOCOMPAT_VERSIONDONTKNOW);
~SdIOCompat();
- UINT16 GetVersion() const { return nVersion; }
+ sal_uInt16 GetVersion() const { return nVersion; }
};
#endif // _SD_SDIOCMPT_HXX
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 29aad772d6c3..f133e9320317 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -115,13 +115,11 @@ public:
void Execute(SfxRequest& rReq);
void GetState(SfxItemSet&);
- virtual void FillStatusBar(StatusBar& rBar);
-
SdOptions* GetSdOptions(DocumentType eDocType);
SD_DLLPUBLIC SvStorageStreamRef GetOptionStream( const String& rOptionName, SdOptionStreamMode eMode );
- BOOL GetWaterCan() const { return bWaterCan; }
- void SetWaterCan( BOOL bWC ) { bWaterCan = bWC; }
+ sal_Bool GetWaterCan() const { return bWaterCan; }
+ void SetWaterCan( sal_Bool bWC ) { bWaterCan = bWC; }
SvxSearchItem* GetSearchItem() { return (pSearchItem); }
void SetSearchItem(SvxSearchItem* pItem) { pSearchItem = pItem; }
@@ -143,9 +141,9 @@ public:
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( sal_uInt16 nId );
+ virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
+ virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet );
protected:
@@ -154,8 +152,8 @@ protected:
SvxSearchItem* pSearchItem;
SvNumberFormatter* pNumberFormatter;
SvStorageRef xOptionStorage;
- BOOL bAutoSave;
- BOOL bWaterCan;
+ sal_Bool bAutoSave;
+ sal_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
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index a8ae44b9b524..68431d0c82d4 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -126,12 +126,12 @@ protected:
AutoLayout meAutoLayout; // AutoLayout
sd::ShapeList maPresentationShapeList; // Praesentationsobjekte
sd::ScopeLock maLockAutoLayoutArrangement;
- BOOL mbSelected; // Selektionskennung
+ sal_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)
+ sal_uInt32 mnTime; // Anzeigedauer in Sekunden
+ sal_Bool mbSoundOn; // mit/ohne Sound (sal_True/sal_False)
+ sal_Bool mbExcluded; // wird in der Show nicht/doch
+ // angezeigt (sal_True/sal_False)
String maLayoutName; // Name des Layouts
String maSoundFile; // Pfad zum Soundfile (MSDOS-Notation)
bool mbLoopSound;
@@ -139,10 +139,10 @@ protected:
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
+ sal_Bool mbScaleObjects; // Objekte sollen skaliert werden
+ sal_Bool mbBackgroundFullSize; // Hintergrundobjekt auf ganze Seite darstellen
rtl_TextEncoding meCharSet; // Text-Encoding
- USHORT mnPaperBin; // PaperBin
+ sal_uInt16 mnPaperBin; // PaperBin
Orientation meOrientation; // Print-Orientation
SdPageLink* mpPageLink; // PageLink (nur bei gelinkten Seiten)
@@ -172,25 +172,25 @@ protected:
public:
TYPEINFO();
- SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, BOOL bMasterPage=FALSE);
+ SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, sal_Bool bMasterPage=sal_False);
SdPage(const SdPage& rSrcPage);
~SdPage();
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 SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 Lwr);
+ virtual void SetLftBorder(sal_Int32 nBorder);
+ virtual void SetRgtBorder(sal_Int32 nBorder);
+ virtual void SetUppBorder(sal_Int32 nBorder);
+ virtual void SetLwrBorder(sal_Int32 nBorder);
virtual void SetModel(SdrModel* pNewModel);
virtual bool IsReadOnly() const;
sd::ShapeList& GetPresentationShapeList() { return maPresentationShapeList; }
void EnsureMasterPageDefaultBackground();
- SdrObject* CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rectangle& rRect, BOOL bInsert=FALSE);
+ SdrObject* CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const Rectangle& rRect, sal_Bool bInsert=sal_False);
SdrObject* CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert);
SdrObject* GetPresObj(PresObjKind eObjKind, int nIndex = 1, bool bFuzzySearch = false );
PresObjKind GetPresObjKind(SdrObject* pObj) const;
@@ -208,20 +208,20 @@ public:
/** inserts the given SdrObject into the presentation object list */
void InsertPresObj(SdrObject* pObj, PresObjKind eKind );
- void SetAutoLayout(AutoLayout eLayout, BOOL bInit=FALSE, BOOL bCreate=FALSE);
+ void SetAutoLayout(AutoLayout eLayout, sal_Bool bInit=sal_False, sal_Bool bCreate=sal_False);
AutoLayout GetAutoLayout() const { return meAutoLayout; }
- void CreateTitleAndLayout(BOOL bInit=FALSE, BOOL bCreate=FALSE);
+ void CreateTitleAndLayout(sal_Bool bInit=sal_False, sal_Bool bCreate=sal_False);
SdrObject* InsertAutoLayoutShape(SdrObject* pObj, PresObjKind eObjKind, bool bVertical, Rectangle aRect, bool bInit );
- virtual void NbcInsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND,
+ virtual void NbcInsertObject(SdrObject* pObj, sal_uLong nPos=CONTAINER_APPEND,
const SdrInsertReason* pReason=NULL);
- virtual SdrObject* NbcRemoveObject(ULONG nObjNum);
- virtual SdrObject* RemoveObject(ULONG nObjNum);
+ virtual SdrObject* NbcRemoveObject(sal_uLong nObjNum);
+ virtual SdrObject* RemoveObject(sal_uLong nObjNum);
// Also overload ReplaceObject methods to realize when
// objects are removed with this mechanism instead of RemoveObject
- virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum);
- virtual SdrObject* ReplaceObject(SdrObject* pNewObj, ULONG nObjNum);
+ virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, sal_uLong nObjNum);
+ virtual SdrObject* ReplaceObject(SdrObject* pNewObj, sal_uLong nObjNum);
virtual void SetLinkData(const String& rLinkName, const String& rLinkData);
@@ -230,8 +230,8 @@ public:
void SetPageKind(PageKind ePgType) { mePageKind = ePgType; }
PageKind GetPageKind() const { return mePageKind; }
- void SetSelected(BOOL bSel) { mbSelected = bSel; }
- BOOL IsSelected() const { return mbSelected; }
+ void SetSelected(sal_Bool bSel) { mbSelected = bSel; }
+ sal_Bool IsSelected() const { return mbSelected; }
void SetFadeEffect(::com::sun::star::presentation::FadeEffect eNewEffect);
::com::sun::star::presentation::FadeEffect GetFadeEffect() const;
@@ -239,17 +239,17 @@ public:
void SetPresChange(PresChange eChange) { mePresChange = eChange; }
PresChange GetPresChange() const { return mePresChange; }
- void SetTime(UINT32 nNewTime) { mnTime = nNewTime; }
- UINT32 GetTime() const { return mnTime; }
+ void SetTime(sal_uInt32 nNewTime) { mnTime = nNewTime; }
+ sal_uInt32 GetTime() const { return mnTime; }
- void SetSound(BOOL bNewSoundOn) { mbSoundOn = bNewSoundOn; }
- BOOL IsSoundOn() const { return mbSoundOn; }
+ void SetSound(sal_Bool bNewSoundOn) { mbSoundOn = bNewSoundOn; }
+ sal_Bool IsSoundOn() const { return mbSoundOn; }
- void SetExcluded(BOOL bNewExcluded) { mbExcluded = bNewExcluded; }
- BOOL IsExcluded() const { return mbExcluded; }
+ void SetExcluded(sal_Bool bNewExcluded) { mbExcluded = bNewExcluded; }
+ sal_Bool IsExcluded() const { return mbExcluded; }
- void SetScaleObjects(BOOL bScale) { mbScaleObjects = bScale; }
- BOOL IsScaleObjects() const { return mbScaleObjects; }
+ void SetScaleObjects(sal_Bool bScale) { mbScaleObjects = bScale; }
+ sal_Bool IsScaleObjects() const { return mbScaleObjects; }
void SetSoundFile(const String& rStr) { maSoundFile = rStr; }
String GetSoundFile() const { return maSoundFile; }
@@ -292,24 +292,24 @@ public:
void DisconnectLink();
void ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderRect,
- BOOL bScaleAllObj);
+ sal_Bool bScaleAllObj);
const String& GetName() const;
String GetRealName() const { return FmFormPage::GetName(); };
void SetPresentationLayout(const String& rLayoutName,
- BOOL bReplaceStyleSheets = TRUE,
- BOOL bSetMasterPage = TRUE,
- BOOL bReverseOrder = FALSE);
+ sal_Bool bReplaceStyleSheets = sal_True,
+ sal_Bool bSetMasterPage = sal_True,
+ sal_Bool bReverseOrder = sal_False);
void EndListenOutlineText();
- void SetBackgroundFullSize( BOOL bIn );
- BOOL IsBackgroundFullSize() const { return mbBackgroundFullSize; }
+ void SetBackgroundFullSize( sal_Bool bIn );
+ sal_Bool IsBackgroundFullSize() const { return mbBackgroundFullSize; }
rtl_TextEncoding GetCharSet() { return(meCharSet); }
- void SetPaperBin(USHORT nBin) { mnPaperBin = nBin; }
- USHORT GetPaperBin() const { return mnPaperBin; }
+ void SetPaperBin(sal_uInt16 nBin) { mnPaperBin = nBin; }
+ sal_uInt16 GetPaperBin() const { return mnPaperBin; }
virtual void SetOrientation(Orientation eOrient);
virtual Orientation GetOrientation() const;
diff --git a/sd/inc/sdresid.hxx b/sd/inc/sdresid.hxx
index 617957b6b9e2..b764fc289c71 100644..100755
--- a/sd/inc/sdresid.hxx
+++ b/sd/inc/sdresid.hxx
@@ -35,7 +35,7 @@
class SD_DLLPUBLIC SdResId : public ResId
{
public:
- SdResId(USHORT nId);
+ SdResId(sal_uInt16 nId);
};
#endif /* _SD_SDRESID_HXX */
diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx
index 46f534c509b2..1b8c00acff77 100644..100755
--- a/sd/inc/sdxmlwrp.hxx
+++ b/sd/inc/sdxmlwrp.hxx
@@ -50,7 +50,7 @@ public:
::sd::DrawDocShell& rDocShell,
sal_Bool bShowProgress,
SdXMLFilterMode eFilterMode = SDXMLMODE_Normal,
- ULONG nStoreVer = SOFFICE_FILEFORMAT_8 );
+ sal_uLong nStoreVer = SOFFICE_FILEFORMAT_8 );
virtual ~SdXMLFilter (void);
sal_Bool Import( ErrCode& nError );
@@ -58,7 +58,7 @@ public:
private:
SdXMLFilterMode meFilterMode;
- ULONG mnStoreVer;
+ sal_uLong mnStoreVer;
};
#endif // _SDXMLWRP_HXX
diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx
index f2b97694bb5e..680d95cd2710 100644
--- a/sd/inc/shapelist.hxx
+++ b/sd/inc/shapelist.hxx
@@ -48,8 +48,6 @@ namespace sd
a pointer to the next shape in list or 0*/
SdrObject* removeShape( SdrObject& rObject );
- void replaceShape( SdrObject& rOldObject, SdrObject& rNewObject );
-
/** removes all shapes from this list */
void clear();
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index b92177893fd4..2a7f82ad5f2e 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -131,7 +131,7 @@ public:
protected:
void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily );
- virtual SfxStyleSheetBase* Create(const String& rName, SfxStyleFamily eFamily, USHORT nMask);
+ virtual SfxStyleSheetBase* Create(const String& rName, SfxStyleFamily eFamily, sal_uInt16 nMask);
virtual SfxStyleSheetBase* Create(const SdStyleSheet& rStyle);
using SfxStyleSheetPool::Create;
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index 633510d7633e..cae4bbdb1066 100644..100755
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -60,19 +60,19 @@ typedef cppu::ImplInheritanceHelper5< SfxUnoStyleSheet,
class SdStyleSheet : public SdStyleSheetBase, private ::cppu::BaseMutex
{
public:
- SdStyleSheet( const rtl::OUString& rDisplayName, SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily, USHORT nMask );
+ SdStyleSheet( const rtl::OUString& rDisplayName, SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily, sal_uInt16 nMask );
SdStyleSheet( const SdStyleSheet& );
- virtual BOOL SetParent (const String& rParentName);
+ virtual sal_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 sal_Bool IsUsed() const;
+ virtual sal_Bool HasFollowSupport() const;
+ virtual sal_Bool HasParentSupport() const;
+ virtual sal_Bool HasClearParentSupport() const;
+ virtual sal_Bool SetName( const UniString& );
+ virtual void SetHelpId( const String& r, sal_uLong nId );
- void AdjustToFontHeight(SfxItemSet& rSet, BOOL bOnlyMissingItems = TRUE);
+ void AdjustToFontHeight(SfxItemSet& rSet, sal_Bool bOnlyMissingItems = sal_True);
SdStyleSheet* GetRealStyleSheet() const;
SdStyleSheet* GetPseudoStyleSheet() const;
@@ -131,7 +131,7 @@ public:
protected:
const SfxItemPropertySimpleEntry* getPropertyMapEntry( const ::rtl::OUString& rPropertyName ) const throw();
- virtual void Load (SvStream& rIn, USHORT nVersion);
+ virtual void Load (SvStream& rIn, sal_uInt16 nVersion);
virtual void Store(SvStream& rOut);
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx
index 9702fff68ac5..68437afe6703 100644..100755
--- a/sd/inc/undo/undomanager.hxx
+++ b/sd/inc/undo/undomanager.hxx
@@ -38,34 +38,24 @@ namespace sd
class UndoManager : public SfxUndoManager
{
public:
- UndoManager( USHORT nMaxUndoActionCount = 20 );
+ UndoManager( sal_uInt16 nMaxUndoActionCount = 20 );
- virtual void EnterListAction(const UniString &rComment, const UniString& rRepeatComment, USHORT nId=0);
- virtual void LeaveListAction();
+ virtual void EnterListAction(const UniString &rComment, const UniString& rRepeatComment, sal_uInt16 nId=0);
- virtual void AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg=FALSE );
-
- 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 void AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg=sal_False );
/** Set or reset the undo manager linked with the called undo manager.
*/
- void SetLinkedUndoManager (SfxUndoManager* pLinkedUndoManager);
+ void SetLinkedUndoManager (::svl::IUndoManager* pLinkedUndoManager);
private:
using SfxUndoManager::Undo;
using SfxUndoManager::Redo;
- int mnListLevel;
- ScopeLock maIsInUndoLock;
-
/** Used when the outline view is visible as a last resort to
synchronize the undo managers.
*/
- SfxUndoManager* mpLinkedUndoManager;
+ ::svl::IUndoManager* mpLinkedUndoManager;
/** Call ClearRedo() at the linked undo manager, when present.
diff --git a/sd/prj/build.lst b/sd/prj/build.lst
index 43af3763a557..291603c7c7d5 100644
--- a/sd/prj/build.lst
+++ b/sd/prj/build.lst
@@ -1,4 +1,4 @@
-sd sd : filter l10n animations svx sfx2 stoc canvas oox NULL
+sd sd : filter L10N:l10n animations svx sfx2 stoc canvas LIBXSLT:libxslt oox NULL
sd sd usr1 - all sd_mkout NULL
sd sd\inc nmake - all sd_inc NULL
sd sd\prj get - all sd_prj NULL
@@ -28,7 +28,7 @@ sd sd\source\ui\slidesorter\controller nmake - all sd_slscontroller sd_sdi sd_i
sd sd\source\ui\slidesorter\cache nmake - all sd_slscache sd_inc NULL
sd sd\source\ui\controller nmake - all sd_controller sd_inc NULL
sd sd\source\ui\notes nmake - all sd_notes sd_inc NULL
-sd sd\source\ui\table nmake - all sd_table sd_inc NULL
+sd sd\source\ui\table nmake - all sd_table sd_sdi sd_inc NULL
sd sd\source\filter\ppt nmake - all sd_ppt sd_inc NULL
sd sd\source\filter nmake - all sd_filt sd_sdi sd_ppt sd_inc NULL
sd sd\source\filter\cgm nmake - all sd_cgm sd_inc NULL
diff --git a/sd/prj/d.lst b/sd/prj/d.lst
index 14f85e982eab..0ebbb9a4eff0 100755
--- a/sd/prj/d.lst
+++ b/sd/prj/d.lst
@@ -55,3 +55,5 @@ mkdir: %_DEST%\inc%_EXT%\sd
..\uiconfig\sdraw\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\statusbar\*.xml
..\uiconfig\simpress\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\statusbar\*.xml
+..\%__SRC%\misc\sd.component %_DEST%\xml%_EXT%\sd.component
+..\%__SRC%\misc\sdd.component %_DEST%\xml%_EXT%\sdd.component
diff --git a/sd/qa/unoapi/knownissues.xcl b/sd/qa/unoapi/knownissues.xcl
index 0f28aebd2890..a47bdb898d4c 100644..100755
--- a/sd/qa/unoapi/knownissues.xcl
+++ b/sd/qa/unoapi/knownissues.xcl
@@ -54,3 +54,10 @@ sd.DrawController_PresentationView::com::sun::star::beans::XPropertySet
### i109518 ###
sd.SdXPresentation::com::sun::star::presentation::XPresentation
sd.SdXPresentation::com::sun::star::beans::XPropertySet
+
+### i113161 ###
+sd.SdLayer::com::sun::star::beans::XPropertySet
+sd.SdLayer::com::sun::star::drawing::Layer
+
+### i113386 ###
+sd.AccessibleDrawDocumentView::com::sun::star::accessibility::XAccessibleComponent
diff --git a/sd/qa/unoapi/sd.sce b/sd/qa/unoapi/sd.sce
index c964c1ba0090..c964c1ba0090 100644..100755
--- a/sd/qa/unoapi/sd.sce
+++ b/sd/qa/unoapi/sd.sce
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index 487f83171fe4..765cc0426fab 100644..100755
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
@@ -85,6 +85,11 @@ interface SlideSorterView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
+ SID_DUPLICATE_PAGE
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetMenuState ;
+ ]
SID_DELETE_PAGE
[
ExecMethod = FuTemporary ;
@@ -232,21 +237,6 @@ interface SlideSorterView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
- /*
- SID_PRINTDOC // ole : no, status : ?
- [
- StateMethod = GetMenuState ;
- ]
- SID_PRINTDOCDIRECT // ole : no, status : ?
- [
- StateMethod = GetMenuState ;
- ]
- SID_SETUPPRINTER // ole : no, status : ?
- [
- StateMethod = GetMenuState ;
- ]
-*/
-
SID_OUTPUT_QUALITY_COLOR // ole : no, status : play rec
[
ExecMethod = ExecCtrl ;
diff --git a/sd/sdi/ToolPanelViewShell.sdi b/sd/sdi/ToolPanelViewShell.sdi
index a72342c52da5..2514f5775e18 100644
--- a/sd/sdi/ToolPanelViewShell.sdi
+++ b/sd/sdi/ToolPanelViewShell.sdi
@@ -24,183 +24,6 @@
*
************************************************************************/
-SfxVoidItem TaskPaneApplyToAllSlides SID_TP_APPLY_TO_ALL_SLIDES
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_VIEW;
-]
-
-SfxVoidItem TaskPaneApplyToSelectedSlides SID_TP_APPLY_TO_SELECTED_SLIDES
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_VIEW;
-]
-
-SfxVoidItem TaskPaneUseForNewPresentations SID_TP_USE_FOR_NEW_PRESENTATIONS
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_VIEW;
-]
-
-SfxVoidItem TaskPaneShowSmallPreview SID_TP_SHOW_SMALL_PREVIEW
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_VIEW;
-]
-
-
-SfxVoidItem TaskPaneShowLargePreview SID_TP_SHOW_LARGE_PREVIEW
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_VIEW;
-]
-
-SfxVoidItem TaskPaneEditMaster SID_TP_EDIT_MASTER
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_VIEW;
-]
-
-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,
- RecordPerSet;
- Synchron;
-
- Readonly = TRUE,
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_INSERT;
-]
-
-
interface MasterPagesSelectorInterface
{
SID_TP_APPLY_TO_ALL_SLIDES
diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi
index 3602e711db1b..9c1bc7252cfb 100755
--- a/sd/sdi/ViewShellBase.sdi
+++ b/sd/sdi/ViewShellBase.sdi
@@ -25,219 +25,6 @@
*
************************************************************************/
-/** This item holds the requested type of view shell when calling the
- SID_SWITCH_SHELL slot.
-*/
-SfxInt32Item SwitchViewShell SID_SWITCH_SHELL
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_VIEW;
-]
-
-
-/** This item holds the requested pane of the multi pane GUI in which a
- change of the view shell is requested by a call to the SID_SWITCH_SHELL
- slot.
-*/
-SfxInt32Item SwitchViewShellPane SID_SWITCH_SHELL_PANE
-[
- // flags:
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- Readonly = FALSE,
-
- // config:
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_VIEW;
-]
-
-SfxBoolItem LeftPaneImpress SID_LEFT_PANE_IMPRESS
-
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_MODIFY;
-]
-
-SfxBoolItem LeftPaneDraw SID_LEFT_PANE_DRAW
-
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_MODIFY;
-]
-
-SfxVoidItem NotesChildWindow SID_NOTES_WINDOW
-
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = TRUE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_VIEW;
-]
-
-SfxBoolItem NormalMultiPaneGUI SID_NORMAL_MULTI_PANE_GUI
-
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_MODIFY;
-]
-
-SfxBoolItem SlideSorterMultiPaneGUI SID_SLIDE_SORTER_MULTI_PANE_GUI
-
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_MODIFY;
-]
-
-SfxVoidItem TaskPaneShowPanel SID_SHOW_TOOL_PANEL (
- SfxBoolItem IsPanelVisible ID_VAL_ISVISIBLE,
- SfxUInt32Item PanelId ID_VAL_PANEL_INDEX)
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = TRUE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_VIEW;
-]
-
interface ViewShellBaseView
{
SID_SWITCH_SHELL
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 4ef8e62a6a1a..041dca8b105d 100755
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -324,11 +324,6 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
- SID_INSERT_APPLET // ole : yes, status : ?
- [
- ExecMethod = FuTemporary ;
- StateMethod = GetMenuState ;
- ]
SID_INSERT_PLUGIN // ole : yes, status : ?
[
ExecMethod = FuTemporary ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index fc8f8a9a1984..5e13f85ccdc8 100755
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -6875,3 +6875,394 @@ SfxVoidItem DistributeRows SID_TABLE_DISTRIBUTE_ROWS
ToolBoxConfig = TRUE,
GroupId = GID_TABLE;
]
+
+SfxVoidItem TaskPaneApplyToAllSlides SID_TP_APPLY_TO_ALL_SLIDES
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_VIEW;
+]
+
+SfxVoidItem TaskPaneApplyToSelectedSlides SID_TP_APPLY_TO_SELECTED_SLIDES
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_VIEW;
+]
+
+SfxVoidItem TaskPaneUseForNewPresentations SID_TP_USE_FOR_NEW_PRESENTATIONS
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_VIEW;
+]
+
+SfxVoidItem TaskPaneShowSmallPreview SID_TP_SHOW_SMALL_PREVIEW
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_VIEW;
+]
+
+
+SfxVoidItem TaskPaneShowLargePreview SID_TP_SHOW_LARGE_PREVIEW
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_VIEW;
+]
+
+SfxVoidItem TaskPaneEditMaster SID_TP_EDIT_MASTER
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_VIEW;
+]
+
+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,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = TRUE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_INSERT;
+]
+
+/** This item holds the requested type of view shell when calling the
+ SID_SWITCH_SHELL slot.
+*/
+SfxInt32Item SwitchViewShell SID_SWITCH_SHELL
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Asynchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_VIEW;
+]
+
+
+/** This item holds the requested pane of the multi pane GUI in which a
+ change of the view shell is requested by a call to the SID_SWITCH_SHELL
+ slot.
+*/
+SfxInt32Item SwitchViewShellPane SID_SWITCH_SHELL_PANE
+[
+ // flags:
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Asynchron;
+
+ Readonly = FALSE,
+
+ // config:
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_VIEW;
+]
+
+SfxBoolItem LeftPaneImpress SID_LEFT_PANE_IMPRESS
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = TRUE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Asynchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_MODIFY;
+]
+
+SfxBoolItem LeftPaneDraw SID_LEFT_PANE_DRAW
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = TRUE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Asynchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_MODIFY;
+]
+
+SfxVoidItem NotesChildWindow SID_NOTES_WINDOW
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = TRUE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Asynchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_VIEW;
+]
+
+SfxBoolItem NormalMultiPaneGUI SID_NORMAL_MULTI_PANE_GUI
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = TRUE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Asynchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_MODIFY;
+]
+
+SfxBoolItem SlideSorterMultiPaneGUI SID_SLIDE_SORTER_MULTI_PANE_GUI
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = TRUE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Asynchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_MODIFY;
+]
+
+SfxVoidItem TaskPaneShowPanel SID_SHOW_TOOL_PANEL (
+ SfxBoolItem IsPanelVisible ID_VAL_ISVISIBLE,
+ SfxUInt32Item PanelId ID_VAL_PANEL_INDEX)
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = TRUE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_VIEW;
+]
+
+
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index cedce0f46e22..464cbfb3d719 100644..100755
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -219,8 +219,8 @@ Reference< XAnimationNode > CustomAnimationPreset::create( const rtl::OUString&
UStringList CustomAnimationPreset::getProperties() const
{
String aProperties( maProperty );
- USHORT nTokens = aProperties.GetTokenCount();
- USHORT nToken;
+ sal_uInt16 nTokens = aProperties.GetTokenCount();
+ sal_uInt16 nToken;
UStringList aPropertyList;
for( nToken = 0; nToken < nTokens; nToken++ )
aPropertyList.push_back( aProperties.GetToken( nToken ) );
@@ -233,8 +233,8 @@ bool CustomAnimationPreset::hasProperty( const OUString& rProperty )const
{
String aProperties( maProperty );
String aProperty( rProperty );
- USHORT nTokens = aProperties.GetTokenCount();
- USHORT nToken;
+ sal_uInt16 nTokens = aProperties.GetTokenCount();
+ sal_uInt16 nToken;
for( nToken = 0; nToken < nTokens; nToken++ )
{
if( aProperties.GetToken( nToken ) == aProperty )
diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx
index 4502892eac10..9de84eeb217b 100644..100755
--- a/sd/source/core/anminfo.cxx
+++ b/sd/source/core/anminfo.cxx
@@ -51,18 +51,18 @@ SdAnimationInfo::SdAnimationInfo(SdrObject& rObject)
meEffect (presentation::AnimationEffect_NONE),
meTextEffect (presentation::AnimationEffect_NONE),
meSpeed (presentation::AnimationSpeed_SLOW),
- mbActive (TRUE),
- mbDimPrevious (FALSE),
- mbIsMovie (FALSE),
- mbDimHide (FALSE),
- mbSoundOn (FALSE),
- mbPlayFull (FALSE),
+ mbActive (sal_True),
+ mbDimPrevious (sal_False),
+ mbIsMovie (sal_False),
+ mbDimHide (sal_False),
+ mbSoundOn (sal_False),
+ mbPlayFull (sal_False),
mpPathObj (NULL),
meClickAction (presentation::ClickAction_NONE),
meSecondEffect (presentation::AnimationEffect_NONE),
meSecondSpeed (presentation::AnimationSpeed_SLOW),
- mbSecondSoundOn (FALSE),
- mbSecondPlayFull (FALSE),
+ mbSecondSoundOn (sal_False),
+ mbSecondPlayFull (sal_False),
mnVerb (0),
mnPresOrder (LIST_APPEND),
mrObject (rObject)
diff --git a/sd/source/core/cusshow.cxx b/sd/source/core/cusshow.cxx
index efc958005bc0..72fe6ddb18fb 100644
--- a/sd/source/core/cusshow.cxx
+++ b/sd/source/core/cusshow.cxx
@@ -107,7 +107,7 @@ void SdCustomShow::ReplacePage( const SdPage* pOldPage, const SdPage* pNewPage )
}
else
{
- ULONG nPos;
+ sal_uLong nPos;
while( (nPos = GetPos( (void*)pOldPage )) != CONTAINER_ENTRY_NOTFOUND )
{
Replace( (void*)pNewPage, nPos );
@@ -117,7 +117,7 @@ void SdCustomShow::ReplacePage( const SdPage* pOldPage, const SdPage* pNewPage )
void SdCustomShow::RemovePage( const SdPage* pPage )
{
- ULONG nPos;
+ sal_uLong nPos;
while( (nPos = GetPos( (void*)pPage )) != CONTAINER_ENTRY_NOTFOUND )
{
Remove( nPos );
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index a299f2f34b4a..1551403c82fd 100644..100755
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -160,15 +160,15 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
, mpCustomShowList(NULL)
, mpDocSh(static_cast< ::sd::DrawDocShell*>(pDrDocSh))
, mpCreatingTransferable( NULL )
-, mbHasOnlineSpellErrors(FALSE)
-, mbInitialOnlineSpellingEnabled(TRUE)
-, mbNewOrLoadCompleted(FALSE)
+, mbHasOnlineSpellErrors(sal_False)
+, mbInitialOnlineSpellingEnabled(sal_True)
+, mbNewOrLoadCompleted(sal_False)
, mbStartWithPresentation( false )
, meLanguage( LANGUAGE_SYSTEM )
, meLanguageCJK( LANGUAGE_SYSTEM )
, meLanguageCTL( LANGUAGE_SYSTEM )
, mePageNumType(SVX_ARABIC)
-, mbAllocDocSh(FALSE)
+, mbAllocDocSh(sal_False)
, meDocType(eType)
, mpCharClass(NULL)
, mpLocale(NULL)
@@ -184,11 +184,11 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
if (mpDocSh)
{
- SetSwapGraphics(TRUE);
+ SetSwapGraphics(sal_True);
}
// Masseinheit (von App) und Massstab (von SdMod) setzen
- INT32 nX, nY;
+ sal_Int32 nX, nY;
SdOptions* pOptions = SD_MOD()->GetSdOptions(meDocType);
pOptions->GetScale( nX, nY );
@@ -248,12 +248,12 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
// for korean and japanese languages we have a different default for apply spacing between asian, latin and ctl text
if( ( LANGUAGE_KOREAN == eRealCTLLanguage ) || ( LANGUAGE_KOREAN_JOHAB == eRealCTLLanguage ) || ( LANGUAGE_JAPANESE == eRealCTLLanguage ) )
{
- GetPool().GetSecondaryPool()->SetPoolDefaultItem( SvxScriptSpaceItem( FALSE, EE_PARA_ASIANCJKSPACING ) );
+ GetPool().GetSecondaryPool()->SetPoolDefaultItem( SvxScriptSpaceItem( sal_False, EE_PARA_ASIANCJKSPACING ) );
}
// DefTab und SpellOptions setzen
// Jetzt am Modul (SD)
- USHORT nDefTab = pOptions->GetDefTab();
+ sal_uInt16 nDefTab = pOptions->GetDefTab();
SetDefaultTabulator( nDefTab );
try
@@ -280,7 +280,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
SetLinkManager( new sfx2::LinkManager(mpDocSh) );
}
- ULONG nCntrl = rOutliner.GetControlWord();
+ sal_uLong nCntrl = rOutliner.GetControlWord();
nCntrl |= EE_CNTRL_ALLOWBIGOBJS;
nCntrl |= EE_CNTRL_URLSFXEXECUTE;
@@ -329,7 +329,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
pHitTestOutliner->SetDefaultLanguage( Application::GetSettings().GetLanguage() );
- ULONG nCntrl2 = pHitTestOutliner->GetControlWord();
+ sal_uLong nCntrl2 = pHitTestOutliner->GetControlWord();
nCntrl2 |= EE_CNTRL_ALLOWBIGOBJS;
nCntrl2 |= EE_CNTRL_URLSFXEXECUTE;
nCntrl2 &= ~EE_CNTRL_ONLINESPELLING;
@@ -345,7 +345,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
*
* Es werden auf Pages und MasterPages folgende Default-Layer angelegt:
*
- * Layer STR_LAYOUT : Standardlayer fr alle Zeichenobjekte
+ * Layer STR_LAYOUT : Standardlayer f�r alle Zeichenobjekte
*
* Layer STR_BCKGRND : Hintergrund der MasterPage
* (auf normalen Pages z.Z. keine Verwendung)
@@ -353,7 +353,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
* Layer STR_BCKGRNDOBJ: Objekte auf dem Hintergrund der MasterPage
* (auf normalen Pages z.Z. keine Verwendung)
*
- * Layer STR_CONTROLS : Standardlayer fr Controls
+ * Layer STR_CONTROLS : Standardlayer f�r Controls
*
**************************************************************************/
{
@@ -396,7 +396,7 @@ SdDrawDocument::~SdDrawDocument()
mpOnlineSearchItem = NULL;
CloseBookmarkDoc();
- SetAllocDocSh(FALSE);
+ SetAllocDocSh(sal_False);
ClearModel(sal_True);
@@ -414,7 +414,7 @@ SdDrawDocument::~SdDrawDocument()
::sd::FrameView* pFrameView = NULL;
- for (ULONG i = 0; i < mpFrameViewList->Count(); i++)
+ for (sal_uLong i = 0; i < mpFrameViewList->Count(); i++)
{
// Ggf. FrameViews loeschen
pFrameView =
@@ -429,7 +429,7 @@ SdDrawDocument::~SdDrawDocument()
if (mpCustomShowList)
{
- for (ULONG j = 0; j < mpCustomShowList->Count(); j++)
+ for (sal_uLong j = 0; j < mpCustomShowList->Count(); j++)
{
// Ggf. CustomShows loeschen
SdCustomShow* pCustomShow = (SdCustomShow*) mpCustomShowList->GetObject(j);
@@ -473,10 +473,10 @@ SdrModel* SdDrawDocument::AllocModel() const
if( meDocType == DOCUMENT_TYPE_IMPRESS )
mpCreatingTransferable->SetDocShell( new ::sd::DrawDocShell(
- SFX_CREATE_MODE_EMBEDDED, TRUE, meDocType ) );
+ SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType ) );
else
mpCreatingTransferable->SetDocShell( new ::sd::GraphicDocShell(
- SFX_CREATE_MODE_EMBEDDED, TRUE, meDocType ) );
+ SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType ) );
pNewDocSh = static_cast< ::sd::DrawDocShell*>( pObj = mpCreatingTransferable->GetDocShell() );
pNewDocSh->DoInitNew( NULL );
@@ -492,7 +492,7 @@ SdrModel* SdDrawDocument::AllocModel() const
pNewStylePool->CopyTableStyles(*pOldStylePool);
- for (USHORT i = 0; i < GetMasterSdPageCount(PK_STANDARD); i++)
+ for (sal_uInt16 i = 0; i < GetMasterSdPageCount(PK_STANDARD); i++)
{
// Alle Layouts der MasterPage mitnehmen
String aOldLayoutName(((SdDrawDocument*) this)->GetMasterSdPage(i, PK_STANDARD)->GetLayoutName());
@@ -507,9 +507,9 @@ SdrModel* SdDrawDocument::AllocModel() const
{
// Es wird eine DocShell erzeugt, welche mit GetAllocedDocSh() zurueckgegeben wird
SdDrawDocument* pDoc = (SdDrawDocument*) this;
- pDoc->SetAllocDocSh(FALSE);
+ pDoc->SetAllocDocSh(sal_False);
pDoc->mxAllocedDocShRef = new ::sd::DrawDocShell(
- SFX_CREATE_MODE_EMBEDDED, TRUE, meDocType);
+ SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType);
pDoc->mxAllocedDocShRef->DoInitNew(NULL);
pNewModel = pDoc->mxAllocedDocShRef->GetDoc();
}
@@ -601,9 +601,9 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
CheckMasterPages();
if ( GetMasterSdPageCount(PK_STANDARD) > 1 )
- RemoveUnnecessaryMasterPages( NULL, TRUE, FALSE );
+ RemoveUnnecessaryMasterPages( NULL, sal_True, sal_False );
- for ( USHORT i = 0; i < GetPageCount(); i++ )
+ for ( sal_uInt16 i = 0; i < GetPageCount(); i++ )
{
// Check for correct layout names
SdPage* pPage = (SdPage*) GetPage( i );
@@ -619,7 +619,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
}
}
- for ( USHORT nPage = 0; nPage < GetMasterPageCount(); nPage++)
+ for ( sal_uInt16 nPage = 0; nPage < GetMasterPageCount(); nPage++)
{
// LayoutName and PageName must be the same
SdPage* pPage = (SdPage*) GetMasterPage( nPage );
@@ -650,7 +650,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
// dokumentspezifisch wie StyleSheetPool und StyleRequestHandler
::Outliner& rDrawOutliner = GetDrawOutliner();
rDrawOutliner.SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool());
- ULONG nCntrl = rDrawOutliner.GetControlWord();
+ sal_uLong nCntrl = rDrawOutliner.GetControlWord();
if (mbOnlineSpell)
nCntrl |= EE_CNTRL_ONLINESPELLING;
else
@@ -676,7 +676,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
// Praesentationsobjekte muessen wieder Listener der entsprechenden
// Vorlagen werden
SdStyleSheetPool* pSPool = (SdStyleSheetPool*) GetStyleSheetPool();
- USHORT nPage, nPageCount;
+ sal_uInt16 nPage, nPageCount;
// create missing layout style sheets for broken documents
// that where created with the 5.2
@@ -703,15 +703,15 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
}
}
- mbNewOrLoadCompleted = TRUE;
+ mbNewOrLoadCompleted = sal_True;
/**************************************************************************
* Alle gelinkten Pages aktualisieren
**************************************************************************/
SdPage* pPage = NULL;
- USHORT nMaxSdPages = GetSdPageCount(PK_STANDARD);
+ sal_uInt16 nMaxSdPages = GetSdPageCount(PK_STANDARD);
- for (USHORT nSdPage=0; nSdPage < nMaxSdPages; nSdPage++)
+ for (sal_uInt16 nSdPage=0; nSdPage < nMaxSdPages; nSdPage++)
{
pPage = (SdPage*) GetSdPage(nSdPage, PK_STANDARD);
@@ -723,7 +723,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
UpdateAllLinks();
- SetChanged( FALSE );
+ SetChanged( sal_False );
}
/** updates all links, only links in this document should by resolved */
@@ -766,16 +766,16 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
if (pObj->GetObjInventor() == SdrInventor)
{
OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject();
- UINT16 nId = pObj->GetObjIdentifier();
+ sal_uInt16 nId = pObj->GetObjIdentifier();
if (nId == OBJ_TITLETEXT)
{
if( pOPO && pOPO->GetOutlinerMode() == OUTLINERMODE_DONTKNOW )
pOPO->SetOutlinerMode( OUTLINERMODE_TITLEOBJECT );
- // TRUE: harte Attribute dabei nicht loeschen
+ // sal_True: harte Attribute dabei nicht loeschen
if (pTitleSheet)
- pObj->SetStyleSheet(pTitleSheet, TRUE);
+ pObj->SetStyleSheet(pTitleSheet, sal_True);
}
else if (nId == OBJ_OUTLINETEXT)
{
@@ -793,7 +793,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
if( iter == aOutlineList.begin())
// Textrahmen hoert auf StyleSheet der Ebene1
- pObj->NbcSetStyleSheet(pSheet, TRUE);
+ pObj->NbcSetStyleSheet(pSheet, sal_True);
}
}
}
@@ -805,9 +805,9 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
if (aString.Len())
{
- sd::Outliner* pInternalOutl = GetInternalOutliner(TRUE);
+ sd::Outliner* pInternalOutl = GetInternalOutliner(sal_True);
pPage->SetObjText( (SdrTextObj*) pObj, pInternalOutl, ePresObjKind, aString );
- pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( ePresObjKind ), TRUE );
+ pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( ePresObjKind ), sal_True );
pInternalOutl->Clear();
}
}
@@ -825,7 +825,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
|*
\************************************************************************/
-::sd::Outliner* SdDrawDocument::GetOutliner(BOOL bCreateOutliner)
+::sd::Outliner* SdDrawDocument::GetOutliner(sal_Bool bCreateOutliner)
{
if (!mpOutliner && bCreateOutliner)
{
@@ -850,7 +850,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
|*
\************************************************************************/
-::sd::Outliner* SdDrawDocument::GetInternalOutliner(BOOL bCreateOutliner)
+::sd::Outliner* SdDrawDocument::GetInternalOutliner(sal_Bool bCreateOutliner)
{
if ( !mpInternalOutliner && bCreateOutliner )
{
@@ -858,9 +858,9 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
// MT:
// Dieser Outliner wird nur fuer das Erzeugen spezieller Textobjekte
// verwendet. Da in diesen Textobjekten keine Portion-Informationen
- // gespeichert werden muessen, kann/soll der Update-Mode immer FALSE bleiben.
- mpInternalOutliner->SetUpdateMode( FALSE );
- mpInternalOutliner->EnableUndo( FALSE );
+ // gespeichert werden muessen, kann/soll der Update-Mode immer sal_False bleiben.
+ mpInternalOutliner->SetUpdateMode( sal_False );
+ mpInternalOutliner->EnableUndo( sal_False );
if (mpDocSh)
mpInternalOutliner->SetRefDevice( SD_MOD()->GetRefDevice( *mpDocSh ) );
@@ -869,8 +869,8 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
mpInternalOutliner->SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool());
}
- DBG_ASSERT( !mpInternalOutliner || ( mpInternalOutliner->GetUpdateMode() == FALSE ) , "InternalOutliner: UpdateMode = TRUE !" );
- DBG_ASSERT( !mpInternalOutliner || ( mpInternalOutliner->IsUndoEnabled() == FALSE ), "InternalOutliner: Undo = TRUE !" );
+ DBG_ASSERT( !mpInternalOutliner || ( mpInternalOutliner->GetUpdateMode() == sal_False ) , "InternalOutliner: UpdateMode = sal_True !" );
+ DBG_ASSERT( !mpInternalOutliner || ( mpInternalOutliner->IsUndoEnabled() == sal_False ), "InternalOutliner: Undo = sal_True !" );
// MT: Wer ihn vollmuellt, macht ihn auch gleich wieder leer:
// Vorteile:
@@ -887,10 +887,10 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
|*
\************************************************************************/
-void SdDrawDocument::SetOnlineSpell(BOOL bIn)
+void SdDrawDocument::SetOnlineSpell(sal_Bool bIn)
{
mbOnlineSpell = bIn;
- ULONG nCntrl = 0;
+ sal_uLong nCntrl = 0;
if(mpOutliner)
{
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 63d14f9b9732..96ccc779b0cb 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -101,8 +101,8 @@ SdrObject* SdDrawDocument::GetObj(const String& rObjName) const
/**************************************************************************
* Zuerst alle Pages durchsuchen
**************************************************************************/
- USHORT nPage = 0;
- const USHORT nMaxPages = GetPageCount();
+ sal_uInt16 nPage = 0;
+ const sal_uInt16 nMaxPages = GetPageCount();
while (nPage < nMaxPages && !pObjFound)
{
@@ -129,7 +129,7 @@ SdrObject* SdDrawDocument::GetObj(const String& rObjName) const
* Wenn nicht gefunden, dann alle MasterPages durchsuchen
**************************************************************************/
nPage = 0;
- const USHORT nMaxMasterPages = GetMasterPageCount();
+ const sal_uInt16 nMaxMasterPages = GetMasterPageCount();
while (nPage < nMaxMasterPages && !pObjFound)
{
@@ -162,14 +162,14 @@ SdrObject* SdDrawDocument::GetObj(const String& rObjName) const
|*
\************************************************************************/
-USHORT SdDrawDocument::GetPageByName(const String& rPgName, BOOL& rbIsMasterPage) const
+sal_uInt16 SdDrawDocument::GetPageByName(const String& rPgName, sal_Bool& rbIsMasterPage) const
{
SdPage* pPage = NULL;
- USHORT nPage = 0;
- const USHORT nMaxPages = GetPageCount();
- USHORT nPageNum = SDRPAGE_NOTFOUND;
+ sal_uInt16 nPage = 0;
+ const sal_uInt16 nMaxPages = GetPageCount();
+ sal_uInt16 nPageNum = SDRPAGE_NOTFOUND;
- rbIsMasterPage = FALSE;
+ rbIsMasterPage = sal_False;
// Search all regular pages and all notes pages (handout pages are
// ignored.)
@@ -189,7 +189,7 @@ USHORT SdDrawDocument::GetPageByName(const String& rPgName, BOOL& rbIsMasterPage
}
// Search all master pages when not found among non-master pages.
- const USHORT nMaxMasterPages = GetMasterPageCount();
+ const sal_uInt16 nMaxMasterPages = GetMasterPageCount();
nPage = 0;
while (nPage < nMaxMasterPages && nPageNum == SDRPAGE_NOTFOUND)
@@ -200,7 +200,7 @@ USHORT SdDrawDocument::GetPageByName(const String& rPgName, BOOL& rbIsMasterPage
if (pPage && pPage->GetName() == rPgName)
{
nPageNum = nPage;
- rbIsMasterPage = TRUE;
+ rbIsMasterPage = sal_True;
}
nPage++;
@@ -209,22 +209,22 @@ USHORT SdDrawDocument::GetPageByName(const String& rPgName, BOOL& rbIsMasterPage
return nPageNum;
}
-SdPage* SdDrawDocument::GetSdPage(USHORT nPgNum, PageKind ePgKind) const
+SdPage* SdDrawDocument::GetSdPage(sal_uInt16 nPgNum, PageKind ePgKind) const
{
return mpDrawPageListWatcher->GetSdPage(ePgKind, sal_uInt32(nPgNum));
}
-USHORT SdDrawDocument::GetSdPageCount(PageKind ePgKind) const
+sal_uInt16 SdDrawDocument::GetSdPageCount(PageKind ePgKind) const
{
return (sal_uInt16)mpDrawPageListWatcher->GetSdPageCount(ePgKind);
}
-SdPage* SdDrawDocument::GetMasterSdPage(USHORT nPgNum, PageKind ePgKind)
+SdPage* SdDrawDocument::GetMasterSdPage(sal_uInt16 nPgNum, PageKind ePgKind)
{
return mpMasterPageListWatcher->GetSdPage(ePgKind, sal_uInt32(nPgNum));
}
-USHORT SdDrawDocument::GetMasterSdPageCount(PageKind ePgKind) const
+sal_uInt16 SdDrawDocument::GetMasterSdPageCount(PageKind ePgKind) const
{
return (sal_uInt16)mpMasterPageListWatcher->GetSdPageCount(ePgKind);
}
@@ -236,12 +236,12 @@ USHORT SdDrawDocument::GetMasterSdPageCount(PageKind ePgKind) const
|*
\************************************************************************/
-void SdDrawDocument::UpdatePageObjectsInNotes(USHORT nStartPos)
+void SdDrawDocument::UpdatePageObjectsInNotes(sal_uInt16 nStartPos)
{
- USHORT nPageCount = GetPageCount();
+ sal_uInt16 nPageCount = GetPageCount();
SdPage* pPage = NULL;
- for (USHORT nPage = nStartPos; nPage < nPageCount; nPage++)
+ for (sal_uInt16 nPage = nStartPos; nPage < nPageCount; nPage++)
{
pPage = (SdPage*)GetPage(nPage);
@@ -249,9 +249,9 @@ void SdDrawDocument::UpdatePageObjectsInNotes(USHORT nStartPos)
// und Nummer korrigieren
if (pPage && pPage->GetPageKind() == PK_NOTES)
{
- ULONG nObjCount = pPage->GetObjCount();
+ sal_uLong nObjCount = pPage->GetObjCount();
SdrObject* pObj = NULL;
- for (ULONG nObj = 0; nObj < nObjCount; nObj++)
+ for (sal_uLong nObj = 0; nObj < nObjCount; nObj++)
{
pObj = pPage->GetObj(nObj);
if (pObj->GetObjIdentifier() == OBJ_PAGE &&
@@ -277,10 +277,10 @@ void SdDrawDocument::UpdatePageRelativeURLs(const String& rOldName, const String
return;
SfxItemPool& pPool(GetPool());
- USHORT nCount = pPool.GetItemCount(EE_FEATURE_FIELD);
- for (USHORT nOff = 0; nOff < nCount; nOff++)
+ sal_uInt32 nCount = pPool.GetItemCount2(EE_FEATURE_FIELD);
+ for (sal_uInt32 nOff = 0; nOff < nCount; nOff++)
{
- const SfxPoolItem *pItem = pPool.GetItem(EE_FEATURE_FIELD, nOff);
+ const SfxPoolItem *pItem = pPool.GetItem2(EE_FEATURE_FIELD, nOff);
const SvxFieldItem* pFldItem = dynamic_cast< const SvxFieldItem * > (pItem);
if(pFldItem)
@@ -317,15 +317,15 @@ void SdDrawDocument::UpdatePageRelativeURLs(const String& rOldName, const String
}
}
-void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, USHORT nPos, sal_Int32 nIncrement)
+void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos, sal_Int32 nIncrement)
{
bool bNotes = (pPage->GetPageKind() == PK_NOTES);
SfxItemPool& pPool(GetPool());
- USHORT nCount = pPool.GetItemCount(EE_FEATURE_FIELD);
- for (USHORT nOff = 0; nOff < nCount; nOff++)
+ sal_uInt32 nCount = pPool.GetItemCount2(EE_FEATURE_FIELD);
+ for (sal_uInt32 nOff = 0; nOff < nCount; nOff++)
{
- const SfxPoolItem *pItem = pPool.GetItem(EE_FEATURE_FIELD, nOff);
+ const SfxPoolItem *pItem = pPool.GetItem2(EE_FEATURE_FIELD, nOff);
const SvxFieldItem* pFldItem;
if ((pFldItem = dynamic_cast< const SvxFieldItem * > (pItem)) != 0)
@@ -357,7 +357,7 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, USHORT nPos, sal_Int3
aURLCopy.Erase(aURLCopy.Len() - sNotes.Len(), sNotes.Len());
sal_Int32 number = aURLCopy.ToInt32();
- USHORT realPageNumber = (nPos + 1)/ 2;
+ sal_uInt16 realPageNumber = (nPos + 1)/ 2;
if ( number >= realPageNumber )
{
@@ -385,12 +385,12 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, USHORT nPos, sal_Int3
|*
\************************************************************************/
-void SdDrawDocument::MovePage(USHORT nPgNum, USHORT nNewPos)
+void SdDrawDocument::MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos)
{
// Seite verschieben
FmFormModel::MovePage(nPgNum, nNewPos);
- USHORT nMin = Min(nPgNum, nNewPos);
+ sal_uInt16 nMin = Min(nPgNum, nNewPos);
UpdatePageObjectsInNotes(nMin);
}
@@ -401,7 +401,7 @@ void SdDrawDocument::MovePage(USHORT nPgNum, USHORT nNewPos)
|*
\************************************************************************/
-void SdDrawDocument::InsertPage(SdrPage* pPage, USHORT nPos)
+void SdDrawDocument::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
{
bool bLast = (nPos == GetPageCount());
@@ -422,7 +422,7 @@ void SdDrawDocument::InsertPage(SdrPage* pPage, USHORT nPos)
|*
\************************************************************************/
-void SdDrawDocument::DeletePage(USHORT nPgNum)
+void SdDrawDocument::DeletePage(sal_uInt16 nPgNum)
{
FmFormModel::DeletePage(nPgNum);
@@ -435,7 +435,7 @@ void SdDrawDocument::DeletePage(USHORT nPgNum)
|*
\************************************************************************/
-SdrPage* SdDrawDocument::RemovePage(USHORT nPgNum)
+SdrPage* SdDrawDocument::RemovePage(sal_uInt16 nPgNum)
{
SdrPage* pPage = FmFormModel::RemovePage(nPgNum);
@@ -453,7 +453,7 @@ SdrPage* SdDrawDocument::RemovePage(USHORT nPgNum)
// Warning: This is not called for new master pages created from SdrModel::Merge,
// you also have to modify code in SdDrawDocument::Merge!
-void SdDrawDocument::InsertMasterPage(SdrPage* pPage, USHORT nPos )
+void SdDrawDocument::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos )
{
FmFormModel::InsertMasterPage( pPage, nPos );
if( pPage && pPage->IsMasterPage() && (static_cast<SdPage*>(pPage)->GetPageKind() == PK_STANDARD) )
@@ -465,7 +465,7 @@ void SdDrawDocument::InsertMasterPage(SdrPage* pPage, USHORT nPos )
}
}
-SdrPage* SdDrawDocument::RemoveMasterPage(USHORT nPgNum)
+SdrPage* SdDrawDocument::RemoveMasterPage(sal_uInt16 nPgNum)
{
SdPage* pPage = static_cast<SdPage*>(GetMasterPage(nPgNum ));
if( pPage && pPage->IsMasterPage() && (pPage->GetPageKind() == PK_STANDARD) )
@@ -485,7 +485,7 @@ SdrPage* SdDrawDocument::RemoveMasterPage(USHORT nPgNum)
|*
\************************************************************************/
-void SdDrawDocument::SetSelected(SdPage* pPage, BOOL bSelect)
+void SdDrawDocument::SetSelected(SdPage* pPage, sal_Bool bSelect)
{
PageKind ePageKind = pPage->GetPageKind();
@@ -528,7 +528,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
* Wenn noch keine Seite im Model vorhanden ist (Datei-Neu), wird
* eine neue Seite eingefuegt
**************************************************************************/
- USHORT nPageCount = GetPageCount();
+ sal_uInt16 nPageCount = GetPageCount();
if (nPageCount <= 1)
{
@@ -538,7 +538,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
/**********************************************************************
* Handzettel-Seite einfuegen
**********************************************************************/
- SdPage* pHandoutPage = dynamic_cast< SdPage* >( AllocPage(FALSE) );
+ SdPage* pHandoutPage = dynamic_cast< SdPage* >( AllocPage(sal_False) );
SdPage* pRefPage = NULL;
@@ -563,7 +563,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
/**********************************************************************
* MasterPage einfuegen und an der Handzettel-Seite vermerken
**********************************************************************/
- SdPage* pHandoutMPage = (SdPage*) AllocPage(TRUE);
+ SdPage* pHandoutMPage = (SdPage*) AllocPage(sal_True);
pHandoutMPage->SetSize( pHandoutPage->GetSize() );
pHandoutMPage->SetPageKind(PK_HANDOUT);
pHandoutMPage->SetBorder( pHandoutPage->GetLftBorder(),
@@ -579,14 +579,14 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
* Eine Standard-Seite ist daher schon vorhanden.
**********************************************************************/
SdPage* pPage;
- BOOL bClipboard = FALSE;
+ sal_Bool bClipboard = sal_False;
if( pRefDocument )
pRefPage = pRefDocument->GetSdPage( 0, PK_STANDARD );
if (nPageCount == 0)
{
- pPage = dynamic_cast< SdPage* >( AllocPage(FALSE) );
+ pPage = dynamic_cast< SdPage* >( AllocPage(sal_False) );
if( pRefPage )
{
@@ -598,7 +598,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
// Draw: stets Default-Groesse mit Raendern
pPage->SetSize(aDefSize);
- SfxPrinter* pPrinter = mpDocSh->GetPrinter(FALSE);
+ SfxPrinter* pPrinter = mpDocSh->GetPrinter(sal_False);
if (pPrinter && pPrinter->IsValid())
{
Size aOutSize(pPrinter->GetOutputSize());
@@ -606,10 +606,10 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
aPageOffset -= pPrinter->PixelToLogic( Point() );
long nOffset = !aPageOffset.X() && !aPageOffset.X() ? 0 : PRINT_OFFSET;
- ULONG nTop = aPageOffset.Y();
- ULONG nLeft = aPageOffset.X();
- ULONG nBottom = Max((long)(aDefSize.Height() - aOutSize.Height() - nTop + nOffset), 0L);
- ULONG nRight = Max((long)(aDefSize.Width() - aOutSize.Width() - nLeft + nOffset), 0L);
+ sal_uLong nTop = aPageOffset.Y();
+ sal_uLong nLeft = aPageOffset.X();
+ sal_uLong nBottom = Max((long)(aDefSize.Height() - aOutSize.Height() - nTop + nOffset), 0L);
+ sal_uLong nRight = Max((long)(aDefSize.Width() - aOutSize.Width() - nLeft + nOffset), 0L);
pPage->SetBorder(nLeft, nTop, nRight, nBottom);
}
@@ -635,14 +635,14 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
}
else
{
- bClipboard = TRUE;
+ bClipboard = sal_True;
pPage = (SdPage*) GetPage(1);
}
/**********************************************************************
* MasterPage einfuegen und an der Seite vermerken
**********************************************************************/
- SdPage* pMPage = (SdPage*) AllocPage(TRUE);
+ SdPage* pMPage = (SdPage*) AllocPage(sal_True);
pMPage->SetSize( pPage->GetSize() );
pMPage->SetBorder( pPage->GetLftBorder(),
pPage->GetUppBorder(),
@@ -656,7 +656,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
/**********************************************************************
* Notizen-Seite einfuegen
**********************************************************************/
- SdPage* pNotesPage = (SdPage*) AllocPage(FALSE);
+ SdPage* pNotesPage = (SdPage*) AllocPage(sal_False);
if( pRefDocument )
pRefPage = pRefDocument->GetSdPage( 0, PK_NOTES );
@@ -688,7 +688,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
/**********************************************************************
* MasterPage einfuegen und an der Notizen-Seite vermerken
**********************************************************************/
- SdPage* pNotesMPage = (SdPage*) AllocPage(TRUE);
+ SdPage* pNotesMPage = (SdPage*) AllocPage(sal_True);
pNotesMPage->SetSize( pNotesPage->GetSize() );
pNotesMPage->SetPageKind(PK_NOTES);
pNotesMPage->SetBorder( pNotesPage->GetLftBorder(),
@@ -702,14 +702,14 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
if( !pRefPage && (meDocType != DOCUMENT_TYPE_DRAW) )
- pPage->SetAutoLayout( AUTOLAYOUT_TITLE, TRUE, TRUE );
+ pPage->SetAutoLayout( AUTOLAYOUT_TITLE, sal_True, sal_True );
mpWorkStartupTimer = new Timer();
mpWorkStartupTimer->SetTimeoutHdl( LINK(this, SdDrawDocument, WorkStartupHdl) );
mpWorkStartupTimer->SetTimeout(2000);
mpWorkStartupTimer->Start();
- SetChanged(FALSE);
+ SetChanged(sal_False);
}
}
@@ -721,10 +721,10 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
|*
\************************************************************************/
-BOOL SdDrawDocument::CreateMissingNotesAndHandoutPages()
+sal_Bool SdDrawDocument::CreateMissingNotesAndHandoutPages()
{
- BOOL bOK = FALSE;
- USHORT nPageCount = GetPageCount();
+ sal_Bool bOK = sal_False;
+ sal_uInt16 nPageCount = GetPageCount();
if (nPageCount != 0)
{
@@ -738,7 +738,7 @@ BOOL SdDrawDocument::CreateMissingNotesAndHandoutPages()
pHandoutPage->SetPageKind(PK_HANDOUT);
pHandoutPage->TRG_SetMasterPage( *pHandoutMPage );
- for (USHORT i = 1; i < nPageCount; i = i + 2)
+ for (sal_uInt16 i = 1; i < nPageCount; i = i + 2)
{
SdPage* pPage = (SdPage*) GetPage(i);
@@ -757,9 +757,9 @@ BOOL SdDrawDocument::CreateMissingNotesAndHandoutPages()
pNotesPage->TRG_SetMasterPage(*GetMasterPage(nMasterPageAfterPagesMasterPage));
}
- bOK = TRUE;
+ bOK = sal_True;
StopWorkStartupDelay();
- SetChanged(FALSE);
+ SetChanged(sal_False);
}
return(bOK);
@@ -768,17 +768,17 @@ BOOL SdDrawDocument::CreateMissingNotesAndHandoutPages()
/*************************************************************************
|*
|* - selektierte Seiten hinter genannte Seite schieben
-|* (nTargetPage = (USHORT)-1 --> vor erste Seite schieben)
-|* - ergibt TRUE, wenn Seiten verschoben wurden
+|* (nTargetPage = (sal_uInt16)-1 --> vor erste Seite schieben)
+|* - ergibt sal_True, wenn Seiten verschoben wurden
|*
\************************************************************************/
-BOOL SdDrawDocument::MovePages(USHORT nTargetPage)
+sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
{
SdPage* pPage = NULL;
- USHORT nPage;
- USHORT nNoOfPages = GetSdPageCount(PK_STANDARD);
- BOOL bSomethingHappened = FALSE;
+ sal_uInt16 nPage;
+ sal_uInt16 nNoOfPages = GetSdPageCount(PK_STANDARD);
+ sal_Bool bSomethingHappened = sal_False;
const bool bUndo = IsUndoEnabled();
@@ -798,7 +798,7 @@ BOOL SdDrawDocument::MovePages(USHORT nTargetPage)
// falls noetig, nach vorne hangeln, bis nicht selektierte Seite gefunden
nPage = nTargetPage;
- if (nPage != (USHORT)-1)
+ if (nPage != (sal_uInt16)-1)
{
pPage = GetSdPage(nPage, PK_STANDARD);
while (nPage > 0 && pPage->IsSelected())
@@ -809,12 +809,12 @@ BOOL SdDrawDocument::MovePages(USHORT nTargetPage)
if (pPage->IsSelected())
{
- nPage = (USHORT)-1;
+ nPage = (sal_uInt16)-1;
}
}
// vor der ersten Seite einfuegen
- if (nPage == (USHORT)-1)
+ if (nPage == (sal_uInt16)-1)
{
while (aPageList.Count() > 0)
{
@@ -831,7 +831,7 @@ BOOL SdDrawDocument::MovePages(USHORT nTargetPage)
if( bUndo )
AddUndo(GetSdrUndoFactory().CreateUndoSetPageNum(*pPg, nPage+1, 2));
MovePage(nPage+1, 2);
- bSomethingHappened = TRUE;
+ bSomethingHappened = sal_True;
}
aPageList.Remove();
}
@@ -859,7 +859,7 @@ BOOL SdDrawDocument::MovePages(USHORT nTargetPage)
if( bUndo )
AddUndo(GetSdrUndoFactory().CreateUndoSetPageNum(*pPg, nPage+1, nTargetPage+1));
MovePage(nPage+1, nTargetPage+1);
- bSomethingHappened = TRUE;
+ bSomethingHappened = sal_True;
}
}
else
@@ -874,10 +874,10 @@ BOOL SdDrawDocument::MovePages(USHORT nTargetPage)
if( bUndo )
AddUndo(GetSdrUndoFactory().CreateUndoSetPageNum(*pPg, nPage, nTargetPage));
MovePage(nPage, nTargetPage);
- bSomethingHappened = TRUE;
+ bSomethingHappened = sal_True;
}
}
- aPageList.Remove((ULONG)0);
+ aPageList.Remove((sal_uLong)0);
nTargetPage = pPage->GetPageNum();
}
}
@@ -895,7 +895,7 @@ BOOL SdDrawDocument::MovePages(USHORT nTargetPage)
|*
\************************************************************************/
-ULONG SdDrawDocument::GetLinkCount()
+sal_uLong SdDrawDocument::GetLinkCount()
{
return ( pLinkManager->GetLinks().Count() );
}
@@ -906,24 +906,24 @@ ULONG SdDrawDocument::GetLinkCount()
|*
\************************************************************************/
-void SdDrawDocument::SetLanguage( const LanguageType eLang, const USHORT nId )
+void SdDrawDocument::SetLanguage( const LanguageType eLang, const sal_uInt16 nId )
{
- BOOL bChanged = FALSE;
+ sal_Bool bChanged = sal_False;
if( nId == EE_CHAR_LANGUAGE && meLanguage != eLang )
{
meLanguage = eLang;
- bChanged = TRUE;
+ bChanged = sal_True;
}
else if( nId == EE_CHAR_LANGUAGE_CJK && meLanguageCJK != eLang )
{
meLanguageCJK = eLang;
- bChanged = TRUE;
+ bChanged = sal_True;
}
else if( nId == EE_CHAR_LANGUAGE_CTL && meLanguageCTL != eLang )
{
meLanguageCTL = eLang;
- bChanged = TRUE;
+ bChanged = sal_True;
}
if( bChanged )
@@ -942,7 +942,7 @@ void SdDrawDocument::SetLanguage( const LanguageType eLang, const USHORT nId )
|*
\************************************************************************/
-LanguageType SdDrawDocument::GetLanguage( const USHORT nId ) const
+LanguageType SdDrawDocument::GetLanguage( const sal_uInt16 nId ) const
{
LanguageType eLangType = meLanguage;
@@ -964,9 +964,9 @@ LanguageType SdDrawDocument::GetLanguage( const USHORT nId ) const
IMPL_LINK( SdDrawDocument, WorkStartupHdl, Timer *, EMPTYARG )
{
if( mpDocSh )
- mpDocSh->SetWaitCursor( TRUE );
+ mpDocSh->SetWaitCursor( sal_True );
- BOOL bChanged = IsChanged(); // merken
+ sal_Bool bChanged = IsChanged(); // merken
// Autolayouts initialisieren
SdPage* pHandoutMPage = GetMasterSdPage(0, PK_HANDOUT);
@@ -974,7 +974,7 @@ IMPL_LINK( SdDrawDocument, WorkStartupHdl, Timer *, EMPTYARG )
if (pHandoutMPage->GetAutoLayout() == AUTOLAYOUT_NONE)
{
// AutoLayout wurde noch nicht umgesetzt -> Initialisieren
- pHandoutMPage->SetAutoLayout(AUTOLAYOUT_HANDOUT6, TRUE, TRUE);
+ pHandoutMPage->SetAutoLayout(AUTOLAYOUT_HANDOUT6, sal_True, sal_True);
}
SdPage* pPage = GetSdPage(0, PK_STANDARD);
@@ -982,7 +982,7 @@ IMPL_LINK( SdDrawDocument, WorkStartupHdl, Timer *, EMPTYARG )
if (pPage->GetAutoLayout() == AUTOLAYOUT_NONE)
{
// AutoLayout wurde noch nicht umgesetzt -> Initialisieren
- pPage->SetAutoLayout(AUTOLAYOUT_NONE, TRUE, TRUE);
+ pPage->SetAutoLayout(AUTOLAYOUT_NONE, sal_True, sal_True);
}
SdPage* pNotesPage = GetSdPage(0, PK_NOTES);
@@ -990,13 +990,13 @@ IMPL_LINK( SdDrawDocument, WorkStartupHdl, Timer *, EMPTYARG )
if (pNotesPage->GetAutoLayout() == AUTOLAYOUT_NONE)
{
// AutoLayout wurde noch nicht umgesetzt -> Initialisieren
- pNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, TRUE, TRUE);
+ pNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, sal_True, sal_True);
}
- SetChanged(bChanged || FALSE);
+ SetChanged(bChanged || sal_False);
if( mpDocSh )
- mpDocSh->SetWaitCursor( FALSE );
+ mpDocSh->SetWaitCursor( sal_False );
return 0;
}
@@ -1044,8 +1044,8 @@ SdAnimationInfo* SdDrawDocument::GetAnimationInfo(SdrObject* pObject) const
SdAnimationInfo* SdDrawDocument::GetShapeUserData(SdrObject& rObject, bool bCreate /* = false */ )
{
- USHORT nUD = 0;
- USHORT nUDCount = rObject.GetUserDataCount();
+ sal_uInt16 nUD = 0;
+ sal_uInt16 nUDCount = rObject.GetUserDataCount();
SdrObjUserData* pUD = 0;
SdAnimationInfo* pRet = 0;
@@ -1075,10 +1075,10 @@ SdIMapInfo* SdDrawDocument::GetIMapInfo( SdrObject* pObject ) const
SdrObjUserData* pUserData = NULL;
SdIMapInfo* pIMapInfo = NULL;
- USHORT nCount = pObject->GetUserDataCount();
+ sal_uInt16 nCount = pObject->GetUserDataCount();
// gibt es in den User-Daten eine IMap-Information?
- for ( USHORT i = 0; i < nCount; i++ )
+ for ( sal_uInt16 i = 0; i < nCount; i++ )
{
pUserData = pObject->GetUserData( i );
@@ -1103,7 +1103,7 @@ IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj,
Point aRelPoint( rWinPoint );
ImageMap& rImageMap = (ImageMap&) pIMapInfo->GetImageMap();
const Rectangle& rRect = pObj->GetLogicRect();
- BOOL bObjSupported = FALSE;
+ sal_Bool bObjSupported = sal_False;
// HitTest ausfuehren
if ( pObj->ISA( SdrGrafObj ) ) // einfaches Grafik-Objekt
@@ -1131,12 +1131,12 @@ IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj,
pGrafObj->GetGrafPrefMapMode(), aMap100 );
delete pGeoData;
- bObjSupported = TRUE;
+ bObjSupported = sal_True;
}
else if ( pObj->ISA( SdrOle2Obj ) ) // OLE-Objekt
{
aGraphSize = ( (SdrOle2Obj*) pObj )->GetOrigObjSize();
- bObjSupported = TRUE;
+ bObjSupported = sal_True;
}
// hat alles geklappt, dann HitTest ausfuehren
@@ -1163,7 +1163,7 @@ void SdDrawDocument::CheckMasterPages()
{
// RemoveMasterPage(2); // code to test the creation of notes pages
- USHORT nMaxPages = GetMasterPageCount();
+ sal_uInt16 nMaxPages = GetMasterPageCount();
// we need at least a handout master and one master page
if( nMaxPages < 2 )
@@ -1174,7 +1174,7 @@ void SdDrawDocument::CheckMasterPages()
SdPage* pPage = NULL;
SdPage* pNotesPage = NULL;
- USHORT nPage;
+ sal_uInt16 nPage;
// first see if the page order is correct
for( nPage = 1; nPage < nMaxPages; nPage++ )
@@ -1199,7 +1199,7 @@ void SdDrawDocument::CheckMasterPages()
if( pPage->GetPageKind() != PK_STANDARD )
{
bChanged = sal_True;
- USHORT nFound = nPage + 1;
+ sal_uInt16 nFound = nPage + 1;
while( nFound < nMaxPages )
{
pPage = static_cast<SdPage*>(GetMasterPage( nFound ));
@@ -1230,7 +1230,7 @@ void SdDrawDocument::CheckMasterPages()
{
bChanged = sal_True;
- USHORT nFound = nPage + 1;
+ sal_uInt16 nFound = nPage + 1;
while( nFound < nMaxPages )
{
pNotesPage = static_cast<SdPage*>(GetMasterPage( nFound ));
@@ -1299,15 +1299,16 @@ void SdDrawDocument::CheckMasterPages()
}
}
-USHORT SdDrawDocument::CreatePage (
+sal_uInt16 SdDrawDocument::CreatePage (
SdPage* pActualPage,
PageKind ePageKind,
const String& sStandardPageName,
const String& sNotesPageName,
AutoLayout eStandardLayout,
AutoLayout eNotesLayout,
- BOOL bIsPageBack,
- BOOL bIsPageObj)
+ sal_Bool bIsPageBack,
+ sal_Bool bIsPageObj,
+ const sal_Int32 nInsertPosition)
{
SdPage* pPreviousStandardPage;
SdPage* pPreviousNotesPage;
@@ -1319,20 +1320,20 @@ USHORT SdDrawDocument::CreatePage (
if (ePageKind == PK_NOTES)
{
pPreviousNotesPage = pActualPage;
- USHORT nNotesPageNum = pPreviousNotesPage->GetPageNum() + 2;
+ sal_uInt16 nNotesPageNum = pPreviousNotesPage->GetPageNum() + 2;
pPreviousStandardPage = (SdPage*) GetPage(nNotesPageNum - 3);
eStandardLayout = pPreviousStandardPage->GetAutoLayout();
}
else
{
pPreviousStandardPage = pActualPage;
- USHORT nStandardPageNum = pPreviousStandardPage->GetPageNum() + 2;
+ sal_uInt16 nStandardPageNum = pPreviousStandardPage->GetPageNum() + 2;
pPreviousNotesPage = (SdPage*) GetPage(nStandardPageNum - 1);
eNotesLayout = pPreviousNotesPage->GetAutoLayout();
}
// Create new standard page and set it up.
- pStandardPage = (SdPage*) AllocPage(FALSE);
+ pStandardPage = (SdPage*) AllocPage(sal_False);
// Set the size here since else the presobj autolayout
// will be wrong.
@@ -1347,7 +1348,7 @@ USHORT SdDrawDocument::CreatePage (
// User layout of current standard page.
pStandardPage->SetLayoutName( pPreviousStandardPage->GetLayoutName() );
- pStandardPage->SetAutoLayout(eStandardLayout, TRUE);
+ pStandardPage->SetAutoLayout(eStandardLayout, sal_True);
pStandardPage->setHeaderFooterSettings( pPreviousStandardPage->getHeaderFooterSettings() );
// transition settings of current page
@@ -1362,7 +1363,7 @@ USHORT SdDrawDocument::CreatePage (
pStandardPage->SetTime( pPreviousStandardPage->GetTime() );
// Create new notes page and set it up.
- pNotesPage = (SdPage*) AllocPage(FALSE);
+ pNotesPage = (SdPage*) AllocPage(sal_False);
pNotesPage->SetPageKind(PK_NOTES);
// Use master page of current page.
@@ -1370,26 +1371,27 @@ USHORT SdDrawDocument::CreatePage (
// Use layout of current notes page.
pNotesPage->SetLayoutName( pPreviousNotesPage->GetLayoutName() );
- pNotesPage->SetAutoLayout(eNotesLayout, TRUE);
+ pNotesPage->SetAutoLayout(eNotesLayout, sal_True);
pNotesPage->setHeaderFooterSettings( pPreviousNotesPage->getHeaderFooterSettings() );
return InsertPageSet (
- pActualPage, ePageKind,
+ pActualPage,
+ ePageKind,
sStandardPageName,
sNotesPageName,
eStandardLayout,
eNotesLayout,
bIsPageBack,
bIsPageObj,
-
pStandardPage,
- pNotesPage);
+ pNotesPage,
+ nInsertPosition);
}
-USHORT SdDrawDocument::DuplicatePage (USHORT nPageNum)
+sal_uInt16 SdDrawDocument::DuplicatePage (sal_uInt16 nPageNum)
{
PageKind ePageKind = PK_STANDARD;
@@ -1398,8 +1400,8 @@ USHORT SdDrawDocument::DuplicatePage (USHORT nPageNum)
// Get background flags.
SdrLayerAdmin& rLayerAdmin = GetLayerAdmin();
- BYTE aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE);
- BYTE aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE);
+ sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False);
+ sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False);
SetOfByte aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers();
// Get layout from current page.
@@ -1417,15 +1419,16 @@ USHORT SdDrawDocument::DuplicatePage (USHORT nPageNum)
-USHORT SdDrawDocument::DuplicatePage (
+sal_uInt16 SdDrawDocument::DuplicatePage (
SdPage* pActualPage,
PageKind ePageKind,
const String& sStandardPageName,
const String& sNotesPageName,
AutoLayout eStandardLayout,
AutoLayout eNotesLayout,
- BOOL bIsPageBack,
- BOOL bIsPageObj)
+ sal_Bool bIsPageBack,
+ sal_Bool bIsPageObj,
+ const sal_Int32 nInsertPosition)
{
SdPage* pPreviousStandardPage;
SdPage* pPreviousNotesPage;
@@ -1437,13 +1440,13 @@ USHORT SdDrawDocument::DuplicatePage (
if (ePageKind == PK_NOTES)
{
pPreviousNotesPage = pActualPage;
- USHORT nNotesPageNum = pPreviousNotesPage->GetPageNum() + 2;
+ sal_uInt16 nNotesPageNum = pPreviousNotesPage->GetPageNum() + 2;
pPreviousStandardPage = (SdPage*) GetPage(nNotesPageNum - 3);
}
else
{
pPreviousStandardPage = pActualPage;
- USHORT nStandardPageNum = pPreviousStandardPage->GetPageNum() + 2;
+ sal_uInt16 nStandardPageNum = pPreviousStandardPage->GetPageNum() + 2;
pPreviousNotesPage = (SdPage*) GetPage(nStandardPageNum - 1);
}
@@ -1452,38 +1455,39 @@ USHORT SdDrawDocument::DuplicatePage (
pNotesPage = (SdPage*) pPreviousNotesPage->Clone();
return InsertPageSet (
- pActualPage, ePageKind,
+ pActualPage,
+ ePageKind,
sStandardPageName,
sNotesPageName,
eStandardLayout,
eNotesLayout,
bIsPageBack,
bIsPageObj,
-
pStandardPage,
- pNotesPage);
+ pNotesPage,
+ nInsertPosition);
}
-USHORT SdDrawDocument::InsertPageSet (
+sal_uInt16 SdDrawDocument::InsertPageSet (
SdPage* pActualPage,
PageKind ePageKind,
const String& sStandardPageName,
const String& sNotesPageName,
AutoLayout eStandardLayout,
AutoLayout eNotesLayout,
- BOOL bIsPageBack,
- BOOL bIsPageObj,
-
+ sal_Bool bIsPageBack,
+ sal_Bool bIsPageObj,
SdPage* pStandardPage,
- SdPage* pNotesPage)
+ SdPage* pNotesPage,
+ sal_Int32 nInsertPosition)
{
SdPage* pPreviousStandardPage;
SdPage* pPreviousNotesPage;
- USHORT nStandardPageNum;
- USHORT nNotesPageNum;
+ sal_uInt16 nStandardPageNum;
+ sal_uInt16 nNotesPageNum;
String aStandardPageName = sStandardPageName;
String aNotesPageName = sNotesPageName;
@@ -1508,13 +1512,16 @@ USHORT SdDrawDocument::InsertPageSet (
eNotesLayout = pPreviousNotesPage->GetAutoLayout();
}
+ OSL_ASSERT(nNotesPageNum==nStandardPageNum+1);
+ if (nInsertPosition < 0)
+ nInsertPosition = nStandardPageNum;
// Set up and insert the standard page.
SetupNewPage (
pPreviousStandardPage,
pStandardPage,
aStandardPageName,
- nStandardPageNum,
+ nInsertPosition,
bIsPageBack,
bIsPageObj);
@@ -1524,7 +1531,7 @@ USHORT SdDrawDocument::InsertPageSet (
pPreviousNotesPage,
pNotesPage,
aNotesPageName,
- nNotesPageNum,
+ nInsertPosition+1,
bIsPageBack,
bIsPageObj);
@@ -1540,9 +1547,9 @@ void SdDrawDocument::SetupNewPage (
SdPage* pPreviousPage,
SdPage* pPage,
const String& sPageName,
- USHORT nInsertionPoint,
- BOOL bIsPageBack,
- BOOL bIsPageObj)
+ sal_uInt16 nInsertionPoint,
+ sal_Bool bIsPageBack,
+ sal_Bool bIsPageObj)
{
if (pPreviousPage != NULL)
{
@@ -1559,8 +1566,8 @@ void SdDrawDocument::SetupNewPage (
if (pPreviousPage != NULL)
{
SdrLayerAdmin& rLayerAdmin = GetLayerAdmin();
- BYTE aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE);
- BYTE aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE);
+ sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False);
+ sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False);
SetOfByte aVisibleLayers = pPreviousPage->TRG_GetMasterPageVisibleLayers();
aVisibleLayers.Set(aBckgrnd, bIsPageBack);
aVisibleLayers.Set(aBckgrndObj, bIsPageObj);
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index b4a698c9cfdf..6f32b90725ab 100644..100755
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -58,6 +58,7 @@
#include <sot/formats.hxx>
#include <set>
+#include <boost/bind.hpp>
#include "glob.hrc"
#include "drawdoc.hxx"
@@ -80,9 +81,9 @@
using namespace ::com::sun::star;
-#define POOL_BUFFER_SIZE (USHORT)32768
-#define BASIC_BUFFER_SIZE (USHORT)8192
-#define DOCUMENT_BUFFER_SIZE (USHORT)32768
+#define POOL_BUFFER_SIZE (sal_uInt16)32768
+#define BASIC_BUFFER_SIZE (sal_uInt16)8192
+#define DOCUMENT_BUFFER_SIZE (sal_uInt16)32768
/*************************************************************************
|*
@@ -92,24 +93,24 @@ using namespace ::com::sun::star;
SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium& rMedium)
{
- BOOL bOK = TRUE;
+ sal_Bool bOK = sal_True;
SdDrawDocument* pBookmarkDoc = NULL;
String aBookmarkName = rMedium.GetName();
const SfxFilter* pFilter = rMedium.GetFilter();
if ( !pFilter )
{
- rMedium.UseInteractionHandler( TRUE );
+ rMedium.UseInteractionHandler( sal_True );
SFX_APP()->GetFilterMatcher().GuessFilter( rMedium, &pFilter );
}
if ( !pFilter )
{
- bOK = FALSE;
+ bOK = sal_False;
}
else if ( maBookmarkFile != aBookmarkName && aBookmarkName.Len() )
{
- BOOL bCreateGraphicShell = pFilter->GetServiceName().EqualsAscii( "com.sun.star.drawing.DrawingDocument" );
- BOOL bCreateImpressShell = pFilter->GetServiceName().EqualsAscii( "com.sun.star.presentation.PresentationDocument" );
+ sal_Bool bCreateGraphicShell = pFilter->GetServiceName().EqualsAscii( "com.sun.star.drawing.DrawingDocument" );
+ sal_Bool bCreateImpressShell = pFilter->GetServiceName().EqualsAscii( "com.sun.star.presentation.PresentationDocument" );
if ( bCreateGraphicShell || bCreateImpressShell )
{
CloseBookmarkDoc();
@@ -120,10 +121,10 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium& rMedium)
// direkt laden
if ( bCreateGraphicShell )
// Draw
- mxBookmarkDocShRef = new ::sd::GraphicDocShell(SFX_CREATE_MODE_STANDARD, TRUE);
+ mxBookmarkDocShRef = new ::sd::GraphicDocShell(SFX_CREATE_MODE_STANDARD, sal_True);
else
// Impress
- mxBookmarkDocShRef = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD, TRUE);
+ mxBookmarkDocShRef = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD, sal_True);
bOK = mxBookmarkDocShRef->DoLoad(&rMedium);
if( bOK )
@@ -164,7 +165,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(const String& rBookmarkFile)
if (maBookmarkFile != rBookmarkFile && rBookmarkFile.Len())
{
- SfxMedium* pMedium = new SfxMedium( rBookmarkFile, STREAM_READ, FALSE );
+ SfxMedium* pMedium = new SfxMedium( rBookmarkFile, STREAM_READ, sal_False );
pBookmarkDoc = OpenBookmarkDoc(*pMedium);
}
else if (mxBookmarkDocShRef.Is())
@@ -181,26 +182,26 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(const String& rBookmarkFile)
|*
\************************************************************************/
-BOOL SdDrawDocument::InsertBookmark(
+sal_Bool SdDrawDocument::InsertBookmark(
List* pBookmarkList, // Liste der Namen der einzufuegenden Bookmarks
List* pExchangeList, // Liste der zu verwendenen Namen
- BOOL bLink, // Bookmarks sollen als Verknuepfung eingefuegt werden
- BOOL bReplace, // Aktuellen Seiten (Standard&Notiz) werden ersetzt
- USHORT nInsertPos, // Einfuegeposition fuer Seiten
- BOOL bNoDialogs, // Keine Dialoge anzeigen
+ sal_Bool bLink, // Bookmarks sollen als Verknuepfung eingefuegt werden
+ sal_Bool bReplace, // Aktuellen Seiten (Standard&Notiz) werden ersetzt
+ sal_uInt16 nInsertPos, // Einfuegeposition fuer Seiten
+ sal_Bool bNoDialogs, // Keine Dialoge anzeigen
::sd::DrawDocShell* pBookmarkDocSh, // Wenn gesetzt, so ist dieses das Source-Dokument
- BOOL bCopy, // Seiten werden kopiert
+ sal_Bool bCopy, // Seiten werden kopiert
Point* pObjPos) // Einfuegeposition fuer Objekte
{
- BOOL bOK = TRUE;
- BOOL bInsertPages = FALSE;
+ sal_Bool bOK = sal_True;
+ sal_Bool bInsertPages = sal_False;
if (!pBookmarkList)
{
/**********************************************************************
* Alle Seiten werden eingefuegt
**********************************************************************/
- bInsertPages = TRUE;
+ bInsertPages = sal_True;
}
else
{
@@ -218,20 +219,20 @@ BOOL SdDrawDocument::InsertBookmark(
aBookmarkName = maBookmarkFile;
}
else
- bOK = FALSE;
+ bOK = sal_False;
- for (USHORT nPos = 0; bOK && ( nPos < pBookmarkList->Count() ) && !bInsertPages; nPos++)
+ for (sal_uInt16 nPos = 0; bOK && ( nPos < pBookmarkList->Count() ) && !bInsertPages; nPos++)
{
/******************************************************************
* Gibt es in der Bookmark-Liste einen Seitennamen?
******************************************************************/
String aBMPgName (*(String*) pBookmarkList->GetObject(nPos));
- BOOL bIsMasterPage;
+ sal_Bool bIsMasterPage;
if( pBookmarkDoc->GetPageByName( aBMPgName, bIsMasterPage ) != SDRPAGE_NOTFOUND )
{
// Seite gefunden
- bInsertPages = TRUE;
+ bInsertPages = sal_True;
}
}
}
@@ -240,7 +241,7 @@ BOOL SdDrawDocument::InsertBookmark(
{
// Zuerst werden alle Seiten-Bookmarks eingefuegt
bOK = InsertBookmarkAsPage(pBookmarkList, pExchangeList, bLink, bReplace,
- nInsertPos, bNoDialogs, pBookmarkDocSh, bCopy, TRUE, FALSE);
+ nInsertPos, bNoDialogs, pBookmarkDocSh, bCopy, sal_True, sal_False);
}
if ( bOK && pBookmarkList )
@@ -273,7 +274,7 @@ SdDrawDocument::InsertBookmarkAsPage_PageFunctorBase::~InsertBookmarkAsPage_Page
{
}
-void SdDrawDocument::IterateBookmarkPages( SdDrawDocument* pBookmarkDoc, List* pBookmarkList, USHORT nBMSdPageCount,
+void SdDrawDocument::IterateBookmarkPages( SdDrawDocument* pBookmarkDoc, List* pBookmarkList, sal_uInt16 nBMSdPageCount,
SdDrawDocument::InsertBookmarkAsPage_PageFunctorBase& rPageIterator )
{
//
@@ -303,15 +304,15 @@ void SdDrawDocument::IterateBookmarkPages( SdDrawDocument* pBookmarkDoc, List* p
if( !pBookmarkList )
{
// simply take master page of nPos'th page in source document
- pBMMPage = (SdPage*)(&(pBookmarkDoc->GetSdPage((USHORT)nPos, PK_STANDARD)->TRG_GetMasterPage()));
+ pBMMPage = (SdPage*)(&(pBookmarkDoc->GetSdPage((sal_uInt16)nPos, PK_STANDARD)->TRG_GetMasterPage()));
}
else
{
// fetch nPos'th entry from bookmark list, and determine master page
String aBMPgName (*(String*) pBookmarkList->GetObject(nPos));
- BOOL bIsMasterPage;
+ sal_Bool bIsMasterPage;
- USHORT nBMPage = pBookmarkDoc->GetPageByName( aBMPgName, bIsMasterPage );
+ sal_uInt16 nBMPage = pBookmarkDoc->GetPageByName( aBMPgName, bIsMasterPage );
if (nBMPage != SDRPAGE_NOTFOUND)
{
@@ -325,7 +326,7 @@ void SdDrawDocument::IterateBookmarkPages( SdDrawDocument* pBookmarkDoc, List* p
// enforce that bookmarked page is a standard page and not already a master page
if (pBMPage && pBMPage->GetPageKind()==PK_STANDARD && !pBMPage->IsMasterPage())
{
- const USHORT nBMSdPage = (nBMPage - 1) / 2;
+ const sal_uInt16 nBMSdPage = (nBMPage - 1) / 2;
pBMMPage = (SdPage*) (&(pBookmarkDoc->GetSdPage(nBMSdPage, PK_STANDARD)->TRG_GetMasterPage()));
}
}
@@ -343,7 +344,7 @@ class InsertBookmarkAsPage_FindDuplicateLayouts : public SdDrawDocument::InsertB
{
public:
InsertBookmarkAsPage_FindDuplicateLayouts( List* pLayoutsToTransfer, SdDrawDocument* pBookmarkDoc,
- List* pBookmarkList, USHORT nBMSdPageCount ) :
+ List* pBookmarkList, sal_uInt16 nBMSdPageCount ) :
mpLayoutsToTransfer(pLayoutsToTransfer), mpBookmarkDoc(pBookmarkDoc),
mpBookmarkList(pBookmarkList), mnBMSdPageCount(nBMSdPageCount) {}
virtual ~InsertBookmarkAsPage_FindDuplicateLayouts() {};
@@ -352,7 +353,7 @@ private:
List* mpLayoutsToTransfer;
SdDrawDocument* mpBookmarkDoc;
List* mpBookmarkList;
- USHORT mnBMSdPageCount;
+ sal_uInt16 mnBMSdPageCount;
};
void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc, SdPage* pBMMPage )
@@ -365,18 +366,18 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc
pLayout->Erase( pLayout->SearchAscii( SD_LT_SEPARATOR ));
String* pTest = (String*) mpLayoutsToTransfer->First();
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
while (pTest && !bFound) // found yet?
{
if (*pLayout == *pTest)
- bFound = TRUE;
+ bFound = sal_True;
else
pTest = (String*)mpLayoutsToTransfer->Next();
}
- const USHORT nMPageCount = rDoc.GetMasterPageCount();
- for (USHORT nMPage = 0; nMPage < nMPageCount && !bFound; nMPage++)
+ const sal_uInt16 nMPageCount = rDoc.GetMasterPageCount();
+ for (sal_uInt16 nMPage = 0; nMPage < nMPageCount && !bFound; nMPage++)
{
/**************************************************************
* Gibt es die Layouts schon im Dokument?
@@ -386,7 +387,7 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc
aTest.Erase( aTest.SearchAscii( SD_LT_SEPARATOR ));
if (aTest == *pLayout)
- bFound = TRUE;
+ bFound = sal_True;
}
if (!bFound)
@@ -395,23 +396,37 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc
delete pLayout;
}
+/** Just add one page to the container given to the constructor.
+*/
+class InsertBookmarkAsPage_AddBookmarkedPages
+ : public SdDrawDocument::InsertBookmarkAsPage_PageFunctorBase
+{
+public:
+ InsertBookmarkAsPage_AddBookmarkedPages(::std::vector<SdPage*>& rContainer)
+ : mrContainer(rContainer) {}
+ ~InsertBookmarkAsPage_AddBookmarkedPages(void) {}
+ void operator() (SdDrawDocument&, SdPage* pPage) { mrContainer.push_back(pPage); }
+private:
+ ::std::vector<SdPage*>& mrContainer;
+};
-BOOL SdDrawDocument::InsertBookmarkAsPage(
+
+sal_Bool SdDrawDocument::InsertBookmarkAsPage(
List* pBookmarkList,
List* pExchangeList, // Liste der zu verwendenen Namen
- BOOL bLink,
- BOOL bReplace,
- USHORT nInsertPos,
- BOOL bNoDialogs,
+ sal_Bool bLink,
+ sal_Bool bReplace,
+ sal_uInt16 nInsertPos,
+ sal_Bool bNoDialogs,
::sd::DrawDocShell* pBookmarkDocSh,
- BOOL bCopy,
- BOOL bMergeMasterPages,
- BOOL bPreservePageNames)
+ sal_Bool bCopy,
+ sal_Bool bMergeMasterPages,
+ sal_Bool bPreservePageNames)
{
- BOOL bOK = TRUE;
- BOOL bContinue = TRUE;
- BOOL bScaleObjects = FALSE;
- USHORT nReplacedStandardPages = 0;
+ sal_Bool bOK = sal_True;
+ sal_Bool bContinue = sal_True;
+ sal_Bool bScaleObjects = sal_False;
+ sal_uInt16 nReplacedStandardPages = 0;
SdDrawDocument* pBookmarkDoc = NULL;
String aBookmarkName;
@@ -432,16 +447,16 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
}
else
{
- return FALSE;
+ return sal_False;
}
- const USHORT nSdPageCount = GetSdPageCount(PK_STANDARD);
- const USHORT nBMSdPageCount = pBookmarkDoc->GetSdPageCount(PK_STANDARD);
- const USHORT nMPageCount = GetMasterPageCount();
+ const sal_uInt16 nSdPageCount = GetSdPageCount(PK_STANDARD);
+ const sal_uInt16 nBMSdPageCount = pBookmarkDoc->GetSdPageCount(PK_STANDARD);
+ const sal_uInt16 nMPageCount = GetMasterPageCount();
if (nSdPageCount==0 || nBMSdPageCount==0 || nMPageCount==0)
{
- bContinue = bOK = FALSE;
+ bContinue = bOK = sal_False;
return(bContinue);
}
@@ -451,18 +466,18 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
// Note that the pointers are used later on as general page pointers.
SdPage* pRefPage = GetSdPage(0, PK_STANDARD);
Size aSize(pRefPage->GetSize());
- INT32 nLeft = pRefPage->GetLftBorder();
- INT32 nRight = pRefPage->GetRgtBorder();
- INT32 nUpper = pRefPage->GetUppBorder();
- INT32 nLower = pRefPage->GetLwrBorder();
+ sal_Int32 nLeft = pRefPage->GetLftBorder();
+ sal_Int32 nRight = pRefPage->GetRgtBorder();
+ sal_Int32 nUpper = pRefPage->GetUppBorder();
+ sal_Int32 nLower = pRefPage->GetLwrBorder();
Orientation eOrient = pRefPage->GetOrientation();
SdPage* pNPage = GetSdPage(0, PK_NOTES);
Size aNSize(GetSdPage(0, PK_NOTES)->GetSize());
- INT32 nNLeft = pNPage->GetLftBorder();
- INT32 nNRight = pNPage->GetRgtBorder();
- INT32 nNUpper = pNPage->GetUppBorder();
- INT32 nNLower = pNPage->GetLwrBorder();
+ sal_Int32 nNLeft = pNPage->GetLftBorder();
+ sal_Int32 nNRight = pNPage->GetRgtBorder();
+ sal_Int32 nNUpper = pNPage->GetUppBorder();
+ sal_Int32 nNLower = pNPage->GetLwrBorder();
Orientation eNOrient = pRefPage->GetOrientation();
// Seitengroesse und -raender an die Werte der letzten
@@ -474,7 +489,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
if( !pBookmarkList )
bScaleObjects = pRefPage->IsScaleObjects();
else
- bScaleObjects = TRUE;
+ bScaleObjects = sal_True;
}
else
{
@@ -487,7 +502,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
pBMPage->GetLwrBorder() != pRefPage->GetLwrBorder())
{
String aStr(SdResId(STR_SCALE_OBJECTS));
- USHORT nBut = QueryBox( NULL, WB_YES_NO_CANCEL, aStr).Execute();
+ sal_uInt16 nBut = QueryBox( NULL, WB_YES_NO_CANCEL, aStr).Execute();
bScaleObjects = nBut == RET_YES;
bContinue = nBut != RET_CANCEL;
@@ -505,7 +520,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
|* den Seiten transferieren, sonst verlieren die Textobjekte
|* beim Transfer den Bezug zur Vorlage
\*************************************************************************/
- SfxUndoManager* pUndoMgr = NULL;
+ ::svl::IUndoManager* pUndoMgr = NULL;
if( mpDocSh )
{
pUndoMgr = mpDocSh->GetUndoManager();
@@ -532,7 +547,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
// Wenn Vorlagen kopiert werden muessen, dann muessen auch die
// MasterPages kopiert werden!
if( pLayout )
- bMergeMasterPages = TRUE;
+ bMergeMasterPages = sal_True;
while (pLayout)
{
@@ -544,7 +559,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
{
if( pUndoMgr )
{
- SdMoveStyleSheetsUndoAction* pMovStyles = new SdMoveStyleSheetsUndoAction(this, aCreatedStyles, TRUE);
+ SdMoveStyleSheetsUndoAction* pMovStyles = new SdMoveStyleSheetsUndoAction(this, aCreatedStyles, sal_True);
pUndoMgr->AddUndoAction(pMovStyles);
}
}
@@ -573,17 +588,17 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
nInsertPos = GetPageCount();
}
- USHORT nActualInsertPos = nInsertPos;
+ sal_uInt16 nActualInsertPos = nInsertPos;
List aNameList;
- std::set<USHORT> aRenameSet;
- USHORT nBMSdPage;
+ std::set<sal_uInt16> aRenameSet;
+ sal_uInt16 nBMSdPage;
for (nBMSdPage=0; nBMSdPage < nBMSdPageCount; nBMSdPage++)
{
SdPage* pBMPage = pBookmarkDoc->GetSdPage(nBMSdPage, PK_STANDARD);
String pName( pBMPage->GetName() );
- BOOL bIsMasterPage;
+ sal_Bool bIsMasterPage;
if (bLink)
{
@@ -606,8 +621,8 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
0xFFFF, // Aber alle anderen
nActualInsertPos, // An Position einfuegen
bMergeMasterPages, // MasterPages mitnehmen
- FALSE, // Aber nur die benoetigten MasterPages
- TRUE, // Undo-Aktion erzeugen
+ sal_False, // Aber nur die benoetigten MasterPages
+ sal_True, // Undo-Aktion erzeugen
bCopy); // Seiten kopieren (oder mergen)
for (nBMSdPage=0; nBMSdPage < nBMSdPageCount; nBMSdPage++)
@@ -647,29 +662,30 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
if (nInsertPos >= GetPageCount())
{
// Seiten werden hinten angefuegt
- bReplace = FALSE;
+ bReplace = sal_False;
nInsertPos = GetPageCount();
}
- USHORT nActualInsertPos = nInsertPos;
+ sal_uInt16 nActualInsertPos = nInsertPos;
- for (USHORT nPos = 0; nPos < pBookmarkList->Count(); nPos++)
+ // Collect the bookmarked pages.
+ ::std::vector<SdPage*> aBookmarkedPages (pBookmarkList->Count(), NULL);
+ for (sal_uInt16 nPos = 0; nPos < pBookmarkList->Count(); nPos++)
{
- /**************************************************************
- * Namen der Bookmark-Seiten aus Liste holen
- **************************************************************/
String aPgName(*(String*) pBookmarkList->GetObject(nPos));
- BOOL bIsMasterPage;
- USHORT nBMPage = pBookmarkDoc->GetPageByName( aPgName, bIsMasterPage );
+ sal_Bool bIsMasterPage;
+ sal_uInt16 nBMPage = pBookmarkDoc->GetPageByName( aPgName, bIsMasterPage );
if (nBMPage != SDRPAGE_NOTFOUND)
{
- pBMPage = (SdPage*) pBookmarkDoc->GetPage(nBMPage);
- }
- else
- {
- pBMPage = NULL;
+ aBookmarkedPages[nPos] = dynamic_cast<SdPage*>(pBookmarkDoc->GetPage(nBMPage));
}
+ }
+
+ for (sal_uInt16 nPos = 0; nPos < pBookmarkList->Count(); nPos++)
+ {
+ pBMPage = aBookmarkedPages[nPos];
+ sal_uInt16 nBMPage = pBMPage!=NULL ? pBMPage->GetPageNum() : SDRPAGE_NOTFOUND;
if (pBMPage && pBMPage->GetPageKind()==PK_STANDARD && !pBMPage->IsMasterPage())
{
@@ -681,7 +697,9 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
// delay renaming *after* pages are copied (might destroy source otherwise)
// don't change name if source and dest model are the same!
// avoid renaming if replacing the same page
- USHORT nPageSameName = GetPageByName(aPgName, bIsMasterPage);
+ String aPgName(*(String*) pBookmarkList->GetObject(nPos));
+ sal_Bool bIsMasterPage;
+ sal_uInt16 nPageSameName = GetPageByName(aPgName, bIsMasterPage);
if( pBookmarkDoc != this &&
nPageSameName != SDRPAGE_NOTFOUND &&
( !bReplace ||
@@ -690,7 +708,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
bMustRename = sal_True;
}
- SdPage* pBookmarkPage = dynamic_cast< SdPage* >( pBookmarkDoc->GetPage(nBMPage) );
+ SdPage* pBookmarkPage = pBMPage;
if (bReplace )
{
ReplacePageInCustomShows( dynamic_cast< SdPage* >( GetPage( nActualInsertPos ) ), pBookmarkPage );
@@ -701,8 +719,8 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
nBMPage+1, // Bis Seite (Notizen)
nActualInsertPos, // An Position einfuegen
bMergeMasterPages, // MasterPages mitnehmen
- FALSE, // Aber nur die benoetigten MasterPages
- TRUE, // Undo-Aktion erzeugen
+ sal_False, // Aber nur die benoetigten MasterPages
+ sal_True, // Undo-Aktion erzeugen
bCopy); // Seiten kopieren (oder mergen)
if( bReplace )
@@ -801,17 +819,17 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
|* DrawingEngine gleiche Praesentationslayouts nicht erkennen kann.
|* Ueberzaehlige MasterPages entfernen.
\*************************************************************************/
- USHORT nNewMPageCount = GetMasterPageCount();
+ sal_uInt16 nNewMPageCount = GetMasterPageCount();
// rueckwaerts, damit Nummern nicht durcheinander geraten
- for (USHORT nPage = nNewMPageCount - 1; nPage >= nMPageCount; nPage--)
+ for (sal_uInt16 nPage = nNewMPageCount - 1; nPage >= nMPageCount; nPage--)
{
pRefPage = (SdPage*) GetMasterPage(nPage);
String aMPLayout(pRefPage->GetLayoutName());
PageKind eKind = pRefPage->GetPageKind();
// gibt's den schon?
- for (USHORT nTest = 0; nTest < nMPageCount; nTest++)
+ for (sal_uInt16 nTest = 0; nTest < nMPageCount; nTest++)
{
SdPage* pTest = (SdPage*) GetMasterPage(nTest);
String aTest(pTest->GetLayoutName());
@@ -837,8 +855,8 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
// nInsertPos > 2 is always true when inserting into non-empty models
if (nInsertPos > 0)
{
- USHORT nSdPageStart = (nInsertPos - 1) / 2;
- USHORT nSdPageEnd = GetSdPageCount(PK_STANDARD) - nSdPageCount +
+ sal_uInt16 nSdPageStart = (nInsertPos - 1) / 2;
+ sal_uInt16 nSdPageEnd = GetSdPageCount(PK_STANDARD) - nSdPageCount +
nSdPageStart - 1;
const bool bRemoveEmptyPresObj = pBookmarkDoc &&
(pBookmarkDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) &&
@@ -849,7 +867,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
nSdPageEnd = nSdPageStart + nReplacedStandardPages - 1;
}
- for (USHORT nSdPage = nSdPageStart; nSdPage <= nSdPageEnd; nSdPage++)
+ for (sal_uInt16 nSdPage = nSdPageStart; nSdPage <= nSdPageEnd; nSdPage++)
{
pRefPage = GetSdPage(nSdPage, PK_STANDARD);
@@ -883,7 +901,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
if (bScaleObjects)
{
Rectangle aBorderRect(nLeft, nUpper, nRight, nLower);
- pRefPage->ScaleObjects(aSize, aBorderRect, TRUE);
+ pRefPage->ScaleObjects(aSize, aBorderRect, sal_True);
}
pRefPage->SetSize(aSize);
pRefPage->SetBorder(nLeft, nUpper, nRight, nLower);
@@ -902,7 +920,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
if (bScaleObjects)
{
Rectangle aBorderRect(nNLeft, nNUpper, nNRight, nNLower);
- pRefPage->ScaleObjects(aNSize, aBorderRect, TRUE);
+ pRefPage->ScaleObjects(aNSize, aBorderRect, sal_True);
}
pRefPage->SetSize(aNSize);
@@ -913,7 +931,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
pRefPage->RemoveEmptyPresentationObjects();
}
- for (USHORT nPage = nMPageCount; nPage < nNewMPageCount; nPage++)
+ for (sal_uInt16 nPage = nMPageCount; nPage < nNewMPageCount; nPage++)
{
pRefPage = (SdPage*) GetMasterPage(nPage);
if (pRefPage->GetPageKind() == PK_STANDARD)
@@ -921,7 +939,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
if (bScaleObjects)
{
Rectangle aBorderRect(nLeft, nUpper, nRight, nLower);
- pRefPage->ScaleObjects(aSize, aBorderRect, TRUE);
+ pRefPage->ScaleObjects(aSize, aBorderRect, sal_True);
}
pRefPage->SetSize(aSize);
pRefPage->SetBorder(nLeft, nUpper, nRight, nLower);
@@ -932,7 +950,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
if (bScaleObjects)
{
Rectangle aBorderRect(nNLeft, nNUpper, nNRight, nNLower);
- pRefPage->ScaleObjects(aNSize, aBorderRect, TRUE);
+ pRefPage->ScaleObjects(aNSize, aBorderRect, sal_True);
}
pRefPage->SetSize(aNSize);
pRefPage->SetBorder(nNLeft, nNUpper, nNRight, nNLower);
@@ -945,7 +963,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
}
// Make absolutely sure no double masterpages are there
- RemoveUnnecessaryMasterPages(NULL, TRUE, TRUE);
+ RemoveUnnecessaryMasterPages(NULL, sal_True, sal_True);
if( bUndo )
EndUndo();
@@ -960,15 +978,15 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
|*
\************************************************************************/
-BOOL SdDrawDocument::InsertBookmarkAsObject(
+sal_Bool SdDrawDocument::InsertBookmarkAsObject(
List* pBookmarkList,
List* pExchangeList, // Liste der zu verwendenen Namen
- BOOL /* bLink */,
+ sal_Bool /* bLink */,
::sd::DrawDocShell* pBookmarkDocSh,
Point* pObjPos)
{
- BOOL bOK = TRUE;
- BOOL bOLEObjFound = FALSE;
+ sal_Bool bOK = sal_True;
+ sal_Bool bOLEObjFound = sal_False;
::sd::View* pBMView = NULL;
SdDrawDocument* pBookmarkDoc = NULL;
@@ -990,7 +1008,7 @@ BOOL SdDrawDocument::InsertBookmarkAsObject(
}
else
{
- return FALSE;
+ return sal_False;
}
if (!pBookmarkList)
@@ -1004,7 +1022,7 @@ BOOL SdDrawDocument::InsertBookmarkAsObject(
SdrPage* pPage;
SdrPageView* pPV;
- for (USHORT nPos = 0; nPos < pBookmarkList->Count(); nPos++)
+ for (sal_uInt16 nPos = 0; nPos < pBookmarkList->Count(); nPos++)
{
/******************************************************************
* Namen der Bookmarks aus Liste holen
@@ -1020,7 +1038,7 @@ BOOL SdDrawDocument::InsertBookmarkAsObject(
if (pObj->GetObjInventor() == SdrInventor &&
pObj->GetObjIdentifier() == OBJ_OLE2)
{
- bOLEObjFound = TRUE;
+ bOLEObjFound = sal_True;
}
if (!pBMView)
@@ -1043,7 +1061,7 @@ BOOL SdDrawDocument::InsertBookmarkAsObject(
pPV = pBMView->ShowSdrPage(pPage);
}
- pBMView->MarkObj(pObj, pPV, FALSE);
+ pBMView->MarkObj(pObj, pPV, sal_False);
}
}
}
@@ -1090,7 +1108,7 @@ BOOL SdDrawDocument::InsertBookmarkAsObject(
aObjPos = Rectangle(Point(), pPage->GetSize()).Center();
}
- ULONG nCountBefore = 0;
+ sal_uLong nCountBefore = 0;
if (pExchangeList)
{
@@ -1100,13 +1118,13 @@ BOOL SdDrawDocument::InsertBookmarkAsObject(
}
if (bOLEObjFound)
- pBMView->GetDoc()->SetAllocDocSh(TRUE);
+ pBMView->GetDoc()->SetAllocDocSh(sal_True);
SdDrawDocument* pTmpDoc = (SdDrawDocument*) pBMView->GetAllMarkedModel();
bOK = pView->Paste(*pTmpDoc, aObjPos, pPage);
if (bOLEObjFound)
- pBMView->GetDoc()->SetAllocDocSh(FALSE);
+ pBMView->GetDoc()->SetAllocDocSh(sal_False);
if (!bOLEObjFound)
delete pTmpDoc; // Wird ansonsten von der DocShell zerstoert
@@ -1116,9 +1134,9 @@ BOOL SdDrawDocument::InsertBookmarkAsObject(
if (pExchangeList)
{
// Anzahl Objekte nach dem Einfuegen bestimmen
- ULONG nCount = pPage->GetObjCount();
+ sal_uLong nCount = pPage->GetObjCount();
- for (ULONG nObj = nCountBefore; nObj < nCount; nObj++)
+ for (sal_uLong nObj = nCountBefore; nObj < nCount; nObj++)
{
// Zuverwendener Name aus Exchange-Liste holen
if (pExchangeList->GetCurObject())
@@ -1188,7 +1206,7 @@ void SdDrawDocument::DisposeLoadedModels()
bool SdDrawDocument::IsReadOnly() const
{
- return FALSE;
+ return sal_False;
}
@@ -1199,7 +1217,7 @@ bool SdDrawDocument::IsReadOnly() const
|*
\************************************************************************/
-void SdDrawDocument::SetAllocDocSh(BOOL bAlloc)
+void SdDrawDocument::SetAllocDocSh(sal_Bool bAlloc)
{
mbAllocDocSh = bAlloc;
@@ -1217,7 +1235,7 @@ void SdDrawDocument::SetAllocDocSh(BOOL bAlloc)
|*
\************************************************************************/
-List* SdDrawDocument::GetCustomShowList(BOOL bCreate)
+List* SdDrawDocument::GetCustomShowList(sal_Bool bCreate)
{
if (!mpCustomShowList && bCreate)
{
@@ -1293,9 +1311,9 @@ SvStream* SdDrawDocument::GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo)
if( pRet )
{
// try to get some information from stream
- const ULONG nStartPos = pRet->Tell();
- const ULONG nEndPos = pRet->Seek( STREAM_SEEK_TO_END );
- const ULONG nStmLen = nEndPos - nStartPos;
+ const sal_uLong nStartPos = pRet->Tell();
+ const sal_uLong nEndPos = pRet->Seek( STREAM_SEEK_TO_END );
+ const sal_uLong nStmLen = nEndPos - nStartPos;
sal_uChar aTestByte;
// try to read one byte
@@ -1316,13 +1334,13 @@ SvStream* SdDrawDocument::GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo)
|*
\************************************************************************/
-void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, BOOL bOnlyDuplicatePages, BOOL bUndo)
+void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, sal_Bool bOnlyDuplicatePages, sal_Bool bUndo)
{
::sd::View* pView = NULL;
- SfxUndoManager* pUndoMgr = NULL;
+ ::svl::IUndoManager* pUndoMgr = NULL;
if( bUndo && !IsUndoEnabled() )
- bUndo = FALSE;
+ bUndo = sal_False;
if (mpDocSh)
{
@@ -1335,7 +1353,7 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, BOOL bOnl
/***********************************************************
* Alle MasterPages pruefen
***********************************************************/
- USHORT nSdMasterPageCount = GetMasterSdPageCount( PK_STANDARD );
+ sal_uInt16 nSdMasterPageCount = GetMasterSdPageCount( PK_STANDARD );
for (sal_Int32 nMPage = nSdMasterPageCount - 1; nMPage >= 0; nMPage--)
{
SdPage* pMaster = pMasterPage;
@@ -1343,12 +1361,12 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, BOOL bOnl
if (!pMaster)
{
- pMaster = (SdPage*) GetMasterSdPage( (USHORT) nMPage, PK_STANDARD );
- pNotesMaster = (SdPage*) GetMasterSdPage( (USHORT) nMPage, PK_NOTES );
+ pMaster = (SdPage*) GetMasterSdPage( (sal_uInt16) nMPage, PK_STANDARD );
+ pNotesMaster = (SdPage*) GetMasterSdPage( (sal_uInt16) nMPage, PK_NOTES );
}
else
{
- for ( USHORT nMPg = 0; nMPg < GetMasterPageCount(); nMPg++ )
+ for ( sal_uInt16 nMPg = 0; nMPg < GetMasterPageCount(); nMPg++ )
{
if ( pMaster == GetMasterPage( nMPg ) )
{
@@ -1365,21 +1383,21 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, BOOL bOnl
pNotesMaster )
{
// Do not delete master pages that have their precious flag set.
- BOOL bDeleteMaster = !pMaster->IsPrecious();
+ sal_Bool bDeleteMaster = !pMaster->IsPrecious();
String aLayoutName = pMaster->GetLayoutName();
if(bOnlyDuplicatePages )
{
// remove only duplicate pages
- bDeleteMaster = FALSE;
- for (USHORT i = 0; i < GetMasterSdPageCount( PK_STANDARD ); i++)
+ bDeleteMaster = sal_False;
+ for (sal_uInt16 i = 0; i < GetMasterSdPageCount( PK_STANDARD ); i++)
{
SdPage* pMPg = (SdPage*) GetMasterSdPage( i, PK_STANDARD );
if( pMPg != pMaster &&
pMPg->GetLayoutName() == aLayoutName )
{
// duplicate page found -> remove it
- bDeleteMaster = TRUE;
+ bDeleteMaster = sal_True;
}
}
}
@@ -1424,15 +1442,15 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, BOOL bOnl
EndUndo(); // schon hier, damit sich Joes Actions ZWISCHEN unsere eigenen schieben
// alte Layoutvorlagen loeschen, wenn sie nicht mehr benoetigt werden
- BOOL bDeleteOldStyleSheets = TRUE;
- for ( USHORT nMPg = 0;
+ sal_Bool bDeleteOldStyleSheets = sal_True;
+ for ( sal_uInt16 nMPg = 0;
nMPg < GetMasterPageCount() && bDeleteOldStyleSheets;
nMPg++ )
{
SdPage* pMPg = (SdPage*) GetMasterPage(nMPg);
if (pMPg->GetLayoutName() == aLayoutName)
{
- bDeleteOldStyleSheets = FALSE;
+ bDeleteOldStyleSheets = sal_False;
}
}
@@ -1479,16 +1497,16 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, BOOL bOnl
|* Ist rLayoutName leer, so wird die erste MasterPage genommen
\************************************************************************/
-void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
+void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
const String& rLayoutName,
SdDrawDocument* pSourceDoc,
- BOOL bMaster,
- BOOL bCheckMasters)
+ sal_Bool bMaster,
+ sal_Bool bCheckMasters)
{
if( mpDocSh )
- mpDocSh->SetWaitCursor( TRUE );
+ mpDocSh->SetWaitCursor( sal_True );
- SfxUndoManager* pUndoMgr = mpDocSh->GetUndoManager();
+ ::svl::IUndoManager* pUndoMgr = mpDocSh->GetUndoManager();
const bool bUndo = IsUndoEnabled();
@@ -1513,7 +1531,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
if (pSourceDoc)
{
List* pReplList = NULL;
- BOOL bLayoutReloaded = FALSE; // Wurde ex. Layout wieder geladen?
+ sal_Bool bLayoutReloaded = sal_False; // Wurde ex. Layout wieder geladen?
/*********************************************************************
|* LayoutName, Page and Notespage
@@ -1531,7 +1549,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
aSearchFor.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
aSearchFor.Append( String(SdResId(STR_LAYOUT_OUTLINE))) ;
- for (USHORT nMP = 0; nMP < pSourceDoc->GetMasterPageCount(); nMP++)
+ for (sal_uInt16 nMP = 0; nMP < pSourceDoc->GetMasterPageCount(); nMP++)
{
SdPage* pMP = (SdPage*) pSourceDoc->GetMasterPage(nMP);
@@ -1564,7 +1582,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
pUndoMgr->LeaveListAction();
if( mpDocSh )
- mpDocSh->SetWaitCursor( FALSE );
+ mpDocSh->SetWaitCursor( sal_False );
OSL_FAIL( "SdDrawDocument::SetMasterPage() failed!" );
@@ -1573,13 +1591,13 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
if (pSourceDoc != this)
{
- const USHORT nMasterPageCount = GetMasterPageCount();
- for ( USHORT nMPage = 0; nMPage < nMasterPageCount; nMPage++ )
+ const sal_uInt16 nMasterPageCount = GetMasterPageCount();
+ for ( sal_uInt16 nMPage = 0; nMPage < nMasterPageCount; nMPage++ )
{
SdPage* pCheckMaster = (SdPage*)GetMasterPage(nMPage);
if( pCheckMaster->GetName() == aNewLayoutName )
{
- bLayoutReloaded = TRUE;
+ bLayoutReloaded = sal_True;
break;
}
}
@@ -1610,7 +1628,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
{
// Es ist eine gleichnamige Vorlage vorhanden ist: Inhalte ersetzen
#ifdef DBG_UTIL
- BOOL bTest =
+ sal_Bool bTest =
#endif
pMySheet->SetName(pHisSheet->GetName());
DBG_ASSERT(bTest, "StyleSheet-Umbenennung fehlgeschlagen");
@@ -1640,7 +1658,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
pReplData->aNewName = pMySheet->GetName();
String aTemp(pMySheet->GetName());
- USHORT nPos = aTemp.SearchAscii( SD_LT_SEPARATOR );
+ sal_uInt16 nPos = aTemp.SearchAscii( SD_LT_SEPARATOR );
aTemp.Erase(0, nPos);
aTemp.Insert(aOldLayoutName, 0);
pReplData->aName = aTemp;
@@ -1670,7 +1688,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
if (rParentOfOld.Len() > 0 && rParentOfNew.Len() == 0)
{
- for (ULONG i = 0; i < pReplList->Count(); i++)
+ for (sal_uLong i = 0; i < pReplList->Count(); i++)
{
StyleReplaceData* pRD = (StyleReplaceData*)pReplList->
GetObject(i);
@@ -1695,7 +1713,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
{
// UndoAction fuer das Erzeugen und Einfuegen vorn StyleSheets
// auf den UndoManager legen
- SdMoveStyleSheetsUndoAction* pMovStyles = new SdMoveStyleSheetsUndoAction( this, aCreatedStyles, TRUE);
+ SdMoveStyleSheetsUndoAction* pMovStyles = new SdMoveStyleSheetsUndoAction( this, aCreatedStyles, sal_True);
pUndoMgr->AddUndoAction(pMovStyles);
}
}
@@ -1723,7 +1741,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
// dagegen ersetzt, so muss vor der Position der alten Masterpage
// eingefuegt werden, damit ab jetzt beim Suchen (z. B. SdPage::
// SetPresentationLayout) die neue Masterpage zuerst gefunden wird
- USHORT nInsertPos = rOldMaster.GetPageNum();
+ sal_uInt16 nInsertPos = rOldMaster.GetPageNum();
BegUndo();
if (!bLayoutReloaded)
@@ -1754,7 +1772,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
if (bMaster || bLayoutReloaded)
{
- for (USHORT nPage = 1; nPage < GetPageCount(); nPage++)
+ for (sal_uInt16 nPage = 1; nPage < GetPageCount(); nPage++)
{
pPage = (SdPage*) GetPage(nPage);
String aTest = pPage->GetLayoutName();
@@ -1783,7 +1801,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
(this,
pPage->IsMasterPage() ? aLayoutName : aOldLayoutName,
aLayoutName,
- eAutoLayout, eAutoLayout, FALSE, pPage);
+ eAutoLayout, eAutoLayout, sal_False, pPage);
pUndoMgr->AddUndoAction(pPLUndoAction);
}
pPage->SetPresentationLayout(aLayoutName);
@@ -1804,7 +1822,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
rOldMaster.GetUppBorder(),
rOldMaster.GetRgtBorder(),
rOldMaster.GetLwrBorder());
- pMaster->ScaleObjects(aSize, aBorderRect, TRUE);
+ pMaster->ScaleObjects(aSize, aBorderRect, sal_True);
pMaster->SetSize(aSize);
pMaster->SetBorder(rOldMaster.GetLftBorder(),
rOldMaster.GetUppBorder(),
@@ -1818,7 +1836,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
rOldNotesMaster.GetUppBorder(),
rOldNotesMaster.GetRgtBorder(),
rOldNotesMaster.GetLwrBorder());
- pNotesMaster->ScaleObjects(aSize, aNotesBorderRect, TRUE);
+ pNotesMaster->ScaleObjects(aSize, aNotesBorderRect, sal_True);
pNotesMaster->SetSize(aSize);
pNotesMaster->SetBorder(rOldNotesMaster.GetLftBorder(),
rOldNotesMaster.GetUppBorder(),
@@ -1852,9 +1870,9 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
\********************************************************************/
String aName = String(SdResId(STR_LAYOUT_DEFAULT_NAME));
String aTest;
- BOOL bNotANewName = TRUE;
- USHORT nCount = 0;
- USHORT nMPgCount = GetMasterPageCount();
+ sal_Bool bNotANewName = sal_True;
+ sal_uInt16 nCount = 0;
+ sal_uInt16 nMPgCount = GetMasterPageCount();
for (nCount = 0; bNotANewName; nCount++)
{
@@ -1864,15 +1882,15 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
aTest += String::CreateFromInt32( nCount );
// gibt's schon eine, die so heisst?
- bNotANewName = FALSE;
- for (USHORT nMPg = 1; nMPg < nMPgCount; nMPg++)
+ bNotANewName = sal_False;
+ for (sal_uInt16 nMPg = 1; nMPg < nMPgCount; nMPg++)
{
const SdrPage* pTest = GetMasterPage(nMPg);
String aPageLayoutName(pTest->GetLayoutName());
aPageLayoutName.Erase( aPageLayoutName.SearchAscii( SD_LT_SEPARATOR ));
if (aPageLayoutName == aTest)
- bNotANewName = TRUE;
+ bNotANewName = sal_True;
}
}
aName = aTest;
@@ -1889,7 +1907,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
if( bUndo )
{
- SdMoveStyleSheetsUndoAction* pMovStyles = new SdMoveStyleSheetsUndoAction(this, aCreatedStyles, TRUE);
+ SdMoveStyleSheetsUndoAction* pMovStyles = new SdMoveStyleSheetsUndoAction(this, aCreatedStyles, sal_True);
pUndoMgr->AddUndoAction(pMovStyles);
}
@@ -1900,7 +1918,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
if( bUndo )
BegUndo();
- pMaster = (SdPage*) AllocPage(TRUE);
+ pMaster = (SdPage*) AllocPage(sal_True);
pMaster->SetSize(pSelectedPage->GetSize());
pMaster->SetBorder(pSelectedPage->GetLftBorder(),
pSelectedPage->GetUppBorder(),
@@ -1915,7 +1933,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
pMaster->SetAutoLayout(AUTOLAYOUT_NONE, true, true);
- pNotesMaster = (SdPage*) AllocPage(TRUE);
+ pNotesMaster = (SdPage*) AllocPage(sal_True);
pNotesMaster->SetPageKind(PK_NOTES);
pNotesMaster->SetSize(pNotes->GetSize());
pNotesMaster->SetBorder(pNotes->GetLftBorder(),
@@ -1940,7 +1958,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
List* pPageList = new List;
if (bMaster)
{
- for (USHORT nPage = 1; nPage < GetPageCount(); nPage++)
+ for (sal_uInt16 nPage = 1; nPage < GetPageCount(); nPage++)
{
pPage = (SdPage*) GetPage(nPage);
const String s(pPage->GetLayoutName());
@@ -1971,7 +1989,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
SdPresentationLayoutUndoAction * pPLUndoAction =
new SdPresentationLayoutUndoAction
(this, aOldLayoutName, aName,
- eOldAutoLayout, eNewAutoLayout, TRUE,
+ eOldAutoLayout, eNewAutoLayout, sal_True,
pPage);
pUndoMgr->AddUndoAction(pPLUndoAction);
}
@@ -2006,14 +2024,14 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
pUndoMgr->LeaveListAction();
if( mpDocSh )
- mpDocSh->SetWaitCursor( FALSE );
+ mpDocSh->SetWaitCursor( sal_False );
}
void SdDrawDocument::Merge(SdrModel& rSourceModel,
- USHORT nFirstPageNum, USHORT nLastPageNum,
- USHORT nDestPos,
+ sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum,
+ sal_uInt16 nDestPos,
bool bMergeMasterPages, bool bAllMasterPages,
bool bUndo, bool bTreadSourceAsConst)
{
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 150cf7939272..3470a41f46d1 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -116,6 +116,7 @@
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <svl/itemset.hxx>
+#include "app.hrc"
using ::rtl::OUString;
using namespace ::com::sun::star;
@@ -149,8 +150,8 @@ void SdDrawDocument::CreateLayoutTemplates()
// nicht benutzt, nicht benutzerdefiniert
// SB hatte wahrscheinlich Probleme mit SFXSTYLEBIT_AUTO, da dann gar nichts
// mehr im Gestalter angezeigt wird. Dieses Problem ist zu 364 j behoben worden
- // USHORT nMask = SFXSTYLEBIT_ALL & ~(SFXSTYLEBIT_USED | SFXSTYLEBIT_USERDEF);
- USHORT nMask = SFXSTYLEBIT_AUTO;
+ // sal_uInt16 nMask = SFXSTYLEBIT_ALL & ~(SFXSTYLEBIT_USED | SFXSTYLEBIT_USERDEF);
+ sal_uInt16 nMask = SFXSTYLEBIT_AUTO;
String aName(aStdName);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
@@ -161,7 +162,7 @@ void SdDrawDocument::CreateLayoutTemplates()
String aNullStr;
::basegfx::B2DPolyPolygon aNullPolyPolygon;
- Color aNullCol(RGB_Color(COL_BLACK));
+ Color aNullCol(RGB_Color(COL_DEFAULT_SHAPE_STROKE));
XDash aNullDash;
XGradient aNullGrad(aNullCol,RGB_Color(COL_WHITE));
@@ -171,19 +172,20 @@ void SdDrawDocument::CreateLayoutTemplates()
// Linienattribute (Extended OutputDevice)
rISet.Put(XLineStyleItem(XLINE_SOLID));
- rISet.Put(XLineColorItem(String(), RGB_Color(COL_BLACK)));
+ rISet.Put(XLineColorItem(String(), RGB_Color(COL_DEFAULT_SHAPE_STROKE)));
rISet.Put(XLineWidthItem(0));
rISet.Put(XLineDashItem(pPool,aNullDash));
rISet.Put(XLineStartItem(pPool,aNullPolyPolygon));
rISet.Put(XLineEndItem(pPool,aNullPolyPolygon));
- rISet.Put(XLineStartWidthItem(300));
- rISet.Put(XLineEndWidthItem(300));
+ rISet.Put(XLineStartWidthItem(200));
+ rISet.Put(XLineEndWidthItem(200));
rISet.Put(XLineStartCenterItem());
rISet.Put(XLineEndCenterItem());
+ rISet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_BLOCK));
// Fuellattribute (Extended OutputDevice)
rISet.Put(XFillStyleItem(XFILL_SOLID));
- rISet.Put(XFillColorItem(String(), RGB_Color(COL_DEFAULT_SHAPE_FILLING))); // "Blue 8"
+ rISet.Put(XFillColorItem(String(), RGB_Color(COL_DEFAULT_SHAPE_FILLING)));
rISet.Put(XFillGradientItem(pPool,aNullGrad));
rISet.Put(XFillHatchItem(pPool,aNullHatch));
@@ -194,10 +196,10 @@ void SdDrawDocument::CreateLayoutTemplates()
rISet.Put(XFillBitmapItem(pPool,aNullBmp));
// Schattenattribute (Drawing Engine)
- rISet.Put(SdrShadowItem(FALSE));
+ rISet.Put(SdrShadowItem(sal_False));
rISet.Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY)));
- rISet.Put(SdrShadowXDistItem(300)); // 3 mm Schattendistanz
- rISet.Put(SdrShadowYDistItem(300));
+ rISet.Put(SdrShadowXDistItem(200)); // 3 mm Schattendistanz
+ rISet.Put(SdrShadowYDistItem(200));
Font aLatinFont, aCJKFont, aCTLFont;
@@ -228,8 +230,8 @@ void SdDrawDocument::CreateLayoutTemplates()
rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CJK ) );
rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CTL ) );
- rISet.Put(SvxContourItem(FALSE, EE_CHAR_OUTLINE ));
- rISet.Put(SvxShadowedItem(FALSE, EE_CHAR_SHADOW ));
+ rISet.Put(SvxContourItem(sal_False, EE_CHAR_OUTLINE ));
+ rISet.Put(SvxShadowedItem(sal_False, EE_CHAR_SHADOW ));
rISet.Put(SvxUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE));
rISet.Put(SvxOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE));
rISet.Put(SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ));
@@ -249,7 +251,7 @@ void SdDrawDocument::CreateLayoutTemplates()
rISet.Put( SvxLineSpacingItem( LINE_SPACE_DEFAULT_HEIGHT, EE_PARA_SBL ) );
// #i16874# enable kerning by default but only for new documents
- rISet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) );
+ rISet.Put( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) );
// Bullet
// BulletItem und BulletFont fuer Titel und Gliederung
@@ -293,7 +295,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XLineStartWidthItem(700));
pISet->Put(XLineEndWidthItem(300));
- pISet->Put(XLineStartCenterItem(TRUE));
+ pISet->Put(XLineStartCenterItem(sal_True));
// ---- Objekt mit Schatten -------------------------------------------
@@ -303,12 +305,12 @@ void SdDrawDocument::CreateLayoutTemplates()
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHSHADOW );
pISet = &pSheet->GetItemSet();
- pISet->Put(SdrShadowItem(TRUE));
+ pISet->Put(SdrShadowItem(sal_True));
pISet->Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY)));
- pISet->Put(SdrShadowXDistItem(300)); // 3 mm Schattendistanz
- pISet->Put(SdrShadowYDistItem(300));
+ pISet->Put(SdrShadowXDistItem(200)); // 3 mm Schattendistanz
+ pISet->Put(SdrShadowYDistItem(200));
- // ---- Objekt ohne Fllung -------------------------------------------
+ // ---- Objekt ohne F�llung -------------------------------------------
aName = String(SdResId(STR_POOLSHEET_OBJWITHOUTFILL));
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
@@ -317,6 +319,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet = &pSheet->GetItemSet();
pISet->Put(XFillStyleItem(XFILL_NONE));
+ pISet->Put(XLineColorItem(String(), RGB_Color(COL_BLACK)));
// ---- Text ----------------------------------------------------------
@@ -329,7 +332,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XLineStyleItem(XLINE_NONE));
pISet->Put(XFillStyleItem(XFILL_NONE));
- // ---- Textk”rper ----------------------------------------------------
+ // ---- Textk�rper ----------------------------------------------------
aName = String(SdResId(STR_POOLSHEET_TEXTBODY));
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
@@ -342,7 +345,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(SvxFontHeightItem(564, 100, EE_CHAR_FONTHEIGHT)); // 16 pt
- // ---- Textk”rper mit Blocksatz --------------------------------------
+ // ---- Textk�rper mit Blocksatz --------------------------------------
aName = String(SdResId(STR_POOLSHEET_TEXTBODY_JUSTIFY));
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
@@ -395,7 +398,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XFillStyleItem(XFILL_SOLID));
pISet->Put(XFillColorItem(String(), RGB_Color(COL_CYAN)));
- pISet->Put(SdrShadowItem(TRUE));
+ pISet->Put(SdrShadowItem(sal_True));
pISet->Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY)));
pISet->Put(SdrShadowXDistItem(200)); // 2 mm Schattendistanz
pISet->Put(SdrShadowYDistItem(200));
@@ -419,7 +422,7 @@ void SdDrawDocument::CreateLayoutTemplates()
Color aOrange4(255, 204, 153);
pISet->Put(XFillColorItem(String(), aOrange4));
- pISet->Put(SdrShadowItem(TRUE));
+ pISet->Put(SdrShadowItem(sal_True));
pISet->Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY)));
pISet->Put(SdrShadowXDistItem(200)); // 2 mm Schattendistanz
pISet->Put(SdrShadowYDistItem(200));
@@ -495,6 +498,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet = &pSheet->GetItemSet();
pISet->Put(XFillStyleItem(XFILL_NONE));
+ pISet->Put(XLineColorItem(String(), RGB_Color(COL_BLACK)));
pISet->Put(SvxFontHeightItem(423, 100, EE_CHAR_FONTHEIGHT )); // 12 pt
@@ -557,7 +561,7 @@ void SdDrawDocument::CreateDefaultCellStyles()
// ---- Default -----------------------------------------------
- USHORT nMask = SFXSTYLEBIT_AUTO;
+ sal_uInt16 nMask = SFXSTYLEBIT_AUTO;
OUString aDefaultCellStyleName( RTL_CONSTASCII_USTRINGPARAM("default") );
@@ -611,7 +615,7 @@ void SdDrawDocument::CreateDefaultCellStyles()
rISet.Put( SdrTextLowerDistItem( 130 ) );
rISet.Put( SvxLineSpacingItem( LINE_SPACE_DEFAULT_HEIGHT, EE_PARA_SBL ) );
- rISet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) );
+ rISet.Put( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) );
rISet.Put( SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP) );
rISet.Put( SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_LEFT) );
@@ -723,11 +727,11 @@ void SdDrawDocument::CreateDefaultCellStyles()
|*
\************************************************************************/
-USHORT SdDrawDocument::GetMasterPageUserCount(SdrPage* pMaster) const
+sal_uInt16 SdDrawDocument::GetMasterPageUserCount(SdrPage* pMaster) const
{
- USHORT nResult = 0;
- USHORT nPage;
- USHORT nPageCount = GetPageCount();
+ sal_uInt16 nResult = 0;
+ sal_uInt16 nPage;
+ sal_uInt16 nPageCount = GetPageCount();
for (nPage = 0; nPage < nPageCount; nPage++)
{
@@ -771,14 +775,14 @@ void SdDrawDocument::StopOnlineSpelling()
|*
\************************************************************************/
-void SdDrawDocument::StartOnlineSpelling(BOOL bForceSpelling)
+void SdDrawDocument::StartOnlineSpelling(sal_Bool bForceSpelling)
{
if (mbOnlineSpell && (bForceSpelling || mbInitialOnlineSpellingEnabled) &&
mpDocSh && !mpDocSh->IsReadOnly() )
{
StopOnlineSpelling();
- ::sd::Outliner* pOutl = GetInternalOutliner(TRUE);
+ ::sd::Outliner* pOutl = GetInternalOutliner(sal_True);
Reference< XSpellChecker1 > xSpellChecker( LinguMgr::GetSpellChecker() );
if ( xSpellChecker.is() )
@@ -791,7 +795,7 @@ void SdDrawDocument::StartOnlineSpelling(BOOL bForceSpelling)
pOutl->SetDefaultLanguage( meLanguage );
mpOnlineSpellingList = new ShapeList;
- USHORT nPage;
+ sal_uInt16 nPage;
for ( nPage = 0; nPage < GetPageCount(); nPage++ )
{
@@ -842,14 +846,14 @@ void SdDrawDocument::FillOnlineSpellingList(SdPage* pPage)
SdrObjListIter aGroupIter(*((SdrObjGroup*)pObj)->GetSubList(),
IM_DEEPNOGROUPS);
- BOOL bSubTextObjFound = FALSE;
+ sal_Bool bSubTextObjFound = sal_False;
while (aGroupIter.IsMore() && !bSubTextObjFound)
{
if (aGroupIter.Next()->GetOutlinerParaObject())
{
// Textobjekt im Gruppenobjekt gefunden
- bSubTextObjFound = TRUE;
+ bSubTextObjFound = sal_True;
}
}
@@ -911,7 +915,7 @@ IMPL_LINK(SdDrawDocument, OnlineSpellingHdl, Timer*, EMPTYARG )
else
{
// Spelling wurde initial durchgefuehrt
- mbInitialOnlineSpellingEnabled = FALSE;
+ mbInitialOnlineSpellingEnabled = sal_False;
// Suche beenden
StopOnlineSpelling();
@@ -933,14 +937,14 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj)
{
if (pObj && pObj->GetOutlinerParaObject() /* && pObj != pView->GetTextEditObject() */)
{
- mbHasOnlineSpellErrors = FALSE;
- ::sd::Outliner* pOutl = GetInternalOutliner(TRUE);
- pOutl->SetUpdateMode(TRUE);
+ mbHasOnlineSpellErrors = sal_False;
+ ::sd::Outliner* pOutl = GetInternalOutliner(sal_True);
+ pOutl->SetUpdateMode(sal_True);
Link aEvtHdl = pOutl->GetStatusEventHdl();
pOutl->SetStatusEventHdl(LINK(this, SdDrawDocument, OnlineSpellEventHdl));
- USHORT nOldOutlMode = pOutl->GetMode();
- USHORT nOutlMode = OUTLINERMODE_TEXTOBJECT;
+ sal_uInt16 nOldOutlMode = pOutl->GetMode();
+ sal_uInt16 nOutlMode = OUTLINERMODE_TEXTOBJECT;
if (((SdrTextObj*) pObj)->GetObjInventor() == SdrInventor &&
((SdrTextObj*) pObj)->GetObjIdentifier() == OBJ_OUTLINETEXT)
{
@@ -976,9 +980,9 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj)
}
pOutl->SetStatusEventHdl(aEvtHdl);
- pOutl->SetUpdateMode(FALSE);
+ pOutl->SetUpdateMode(sal_False);
pOutl->Init( nOldOutlMode );
- mbHasOnlineSpellErrors = FALSE;
+ mbHasOnlineSpellErrors = sal_False;
}
}
@@ -1023,7 +1027,7 @@ void SdDrawDocument::RemoveObject(SdrObject* pObj, SdPage* /*pPage*/)
\************************************************************************/
IMPL_LINK(SdDrawDocument, OnlineSpellEventHdl, EditStatus*, pEditStat)
{
- ULONG nStat = pEditStat->GetStatusWord();
+ sal_uLong nStat = pEditStat->GetStatusWord();
mbHasOnlineSpellErrors = (nStat & EE_STAT_WRONGWORDCHANGED) != 0;
return(0);
@@ -1041,7 +1045,7 @@ void SdDrawDocument::ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject*
delete mpOnlineSearchItem;
mpOnlineSearchItem = NULL;
- USHORT nCommand = pInfo->nCommand;
+ sal_uInt16 nCommand = pInfo->nCommand;
if (nCommand == SPELLCMD_IGNOREWORD
// restart when add to dictionary takes place, too.
@@ -1049,7 +1053,7 @@ void SdDrawDocument::ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject*
{
if(pObj && pOutl && pObj->ISA(SdrTextObj))
{
- BOOL bModified(IsChanged());
+ sal_Bool bModified(IsChanged());
((SdrTextObj*)pObj)->SetOutlinerParaObject(pOutl->CreateParaObject());
SetChanged(bModified);
pObj->BroadcastObjectChange();
@@ -1074,9 +1078,9 @@ void SdDrawDocument::ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject*
void SdDrawDocument::RestoreLayerNames()
{
SdrLayerAdmin& rLayerAdmin = GetLayerAdmin();
- USHORT nLayerCount = rLayerAdmin.GetLayerCount();
+ sal_uInt16 nLayerCount = rLayerAdmin.GetLayerCount();
- for (USHORT nLayer = 0; nLayer < nLayerCount; nLayer++)
+ for (sal_uInt16 nLayer = 0; nLayer < nLayerCount; nLayer++)
{
SdrLayer* pLayer = rLayerAdmin.GetLayer(nLayer);
@@ -1114,10 +1118,10 @@ void SdDrawDocument::RestoreLayerNames()
|*
\************************************************************************/
-String SdDrawDocument::CreatePageNumValue(USHORT nNum) const
+String SdDrawDocument::CreatePageNumValue(sal_uInt16 nNum) const
{
String aPageNumValue;
- BOOL bUpper = FALSE;
+ sal_Bool bUpper = sal_False;
switch (mePageNumType)
{
@@ -1128,7 +1132,7 @@ String SdDrawDocument::CreatePageNumValue(USHORT nNum) const
aPageNumValue += (sal_Unicode)(char)((nNum - 1) % 26 + 'a');
break;
case SVX_ROMAN_UPPER:
- bUpper = TRUE;
+ bUpper = sal_True;
case SVX_ROMAN_LOWER:
aPageNumValue += SvxNumberFormat::CreateRomanString(nNum, bUpper);
break;
@@ -1156,11 +1160,11 @@ String SdDrawDocument::CreatePageNumValue(USHORT nNum) const
void SdDrawDocument::RenameLayoutTemplate(const String& rOldLayoutName, const String& rNewName)
{
String aOldName(rOldLayoutName);
- USHORT nPos = aOldName.SearchAscii( SD_LT_SEPARATOR );
+ sal_uInt16 nPos = aOldName.SearchAscii( SD_LT_SEPARATOR );
// erase everything after '~LT~'
aOldName.Erase(nPos + sizeof(SD_LT_SEPARATOR) - 1 );
- USHORT nLen = aOldName.Len();
+ sal_uInt16 nLen = aOldName.Len();
List aReplList;
SfxStyleSheetIterator aIter(mxStyleSheetPool.get(), SD_STYLE_FAMILY_MASTERPAGE);
@@ -1197,7 +1201,7 @@ void SdDrawDocument::RenameLayoutTemplate(const String& rOldLayoutName, const St
// an allen Seiten, die das jetzt umbeannte Layout benutzen, die
// Textobjekte von der Aenderung unterrichten und Layoutnamen setzen
- USHORT nPage;
+ sal_uInt16 nPage;
for (nPage = 0; nPage < GetPageCount(); nPage++)
{
SdPage* pPage = (SdPage*) GetPage(nPage);
@@ -1207,7 +1211,7 @@ void SdDrawDocument::RenameLayoutTemplate(const String& rOldLayoutName, const St
{
pPage->SetLayoutName(aPageLayoutName);
- for (ULONG nObj = 0; nObj < pPage->GetObjCount(); nObj++)
+ for (sal_uLong nObj = 0; nObj < pPage->GetObjCount(); nObj++)
{
SdrObject* pObj = pPage->GetObj(nObj);
@@ -1255,7 +1259,7 @@ void SdDrawDocument::RenameLayoutTemplate(const String& rOldLayoutName, const St
pPage->SetLayoutName(aPageLayoutName);
pPage->SetName(rNewName);
- for (ULONG nObj = 0; nObj < pPage->GetObjCount(); nObj++)
+ for (sal_uLong nObj = 0; nObj < pPage->GetObjCount(); nObj++)
{
SdrObject* pObj = pPage->GetObj(nObj);
@@ -1318,14 +1322,14 @@ void SdDrawDocument::SetTextDefaults() const
aNumberFormat.SetStart(1);
aNumberFormat.SetNumAdjust(SVX_ADJUST_LEFT);
- SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10, FALSE);
+ SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10, sal_False);
aNumberFormat.SetLSpace( 0 );
aNumberFormat.SetAbsLSpace( 0 );
aNumberFormat.SetFirstLineOffset( 0 );
aNumRule.SetLevel( 0, aNumberFormat );
- for( USHORT i = 1; i < aNumRule.GetLevelCount(); i++ )
+ for( sal_uInt16 i = 1; i < aNumRule.GetLevelCount(); i++ )
{
const short nLSpace = (i + 1) * 600;
aNumberFormat.SetLSpace(nLSpace);
@@ -1448,17 +1452,17 @@ void ModifyGuard::init()
mpDocShell = mpDoc->GetDocSh();
}
- mbIsEnableSetModified = mpDocShell ? mpDocShell->IsEnableSetModified() : FALSE;
- mbIsDocumentChanged = mpDoc ? mpDoc->IsChanged() : FALSE;
+ mbIsEnableSetModified = mpDocShell ? mpDocShell->IsEnableSetModified() : sal_False;
+ mbIsDocumentChanged = mpDoc ? mpDoc->IsChanged() : sal_False;
if( mbIsEnableSetModified )
- mpDocShell->EnableSetModified( FALSE );
+ mpDocShell->EnableSetModified( sal_False );
}
ModifyGuard::~ModifyGuard()
{
if( mbIsEnableSetModified )
- mpDocShell->EnableSetModified( TRUE );
+ mpDocShell->EnableSetModified( sal_True );
if( mpDoc && (mpDoc->IsChanged() != mbIsDocumentChanged) )
mpDoc->SetChanged(mbIsDocumentChanged);
diff --git a/sd/source/core/drawdoc_animations.cxx b/sd/source/core/drawdoc_animations.cxx
index 2d024f8a7c84..0c3979bb6ec0 100644..100755
--- a/sd/source/core/drawdoc_animations.cxx
+++ b/sd/source/core/drawdoc_animations.cxx
@@ -42,7 +42,7 @@ void SdDrawDocument::ReplacePageInCustomShows( const SdPage* pOldPage, const SdP
{
if ( mpCustomShowList )
{
- for (ULONG i = 0; i < mpCustomShowList->Count(); i++)
+ for (sal_uLong i = 0; i < mpCustomShowList->Count(); i++)
{
SdCustomShow* pCustomShow = (SdCustomShow*) mpCustomShowList->GetObject(i);
if( pNewPage == 0 )
diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src
index a0ed03c3ce06..a0ed03c3ce06 100755..100644
--- a/sd/source/core/glob.src
+++ b/sd/source/core/glob.src
diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx
index 6c19008f6c16..21263657c503 100644..100755
--- a/sd/source/core/pglink.cxx
+++ b/sd/source/core/pglink.cxx
@@ -105,21 +105,21 @@ void SdPageLink::DataChanged( const String& ,
List aBookmarkList;
aBookmarkList.Insert(&aBookmarkName);
- USHORT nInsertPos = pPage->GetPageNum();
- BOOL bLink = TRUE;
- BOOL bReplace = TRUE;
- BOOL bNoDialogs = FALSE;
- BOOL bCopy = FALSE;
+ sal_uInt16 nInsertPos = pPage->GetPageNum();
+ sal_Bool bLink = sal_True;
+ sal_Bool bReplace = sal_True;
+ sal_Bool bNoDialogs = sal_False;
+ sal_Bool bCopy = sal_False;
if( pDoc->pDocLockedInsertingLinks )
{
// resolving links while loading pDoc
- bNoDialogs = TRUE;
- bCopy = TRUE;
+ bNoDialogs = sal_True;
+ bCopy = sal_True;
}
pDoc->InsertBookmarkAsPage(&aBookmarkList, NULL, bLink, bReplace,
- nInsertPos, bNoDialogs, NULL, bCopy, TRUE, TRUE);
+ nInsertPos, bNoDialogs, NULL, bCopy, sal_True, sal_True);
if( !pDoc->pDocLockedInsertingLinks )
pDoc->CloseBookmarkDoc();
diff --git a/sd/source/core/sdattr.cxx b/sd/source/core/sdattr.cxx
index f1e5fd073ea8..743fb0b3887a 100644..100755
--- a/sd/source/core/sdattr.cxx
+++ b/sd/source/core/sdattr.cxx
@@ -43,7 +43,7 @@ TYPEINIT1_AUTOFACTORY( DiaEffectItem, SfxEnumItem );
DiaEffectItem::DiaEffectItem( presentation::FadeEffect eFE ) :
- SfxEnumItem( ATTR_DIA_EFFECT, (USHORT)eFE )
+ SfxEnumItem( ATTR_DIA_EFFECT, (sal_uInt16)eFE )
{
}
@@ -60,7 +60,7 @@ SfxPoolItem* DiaEffectItem::Clone( SfxItemPool* ) const
}
-SfxPoolItem* DiaEffectItem::Create( SvStream& rIn, USHORT ) const
+SfxPoolItem* DiaEffectItem::Create( SvStream& rIn, sal_uInt16 ) const
{
return new DiaEffectItem( rIn );
}
@@ -74,7 +74,7 @@ TYPEINIT1_AUTOFACTORY( DiaSpeedItem, SfxEnumItem );
DiaSpeedItem::DiaSpeedItem( FadeSpeed eFS ) :
- SfxEnumItem( ATTR_DIA_SPEED, (USHORT)eFS )
+ SfxEnumItem( ATTR_DIA_SPEED, (sal_uInt16)eFS )
{
}
@@ -91,7 +91,7 @@ SfxPoolItem* DiaSpeedItem::Clone( SfxItemPool* ) const
}
-SfxPoolItem* DiaSpeedItem::Create( SvStream& rIn, USHORT ) const
+SfxPoolItem* DiaSpeedItem::Create( SvStream& rIn, sal_uInt16 ) const
{
return new DiaSpeedItem( rIn );
}
@@ -104,7 +104,7 @@ SfxPoolItem* DiaSpeedItem::Create( SvStream& rIn, USHORT ) const
TYPEINIT1_AUTOFACTORY( DiaAutoItem, SfxEnumItem );
DiaAutoItem::DiaAutoItem( PresChange eChange ) :
- SfxEnumItem( ATTR_DIA_AUTO, (USHORT)eChange )
+ SfxEnumItem( ATTR_DIA_AUTO, (sal_uInt16)eChange )
{
}
@@ -121,7 +121,7 @@ SfxPoolItem* DiaAutoItem::Clone( SfxItemPool* ) const
}
-SfxPoolItem* DiaAutoItem::Create( SvStream& rIn, USHORT ) const
+SfxPoolItem* DiaAutoItem::Create( SvStream& rIn, sal_uInt16 ) const
{
return new DiaAutoItem( rIn );
}
@@ -134,7 +134,7 @@ SfxPoolItem* DiaAutoItem::Create( SvStream& rIn, USHORT ) const
TYPEINIT1_AUTOFACTORY( DiaTimeItem, SfxUInt32Item );
-DiaTimeItem::DiaTimeItem( UINT32 nValue ) :
+DiaTimeItem::DiaTimeItem( sal_uInt32 nValue ) :
SfxUInt32Item( ATTR_DIA_TIME, nValue )
{
}
diff --git a/sd/source/core/sdiocmpt.cxx b/sd/source/core/sdiocmpt.cxx
index f67f550b984c..306f9ff394dd 100644..100755
--- a/sd/source/core/sdiocmpt.cxx
+++ b/sd/source/core/sdiocmpt.cxx
@@ -36,12 +36,12 @@
//////////////////////////////////////////////////////////////////////////////
-old_SdrDownCompat::old_SdrDownCompat(SvStream& rNewStream, UINT16 nNewMode)
+old_SdrDownCompat::old_SdrDownCompat(SvStream& rNewStream, sal_uInt16 nNewMode)
: rStream(rNewStream),
nSubRecSiz(0),
nSubRecPos(0),
nMode(nNewMode),
- bOpen(FALSE)
+ bOpen(sal_False)
{
OpenSubRecord();
}
@@ -78,7 +78,7 @@ void old_SdrDownCompat::OpenSubRecord()
Write();
}
- bOpen = TRUE;
+ bOpen = sal_True;
}
void old_SdrDownCompat::CloseSubRecord()
@@ -86,11 +86,11 @@ void old_SdrDownCompat::CloseSubRecord()
if(rStream.GetError())
return;
- UINT32 nAktPos(rStream.Tell());
+ sal_uInt32 nAktPos(rStream.Tell());
if(nMode == STREAM_READ)
{
- UINT32 nReadAnz(nAktPos - nSubRecPos);
+ sal_uInt32 nReadAnz(nAktPos - nSubRecPos);
if(nReadAnz != nSubRecSiz)
{
rStream.Seek(nSubRecPos + nSubRecSiz);
@@ -104,7 +104,7 @@ void old_SdrDownCompat::CloseSubRecord()
rStream.Seek(nAktPos);
}
- bOpen = FALSE;
+ bOpen = sal_False;
}
/*************************************************************************
@@ -113,7 +113,7 @@ void old_SdrDownCompat::CloseSubRecord()
|*
\************************************************************************/
-SdIOCompat::SdIOCompat(SvStream& rNewStream, USHORT nNewMode, UINT16 nVer)
+SdIOCompat::SdIOCompat(SvStream& rNewStream, sal_uInt16 nNewMode, sal_uInt16 nVer)
: old_SdrDownCompat(rNewStream, nNewMode), nVersion(nVer)
{
if (nNewMode == STREAM_WRITE)
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index e225235a9092..3a90a78a27c4 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -65,7 +65,7 @@
#include "../ui/inc/DrawDocShell.hxx"
#include "Outliner.hxx"
-
+#include "app.hrc"
#include "eetext.hxx"
#include "drawdoc.hxx"
#include "sdpage.hxx"
@@ -97,20 +97,20 @@ TYPEINIT2( SdPage, FmFormPage, SdrObjUserCall );
|*
\************************************************************************/
-SdPage::SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, BOOL bMasterPage)
+SdPage::SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, sal_Bool bMasterPage)
: FmFormPage(rNewDoc, pBasic, bMasterPage)
, SdrObjUserCall()
, mePageKind(PK_STANDARD)
, meAutoLayout(AUTOLAYOUT_NONE)
-, mbSelected(FALSE)
+, mbSelected(sal_False)
, mePresChange(PRESCHANGE_MANUAL)
, mnTime(1)
-, mbSoundOn(FALSE)
-, mbExcluded(FALSE)
-, mbLoopSound(FALSE)
-, mbStopSound(FALSE)
-, mbScaleObjects(TRUE)
-, mbBackgroundFullSize( FALSE )
+, mbSoundOn(sal_False)
+, mbExcluded(sal_False)
+, mbLoopSound(sal_False)
+, mbStopSound(sal_False)
+, mbScaleObjects(sal_True)
+, mbBackgroundFullSize( sal_False )
, meCharSet(gsl_getSystemTextEncoding())
, mnPaperBin(PAPERBIN_PRINTER_SETTINGS)
, mpPageLink(NULL)
@@ -194,7 +194,7 @@ SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, int nIndex, bool bFuzzySearc
case PRESOBJ_CALC:
case PRESOBJ_IMAGE:
case PRESOBJ_MEDIA:
- bFound = TRUE;
+ bFound = sal_True;
break;
default:
break;
@@ -247,10 +247,10 @@ void SdPage::EnsureMasterPageDefaultBackground()
/** creates a presentation object with the given PresObjKind on this page. A user call will be set
*/
-SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rectangle& rRect, BOOL /* bInsert */ )
+SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const Rectangle& rRect, sal_Bool /* bInsert */ )
{
- sd::UndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0;
- const bool bUndo = pUndoManager && pUndoManager->isInListAction() && IsInserted();
+ ::svl::IUndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0;
+ const bool bUndo = pUndoManager && pUndoManager->IsInListAction() && IsInserted();
SdrObject* pSdrObj = NULL;
@@ -265,7 +265,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec
if (mbMaster)
{
- pSdrObj->SetNotVisibleAsMaster(TRUE);
+ pSdrObj->SetNotVisibleAsMaster(sal_True);
}
}
break;
@@ -276,7 +276,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec
if (mbMaster)
{
- pSdrObj->SetNotVisibleAsMaster(TRUE);
+ pSdrObj->SetNotVisibleAsMaster(sal_True);
}
}
break;
@@ -287,7 +287,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec
if (mbMaster)
{
- pSdrObj->SetNotVisibleAsMaster(TRUE);
+ pSdrObj->SetNotVisibleAsMaster(sal_True);
}
}
break;
@@ -386,7 +386,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec
pSdrObj = new SdrPageObj();
}
- pSdrObj->SetResizeProtect(TRUE);
+ pSdrObj->SetResizeProtect(sal_True);
}
break;
@@ -416,7 +416,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec
// Tell the object EARLY that it is vertical to have the
// defaults for AutoGrowWidth/Height reversed
if(bVertical)
- ((SdrTextObj*)pSdrObj)->SetVerticalWriting(TRUE);
+ ((SdrTextObj*)pSdrObj)->SetVerticalWriting(sal_True);
SfxItemSet aTempAttr( ((SdDrawDocument*) pModel)->GetPool() );
if( bVertical )
@@ -432,9 +432,9 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec
// potential problem: This action was still NOT
// adapted for vertical text. This sure needs to be done.
if(bVertical)
- aTempAttr.Put(SdrTextAutoGrowWidthItem(FALSE));
+ aTempAttr.Put(SdrTextAutoGrowWidthItem(sal_False));
else
- aTempAttr.Put(SdrTextAutoGrowHeightItem(FALSE));
+ aTempAttr.Put(SdrTextAutoGrowHeightItem(sal_False));
}
// check if we need another vertical adjustement than the default
@@ -462,7 +462,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec
{
SdrOutliner* pOutliner = ( (SdDrawDocument*) GetModel() )->GetInternalOutliner();
- USHORT nOutlMode = pOutliner->GetMode();
+ sal_uInt16 nOutlMode = pOutliner->GetMode();
pOutliner->Init( OUTLINERMODE_TEXTOBJECT );
pOutliner->SetStyleSheet( 0, NULL );
pOutliner->SetVertical( bVertical );
@@ -508,7 +508,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec
// Hintergrundobjekte der MasterPage
pSdrObj->SetLayer( rLayerAdmin.
- GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE) );
+ GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False) );
}
// Objekt am StyleSheet anmelden
@@ -517,12 +517,12 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec
{
SfxStyleSheet* pSheetForPresObj = GetStyleSheetForPresObj(eObjKind);
if(pSheetForPresObj)
- pSdrObj->SetStyleSheet(pSheetForPresObj, FALSE);
+ pSdrObj->SetStyleSheet(pSheetForPresObj, sal_False);
}
if (eObjKind == PRESOBJ_OUTLINE)
{
- for (USHORT nLevel = 1; nLevel < 10; nLevel++)
+ for (sal_uInt16 nLevel = 1; nLevel < 10; nLevel++)
{
String aName(maLayoutName);
aName += sal_Unicode( ' ' );
@@ -541,7 +541,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec
eObjKind == PRESOBJ_GRAPHIC )
{
SfxItemSet aSet( ((SdDrawDocument*) pModel)->GetPool() );
- aSet.Put( SdrTextContourFrameItem( TRUE ) );
+ aSet.Put( SdrTextContourFrameItem( sal_True ) );
aSet.Put( SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST ) );
pSdrObj->SetMergedItemSet(aSet);
@@ -578,7 +578,7 @@ SfxStyleSheet* SdPage::GetStyleSheetForMasterPageBackground() const
{
String aName(GetLayoutName());
String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
- USHORT nPos = aName.Search(aSep);
+ sal_uInt16 nPos = aName.Search(aSep);
if (nPos != STRING_NOTFOUND)
{
@@ -597,7 +597,7 @@ SfxStyleSheet* SdPage::GetStyleSheetForPresObj(PresObjKind eObjKind) const
{
String aName(GetLayoutName());
String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
- USHORT nPos = aName.Search(aSep);
+ sal_uInt16 nPos = aName.Search(aSep);
if (nPos != STRING_NOTFOUND)
{
nPos = nPos + aSep.Len();
@@ -712,8 +712,8 @@ void SdPage::Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectang
{
if( pObj->GetUserCall() )
{
- sd::UndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0;
- const bool bUndo = pUndoManager && pUndoManager->isInListAction() && IsInserted();
+ ::svl::IUndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0;
+ const bool bUndo = pUndoManager && pUndoManager->IsInListAction() && IsInserted();
if( bUndo )
pUndoManager->AddUndoAction( new UndoObjectUserCall(*pObj) );
@@ -726,9 +726,9 @@ void SdPage::Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectang
{
// MasterPage-Objekt wurde veraendert, daher
// Objekte auf allen Seiten anpassen
- USHORT nPageCount = ((SdDrawDocument*) pModel)->GetSdPageCount(mePageKind);
+ sal_uInt16 nPageCount = ((SdDrawDocument*) pModel)->GetSdPageCount(mePageKind);
- for (USHORT i = 0; i < nPageCount; i++)
+ for (sal_uInt16 i = 0; i < nPageCount; i++)
{
SdPage* pLoopPage = ((SdDrawDocument*) pModel)->GetSdPage(i, mePageKind);
@@ -758,10 +758,10 @@ void SdPage::Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectang
|*
\************************************************************************/
-void SdPage::CreateTitleAndLayout(BOOL bInit, BOOL bCreate )
+void SdPage::CreateTitleAndLayout(sal_Bool bInit, sal_Bool bCreate )
{
- sd::UndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0;
- const bool bUndo = pUndoManager && pUndoManager->isInListAction() && IsInserted();
+ ::svl::IUndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0;
+ const bool bUndo = pUndoManager && pUndoManager->IsInListAction() && IsInserted();
SdPage* pMasterPage = this;
@@ -807,7 +807,7 @@ void SdPage::CreateTitleAndLayout(BOOL bInit, BOOL bCreate )
while( iter != aAreas.end() )
{
- SdrPageObj* pPageObj = static_cast<SdrPageObj*>(pMasterPage->CreatePresObj(PRESOBJ_HANDOUT, FALSE, (*iter++), TRUE) );
+ SdrPageObj* pPageObj = static_cast<SdrPageObj*>(pMasterPage->CreatePresObj(PRESOBJ_HANDOUT, sal_False, (*iter++), sal_True) );
// #i105146# We want no content to be displayed for PK_HANDOUT,
// so just never set a page as content
pPageObj->SetReferencedPage(0L);
@@ -859,17 +859,17 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert)
if( eObjKind == PRESOBJ_TITLE )
{
Rectangle aTitleRect( GetTitleRect() );
- return CreatePresObj(PRESOBJ_TITLE, FALSE, aTitleRect, bInsert);
+ return CreatePresObj(PRESOBJ_TITLE, sal_False, aTitleRect, bInsert);
}
else if( eObjKind == PRESOBJ_OUTLINE )
{
Rectangle aLayoutRect( GetLayoutRect() );
- return CreatePresObj( PRESOBJ_OUTLINE, FALSE, aLayoutRect, bInsert);
+ return CreatePresObj( PRESOBJ_OUTLINE, sal_False, aLayoutRect, bInsert);
}
else if( eObjKind == PRESOBJ_NOTES )
{
Rectangle aLayoutRect( GetLayoutRect() );
- return CreatePresObj( PRESOBJ_NOTES, FALSE, aLayoutRect, bInsert);
+ return CreatePresObj( PRESOBJ_NOTES, sal_False, aLayoutRect, bInsert);
}
else if( (eObjKind == PRESOBJ_FOOTER) || (eObjKind == PRESOBJ_DATETIME) || (eObjKind == PRESOBJ_SLIDENUMBER) || (eObjKind == PRESOBJ_HEADER ) )
{
@@ -894,21 +894,21 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert)
Point aPos( long(nLftBorder+(aPageSize.Width()*0.05)), Y );
Size aSize( W1, H );
Rectangle aRect( aPos, aSize );
- return CreatePresObj( PRESOBJ_DATETIME, FALSE, aRect, bInsert );
+ return CreatePresObj( PRESOBJ_DATETIME, sal_False, aRect, bInsert );
}
else if( eObjKind == PRESOBJ_FOOTER )
{
Point aPos( long(nLftBorder+ aPageSize.Width() * 0.342), Y );
Size aSize( W2, H );
Rectangle aRect( aPos, aSize );
- return CreatePresObj( PRESOBJ_FOOTER, FALSE, aRect, bInsert );
+ return CreatePresObj( PRESOBJ_FOOTER, sal_False, aRect, bInsert );
}
else if( eObjKind == PRESOBJ_SLIDENUMBER )
{
Point aPos( long(nLftBorder+(aPageSize.Width()*0.717)), Y );
Size aSize( W1, H );
Rectangle aRect( aPos, aSize );
- return CreatePresObj( PRESOBJ_SLIDENUMBER, FALSE, aRect, bInsert );
+ return CreatePresObj( PRESOBJ_SLIDENUMBER, sal_False, aRect, bInsert );
}
else
{
@@ -939,25 +939,25 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert)
{
Point aPos( X1, Y1 );
Rectangle aRect( aPos, aSize );
- return CreatePresObj( PRESOBJ_HEADER, FALSE, aRect, bInsert );
+ return CreatePresObj( PRESOBJ_HEADER, sal_False, aRect, bInsert );
}
else if( eObjKind == PRESOBJ_DATETIME )
{
Point aPos( X2, Y1 );
Rectangle aRect( aPos, aSize );
- return CreatePresObj( PRESOBJ_DATETIME, FALSE, aRect, bInsert );
+ return CreatePresObj( PRESOBJ_DATETIME, sal_False, aRect, bInsert );
}
else if( eObjKind == PRESOBJ_FOOTER )
{
Point aPos( X1, Y2 );
Rectangle aRect( aPos, aSize );
- return CreatePresObj( PRESOBJ_FOOTER, FALSE, aRect, bInsert );
+ return CreatePresObj( PRESOBJ_FOOTER, sal_False, aRect, bInsert );
}
else if( eObjKind == PRESOBJ_SLIDENUMBER )
{
Point aPos( X2, Y2 );
Rectangle aRect( aPos, aSize );
- return CreatePresObj( PRESOBJ_SLIDENUMBER, FALSE, aRect, bInsert );
+ return CreatePresObj( PRESOBJ_SLIDENUMBER, sal_False, aRect, bInsert );
}
OSL_FAIL("SdPage::CreateDefaultPresObj() - this should not happen!");
@@ -1292,7 +1292,7 @@ static void CalcAutoLayoutRectangles( SdPage& rPage, int nLayout, Rectangle* rRe
break;
case 6: // title, 4 shapes
{
- ULONG nX = long (aLayoutPos.X());
+ sal_uLong nX = long (aLayoutPos.X());
aLayoutSize.Height() = long (aLayoutSize.Height() * 0.477);
aLayoutSize.Width() = long (aLayoutSize.Width() * 0.488);
@@ -1352,7 +1352,7 @@ static void CalcAutoLayoutRectangles( SdPage& rPage, int nLayout, Rectangle* rRe
}
case 11: // title, 6 shapes
{
- ULONG nX = long (aLayoutPos.X());
+ sal_uLong nX = long (aLayoutPos.X());
aLayoutSize.Height() = long (aLayoutSize.Height() * 0.477);
aLayoutSize.Width() = long (aLayoutSize.Width() * 0.322);
@@ -1541,14 +1541,14 @@ void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescripto
}
}
-void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bCreate )
+void SdPage::SetAutoLayout(AutoLayout eLayout, sal_Bool bInit, sal_Bool bCreate )
{
sd::ScopeLockGuard aGuard( maLockAutoLayoutArrangement );
const bool bSwitchLayout = eLayout != GetAutoLayout();
- sd::UndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0;
- const bool bUndo = pUndoManager && pUndoManager->isInListAction() && IsInserted();
+ ::svl::IUndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0;
+ const bool bUndo = pUndoManager && pUndoManager->IsInListAction() && IsInserted();
meAutoLayout = eLayout;
@@ -1616,7 +1616,7 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bCreate )
|*
\************************************************************************/
-void SdPage::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason)
+void SdPage::NbcInsertObject(SdrObject* pObj, sal_uLong nPos, const SdrInsertReason* pReason)
{
FmFormPage::NbcInsertObject(pObj, nPos, pReason);
@@ -1641,7 +1641,7 @@ void SdPage::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason*
|*
\************************************************************************/
-SdrObject* SdPage::RemoveObject(ULONG nObjNum)
+SdrObject* SdPage::RemoveObject(sal_uLong nObjNum)
{
onRemoveObject(GetObj( nObjNum ));
return FmFormPage::RemoveObject(nObjNum);
@@ -1653,7 +1653,7 @@ SdrObject* SdPage::RemoveObject(ULONG nObjNum)
|*
\************************************************************************/
-SdrObject* SdPage::NbcRemoveObject(ULONG nObjNum)
+SdrObject* SdPage::NbcRemoveObject(sal_uLong nObjNum)
{
onRemoveObject(GetObj( nObjNum ));
return FmFormPage::NbcRemoveObject(nObjNum);
@@ -1661,7 +1661,7 @@ SdrObject* SdPage::NbcRemoveObject(ULONG nObjNum)
// Also overload ReplaceObject methods to realize when
// objects are removed with this mechanism instead of RemoveObject
-SdrObject* SdPage::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
+SdrObject* SdPage::NbcReplaceObject(SdrObject* pNewObj, sal_uLong nObjNum)
{
onRemoveObject(GetObj( nObjNum ));
return FmFormPage::NbcReplaceObject(pNewObj, nObjNum);
@@ -1669,7 +1669,7 @@ SdrObject* SdPage::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
// Also overload ReplaceObject methods to realize when
// objects are removed with this mechanism instead of RemoveObject
-SdrObject* SdPage::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
+SdrObject* SdPage::ReplaceObject(SdrObject* pNewObj, sal_uLong nObjNum)
{
onRemoveObject(GetObj( nObjNum ));
return FmFormPage::ReplaceObject(pNewObj, nObjNum);
@@ -1716,7 +1716,7 @@ void SdPage::SetSize(const Size& aSize)
}
}
-void SdPage::SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 nLwr)
+void SdPage::SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 nLwr)
{
if (nLft != GetLftBorder() || nUpp != GetUppBorder() ||
nRgt != GetRgtBorder() || nLwr != GetLwrBorder() )
@@ -1725,7 +1725,7 @@ void SdPage::SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 nLwr)
}
}
-void SdPage::SetLftBorder(INT32 nBorder)
+void SdPage::SetLftBorder(sal_Int32 nBorder)
{
if (nBorder != GetLftBorder() )
{
@@ -1733,7 +1733,7 @@ void SdPage::SetLftBorder(INT32 nBorder)
}
}
-void SdPage::SetRgtBorder(INT32 nBorder)
+void SdPage::SetRgtBorder(sal_Int32 nBorder)
{
if (nBorder != GetRgtBorder() )
{
@@ -1741,7 +1741,7 @@ void SdPage::SetRgtBorder(INT32 nBorder)
}
}
-void SdPage::SetUppBorder(INT32 nBorder)
+void SdPage::SetUppBorder(sal_Int32 nBorder)
{
if (nBorder != GetUppBorder() )
{
@@ -1749,7 +1749,7 @@ void SdPage::SetUppBorder(INT32 nBorder)
}
}
-void SdPage::SetLwrBorder(INT32 nBorder)
+void SdPage::SetLwrBorder(sal_Int32 nBorder)
{
if (nBorder != GetLwrBorder() )
{
@@ -1763,7 +1763,7 @@ void SdPage::SetLwrBorder(INT32 nBorder)
|*
\************************************************************************/
-void SdPage::SetBackgroundFullSize( BOOL bIn )
+void SdPage::SetBackgroundFullSize( sal_Bool bIn )
{
if( bIn != mbBackgroundFullSize )
{
@@ -1782,7 +1782,7 @@ void SdPage::SetBackgroundFullSize( BOOL bIn )
|*
\************************************************************************/
-void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderRect, BOOL bScaleAllObj)
+void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderRect, sal_Bool bScaleAllObj)
{
sd::ScopeLockGuard aGuard( maLockAutoLayoutArrangement );
@@ -1790,10 +1790,10 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
SdrObject* pObj = NULL;
Point aRefPnt(0, 0);
Size aNewPageSize(rNewPageSize);
- INT32 nLeft = rNewBorderRect.Left();
- INT32 nRight = rNewBorderRect.Right();
- INT32 nUpper = rNewBorderRect.Top();
- INT32 nLower = rNewBorderRect.Bottom();
+ sal_Int32 nLeft = rNewBorderRect.Left();
+ sal_Int32 nRight = rNewBorderRect.Right();
+ sal_Int32 nUpper = rNewBorderRect.Top();
+ sal_Int32 nLower = rNewBorderRect.Bottom();
// Negative Werte stehen fuer nicht zu aendernde Werte
// -> aktuelle Werte verwenden
@@ -1840,11 +1840,11 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
Fraction aFractX = Fraction(aNewPageSize.Width(), nOldWidth);
Fraction aFractY = Fraction(aNewPageSize.Height(), nOldHeight);
- ULONG nObjCnt = (mbScaleObjects ? GetObjCount() : 0);
+ sal_uLong nObjCnt = (mbScaleObjects ? GetObjCount() : 0);
- for (ULONG nObj = 0; nObj < nObjCnt; nObj++)
+ for (sal_uLong nObj = 0; nObj < nObjCnt; nObj++)
{
- BOOL bIsPresObjOnMaster = FALSE;
+ sal_Bool bIsPresObjOnMaster = sal_False;
// Alle Objekte
pObj = GetObj(nObj);
@@ -1852,7 +1852,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
if (mbMaster && IsPresObj(pObj))
{
// Es ist ein Praesentationsobjekt auf der MasterPage
- bIsPresObjOnMaster = TRUE;
+ bIsPresObjOnMaster = sal_True;
}
if (pObj)
@@ -1882,9 +1882,9 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
/**********************************************************
* Praesentationsvorlage: Texthoehe anpassen
**********************************************************/
- USHORT nIndexTitle = 0;
- USHORT nIndexOutline = 0;
- USHORT nIndexNotes = 0;
+ sal_uInt16 nIndexTitle = 0;
+ sal_uInt16 nIndexOutline = 0;
+ sal_uInt16 nIndexNotes = 0;
if (pObj == GetPresObj(PRESOBJ_TITLE, nIndexTitle))
{
@@ -1895,7 +1895,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
SfxItemSet& rSet = pTitleSheet->GetItemSet();
SvxFontHeightItem& rOldHgt = (SvxFontHeightItem&) rSet.Get(EE_CHAR_FONTHEIGHT);
- ULONG nFontHeight = rOldHgt.GetHeight();
+ sal_uLong nFontHeight = rOldHgt.GetHeight();
nFontHeight = long(nFontHeight * (double) aFractY);
rSet.Put(SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT));
@@ -1923,7 +1923,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
String aName(GetLayoutName());
aName += sal_Unicode( ' ' );
- for (USHORT i=1; i<=9; i++)
+ for (sal_uInt16 i=1; i<=9; i++)
{
String sLayoutName(aName);
sLayoutName += String::CreateFromInt32( (sal_Int32)i );
@@ -1935,7 +1935,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
SfxItemSet aTempSet(pOutlineSheet->GetItemSet());
SvxFontHeightItem& rOldHgt = (SvxFontHeightItem&) aTempSet.Get(EE_CHAR_FONTHEIGHT);
- ULONG nFontHeight = rOldHgt.GetHeight();
+ sal_uLong nFontHeight = rOldHgt.GetHeight();
nFontHeight = long(nFontHeight * (double) aFractY);
aTempSet.Put(SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT));
@@ -1956,7 +1956,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
}
// Bullet anpassen
- ((SdStyleSheet*) pOutlineSheet)->AdjustToFontHeight(aTempSet, FALSE);
+ ((SdStyleSheet*) pOutlineSheet)->AdjustToFontHeight(aTempSet, sal_False);
// Sonderbehandlung: die INVALIDS auf NULL-Pointer
// zurueckgesetzen (sonst landen INVALIDs oder
@@ -1985,8 +1985,8 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
if (pNotesSheet)
{
- ULONG nHeight = pObj->GetLogicRect().GetSize().Height();
- ULONG nFontHeight = (ULONG) (nHeight * 0.0741);
+ sal_uLong nHeight = pObj->GetLogicRect().GetSize().Height();
+ sal_uLong nFontHeight = (sal_uLong) (nHeight * 0.0741);
SfxItemSet& rSet = pNotesSheet->GetItemSet();
rSet.Put( SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT ));
rSet.Put( SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT_CJK ));
@@ -2003,8 +2003,8 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
/******************************************************
* Normales Textobjekt: Texthoehe anpassen
******************************************************/
- ULONG nScriptType = pObj->GetOutlinerParaObject()->GetTextObject().GetScriptType();
- USHORT nWhich = EE_CHAR_FONTHEIGHT;
+ sal_uLong nScriptType = pObj->GetOutlinerParaObject()->GetTextObject().GetScriptType();
+ sal_uInt16 nWhich = EE_CHAR_FONTHEIGHT;
if ( nScriptType == SCRIPTTYPE_ASIAN )
nWhich = EE_CHAR_FONTHEIGHT_CJK;
else if ( nScriptType == SCRIPTTYPE_COMPLEX )
@@ -2052,8 +2052,8 @@ SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj,
if( !pModel || !pSourceObj )
return pSourceObj;
- sd::UndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0;
- const bool bUndo = pUndoManager && pUndoManager->isInListAction() && rPage.IsInserted();
+ ::svl::IUndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0;
+ const bool bUndo = pUndoManager && pUndoManager->IsInListAction() && rPage.IsInserted();
SdrObject* pNewObj = pSourceObj;
if((eObjKind == PRESOBJ_OUTLINE) && (pSourceObj->GetObjIdentifier() == OBJ_TEXT) )
@@ -2066,15 +2066,15 @@ SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj,
if(pOutlParaObj)
{
// Text umsetzen
- ::sd::Outliner* pOutl = pModel->GetInternalOutliner( TRUE );
+ ::sd::Outliner* pOutl = pModel->GetInternalOutliner( sal_True );
pOutl->Clear();
pOutl->SetText( *pOutlParaObj );
pOutlParaObj = pOutl->CreateParaObject();
pNewObj->SetOutlinerParaObject( pOutlParaObj );
pOutl->Clear();
- pNewObj->SetEmptyPresObj(FALSE);
+ pNewObj->SetEmptyPresObj(sal_False);
- for (USHORT nLevel = 1; nLevel < 10; nLevel++)
+ for (sal_uInt16 nLevel = 1; nLevel < 10; nLevel++)
{
// Neue Vorlage zuweisen
String aName(rPage.GetLayoutName());
@@ -2132,7 +2132,7 @@ SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj,
pOutlParaObj = pOutl->CreateParaObject();
pNewObj->SetOutlinerParaObject( pOutlParaObj );
pOutl->Clear();
- pNewObj->SetEmptyPresObj(FALSE);
+ pNewObj->SetEmptyPresObj(sal_False);
// Linken Einzug zuruecksetzen
SfxItemSet aSet(pModel->GetPool(), EE_PARA_LRSPACE, EE_PARA_LRSPACE );
@@ -2148,7 +2148,7 @@ SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj,
SfxStyleSheet* pSheet = rPage.GetStyleSheetForPresObj(PRESOBJ_TEXT);
if (pSheet)
- pNewObj->SetStyleSheet(pSheet, TRUE);
+ pNewObj->SetStyleSheet(pSheet, sal_True);
// Remove subtitle shape from page
if( bUndo )
@@ -2192,8 +2192,8 @@ SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj,
*/
SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind, bool bVertical, Rectangle aRect, bool bInit )
{
- sd::UndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0;
- const bool bUndo = pUndoManager && pUndoManager->isInListAction() && IsInserted();
+ ::svl::IUndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0;
+ const bool bUndo = pUndoManager && pUndoManager->IsInListAction() && IsInserted();
if (!pObj && bInit)
{
@@ -2208,7 +2208,7 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind,
if( bUndo )
{
pUndoManager->AddUndoAction( pModel->GetSdrUndoFactory().CreateUndoGeoObject( *pObj ) );
- pUndoManager->AddUndoAction( pModel->GetSdrUndoFactory().CreateUndoAttrObject( *pObj, TRUE, TRUE ) );
+ pUndoManager->AddUndoAction( pModel->GetSdrUndoFactory().CreateUndoAttrObject( *pObj, sal_True, sal_True ) );
pUndoManager->AddUndoAction( new UndoObjectUserCall( *pObj ) );
}
@@ -2237,13 +2237,13 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind,
SfxItemSet aTempAttr( ((SdDrawDocument*) pModel)->GetPool() );
SdrTextMinFrameHeightItem aMinHeight( aRect.GetSize().Height() );
aTempAttr.Put( aMinHeight );
- aTempAttr.Put( SdrTextAutoGrowHeightItem(FALSE) );
+ aTempAttr.Put( SdrTextAutoGrowHeightItem(sal_False) );
pTextObject->SetMergedItemSet(aTempAttr);
pTextObject->SetLogicRect(aRect);
// switch on AutoGrowHeight
SfxItemSet aAttr( ((SdDrawDocument*) pModel)->GetPool() );
- aAttr.Put( SdrTextAutoGrowHeightItem(TRUE) );
+ aAttr.Put( SdrTextAutoGrowHeightItem(sal_True) );
pTextObject->SetMergedItemSet(aAttr);
}
@@ -2254,13 +2254,13 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind,
SfxItemSet aTempAttr( ((SdDrawDocument*) pModel)->GetPool() );
SdrTextMinFrameWidthItem aMinWidth( aRect.GetSize().Width() );
aTempAttr.Put( aMinWidth );
- aTempAttr.Put( SdrTextAutoGrowWidthItem(FALSE) );
+ aTempAttr.Put( SdrTextAutoGrowWidthItem(sal_False) );
pTextObject->SetMergedItemSet(aTempAttr);
pTextObject->SetLogicRect(aRect);
// switch on AutoGrowWidth
SfxItemSet aAttr( ((SdDrawDocument*) pModel)->GetPool() );
- aAttr.Put( SdrTextAutoGrowWidthItem(TRUE) );
+ aAttr.Put( SdrTextAutoGrowWidthItem(sal_True) );
pTextObject->SetMergedItemSet(aAttr);
}
}
@@ -2281,8 +2281,8 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind,
if( bVertical && (( eObjKind == PRESOBJ_TITLE) || (eObjKind == PRESOBJ_OUTLINE)))
{
SfxItemSet aNewSet(pObj->GetMergedItemSet());
- aNewSet.Put( SdrTextAutoGrowWidthItem(TRUE) );
- aNewSet.Put( SdrTextAutoGrowHeightItem(FALSE) );
+ aNewSet.Put( SdrTextAutoGrowWidthItem(sal_True) );
+ aNewSet.Put( SdrTextAutoGrowHeightItem(sal_False) );
if( eObjKind == PRESOBJ_OUTLINE )
{
aNewSet.Put( SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP) );
@@ -2367,14 +2367,14 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO
pOutl->SetRefDevice( SD_MOD()->GetRefDevice( *( (SdDrawDocument*) GetModel() )->GetDocSh() ) );
pOutl->SetEditTextObjectPool(pPool);
pOutl->SetStyleSheetPool((SfxStyleSheetPool*)GetModel()->GetStyleSheetPool());
- pOutl->EnableUndo(FALSE);
- pOutl->SetUpdateMode( FALSE );
+ pOutl->EnableUndo(sal_False);
+ pOutl->SetUpdateMode( sal_False );
}
- USHORT nOutlMode = pOutl->GetMode();
+ sal_uInt16 nOutlMode = pOutl->GetMode();
Size aPaperSize = pOutl->GetPaperSize();
- BOOL bUpdateMode = pOutl->GetUpdateMode();
- pOutl->SetUpdateMode(FALSE);
+ sal_Bool bUpdateMode = pOutl->GetUpdateMode();
+ pOutl->SetUpdateMode(sal_False);
pOutl->SetParaAttribs( 0, pOutl->GetEmptyItemSet() );
// Always set the object's StyleSheet at the Outliner to
@@ -2514,7 +2514,7 @@ void SdPage::SetLayoutName(String aName)
if( mbMaster )
{
String aSep( RTL_CONSTASCII_USTRINGPARAM(SD_LT_SEPARATOR) );
- USHORT nPos = maLayoutName.Search( aSep );
+ sal_uInt16 nPos = maLayoutName.Search( aSep );
if ( nPos != STRING_NOTFOUND )
{
FmFormPage::SetName(maLayoutName.Copy(0, nPos));
@@ -2537,7 +2537,7 @@ const String& SdPage::GetName() const
if ((mePageKind == PK_STANDARD || mePageKind == PK_NOTES) && !mbMaster)
{
// default name for handout pages
- USHORT nNum = (GetPageNum() + 1) / 2;
+ sal_uInt16 nNum = (GetPageNum() + 1) / 2;
aCreatedPageName = String(SdResId(STR_PAGE));
aCreatedPageName += sal_Unicode( ' ' );
@@ -2836,7 +2836,7 @@ bool SdPage::RestoreDefaultText( SdrObject* pObj )
if (aString.Len())
{
- BOOL bVertical = FALSE;
+ sal_Bool bVertical = sal_False;
OutlinerParaObject* pOldPara = pTextObj->GetOutlinerParaObject();
if( pOldPara )
bVertical = pOldPara->IsVertical(); // is old para object vertical?
@@ -2860,8 +2860,8 @@ bool SdPage::RestoreDefaultText( SdrObject* pObj )
}
pTextObj->SetTextEditOutliner( NULL ); // to make stylesheet settings work
- pTextObj->NbcSetStyleSheet( GetStyleSheetForPresObj(ePresObjKind), TRUE );
- pTextObj->SetEmptyPresObj(TRUE);
+ pTextObj->NbcSetStyleSheet( GetStyleSheetForPresObj(ePresObjKind), sal_True );
+ pTextObj->SetEmptyPresObj(sal_True);
bRet = true;
}
}
@@ -2919,7 +2919,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout,
};
sal_uInt16* pOffsets = aOffsets[0];
- USHORT nColCnt = 0, nRowCnt = 0;
+ sal_uInt16 nColCnt = 0, nRowCnt = 0;
switch ( eLayout )
{
case AUTOLAYOUT_HANDOUT1:
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 76a23d4b730e..e5576bc01c1a 100644..100755
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -67,7 +67,7 @@ extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString&
/*************************************************************************
|*
-|* SetPresentationLayout, setzt: Layoutnamen, Masterpage-Verknpfung und
+|* SetPresentationLayout, setzt: Layoutnamen, Masterpage-Verkn�pfung und
|* Vorlagen fuer Praesentationsobjekte
|*
|* Vorraussetzungen: - Die Seite muss bereits das richtige Model kennen!
@@ -75,20 +75,20 @@ extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString&
|* - Die entsprechenden StyleSheets muessen bereits im
|* im StyleSheetPool sein.
|*
-|* bReplaceStyleSheets = TRUE : Benannte StyleSheets werden ausgetauscht
-|* FALSE: Alle StyleSheets werden neu zugewiesen
+|* bReplaceStyleSheets = sal_True : Benannte StyleSheets werden ausgetauscht
+|* sal_False: Alle StyleSheets werden neu zugewiesen
|*
-|* bSetMasterPage = TRUE : MasterPage suchen und zuweisen
+|* bSetMasterPage = sal_True : MasterPage suchen und zuweisen
|*
-|* bReverseOrder = FALSE: MasterPages von vorn nach hinten suchen
-|* TRUE : MasterPages von hinten nach vorn suchen (fuer Undo-Action)
+|* bReverseOrder = sal_False: MasterPages von vorn nach hinten suchen
+|* sal_True : MasterPages von hinten nach vorn suchen (fuer Undo-Action)
|*
\************************************************************************/
void SdPage::SetPresentationLayout(const String& rLayoutName,
- BOOL bReplaceStyleSheets,
- BOOL bSetMasterPage,
- BOOL bReverseOrder)
+ sal_Bool bReplaceStyleSheets,
+ sal_Bool bSetMasterPage,
+ sal_Bool bReverseOrder)
{
/*********************************************************************
|* Layoutname der Seite
@@ -105,8 +105,8 @@ void SdPage::SetPresentationLayout(const String& rLayoutName,
{
SdPage* pMaster;
SdPage* pFoundMaster = 0;
- USHORT nMaster = 0;
- USHORT nMasterCount = pModel->GetMasterPageCount();
+ sal_uInt16 nMaster = 0;
+ sal_uInt16 nMasterCount = pModel->GetMasterPageCount();
if( !bReverseOrder )
{
@@ -154,9 +154,9 @@ void SdPage::SetPresentationLayout(const String& rLayoutName,
boost::ptr_vector<StyleReplaceData> aReplList;
bool bListsFilled = false;
- ULONG nObjCount = GetObjCount();
+ sal_uLong nObjCount = GetObjCount();
- for (ULONG nObj = 0; nObj < nObjCount; nObj++)
+ for (sal_uLong nObj = 0; nObj < nObjCount; nObj++)
{
SdrTextObj* pObj = (SdrTextObj*) GetObj(nObj);
@@ -252,14 +252,14 @@ void SdPage::SetPresentationLayout(const String& rLayoutName,
SfxStyleSheet* pSheet = GetStyleSheetForPresObj(PRESOBJ_TITLE);
if (pSheet)
- pObj->SetStyleSheet(pSheet, TRUE);
+ pObj->SetStyleSheet(pSheet, sal_True);
}
else
{
SfxStyleSheet* pSheet = GetStyleSheetForPresObj(GetPresObjKind(pObj));
if (pSheet)
- pObj->SetStyleSheet(pSheet, TRUE);
+ pObj->SetStyleSheet(pSheet, sal_True);
}
}
}
@@ -395,7 +395,7 @@ SdPage::SdPage(const SdPage& rSrcPage)
while((pObj = rSrcPage.maPresentationShapeList.getNextShape(pObj)) != 0)
InsertPresObj(GetObj(pObj->GetOrdNum()), rSrcPage.GetPresObjKind(pObj));
- mbSelected = FALSE;
+ mbSelected = sal_False;
mnTransitionType = rSrcPage.mnTransitionType;
mnTransitionSubtype = rSrcPage.mnTransitionSubtype;
mbTransitionDirection = rSrcPage.mbTransitionDirection;
diff --git a/sd/source/core/shapelist.cxx b/sd/source/core/shapelist.cxx
index 3e809868187c..2e3b35f3e585 100644
--- a/sd/source/core/shapelist.cxx
+++ b/sd/source/core/shapelist.cxx
@@ -85,44 +85,6 @@ SdrObject* ShapeList::removeShape( SdrObject& rObject )
return 0;
}
-void ShapeList::replaceShape( SdrObject& rOldObject, SdrObject& rNewObject )
-{
- if( &rOldObject == &rNewObject )
- return;
-
- ListImpl::iterator aIter( std::find( maShapeList.begin(), maShapeList.end(), &rNewObject ) );
- if( aIter != maShapeList.end() )
- {
- bool bIterErased = aIter == maIter;
- (*aIter)->RemoveObjectUser(*this);
- aIter = maShapeList.erase( aIter );
-
- if( bIterErased )
- maIter = aIter;
- }
-
- aIter = std::find( maShapeList.begin(), maShapeList.end(), &rOldObject );
- if( aIter != maShapeList.end() )
- {
- bool bIterErased = aIter == maIter;
-
- ListImpl::iterator iNew( maShapeList.insert( aIter, &rNewObject ) );
-
- (*aIter)->RemoveObjectUser(*this);
- aIter = maShapeList.erase( aIter );
-
- rNewObject.AddObjectUser( *this );
-
- if( bIterErased )
- maIter = iNew;
- }
- else
- {
- OSL_FAIL("sd::ShapeList::replaceShape(), given shape not part of list!");
- addShape( rNewObject );
- }
-}
-
/** removes all shapes from this list
NOTE: iterators will become invalid */
void ShapeList::clear()
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 7338f7066b58..b3d53d599844 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -75,6 +75,7 @@
#include "sdpage.hxx"
#include "helpids.h"
#include <svl/itemset.hxx>
+#include "app.hrc"
using ::rtl::OUString;
using namespace ::com::sun::star::uno;
@@ -119,7 +120,7 @@ SdStyleSheetPool::~SdStyleSheetPool()
// ----------------------------------------------------------
-SfxStyleSheetBase* SdStyleSheetPool::Create(const String& rName, SfxStyleFamily eFamily, USHORT _nMask )
+SfxStyleSheetBase* SdStyleSheetPool::Create(const String& rName, SfxStyleFamily eFamily, sal_uInt16 _nMask )
{
return new SdStyleSheet(rName, *this, eFamily, _nMask);
}
@@ -155,7 +156,7 @@ void SdStyleSheetPool::CreateOutlineSheetList (const String& rLayoutName, std::v
aName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
aName += String(SdResId(STR_LAYOUT_OUTLINE));
- for (USHORT nSheet = 1; nSheet < 10; nSheet++)
+ for (sal_uInt16 nSheet = 1; nSheet < 10; nSheet++)
{
String aFullName(aName);
aFullName.Append( sal_Unicode( ' ' ));
@@ -211,7 +212,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
SfxStyleSheetBase* pParent = NULL;
SvxLRSpaceItem aSvxLRSpaceItem( EE_PARA_LRSPACE );
SvxULSpaceItem aSvxULSpaceItem( EE_PARA_ULSPACE );
- USHORT nLevel;
+ sal_uInt16 nLevel;
for( nLevel = 1; nLevel < 10; nLevel++)
{
@@ -246,8 +247,8 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
rSet.Put( SvxUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE ) );
rSet.Put( SvxOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE ) );
rSet.Put( SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ) );
- rSet.Put( SvxShadowedItem(FALSE, EE_CHAR_SHADOW ) );
- rSet.Put( SvxContourItem(FALSE, EE_CHAR_OUTLINE ) );
+ rSet.Put( SvxShadowedItem(sal_False, EE_CHAR_SHADOW ) );
+ rSet.Put( SvxContourItem(sal_False, EE_CHAR_OUTLINE ) );
rSet.Put( SvxEmphasisMarkItem(EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK ) );
rSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF) );
rSet.Put( SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR) );
@@ -256,7 +257,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
rSet.Put( SdrTextFitToSizeTypeItem(SDRTEXTFIT_AUTOFIT) );
rSet.Put( SdrTextAutoGrowHeightItem(FALSE) );
// #i16874# enable kerning by default but only for new documents
- rSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) );
+ rSet.Put( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) );
if( nLevel == 1 )
{
@@ -265,8 +266,8 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
}
}
- ULONG nFontSize = 20;
- USHORT nLower = 100;
+ sal_uLong nFontSize = 20;
+ sal_uInt16 nLower = 100;
switch (nLevel)
{
@@ -299,7 +300,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
}
// FontSize
- nFontSize = (USHORT)((nFontSize * 2540L) / 72); // Pt --> 1/100 mm
+ nFontSize = (sal_uInt16)((nFontSize * 2540L) / 72); // Pt --> 1/100 mm
SfxItemSet& rOutlineSet = pSheet->GetItemSet();
rOutlineSet.Put( SvxFontHeightItem( nFontSize, 100, EE_CHAR_FONTHEIGHT ) );
rOutlineSet.Put( SvxFontHeightItem( nFontSize, 100, EE_CHAR_FONTHEIGHT_CJK ) );
@@ -367,15 +368,15 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
rTitleSet.Put(SvxUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE ));
rTitleSet.Put(SvxOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE ));
rTitleSet.Put(SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ));
- rTitleSet.Put(SvxShadowedItem(FALSE, EE_CHAR_SHADOW ));
- rTitleSet.Put(SvxContourItem(FALSE, EE_CHAR_OUTLINE ));
+ rTitleSet.Put(SvxShadowedItem(sal_False, EE_CHAR_SHADOW ));
+ rTitleSet.Put(SvxContourItem(sal_False, EE_CHAR_OUTLINE ));
rTitleSet.Put( SvxEmphasisMarkItem(EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK ) );
rTitleSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF ) );
rTitleSet.Put(SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR ));
rTitleSet.Put(SvxAdjustItem(SVX_ADJUST_CENTER, EE_PARA_JUST ));
rTitleSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) );
// #i16874# enable kerning by default but only for new documents
- rTitleSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) );
+ rTitleSet.Put( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) );
aBulletFont.SetSize(Size(0,1552)); // 44 pt
PutNumBulletItem( pSheet, aBulletFont );
@@ -412,15 +413,15 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
rSubtitleSet.Put(SvxUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE ));
rSubtitleSet.Put(SvxOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE ));
rSubtitleSet.Put(SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ));
- rSubtitleSet.Put(SvxShadowedItem(FALSE, EE_CHAR_SHADOW ));
- rSubtitleSet.Put(SvxContourItem(FALSE, EE_CHAR_OUTLINE ));
+ rSubtitleSet.Put(SvxShadowedItem(sal_False, EE_CHAR_SHADOW ));
+ rSubtitleSet.Put(SvxContourItem(sal_False, EE_CHAR_OUTLINE ));
rSubtitleSet.Put( SvxEmphasisMarkItem(EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK ) );
rSubtitleSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF ) );
rSubtitleSet.Put(SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR ));
rSubtitleSet.Put(SvxAdjustItem(SVX_ADJUST_CENTER, EE_PARA_JUST ));
rSubtitleSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) );
// #i16874# enable kerning by default but only for new documents
- rSubtitleSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) );
+ rSubtitleSet.Put( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) );
aSvxLRSpaceItem.SetTxtLeft(0);
rSubtitleSet.Put(aSvxLRSpaceItem);
@@ -460,14 +461,14 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
rNotesSet.Put( SvxUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE ) );
rNotesSet.Put( SvxOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE ) );
rNotesSet.Put( SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ) );
- rNotesSet.Put( SvxShadowedItem(FALSE, EE_CHAR_SHADOW ) );
- rNotesSet.Put( SvxContourItem(FALSE, EE_CHAR_OUTLINE ) );
+ rNotesSet.Put( SvxShadowedItem(sal_False, EE_CHAR_SHADOW ) );
+ rNotesSet.Put( SvxContourItem(sal_False, EE_CHAR_OUTLINE ) );
rNotesSet.Put( SvxEmphasisMarkItem(EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK ) );
rNotesSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF) );
rNotesSet.Put( SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR ) );
rNotesSet.Put( SvxLRSpaceItem( 0, 0, 600, -600, EE_PARA_LRSPACE ) );
// #i16874# enable kerning by default but only for new documents
- rNotesSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) );
+ rNotesSet.Put( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) );
/* #i35937# */
@@ -487,12 +488,13 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUNDOBJECTS );
pSheet->SetParent(String());
SfxItemSet& rBackgroundObjectsSet = pSheet->GetItemSet();
- rBackgroundObjectsSet.Put(SdrShadowItem(FALSE));
+ rBackgroundObjectsSet.Put(SdrShadowItem(sal_False));
rBackgroundObjectsSet.Put(SdrShadowColorItem(String(), Color(COL_GRAY)));
- rBackgroundObjectsSet.Put(SdrShadowXDistItem(300)); // 3 mm Schattendistanz
- rBackgroundObjectsSet.Put(SdrShadowYDistItem(300));
+ rBackgroundObjectsSet.Put(SdrShadowXDistItem(200)); // 3 mm Schattendistanz
+ rBackgroundObjectsSet.Put(SdrShadowYDistItem(200));
// #i16874# enable kerning by default but only for new documents
- rBackgroundObjectsSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) );
+ rBackgroundObjectsSet.Put( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) );
+ rBackgroundObjectsSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_BLOCK));
}
/**************************************************************************
@@ -512,7 +514,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
rBackgroundSet.Put(XLineStyleItem(XLINE_NONE));
rBackgroundSet.Put(XFillStyleItem(XFILL_NONE));
// #i16874# enable kerning by default but only for new documents
- rBackgroundSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) );
+ rBackgroundSet.Put( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) );
}
DBG_ASSERT( !bCheck || !bCreated, "missing layout style sheets detected!" );
@@ -718,7 +720,7 @@ void SdStyleSheetPool::CreateLayoutSheetNames(const String& rLayoutName, std::ve
String aName(SdResId(STR_LAYOUT_OUTLINE));
String aStr;
- for (USHORT nLevel = 1; nLevel < 10; nLevel++)
+ for (sal_uInt16 nLevel = 1; nLevel < 10; nLevel++)
{
aStr = String( aPrefix );
aStr.Append(aName);
@@ -759,7 +761,7 @@ void SdStyleSheetPool::CreateLayoutSheetList(const String& rLayoutName, SdStyleS
{
String aLayoutNameWithSep(rLayoutName);
aLayoutNameWithSep.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
- USHORT nLen = aLayoutNameWithSep.Len();
+ sal_uInt16 nLen = aLayoutNameWithSep.Len();
SfxStyleSheetIterator aIter(this, SD_STYLE_FAMILY_MASTERPAGE);
SfxStyleSheetBase* pSheet = aIter.First();
@@ -785,7 +787,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
SfxStyleSheetBase* pSheet = NULL;
SfxStyleSheetBase* pParent = NULL;
- USHORT nUsedMask = SFXSTYLEBIT_USED;
+ sal_uInt16 nUsedMask = SFXSTYLEBIT_USED;
aName = String(SdResId(STR_PSEUDOSHEET_TITLE));
if( (pSheet = Find(aName, SD_STYLE_FAMILY_PSEUDO)) == 0 )
@@ -835,7 +837,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
pParent = NULL;
SetSearchMask(SD_STYLE_FAMILY_PSEUDO);
aName = String(SdResId(STR_PSEUDOSHEET_OUTLINE));
- for (USHORT nLevel = 1; nLevel < 10; nLevel++)
+ for (sal_uInt16 nLevel = 1; nLevel < 10; nLevel++)
{
String aLevelName(aName);
aLevelName.Append( sal_Unicode( ' ' ));
@@ -877,12 +879,12 @@ void SdStyleSheetPool::UpdateStdNames()
if( !pStyle->IsUserDefined() )
{
String aOldName = pStyle->GetName();
- ULONG nHelpId = pStyle->GetHelpId( aHelpFile );
+ sal_uLong nHelpId = pStyle->GetHelpId( aHelpFile );
SfxStyleFamily eFam = pStyle->GetFamily();
- BOOL bHelpKnown = TRUE;
+ sal_Bool bHelpKnown = sal_True;
String aNewName;
- USHORT nNameId = 0;
+ sal_uInt16 nNameId = 0;
switch( nHelpId )
{
case HID_STANDARD_STYLESHEET_NAME: nNameId = STR_STANDARD_STYLESHEET_NAME; break;
@@ -925,7 +927,7 @@ void SdStyleSheetPool::UpdateStdNames()
default:
// 0 oder falsche (alte) HelpId
- bHelpKnown = FALSE;
+ bHelpKnown = sal_False;
}
if( bHelpKnown )
{
@@ -966,7 +968,7 @@ void SdStyleSheetPool::UpdateStdNames()
if ( pEraseList )
{
// Styles, welche nicht umbenannt werden konnten, muessen entfernt werden
- for ( ULONG i = 0; i < pEraseList->Count(); i++ )
+ for ( sal_uLong i = 0; i < pEraseList->Count(); i++ )
{
SfxStyleSheetBase* pEraseSheet = ( SfxStyleSheetBase* ) pEraseList->GetObject( i );
Remove( pEraseSheet );
@@ -984,7 +986,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
Font& rBulletFont )
{
String aHelpFile;
- ULONG nHelpId = pSheet->GetHelpId( aHelpFile );
+ sal_uLong nHelpId = pSheet->GetHelpId( aHelpFile );
SfxItemSet& rSet = pSheet->GetItemSet();
switch ( nHelpId )
@@ -1000,13 +1002,9 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
aNumberFormat.SetStart(1);
aNumberFormat.SetNumAdjust(SVX_ADJUST_LEFT);
- SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10 , FALSE);
- aNumberFormat.SetLSpace( 0 );
- aNumberFormat.SetAbsLSpace( 0 );
- aNumberFormat.SetFirstLineOffset( 0 );
- aNumRule.SetLevel( 0, aNumberFormat );
+ SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10 , sal_False);
- for( USHORT i = 1; i < aNumRule.GetLevelCount(); i++ )
+ for( sal_uInt16 i = 0; i < aNumRule.GetLevelCount(); i++ )
{
const short nLSpace = (i + 1) * 600;
aNumberFormat.SetLSpace(nLSpace);
@@ -1030,8 +1028,8 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
if(pDefaultRule)
{
- SvxNumRule aNumRule(pDefaultRule->GetFeatureFlags(), 10, FALSE);
- for(USHORT i=0; i < aNumRule.GetLevelCount(); i++)
+ SvxNumRule aNumRule(pDefaultRule->GetFeatureFlags(), 10, sal_False);
+ for(sal_uInt16 i=0; i < aNumRule.GetLevelCount(); i++)
{
SvxNumberFormat aFrmt( pDefaultRule->GetLevel(i) );
aFrmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
@@ -1057,8 +1055,8 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
aNumberFormat.SetNumAdjust(SVX_ADJUST_LEFT);
SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE|NUM_SYMBOL_ALIGNMENT,
- 10, FALSE );
- for( UINT16 i = 0; i < aNumRule.GetLevelCount(); i++ )
+ 10, sal_False );
+ for( sal_uInt16 i = 0; i < aNumRule.GetLevelCount(); i++ )
{
aNumberFormat.SetBulletChar( 0x25CF ); // StarBats: 0xF000 + 34
aNumberFormat.SetBulletRelSize(45);
@@ -1067,7 +1065,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
aNumberFormat.SetAbsLSpace(nLSpace);
short nFirstLineOffset = -600;
- ULONG nFontSize = 20;
+ sal_uLong nFontSize = 20;
switch(i)
{
case 0:
@@ -1102,7 +1100,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
}
aNumberFormat.SetFirstLineOffset(nFirstLineOffset);
- nFontSize = (USHORT)((nFontSize * 2540L) / 72); // Pt --> 1/100 mm
+ nFontSize = (sal_uInt16)((nFontSize * 2540L) / 72); // Pt --> 1/100 mm
rBulletFont.SetSize(Size(0,846)); // 24 pt
aNumberFormat.SetBulletFont(&rBulletFont);
aNumRule.SetLevel( i, aNumberFormat );
@@ -1130,10 +1128,10 @@ Font SdStyleSheetPool::GetBulletFont() const
aBulletFont.SetOverline(UNDERLINE_NONE);
aBulletFont.SetStrikeout(STRIKEOUT_NONE);
aBulletFont.SetItalic(ITALIC_NONE);
- aBulletFont.SetOutline(FALSE);
- aBulletFont.SetShadow(FALSE);
+ aBulletFont.SetOutline(sal_False);
+ aBulletFont.SetShadow(sal_False);
aBulletFont.SetColor(Color(COL_AUTO));
- aBulletFont.SetTransparent(TRUE);
+ aBulletFont.SetTransparent(sal_True);
return aBulletFont;
}
@@ -1382,10 +1380,10 @@ SdStyleSheetVector SdStyleSheetPool::CreateChildList( SdStyleSheet* pSheet )
{
SdStyleSheetVector aResult;
- USHORT nListenerCount = pSheet->GetListenerCount();
+ sal_uInt16 nListenerCount = pSheet->GetListenerCount();
if (nListenerCount > 0)
{
- for (USHORT n = 0; n < nListenerCount; n++)
+ for (sal_uInt16 n = 0; n < nListenerCount; n++)
{
SdStyleSheet* pChild = dynamic_cast< SdStyleSheet* >( pSheet->GetListener(n) );
if(pChild && pChild->GetParent() == pSheet->GetName())
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index c921786753c6..0b439edd3b26 100644..100755
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -132,7 +132,7 @@ void ModifyListenerForewarder::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*
mpStyleSheet->notifyModifyListener();
}
-SdStyleSheet::SdStyleSheet(const OUString& rDisplayName, SfxStyleSheetBasePool& _rPool, SfxStyleFamily eFamily, USHORT _nMask)
+SdStyleSheet::SdStyleSheet(const OUString& rDisplayName, SfxStyleSheetBasePool& _rPool, SfxStyleFamily eFamily, sal_uInt16 _nMask)
: SdStyleSheetBase( UniString( rDisplayName ), _rPool, eFamily, _nMask)
, ::cppu::BaseMutex()
, msApiName( rDisplayName )
@@ -170,7 +170,7 @@ rtl::OUString SdStyleSheet::GetApiName() const
}
-void SdStyleSheet::Load (SvStream& rIn, USHORT nVersion)
+void SdStyleSheet::Load (SvStream& rIn, sal_uInt16 nVersion)
{
SfxStyleSheetBase::Load(rIn, nVersion);
@@ -200,9 +200,9 @@ void SdStyleSheet::Store(SvStream& rOut)
|*
\************************************************************************/
-BOOL SdStyleSheet::SetParent(const String& rParentName)
+sal_Bool SdStyleSheet::SetParent(const String& rParentName)
{
- BOOL bResult = FALSE;
+ sal_Bool bResult = sal_False;
if (SfxStyleSheet::SetParent(rParentName))
{
@@ -214,7 +214,7 @@ BOOL SdStyleSheet::SetParent(const String& rParentName)
SfxStyleSheetBase* pStyle = rPool.Find(rParentName, nFamily);
if (pStyle)
{
- bResult = TRUE;
+ bResult = sal_True;
SfxItemSet& rParentSet = pStyle->GetItemSet();
GetItemSet().SetParent(&rParentSet);
Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) );
@@ -222,14 +222,14 @@ BOOL SdStyleSheet::SetParent(const String& rParentName)
}
else
{
- bResult = TRUE;
+ bResult = sal_True;
GetItemSet().SetParent(NULL);
Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) );
}
}
else
{
- bResult = TRUE;
+ bResult = sal_True;
}
}
return bResult;
@@ -248,7 +248,7 @@ SfxItemSet& SdStyleSheet::GetItemSet()
// ggfs. das ItemSet 'on demand' anlegen
if (!pSet)
{
- USHORT nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST,
+ sal_uInt16 nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST,
XATTR_FILL_FIRST, XATTR_FILL_LAST,
SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST,
@@ -276,7 +276,7 @@ SfxItemSet& SdStyleSheet::GetItemSet()
{
if (!pSet)
{
- USHORT nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST,
+ sal_uInt16 nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST,
XATTR_FILL_FIRST, XATTR_FILL_LAST,
SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST,
@@ -312,7 +312,7 @@ SfxItemSet& SdStyleSheet::GetItemSet()
{
if (!pSet)
{
- USHORT nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST,
+ sal_uInt16 nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST,
XATTR_FILL_FIRST, XATTR_FILL_LAST,
SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST,
@@ -345,14 +345,14 @@ SfxItemSet& SdStyleSheet::GetItemSet()
|*
\************************************************************************/
-BOOL SdStyleSheet::IsUsed() const
+sal_Bool SdStyleSheet::IsUsed() const
{
- BOOL bResult = FALSE;
+ sal_Bool bResult = sal_False;
- USHORT nListenerCount = GetListenerCount();
+ sal_uInt16 nListenerCount = GetListenerCount();
if (nListenerCount > 0)
{
- for (USHORT n = 0; n < nListenerCount; n++)
+ for (sal_uInt16 n = 0; n < nListenerCount; n++)
{
SfxListener* pListener = GetListener(n);
if( pListener == this )
@@ -471,7 +471,7 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
else
{
String aOutlineStr(SdResId(STR_PSEUDOSHEET_OUTLINE));
- USHORT nPos = aName.Search(aOutlineStr);
+ sal_uInt16 nPos = aName.Search(aOutlineStr);
if (nPos != STRING_NOTFOUND)
{
String aNumStr(aName.Copy(aOutlineStr.Len()));
@@ -533,7 +533,7 @@ SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const
else
{
String aOutlineStr((SdResId(STR_LAYOUT_OUTLINE)));
- USHORT nPos = aStyleName.Search(aOutlineStr);
+ sal_uInt16 nPos = aStyleName.Search(aOutlineStr);
if (nPos != STRING_NOTFOUND)
{
String aNumStr(aStyleName.Copy(aOutlineStr.Len()));
@@ -564,7 +564,7 @@ void SdStyleSheet::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
// bekommt, sorgt er dafuer, dass das eigentlich gemeinte StyleSheet
// broadcastet
SfxSimpleHint* pSimple = PTR_CAST(SfxSimpleHint, &rHint);
- ULONG nId = pSimple == NULL ? 0 : pSimple->GetId();
+ sal_uLong nId = pSimple == NULL ? 0 : pSimple->GetId();
if (nId == SFX_HINT_DATACHANGED && nFamily == SD_STYLE_FAMILY_PSEUDO)
{
SdStyleSheet* pRealStyle = GetRealStyleSheet();
@@ -579,11 +579,11 @@ void SdStyleSheet::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
|* berechnet, dass das Verhaeltnis zur Fonthoehe so ist wie im StyleSheet.
|*
|* bOnlyMissingItems legt fest, ob lediglich nicht gesetzte Items ergaenzt
-|* (TRUE) oder explizit gesetzte Items ueberschreiben werden sollen (FALSE)
+|* (sal_True) oder explizit gesetzte Items ueberschreiben werden sollen (sal_False)
|*
\************************************************************************/
-void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, BOOL bOnlyMissingItems)
+void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, sal_Bool bOnlyMissingItems)
{
// Bulletbreite und Texteinzug an neue Fonthoehe
// anpassen, wenn sie nicht explizit gesetzt wurden
@@ -601,15 +601,15 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, BOOL bOnlyMissingItems)
rSet.GetItemState(EE_CHAR_FONTHEIGHT) == SFX_ITEM_SET)
{
const SfxItemSet* pCurSet = &GetItemSet();
- UINT32 nNewHeight = ((SvxFontHeightItem&)rSet.Get(EE_CHAR_FONTHEIGHT)).GetHeight();
- UINT32 nOldHeight = ((SvxFontHeightItem&)pCurSet->Get(EE_CHAR_FONTHEIGHT)).GetHeight();
+ sal_uInt32 nNewHeight = ((SvxFontHeightItem&)rSet.Get(EE_CHAR_FONTHEIGHT)).GetHeight();
+ sal_uInt32 nOldHeight = ((SvxFontHeightItem&)pCurSet->Get(EE_CHAR_FONTHEIGHT)).GetHeight();
if (rSet.GetItemState(EE_PARA_BULLET) != SFX_ITEM_SET || !bOnlyMissingItems)
{
const SvxBulletItem& rBItem = (const SvxBulletItem&)pCurSet->Get(EE_PARA_BULLET);
double fBulletFraction = double(rBItem.GetWidth()) / nOldHeight;
SvxBulletItem aNewBItem(rBItem);
- aNewBItem.SetWidth((UINT32)(fBulletFraction * nNewHeight));
+ aNewBItem.SetWidth((sal_uInt32)(fBulletFraction * nNewHeight));
rSet.Put(aNewBItem);
}
@@ -618,7 +618,7 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, BOOL bOnlyMissingItems)
const SvxLRSpaceItem& rLRItem = (const SvxLRSpaceItem&)pCurSet->Get(EE_PARA_LRSPACE);
double fIndentFraction = double(rLRItem.GetTxtLeft()) / nOldHeight;
SvxLRSpaceItem aNewLRItem(rLRItem);
- aNewLRItem.SetTxtLeft((USHORT)(fIndentFraction * nNewHeight));
+ aNewLRItem.SetTxtLeft((sal_uInt16)(fIndentFraction * nNewHeight));
double fFirstIndentFraction = double(rLRItem.GetTxtFirstLineOfst()) / nOldHeight;
aNewLRItem.SetTxtFirstLineOfst((short)(fFirstIndentFraction * nNewHeight));
rSet.Put(aNewLRItem);
@@ -629,9 +629,9 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, BOOL bOnlyMissingItems)
const SvxULSpaceItem& rULItem = (const SvxULSpaceItem&)pCurSet->Get(EE_PARA_ULSPACE);
SvxULSpaceItem aNewULItem(rULItem);
double fLowerFraction = double(rULItem.GetLower()) / nOldHeight;
- aNewULItem.SetLower((USHORT)(fLowerFraction * nNewHeight));
+ aNewULItem.SetLower((sal_uInt16)(fLowerFraction * nNewHeight));
double fUpperFraction = double(rULItem.GetUpper()) / nOldHeight;
- aNewULItem.SetUpper((USHORT)(fUpperFraction * nNewHeight));
+ aNewULItem.SetUpper((sal_uInt16)(fUpperFraction * nNewHeight));
rSet.Put(aNewULItem);
}
}
@@ -639,35 +639,35 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, BOOL bOnlyMissingItems)
// --------------------------------------------------------------------
-BOOL SdStyleSheet::HasFollowSupport() const
+sal_Bool SdStyleSheet::HasFollowSupport() const
{
- return FALSE;
+ return sal_False;
}
// --------------------------------------------------------------------
-BOOL SdStyleSheet::HasParentSupport() const
+sal_Bool SdStyleSheet::HasParentSupport() const
{
- return TRUE;
+ return sal_True;
}
// --------------------------------------------------------------------
-BOOL SdStyleSheet::HasClearParentSupport() const
+sal_Bool SdStyleSheet::HasClearParentSupport() const
{
- return TRUE;
+ return sal_True;
}
// --------------------------------------------------------------------
-BOOL SdStyleSheet::SetName( const UniString& rName )
+sal_Bool SdStyleSheet::SetName( const UniString& rName )
{
return SfxStyleSheet::SetName( rName );
}
// --------------------------------------------------------------------
-void SdStyleSheet::SetHelpId( const String& r, ULONG nId )
+void SdStyleSheet::SetHelpId( const String& r, sal_uLong nId )
{
SfxStyleSheet::SetHelpId( r, nId );
@@ -962,13 +962,11 @@ void SAL_CALL SdStyleSheet::setName( const OUString& rName ) throw(RuntimeExcep
{
SolarMutexGuard aGuard;
throwIfDisposed();
- if( IsUserDefined() )
+
+ if( SetName( rName ) )
{
- if( SetName( rName ) )
- {
- msApiName = rName;
- Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
- }
+ msApiName = rName;
+ Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
}
}
@@ -1015,28 +1013,25 @@ void SAL_CALL SdStyleSheet::setParentStyle( const OUString& rParentName ) throw
SolarMutexGuard aGuard;
throwIfDisposed();
- if( IsUserDefined() )
+ if( rParentName.getLength() )
{
- if( rParentName.getLength() )
- {
- const SfxStyles& rStyles = mxPool->GetStyles();
+ const SfxStyles& rStyles = mxPool->GetStyles();
for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); ++iter )
+ {
+ SdStyleSheet* pStyle = static_cast< SdStyleSheet* >( (*iter).get() );
+ if( pStyle && (pStyle->nFamily == nFamily) && (pStyle->msApiName == rParentName) )
{
- SdStyleSheet* pStyle = static_cast< SdStyleSheet* >( (*iter).get() );
- if( pStyle && (pStyle->nFamily == nFamily) && (pStyle->msApiName == rParentName) )
- {
- if( pStyle != this )
- SetParent( pStyle->GetName() );
- return;
- }
+ if( pStyle != this )
+ SetParent( pStyle->GetName() );
+ return;
}
- throw NoSuchElementException();
- }
- else
- {
- SetParent( rParentName );
}
+ throw NoSuchElementException();
+ }
+ else
+ {
+ SetParent( rParentName );
}
}
@@ -1304,7 +1299,7 @@ PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyN
case XATTR_LINESTART:
case XATTR_LINEDASH:
{
- NameOrIndex* pItem = (NameOrIndex*)rStyleSet.GetItem((USHORT)pEntry->nWID);
+ NameOrIndex* pItem = (NameOrIndex*)rStyleSet.GetItem((sal_uInt16)pEntry->nWID);
if( ( pItem == NULL ) || ( pItem->GetName().Len() == 0) )
eState = PropertyState_DEFAULT_VALUE;
}
diff --git a/sd/source/core/undo/undomanager.cxx b/sd/source/core/undo/undomanager.cxx
index f08c7961a163..adeafcbd60eb 100644..100755
--- a/sd/source/core/undo/undomanager.cxx
+++ b/sd/source/core/undo/undomanager.cxx
@@ -33,42 +33,24 @@
using namespace sd;
-UndoManager::UndoManager( USHORT nMaxUndoActionCount /* = 20 */ )
+UndoManager::UndoManager( sal_uInt16 nMaxUndoActionCount /* = 20 */ )
: SfxUndoManager( nMaxUndoActionCount )
-, mnListLevel( 0 )
, mpLinkedUndoManager(NULL)
{
}
-void UndoManager::EnterListAction(const UniString &rComment, const UniString& rRepeatComment, USHORT nId /* =0 */)
+void UndoManager::EnterListAction(const UniString &rComment, const UniString& rRepeatComment, sal_uInt16 nId /* =0 */)
{
- if( !isInUndo() )
+ if( !IsDoing() )
{
ClearLinkedRedoActions();
- mnListLevel++;
SfxUndoManager::EnterListAction( rComment, rRepeatComment, nId );
}
}
-void UndoManager::LeaveListAction()
+void UndoManager::AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg /* = sal_False */ )
{
- if( !isInUndo() )
- {
- SfxUndoManager::LeaveListAction();
- if( mnListLevel )
- {
- mnListLevel--;
- }
- else
- {
- OSL_FAIL("sd::UndoManager::LeaveListAction(), no open list action!" );
- }
- }
-}
-
-void UndoManager::AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg /* = FALSE */ )
-{
- if( !isInUndo() )
+ if( !IsDoing() )
{
ClearLinkedRedoActions();
SfxUndoManager::AddUndoAction( pAction, bTryMerg );
@@ -80,22 +62,7 @@ void UndoManager::AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg /* = FALS
}
-BOOL UndoManager::Undo( USHORT nCount )
-{
- ScopeLockGuard aGuard( maIsInUndoLock );
- return SfxUndoManager::Undo( nCount );
-}
-
-BOOL UndoManager::Redo( USHORT nCount )
-{
- ScopeLockGuard aGuard( maIsInUndoLock );
- return SfxUndoManager::Redo( nCount );
-}
-
-
-
-
-void UndoManager::SetLinkedUndoManager (SfxUndoManager* pLinkedUndoManager)
+void UndoManager::SetLinkedUndoManager (::svl::IUndoManager* pLinkedUndoManager)
{
mpLinkedUndoManager = pLinkedUndoManager;
}
diff --git a/sd/source/core/undo/undoobjects.cxx b/sd/source/core/undo/undoobjects.cxx
index 8687de4d3c9f..566bdfd94dcf 100644..100755
--- a/sd/source/core/undo/undoobjects.cxx
+++ b/sd/source/core/undo/undoobjects.cxx
@@ -245,7 +245,7 @@ void UndoObjectSetText::Redo()
if( mpUndoAnimation )
mpUndoAnimation->Redo();
SdrUndoObjSetText::Redo();
- mxSdrObject->SetEmptyPresObj(mbNewEmptyPresObj ? TRUE : FALSE );
+ mxSdrObject->SetEmptyPresObj(mbNewEmptyPresObj ? sal_True : sal_False );
}
}
@@ -348,7 +348,7 @@ void UndoAutoLayoutPosAndSize::Redo()
{
SdPage* pPage = static_cast< SdPage* >( mxPage.get() );
if( pPage )
- pPage->SetAutoLayout( pPage->GetAutoLayout(), FALSE, FALSE );
+ pPage->SetAutoLayout( pPage->GetAutoLayout(), sal_False, sal_False );
}
//////////////////////////////////////////////////////////////////////////////
@@ -403,7 +403,7 @@ void UndoGeoObject::Redo()
//////////////////////////////////////////////////////////////////////////////
UndoAttrObject::UndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText )
-: SdrUndoAttrObj( rObject, bStyleSheet1 ? TRUE : FALSE, bSaveText ? TRUE : FALSE )
+: SdrUndoAttrObj( rObject, bStyleSheet1 ? sal_True : sal_False, bSaveText ? sal_True : sal_False )
, mxPage( rObject.GetPage() )
, mxSdrObject( &rObject )
{
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx
index 884d5524bbee..405a3acb0cdf 100644..100755
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -68,8 +68,8 @@ using namespace ::com::sun::star::frame;
// - Typedefs -
// ------------
-typedef UINT32 ( __LOADONCALLAPI *ImportCGM )( ::rtl::OUString&, Reference< XModel >&, UINT32, Reference< XStatusIndicator >& );
-typedef BOOL ( __LOADONCALLAPI *ExportCGM )( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* );
+typedef sal_uInt32 ( __LOADONCALLAPI *ImportCGM )( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& );
+typedef sal_Bool ( __LOADONCALLAPI *ExportCGM )( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* );
// ---------------
// - SdPPTFilter -
@@ -97,7 +97,7 @@ sal_Bool SdCGMFilter::Import()
{
ImportCGM FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ImportCGM" ) ) ) );
::rtl::OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) );
- UINT32 nRetValue;
+ sal_uInt32 nRetValue;
if( mrDocument.GetPageCount() == 0L )
mrDocument.CreateFirstPages();
@@ -107,7 +107,7 @@ sal_Bool SdCGMFilter::Import()
if( nRetValue )
{
- bRet = TRUE;
+ bRet = sal_True;
if( ( nRetValue &~0xff000000 ) != 0xffffff ) // maybe the backgroundcolor is already white
{ // so we must not set a master page
@@ -117,7 +117,7 @@ sal_Bool SdCGMFilter::Import()
if(pSdPage)
{
// set PageFill to given color
- const Color aColor((BYTE)(nRetValue >> 16), (BYTE)(nRetValue >> 8), (BYTE)(nRetValue >> 16));
+ const Color aColor((sal_uInt8)(nRetValue >> 16), (sal_uInt8)(nRetValue >> 8), (sal_uInt8)(nRetValue >> 16));
pSdPage->getSdrPageProperties().PutItem(XFillColorItem(String(), aColor));
pSdPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_SOLID));
}
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 5c8cf3c4ba2d..b61043809a6e 100644..100755
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -106,7 +106,7 @@ void PPTWriter::exportPPTPre()
if ( mXStatusIndicator.is() )
{
- mbStatusIndicator = TRUE;
+ mbStatusIndicator = sal_True;
mnStatMaxValue = ( mnPages + mnMasterPages ) * 5;
mXStatusIndicator->start( String( RTL_CONSTASCII_USTRINGPARAM( "PowerPoint Export" ) ),
mnStatMaxValue + ( mnStatMaxValue >> 3 ) );
@@ -154,7 +154,7 @@ void PPTWriter::exportPPTPost( )
if ( !ImplCreateDocumentSummaryInformation() )
return;
- mbStatus = TRUE;
+ mbStatus = sal_True;
};
// ---------------------------------------------------------------------------------------------
@@ -446,6 +446,11 @@ PPTWriter::~PPTWriter()
void* pPtr;
delete mpExEmbed;
delete mpPptEscherEx;
+ delete mpCurUserStrm;
+ delete mpPicStrm;
+ delete mpStrm;
+
+
std::vector< PPTExStyleSheet* >::iterator aStyleSheetIter( maStyleSheetList.begin() );
while( aStyleSheetIter < maStyleSheetList.end() )
@@ -468,7 +473,7 @@ sal_Bool PPTWriter::ImplCreateCurrentUserStream()
{
mpCurUserStrm = mrStg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "Current User" ) ) );
if ( !mpCurUserStrm )
- return FALSE;
+ return sal_False;
char pUserName[] = "Current User";
sal_uInt32 nLenOfUserName = strlen( pUserName );
sal_uInt32 nSizeOfRecord = 0x14 + ( ( nLenOfUserName + 4 ) & ~ 3 );
@@ -491,7 +496,7 @@ sal_Bool PPTWriter::ImplCreateCurrentUserStream()
*mpCurUserStrm << (sal_uInt8)0; // pad bytes
};
mpCurUserStrm->Seek( nEditPos );
- return TRUE;
+ return sal_True;
};
// ---------------------------------------------------------------------------------------------
@@ -698,9 +703,9 @@ sal_Bool PPTWriter::ImplCreateDocument()
mpPptEscherEx->AddAtom( 40, EPP_DocumentAtom, 1 );
*mpStrm << nWidth // Slide Size in Master coordinates X
<< nHeight // " " " " " Y
- << (INT32)maNotesPageSize.Width // Notes Page Size X
- << (INT32)maNotesPageSize.Height // " " " Y
- << (INT32)1 << (INT32)2; // the scale used when the Powerpoint document is embedded. the default is 1:2
+ << (sal_Int32)maNotesPageSize.Width // Notes Page Size X
+ << (sal_Int32)maNotesPageSize.Height // " " " Y
+ << (sal_Int32)1 << (sal_Int32)2; // the scale used when the Powerpoint document is embedded. the default is 1:2
mpPptEscherEx->InsertPersistOffset( EPP_MAINNOTESMASTER_PERSIST_KEY, mpStrm->Tell() );
*mpStrm << (sal_uInt32)0 // Reference to NotesMaster ( 0 if none );
<< (sal_uInt32)0 // Reference to HandoutMaster ( 0 if none );
@@ -734,12 +739,12 @@ sal_Bool PPTWriter::ImplCreateDocument()
mpPptEscherEx->InsertPersistOffset( EPP_MAINSLIDE_PERSIST_KEY | i, mpStrm->Tell() );
*mpStrm << (sal_uInt32)0 // psrReference - logical reference to the slide persist object ( EPP_MAINSLIDE_PERSIST_KEY )
<< (sal_uInt32)4 // flags - only bit 3 used, if set then slide contains shapes other than placeholders
- << (INT32)0 // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects
- << (INT32)i + 0x100 // slideId - Unique slide identifier, used for OLE link monikers for example
+ << (sal_Int32)0 // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects
+ << (sal_Int32)i + 0x100 // slideId - Unique slide identifier, used for OLE link monikers for example
<< (sal_uInt32)0; // reserved, usualy 0
if ( !GetPageByIndex( i, NORMAL ) ) // sehr aufregend: noch einmal ueber alle seiten
- return FALSE;
+ return sal_False;
SetCurrentStyleSheet( GetMasterIndex( NORMAL ) );
::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed >
@@ -763,8 +768,8 @@ sal_Bool PPTWriter::ImplCreateDocument()
mpPptEscherEx->InsertPersistOffset( EPP_MAINNOTES_PERSIST_KEY | i, mpStrm->Tell() );
*mpStrm << (sal_uInt32)0
<< (sal_uInt32)4
- << (INT32)0
- << (INT32)i + 0x100
+ << (sal_Int32)0
+ << (sal_Int32)i + 0x100
<< (sal_uInt32)0;
}
mpPptEscherEx->CloseContainer(); // EPP_SlideListWithText
@@ -784,7 +789,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
{
::rtl::OUString aCustomShow;
sal_uInt32 nPenColor = 0x1000000;
- INT32 nRestartTime = 0x7fffffff;
+ sal_Int32 nRestartTime = 0x7fffffff;
sal_Int16 nStartSlide = 0;
sal_Int16 nEndSlide = 0;
sal_uInt32 nFlags = 0; // Bit 0: Auto advance
@@ -834,7 +839,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
nFlags |= 1;
}
- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsEndless" ) ) ) ) // muesste eigendlich heissen IsNotEndless !=)"§()&
+ if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsEndless" ) ) ) ) // muesste eigendlich heissen IsNotEndless !=)"�()&
{
sal_Bool bBool = sal_False;
mAny >>= bBool;
@@ -902,8 +907,8 @@ sal_Bool PPTWriter::ImplCreateDocument()
{
mpPptEscherEx->BeginAtom();
- INT32 nSlideCount = aXIC->getCount();
- for ( INT32 j = 0; j < nSlideCount; j++ ) // Anzahl der Slides
+ sal_Int32 nSlideCount = aXIC->getCount();
+ for ( sal_Int32 j = 0; j < nSlideCount; j++ ) // Anzahl der Slides
{
mAny = aXIC->getByIndex( j );
if ( mAny.getValue() )
@@ -948,7 +953,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
}
mpPptEscherEx->AddAtom( 0, EPP_EndDocument );
mpPptEscherEx->CloseContainer(); // EPP_Document
- return TRUE;
+ return sal_True;
};
// ---------------------------------------------------------------------------------------------
@@ -1031,7 +1036,7 @@ sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm )
rStrm << (sal_uInt32)( nCurrentOfs - ( nParaOfs + 4 ) );
rStrm << nParaCount;
rStrm.Seek( nCurrentOfs );
- return TRUE;
+ return sal_True;
}
// ---------------------------------------------------------------------------------------------
@@ -1049,7 +1054,7 @@ sal_Bool PPTWriter::ImplCreateMainNotes()
mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
mpPptEscherEx->EnterGroup(0,0);
- ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, TRUE );
+ ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, sal_True );
mpPptEscherEx->LeaveGroup();
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -1073,7 +1078,7 @@ sal_Bool PPTWriter::ImplCreateMainNotes()
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 );
*mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2;
mpPptEscherEx->CloseContainer(); // EPP_Notes
- return TRUE;
+ return sal_True;
}
// ---------------------------------------------------------------------------------------------
@@ -1182,7 +1187,7 @@ void PPTWriter::ImplWriteNotes( sal_uInt32 nPageNum )
mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
mpPptEscherEx->EnterGroup(0,0);
- ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, FALSE ); // Die Shapes der Seite werden im PPT Dok. erzeugt
+ ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, sal_False ); // Die Shapes der Seite werden im PPT Dok. erzeugt
mpPptEscherEx->LeaveGroup();
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -1310,13 +1315,13 @@ void PPTWriter::ImplWriteOLE( )
::uno::Reference < embed::XEmbeddedObject > xObj( ( (SdrOle2Obj*) pSdrObj )->GetObjRef() );
if( xObj.is() )
{
- SvStorageRef xTempStorage( new SvStorage( new SvMemoryStream(), TRUE ) );
+ SvStorageRef xTempStorage( new SvStorage( new SvMemoryStream(), sal_True ) );
aOleExport.ExportOLEObject( xObj, *xTempStorage );
//TODO/MBA: testing
String aPersistStream( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( SVEXT_PERSIST_STREAM ) ) );
SvMemoryStream aStream;
- SvStorageRef xCleanStorage( new SvStorage( FALSE, aStream ) );
+ SvStorageRef xCleanStorage( new SvStorage( sal_False, aStream ) );
xTempStorage->CopyTo( xCleanStorage );
// create a dummy content stream, the dummy content is necessary for ppt, but not for
// doc files, so we can't share code.
@@ -1342,7 +1347,7 @@ void PPTWriter::ImplWriteOLE( )
{
String aName;
::com::sun::star::awt::Size aSize;
- SvStorageRef xDest( new SvStorage( new SvMemoryStream(), TRUE ) );
+ SvStorageRef xDest( new SvStorage( new SvMemoryStream(), sal_True ) );
sal_Bool bOk = SvxMSConvertOCXControls::WriteOCXStream( xDest, pPtr->xControlModel, aSize, aName );
if ( bOk )
pStrm = xDest->CreateMemoryStream();
@@ -1469,7 +1474,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
*mpCurUserStrm << (sal_uInt32)nPos; // offset to current edit setzen
mpPptEscherEx->AddAtom( 28, EPP_UserEditAtom );
- *mpStrm << (INT32)0x100 // last slide ID
+ *mpStrm << (sal_Int32)0x100 // last slide ID
<< (sal_uInt32)0x03000dbc // minor and major app version that did the save
<< (sal_uInt32)0 // offset last save, 0 after a full save
<< nPersistOfs // File offset to persist pointers for this save operation
@@ -1478,37 +1483,37 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
<< (sal_Int16)EPP_LastViewTypeSlideView // last view type
<< (sal_Int16)0x12; // padword
- return TRUE;
+ return sal_True;
}
// ---------------------
// - exported function -
// ---------------------
-extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI ExportPPT( SvStorageRef& rSvStorage,
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI ExportPPT( SvStorageRef& rSvStorage,
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rXModel,
::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rXStatInd,
SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags )
{
PPTWriter* pPPTWriter;
- BOOL bStatus = FALSE;
+ sal_Bool bStatus = sal_False;
pPPTWriter = new PPTWriter( rSvStorage, rXModel, rXStatInd, pVBA, nCnvrtFlags );
if ( pPPTWriter )
{
pPPTWriter->exportPPT();
- bStatus = ( pPPTWriter->IsValid() == TRUE );
+ bStatus = ( pPPTWriter->IsValid() == sal_True );
delete pPPTWriter;
}
return bStatus;
}
-extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas )
{
- SvStorageRef xDest( new SvStorage( new SvMemoryStream(), TRUE ) );
- SvxImportMSVBasic aMSVBas( rDocShell, *xDest, FALSE, FALSE );
- aMSVBas.SaveOrDelMSVBAStorage( TRUE, String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
+ SvStorageRef xDest( new SvStorage( new SvMemoryStream(), sal_True ) );
+ SvxImportMSVBasic aMSVBas( rDocShell, *xDest, sal_False, sal_False );
+ aMSVBas.SaveOrDelMSVBAStorage( sal_True, String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
SvStorageRef xOverhead = xDest->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
if ( xOverhead.Is() && ( xOverhead->GetError() == SVSTREAM_OK ) )
@@ -1519,7 +1524,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI SaveVBA( SfxObjectShell& rD
SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead2") ) );
if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) )
{
- UINT32 nLen = xTemp->GetSize();
+ sal_uInt32 nLen = xTemp->GetSize();
if ( nLen )
{
char* pTemp = new char[ nLen ];
@@ -1528,15 +1533,15 @@ extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI SaveVBA( SfxObjectShell& rD
xTemp->Seek( STREAM_SEEK_TO_BEGIN );
xTemp->Read( pTemp, nLen );
pBas = new SvMemoryStream( pTemp, nLen, STREAM_READ );
- pBas->ObjectOwnsMemory( TRUE );
- return TRUE;
+ pBas->ObjectOwnsMemory( sal_True );
+ return sal_True;
}
}
}
}
}
- return FALSE;
+ return sal_False;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 11cd4f714fae..8ff33e63e9dc 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -192,9 +192,9 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
sal_uInt32 mnTextSize;
SvStorageRef mrStg;
- SvStorageStream* mpCurUserStrm;
- SvStorageStream* mpStrm;
- SvStorageStream* mpPicStrm;
+ SvStream* mpCurUserStrm;
+ SvStream* mpStrm;
+ SvStream* mpPicStrm;
PptEscherEx* mpPptEscherEx;
List maExOleObj;
diff --git a/sd/source/filter/eppt/epptdef.hxx b/sd/source/filter/eppt/epptdef.hxx
index 7b5f2d17a9b8..ad93ec30f5a2 100644..100755
--- a/sd/source/filter/eppt/epptdef.hxx
+++ b/sd/source/filter/eppt/epptdef.hxx
@@ -133,7 +133,7 @@
#define EPP_PST_ExtendedParagraphMasterAtom 4013
#define EPP_PST_ExtendedPresRuleContainer 4014 // consist of 4012, 4015,
#define EPP_PST_ExtendedParagraphHeaderAtom 4015 // the instance of this atom indices the current presobj
- // the first UINT32 in this atom indices the current slideId
+ // the first sal_uInt32 in this atom indices the current slideId
#define EPP_FontEnityAtom 4023
#define EPP_FontEmbedData 4024
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index acd0a571e797..0466af7e6418 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -615,10 +615,10 @@ sal_Bool PPTWriter::ImplCloseDocument()
if ( nOldPos )
{
mpStrm->Seek( nOldPos );
- return TRUE;
+ return sal_True;
}
}
- return FALSE;
+ return sal_False;
}
// ---------------------------------------------------------------------------------------------
@@ -701,7 +701,7 @@ sal_Bool PropValue::ImplGetPropertyValue( const ::com::sun::star::uno::Reference
sal_Bool PropStateValue::ImplGetPropertyValue( const String& rString, sal_Bool bGetPropertyState )
{
ePropState = ::com::sun::star::beans::PropertyState_AMBIGUOUS_VALUE;
- sal_Bool bRetValue = TRUE;
+ sal_Bool bRetValue = sal_True;
#ifdef UNX
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
aXPropSetInfo( mXPropSet->getPropertySetInfo() );
@@ -712,7 +712,7 @@ sal_Bool PropStateValue::ImplGetPropertyValue( const String& rString, sal_Bool b
{
mAny = mXPropSet->getPropertyValue( rString );
if ( !mAny.hasValue() )
- bRetValue = FALSE;
+ bRetValue = sal_False;
else if ( bGetPropertyState )
ePropState = mXPropState->getPropertyState( rString );
else
@@ -720,7 +720,7 @@ sal_Bool PropStateValue::ImplGetPropertyValue( const String& rString, sal_Bool b
}
catch( ::com::sun::star::uno::Exception& )
{
- bRetValue = FALSE;
+ bRetValue = sal_False;
}
return bRetValue;
}
@@ -729,14 +729,14 @@ sal_Bool PropStateValue::ImplGetPropertyValue( const String& rString, sal_Bool b
void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
{
- sal_Bool bFirstParagraph = TRUE;
+ sal_Bool bFirstParagraph = sal_True;
sal_uInt32 nCharCount;
sal_uInt32 nPropertyFlags = 0;
sal_uInt16 nDepth = 0;
sal_Int16 nLineSpacing;
int nInstance = rTextObj.GetInstance();
- for ( ParagraphObj* pPara = rTextObj.First() ; pPara; pPara = rTextObj.Next(), bFirstParagraph = FALSE )
+ for ( ParagraphObj* pPara = rTextObj.First() ; pPara; pPara = rTextObj.Next(), bFirstParagraph = sal_False )
{
PortionObj* pPortion = (PortionObj*)pPara->First();
nCharCount = pPara->Count();
@@ -1450,12 +1450,12 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt,
sal_uInt32 nSoundRef = 0; // 0 if storage is from clipboard. Otherwise index(ID) in SoundCollection list.
sal_uInt32 nDelayTime = 0; // delay before playing object
sal_uInt16 nSlideCount = 1; // number of slides to play object
- UINT8 nBuildType = 1; // type of build
- UINT8 nFlyMethod = 0; // animation effect( fly, zoom, appear, etc )
- UINT8 nFlyDirection = 0; // Animation direction( left, right, up, down, etc )
- UINT8 nAfterEffect = 0; // what to do after build
- UINT8 nSubEffect = 0; // build by word or letter
- UINT8 nOleVerb = 0; // Determines object's class (sound, video, other)
+ sal_uInt8 nBuildType = 1; // type of build
+ sal_uInt8 nFlyMethod = 0; // animation effect( fly, zoom, appear, etc )
+ sal_uInt8 nFlyDirection = 0; // Animation direction( left, right, up, down, etc )
+ sal_uInt8 nAfterEffect = 0; // what to do after build
+ sal_uInt8 nSubEffect = 0; // build by word or letter
+ sal_uInt8 nOleVerb = 0; // Determines object's class (sound, video, other)
if ( eAe == ::com::sun::star::presentation::AnimationEffect_NONE )
{
@@ -1935,8 +1935,8 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt,
}
}
}
- sal_Bool bDimHide = FALSE;
- sal_Bool bDimPrevious = FALSE;
+ sal_Bool bDimHide = sal_False;
+ sal_Bool bDimPrevious = sal_False;
if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "DimHide" ) ) ) )
mAny >>= bDimHide;
if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "DimPrevious" ) ) ) )
@@ -2132,7 +2132,7 @@ sal_Bool PPTWriter::ImplGetEffect( const ::com::sun::star::uno::Reference< ::com
if ( GetPropertyValue( aAny, rPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "SoundOn" ) ) ) )
aAny >>= bIsSound;
else
- bIsSound = FALSE;
+ bIsSound = sal_False;
sal_Bool bHasEffect = ( ( eEffect != ::com::sun::star::presentation::AnimationEffect_NONE )
|| ( eTextEffect != ::com::sun::star::presentation::AnimationEffect_NONE )
@@ -2225,16 +2225,16 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
nIndices = nInstance = nLastPer = nShapeCount = nEffectCount = 0;
- sal_Bool bIsTitlePossible = TRUE; // bei mehr als einem title geht powerpoint in die knie
+ sal_Bool bIsTitlePossible = sal_True; // bei mehr als einem title geht powerpoint in die knie
sal_uInt32 nOutlinerCount = 0; // die gliederungsobjekte muessen dem layout entsprechen,
sal_uInt32 nPrevTextStyle = 0; // es darf nicht mehr als zwei geben
nOlePictureId = 0;
- sal_Bool bAdditionalText = FALSE;
+ sal_Bool bAdditionalText = sal_False;
- sal_Bool bSecOutl = FALSE;
+ sal_Bool bSecOutl = sal_False;
sal_uInt32 nPObjects = 0;
SvMemoryStream* pClientTextBox = NULL;
@@ -2260,7 +2260,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
nGroups = GetGroupsClosed();
for ( sal_uInt32 i = 0; i < nGroups; i++, mpPptEscherEx->LeaveGroup() ) ;
- if ( GetShapeByIndex( GetCurrentGroupIndex(), TRUE ) )
+ if ( GetShapeByIndex( GetCurrentGroupIndex(), sal_True ) )
{
sal_Bool bIsSound;
sal_Bool bMediaClickAction = sal_False;
@@ -2478,7 +2478,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
mpPptEscherEx->EnterGroup( 0,0 );
nGroupLevel = mpPptEscherEx->GetGroupLevel();
bNeedText = sal_False;
- bAdditionalText = TRUE;
+ bAdditionalText = sal_True;
mnTextSize = 0;
}
mnAngle = 0;
@@ -2562,7 +2562,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
::com::sun::star::awt::Size aSize;
String aControlName;
- SvStorageRef xTemp( new SvStorage( new SvMemoryStream(), TRUE ) );
+ SvStorageRef xTemp( new SvStorage( new SvMemoryStream(), sal_True ) );
if ( SvxMSConvertOCXControls::WriteOCXStream( xTemp, aXControlModel, aSize, aControlName ) )
{
String aUserName( xTemp->GetUserName() );
@@ -2594,7 +2594,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( ( nStringLen > 1 ) && ( ( xCompObj->Tell() + nStringLen ) < nStreamLen ) )
{ // i think that the OleIdentifier will follow
ByteString aTemp;
- sal_Char* p = aTemp.AllocBuffer( (USHORT)(nStringLen - 1) );
+ sal_Char* p = aTemp.AllocBuffer( (sal_uInt16)(nStringLen - 1) );
xCompObj->Read( p, nStringLen - 1 );
aOleIdentifier = String( aTemp, gsl_getSystemTextEncoding() );
}
@@ -2636,7 +2636,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
}
*pTmp++ = 0;
*pTmp = 0;
- aPropOpt.AddOpt( ESCHER_Prop_wzName, TRUE, nBufSize, pBuf, nBufSize );
+ aPropOpt.AddOpt( ESCHER_Prop_wzName, sal_True, nBufSize, pBuf, nBufSize );
}
}
else if ( mType == "drawing.Connector" )
@@ -2668,7 +2668,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
aTextRefPoint = ::com::sun::star::awt::Point( maRect.Left(), maRect.Top() );
mnTextSize = 0;
- bAdditionalText = TRUE;
+ bAdditionalText = sal_True;
mpPptEscherEx->EnterGroup( &maRect,0 );
}
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -2689,7 +2689,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
mpPptEscherEx->EnterGroup( 0,0 );
nGroupLevel = mpPptEscherEx->GetGroupLevel();
- bAdditionalText = TRUE;
+ bAdditionalText = sal_True;
mnTextSize = 0;
}
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -2708,7 +2708,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
mpPptEscherEx->EnterGroup( 0,0 );
nGroupLevel = mpPptEscherEx->GetGroupLevel();
- bAdditionalText = TRUE;
+ bAdditionalText = sal_True;
mnTextSize = 0;
}
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -2727,7 +2727,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
mpPptEscherEx->EnterGroup( 0,0 );
nGroupLevel = mpPptEscherEx->GetGroupLevel();
- bAdditionalText = TRUE;
+ bAdditionalText = sal_True;
mnTextSize = 0;
}
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -2746,7 +2746,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
mpPptEscherEx->EnterGroup( 0,0 );
nGroupLevel = mpPptEscherEx->GetGroupLevel();
- bAdditionalText = TRUE;
+ bAdditionalText = sal_True;
mnTextSize = 0;
}
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -2816,7 +2816,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
else
nPlaceHolderAtom = EPP_PLACEHOLDER_NOTESBODY;
}
- ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
}
else if ( mType == "presentation.TitleText" )
{
@@ -2832,7 +2832,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
}
else if ( rLayout.bTitlePossible && bIsTitlePossible )
{
- bIsTitlePossible = FALSE;
+ bIsTitlePossible = sal_False;
ImplGetText();
TextObjBinary aTextObj( mXText, EPP_TEXTTYPE_Title, maFontCollection, (PPTExBulletProvider&)*this );
@@ -2911,12 +2911,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
}
}
else
- mbPresObj = FALSE;
+ mbPresObj = sal_False;
}
if ( !mbPresObj )
{
mType = "drawing.Text";
- ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
}
}
else if ( ( mType == "presentation.Outliner" ) || ( mType == "presentation.Subtitle" ) )
@@ -3007,12 +3007,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
}
}
else
- mbPresObj = FALSE;
+ mbPresObj = sal_False;
}
if ( !mbPresObj )
{
mType = "drawing.Text";
- ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
}
}
else if ( ( mType == "drawing.Page" ) || ( mType == "presentation.Page" ) )
@@ -3024,7 +3024,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
else
nPlaceHolderAtom = EPP_PLACEHOLDER_NOTESSLIDEIMAGE;
}
- ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
}
else if ( mType == "drawing.Frame" )
{
@@ -3111,7 +3111,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
mbPresObj = sal_False;
mType = "drawing.Text";
- ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
}
}
else if ( mType == "presentation.Footer" )
@@ -3122,7 +3122,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
mbPresObj = sal_False;
mType = "drawing.Text";
- ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
}
}
else if ( mType == "presentation.DateTime" )
@@ -3133,7 +3133,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
mbPresObj = sal_False;
mType = "drawing.Text";
- ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
}
}
else if ( mType == "presentation.SlideNumber" )
@@ -3144,7 +3144,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
mbPresObj = sal_False;
mType = "drawing.Text";
- ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True );
}
}
else if ( ( (sal_Char)'3' == mType.GetChar( 8 ) ) && ( (char)'D' == mType.GetChar( 9 ) ) ) // drawing.3D
@@ -3329,9 +3329,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( !pClientTextBox )
pClientTextBox = new SvMemoryStream( 0x200, 0x200 );
- if ( mbEmptyPresObj == FALSE )
+ if ( mbEmptyPresObj == sal_False )
{
- if ( ( ePageType == NORMAL ) && ( bMasterPage == FALSE ) )
+ if ( ( ePageType == NORMAL ) && ( bMasterPage == sal_False ) )
{
sal_uInt32 nTextType = EPP_TEXTTYPE_Body;
if ( mnTextStyle == EPP_TEXTSTYLE_BODY )
@@ -3433,7 +3433,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( bAdditionalText )
{
- bAdditionalText = FALSE;
+ bAdditionalText = sal_False;
::com::sun::star::uno::Any aAny;
EscherPropertyContainer aPropOpt;
@@ -3449,7 +3449,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
double fDist = hypot( maRect.GetWidth(), maRect.GetHeight() );
maRect = Rectangle( Point( aTextRefPoint.X, aTextRefPoint.Y ),
Point( (sal_Int32)( aTextRefPoint.X + fDist ), aTextRefPoint.Y - 1 ) );
- ImplCreateTextShape( aPropOpt, aSolverContainer, FALSE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_False );
aPropOpt.AddOpt( ESCHER_Prop_FitTextToShape, 0x60006 ); // Size Shape To Fit Text
if ( mnAngle < 0 )
mnAngle = ( 36000 + mnAngle ) % 36000;
@@ -3458,7 +3458,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
}
else
{
- ImplCreateTextShape( aPropOpt, aSolverContainer, FALSE );
+ ImplCreateTextShape( aPropOpt, aSolverContainer, sal_False );
if ( mnAngle < 0 )
mnAngle = ( 36000 + mnAngle ) % 36000;
else
@@ -3561,10 +3561,10 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
mpPptEscherEx->OpenContainer( ESCHER_SpgrContainer );
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
mpPptEscherEx->AddAtom( 16, ESCHER_Spgr, 1 );
- *mpStrm << (INT32)maRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden
- << (INT32)maRect.Top()
- << (INT32)maRect.Right()
- << (INT32)maRect.Bottom();
+ *mpStrm << (sal_Int32)maRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden
+ << (sal_Int32)maRect.Top()
+ << (sal_Int32)maRect.Right()
+ << (sal_Int32)maRect.Bottom();
sal_uInt32 nShapeId = mpPptEscherEx->GenerateShapeId();
mpPptEscherEx->AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group | Patriarch
@@ -3614,7 +3614,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
if ( nRowCount )
{
SvMemoryStream aMemStrm;
- aMemStrm.ObjectOwnsMemory( FALSE );
+ aMemStrm.ObjectOwnsMemory( sal_False );
aMemStrm << nRowCount
<< nRowCount
<< (sal_uInt16)4;
diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx
index dba09a161337..7714ca4d761b 100644
--- a/sd/source/filter/eppt/escherex.cxx
+++ b/sd/source/filter/eppt/escherex.cxx
@@ -51,7 +51,7 @@ sal_uInt32 PptEscherEx::DrawingGroupContainerSize()
void PptEscherEx::WriteDrawingGroupContainer( SvStream& rSt )
{
- UINT32 nSize = DrawingGroupContainerSize();
+ sal_uInt32 nSize = DrawingGroupContainerSize();
rSt << (sal_uInt32)( 0xf | ( 1035 << 16 ) ) // EPP_PPDrawingGroup
<< (sal_uInt32)( nSize - 8 );
@@ -62,7 +62,7 @@ void PptEscherEx::WriteDrawingGroupContainer( SvStream& rSt )
sal_uInt32 PptEscherEx::ImplDggContainerSize()
{
- UINT32 nSize;
+ sal_uInt32 nSize;
nSize = mxGlobal->GetDggAtomSize();
nSize += mxGlobal->GetBlibStoreContainerSize();
@@ -130,7 +130,7 @@ sal_uInt32 PptEscherEx::ImplSplitMenuColorsAtomSize()
void PptEscherEx::ImplWriteSplitMenuColorsAtom( SvStream& rSt )
{
- UINT32 nSize = ImplSplitMenuColorsAtomSize();
+ sal_uInt32 nSize = ImplSplitMenuColorsAtomSize();
if ( nSize )
{
rSt << (sal_uInt32)( ( ESCHER_SplitMenuColors << 16 ) | ( ESCHER_SPLIT_MENU_COLORS_COUNT << 4 ) )
@@ -151,9 +151,9 @@ PptEscherEx::~PptEscherEx()
// ---------------------------------------------------------------------------------------------
-void PptEscherEx::OpenContainer( UINT16 n_EscherContainer, int nRecInstance )
+void PptEscherEx::OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance )
{
- *mpOutStrm << (UINT16)( ( nRecInstance << 4 ) | 0xf ) << n_EscherContainer << (UINT32)0;
+ *mpOutStrm << (sal_uInt16)( ( nRecInstance << 4 ) | 0xf ) << n_EscherContainer << (sal_uInt32)0;
mOffsets.push_back( mpOutStrm->Tell() - 4 );
mRecTypes.push_back( n_EscherContainer );
@@ -163,12 +163,12 @@ void PptEscherEx::OpenContainer( UINT16 n_EscherContainer, int nRecInstance )
{
if ( !mbEscherDg )
{
- mbEscherDg = TRUE;
+ mbEscherDg = sal_True;
mnCurrentDg = mxGlobal->GenerateDrawingId();
AddAtom( 8, ESCHER_Dg, 0, mnCurrentDg );
PtReplaceOrInsert( ESCHER_Persist_Dg | mnCurrentDg, mpOutStrm->Tell() );
- *mpOutStrm << (UINT32)0 // The number of shapes in this drawing
- << (UINT32)0; // The last MSOSPID given to an SP in this DG
+ *mpOutStrm << (sal_uInt32)0 // The number of shapes in this drawing
+ << (sal_uInt32)0; // The last MSOSPID given to an SP in this DG
}
}
break;
@@ -177,7 +177,7 @@ void PptEscherEx::OpenContainer( UINT16 n_EscherContainer, int nRecInstance )
{
if ( mbEscherDg )
{
- mbEscherSpgr = TRUE;
+ mbEscherSpgr = sal_True;
}
}
break;
@@ -197,7 +197,7 @@ void PptEscherEx::CloseContainer()
*/
if ( ( mRecTypes.back() != ESCHER_SpgrContainer ) || ( mnGroupLevel < 12 ) )
{
- UINT32 nSize, nPos = mpOutStrm->Tell();
+ sal_uInt32 nSize, nPos = mpOutStrm->Tell();
nSize = ( nPos - mOffsets.back() ) - 4;
mpOutStrm->Seek( mOffsets.back() );
*mpOutStrm << nSize;
@@ -208,7 +208,7 @@ void PptEscherEx::CloseContainer()
{
if ( mbEscherDg )
{
- mbEscherDg = FALSE;
+ mbEscherDg = sal_False;
if ( DoSeek( ESCHER_Persist_Dg | mnCurrentDg ) )
*mpOutStrm << mxGlobal->GetDrawingShapeCount( mnCurrentDg ) << mxGlobal->GetLastShapeId( mnCurrentDg );
}
@@ -219,7 +219,7 @@ void PptEscherEx::CloseContainer()
{
if ( mbEscherSpgr )
{
- mbEscherSpgr = FALSE;
+ mbEscherSpgr = sal_False;
}
}
@@ -253,10 +253,10 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie
OpenContainer( ESCHER_SpContainer );
AddAtom( 16, ESCHER_Spgr, 1 );
PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel, mpOutStrm->Tell() );
- *mpOutStrm << (INT32)aRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden
- << (INT32)aRect.Top()
- << (INT32)aRect.Right()
- << (INT32)aRect.Bottom();
+ *mpOutStrm << (sal_Int32)aRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden
+ << (sal_Int32)aRect.Top()
+ << (sal_Int32)aRect.Right()
+ << (sal_Int32)aRect.Bottom();
nShapeId = GenerateShapeId();
if ( !mnGroupLevel )
@@ -268,7 +268,7 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie
{
AddAtom( 8, ESCHER_ClientAnchor );
PtReplaceOrInsert( ESCHER_Persist_Grouping_Logic | mnGroupLevel, mpOutStrm->Tell() );
- *mpOutStrm << (INT16)aRect.Top() << (INT16)aRect.Left() << (INT16)aRect.Right() << (INT16)aRect.Bottom();
+ *mpOutStrm << (sal_Int16)aRect.Top() << (sal_Int16)aRect.Left() << (sal_Int16)aRect.Right() << (sal_Int16)aRect.Bottom();
}
else
{
diff --git a/sd/source/filter/eppt/escherex.hxx b/sd/source/filter/eppt/escherex.hxx
index 4589ea8f5c6c..4b77a1a755c1 100644..100755
--- a/sd/source/filter/eppt/escherex.hxx
+++ b/sd/source/filter/eppt/escherex.hxx
@@ -31,7 +31,7 @@
#include <filter/msfilter/escherex.hxx>
// ---------------------------------------------------------------------------------------------
-// Werte fuer den ULONG im PPT_PST_TextHeaderAtom
+// Werte fuer den sal_uLong im PPT_PST_TextHeaderAtom
enum PPT_TextHeader
{
PPTTH_TITLE,
@@ -63,12 +63,12 @@ class PptEscherEx : public EscherEx
PptEscherEx( SvStream& rOut );
~PptEscherEx();
- void OpenContainer( UINT16 n_EscherContainer, int nRecInstance = 0 );
+ void OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance = 0 );
void CloseContainer();
sal_uInt32 EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClientData );
- UINT32 DrawingGroupContainerSize();
+ sal_uInt32 DrawingGroupContainerSize();
void WriteDrawingGroupContainer( SvStream& rSt );
using EscherEx::EnterGroup;
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index 162379581d3d..a40a84e693c0 100644..100755
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -108,7 +108,7 @@ using namespace ::sfx2;
class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper1< com::sun::star::task::XInteractionHandler >
{
com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > m_xInter;
- USHORT nFilterError;
+ sal_uInt16 nFilterError;
public:
@@ -119,7 +119,7 @@ class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper1< com::sun:
~SdGRFFilter_ImplInteractionHdl();
- USHORT GetErrorCode() const { return nFilterError; };
+ sal_uInt16 GetErrorCode() const { return nFilterError; };
virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& )
throw( com::sun::star::uno::RuntimeException );
@@ -137,7 +137,7 @@ void SdGRFFilter_ImplInteractionHdl::handle( const com::sun::star::uno::Referenc
com::sun::star::drawing::GraphicFilterRequest aErr;
if ( xRequest->getRequest() >>= aErr )
- nFilterError = (USHORT)aErr.ErrCode;
+ nFilterError = (sal_uInt16)aErr.ErrCode;
else
m_xInter->handle( xRequest );
}
@@ -160,9 +160,9 @@ SdGRFFilter::~SdGRFFilter()
// -----------------------------------------------------------------------------
-void SdGRFFilter::HandleGraphicFilterError( USHORT nFilterError, ULONG nStreamError )
+void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong nStreamError )
{
- USHORT nId;
+ sal_uInt16 nId;
switch( nFilterError )
{
@@ -209,14 +209,14 @@ sal_Bool SdGRFFilter::Import()
Graphic aGraphic;
const String aFileName( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) );
GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter();
- const USHORT nFilter = pGraphicFilter->GetImportFormatNumberForTypeName( mrMedium.GetFilter()->GetTypeName() );
+ const sal_uInt16 nFilter = pGraphicFilter->GetImportFormatNumberForTypeName( mrMedium.GetFilter()->GetTypeName() );
sal_Bool bRet = sal_False;
// ggf. Filterdialog ausfuehren
if ( !pGraphicFilter->HasImportDialog( nFilter ) || pGraphicFilter->DoImportDialog( NULL, nFilter ) )
{
SvStream* pIStm = mrMedium.GetInStream();
- USHORT nReturn = pIStm ? pGraphicFilter->ImportGraphic( aGraphic, aFileName, *pIStm, nFilter ) : 1;
+ sal_uInt16 nReturn = pIStm ? pGraphicFilter->ImportGraphic( aGraphic, aFileName, *pIStm, nFilter ) : 1;
if( nReturn )
HandleGraphicFilterError( nReturn, pGraphicFilter->GetLastError().nStreamError );
@@ -314,7 +314,7 @@ sal_Bool SdGRFFilter::Export()
if ( pSet && pGraphicFilter && xSource.is() )
{
const String aTypeName( mrMedium.GetFilter()->GetTypeName() );
- const USHORT nFilter = pGraphicFilter->GetExportFormatNumberForTypeName( aTypeName );
+ const sal_uInt16 nFilter = pGraphicFilter->GetExportFormatNumberForTypeName( aTypeName );
if ( nFilter != GRFILTER_FORMAT_NOTFOUND )
{
uno::Reference< task::XInteractionHandler > mXInteractionHandler;
@@ -479,11 +479,11 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su
GraphicFilter& rGF = *GraphicFilter::GetGraphicFilter();
Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY);
OUString aDefaultFormatName;
- USHORT nCount = rGF.GetExportFormatCount();
+ sal_uInt16 nCount = rGF.GetExportFormatCount();
std::map< OUString, OUString > aMimeTypeMap;
- for ( USHORT i = 0; i < nCount; i++ )
+ for ( sal_uInt16 i = 0; i < nCount; i++ )
{
const OUString aExportFormatName( rGF.GetExportFormatName( i ) );
const OUString aFilterMimeType( rGF.GetExportFormatMediaType( i ) );
@@ -496,7 +496,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su
if( aDefaultFormatName.getLength() == 0 )
{
nCount = rGF.GetImportFormatCount();
- for( USHORT i = 0; i < nCount; i++ )
+ for( sal_uInt16 i = 0; i < nCount; i++ )
{
const OUString aFilterMimeType( rGF.GetImportFormatMediaType( i ) );
if( aMimeType == aFilterMimeType )
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 80f21e0676f7..fd46e1412a5e 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -159,9 +159,9 @@ public:
EasyFile();
~EasyFile();
- ULONG createStream( const String& rUrl, SvStream*& rpStr );
- ULONG createFileName( const String& rUrl, String& rFileName );
- ULONG close();
+ sal_uLong createStream( const String& rUrl, SvStream*& rpStr );
+ sal_uLong createFileName( const String& rUrl, String& rFileName );
+ sal_uLong close();
};
// *********************************************************************
@@ -356,7 +356,7 @@ String HtmlState::SetLink( const String& aLink, const String& aTarget )
// class HtmlExport Methoden
// *********************************************************************
-static String getParagraphStyle( SdrOutliner* pOutliner, USHORT nPara )
+static String getParagraphStyle( SdrOutliner* pOutliner, sal_uInt16 nPara )
{
SfxItemSet aParaSet( pOutliner->GetParaAttribs( nPara ) );
@@ -439,7 +439,7 @@ HtmlExport::~HtmlExport()
// ------------------------------------------------------------------
if(mpImageFiles && mpHTMLFiles && mpPageNames && mpTextFiles)
{
- for ( USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
+ for ( sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
{
delete mpImageFiles[nSdPage];
delete mpHTMLFiles[nSdPage];
@@ -490,7 +490,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams
xub_StrLen nPos = aTmp.Search( '%' );
if(nPos != STRING_NOTFOUND)
aTmp.Erase(nPos,1);
- mnCompression = (INT16)aTmp.ToInt32();
+ mnCompression = (sal_Int16)aTmp.ToInt32();
}
}
else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Width" ) ) )
@@ -654,7 +654,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams
Size aTmpSize( pPage->GetSize() );
double dRatio=((double)aTmpSize.Width())/aTmpSize.Height();
- mnHeightPixel = (USHORT)(mnWidthPixel/dRatio);
+ mnHeightPixel = (sal_uInt16)(mnWidthPixel/dRatio);
//------------------------------------------------------------------
// Ziel ausklamuestern...
@@ -666,7 +666,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams
maIndex = aINetURLObj.GetLastName();
mnSdPageCount = mpDoc->GetSdPageCount( PK_STANDARD );
- for( USHORT nPage = 0; nPage < mnSdPageCount; nPage++ )
+ for( sal_uInt16 nPage = 0; nPage < mnSdPageCount; nPage++ )
{
pPage = mpDoc->GetSdPage( nPage, PK_STANDARD );
@@ -707,7 +707,7 @@ void HtmlExport::ExportHtml()
if( mbDownload )
{
// Separator such und Extension ausblenden
- USHORT nSepPos = maDocFileName.Search( sal_Unicode('.') );
+ sal_uInt16 nSepPos = maDocFileName.Search( sal_Unicode('.') );
if(nSepPos != STRING_NOTFOUND)
maDocFileName.Erase(nSepPos);
@@ -717,7 +717,7 @@ void HtmlExport::ExportHtml()
//////
- USHORT nProgrCount = mnSdPageCount;
+ sal_uInt16 nProgrCount = mnSdPageCount;
nProgrCount += mbImpress?mnSdPageCount:0;
nProgrCount += mbContentsPage?1:0;
nProgrCount += (mbFrames && mbNotes)?mnSdPageCount:0;
@@ -817,8 +817,8 @@ void HtmlExport::SetDocColors( SdPage* pPage )
if(pSheet)
{
SfxItemSet& rSet = pSheet->GetItemSet();
- if(rSet.GetItemState(EE_CHAR_COLOR,TRUE) == SFX_ITEM_ON)
- maTextColor = ((SvxColorItem*)rSet.GetItem(EE_CHAR_COLOR,TRUE))->GetValue();
+ if(rSet.GetItemState(EE_CHAR_COLOR,sal_True) == SFX_ITEM_ON)
+ maTextColor = ((SvxColorItem*)rSet.GetItem(EE_CHAR_COLOR,sal_True))->GetValue();
}
// Standard Hintergrundfarbe aus Background der MasterPage der ersten Seite
@@ -833,7 +833,7 @@ void HtmlExport::SetDocColors( SdPage* pPage )
///////////////////////////////////////////////////////////////////////
-void HtmlExport::InitProgress( USHORT nProgrCount )
+void HtmlExport::InitProgress( sal_uInt16 nProgrCount )
{
String aStr(SdResId(STR_CREATE_PAGES));
mpProgress = new SfxProgress( mpDocSh, aStr, nProgrCount );
@@ -872,7 +872,7 @@ void HtmlExport::ExportWebCast()
mnPagesWritten = 0;
InitProgress( mnSdPageCount + 9 );
- mpDocSh->SetWaitCursor( TRUE );
+ mpDocSh->SetWaitCursor( sal_True );
CreateFileNames();
@@ -1014,7 +1014,7 @@ bool HtmlExport::CreateImagesForPresPages()
aDescriptor[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FilterData") );
aDescriptor[2].Value <<= aFilterData;
- for (USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
+ for (sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
{
SdPage* pPage = maPages[ nSdPage ];
@@ -1044,11 +1044,11 @@ bool HtmlExport::CreateImagesForPresPages()
// =====================================================================
SdrTextObj* HtmlExport::GetLayoutTextObject(SdrPage* pPage)
{
- ULONG nObjectCount = pPage->GetObjCount();
+ sal_uLong nObjectCount = pPage->GetObjCount();
SdrObject* pObject = NULL;
SdrTextObj* pResult = NULL;
- for (ULONG nObject = 0; nObject < nObjectCount; nObject++)
+ for (sal_uLong nObject = 0; nObject < nObjectCount; nObject++)
{
pObject = pPage->GetObj(nObject);
if (pObject->GetObjInventor() == SdrInventor &&
@@ -1084,7 +1084,7 @@ bool HtmlExport::CreateHtmlTextForPresPages()
SdrOutliner* pOutliner = mpDoc->GetInternalOutliner();
- for(USHORT nSdPage = 0; nSdPage < mnSdPageCount && bOk; nSdPage++)
+ for(sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount && bOk; nSdPage++)
{
SdPage* pPage = maPages[ nSdPage ];
@@ -1151,7 +1151,7 @@ bool HtmlExport::CreateHtmlTextForPresPages()
the given filename */
bool HtmlExport::WriteHtml( const String& rFileName, bool bAddExtension, const String& rHtmlData )
{
- ULONG nErr = 0;
+ sal_uLong nErr = 0;
String aFileName( rFileName );
if( bAddExtension )
@@ -1221,19 +1221,19 @@ String HtmlExport::CreateTextForPage( SdrOutliner* pOutliner,
pOutliner->Clear();
pOutliner->SetText( *pOPO );
- ULONG nCount = pOutliner->GetParagraphCount();
+ sal_uLong nCount = pOutliner->GetParagraphCount();
Paragraph* pPara = NULL;
sal_Int16 nActDepth = -1;
String aParaText;
- for (ULONG nPara = 0; nPara < nCount; nPara++)
+ for (sal_uLong nPara = 0; nPara < nCount; nPara++)
{
pPara = pOutliner->GetParagraph(nPara);
if(pPara == 0)
continue;
- const sal_Int16 nDepth = (USHORT) pOutliner->GetDepth( (USHORT) nPara );
+ const sal_Int16 nDepth = (sal_uInt16) pOutliner->GetDepth( (sal_uInt16) nPara );
aParaText = ParagraphToHTMLString(pOutliner,nPara,rBackgroundColor);
if(aParaText.Len() == 0)
@@ -1318,8 +1318,8 @@ String HtmlExport::CreateTextForNotesPage( SdrOutliner* pOutliner,
pOutliner->Clear();
pOutliner->SetText( *pOPO );
- ULONG nCount = pOutliner->GetParagraphCount();
- for (ULONG nPara = 0; nPara < nCount; nPara++)
+ sal_uLong nCount = pOutliner->GetParagraphCount();
+ for (sal_uLong nPara = 0; nPara < nCount; nPara++)
{
aStr.AppendAscii("<p style=\"");
aStr.Append( getParagraphStyle( pOutliner, nPara ) );
@@ -1336,7 +1336,7 @@ String HtmlExport::CreateTextForNotesPage( SdrOutliner* pOutliner,
// =====================================================================
// Wandelt einen Paragraphen des Outliners in Html
// =====================================================================
-String HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, ULONG nPara, const Color& rBackgroundColor )
+String HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, sal_uLong nPara, const Color& rBackgroundColor )
{
String aStr;
@@ -1346,7 +1346,7 @@ String HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, ULONG nPara, c
// TODO: MALTE!!!
EditEngine& rEditEngine = *(EditEngine*)&pOutliner->GetEditEngine();
bool bOldUpdateMode = rEditEngine.GetUpdateMode();
- rEditEngine.SetUpdateMode(TRUE);
+ rEditEngine.SetUpdateMode(sal_True);
Paragraph* pPara = pOutliner->GetParagraph(nPara);
if(NULL == pPara)
@@ -1354,15 +1354,15 @@ String HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, ULONG nPara, c
HtmlState aState( (mbUserAttr || mbDocColors) ? maTextColor : Color(COL_BLACK) );
SvUShorts aPortionList;
- rEditEngine.GetPortions( (USHORT) nPara, aPortionList );
- USHORT nPortionCount = aPortionList.Count();
+ rEditEngine.GetPortions( (sal_uInt16) nPara, aPortionList );
+ sal_uInt16 nPortionCount = aPortionList.Count();
- USHORT nPos1 = 0;
- for( USHORT nPortion = 0; nPortion < nPortionCount; nPortion++ )
+ sal_uInt16 nPos1 = 0;
+ for( sal_uInt16 nPortion = 0; nPortion < nPortionCount; nPortion++ )
{
- USHORT nPos2 = aPortionList.GetObject(nPortion);
+ sal_uInt16 nPos2 = aPortionList.GetObject(nPortion);
- ESelection aSelection( (USHORT) nPara, nPos1, (USHORT) nPara, nPos2);
+ ESelection aSelection( (sal_uInt16) nPara, nPos1, (sal_uInt16) nPara, nPos2);
SfxItemSet aSet( rEditEngine.GetAttribs( aSelection ) );
@@ -1479,7 +1479,7 @@ bool HtmlExport::CreateHtmlForPresPages()
List aClickableObjects;
- for(USHORT nSdPage = 0; nSdPage < mnSdPageCount && bOk; nSdPage++)
+ for(sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount && bOk; nSdPage++)
{
// Klickbare Objekte finden (auch auf der Masterpage) und
// in Liste stellen. In umgekehrter Zeichenreihenfolge in
@@ -1497,8 +1497,8 @@ bool HtmlExport::CreateHtmlForPresPages()
while (!bMasterDone)
{
- // TRUE = rueckwaerts
- SdrObjListIter aIter(*pPage, IM_DEEPWITHGROUPS, TRUE);
+ // sal_True = rueckwaerts
+ SdrObjListIter aIter(*pPage, IM_DEEPWITHGROUPS, sal_True);
SdrObject* pObject = aIter.Next();
while (pObject)
@@ -1526,7 +1526,7 @@ bool HtmlExport::CreateHtmlForPresPages()
else
bMasterDone = true;
}
- ULONG nClickableObjectCount = aClickableObjects.Count();
+ sal_uLong nClickableObjectCount = aClickableObjects.Count();
// HTML Head
String aStr(maHTMLHeader);
@@ -1539,7 +1539,7 @@ bool HtmlExport::CreateHtmlForPresPages()
pPage = maPages[ nSdPage ];
if( meMode == PUBLISH_KIOSK )
{
- ULONG nSecs = 0;
+ sal_uLong nSecs = 0;
bool bEndless = false;
if( !mbAutoSlide )
{
@@ -1620,7 +1620,7 @@ bool HtmlExport::CreateHtmlForPresPages()
{
aStr.AppendAscii( "<map name=\"map0\">\r\n" );
- for (ULONG nObject = 0; nObject < nClickableObjectCount; nObject++)
+ for (sal_uLong nObject = 0; nObject < nClickableObjectCount; nObject++)
{
SdrObject* pObject = (SdrObject*)aClickableObjects.GetObject(nObject);
SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObject);
@@ -1630,7 +1630,7 @@ bool HtmlExport::CreateHtmlForPresPages()
Point aLogPos(aRect.TopLeft());
bool bIsSquare = aRect.GetWidth() == aRect.GetHeight();
- ULONG nPageWidth = pPage->GetSize().Width() - pPage->GetLftBorder() -
+ sal_uLong nPageWidth = pPage->GetSize().Width() - pPage->GetLftBorder() -
pPage->GetRgtBorder();
// das BoundRect bezieht sich auf den physikalischen
@@ -1652,17 +1652,17 @@ bool HtmlExport::CreateHtmlForPresPages()
if (pIMapInfo)
{
const ImageMap& rIMap = pIMapInfo->GetImageMap();
- UINT16 nAreaCount = rIMap.GetIMapObjectCount();
- for (UINT16 nArea = 0; nArea < nAreaCount; nArea++)
+ sal_uInt16 nAreaCount = rIMap.GetIMapObjectCount();
+ for (sal_uInt16 nArea = 0; nArea < nAreaCount; nArea++)
{
IMapObject* pArea = rIMap.GetIMapObject(nArea);
- UINT16 nType = pArea->GetType();
+ sal_uInt16 nType = pArea->GetType();
String aURL( pArea->GetURL() );
// ggfs. Seiten- oder Objektnamen umwandeln in den
// Namen der entsprechenden HTML-Datei
- BOOL bIsMasterPage;
- USHORT nPgNum = mpDoc->GetPageByName( aURL, bIsMasterPage );
+ sal_Bool bIsMasterPage;
+ sal_uInt16 nPgNum = mpDoc->GetPageByName( aURL, bIsMasterPage );
SdrObject* pObj = NULL;
if (nPgNum == SDRPAGE_NOTFOUND)
@@ -1706,9 +1706,9 @@ bool HtmlExport::CreateHtmlForPresPages()
aCenter.X() = (long)(aCenter.X() * fLogicToPixel);
aCenter.Y() = (long)(aCenter.Y() * fLogicToPixel);
- ULONG nCircleRadius = (((IMapCircleObject*)pArea)->
+ sal_uLong nCircleRadius = (((IMapCircleObject*)pArea)->
GetRadius(false));
- nCircleRadius = (ULONG)(nCircleRadius * fLogicToPixel);
+ nCircleRadius = (sal_uLong)(nCircleRadius * fLogicToPixel);
aStr += CreateHTMLCircleArea(nCircleRadius,
aCenter.X(), aCenter.Y(),
aURL);
@@ -1746,8 +1746,8 @@ bool HtmlExport::CreateHtmlForPresPages()
{
case presentation::ClickAction_BOOKMARK:
{
- BOOL bIsMasterPage;
- USHORT nPgNum = mpDoc->GetPageByName( pInfo->GetBookmark(), bIsMasterPage );
+ sal_Bool bIsMasterPage;
+ sal_uInt16 nPgNum = mpDoc->GetPageByName( pInfo->GetBookmark(), bIsMasterPage );
SdrObject* pObj = NULL;
if( nPgNum == SDRPAGE_NOTFOUND )
@@ -1769,25 +1769,25 @@ bool HtmlExport::CreateHtmlForPresPages()
case presentation::ClickAction_PREVPAGE:
{
- ULONG nPage = nSdPage;
+ sal_uLong nPage = nSdPage;
if (nSdPage == 0)
nPage = 0;
else
nPage = nSdPage - 1;
- aHRef = CreatePageURL( (USHORT) nPage);
+ aHRef = CreatePageURL( (sal_uInt16) nPage);
}
break;
case presentation::ClickAction_NEXTPAGE:
{
- ULONG nPage = nSdPage;
+ sal_uLong nPage = nSdPage;
if (nSdPage == mnSdPageCount - 1)
nPage = mnSdPageCount - 1;
else
nPage = nSdPage + 1;
- aHRef = CreatePageURL( (USHORT) nPage);
+ aHRef = CreatePageURL( (sal_uInt16) nPage);
}
break;
@@ -1898,7 +1898,7 @@ bool HtmlExport::CreateContentPage()
aStr += RESTOHTML(STR_HTMLEXP_CONTENTS);
aStr.AppendAscii( "</h3>" );
- for(USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
+ for(sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
{
String aPageName = *mpPageNames[nSdPage];
aStr.AppendAscii( "<div align=\"left\">" );
@@ -1982,7 +1982,7 @@ bool HtmlExport::CreateNotesPages()
bool bOk = true;
SdrOutliner* pOutliner = mpDoc->GetInternalOutliner();
- for( USHORT nSdPage = 0; bOk && nSdPage < mnSdPageCount; nSdPage++ )
+ for( sal_uInt16 nSdPage = 0; bOk && nSdPage < mnSdPageCount; nSdPage++ )
{
SdPage* pPage = maNotesPages[nSdPage];
if( mbDocColors )
@@ -2038,7 +2038,7 @@ bool HtmlExport::CreateOutlinePages()
aStr += CreateBodyTag();
SdrOutliner* pOutliner = mpDoc->GetInternalOutliner();
- for(USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
+ for(sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
{
SdPage* pPage = maPages[ nSdPage ];
@@ -2091,7 +2091,7 @@ void HtmlExport::CreateFileNames()
mbHeader = false; // Ueberschrift auf Uebersichtsseite?
- for (USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
+ for (sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
{
String* pName;
if(nSdPage == 0 && !mbContentsPage && !mbFrames )
@@ -2167,7 +2167,7 @@ String HtmlExport::getDocumentTitle()
}
}
- for( UINT16 i = 0; i < mDocTitle.Len(); i++ )
+ for( sal_uInt16 i = 0; i < mDocTitle.Len(); i++ )
if( mDocTitle.GetChar(i) == (sal_Unicode)0xff)
mDocTitle.SetChar(i, sal_Unicode(' ') );
}
@@ -2177,7 +2177,7 @@ String HtmlExport::getDocumentTitle()
mDocTitle = maDocFileName;
int nDot = mDocTitle.Search( '.' );
if( nDot > 0 )
- mDocTitle.Erase( (USHORT)nDot );
+ mDocTitle.Erase( (sal_uInt16)nDot );
}
mbHeader = true;
}
@@ -2515,7 +2515,7 @@ bool HtmlExport::CreateNavBarFrames()
// ====================================================================
// Buttonleiste fuer Standard ausgeben
// ====================================================================
-String HtmlExport::CreateNavBar( USHORT nSdPage, bool bIsText ) const
+String HtmlExport::CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const
{
// Navigationsleiste vorbereiten
String aStrNavFirst( SdResId(STR_HTMLEXP_FIRSTPAGE) );
@@ -2692,8 +2692,8 @@ String HtmlExport::CreateLink( const String& aLink,
// Erzeugt ein Image-tag
// =====================================================================
String HtmlExport::CreateImage( const String& aImage, const String& aAltText,
- INT16 nWidth,
- INT16 nHeight ) const
+ sal_Int16 nWidth,
+ sal_Int16 nHeight ) const
{
String aStr( RTL_CONSTASCII_USTRINGPARAM("<img src=\""));
aStr += StringToURL(aImage);
@@ -2748,9 +2748,9 @@ String HtmlExport::ColorToHTMLString( Color aColor )
// =====================================================================
// Area fuer Kreis erzeugen; es werden Pixelkoordinaten erwartet
// =====================================================================
-String HtmlExport::CreateHTMLCircleArea( ULONG nRadius,
- ULONG nCenterX,
- ULONG nCenterY,
+String HtmlExport::CreateHTMLCircleArea( sal_uLong nRadius,
+ sal_uLong nCenterX,
+ sal_uLong nCenterY,
const String& rHRef ) const
{
String aStr( RTL_CONSTASCII_USTRINGPARAM("<area shape=\"circle\" alt=\"\" coords=\"" ));
@@ -2847,7 +2847,7 @@ String HtmlExport::StringToHTMLString( const String& rString )
// =====================================================================
// Erzeugt die URL einer bestimmten Seite
// =====================================================================
-String HtmlExport::CreatePageURL( USHORT nPgNum )
+String HtmlExport::CreatePageURL( sal_uInt16 nPgNum )
{
if(mbFrames)
{
@@ -2870,7 +2870,7 @@ bool HtmlExport::CopyScript( const String& rPath, const String& rSource, const S
meEC.SetContext( STR_HTMLEXP_ERROR_OPEN_FILE, rSource );
- ULONG nErr = 0;
+ sal_uLong nErr = 0;
SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
if( pIStm )
@@ -2944,7 +2944,7 @@ static const char * ASP_Scripts[] = { "common.inc", "webcast.asp", "show.asp", "
/** erzeugt und speichert die f�r WebShow ben�tigte ASP Scripte */
bool HtmlExport::CreateASPScripts()
{
- for( USHORT n = 0; n < (sizeof( ASP_Scripts ) / sizeof(char *)); n++ )
+ for( sal_uInt16 n = 0; n < (sizeof( ASP_Scripts ) / sizeof(char *)); n++ )
{
String aScript;
@@ -2965,7 +2965,7 @@ static const char *PERL_Scripts[] = { "webcast.pl", "common.pl", "editpic.pl", "
/** erzeugt und speichert die f�r WebShow ben�tigte PERL Scripte */
bool HtmlExport::CreatePERLScripts()
{
- for( USHORT n = 0; n < (sizeof( PERL_Scripts ) / sizeof(char *)); n++ )
+ for( sal_uInt16 n = 0; n < (sizeof( PERL_Scripts ) / sizeof(char *)); n++ )
{
String aScript;
aScript.AssignAscii( PERL_Scripts[n] );
@@ -2986,7 +2986,7 @@ bool HtmlExport::CreatePERLScripts()
bool HtmlExport::CreateImageFileList()
{
String aStr;
- for( USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
+ for( sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
{
aStr += String::CreateFromInt32( nSdPage + 1 );
aStr.Append(sal_Unicode(';'));
@@ -3014,7 +3014,7 @@ bool HtmlExport::CreateImageNumberFile()
meEC.SetContext( STR_HTMLEXP_ERROR_CREATE_FILE, aFileName );
EasyFile aFile;
SvStream* pStr;
- ULONG nErr = aFile.createStream(aFull, pStr);
+ sal_uLong nErr = aFile.createStream(aFull, pStr);
if(nErr == 0)
{
*pStr << (const char *)"1";
@@ -3185,9 +3185,9 @@ EasyFile::~EasyFile()
}
// =====================================================================
-ULONG EasyFile::createStream( const String& rUrl, SvStream* &rpStr )
+sal_uLong EasyFile::createStream( const String& rUrl, SvStream* &rpStr )
{
- ULONG nErr = 0;
+ sal_uLong nErr = 0;
if(bOpen)
nErr = close();
@@ -3225,9 +3225,9 @@ ULONG EasyFile::createStream( const String& rUrl, SvStream* &rpStr )
}
// =====================================================================
-ULONG EasyFile::createFileName( const String& rURL, String& rFileName )
+sal_uLong EasyFile::createFileName( const String& rURL, String& rFileName )
{
- ULONG nErr = 0;
+ sal_uLong nErr = 0;
if( bOpen )
nErr = close();
@@ -3250,9 +3250,9 @@ ULONG EasyFile::createFileName( const String& rURL, String& rFileName )
}
// =====================================================================
-ULONG EasyFile::close()
+sal_uLong EasyFile::close()
{
- ULONG nErr = 0;
+ sal_uLong nErr = 0;
delete pOStm;
pOStm = NULL;
@@ -3286,7 +3286,7 @@ HtmlErrorContext::HtmlErrorContext(Window *_pWin)
// =====================================================================
-BOOL HtmlErrorContext::GetString( ULONG, String& rCtxStr )
+sal_Bool HtmlErrorContext::GetString( sal_uLong, String& rCtxStr )
{
DBG_ASSERT( mnResId != 0, "No error context set" );
if( mnResId == 0 )
@@ -3302,7 +3302,7 @@ BOOL HtmlErrorContext::GetString( ULONG, String& rCtxStr )
// =====================================================================
-void HtmlErrorContext::SetContext( USHORT nResId, const String& rURL )
+void HtmlErrorContext::SetContext( sal_uInt16 nResId, const String& rURL )
{
mnResId = nResId;
maURL1 = rURL;
@@ -3311,7 +3311,7 @@ void HtmlErrorContext::SetContext( USHORT nResId, const String& rURL )
// =====================================================================
-void HtmlErrorContext::SetContext( USHORT nResId, const String& rURL1, const String& rURL2 )
+void HtmlErrorContext::SetContext( sal_uInt16 nResId, const String& rURL1, const String& rURL2 )
{
mnResId = nResId;
maURL1 = rURL1;
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index fd5a30fa2f0c..31ae7ba80175 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -77,7 +77,7 @@ class View;
class HtmlErrorContext : public ErrorContext
{
private:
- USHORT mnResId;
+ sal_uInt16 mnResId;
String maURL1;
String maURL2;
@@ -85,10 +85,10 @@ public:
HtmlErrorContext(Window *pWin=0);
~HtmlErrorContext() {};
- virtual BOOL GetString( ULONG nErrId, String& rCtxStr );
+ virtual sal_Bool GetString( sal_uLong nErrId, String& rCtxStr );
- void SetContext( USHORT nResId, const String& rURL );
- void SetContext( USHORT nResId, const String& rURL1, const String& rURL2 );
+ void SetContext( sal_uInt16 nResId, const String& rURL );
+ void SetContext( sal_uInt16 nResId, const String& rURL1, const String& rURL2 );
};
// =====================================================================
@@ -109,12 +109,12 @@ class HtmlExport
HtmlPublishMode meMode;
SfxProgress* mpProgress;
bool mbImpress;
- USHORT mnSdPageCount;
- USHORT mnPagesWritten;
+ sal_uInt16 mnSdPageCount;
+ sal_uInt16 mnPagesWritten;
bool mbContentsPage;
- INT16 mnButtonThema;
- UINT16 mnWidthPixel;
- UINT16 mnHeightPixel;
+ sal_Int16 mnButtonThema;
+ sal_uInt16 mnWidthPixel;
+ sal_uInt16 mnHeightPixel;
PublishingFormat meFormat;
bool mbHeader;
bool mbNotes;
@@ -125,14 +125,14 @@ class HtmlExport
String maAuthor;
String maHomePage;
String maInfo;
- INT16 mnCompression;
+ sal_Int16 mnCompression;
String maDocFileName;
String maFramePage;
String mDocTitle;
bool mbDownload;
bool mbAutoSlide;
- UINT32 mnSlideDuration;
+ sal_uInt32 mnSlideDuration;
bool mbSlideSound;
bool mbHiddenSlides;
bool mbEndless;
@@ -190,30 +190,30 @@ class HtmlExport
String CreateLink( const String& aLink, const String& aText,
const String& aTarget = String()) const;
- String CreateImage( const String& aImage, const String& aAltText, INT16 nWidth = -1, INT16 nHeight = -1 ) const;
- String CreateNavBar( USHORT nSdPage, bool bIsText ) const;
+ String CreateImage( const String& aImage, const String& aAltText, sal_Int16 nWidth = -1, sal_Int16 nHeight = -1 ) const;
+ String CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const;
String CreateBodyTag() const;
- String ParagraphToHTMLString( SdrOutliner* pOutliner, ULONG nPara, const Color& rBackgroundColor );
+ String ParagraphToHTMLString( SdrOutliner* pOutliner, sal_uLong nPara, const Color& rBackgroundColor );
String TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState, const Color& rBackgroundColor );
String CreateTextForTitle( SdrOutliner* pOutliner, SdPage* pPage, const Color& rBackgroundColor );
String CreateTextForPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor );
String CreateTextForNotesPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor );
- String CreateHTMLCircleArea( ULONG nRadius, ULONG nCenterX,
- ULONG nCenterY, const String& rHRef ) const;
+ String CreateHTMLCircleArea( sal_uLong nRadius, sal_uLong nCenterX,
+ sal_uLong nCenterY, const String& rHRef ) const;
String CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPoly, Size aShift, double fFactor, const String& rHRef ) const;
String CreateHTMLRectArea( const Rectangle& rRect,
const String& rHRef ) const;
- String CreatePageURL( USHORT nPgNum );
+ String CreatePageURL( sal_uInt16 nPgNum );
String InsertSound( const String& rSoundFile );
bool CopyFile( const String& rSourceFile, const String& rDestPath );
bool CopyScript( const String& rPath, const String& rSource, const String& rDest, bool bUnix = false );
- void InitProgress( USHORT nProgrCount );
+ void InitProgress( sal_uInt16 nProgrCount );
void ResetProgress();
String WriteMetaCharset() const;
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index f44c5f124992..07f44ce83aa4 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -76,13 +76,13 @@ using ::rtl::OUString;
extern void InterpolateFixedBitmap( FixedBitmap * pBitmap );
// Kennung fuer die Config Datei mit den Html Einstellungen
-const UINT16 nMagic = (UINT16)0x1977;
+const sal_uInt16 nMagic = (sal_uInt16)0x1977;
// Key fuer die soffice.ini
#define KEY_QUALITY "JPG-EXPORT-QUALITY"
// Die Help Ids der einzelnen Seiten
-ULONG aPageHelpIds[NOOFPAGES] =
+const char* aPageHelpIds[NOOFPAGES] =
{
HID_SD_HTMLEXPORT_PAGE1,
HID_SD_HTMLEXPORT_PAGE2,
@@ -108,39 +108,39 @@ public:
String m_aURL;
// special Kiosk options
- BOOL m_bAutoSlide;
- UINT32 m_nSlideDuration;
- BOOL m_bEndless;
+ sal_Bool m_bAutoSlide;
+ sal_uInt32 m_nSlideDuration;
+ sal_Bool m_bEndless;
// special HTML options
- BOOL m_bContentPage;
- BOOL m_bNotes;
+ sal_Bool m_bContentPage;
+ sal_Bool m_bNotes;
// misc options
- UINT16 m_nResolution;
+ sal_uInt16 m_nResolution;
String m_aCompression;
PublishingFormat m_eFormat;
- BOOL m_bSlideSound;
- BOOL m_bHiddenSlides;
+ sal_Bool m_bSlideSound;
+ sal_Bool m_bHiddenSlides;
// titel page information
String m_aAuthor;
String m_aEMail;
String m_aWWW;
String m_aMisc;
- BOOL m_bDownload;
- BOOL m_bCreated; // not used
+ sal_Bool m_bDownload;
+ sal_Bool m_bCreated; // not used
// buttons and colorscheme
- INT16 m_nButtonThema;
- BOOL m_bUserAttr;
+ sal_Int16 m_nButtonThema;
+ sal_Bool m_bUserAttr;
Color m_aBackColor;
Color m_aTextColor;
Color m_aLinkColor;
Color m_aVLinkColor;
Color m_aALinkColor;
- BOOL m_bUseAttribs;
- BOOL m_bUseColor;
+ sal_Bool m_bUseAttribs;
+ sal_Bool m_bUseColor;
SdPublishingDesign();
@@ -155,8 +155,8 @@ public:
SdPublishingDesign::SdPublishingDesign()
{
m_eMode = PUBLISH_HTML;
- m_bContentPage = TRUE;
- m_bNotes = TRUE;
+ m_bContentPage = sal_True;
+ m_bNotes = sal_True;
m_eFormat = FORMAT_PNG;
@@ -174,12 +174,12 @@ SdPublishingDesign::SdPublishingDesign()
m_aAuthor += sal_Unicode(' ');
m_aAuthor += (String)aUserOptions.GetLastName();
m_aEMail = aUserOptions.GetEmail();
- m_bDownload = FALSE;
+ m_bDownload = sal_False;
m_nButtonThema = -1;
- m_bUserAttr = FALSE;
- m_bUseAttribs = TRUE;
- m_bUseColor = TRUE;
+ m_bUserAttr = sal_False;
+ m_bUseAttribs = sal_True;
+ m_bUseColor = sal_True;
m_aBackColor = COL_WHITE;
m_aTextColor = COL_BLACK;
@@ -189,12 +189,12 @@ SdPublishingDesign::SdPublishingDesign()
m_eScript = SCRIPT_ASP;
- m_bAutoSlide = TRUE;
+ m_bAutoSlide = sal_True;
m_nSlideDuration = 15;
- m_bEndless = TRUE;
+ m_bEndless = sal_True;
- m_bSlideSound = TRUE;
- m_bHiddenSlides = FALSE;
+ m_bSlideSound = sal_True;
+ m_bHiddenSlides = sal_False;
}
// =====================================================================
@@ -268,7 +268,7 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign)
{
SdIOCompat aIO(rIn, STREAM_READ);
- UINT16 nTemp16;
+ sal_uInt16 nTemp16;
rIn.ReadByteString( rDesign.m_aDesignName, RTL_TEXTENCODING_UTF8 );
rIn >> nTemp16;
@@ -320,12 +320,12 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign)
// Name
rOut.WriteByteString( rDesign.m_aDesignName, RTL_TEXTENCODING_UTF8 );
- rOut << (UINT16)rDesign.m_eMode;
+ rOut << (sal_uInt16)rDesign.m_eMode;
rOut << rDesign.m_bContentPage;
rOut << rDesign.m_bNotes;
rOut << rDesign.m_nResolution;
rOut.WriteByteString( rDesign.m_aCompression, RTL_TEXTENCODING_UTF8 );
- rOut << (UINT16)rDesign.m_eFormat;
+ rOut << (sal_uInt16)rDesign.m_eFormat;
rOut.WriteByteString( rDesign.m_aAuthor, RTL_TEXTENCODING_UTF8 );
rOut.WriteByteString( rDesign.m_aEMail, RTL_TEXTENCODING_UTF8 );
rOut.WriteByteString( rDesign.m_aWWW, RTL_TEXTENCODING_UTF8 );
@@ -342,7 +342,7 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign)
rOut << rDesign.m_bUseAttribs;
rOut << rDesign.m_bUseColor;
- rOut << (UINT16)rDesign.m_eScript;
+ rOut << (sal_uInt16)rDesign.m_eScript;
rOut.WriteByteString( rDesign.m_aURL, RTL_TEXTENCODING_UTF8 );
rOut.WriteByteString( rDesign.m_aCGI, RTL_TEXTENCODING_UTF8 );
@@ -389,8 +389,8 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType)
, aNextPageButton(this,SdResId(BUT_NEXT))
, aFinishButton(this,SdResId(BUT_FINISH))
, aAssistentFunc(NOOFPAGES)
-, m_bButtonsDirty(TRUE)
-, m_bDesignListDirty(FALSE)
+, m_bButtonsDirty(sal_True)
+, m_bDesignListDirty(sal_False)
, m_pDesign(NULL)
{
m_bImpress = eDocType == DOCUMENT_TYPE_IMPRESS;
@@ -433,7 +433,7 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType)
pPage3_Png->SetClickHdl(LINK(this,SdPublishingDlg, GfxFormatHdl));
pPage3_Gif->SetClickHdl(LINK(this,SdPublishingDlg, GfxFormatHdl));
pPage3_Jpg->SetClickHdl(LINK(this,SdPublishingDlg, GfxFormatHdl));
- pPage3_Quality->Enable(FALSE);
+ pPage3_Quality->Enable(sal_False);
pPage3_Resolution_1->SetClickHdl(LINK(this,SdPublishingDlg, ResolutionHdl ));
pPage3_Resolution_2->SetClickHdl(LINK(this,SdPublishingDlg, ResolutionHdl ));
@@ -465,7 +465,7 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType)
pPage5_Buttons->SetLineCount( 4 );
pPage5_Buttons->SetExtraSpacing( 1 );
- for( UINT16 nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ )
+ for( sal_uInt16 nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ )
{
SdPublishingDesign *pDesign = (SdPublishingDesign*)
m_pDesignList->GetObject(nIndex);
@@ -489,7 +489,7 @@ SdPublishingDlg::~SdPublishingDlg()
{
if( m_pDesignList )
{
- for( UINT16 nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ )
+ for( sal_uInt16 nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ )
delete (SdPublishingDesign*)m_pDesignList->GetObject(nIndex);
}
@@ -790,8 +790,8 @@ void SdPublishingDlg::SetDefaults()
SdPublishingDesign aDefault;
SetDesign(&aDefault);
- pPage1_NewDesign->Check(TRUE);
- pPage1_OldDesign->Check(FALSE);
+ pPage1_NewDesign->Check(sal_True);
+ pPage1_OldDesign->Check(sal_False);
UpdatePage();
}
@@ -978,8 +978,8 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton )
{
if(pButton == pPage1_NewDesign)
{
- pPage1_NewDesign->Check(TRUE); // wegen DesignDeleteHdl
- pPage1_OldDesign->Check(FALSE);
+ pPage1_NewDesign->Check(sal_True); // wegen DesignDeleteHdl
+ pPage1_OldDesign->Check(sal_False);
pPage1_Designs->Disable();
pPage1_DelDesign->Disable();
m_pDesign = NULL;
@@ -989,14 +989,14 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton )
}
else
{
- pPage1_NewDesign->Check(FALSE);
+ pPage1_NewDesign->Check(sal_False);
pPage1_Designs->Enable();
pPage1_DelDesign->Enable();
if(pPage1_Designs->GetSelectEntryCount() == 0)
pPage1_Designs->SelectEntryPos(0);
- USHORT nPos = pPage1_Designs->GetSelectEntryPos();
+ sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos();
m_pDesign = (SdPublishingDesign*)m_pDesignList->GetObject(nPos);
DBG_ASSERT(m_pDesign, "Kein Design? Das darf nicht sein! (CL)");
@@ -1012,7 +1012,7 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton )
// =====================================================================
IMPL_LINK( SdPublishingDlg, DesignSelectHdl, ListBox *, EMPTYARG )
{
- USHORT nPos = pPage1_Designs->GetSelectEntryPos();
+ sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos();
m_pDesign = (SdPublishingDesign*)m_pDesignList->GetObject(nPos);
DBG_ASSERT(m_pDesign, "Kein Design? Das darf nicht sein! (CL)");
@@ -1029,7 +1029,7 @@ IMPL_LINK( SdPublishingDlg, DesignSelectHdl, ListBox *, EMPTYARG )
// =====================================================================
IMPL_LINK( SdPublishingDlg, DesignDeleteHdl, PushButton *, EMPTYARG )
{
- USHORT nPos = pPage1_Designs->GetSelectEntryPos();
+ sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos();
SdPublishingDesign* pDesign = (SdPublishingDesign*)
m_pDesignList->GetObject(nPos);
DBG_ASSERT(pDesign, "Kein Design? Das darf nicht sein! (CL)");
@@ -1045,7 +1045,7 @@ IMPL_LINK( SdPublishingDlg, DesignDeleteHdl, PushButton *, EMPTYARG )
delete pDesign;
- m_bDesignListDirty = TRUE;
+ m_bDesignListDirty = sal_True;
UpdatePage();
@@ -1053,11 +1053,11 @@ IMPL_LINK( SdPublishingDlg, DesignDeleteHdl, PushButton *, EMPTYARG )
}
// =====================================================================
-// Clickhandler fuer das ändern des Servertyps
+// Clickhandler fuer das �ndern des Servertyps
// =====================================================================
IMPL_LINK( SdPublishingDlg, WebServerHdl, RadioButton *, pButton )
{
- BOOL bASP = pButton == pPage2_ASP;
+ sal_Bool bASP = pButton == pPage2_ASP;
pPage2_ASP->Check( bASP );
pPage2_PERL->Check( !bASP );
@@ -1130,7 +1130,7 @@ IMPL_LINK( SdPublishingDlg, ResolutionHdl, RadioButton *, pButton )
IMPL_LINK( SdPublishingDlg, ButtonsHdl, ValueSet *, EMPTYARG )
{
// wird eine Bitmap Schaltflaeche gewaehlt, TexOnly ausschalten
- pPage5_TextOnly->Check(FALSE);
+ pPage5_TextOnly->Check(sal_False);
return 0;
}
@@ -1172,7 +1172,7 @@ IMPL_LINK( SdPublishingDlg, ColorHdl, PushButton *, pButton)
m_aALinkColor = aDlg.GetColor();
}
- pPage6_User->Check(TRUE);
+ pPage6_User->Check(sal_True);
pPage6_Preview->SetColors( m_aBackColor, m_aTextColor, m_aLinkColor,
m_aVLinkColor, m_aALinkColor );
pPage6_Preview->Invalidate();
@@ -1194,19 +1194,19 @@ IMPL_LINK( SdPublishingDlg, FinishHdl, OKButton *, EMPTYARG )
SdPublishingDesign* pDesign = new SdPublishingDesign();
GetDesign(pDesign);
- BOOL bSave = FALSE;
+ sal_Bool bSave = sal_False;
if(pPage1_OldDesign->IsChecked() && m_pDesign)
{
// aenderungen??
if(!(*pDesign == *m_pDesign))
- bSave = TRUE;
+ bSave = sal_True;
}
else
{
SdPublishingDesign aDefaultDesign;
if(!(aDefaultDesign == *pDesign))
- bSave = TRUE;
+ bSave = sal_True;
}
if(bSave)
@@ -1215,10 +1215,10 @@ IMPL_LINK( SdPublishingDlg, FinishHdl, OKButton *, EMPTYARG )
if(m_pDesign)
aName = m_pDesign->m_aDesignName;
- BOOL bRetry;
+ sal_Bool bRetry;
do
{
- bRetry = FALSE;
+ bRetry = sal_False;
SdDesignNameDlg aDlg(this, aName );
@@ -1227,7 +1227,7 @@ IMPL_LINK( SdPublishingDlg, FinishHdl, OKButton *, EMPTYARG )
pDesign->m_aDesignName = aDlg.GetDesignName();
SdPublishingDesign* pSameNameDes = NULL;
- UINT16 nIndex;
+ sal_uInt16 nIndex;
for( nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ )
{
pSameNameDes = (SdPublishingDesign*)
@@ -1252,7 +1252,7 @@ IMPL_LINK( SdPublishingDlg, FinishHdl, OKButton *, EMPTYARG )
if(!bRetry)
{
m_pDesignList->Insert(pDesign);
- m_bDesignListDirty = TRUE;
+ m_bDesignListDirty = sal_True;
pDesign = NULL;
}
}
@@ -1322,7 +1322,7 @@ void SdPublishingDlg::UpdatePage()
pPage2_Index_txt->Show();
pPage2_Index->Show();
- BOOL bPerl = pPage2_PERL->IsChecked();
+ sal_Bool bPerl = pPage2_PERL->IsChecked();
pPage2_Index->Enable(bPerl);
pPage2_Index_txt->Enable(bPerl);
pPage2_URL_txt->Enable(bPerl);
@@ -1351,7 +1351,7 @@ void SdPublishingDlg::UpdatePage()
pPage2_Duration_txt->Show();
pPage2_Duration->Show();
pPage2_Endless->Show();
- BOOL bAuto = pPage2_ChgAuto->IsChecked();
+ sal_Bool bAuto = pPage2_ChgAuto->IsChecked();
pPage2_Duration->Enable(bAuto);
pPage2_Endless->Enable(bAuto);
}
@@ -1429,14 +1429,14 @@ void SdPublishingDlg::LoadPreviewButtons()
{
if( mpButtonSet->getPreview( nSet, aButtonNames, aImage ) )
{
- pPage5_Buttons->InsertItem( (USHORT)nSet+1, aImage );
+ pPage5_Buttons->InsertItem( (sal_uInt16)nSet+1, aImage );
if( nHeight < aImage.GetSizePixel().Height() )
nHeight = aImage.GetSizePixel().Height();
}
}
pPage5_Buttons->SetItemHeight( nHeight );
- m_bButtonsDirty = FALSE;
+ m_bButtonsDirty = sal_False;
}
}
@@ -1568,7 +1568,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign )
pDesign->m_aEMail = pPage4_Email->GetText();
pDesign->m_aWWW = pPage4_WWW->GetText();
pDesign->m_aMisc = pPage4_Misc->GetText();
- pDesign->m_bDownload = m_bImpress?pPage4_Download->IsChecked():FALSE;
+ pDesign->m_bDownload = m_bImpress?pPage4_Download->IsChecked():sal_False;
if(pPage5_TextOnly->IsChecked())
pDesign->m_nButtonThema = -1;
@@ -1589,7 +1589,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign )
pDesign->m_aURL = pPage2_URL->GetText();
pDesign->m_bAutoSlide = pPage2_ChgAuto->IsChecked();
- pDesign->m_nSlideDuration = (UINT32)pPage2_Duration->GetTime().GetMSFromTime() / 1000;
+ pDesign->m_nSlideDuration = (sal_uInt32)pPage2_Duration->GetTime().GetMSFromTime() / 1000;
pDesign->m_bEndless = pPage2_Endless->IsChecked();
}
@@ -1606,9 +1606,9 @@ IMPL_LINK( SdPublishingDlg, LastPageHdl, PushButton *, EMPTYARG )
// =====================================================================
// Designs laden
// =====================================================================
-BOOL SdPublishingDlg::Load()
+sal_Bool SdPublishingDlg::Load()
{
- m_bDesignListDirty = FALSE;
+ m_bDesignListDirty = sal_False;
m_pDesignList = new List();
@@ -1629,25 +1629,25 @@ BOOL SdPublishingDlg::Load()
return sal_False;
}
- SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ | STREAM_NOCREATE, TRUE );
+ SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ | STREAM_NOCREATE, sal_True );
SvStream* pStream = aMedium.GetInStream();
if( !pStream )
- return( FALSE );
+ return( sal_False );
- UINT16 aCheck;
+ sal_uInt16 aCheck;
*pStream >> aCheck;
if(aCheck != nMagic)
- return FALSE;
+ return sal_False;
SdIOCompat aIO(*pStream, STREAM_READ);
- UINT16 nDesigns;
+ sal_uInt16 nDesigns;
*pStream >> nDesigns;
- for( UINT16 nIndex = 0;
+ for( sal_uInt16 nIndex = 0;
pStream->GetError() == SVSTREAM_OK && nIndex < nDesigns;
nIndex++ )
{
@@ -1663,29 +1663,29 @@ BOOL SdPublishingDlg::Load()
// =====================================================================
// Designs speichern
// =====================================================================
-BOOL SdPublishingDlg::Save()
+sal_Bool SdPublishingDlg::Save()
{
INetURLObject aURL( SvtPathOptions().GetUserConfigPath() );
aURL.Append( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "designs.sod" ) ) );
- SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC, FALSE );
+ SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC, sal_False );
aMedium.IsRemote();
SvStream* pStream = aMedium.GetOutStream();
if( !pStream )
- return( FALSE );
+ return( sal_False );
- UINT16 aCheck = nMagic;
+ sal_uInt16 aCheck = nMagic;
*pStream << aCheck;
// damit SdIOCompat vor dem Stream destruiert wird
{
SdIOCompat aIO(*pStream, STREAM_WRITE, 0);
- UINT16 nDesigns = (UINT16) m_pDesignList->Count();
+ sal_uInt16 nDesigns = (sal_uInt16) m_pDesignList->Count();
*pStream << nDesigns;
- for( UINT16 nIndex = 0;
+ for( sal_uInt16 nIndex = 0;
pStream->GetError() == SVSTREAM_OK && nIndex < nDesigns;
nIndex++ )
{
diff --git a/sd/source/filter/html/pubdlg.src b/sd/source/filter/html/pubdlg.src
index 00e9b4af75e4..9aabf8f5e971 100644
--- a/sd/source/filter/html/pubdlg.src
+++ b/sd/source/filter/html/pubdlg.src
@@ -30,6 +30,7 @@
ModalDialog DLG_PUBLISHING
{
+ HelpID = "sd:ModalDialog:DLG_PUBLISHING";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 272 , 190 ) ;
@@ -59,6 +60,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE1_NEW_DESIGN
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE1_NEW_DESIGN";
Pos = MAP_APPFONT( 12, 50 );
Size = MAP_APPFONT( 153, 10 );
Text [ en-US ] = "New design";
@@ -66,6 +68,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE1_OLD_DESIGN
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE1_OLD_DESIGN";
Pos = MAP_APPFONT( 12, 63 );
Size = MAP_APPFONT( 153, 10 );
Text [ en-US ] = "Existing design";
@@ -73,6 +76,7 @@ ModalDialog DLG_PUBLISHING
ListBox PAGE1_DESIGNS
{
+ HelpID = "sd:ListBox:DLG_PUBLISHING:PAGE1_DESIGNS";
Border = TRUE ;
Pos = MAP_APPFONT ( 21 , 75 ) ;
Size = MAP_APPFONT ( 144 , 63 ) ;
@@ -82,6 +86,7 @@ ModalDialog DLG_PUBLISHING
PushButton PAGE1_DEL_DESIGN
{
+ HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE1_DEL_DESIGN";
Pos = MAP_APPFONT ( 168 , 75 ) ;
Size = MAP_APPFONT ( 92 , 14 ) ;
TabStop = TRUE ;
@@ -120,6 +125,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE2_STANDARD
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_STANDARD";
Pos = MAP_APPFONT( 12, 50 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "Standard H~TML format";
@@ -127,6 +133,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE2_FRAMES
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_FRAMES";
Pos = MAP_APPFONT( 12, 63 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "Standard HTML with ~frames";
@@ -134,6 +141,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE2_KIOSK
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_KIOSK";
Pos = MAP_APPFONT( 12, 76 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "~Automatic";
@@ -141,6 +149,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE2_WEBCAST
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_WEBCAST";
Pos = MAP_APPFONT( 12, 89 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "~WebCast";
@@ -199,6 +208,7 @@ ModalDialog DLG_PUBLISHING
CheckBox PAGE2_CONTENT
{
+ HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE2_CONTENT";
Pos = MAP_APPFONT( 144, 49 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "Create title page";
@@ -213,6 +223,7 @@ ModalDialog DLG_PUBLISHING
CheckBox PAGE2_NOTES
{
+ HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE2_NOTES";
Pos = MAP_APPFONT( 144, 63 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "Show notes";
@@ -231,6 +242,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE2_CHG_DEFAULT
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_CHG_DEFAULT";
Pos = MAP_APPFONT ( 144 , 49 ) ;
Size = MAP_APPFONT ( 116 , 10 ) ;
TabStop = TRUE ;
@@ -239,6 +251,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE2_CHG_AUTO
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_CHG_AUTO";
Pos = MAP_APPFONT ( 144 , 63 ) ;
Size = MAP_APPFONT ( 116 , 10 ) ;
TabStop = TRUE ;
@@ -254,6 +267,7 @@ ModalDialog DLG_PUBLISHING
TimeField PAGE2_DURATION_TMF
{
+ HelpID = "sd:TimeField:DLG_PUBLISHING:PAGE2_DURATION_TMF";
Pos = MAP_APPFONT ( 196, 76 ) ;
Size = MAP_APPFONT ( 48, 12 ) ;
Border = TRUE ;
@@ -279,6 +293,7 @@ ModalDialog DLG_PUBLISHING
CheckBox PAGE2_ENDLESS
{
+ HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE2_ENDLESS";
Pos = MAP_APPFONT ( 154, 91 );
Size = MAP_APPFONT ( 108, 10 );
Text [ en-US ] = "~Endless" ;
@@ -297,6 +312,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE2_ASP
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_ASP";
Pos = MAP_APPFONT( 144, 49 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "~Active Server Pages (ASP)";
@@ -304,6 +320,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE2_PERL
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_PERL";
Pos = MAP_APPFONT( 144, 63 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "Perl" ;
@@ -318,6 +335,7 @@ ModalDialog DLG_PUBLISHING
Edit PAGE2_INDEX
{
+ HelpID = "sd:Edit:DLG_PUBLISHING:PAGE2_INDEX";
BORDER = TRUE;
Pos = MAP_APPFONT( 154, 88 );
Size = MAP_APPFONT( 105, 12 );
@@ -333,6 +351,7 @@ ModalDialog DLG_PUBLISHING
Edit PAGE2_URL
{
+ HelpID = "sd:Edit:DLG_PUBLISHING:PAGE2_URL";
BORDER = TRUE;
Pos = MAP_APPFONT( 154, 116 );
Size = MAP_APPFONT( 105, 12 );
@@ -348,6 +367,7 @@ ModalDialog DLG_PUBLISHING
Edit PAGE2_CGI
{
+ HelpID = "sd:Edit:DLG_PUBLISHING:PAGE2_CGI";
BORDER = TRUE;
Pos = MAP_APPFONT( 154, 144 );
Size = MAP_APPFONT( 105, 12 );
@@ -382,6 +402,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE3_PNG
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_PNG";
Pos = MAP_APPFONT( 12, 49 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "~PNG";
@@ -389,6 +410,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE3_GIF
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_GIF";
Pos = MAP_APPFONT( 12, 63 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "~GIF";
@@ -396,6 +418,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE3_JPG
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_JPG";
Pos = MAP_APPFONT( 12, 77 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "~JPG";
@@ -403,6 +426,7 @@ ModalDialog DLG_PUBLISHING
ComboBox PAGE3_QUALITY
{
+ HelpID = "sd:ComboBox:DLG_PUBLISHING:PAGE3_QUALITY";
Pos = MAP_APPFONT( 18, 91 );
Size = MAP_APPFONT( 28, 70 );
TabStop = TRUE ;
@@ -436,6 +460,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE3_RESOLUTION_1
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_1";
Pos = MAP_APPFONT( 144, 49 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "Low resolution (~640x480 pixels)";
@@ -443,6 +468,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE3_RESOLUTION_2
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_2";
Pos = MAP_APPFONT( 144, 63 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "Medium resolution (~800x600 pixels)";
@@ -450,6 +476,7 @@ ModalDialog DLG_PUBLISHING
RadioButton PAGE3_RESOLUTION_3
{
+ HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_3";
Pos = MAP_APPFONT ( 144, 77 ) ;
Size = MAP_APPFONT ( 116 , 10 ) ;
Text [ en-US ] = "High resolution (~1024x768 pixels)";
@@ -468,6 +495,7 @@ ModalDialog DLG_PUBLISHING
CheckBox PAGE3_SLD_SOUND
{
+ HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE3_SLD_SOUND";
Pos = MAP_APPFONT ( 12, 125 );
Size = MAP_APPFONT ( 252, 10 );
Text [ en-US ] = "~Export sounds when slide advances" ;
@@ -475,6 +503,7 @@ ModalDialog DLG_PUBLISHING
CheckBox PAGE3_HIDDEN_SLIDES
{
+ HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE3_HIDDEN_SLIDES";
Pos = MAP_APPFONT ( 12, 138 );
Size = MAP_APPFONT ( 252, 10 );
Text [ en-US ] = "Export ~hidden slides" ;
@@ -509,6 +538,7 @@ ModalDialog DLG_PUBLISHING
Edit PAGE4_AUTHOR
{
+ HelpID = "sd:Edit:DLG_PUBLISHING:PAGE4_AUTHOR";
BORDER = TRUE ;
Pos = MAP_APPFONT ( 136, 49 );
Size = MAP_APPFONT ( 128, 12 );
@@ -524,6 +554,7 @@ ModalDialog DLG_PUBLISHING
Edit PAGE4_EMAIL_EDIT
{
+ HelpID = "sd:Edit:DLG_PUBLISHING:PAGE4_EMAIL_EDIT";
BORDER = TRUE ;
Pos = MAP_APPFONT ( 136 , 65 ) ;
Size = MAP_APPFONT ( 128 , 12 ) ;
@@ -539,6 +570,7 @@ ModalDialog DLG_PUBLISHING
Edit PAGE4_WWW_EDIT
{
+ HelpID = "sd:Edit:DLG_PUBLISHING:PAGE4_WWW_EDIT";
BORDER =