[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 318 commits - animations/prj animations/source sd/inc sd/prj sd/qa sd/sdi sd/source sd/uiconfig sd/util slideshow/prj slideshow/source slideshow/test slideshow/util
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Sat Mar 12 11:19:40 PST 2011
animations/prj/build.lst | 2
animations/prj/d.lst | 1
animations/source/animcore/animcore.component | 67
animations/source/animcore/factreg.cxx | 6
animations/source/animcore/makefile.mk | 9
sd/inc/Outliner.hxx | 38
sd/inc/anminfo.hxx | 20
sd/inc/app.hrc | 44
sd/inc/drawdoc.hxx | 155
sd/inc/glob.hrc | 2
sd/inc/glob.hxx | 8
sd/inc/helpids.h | 475 +-
sd/inc/pch/precompiled_sd.hxx | 6
sd/inc/sdabstdlg.hxx | 34
sd/inc/sdattr.hxx | 22
sd/inc/sdcommands.h | 310 +
sd/inc/sderror.hxx | 4
sd/inc/sdgrffilter.hxx | 2
sd/inc/sdhtmlfilter.hxx | 2
sd/inc/sdiocmpt.hxx | 20
sd/inc/sdmod.hxx | 16
sd/inc/sdpage.hxx | 80
sd/inc/sdresid.hxx | 2
sd/inc/sdxmlwrp.hxx | 4
sd/inc/shapelist.hxx | 2
sd/inc/stlpool.hxx | 2
sd/inc/stlsheet.hxx | 20
sd/inc/undo/undomanager.hxx | 20
sd/prj/build.lst | 4
sd/prj/d.lst | 2
sd/qa/unoapi/knownissues.xcl | 7
sd/sdi/SlideSorterController.sdi | 20
sd/sdi/ToolPanelViewShell.sdi | 177
sd/sdi/ViewShellBase.sdi | 213 -
sd/sdi/_drvwsh.sdi | 5
sd/sdi/sdraw.sdi | 391 +
sd/source/core/CustomAnimationPreset.cxx | 8
sd/source/core/anminfo.cxx | 16
sd/source/core/cusshow.cxx | 4
sd/source/core/drawdoc.cxx | 88
sd/source/core/drawdoc2.cxx | 271 -
sd/source/core/drawdoc3.cxx | 356 -
sd/source/core/drawdoc4.cxx | 124
sd/source/core/drawdoc_animations.cxx | 2
sd/source/core/pglink.cxx | 16
sd/source/core/sdattr.cxx | 14
sd/source/core/sdiocmpt.cxx | 14
sd/source/core/sdpage.cxx | 216 -
sd/source/core/sdpage2.cxx | 32
sd/source/core/shapelist.cxx | 38
sd/source/core/stlpool.cxx | 98
sd/source/core/stlsheet.cxx | 107
sd/source/core/undo/undomanager.cxx | 45
sd/source/core/undo/undoobjects.cxx | 6
sd/source/filter/cgm/sdcgmfilter.cxx | 10
sd/source/filter/eppt/eppt.cxx | 79
sd/source/filter/eppt/eppt.hxx | 6
sd/source/filter/eppt/epptdef.hxx | 2
sd/source/filter/eppt/epptso.cxx | 100
sd/source/filter/eppt/escherex.cxx | 34
sd/source/filter/eppt/escherex.hxx | 6
sd/source/filter/grf/sdgrffilter.cxx | 22
sd/source/filter/html/htmlex.cxx | 158
sd/source/filter/html/htmlex.hxx | 36
sd/source/filter/html/pubdlg.cxx | 150
sd/source/filter/html/pubdlg.src | 47
sd/source/filter/ppt/ppt97animations.cxx | 2
sd/source/filter/ppt/ppt97animations.hxx | 30
sd/source/filter/ppt/pptin.cxx | 230 -
sd/source/filter/ppt/pptin.hxx | 2
sd/source/filter/ppt/pptinanimations.cxx | 24
sd/source/filter/ppt/propread.cxx | 4
sd/source/filter/ppt/propread.hxx | 10
sd/source/filter/sdpptwrp.cxx | 8
sd/source/filter/xml/sdxmlwrp.cxx | 16
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 2
sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx | 4
sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx | 15
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 78
sd/source/ui/accessibility/AccessibleTreeNode.cxx | 25
sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 38
sd/source/ui/animations/CustomAnimationCreateDialog.src | 4
sd/source/ui/animations/CustomAnimationDialog.cxx | 96
sd/source/ui/animations/CustomAnimationDialog.hxx | 2
sd/source/ui/animations/CustomAnimationDialog.src | 41
sd/source/ui/animations/CustomAnimationList.cxx | 34
sd/source/ui/animations/CustomAnimationList.hxx | 8
sd/source/ui/animations/CustomAnimationPane.cxx | 70
sd/source/ui/animations/CustomAnimationPane.hxx | 4
sd/source/ui/animations/DialogListBox.cxx | 2
sd/source/ui/animations/SlideTransitionPane.cxx | 36
sd/source/ui/animations/motionpathtag.cxx | 70
sd/source/ui/animations/motionpathtag.hxx | 16
sd/source/ui/annotations/annotationmanager.cxx | 38
sd/source/ui/annotations/annotationmanagerimpl.hxx | 4
sd/source/ui/annotations/annotations.src | 29
sd/source/ui/annotations/annotationtag.cxx | 38
sd/source/ui/annotations/annotationtag.hxx | 10
sd/source/ui/annotations/annotationwindow.cxx | 24
sd/source/ui/annotations/annotationwindow.hxx | 2
sd/source/ui/app/accel_tmpl.src | 117
sd/source/ui/app/app.img | 120
sd/source/ui/app/makefile.mk | 1
sd/source/ui/app/menuids2_tmpl.src | 190
sd/source/ui/app/menuids3_tmpl.src | 38
sd/source/ui/app/menuids4_tmpl.src | 2
sd/source/ui/app/menuids_tmpl.src | 274 -
sd/source/ui/app/optsitem.cxx | 375 +
sd/source/ui/app/popup.src | 57
sd/source/ui/app/popup2_tmpl.src | 28
sd/source/ui/app/sdmod.cxx | 48
sd/source/ui/app/sdmod1.cxx | 70
sd/source/ui/app/sdmod2.cxx | 84
sd/source/ui/app/sdpopup.cxx | 24
sd/source/ui/app/sdresid.cxx | 2
sd/source/ui/app/sdxfer.cxx | 58
sd/source/ui/app/strings.src | 14
sd/source/ui/app/tbx_ww.src | 1123 -----
sd/source/ui/app/tbxww.cxx | 30
sd/source/ui/app/tmplctrl.cxx | 18
sd/source/ui/app/toolbox.src | 737 ---
sd/source/ui/controller/slidelayoutcontroller.cxx | 10
sd/source/ui/dlg/AnimationChildWindow.cxx | 4
sd/source/ui/dlg/LayerDialogChildWindow.cxx | 2
sd/source/ui/dlg/LayerDialogContent.cxx | 2
sd/source/ui/dlg/LayerTabBar.cxx | 34
sd/source/ui/dlg/NavigatorChildWindow.cxx | 2
sd/source/ui/dlg/PaneChildWindows.cxx | 14
sd/source/ui/dlg/PaneDockingWindow.cxx | 68
sd/source/ui/dlg/PaneDockingWindow.src | 6
sd/source/ui/dlg/SpellDialogChildWindow.cxx | 4
sd/source/ui/dlg/animobjs.cxx | 168
sd/source/ui/dlg/animobjs.src | 24
sd/source/ui/dlg/brkdlg.cxx | 10
sd/source/ui/dlg/brkdlg.src | 1
sd/source/ui/dlg/celltempl.cxx | 4
sd/source/ui/dlg/copydlg.cxx | 38
sd/source/ui/dlg/copydlg.src | 14
sd/source/ui/dlg/custsdlg.cxx | 92
sd/source/ui/dlg/custsdlg.src | 16
sd/source/ui/dlg/diactrl.cxx | 6
sd/source/ui/dlg/dlgass.cxx | 190
sd/source/ui/dlg/dlgass.src | 25
sd/source/ui/dlg/dlgassim.cxx | 26
sd/source/ui/dlg/dlgassim.hxx | 4
sd/source/ui/dlg/dlgchar.cxx | 2
sd/source/ui/dlg/dlgctrls.cxx | 8
sd/source/ui/dlg/dlgfield.cxx | 14
sd/source/ui/dlg/dlgfield.src | 5
sd/source/ui/dlg/dlgolbul.cxx | 36
sd/source/ui/dlg/dlgpage.cxx | 10
sd/source/ui/dlg/dlgsnap.cxx | 14
sd/source/ui/dlg/dlgsnap.src | 10
sd/source/ui/dlg/docprev.cxx | 16
sd/source/ui/dlg/filedlg.cxx | 20
sd/source/ui/dlg/gluectrl.cxx | 14
sd/source/ui/dlg/headerfooterdlg.cxx | 47
sd/source/ui/dlg/headerfooterdlg.src | 14
sd/source/ui/dlg/ins_paste.cxx | 4
sd/source/ui/dlg/ins_paste.src | 3
sd/source/ui/dlg/inspagob.cxx | 8
sd/source/ui/dlg/inspagob.src | 4
sd/source/ui/dlg/layeroptionsdlg.src | 9
sd/source/ui/dlg/masterlayoutdlg.cxx | 4
sd/source/ui/dlg/masterlayoutdlg.src | 5
sd/source/ui/dlg/morphdlg.cxx | 8
sd/source/ui/dlg/morphdlg.src | 8
sd/source/ui/dlg/navigatr.cxx | 130
sd/source/ui/dlg/navigatr.src | 5
sd/source/ui/dlg/paragr.cxx | 24
sd/source/ui/dlg/paragr.src | 6
sd/source/ui/dlg/present.cxx | 28
sd/source/ui/dlg/present.src | 19
sd/source/ui/dlg/prltempl.cxx | 16
sd/source/ui/dlg/prntopts.cxx | 17
sd/source/ui/dlg/prntopts.src | 18
sd/source/ui/dlg/sddlgfact.cxx | 50
sd/source/ui/dlg/sddlgfact.hxx | 46
sd/source/ui/dlg/sdpreslt.cxx | 42
sd/source/ui/dlg/sdpreslt.src | 7
sd/source/ui/dlg/sdtreelb.cxx | 143
sd/source/ui/dlg/tabtempl.cxx | 4
sd/source/ui/dlg/tpaction.cxx | 91
sd/source/ui/dlg/tpaction.src | 16
sd/source/ui/dlg/tpoption.cxx | 90
sd/source/ui/dlg/tpoption.src | 19
sd/source/ui/dlg/unchss.cxx | 2
sd/source/ui/dlg/vectdlg.cxx | 41
sd/source/ui/dlg/vectdlg.src | 11
sd/source/ui/docshell/docshel2.cxx | 34
sd/source/ui/docshell/docshel3.cxx | 8
sd/source/ui/docshell/docshel4.cxx | 98
sd/source/ui/docshell/docshell.cxx | 48
sd/source/ui/docshell/grdocsh.cxx | 4
sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx | 3
sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx | 2
sd/source/ui/framework/configuration/ConfigurationUpdater.hxx | 6
sd/source/ui/framework/factories/BasicPaneFactory.cxx | 2
sd/source/ui/framework/factories/BasicViewFactory.cxx | 18
sd/source/ui/framework/factories/BasicViewFactory.hxx | 6
sd/source/ui/framework/factories/ChildWindowPane.cxx | 12
sd/source/ui/framework/factories/ChildWindowPane.hxx | 4
sd/source/ui/framework/factories/FullScreenPane.cxx | 4
sd/source/ui/framework/factories/Pane.cxx | 2
sd/source/ui/framework/tools/FrameworkHelper.cxx | 25
sd/source/ui/func/bulmaper.cxx | 12
sd/source/ui/func/fuarea.cxx | 2
sd/source/ui/func/fubullet.cxx | 28
sd/source/ui/func/fuchar.cxx | 12
sd/source/ui/func/fucon3d.cxx | 28
sd/source/ui/func/fuconarc.cxx | 44
sd/source/ui/func/fuconbez.cxx | 44
sd/source/ui/func/fuconcs.cxx | 18
sd/source/ui/func/fuconrec.cxx | 54
sd/source/ui/func/fuconstr.cxx | 156
sd/source/ui/func/fuconuno.cxx | 28
sd/source/ui/func/fucopy.cxx | 64
sd/source/ui/func/fucushow.cxx | 4
sd/source/ui/func/fudraw.cxx | 186
sd/source/ui/func/fudspord.cxx | 12
sd/source/ui/func/fuediglu.cxx | 56
sd/source/ui/func/fuexpand.cxx | 51
sd/source/ui/func/fuformatpaintbrush.cxx | 46
sd/source/ui/func/fuhhconv.cxx | 20
sd/source/ui/func/fuinsert.cxx | 23
sd/source/ui/func/fuinsfil.cxx | 100
sd/source/ui/func/fuline.cxx | 4
sd/source/ui/func/fulinend.cxx | 14
sd/source/ui/func/fumorph.cxx | 30
sd/source/ui/func/fuoaprms.cxx | 70
sd/source/ui/func/fuolbull.cxx | 4
sd/source/ui/func/fuoltext.cxx | 28
sd/source/ui/func/fuoutl.cxx | 6
sd/source/ui/func/fupage.cxx | 99
sd/source/ui/func/fuparagr.cxx | 4
sd/source/ui/func/fupoor.cxx | 102
sd/source/ui/func/fuprlout.cxx | 36
sd/source/ui/func/fuprobjs.cxx | 14
sd/source/ui/func/fuscale.cxx | 12
sd/source/ui/func/fusearch.cxx | 14
sd/source/ui/func/fusel.cxx | 214 -
sd/source/ui/func/fusldlg.cxx | 10
sd/source/ui/func/fusnapln.cxx | 22
sd/source/ui/func/fusumry.cxx | 28
sd/source/ui/func/futempl.cxx | 54
sd/source/ui/func/futext.cxx | 201
sd/source/ui/func/futransf.cxx | 2
sd/source/ui/func/futxtatt.cxx | 2
sd/source/ui/func/fuzoom.cxx | 30
sd/source/ui/func/sdundogr.cxx | 16
sd/source/ui/func/smarttag.cxx | 34
sd/source/ui/func/unprlout.cxx | 8
sd/source/ui/inc/3dchld.hxx | 2
sd/source/ui/inc/AccessibleOutlineEditSource.hxx | 2
sd/source/ui/inc/AccessibleSlideView.hxx | 2
sd/source/ui/inc/AccessibleTreeNode.hxx | 24
sd/source/ui/inc/AccessibleViewForwarder.hxx | 4
sd/source/ui/inc/AnimationChildWindow.hxx | 2
sd/source/ui/inc/BreakDlg.hxx | 6
sd/source/ui/inc/DrawDocShell.hxx | 73
sd/source/ui/inc/DrawViewShell.hxx | 77
sd/source/ui/inc/FrameView.hxx | 86
sd/source/ui/inc/GraphicDocShell.hxx | 4
sd/source/ui/inc/GraphicObjectBar.hxx | 2
sd/source/ui/inc/LayerDialogChildWindow.hxx | 2
sd/source/ui/inc/LayerDialogContent.hxx | 2
sd/source/ui/inc/NavigatorChildWindow.hxx | 2
sd/source/ui/inc/NotesChildWindow.hxx | 2
sd/source/ui/inc/OutlineBulletDlg.hxx | 4
sd/source/ui/inc/OutlineView.hxx | 24
sd/source/ui/inc/OutlineViewShell.hxx | 22
sd/source/ui/inc/PaneChildWindows.hxx | 12
sd/source/ui/inc/PaneDockingWindow.hxx | 20
sd/source/ui/inc/PresentationViewShell.hxx | 4
sd/source/ui/inc/PreviewRenderer.hxx | 16
sd/source/ui/inc/Ruler.hxx | 6
sd/source/ui/inc/SlideSorter.hxx | 33
sd/source/ui/inc/SlideSorterChildWindow.hxx | 2
sd/source/ui/inc/SlideSorterViewShell.hxx | 21
sd/source/ui/inc/SlideView.hxx | 48
sd/source/ui/inc/SlideViewShell.hxx | 24
sd/source/ui/inc/SpellDialogChildWindow.hxx | 2
sd/source/ui/inc/TabControl.hxx | 2
sd/source/ui/inc/View.hxx | 54
sd/source/ui/inc/ViewClipboard.hxx | 6
sd/source/ui/inc/ViewShell.hxx | 113
sd/source/ui/inc/ViewShellBase.hxx | 30
sd/source/ui/inc/ViewTabControl.hxx | 2
sd/source/ui/inc/Window.hxx | 11
sd/source/ui/inc/animobjs.hrc | 3
sd/source/ui/inc/animobjs.hxx | 19
sd/source/ui/inc/celltempl.hxx | 2
sd/source/ui/inc/copydlg.hxx | 6
sd/source/ui/inc/custsdlg.hxx | 10
sd/source/ui/inc/diactrl.hxx | 4
sd/source/ui/inc/dlg_char.hxx | 2
sd/source/ui/inc/dlgass.hxx | 8
sd/source/ui/inc/dlgfield.hxx | 2
sd/source/ui/inc/dlgpage.hxx | 6
sd/source/ui/inc/dlgsnap.hxx | 4
sd/source/ui/inc/docprev.hxx | 2
sd/source/ui/inc/drawview.hxx | 10
sd/source/ui/inc/framework/FrameworkHelper.hxx | 13
sd/source/ui/inc/fucon3d.hxx | 8
sd/source/ui/inc/fuconarc.hxx | 8
sd/source/ui/inc/fuconbez.hxx | 14
sd/source/ui/inc/fuconcs.hxx | 8
sd/source/ui/inc/fuconrec.hxx | 8
sd/source/ui/inc/fuconstr.hxx | 10
sd/source/ui/inc/fuconuno.hxx | 12
sd/source/ui/inc/fudraw.hxx | 24
sd/source/ui/inc/fudspord.hxx | 6
sd/source/ui/inc/fuediglu.hxx | 10
sd/source/ui/inc/fuformatpaintbrush.hxx | 12
sd/source/ui/inc/fuhhconv.hxx | 8
sd/source/ui/inc/fuinsfil.hxx | 4
sd/source/ui/inc/fumorph.hxx | 2
sd/source/ui/inc/fuoltext.hxx | 8
sd/source/ui/inc/fuoutl.hxx | 2
sd/source/ui/inc/fupoor.hxx | 34
sd/source/ui/inc/fusearch.hxx | 2
sd/source/ui/inc/fusel.hxx | 26
sd/source/ui/inc/fuslid.hxx | 6
sd/source/ui/inc/futext.hxx | 18
sd/source/ui/inc/fuzoom.hxx | 12
sd/source/ui/inc/gluectrl.hxx | 6
sd/source/ui/inc/ins_paste.hxx | 2
sd/source/ui/inc/inspagob.hxx | 6
sd/source/ui/inc/masterlayoutdlg.hxx | 8
sd/source/ui/inc/morphdlg.hxx | 8
sd/source/ui/inc/navigatr.hrc | 7
sd/source/ui/inc/navigatr.hxx | 26
sd/source/ui/inc/optdlg.hxx | 2
sd/source/ui/inc/optsitem.hxx | 543 +-
sd/source/ui/inc/prltempl.hxx | 10
sd/source/ui/inc/prntopts.hxx | 2
sd/source/ui/inc/pubdlg.hxx | 10
sd/source/ui/inc/sdtreelb.hxx | 25
sd/source/ui/inc/sdundogr.hxx | 4
sd/source/ui/inc/sdxfer.hxx | 26
sd/source/ui/inc/smarttag.hxx | 22
sd/source/ui/inc/sprite.hxx | 8
sd/source/ui/inc/strings.hrc | 3
sd/source/ui/inc/tabtempl.hxx | 8
sd/source/ui/inc/taskpane/ControlContainer.hxx | 14
sd/source/ui/inc/taskpane/ScrollPanel.hxx | 6
sd/source/ui/inc/taskpane/SubToolPanel.hxx | 1
sd/source/ui/inc/taskpane/TitleBar.hxx | 2
sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 5
sd/source/ui/inc/tbx_ww.hxx | 8
sd/source/ui/inc/tmplctrl.hxx | 4
sd/source/ui/inc/tools/IconCache.hxx | 2
sd/source/ui/inc/tpaction.hrc | 3
sd/source/ui/inc/tpaction.hxx | 10
sd/source/ui/inc/tpoption.hxx | 14
sd/source/ui/inc/undopage.hxx | 80
sd/source/ui/inc/unmodpg.hxx | 15
sd/source/ui/inc/unoaprms.hxx | 64
sd/source/ui/inc/unprlout.hxx | 4
sd/source/ui/inc/vectdlg.hxx | 2
sd/source/ui/inc/view/viewoverlaymanager.hxx | 2
sd/source/ui/inc/zoomlist.hxx | 6
sd/source/ui/notes/EditWindow.cxx | 50
sd/source/ui/notes/EditWindow.hxx | 8
sd/source/ui/notes/NotesChildWindow.cxx | 2
sd/source/ui/notes/NotesChildWindow.src | 3
sd/source/ui/notes/TextLogger.cxx | 2
sd/source/ui/presenter/CanvasUpdateRequester.hxx | 2
sd/source/ui/presenter/PresenterHelper.cxx | 6
sd/source/ui/presenter/PresenterPreviewCache.cxx | 11
sd/source/ui/presenter/PresenterTextView.cxx | 18
sd/source/ui/slideshow/makefile.mk | 3
sd/source/ui/slideshow/showwin.cxx | 62
sd/source/ui/slideshow/showwindow.hxx | 14
sd/source/ui/slideshow/slideshow.cxx | 23
sd/source/ui/slideshow/slideshow.hrc | 33
sd/source/ui/slideshow/slideshow.src | 70
sd/source/ui/slideshow/slideshowimpl.cxx | 633 +--
sd/source/ui/slideshow/slideshowimpl.hxx | 14
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx | 152
sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx | 44
sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx | 81
sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx | 28
sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx | 41
sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx | 6
sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx | 141
sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx | 66
sd/source/ui/slidesorter/cache/SlsPageCache.cxx | 64
sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx | 51
sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 18
sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx | 8
sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx | 46
sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx | 2
sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx | 2
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 359 +
sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx | 294 +
sd/source/ui/slidesorter/controller/SlsAnimator.cxx | 299 +
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 370 +
sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx | 149
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx | 199
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx | 100
sd/source/ui/slidesorter/controller/SlsFocusManager.cxx | 136
sd/source/ui/slidesorter/controller/SlsHideSlideFunction.cxx | 8
sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx | 327 +
sd/source/ui/slidesorter/controller/SlsListener.cxx | 139
sd/source/ui/slidesorter/controller/SlsListener.hxx | 11
sd/source/ui/slidesorter/controller/SlsPageSelector.cxx | 254 +
sd/source/ui/slidesorter/controller/SlsProperties.cxx | 46
sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx | 422 +-
sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx | 2
sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx | 2
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 2039 ++++++----
sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx | 413 --
sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx | 173
sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx | 14
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 567 +-
sd/source/ui/slidesorter/controller/SlsTransferable.cxx | 17
sd/source/ui/slidesorter/controller/SlsTransferable.hxx | 73
sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx | 305 +
sd/source/ui/slidesorter/controller/makefile.mk | 14
sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx | 4
sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx | 61
sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx | 13
sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx | 46
sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx | 180
sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx | 61
sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx | 39
sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx | 29
sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx | 20
sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx | 153
sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx | 124
sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx | 16
sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx | 70
sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx | 145
sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx | 88
sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx | 85
sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx | 6
sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx | 25
sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx | 87
sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx | 100
sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx | 72
sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx | 128
sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx | 101
sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx | 214 -
sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx | 362 +
sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx | 60
sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx | 71
sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx | 131
sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx | 334 -
sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx | 145
sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx | 138
sd/source/ui/slidesorter/inc/view/SlsResource.hrc | 111
sd/source/ui/slidesorter/inc/view/SlsTheme.hxx | 236 +
sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx | 97
sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx | 276 -
sd/source/ui/slidesorter/model/SlideSorterModel.cxx | 407 +
sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx | 240 -
sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx | 4
sd/source/ui/slidesorter/model/SlsVisualState.cxx | 236 +
sd/source/ui/slidesorter/model/makefile.mk | 1
sd/source/ui/slidesorter/shell/SlideSorter.cxx | 141
sd/source/ui/slidesorter/shell/SlideSorterChildWindow.cxx | 4
sd/source/ui/slidesorter/shell/SlideSorterService.cxx | 60
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 124
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 1051 +++--
sd/source/ui/slidesorter/view/SlsButtonBar.cxx | 1558 +++++++
sd/source/ui/slidesorter/view/SlsFontProvider.cxx | 2
sd/source/ui/slidesorter/view/SlsFramePainter.cxx | 265 +
sd/source/ui/slidesorter/view/SlsFramePainter.hxx | 121
sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx | 537 ++
sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 448 ++
sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx | 565 ++
sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx | 99
sd/source/ui/slidesorter/view/SlsLayouter.cxx | 1692 ++++++--
sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx | 287 +
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx | 584 ++
sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx | 128
sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx | 1402 ------
sd/source/ui/slidesorter/view/SlsResource.hxx | 50
sd/source/ui/slidesorter/view/SlsResource.src | 314 +
sd/source/ui/slidesorter/view/SlsTheme.cxx | 536 ++
sd/source/ui/slidesorter/view/SlsToolTip.cxx | 230 +
sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx | 30
sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx | 14
sd/source/ui/slidesorter/view/SlsViewOverlay.cxx | 609 --
sd/source/ui/slidesorter/view/makefile.mk | 32
sd/source/ui/table/TableDesignPane.cxx | 32
sd/source/ui/table/TableDesignPane.src | 1
sd/source/ui/table/tablefunction.cxx | 2
sd/source/ui/table/tableobjectbar.cxx | 10
sd/source/ui/toolpanel/ControlContainer.cxx | 61
sd/source/ui/toolpanel/LayoutMenu.cxx | 38
sd/source/ui/toolpanel/LayoutMenu.hxx | 2
sd/source/ui/toolpanel/ScrollPanel.cxx | 33
sd/source/ui/toolpanel/SubToolPanel.cxx | 29
sd/source/ui/toolpanel/TaskPaneTreeNode.cxx | 2
sd/source/ui/toolpanel/TestMenu.cxx | 10
sd/source/ui/toolpanel/TestPanel.cxx | 6
sd/source/ui/toolpanel/TitleBar.cxx | 16
sd/source/ui/toolpanel/ToolPanel.cxx | 2
sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 48
sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx | 12
sd/source/ui/toolpanel/controls/DocumentHelper.cxx | 48
sd/source/ui/toolpanel/controls/DocumentHelper.hxx | 2
sd/source/ui/toolpanel/controls/MasterPageContainer.cxx | 4
sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx | 8
sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx | 2
sd/source/ui/toolpanel/controls/MasterPageObserver.cxx | 8
sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx | 19
sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx | 38
sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx | 13
sd/source/ui/toolpanel/controls/PreviewValueSet.cxx | 16
sd/source/ui/toolpanel/controls/PreviewValueSet.hxx | 4
sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx | 6
sd/source/ui/tools/IconCache.cxx | 8
sd/source/ui/tools/PreviewRenderer.cxx | 193
sd/source/ui/unoidl/DrawController.cxx | 18
sd/source/ui/unoidl/SdUnoDrawView.cxx | 2
sd/source/ui/unoidl/SdUnoSlideView.cxx | 24
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 38
sd/source/ui/unoidl/detreg.cxx | 24
sd/source/ui/unoidl/facreg.cxx | 109
sd/source/ui/unoidl/sddetect.cxx | 28
sd/source/ui/unoidl/unocpres.hxx | 2
sd/source/ui/unoidl/unodoc.cxx | 4
sd/source/ui/unoidl/unolayer.cxx | 6
sd/source/ui/unoidl/unomodel.cxx | 20
sd/source/ui/unoidl/unoobj.cxx | 6
sd/source/ui/unoidl/unopage.cxx | 40
sd/source/ui/unoidl/unopool.cxx | 2
sd/source/ui/unoidl/unosrch.cxx | 4
sd/source/ui/view/DocumentRenderer.cxx | 202
sd/source/ui/view/DocumentRenderer.hrc | 15
sd/source/ui/view/DocumentRenderer.src | 94
sd/source/ui/view/GraphicObjectBar.cxx | 4
sd/source/ui/view/GraphicViewShellBase.cxx | 10
sd/source/ui/view/ImpressViewShellBase.cxx | 10
sd/source/ui/view/MediaObjectBar.cxx | 4
sd/source/ui/view/OutlineViewShellBase.cxx | 8
sd/source/ui/view/Outliner.cxx | 142
sd/source/ui/view/OutlinerIterator.cxx | 4
sd/source/ui/view/PresentationViewShellBase.cxx | 9
sd/source/ui/view/SlideSorterViewShellBase.cxx | 8
sd/source/ui/view/ToolBarManager.cxx | 4
sd/source/ui/view/ViewClipboard.cxx | 42
sd/source/ui/view/ViewShellBase.cxx | 94
sd/source/ui/view/ViewShellImplementation.cxx | 52
sd/source/ui/view/ViewShellManager.cxx | 21
sd/source/ui/view/ViewTabBar.cxx | 14
sd/source/ui/view/drawview.cxx | 62
sd/source/ui/view/drbezob.cxx | 26
sd/source/ui/view/drtxtob.cxx | 80
sd/source/ui/view/drtxtob1.cxx | 52
sd/source/ui/view/drviews1.cxx | 146
sd/source/ui/view/drviews2.cxx | 111
sd/source/ui/view/drviews3.cxx | 52
sd/source/ui/view/drviews4.cxx | 66
sd/source/ui/view/drviews5.cxx | 40
sd/source/ui/view/drviews6.cxx | 64
sd/source/ui/view/drviews7.cxx | 232 -
sd/source/ui/view/drviews8.cxx | 21
sd/source/ui/view/drviews9.cxx | 114
sd/source/ui/view/drviewsa.cxx | 75
sd/source/ui/view/drviewsb.cxx | 112
sd/source/ui/view/drviewsc.cxx | 55
sd/source/ui/view/drviewsd.cxx | 26
sd/source/ui/view/drviewse.cxx | 104
sd/source/ui/view/drviewsf.cxx | 40
sd/source/ui/view/drviewsg.cxx | 14
sd/source/ui/view/drviewsh.cxx | 4
sd/source/ui/view/drviewsi.cxx | 14
sd/source/ui/view/drviewsj.cxx | 68
sd/source/ui/view/frmview.cxx | 46
sd/source/ui/view/outlnvs2.cxx | 18
sd/source/ui/view/outlnvsh.cxx | 347 -
sd/source/ui/view/outlview.cxx | 270 -
sd/source/ui/view/presvish.cxx | 6
sd/source/ui/view/sdruler.cxx | 16
sd/source/ui/view/sdview.cxx | 98
sd/source/ui/view/sdview2.cxx | 118
sd/source/ui/view/sdview3.cxx | 141
sd/source/ui/view/sdview4.cxx | 24
sd/source/ui/view/sdwindow.cxx | 58
sd/source/ui/view/tabcontr.cxx | 40
sd/source/ui/view/unmodpg.cxx | 24
sd/source/ui/view/viewoverlaymanager.cxx | 24
sd/source/ui/view/viewshe2.cxx | 56
sd/source/ui/view/viewshe3.cxx | 64
sd/source/ui/view/viewshel.cxx | 119
sd/source/ui/view/zoomlist.cxx | 24
sd/util/exports.dxp | 1
sd/util/hidother.src | 26
sd/util/makefile.mk | 18
sd/util/sd.component | 102
sd/util/sdd.component | 34
slideshow/prj/build.lst | 2
slideshow/prj/d.lst | 2
slideshow/source/engine/OGLTrans/exports.dxp | 1
slideshow/source/engine/OGLTrans/ogltrans.component | 34
slideshow/source/engine/OGLTrans/win/makefile.mk | 8
slideshow/source/engine/makefile.mk | 2
slideshow/source/engine/shapes/gdimtftools.cxx | 12
slideshow/source/engine/shapes/shapeimporter.cxx | 11
slideshow/source/engine/shapes/viewmediashape.cxx | 30
slideshow/source/engine/shapes/viewmediashape.hxx | 7
slideshow/source/engine/slide/layermanager.hxx | 4
slideshow/source/engine/slide/slideimpl.cxx | 52
slideshow/source/engine/slide/userpaintoverlay.cxx | 91
slideshow/source/engine/slide/userpaintoverlay.hxx | 9
slideshow/source/engine/slideshowimpl.cxx | 54
slideshow/source/inc/slide.hxx | 7
slideshow/test/demoshow.cxx | 8
slideshow/util/exports.dxp | 1
slideshow/util/makefile.mk | 8
slideshow/util/makefile.pmk | 2
slideshow/util/slideshow.component | 34
616 files changed, 26517 insertions(+), 17832 deletions(-)
New commits:
commit 903915d68dc78ab43671204f7831d1bde39bed00
Merge: a72074b... da90406...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Mar 12 20:06:58 2011 +0100
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
diff --cc animations/source/animcore/makefile.mk
index c2a1071,674858c..9c6b4a2
--- a/animations/source/animcore/makefile.mk
+++ b/animations/source/animcore/makefile.mk
@@@ -63,5 -66,13 +63,12 @@@ DEF1NAME= $(SHL1TARGET
.ENDIF # L10N_framework
# --- Targets ------------------------------------------------------
-
.INCLUDE : target.mk
+
-
+ ALLTAR : $(MISC)/animcore.component
+
+ $(MISC)/animcore.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ animcore.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt animcore.component
diff --cc sd/inc/Outliner.hxx
index ded3595,79dd683..1e9d0cd
mode 100644,100755..100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
diff --cc sd/inc/anminfo.hxx
index c5bfb41,74cb27a..cbbb9e2
mode 100644,100755..100755
--- a/sd/inc/anminfo.hxx
+++ b/sd/inc/anminfo.hxx
@@@ -69,10 -68,11 +69,10 @@@ public
::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
-// String maBookmark; // Sprung zu Objekt/Seite
+ sal_uInt16 mnVerb; // fuer OLE-Objekt
+ sal_uLong mnPresOrder;
SdrObject& mrObject;
SD_DLLPUBLIC void SetBookmark( const String& rBookmark );
diff --cc sd/inc/app.hrc
index b80afb6,03b22b3..19bc3bd
mode 100644,100755..100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
diff --cc sd/inc/drawdoc.hxx
index 83b2786,13286b3..ad9e72e
mode 100644,100755..100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@@ -446,10 -447,10 +446,10 @@@ 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,
- FASTBOOL bMergeMasterPages=sal_False, FASTBOOL bAllMasterPages=sal_False,
- FASTBOOL bUndo=sal_True, FASTBOOL bTreadSourceAsConst=sal_False);
+ bool bMergeMasterPages = false, bool bAllMasterPages = false,
+ bool bUndo = true, bool bTreadSourceAsConst = false);
SD_DLLPUBLIC ::com::sun::star::text::WritingMode GetDefaultWritingMode() const;
void SetDefaultWritingMode( ::com::sun::star::text::WritingMode eMode );
@@@ -656,10 -668,11 +667,10 @@@ private
SdPage* pPreviousPage,
SdPage* pPage,
const String& sPageName,
- USHORT nInsertionPoint,
- BOOL bIsPageBack,
- BOOL bIsPageObj);
+ sal_uInt16 nInsertionPoint,
+ sal_Bool bIsPageBack,
+ sal_Bool bIsPageObj);
- // #109538#
virtual void PageListChanged();
virtual void MasterPageListChanged();
};
diff --cc sd/inc/glob.hxx
index 8264dca,1456271..ca24946
mode 100644,100755..100644
--- a/sd/inc/glob.hxx
+++ b/sd/inc/glob.hxx
diff --cc sd/inc/helpids.h
index 41d2c34,550fba2..06d2b75
mode 100644,100755..100755
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@@ -25,259 -24,228 +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: */
diff --cc sd/inc/pch/precompiled_sd.hxx
index 6b3ed86,b663187..8c8f7f0
mode 100644,100755..100755
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@@ -901,13 -900,15 +899,13 @@@
#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 "vos/diagnose.hxx"
-#include "vos/module.hxx"
-#include "vos/mutex.hxx"
-#include "vos/process.hxx"
-#include "vos/thread.hxx"
-#include "vos/xception.hxx"
+#include "osl/diagnose.h"
+#include "osl/module.hxx"
+#include "osl/mutex.hxx"
+#include "osl/process.h"
//---MARKER---
#endif
diff --cc sd/inc/sdabstdlg.hxx
index 8d75a56,84e6fd7..d1cede9
mode 100644,100755..100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
diff --cc sd/inc/sdattr.hxx
index 4f1ad34,f4a28b7..a328ff8
mode 100644,100755..100755
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.hxx
diff --cc sd/inc/sderror.hxx
index 3957f53,242e385..9f10fc5
mode 100644,100755..100755
--- a/sd/inc/sderror.hxx
+++ b/sd/inc/sderror.hxx
@@@ -50,12 -49,12 +50,12 @@@
#ifndef __RSC
- inline bool IsWarning( ULONG nErr )
-inline FASTBOOL IsWarning( sal_uLong nErr )
++inline bool IsWarning( sal_uLong nErr )
{
return 0 != ( nErr & ERRCODE_WARNING_MASK & nErr );
}
- inline bool IsError( ULONG nErr )
-inline FASTBOOL IsError( sal_uLong nErr )
++inline bool IsError( sal_uLong nErr )
{
return nErr && 0 == ( ERRCODE_WARNING_MASK & nErr );
}
diff --cc sd/inc/sdgrffilter.hxx
index 70cbdc3,a92bc0a..e2d1ca1
mode 100644,100755..100755
--- a/sd/inc/sdgrffilter.hxx
+++ b/sd/inc/sdgrffilter.hxx
diff --cc sd/inc/sdhtmlfilter.hxx
index 64ae3a9,34e2ac6..5b4427d
mode 100644,100755..100755
--- a/sd/inc/sdhtmlfilter.hxx
+++ b/sd/inc/sdhtmlfilter.hxx
diff --cc sd/inc/sdiocmpt.hxx
index 7e71ea5,904168e..e43d428
mode 100644,100755..100755
--- a/sd/inc/sdiocmpt.hxx
+++ b/sd/inc/sdiocmpt.hxx
diff --cc sd/inc/sdmod.hxx
index 4fe7851,74a10b7..6ffac8b
mode 100644,100755..100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
diff --cc sd/inc/sdpage.hxx
index 348cd65,0b894c8..6b018b8
mode 100644,100755..100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@@ -179,13 -182,13 +179,13 @@@ public
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 FASTBOOL IsReadOnly() const;
+ virtual bool IsReadOnly() const;
sd::ShapeList& GetPresentationShapeList() { return maPresentationShapeList; }
@@@ -208,20 -211,20 +208,20 @@@
/** 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);
- // #95876# Also overload ReplaceObject methods to realize when
+ // 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);
diff --cc sd/inc/sdresid.hxx
index f75cfaa,4408a52..123de1c
mode 100644,100755..100755
--- a/sd/inc/sdresid.hxx
+++ b/sd/inc/sdresid.hxx
diff --cc sd/inc/sdxmlwrp.hxx
index 0ca8aa1,c0ba807..4ae0e46
mode 100644,100755..100755
--- a/sd/inc/sdxmlwrp.hxx
+++ b/sd/inc/sdxmlwrp.hxx
diff --cc sd/inc/shapelist.hxx
index 4896d06,87d6c21..e0af951
mode 100644,100755..100644
--- a/sd/inc/shapelist.hxx
+++ b/sd/inc/shapelist.hxx
diff --cc sd/inc/stlpool.hxx
index bbf4ff8,4fe4cfe..6ef2f25
mode 100644,100755..100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
diff --cc sd/inc/stlsheet.hxx
index d7d7c6e,2037d0e..c6693d6
mode 100644,100755..100755
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
diff --cc sd/inc/undo/undomanager.hxx
index 75ad9e4,874a4c8..bd7f3c1
mode 100644,100755..100755
--- a/sd/inc/undo/undomanager.hxx
+++ b/sd/inc/undo/undomanager.hxx
diff --cc sd/prj/build.lst
index 43af376,72ee277..291603c
--- a/sd/prj/build.lst
+++ b/sd/prj/build.lst
@@@ -1,4 -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 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
diff --cc sd/sdi/SlideSorterController.sdi
index 00a3f73,2077b62..ba3667e
mode 100644,100755..100755
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
diff --cc sd/source/core/CustomAnimationPreset.cxx
index ccd9843,0fed13b..822d85c
mode 100644,100755..100755
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
diff --cc sd/source/core/anminfo.cxx
index fd33ec4,4ae58fb..27e198c
mode 100644,100755..100755
--- a/sd/source/core/anminfo.cxx
+++ b/sd/source/core/anminfo.cxx
diff --cc sd/source/core/cusshow.cxx
index 455bcee,79bda9e..ad7d2b3
mode 100644,100755..100644
--- a/sd/source/core/cusshow.cxx
+++ b/sd/source/core/cusshow.cxx
diff --cc sd/source/core/drawdoc.cxx
index 5162659,a7e05ec..40e5e55
mode 100644,100755..100755
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@@ -345,7 -348,7 +345,7 @@@ SdDrawDocument::SdDrawDocument(Document
*
* Es werden auf Pages und MasterPages folgende Default-Layer angelegt:
*
-- * Layer STR_LAYOUT : Standardlayer fr 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 -356,7 +353,7 @@@
* Layer STR_BCKGRNDOBJ: Objekte auf dem Hintergrund der MasterPage
* (auf normalen Pages z.Z. keine Verwendung)
*
-- * Layer STR_CONTROLS : Standardlayer fr Controls
++ * Layer STR_CONTROLS : Standardlayer f�r Controls
*
**************************************************************************/
{
@@@ -396,8 -399,9 +396,8 @@@ SdDrawDocument::~SdDrawDocument(
mpOnlineSearchItem = NULL;
CloseBookmarkDoc();
- SetAllocDocSh(FALSE);
+ SetAllocDocSh(sal_False);
- // #116168#
ClearModel(sal_True);
if (pLinkManager)
@@@ -676,9 -680,9 +676,9 @@@ void SdDrawDocument::NewOrLoadCompleted
// Praesentationsobjekte muessen wieder Listener der entsprechenden
// Vorlagen werden
SdStyleSheetPool* pSPool = (SdStyleSheetPool*) GetStyleSheetPool();
- USHORT nPage, nPageCount;
+ sal_uInt16 nPage, nPageCount;
- // #96323# create missing layout style sheets for broken documents
+ // create missing layout style sheets for broken documents
// that where created with the 5.2
nPageCount = GetMasterSdPageCount( PK_STANDARD );
for (nPage = 0; nPage < nPageCount; nPage++)
@@@ -791,9 -807,9 +791,9 @@@ void SdDrawDocument::NewOrLoadCompleted
{
pObj->StartListening(*pSheet);
- if( nSheet == 0)
+ if( iter == aOutlineList.begin())
// Textrahmen hoert auf StyleSheet der Ebene1
- pObj->NbcSetStyleSheet(pSheet, TRUE);
+ pObj->NbcSetStyleSheet(pSheet, sal_True);
}
}
}
diff --cc sd/source/core/drawdoc2.cxx
index 0da7d93,ae3742d..bd306a9
mode 100644,100755..100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@@ -209,23 -210,52 +209,23 @@@ sal_uInt16 SdDrawDocument::GetPageByNam
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
{
- // #109538#
return (sal_uInt16)mpMasterPageListWatcher->GetSdPageCount(ePgKind);
}
@@@ -538,7 -568,8 +538,7 @@@ void SdDrawDocument::CreateFirstPages(
/**********************************************************************
* Handzettel-Seite einfuegen
**********************************************************************/
- SdPage* pHandoutPage = dynamic_cast< SdPage* >( AllocPage(FALSE) );
- sal_Bool bMasterPage;
- SdPage* pHandoutPage = dynamic_cast< SdPage* >( AllocPage(bMasterPage=sal_False) );
++ SdPage* pHandoutPage = dynamic_cast< SdPage* >( AllocPage(sal_False) );
SdPage* pRefPage = NULL;
@@@ -563,7 -594,7 +563,7 @@@
/**********************************************************************
* MasterPage einfuegen und an der Handzettel-Seite vermerken
**********************************************************************/
- SdPage* pHandoutMPage = (SdPage*) AllocPage(TRUE);
- SdPage* pHandoutMPage = (SdPage*) AllocPage(bMasterPage=sal_True);
++ SdPage* pHandoutMPage = (SdPage*) AllocPage(sal_True);
pHandoutMPage->SetSize( pHandoutPage->GetSize() );
pHandoutMPage->SetPageKind(PK_HANDOUT);
pHandoutMPage->SetBorder( pHandoutPage->GetLftBorder(),
@@@ -586,7 -617,7 +586,7 @@@
if (nPageCount == 0)
{
- pPage = dynamic_cast< SdPage* >( AllocPage(FALSE) );
- pPage = dynamic_cast< SdPage* >( AllocPage(bMasterPage=sal_False) );
++ pPage = dynamic_cast< SdPage* >( AllocPage(sal_False) );
if( pRefPage )
{
@@@ -642,7 -673,7 +642,7 @@@
/**********************************************************************
* MasterPage einfuegen und an der Seite vermerken
**********************************************************************/
- SdPage* pMPage = (SdPage*) AllocPage(TRUE);
- SdPage* pMPage = (SdPage*) AllocPage(bMasterPage=sal_True);
++ SdPage* pMPage = (SdPage*) AllocPage(sal_True);
pMPage->SetSize( pPage->GetSize() );
pMPage->SetBorder( pPage->GetLftBorder(),
pPage->GetUppBorder(),
@@@ -656,7 -687,7 +656,7 @@@
/**********************************************************************
* Notizen-Seite einfuegen
**********************************************************************/
- SdPage* pNotesPage = (SdPage*) AllocPage(FALSE);
- SdPage* pNotesPage = (SdPage*) AllocPage(bMasterPage=sal_False);
++ SdPage* pNotesPage = (SdPage*) AllocPage(sal_False);
if( pRefDocument )
pRefPage = pRefDocument->GetSdPage( 0, PK_NOTES );
@@@ -688,7 -719,7 +688,7 @@@
/**********************************************************************
* MasterPage einfuegen und an der Notizen-Seite vermerken
**********************************************************************/
- SdPage* pNotesMPage = (SdPage*) AllocPage(TRUE);
- SdPage* pNotesMPage = (SdPage*) AllocPage(bMasterPage=sal_True);
++ SdPage* pNotesMPage = (SdPage*) AllocPage(sal_True);
pNotesMPage->SetSize( pNotesPage->GetSize() );
pNotesMPage->SetPageKind(PK_NOTES);
pNotesMPage->SetBorder( pNotesPage->GetLftBorder(),
@@@ -773,12 -804,13 +773,12 @@@ sal_Bool SdDrawDocument::CreateMissingN
|*
\************************************************************************/
- BOOL SdDrawDocument::MovePages(USHORT nTargetPage)
+ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
{
- SdPage* pTargetPage = NULL;
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();
@@@ -1332,8 -1380,9 +1333,8 @@@ sal_uInt16 SdDrawDocument::CreatePage
}
// Create new standard page and set it up.
- pStandardPage = (SdPage*) AllocPage(FALSE);
+ pStandardPage = (SdPage*) AllocPage(sal_False);
- // #108658#
// Set the size here since else the presobj autolayout
// will be wrong.
pStandardPage->SetSize( pPreviousStandardPage->GetSize() );
diff --cc sd/source/core/drawdoc3.cxx
index 2637f18,0abd0ab..f294ea5
mode 100644,100755..100755
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@@ -678,10 -709,12 +694,12 @@@ sal_Bool SdDrawDocument::InsertBookmark
**************************************************************/
sal_Bool bMustRename = sal_False;
- // #95991# delay renaming *after* pages are copied (might destroy source otherwise)
- // #67905# don't change name if source and dest model are the same!
- // #96029# avoid renaming if replacing the same page
+ // 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 ||
@@@ -834,11 -867,11 +852,11 @@@
}
}
- // #96029# nInsertPos > 2 is always true when inserting into non-empty models
+ // 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) &&
@@@ -944,8 -977,8 +962,8 @@@
}
}
- // #91146# Make absolutely sure no double masterpages are there
+ // Make absolutely sure no double masterpages are there
- RemoveUnnecessaryMasterPages(NULL, TRUE, TRUE);
+ RemoveUnnecessaryMasterPages(NULL, sal_True, sal_True);
if( bUndo )
EndUndo();
@@@ -1186,9 -1223,9 +1204,9 @@@ void SdDrawDocument::DisposeLoadedModel
|*
\************************************************************************/
-FASTBOOL SdDrawDocument::IsReadOnly() const
+bool SdDrawDocument::IsReadOnly() const
{
- return FALSE;
+ return sal_False;
}
@@@ -1564,9 -1601,9 +1582,9 @@@ void SdDrawDocument::SetMasterPage(sal_
pUndoMgr->LeaveListAction();
if( mpDocSh )
- mpDocSh->SetWaitCursor( FALSE );
+ mpDocSh->SetWaitCursor( sal_False );
- DBG_ERROR( "SdDrawDocument::SetMasterPage() failed!" );
+ OSL_FAIL( "SdDrawDocument::SetMasterPage() failed!" );
return;
}
@@@ -2012,10 -2050,10 +2030,10 @@@
void SdDrawDocument::Merge(SdrModel& rSourceModel,
- USHORT nFirstPageNum, USHORT nLastPageNum,
- USHORT nDestPos,
+ sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum,
+ sal_uInt16 nDestPos,
- FASTBOOL bMergeMasterPages, FASTBOOL bAllMasterPages,
- FASTBOOL bUndo, FASTBOOL bTreadSourceAsConst)
+ bool bMergeMasterPages, bool bAllMasterPages,
+ bool bUndo, bool bTreadSourceAsConst)
{
sal_uInt16 nMasterPageCount = GetMasterPageCount();
SdrModel::Merge( rSourceModel, nFirstPageNum, nLastPageNum, nDestPos, bMergeMasterPages, bAllMasterPages, bUndo, bTreadSourceAsConst );
diff --cc sd/source/core/drawdoc4.cxx
index 277795a,eced4ea..dbe556a
mode 100644,100755..100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@@ -303,12 -309,12 +305,12 @@@ void SdDrawDocument::CreateLayoutTempla
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 Fllung -------------------------------------------
++ // ---- Objekt ohne F�llung -------------------------------------------
aName = String(SdResId(STR_POOLSHEET_OBJWITHOUTFILL));
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
@@@ -329,7 -336,7 +332,7 @@@
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 -349,7 +345,7 @@@
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));
@@@ -1041,10 -1078,10 +1045,10 @@@ void SdDrawDocument::ImpOnlineSpellCall
delete mpOnlineSearchItem;
mpOnlineSearchItem = NULL;
- USHORT nCommand = pInfo->nCommand;
+ sal_uInt16 nCommand = pInfo->nCommand;
if (nCommand == SPELLCMD_IGNOREWORD
- // #91457# restart when add to dictionary takes place, too.
+ // restart when add to dictionary takes place, too.
|| nCommand == SPELLCMD_ADDTODICTIONARY)
{
if(pObj && pOutl && pObj->ISA(SdrTextObj))
diff --cc sd/source/core/drawdoc_animations.cxx
index 4eb1755,562db6f..1c15344
mode 100644,100755..100755
--- a/sd/source/core/drawdoc_animations.cxx
+++ b/sd/source/core/drawdoc_animations.cxx
diff --cc sd/source/core/glob.src
index a38af73,24d4f22..a38af73
mode 100755,100644..100644
--- a/sd/source/core/glob.src
+++ b/sd/source/core/glob.src
diff --cc sd/source/core/pglink.cxx
index cb47af8,f972bf1..aa3e251
mode 100644,100755..100755
--- a/sd/source/core/pglink.cxx
+++ b/sd/source/core/pglink.cxx
diff --cc sd/source/core/sdattr.cxx
index 41fd0bc,5230b9d..d7d3334
mode 100644,100755..100755
--- a/sd/source/core/sdattr.cxx
+++ b/sd/source/core/sdattr.cxx
diff --cc sd/source/core/sdiocmpt.cxx
index 1f7cc60,3de73f0..c858982
mode 100644,100755..100755
--- a/sd/source/core/sdiocmpt.cxx
+++ b/sd/source/core/sdiocmpt.cxx
diff --cc sd/source/core/sdpage.cxx
index badbb73,f49cfcb..620786b
mode 100644,100755..100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@@ -65,7 -66,8 +65,7 @@@
#include "../ui/inc/DrawDocShell.hxx"
#include "Outliner.hxx"
-
+ #include "app.hrc"
-#include "misc.hxx"
#include "eetext.hxx"
#include "drawdoc.hxx"
#include "sdpage.hxx"
@@@ -413,10 -416,10 +413,10 @@@ SdrObject* SdPage::CreatePresObj(PresOb
if ( pSdrObj->ISA(SdrTextObj) )
{
- // #96243# Tell the object EARLY that it is vertical to have the
+ // 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 )
@@@ -429,12 -432,12 +429,12 @@@
// Bei Praesentationsobjekten auf der MasterPage soll die
// Groesse vom Benutzwer frei waehlbar sein
- // #96243# potential problem: This action was still NOT
+ // 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
@@@ -712,9 -716,12 +712,9 @@@ void SdPage::Changed(const SdrObject& r
{
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();
-/*
- DBG_ASSERT( bUndo || (pUndoManager && pUndoManager->IsDoing()),
- "SdPage::Changed(), model change without undo!?" );
-*/
+
if( bUndo )
pUndoManager->AddUndoAction( new UndoObjectUserCall(*pObj) );
@@@ -957,10 -964,10 +957,10 @@@ SdrObject* SdPage::CreateDefaultPresObj
{
Point aPos( X2, Y2 );
Rectangle aRect( aPos, aSize );
- return CreatePresObj( PRESOBJ_SLIDENUMBER, FALSE, aRect, bInsert );
+ return CreatePresObj( PRESOBJ_SLIDENUMBER, sal_False, aRect, bInsert );
}
- DBG_ERROR("SdPage::CreateDefaultPresObj() - this should not happen!");
+ OSL_FAIL("SdPage::CreateDefaultPresObj() - this should not happen!");
return NULL;
}
}
@@@ -1659,17 -1678,17 +1659,17 @@@ SdrObject* SdPage::NbcRemoveObject(sal_
return FmFormPage::NbcRemoveObject(nObjNum);
}
-// #95876# Also overload ReplaceObject methods to realize when
+// 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);
}
-// #95876# Also overload ReplaceObject methods to realize when
+// 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 -1741,14 +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 -1757,14 +1725,7 @@@
}
}
- void SdPage::SetLftBorder(INT32 nBorder)
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
+ void SdPage::SetLftBorder(sal_Int32 nBorder)
{
if (nBorder != GetLftBorder() )
{
@@@ -1733,7 -1772,14 +1733,7 @@@
}
}
- void SdPage::SetRgtBorder(INT32 nBorder)
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
+ void SdPage::SetRgtBorder(sal_Int32 nBorder)
{
if (nBorder != GetRgtBorder() )
{
@@@ -1741,7 -1787,14 +1741,7 @@@
}
}
- void SdPage::SetUppBorder(INT32 nBorder)
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
+ void SdPage::SetUppBorder(sal_Int32 nBorder)
{
if (nBorder != GetUppBorder() )
{
@@@ -1749,7 -1802,14 +1749,7 @@@
}
}
- void SdPage::SetLwrBorder(INT32 nBorder)
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
+ void SdPage::SetLwrBorder(sal_Int32 nBorder)
{
if (nBorder != GetLwrBorder() )
{
@@@ -2367,20 -2430,20 +2367,20 @@@ void SdPage::SetObjText(SdrTextObj* pOb
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() );
- // #95114# Always set the object's StyleSheet at the Outliner to
+ // Always set the object's StyleSheet at the Outliner to
// use the current objects StyleSheet. Thus it's the same as in
// SetText(...).
- // #95114# Moved this implementation from where SetObjText(...) was called
+ // Moved this implementation from where SetObjText(...) was called
// to inside this method to work even when outliner is fetched here.
pOutl->SetStyleSheet(0, pObj->GetStyleSheet());
diff --cc sd/source/core/sdpage2.cxx
index 4ce39c3,f98756c..a96de5e
mode 100644,100755..100755
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@@ -67,7 -68,7 +67,7 @@@ extern void NotifyDocumentEvent( SdDraw
/*************************************************************************
|*
--|* SetPresentationLayout, setzt: Layoutnamen, Masterpage-Verknpfung und
++|* SetPresentationLayout, setzt: Layoutnamen, Masterpage-Verkn�pfung und
|* Vorlagen fuer Praesentationsobjekte
|*
|* Vorraussetzungen: - Die Seite muss bereits das richtige Model kennen!
@@@ -149,14 -150,14 +149,14 @@@ void SdPage::SetPresentationLayout(cons
// Listen mit:
// - Vorlagenzeigern fuer Gliederungstextobjekt (alte und neue Vorlagen)
// -Replacedaten fuer OutlinerParaObject
- List aOutlineStyles;
- List aOldOutlineStyles;
- List aReplList;
- sal_Bool bListsFilled = sal_False;
+ std::vector<SfxStyleSheetBase*> aOutlineStyles;
+ std::vector<SfxStyleSheetBase*> aOldOutlineStyles;
+ 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);
@@@ -259,9 -254,14 +259,9 @@@
SfxStyleSheet* pSheet = GetStyleSheetForPresObj(GetPresObjKind(pObj));
if (pSheet)
- pObj->SetStyleSheet(pSheet, TRUE);
+ pObj->SetStyleSheet(pSheet, sal_True);
}
}
-
- for (sal_uLong i = 0; i < aReplList.Count(); i++)
- {
- delete (StyleReplaceData*) aReplList.GetObject(i);
- }
}
diff --cc sd/source/core/shapelist.cxx
index 27ec356,695c30b..292f653
mode 100644,100755..100644
--- a/sd/source/core/shapelist.cxx
+++ b/sd/source/core/shapelist.cxx
diff --cc sd/source/core/stlpool.cxx
index 5f99e82,ceb7980..4f4b76e
mode 100644,100755..100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@@ -154,8 -157,8 +155,8 @@@ void SdStyleSheetPool::CreateOutlineShe
String aName(rLayoutName);
aName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
aName += String(SdResId(STR_LAYOUT_OUTLINE));
- List* pList = new List;
+
- for (USHORT nSheet = 1; nSheet < 10; nSheet++)
+ for (sal_uInt16 nSheet = 1; nSheet < 10; nSheet++)
{
String aFullName(aName);
aFullName.Append( sal_Unicode( ' ' ));
@@@ -253,10 -255,8 +254,10 @@@ void SdStyleSheetPool::CreateLayoutStyl
rSet.Put( SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR) );
rSet.Put( XLineStyleItem(XLINE_NONE) );
rSet.Put( XFillStyleItem(XFILL_NONE) );
+ 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 -265,10 +266,8 @@@
}
}
- ULONG nFontSize = 20;
- USHORT nLower = 100;
+ sal_uLong nFontSize = 20;
- short nFirstIndent = -600;
-// sal_uInt16 nIndent = nLevel * 1200;
+ sal_uInt16 nLower = 100;
switch (nLevel)
{
@@@ -374,8 -394,9 +375,8 @@@
rTitleSet.Put(SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR ));
rTitleSet.Put(SvxAdjustItem(SVX_ADJUST_CENTER, EE_PARA_JUST ));
rTitleSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) );
-// rTitleSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) );
// #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 );
@@@ -419,8 -440,9 +420,8 @@@
rSubtitleSet.Put(SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR ));
rSubtitleSet.Put(SvxAdjustItem(SVX_ADJUST_CENTER, EE_PARA_JUST ));
rSubtitleSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) );
-// rSubtitleSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) );
// #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);
@@@ -465,11 -487,19 +466,11 @@@
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( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) );
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#
- SvxNumBulletItem aNumBullet( (const SvxNumBulletItem&) rNotesSet.Get(EE_PARA_NUMBULLET) );
-
- EditEngine::ImportBulletItem( aNumBullet, 0, NULL,
- &(const SvxLRSpaceItem&) rNotesSet.Get( EE_PARA_LRSPACE ) );
-
- ( (SfxItemSet&) rNotesSet).Put( aNumBullet );
-*/
+/* #i35937# */
}
@@@ -715,37 -739,41 +717,37 @@@ void SdStyleSheetPool::CreateLayoutShee
String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
aPrefix.Insert(aSep);
- List* pNameList = new List;
-
String aName(SdResId(STR_LAYOUT_OUTLINE));
- String* pName = NULL;
+ String aStr;
- for (USHORT nLevel = 1; nLevel < 10; nLevel++)
+ for (sal_uInt16 nLevel = 1; nLevel < 10; nLevel++)
{
- pName = new String(aName);
- pName->Append( sal_Unicode( ' ' ));
- pName->Append( String::CreateFromInt32( sal_Int32( nLevel )));
- pName->Insert(aPrefix, 0);
- pNameList->Insert(pName, LIST_APPEND);
+ aStr = String( aPrefix );
+ aStr.Append(aName);
+ aStr.Append( sal_Unicode( ' ' ));
+ aStr.Append( String::CreateFromInt32( sal_Int32( nLevel )));
+ aNameList.push_back(aStr);
}
- pName = new String(SdResId(STR_LAYOUT_TITLE));
- pName->Insert(aPrefix, 0);
- pNameList->Insert(pName, LIST_APPEND);
+ aStr = String(SdResId(STR_LAYOUT_TITLE));
+ aStr.Insert(aPrefix, 0);
+ aNameList.push_back(aStr);
- pName = new String(SdResId(STR_LAYOUT_SUBTITLE));
- pName->Insert(aPrefix, 0);
- pNameList->Insert(pName, LIST_APPEND);
+ aStr = String(SdResId(STR_LAYOUT_SUBTITLE));
+ aStr.Insert(aPrefix, 0);
+ aNameList.push_back(aStr);
- pName = new String(SdResId(STR_LAYOUT_NOTES));
- pName->Insert(aPrefix, 0);
- pNameList->Insert(pName, LIST_APPEND);
+ aStr = String(SdResId(STR_LAYOUT_NOTES));
+ aStr.Insert(aPrefix, 0);
+ aNameList.push_back(aStr);
- pName = new String(SdResId(STR_LAYOUT_BACKGROUNDOBJECTS));
- pName->Insert(aPrefix, 0);
- pNameList->Insert(pName, LIST_APPEND);
+ aStr = String(SdResId(STR_LAYOUT_BACKGROUNDOBJECTS));
+ aStr.Insert(aPrefix, 0);
+ aNameList.push_back(aStr);
- pName = new String(SdResId(STR_LAYOUT_BACKGROUND));
- pName->Insert(aPrefix, 0);
- pNameList->Insert(pName, LIST_APPEND);
-
- return pNameList;
+ aStr = String(SdResId(STR_LAYOUT_BACKGROUND));
+ aStr.Insert(aPrefix, 0);
+ aNameList.push_back(aStr);
}
/*************************************************************************
@@@ -785,7 -813,8 +787,7 @@@ void SdStyleSheetPool::CreatePseudosIfN
SfxStyleSheetBase* pSheet = NULL;
SfxStyleSheetBase* pParent = NULL;
- USHORT nUsedMask = SFXSTYLEBIT_USED;
- //sal_uInt16 nUsedMask = SFXSTYLEBIT_ALL & ~SFXSTYLEBIT_USERDEF;
+ sal_uInt16 nUsedMask = SFXSTYLEBIT_USED;
aName = String(SdResId(STR_PSEUDOSHEET_TITLE));
if( (pSheet = Find(aName, SD_STYLE_FAMILY_PSEUDO)) == 0 )
diff --cc sd/source/core/stlsheet.cxx
index 6b54e05,46f96ae..041fea4
mode 100644,100755..100755
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@@ -960,15 -1001,13 +960,13 @@@ OUString SAL_CALL SdStyleSheet::getName
void SAL_CALL SdStyleSheet::setName( const OUString& rName ) throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ 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));
}
}
@@@ -1012,31 -1051,28 +1010,28 @@@ OUString SAL_CALL SdStyleSheet::getPare
void SAL_CALL SdStyleSheet::setParentStyle( const OUString& rParentName ) throw(NoSuchElementException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ 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++ )
+ 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 );
}
}
diff --cc sd/source/core/undo/undomanager.cxx
index 68e8983,83f5fd5..8dbb6dd
mode 100644,100755..100755
--- a/sd/source/core/undo/undomanager.cxx
+++ b/sd/source/core/undo/undomanager.cxx
diff --cc sd/source/core/undo/undoobjects.cxx
index ca73bf0,b5099d7..110c0c1
mode 100644,100755..100755
--- a/sd/source/core/undo/undoobjects.cxx
+++ b/sd/source/core/undo/undoobjects.cxx
diff --cc sd/source/filter/cgm/sdcgmfilter.cxx
index 9a11b4f,17b0703..3adc47b
mode 100644,100755..100755
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@@ -95,9 -94,9 +95,9 @@@ sal_Bool SdCGMFilter::Import(
if( pLibrary && mxModel.is() )
{
- ImportCGM FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii( "ImportCGM" ) ) );
+ 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();
diff --cc sd/source/filter/eppt/eppt.cxx
index 5c8cf3c,e7c7ddc..b610438
mode 100644,100755..100755
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@@ -151,293 -251,12 +151,293 @@@ void PPTWriter::exportPPTPost(
if ( !ImplWriteAtomEnding() )
return;
- if ( !ImplCreateDocumentSummaryInformation( nCnvrtFlags ) )
+ if ( !ImplCreateDocumentSummaryInformation() )
return;
- mbStatus = TRUE;
+ mbStatus = sal_True;
};
+// ---------------------------------------------------------------------------------------------
+
+void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStream& rBinaryTagData10Atom );
+
+void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_uInt16 nMode,
+ sal_Bool bHasBackground, Reference< XPropertySet > aXBackgroundPropSet )
+{
+ Any aAny;
+
+ const PHLayout& rLayout = GetLayout( mXPagePropSet );
+ mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_Slide | nPageNum, mpStrm->Tell() );
+ mpPptEscherEx->OpenContainer( EPP_Slide );
+ mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 );
+ *mpStrm << rLayout.nLayout;
+ mpStrm->Write( rLayout.nPlaceHolder, 8 ); // placeholderIDs ( 8Stueck )
+ *mpStrm << (sal_uInt32)(nMasterNum | 0x80000000)// master ID ( ist gleich 0x80000000 bei einer masterpage )
+ << (sal_uInt32)nPageNum + 0x100 // notes ID ( ist gleich null wenn keine notizen vorhanden )
+ << nMode
+ << (sal_uInt16)0; // padword
+
+ mnDiaMode = 0;
+ sal_Bool bVisible = sal_True;
+ ::com::sun::star::presentation::FadeEffect eFe = ::com::sun::star::presentation::FadeEffect_NONE;
+
+ if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Visible" ) ) ) )
+ aAny >>= bVisible;
+ if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Change" ) ) ) )
+ {
+ switch ( *(INT32*)aAny.getValue() )
+ {
+ case 1 : // automatisch
+ mnDiaMode++;
+ case 2 : // halbautomatisch
+ mnDiaMode++;
+ default :
+ case 0 : // manuell
+ break;
+ }
+ }
+ if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Effect" ) ) ) )
+ aAny >>= eFe;
+
+ sal_uInt32 nSoundRef = 0;
+ sal_Bool bIsSound = sal_False;
+ sal_Bool bStopSound = sal_False;
+ sal_Bool bLoopSound = sal_False;
+
+ if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Sound" ) ) ) )
+ {
+ rtl::OUString aSoundURL;
+ if ( aAny >>= aSoundURL )
+ {
+ nSoundRef = maSoundCollection.GetId( aSoundURL );
+ bIsSound = sal_True;
+ }
+ else
+ aAny >>= bStopSound;
+ }
+ if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LoopSound" ) ) ) )
+ aAny >>= bLoopSound;
+
+ sal_Bool bNeedsSSSlideInfoAtom = ( bVisible == FALSE )
+ || ( mnDiaMode == 2 )
+ || ( bIsSound )
+ || ( bStopSound )
+ || ( eFe != ::com::sun::star::presentation::FadeEffect_NONE );
+ if ( bNeedsSSSlideInfoAtom )
+ {
+ sal_uInt8 nDirection = 0;
+ sal_uInt8 nTransitionType = 0;
+ sal_uInt16 nBuildFlags = 1; // advange by mouseclick
+ INT32 nSlideTime = 0; // muss noch !!!
+ sal_uInt8 nSpeed = 1;
+
+ if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Speed" ) ) ) )
+ {
+ ::com::sun::star::presentation::AnimationSpeed aAs;
+ aAny >>= aAs;
+ nSpeed = (sal_uInt8)aAs;
+ }
+ sal_Int16 nTT = 0;
+ if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TransitionType" ) ) )
+ && ( aAny >>= nTT ) )
+ {
+ sal_Int16 nTST = 0;
+ if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TransitionSubtype" ) ) )
+ && ( aAny >>= nTST ) )
+ nTransitionType = GetTransition( nTT, nTST, eFe, nDirection );
+
+ }
+ if ( !nTransitionType )
+ nTransitionType = GetTransition( eFe, nDirection );
+ if ( mnDiaMode == 2 ) // automatic ?
+ nBuildFlags |= 0x400;
+ if ( bVisible == FALSE )
+ nBuildFlags |= 4;
+ if ( bIsSound )
+ nBuildFlags |= 16;
+ if ( bLoopSound )
+ nBuildFlags |= 64;
+ if ( bStopSound )
+ nBuildFlags |= 256;
+
+ if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Duration" ) ) ) )// duration of this slide
+ nSlideTime = *(INT32*)aAny.getValue() << 10; // in ticks
+
+ mpPptEscherEx->AddAtom( 16, EPP_SSSlideInfoAtom );
+ *mpStrm << nSlideTime // standtime in ticks
+ << nSoundRef
+ << nDirection
+ << nTransitionType
+ << nBuildFlags
+ << nSpeed
+ << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0;
+ }
+
+ ImplCreateHeaderFooters( mXPagePropSet );
+
+ EscherSolverContainer aSolverContainer;
+ mpPptEscherEx->OpenContainer( EPP_PPDrawing );
+ mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
+ mpPptEscherEx->EnterGroup(0,0);
+ ImplWritePage( rLayout, aSolverContainer, NORMAL, FALSE, nPageNum ); // Die Shapes der Seite werden im PPT Dok. erzeugt
+ mpPptEscherEx->LeaveGroup();
+
+ if ( bHasBackground )
+ ImplWriteBackground( aXBackgroundPropSet );
+ else
+ {
+ mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
+ mpPptEscherEx->AddShape( ESCHER_ShpInst_Rectangle, 0xc00 ); // Flags: Connector | Background | HasSpt
+ EscherPropertyContainer aPropOpt;
+ aPropOpt.AddOpt( ESCHER_Prop_fillRectRight, PPTtoEMU( maDestPageSize.Width ) );
+ aPropOpt.AddOpt( ESCHER_Prop_fillRectBottom, PPTtoEMU( maDestPageSize.Width ) );
+ aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x120012 );
+ aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x80000 );
+ aPropOpt.AddOpt( ESCHER_Prop_bWMode, ESCHER_wDontShow );
+ aPropOpt.AddOpt( ESCHER_Prop_fBackground, 0x10001 ); // if true, this is the background shape
+ aPropOpt.Commit( *mpStrm );
+ mpPptEscherEx->CloseContainer(); // ESCHER_SpContainer
+ }
+
+ aSolverContainer.WriteSolver( *mpStrm );
+
+ mpPptEscherEx->CloseContainer(); // ESCHER_DgContainer
+ mpPptEscherEx->CloseContainer(); // EPP_Drawing
+ 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;
+
+ SvMemoryStream aBinaryTagData10Atom;
+ ImplExportComments( mXDrawPage, aBinaryTagData10Atom );
+ if ( mbUseNewAnimations )
+ {
+ SvMemoryStream amsofbtAnimGroup;
+ ppt::AnimationExporter aExporter( aSolverContainer, maSoundCollection );
+ aExporter.doexport( mXDrawPage, amsofbtAnimGroup );
+ sal_uInt32 nmsofbtAnimGroupSize = amsofbtAnimGroup.Tell();
+ if ( nmsofbtAnimGroupSize )
+ {
+ {
+ EscherExAtom aMagic2( aBinaryTagData10Atom, 0x2eeb );
+ aBinaryTagData10Atom << (sal_uInt32)0x01c45df9
+ << (sal_uInt32)0xe1471b30;
+ }
+ {
+ EscherExAtom aMagic( aBinaryTagData10Atom, 0x2b00 );
+ aBinaryTagData10Atom << (sal_uInt32)0;
+ }
+ aBinaryTagData10Atom.Write( amsofbtAnimGroup.GetData(), amsofbtAnimGroup.Tell() );
+ {
+ EscherExContainer aMagic2( aBinaryTagData10Atom, 0x2b02 );
+ }
+ }
+ }
+ if ( aBinaryTagData10Atom.Tell() )
+ {
+ EscherExContainer aProgTags ( *mpStrm, EPP_ProgTags );
+ EscherExContainer aProgBinaryTag( *mpStrm, EPP_ProgBinaryTag );
+ {
+ EscherExAtom aCString( *mpStrm, EPP_CString );
+ *mpStrm << (sal_uInt32)0x5f005f
+ << (sal_uInt32)0x50005f
+ << (sal_uInt32)0x540050
+ << (sal_uInt16)0x31
+ << (sal_uInt16)0x30;
+ }
+ {
+ EscherExAtom aBinaryTagData( *mpStrm, EPP_BinaryTagData );
+ mpStrm->Write( aBinaryTagData10Atom.GetData(), aBinaryTagData10Atom.Tell() );
+ }
+ }
+ mpPptEscherEx->CloseContainer(); // EPP_Slide
+}
+
+// ---------------------------------------------------------------------------------------------
+
+void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertySet > aXBackgroundPropSet )
+{
+ mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_MainMaster | nPageNum, mpStrm->Tell() );
+ mpPptEscherEx->OpenContainer( EPP_MainMaster );
+ mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 );
+ *mpStrm << (INT32)EPP_LAYOUT_TITLEANDBODYSLIDE // slide layout -> title and body slide
+ << (sal_uInt8)1 << (sal_uInt8)2 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 // placeholderID
+ << (sal_uInt32)0 // master ID ( ist gleich null bei einer masterpage )
+ << (sal_uInt32)0 // notes ID ( ist gleich null wenn keine notizen vorhanden )
+ << (sal_uInt16)0 // Bit 1: Follow master objects, Bit 2: Follow master scheme, Bit 3: Follow master background
+ << (sal_uInt16)0; // padword
+
+ mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
+ *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->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
+ *mpStrm << (sal_uInt32)0xff0000 << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x00ffff << (sal_uInt32)0x0099ff << (sal_uInt32)0xffff00 << (sal_uInt32)0x0000ff << (sal_uInt32)0x969696;
+ mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
+ *mpStrm << (sal_uInt32)0xccffff << (sal_uInt32)0x000000 << (sal_uInt32)0x336666 << (sal_uInt32)0x008080 << (sal_uInt32)0x339933 << (sal_uInt32)0x000080 << (sal_uInt32)0xcc3300 << (sal_uInt32)0x66ccff;
+ mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
+ *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x333333 << (sal_uInt32)0x000000 << (sal_uInt32)0xdddddd << (sal_uInt32)0x808080 << (sal_uInt32)0x4d4d4d << (sal_uInt32)0xeaeaea;
+ mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
+ *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x66ccff << (sal_uInt32)0xff0000 << (sal_uInt32)0xcc00cc << (sal_uInt32)0xc0c0c0;
+ mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
+ *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0xc0c0c0 << (sal_uInt32)0xff6600 << (sal_uInt32)0x0000ff << (sal_uInt32)0x009900;
+ mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
+ *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0xff9933 << (sal_uInt32)0xccff99 << (sal_uInt32)0xcc00cc << (sal_uInt32)0xb2b2b2;
+
+ for ( int nInstance = EPP_TEXTTYPE_Title; nInstance <= EPP_TEXTTYPE_QuarterBody; nInstance++ )
+ {
+ if ( nInstance == EPP_TEXTTYPE_notUsed )
+ continue;
+
+ // the auto color is dependent to the page background,so we have to set a page that is in the right context
+ if ( nInstance == EPP_TEXTTYPE_Notes )
+ GetPageByIndex( 0, NOTICE );
+ else
+ GetPageByIndex( 0, MASTER );
+
+ mpPptEscherEx->BeginAtom();
+
+ sal_Bool bFirst = TRUE;
+ sal_Bool bSimpleText = FALSE;
+
+ *mpStrm << (sal_uInt16)5; // paragraph count
+
+ for ( sal_uInt16 nLev = 0; nLev < 5; nLev++ )
+ {
+ if ( nInstance >= EPP_TEXTTYPE_CenterBody )
+ {
+ bFirst = FALSE;
+ bSimpleText = TRUE;
+ *mpStrm << nLev;
+ }
+ mpStyleSheet->mpParaSheet[ nInstance ]->Write( *mpStrm, mpPptEscherEx, nLev, bFirst, bSimpleText, mXPagePropSet );
+ mpStyleSheet->mpCharSheet[ nInstance ]->Write( *mpStrm, mpPptEscherEx, nLev, bFirst, bSimpleText, mXPagePropSet );
+ bFirst = FALSE;
+ }
+ mpPptEscherEx->EndAtom( EPP_TxMasterStyleAtom, 0, nInstance );
+ }
+ GetPageByIndex( nPageNum, MASTER );
+
+ EscherSolverContainer aSolverContainer;
+
+ mpPptEscherEx->OpenContainer( EPP_PPDrawing );
+ mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
+
+ mpPptEscherEx->EnterGroup(0,0);
+ ImplWritePage( GetLayout( 0 ), aSolverContainer, MASTER, TRUE ); // Die Shapes der Seite werden im PPT Dok. erzeugt
+ mpPptEscherEx->LeaveGroup();
+
+ ImplWriteBackground( aXBackgroundPropSet );
+
+ aSolverContainer.WriteSolver( *mpStrm );
+
+ mpPptEscherEx->CloseContainer(); // ESCHER_DgContainer
+ mpPptEscherEx->CloseContainer(); // EPP_Drawing
+ 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;
+
+ if ( aBuExMasterStream.Tell() )
+ {
+ ImplProgTagContainer( mpStrm, &aBuExMasterStream );
+ }
+ mpPptEscherEx->CloseContainer(); // EPP_MainMaster
+};
// ---------------------------------------------------------------------------------------------
@@@ -732,15 -563,15 +737,15 @@@ sal_Bool PPTWriter::ImplCreateDocument(
{
mpPptEscherEx->AddAtom( 20, EPP_SlidePersistAtom );
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 )
+ *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 ( !ImplGetPageByIndex( i, NORMAL ) ) // sehr aufregend: noch einmal ueber alle seiten
+ if ( !GetPageByIndex( i, NORMAL ) ) // sehr aufregend: noch einmal ueber alle seiten
- return FALSE;
+ return sal_False;
- ImplSetCurrentStyleSheet( ImplGetMasterIndex( NORMAL ) );
+ SetCurrentStyleSheet( GetMasterIndex( NORMAL ) );
::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed >
aXName( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
@@@ -834,7 -671,7 +839,7 @@@
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;
@@@ -1031,9 -880,157 +1036,9 @@@ sal_Bool PPTWriter::ImplCreateHyperBlob
rStrm << (sal_uInt32)( nCurrentOfs - ( nParaOfs + 4 ) );
rStrm << nParaCount;
rStrm.Seek( nCurrentOfs );
- return TRUE;
+ return sal_True;
}
-PHLayout& PPTWriter::ImplGetLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const
-{
- ::com::sun::star::uno::Any aAny;
- sal_Int16 nLayout = 20;
- if ( GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Layout" ) ) ), sal_True )
- aAny >>= nLayout;
-
- if ( ( nLayout >= 21 ) && ( nLayout <= 26 ) ) // NOTES _> HANDOUT6
- nLayout = 20;
- if ( ( nLayout >= 27 ) && ( nLayout <= 30 ) ) // VERTICAL LAYOUT
- nLayout -= 6;
- else if ( nLayout > 30 )
- nLayout = 20;
- return pPHLayout[ nLayout ];
-}
-
-
-// ---------------------------------------------------------------------------------------------
-
-sal_Bool PPTWriter::ImplCreateMaster( sal_uInt32 nPageNum )
-{
- if ( !ImplGetPageByIndex( nPageNum, MASTER ) )
- return sal_False;
- ImplSetCurrentStyleSheet( nPageNum );
-
- if ( !ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ) ) ) // Backgroundshape laden
- return sal_False;
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet;
- if ( !( mAny >>= aXBackgroundPropSet ) )
- return sal_False;
-
- sal_uInt32 nFillColor = 0xffffff;
- sal_uInt32 nFillBackColor = 0x000000;
-
- ::com::sun::star::drawing::FillStyle aFS = ::com::sun::star::drawing::FillStyle_NONE;
- if ( ImplGetPropertyValue( aXBackgroundPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ) ) ) )
- mAny >>= aFS;
- switch ( aFS )
- {
- case ::com::sun::star::drawing::FillStyle_GRADIENT :
- {
- if ( ImplGetPropertyValue( aXBackgroundPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillGradient" ) ) ) )
- {
- nFillColor = EscherPropertyContainer::GetGradientColor( (::com::sun::star::awt::Gradient*)mAny.getValue(), 0 );
- nFillBackColor = EscherPropertyContainer::GetGradientColor( (::com::sun::star::awt::Gradient*)mAny.getValue(), 1 );
- }
- }
- break;
-
- case ::com::sun::star::drawing::FillStyle_SOLID :
- {
- if ( ImplGetPropertyValue( aXBackgroundPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ) ) ) )
- {
- nFillColor = mpPptEscherEx->GetColor( *((sal_uInt32*)mAny.getValue()) );
- nFillBackColor = nFillColor ^ 0xffffff;
- }
- }
- break;
-
- default:
- break;
- }
-
- mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_MainMaster | nPageNum, mpStrm->Tell() );
- mpPptEscherEx->OpenContainer( EPP_MainMaster );
- mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 );
- *mpStrm << (sal_Int32)EPP_LAYOUT_TITLEANDBODYSLIDE // slide layout -> title and body slide
- << (sal_uInt8)1 << (sal_uInt8)2 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 // placeholderID
- << (sal_uInt32)0 // master ID ( ist gleich null bei einer masterpage )
- << (sal_uInt32)0 // notes ID ( ist gleich null wenn keine notizen vorhanden )
- << (sal_uInt16)0 // Bit 1: Follow master objects, Bit 2: Follow master scheme, Bit 3: Follow master background
- << (sal_uInt16)0; // padword
-
- mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list