[Libreoffice-commits] .: 325 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
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Mar 18 08:23:29 PDT 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
animations/source/animcore/targetpropertiescreator.cxx | 1
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 | 311 +
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/unit/makefile.mk | 36
sd/qa/unit/uimpress.cxx | 4
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 | 106
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 | 105
sd/source/filter/eppt/eppt.hxx | 6
sd/source/filter/eppt/epptbase.hxx | 8
sd/source/filter/eppt/epptdef.hxx | 2
sd/source/filter/eppt/epptooxml.hxx | 5
sd/source/filter/eppt/epptso.cxx | 100
sd/source/filter/eppt/escherex.cxx | 34
sd/source/filter/eppt/escherex.hxx | 6
sd/source/filter/eppt/pptexanimations.cxx | 6
sd/source/filter/eppt/pptx-epptbase.cxx | 116
sd/source/filter/eppt/pptx-epptooxml.cxx | 145
sd/source/filter/eppt/pptx-stylesheet.cxx | 14
sd/source/filter/eppt/pptx-text.cxx | 40
sd/source/filter/eppt/text.hxx | 14
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 | 4
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 | 64
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 | 276 -
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 | 36
sd/source/ui/app/tmplctrl.cxx | 18
sd/source/ui/app/toolbox.src | 737 ---
sd/source/ui/controller/slidelayoutcontroller.cxx | 12
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 | 176
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 | 24
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 | 138
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 | 167
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 | 104
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 | 72
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 | 9
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/res_bmp.hrc | 2
sd/source/ui/inc/sdtreelb.hxx | 47
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 | 673 +--
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 | 147
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 | 24
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 | 48
sd/source/ui/unoidl/unopool.cxx | 2
sd/source/ui/unoidl/unosrch.cxx | 4
sd/source/ui/view/DocumentRenderer.cxx | 316 -
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 | 113
sd/source/ui/view/drviews3.cxx | 58
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 | 59
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 | 264 -
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 | 60
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
sd/util/sdfilt.map | 1
slideshow/prj/build.lst | 2
slideshow/prj/d.lst | 2
slideshow/source/engine/OGLTrans/exports.dxp | 1
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm | 12
slideshow/source/engine/OGLTrans/ogltrans.component | 34
slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx | 14
slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx | 14
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 | 38
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 | 140
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
632 files changed, 26925 insertions(+), 18268 deletions(-)
New commits:
commit 571e3b112b2fda5f1fca87d8433797a72e3a306e
Merge: e66c2fc... c4ffa8e...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Mar 18 15:40:35 2011 +0100
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
sd/source/ui/func/fuinsfil.cxx
sd/source/ui/func/fuprobjs.cxx
sd/source/ui/slideshow/slideshowimpl.cxx
sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
sd/source/ui/toolpanel/ToolPanelViewShell.cxx
sd/source/ui/view/drawview.cxx
sd/source/ui/view/drtxtob.cxx
sd/source/ui/view/outlnvsh.cxx
sd/source/ui/view/outlview.cxx
diff --cc sd/inc/Outliner.hxx
index ded3595,1e9d0cd..09d5617
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@@ -164,8 -164,8 +164,8 @@@ public
/** Starts the text conversion (hangul/hanja or Chinese simplified/traditional)
for the current viewshell */
- void StartConversion( INT16 nSourceLanguage, INT16 nTargetLanguage,
- const Font *pTargetFont, INT32 nOptions, BOOL bIsInteractive );
- void StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage,
++ void StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage,
+ const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive );
/** This is called internaly when text conversion is started.
The position of current view mode/page/object/caret position
diff --cc sd/source/core/CustomAnimationPreset.cxx
index 109560f,822d85c..7763c51
mode 100644,100755..100755
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
diff --cc sd/source/core/drawdoc3.cxx
index f13fc61,f294ea5..3065cdc
mode 100644,100755..100755
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
diff --cc sd/source/core/stlsheet.cxx
index ede6ff5,041fea4..2f0a03a
mode 100644,100755..100755
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
diff --cc sd/source/filter/grf/sdgrffilter.cxx
index 7acb9a1,5f830ed..aa80d7e
mode 100644,100755..100755
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
diff --cc sd/source/filter/xml/sdxmlwrp.cxx
index 7db3405,252d06d..4ffaba4
mode 100644,100755..100755
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
diff --cc sd/source/ui/dlg/navigatr.cxx
index bc34428,a804dd1..09426b8
mode 100644,100755..100755
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
diff --cc sd/source/ui/func/fuinsfil.cxx
index efbf7fb,dfc4117..521c91a
mode 100644,100755..100755
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@@ -638,12 -635,13 +638,12 @@@ void FuInsertFile::InsTextOrRTFinOlMode
// wo soll eingefuegt werden?
while( !pDocliner->HasParaFlag( pPara, PARAFLAG_ISPAGE ) )
- {
pPara = pDocliner->GetParent(pPara);
- }
+
- ULONG nTargetPos = pDocliner->GetAbsPos(pPara) + 1;
+ sal_uLong nTargetPos = pDocliner->GetAbsPos(pPara) + 1;
// Layout der Vorgaengerseite uebernehmen
- USHORT nPage = 0;
+ sal_uInt16 nPage = 0;
pPara = pDocliner->GetParagraph( pDocliner->GetAbsPos( pPara ) - 1 );
while (pPara)
{
diff --cc sd/source/ui/func/fuprobjs.cxx
index 408b43f,ce01d3f..b7bf563
mode 100644,100755..100755
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@@ -99,21 -99,14 +99,21 @@@ void FuPresentationObjects::DoExecute(
OutlineView* pOlView = static_cast<OutlineView*>(pOutlineViewShell->GetView());
OutlinerView* pOutlinerView = pOlView->GetViewByWindow( (Window*) mpWindow );
::Outliner* pOutl = pOutlinerView->GetOutliner();
- List* pList = pOutlinerView->CreateSelectionList();
- Paragraph* pPara = (Paragraph*)pList->First();
+
+ std::vector<Paragraph*> aSelList;
+ pOutlinerView->CreateSelectionList(aSelList);
+
+ std::vector<Paragraph*>::const_iterator iter = aSelList.begin();
+ Paragraph* pPara = aSelList.empty() ? NULL : *iter;
+
- nDepth = pOutl->GetDepth((USHORT)pOutl->GetAbsPos( pPara ) );
+ nDepth = pOutl->GetDepth((sal_uInt16)pOutl->GetAbsPos( pPara ) );
bool bPage = pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE );
- while( pPara )
+ while( iter != aSelList.end() )
{
+ pPara = *iter;
+
- nTmp = pOutl->GetDepth((USHORT) pOutl->GetAbsPos( pPara ) );
+ nTmp = pOutl->GetDepth((sal_uInt16) pOutl->GetAbsPos( pPara ) );
if( nDepth != nTmp )
{
@@@ -123,11 -116,12 +123,11 @@@
if( pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ) != bPage )
{
- bUnique = FALSE;
+ bUnique = sal_False;
break;
}
- bUnique = TRUE;
+ bUnique = sal_True;
-
- pPara = (Paragraph*) pList->Next();
+ ++iter;
}
if( bUnique )
diff --cc sd/source/ui/inc/OutlineView.hxx
index c13b453,89f4936..b676995
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@@ -191,13 -191,13 +191,13 @@@ private
SdrOutliner* mpOutliner;
OutlinerView* mpOutlinerView[MAX_OUTLINERVIEWS];
- List* mpOldParaOrder;
- List* mpSelectedParas;
+ std::vector<Paragraph*> maOldParaOrder;
+ std::vector<Paragraph*> maSelectedParas;
- USHORT mnPagesToProcess; // fuer die Fortschrittsanzeige
- USHORT mnPagesProcessed;
+ sal_uInt16 mnPagesToProcess; // fuer die Fortschrittsanzeige
+ sal_uInt16 mnPagesProcessed;
- BOOL mbFirstPaint;
+ sal_Bool mbFirstPaint;
SfxProgress* mpProgress;
diff --cc sd/source/ui/slideshow/slideshowimpl.cxx
index 943b379,f1eda84..3ae8df2
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@@ -3194,8 -3048,8 +3048,8 @@@ void SAL_CALL SlideshowImpl::setUsePen
catch( Exception& e )
{
static_cast<void>(e);
- DBG_ERROR(
+ OSL_FAIL(
- (OString("sd::SlideshowImpl::setUseEraser(), "
+ (OString("sd::SlideshowImpl::setUsePen(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@@@ -3237,71 -3088,59 +3088,59 @@@ void SAL_CALL SlideshowImpl::setPenColo
{
SolarMutexGuard aSolarGuard;
mnUserPaintColor = nColor;
- #ifdef ENABLE_PRESENTER_EXTRA_UI
- mbSwitchPenMode = true;
- mbSwitchEraserMode = !mbSwitchPenMode;
- #endif
- if( maPresSettings.mbMouseAsPen )
- setUsePen( sal_True ); // update color
+ setUsePen( true ); // enable pen mode, update color
}
- #ifdef ENABLE_PRESENTER_EXTRA_UI
// --------------------------------------------------------------------
- void SAL_CALL SlideshowImpl::setPenMode( bool bSwitchPenMode ) throw (RuntimeException)
+ void SAL_CALL SlideshowImpl::setUseEraser( ::sal_Bool /*_usepen*/ ) throw (css::uno::RuntimeException)
{
- SolarMutexGuard aSolarGuard;
- mbSwitchPenMode = bSwitchPenMode;
-
- if(mbSwitchPenMode == true){
- mbSwitchEraserMode = false;
- }else{
- mbSwitchEraserMode = true;
- }
- if( maPresSettings.mbMouseAsPen )
- setUsePen( sal_True ); // Switch to Pen Mode
-
}
- void SAL_CALL SlideshowImpl::setEraserMode(bool bSwitchEraserMode ) throw (RuntimeException)
+ // --------------------------------------------------------------------
+
+ void SAL_CALL SlideshowImpl::setPenMode( bool bSwitchPenMode ) throw (RuntimeException)
{
SolarMutexGuard aSolarGuard;
- mbSwitchEraserMode = bSwitchEraserMode;
- if(mbSwitchEraserMode = true){
- mbSwitchPenMode = false;
- }else{
- mbSwitchPenMode = true;
- }
-
- if( maPresSettings.mbMouseAsPen )
- setUseEraser( sal_True ); // Switch to EraseMode
-
+ setUsePen( bSwitchPenMode ); // SwitchPen Mode
+
}
-
// --------------------------------------------------------------------
- void SAL_CALL SlideshowImpl::setEraseAllInk( bool bEraseAllInk ) throw (RuntimeException)
+ void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk) throw (RuntimeException)
{
- SolarMutexGuard aSolarGuard;
- mbEraseAllInk=bEraseAllInk;
- mbSwitchPenMode = true;
- mbSwitchEraserMode = false;
- if( maPresSettings.mbMouseAsPen )
- setUsePen( sal_True ); // update erase all ink bool
+ if( bEraseAllInk )
+ {
+ SolarMutexGuard aSolarGuard;
+ if( mxShow.is() ) try
+ {
+ beans::PropertyValue aPenPropEraseAllInk;
+ aPenPropEraseAllInk.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "EraseAllInk" ));
+ aPenPropEraseAllInk.Value <<= bEraseAllInk;
+ mxShow->setProperty( aPenPropEraseAllInk );
+ }
+ catch( Exception& e )
+ {
+ static_cast<void>(e);
- DBG_ERROR(
++ OSL_TRACE(
+ (OString("sd::SlideshowImpl::setEraseAllInk(), "
+ "exception caught: ") +
+ rtl::OUStringToOString(
+ comphelper::anyToString( cppu::getCaughtException() ),
+ RTL_TEXTENCODING_UTF8 )).getStr() );
+ }
+ }
}
+ void SAL_CALL SlideshowImpl::setEraseInk( sal_Int32 /*nEraseInkSize*/ ) throw (css::uno::RuntimeException)
+ {
+ }
- void SAL_CALL SlideshowImpl::setEraseInk( sal_Int32 nEraseInkSize ) throw (RuntimeException)
+ void SAL_CALL SlideshowImpl::setEraserMode( bool /*bSwitchEraserMode*/ ) throw (css::uno::RuntimeException)
{
- SolarMutexGuard aSolarGuard;
- mnEraseInkSize=nEraseInkSize;
- mbSwitchPenMode = false;
- mbSwitchEraserMode = true;
- if( maPresSettings.mbMouseAsPen )
- setUseEraser( sal_True ); // update erase ink size
}
- #endif
+
// --------------------------------------------------------------------
// XSlideShowController Methods
// --------------------------------------------------------------------
diff --cc sd/source/ui/unoidl/unolayer.cxx
index 59c68f8,e50c408..69a0b29
mode 100644,100755..100755
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
diff --cc sd/source/ui/view/drawview.cxx
index 0cb307e,4ecea01..c346855
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@@ -206,11 -206,11 +206,11 @@@ sal_Bool DrawView::SetAttributes(const
// Presentation object outline
OutlinerView* pOV = GetTextEditOutlinerView();
::Outliner* pOutliner = pOV->GetOutliner();
- List* pList = (List*)pOV->CreateSelectionList();
+
aTemplateName += String(SdResId(STR_LAYOUT_OUTLINE));
- pOutliner->SetUpdateMode(FALSE);
- mpDocSh->SetWaitCursor( TRUE );
+ pOutliner->SetUpdateMode(sal_False);
+ mpDocSh->SetWaitCursor( sal_True );
// Platzhalter durch Vorlagennamen ersetzen
String aComment(SdResId(STR_UNDO_CHANGE_PRES_OBJECT));
@@@ -219,16 -219,11 +219,16 @@@
aComment.Insert( String((SdResId(STR_PSEUDOSHEET_OUTLINE))), nPos);
mpDocSh->GetUndoManager()->EnterListAction( aComment, String() );
- Paragraph* pPara = (Paragraph*)pList->Last();
+ std::vector<Paragraph*> aSelList;
+ pOV->CreateSelectionList(aSelList);
+
+ std::vector<Paragraph*>::reverse_iterator iter = aSelList.rbegin();
+ Paragraph* pPara = iter != aSelList.rend() ? *iter : NULL;
+
while (pPara)
{
- ULONG nParaPos = pOutliner->GetAbsPos( pPara );
- sal_Int16 nDepth = pOutliner->GetDepth( (USHORT) nParaPos );
+ sal_uLong nParaPos = pOutliner->GetAbsPos( pPara );
+ sal_Int16 nDepth = pOutliner->GetDepth( (sal_uInt16) nParaPos );
String aName(rPage.GetLayoutName());
aName += (sal_Unicode)(' ');
aName += String::CreateFromInt32( (nDepth <= 0) ? 1 : nDepth + 1 );
@@@ -265,11 -260,10 +265,11 @@@
pOutlSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
}
- pPara = (Paragraph*)pList->Prev();
+ ++iter;
+ pPara = iter != aSelList.rend() ? *iter : NULL;
if( !pPara && nDepth > 0 && rSet.GetItemState( EE_PARA_NUMBULLET ) == SFX_ITEM_ON &&
- pOutliner->GetDepth( (USHORT) pOutliner->GetAbsPos(*(aSelList.begin())) ) > 0 )
- pOutliner->GetDepth( (sal_uInt16) pOutliner->GetAbsPos( (Paragraph*) pList->First() ) ) > 0 )
++ pOutliner->GetDepth( (sal_uInt16) pOutliner->GetAbsPos(*(aSelList.begin())) ) > 0 )
pPara = pOutliner->GetParagraph( 0 ); // Put NumBulletItem in outline level 1
}
@@@ -278,7 -272,8 +278,7 @@@
mpDocSh->GetUndoManager()->LeaveListAction();
- bOk = TRUE;
- delete pList;
+ bOk = sal_True;
}
else
{
diff --cc sd/source/ui/view/drtxtob.cxx
index 0e23e4e,dffab1b..a80d32b
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@@ -262,13 -262,11 +262,13 @@@ void TextObjectBar::GetAttrState( SfxIt
{
// Outliner im Gliederungsmodus
::Outliner* pOutl = pOLV->GetOutliner();
- List* pList = pOLV->CreateSelectionList();
- Paragraph* pPara = (Paragraph*) pList->First();
+
+ std::vector<Paragraph*> aSelList;
+ pOLV->CreateSelectionList(aSelList);
+ Paragraph* pPara = aSelList.empty() ? NULL : *(aSelList.begin());
// find out if we are a OutlineView
- BOOL bIsOutlineView(OUTLINERMODE_OUTLINEVIEW == pOLV->GetOutliner()->GetMode());
+ sal_Bool bIsOutlineView(OUTLINERMODE_OUTLINEVIEW == pOLV->GetOutliner()->GetMode());
// This is ONLY for OutlineViews
if(bIsOutlineView)
@@@ -291,11 -289,9 +291,11 @@@
}
}
- while (pPara)
+ for (std::vector<Paragraph*>::const_iterator iter = aSelList.begin(); iter != aSelList.end(); ++iter)
{
+ pPara = *iter;
+
- sal_Int16 nDepth = pOutl->GetDepth( (USHORT) pOutl->GetAbsPos( pPara ) );
+ sal_Int16 nDepth = pOutl->GetDepth( (sal_uInt16) pOutl->GetAbsPos( pPara ) );
if (nDepth > 0 || (bOutlineViewSh && (nDepth <= 0) && !pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE )) )
{
@@@ -307,11 -303,13 +307,11 @@@
(bOutlineViewSh && (nDepth <= 0) && pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ) && pOutl->GetAbsPos(pPara) != 0) )
{
// Nicht maximale Tiefe und nicht ganz oben
- bDisableRight = FALSE;
+ bDisableRight = sal_False;
}
-
- pPara = static_cast<Paragraph*>( pList->Next() );
}
- if ( ( pOutl->GetAbsPos((Paragraph*) pList->Last()) < pOutl->GetParagraphCount() - 1 ) &&
+ if ( ( pOutl->GetAbsPos(pPara) < pOutl->GetParagraphCount() - 1 ) &&
( pOutl->GetParagraphCount() > 1 || !bOutlineViewSh) )
{
// Nicht letzter Absatz
@@@ -328,8 -325,10 +328,8 @@@
&& !pOutl->HasParaFlag( pOutl->GetParagraph(1), PARAFLAG_ISPAGE ) )
{
// Needs to be disabled
- bDisableDown = TRUE;
+ bDisableDown = sal_True;
}
-
- delete pList;
}
if (bDisableLeft)
diff --cc sd/source/ui/view/outlnvsh.cxx
index 5149c85,1233be6..e3efe65
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@@ -858,43 -858,33 +858,43 @@@ void OutlineViewShell::GetMenuState( Sf
// Buttons of toolbar
// first the selection dependent ones: COLLAPSE, EXPAND
- BOOL bDisableCollapse = TRUE;
- BOOL bDisableExpand = TRUE;
- BOOL bUnique = TRUE;
+ sal_Bool bDisableCollapse = sal_True;
+ sal_Bool bDisableExpand = sal_True;
+ sal_Bool bUnique = sal_True;
OutlinerView* pOutlinerView = pOlView->GetViewByWindow(GetActiveWindow());
- List* pList = pOutlinerView->CreateSelectionList();
- Paragraph* pPara = (Paragraph*)pList->First();
- sal_Int16 nDepth;
- sal_Int16 nTmpDepth = pOutl->GetDepth( (sal_uInt16) pOutl->GetAbsPos( pPara ) );
- bool bPage = pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE );
- while (pPara)
+ std::vector<Paragraph*> aSelList;
+ pOutlinerView->CreateSelectionList(aSelList);
+
+ if (!aSelList.empty())
{
- nDepth = pOutl->GetDepth( (sal_uInt16) pOutl->GetAbsPos( pPara ) );
-
- if( nDepth != nTmpDepth )
- bUnique = sal_False;
- if( bPage != pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ) )
- bUnique = sal_False;
- if (!pOutl->IsExpanded(pPara) && pOutl->HasChilds(pPara))
- bDisableExpand = sal_False;
- if (pOutl->IsExpanded(pPara) && pOutl->HasChilds(pPara))
- bDisableCollapse = sal_False;
-
- pPara = (Paragraph*)pList->Next();
- }
+ std::vector<Paragraph*>::const_iterator iter = aSelList.begin();
+ Paragraph* pPara = *iter;
+
+ sal_Int16 nDepth;
- sal_Int16 nTmpDepth = pOutl->GetDepth( (USHORT) pOutl->GetAbsPos( pPara ) );
++ sal_Int16 nTmpDepth = pOutl->GetDepth( (sal_uInt16) pOutl->GetAbsPos( pPara ) );
+ bool bPage = pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE );
+
+ while (iter != aSelList.begin())
+ {
+ pPara = *iter;
- nDepth = pOutl->GetDepth( (USHORT) pOutl->GetAbsPos( pPara ) );
- delete pList;
++ nDepth = pOutl->GetDepth( (sal_uInt16) pOutl->GetAbsPos( pPara ) );
+
+ if( nDepth != nTmpDepth || bPage != pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ))
- bUnique = FALSE;
++ bUnique = sal_False;
+
+ if (pOutl->HasChilds(pPara))
+ {
+ if (!pOutl->IsExpanded(pPara))
- bDisableExpand = FALSE;
++ bDisableExpand = sal_False;
+ else
- bDisableCollapse = FALSE;
++ bDisableCollapse = sal_False;
+ }
+
+ ++iter;
+ }
+ }
if (bDisableExpand)
rSet.DisableItem(SID_OUTLINE_EXPAND);
@@@ -928,8 -918,8 +928,8 @@@
// otherwise look through all paragraphs
if (bDisableCollapseAll || bDisableExpandAll)
{
- ULONG nParaPos = 0;
+ sal_uLong nParaPos = 0;
- pPara = pOutl->GetParagraph( nParaPos );
+ Paragraph* pPara = pOutl->GetParagraph( nParaPos );
while (pPara && (bDisableCollapseAll || bDisableExpandAll))
{
if (!pOutl->IsExpanded(pPara) && pOutl->HasChilds(pPara))
@@@ -1767,106 -1764,8 +1781,7 @@@ SdPage* OutlineViewShell::GetActualPage
return pOlView->GetActualPage();
}
--
- /*************************************************************************
- |*
- |* Retrieve range of marked pages
- |*
- \************************************************************************/
-
- String OutlineViewShell::GetPageRangeString()
- {
- String aStrPageRange;
- BOOL bFirstPageNo = TRUE;
- BOOL bOpenRange = FALSE;
- USHORT nLastPage = 0;
- USHORT nLastUsedPage = (USHORT)-1;
-
- USHORT nPageCount = 0;
- for( USHORT n = 0; n< GetDoc()->GetPageCount(); n++ )
- if( ( (SdPage*)GetDoc()->GetPage( n ) )->GetPageKind() == PK_STANDARD )
- nPageCount++;
-
- ::sd::Window *pWin = GetActiveWindow();
- OutlinerView *pActiveView = pOlView->GetViewByWindow(pWin);
- ::Outliner *pOutl = pActiveView->GetOutliner();
-
- std::vector<Paragraph*> aSelList;
- pActiveView->CreateSelectionList(aSelList);
- Paragraph *pPara = NULL;
-
- for (std::vector<Paragraph*>::const_iterator iter = aSelList.begin(); iter != aSelList.end(); ++iter)
- {
- pPara = *iter;
-
- if ( !pOutl->HasParaFlag(pPara, PARAFLAG_ISPAGE) )
- {
- pPara = pOlView->GetPrevTitle(pPara);
- }
- USHORT nPageToSelect = 0;
- while(pPara)
- {
- pPara = pOlView->GetPrevTitle(pPara);
- if (pPara)
- nPageToSelect++;
- }
-
- if( bFirstPageNo )
- {
- bFirstPageNo = FALSE;
- aStrPageRange = String::CreateFromInt32( sal_Int32( nPageToSelect+1 ) );
- nLastUsedPage = nPageToSelect;
- nPageCount--;
- }
- else
- {
- if( nPageToSelect != nLastPage )
- {
- if( nPageToSelect == nLastPage+1 )
- {
- bOpenRange = TRUE;
- nPageCount--;
- }
- else
- {
- if( bOpenRange )
- {
- if( nLastPage == nLastUsedPage+1 )
- aStrPageRange.Append( sal_Unicode(',') );
- else
- aStrPageRange.Append( sal_Unicode('-') );
-
- aStrPageRange.Append( String::CreateFromInt32( sal_Int32( nLastPage+1 ) ) );
- }
- aStrPageRange.Append( sal_Unicode(',') );
- aStrPageRange.Append( String::CreateFromInt32( sal_Int32( nPageToSelect+1 ) ) );
- nLastUsedPage = nPageToSelect;
- bOpenRange = FALSE;
- nPageCount--;
- }
- }
- }
-
- nLastPage = nPageToSelect;
- }
-
- if( bOpenRange )
- {
- if( nLastPage == nLastUsedPage+1 )
- aStrPageRange.Append( sal_Unicode(',') );
- else
- aStrPageRange.Append( sal_Unicode('-') );
-
- aStrPageRange.Append( String::CreateFromInt32( sal_Int32( nLastPage+1 ) ) );
- }
-
- if( nPageCount == 0 )
- aStrPageRange.Erase();
-
- return aStrPageRange;
- }
-
- void OutlineViewShell::UpdatePreview( SdPage* pPage, BOOL )
+ void OutlineViewShell::UpdatePreview( SdPage* pPage, sal_Bool )
{
const bool bNewPage = pPage != pLastPage;
pLastPage = pPage;
diff --cc sd/source/ui/view/outlview.cxx
index 9b979ae,58c8bd1..efb99b7
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@@ -112,10 -112,12 +112,10 @@@ TYPEINIT1( OutlineView, ::sd::View )
OutlineView::OutlineView( DrawDocShell* pDocSh, ::Window* pWindow, OutlineViewShell* pOutlineViewSh)
: ::sd::View(pDocSh->GetDoc(), pWindow, pOutlineViewSh)
, mpOutlineViewShell(pOutlineViewSh)
- , mpOutliner( mpDoc->GetOutliner(TRUE) )
+ , mpOutliner( mpDoc->GetOutliner(sal_True) )
-, mpOldParaOrder(NULL)
-, mpSelectedParas(NULL)
, mnPagesToProcess(0)
, mnPagesProcessed(0)
- , mbFirstPaint(TRUE)
+ , mbFirstPaint(sal_True)
, mpProgress(NULL)
, maDocColor( COL_WHITE )
, mnPageNumberWidthPixel( 0 )
@@@ -664,18 -669,14 +664,18 @@@ IMPL_LINK( OutlineView, DepthChangedHdl
{
Window* pActWin = mpOutlineViewShell->GetActiveWindow();
OutlinerView* pOlView = GetViewByWindow(pActWin);
- List* pList = pOlView->CreateSelectionList();
- Paragraph* pParagraph = (Paragraph*)pList->First();
- while (pParagraph)
+ std::vector<Paragraph*> aSelList;
+ pOlView->CreateSelectionList(aSelList);
+
+ Paragraph *pParagraph = NULL;
+ for (std::vector<Paragraph*>::const_iterator iter = aSelList.begin(); iter != aSelList.end(); ++iter)
{
- if( !pOutliner->HasParaFlag( pParagraph, PARAFLAG_ISPAGE ) && (pOutliner->GetDepth( (sal_uInt16) pOutliner->GetAbsPos( pParagraph ) ) <= 0) )
+ pParagraph = *iter;
+
+ if( !pOutliner->HasParaFlag( pParagraph, PARAFLAG_ISPAGE ) &&
- (pOutliner->GetDepth( (USHORT) pOutliner->GetAbsPos( pParagraph ) ) <= 0) )
++ (pOutliner->GetDepth( (sal_uInt16) pOutliner->GetAbsPos( pParagraph ) ) <= 0) )
mnPagesToProcess++;
- pParagraph = (Paragraph*)pList->Next();
}
mnPagesToProcess++; // the paragraph being in level 0 already
@@@ -692,8 -693,9 +692,8 @@@
}
else
{
- mpDocSh->SetWaitCursor( TRUE );
+ mpDocSh->SetWaitCursor( sal_True );
}
- delete pList;
}
ParagraphInsertedHdl(pOutliner);
@@@ -930,10 -942,9 +930,10 @@@ IMPL_LINK( OutlineView, BeginMovingHdl
}
// select the pages belonging to the paragraphs on level 0 to select
- USHORT nPos = 0;
- ULONG nParaPos = 0;
+ sal_uInt16 nPos = 0;
+ sal_uLong nParaPos = 0;
- pPara = pOutliner->GetParagraph( 0 );
+ Paragraph* pPara = pOutliner->GetParagraph( 0 );
+ std::vector<Paragraph*>::const_iterator fiter;
while(pPara)
{
@@@ -967,11 -978,13 +967,11 @@@ IMPL_LINK( OutlineView, EndMovingHdl, :
DBG_ASSERT( isRecordingUndo(), "sd::OutlineView::EndMovingHdl(), model change without undo?!" );
// look for insertion position via the first paragraph
- Paragraph* pSearchIt = (Paragraph*)mpSelectedParas->First();
+ Paragraph* pSearchIt = maSelectedParas.empty() ? NULL : *(maSelectedParas.begin());
// look for the first of the selected paragraphs in the new ordering
- USHORT nPosNewOrder = 0;
- ULONG nParaPos = 0;
+ sal_uInt16 nPosNewOrder = 0;
+ sal_uLong nParaPos = 0;
Paragraph* pPara = pOutliner->GetParagraph( 0 );
Paragraph* pPrev = NULL;
while (pPara && pPara != pSearchIt)
@@@ -992,22 -1005,14 +992,22 @@@
else
{
// look for the predecessor in the old ordering
- nPos = (sal_uInt16)mpOldParaOrder->GetPos(pPrev);
+ std::vector<Paragraph*>::const_iterator it = std::find(maOldParaOrder.begin(),
+ maOldParaOrder.end(),
+ pPrev);
+
+ if (it != maOldParaOrder.end())
- nPos = static_cast<USHORT>(it-maOldParaOrder.begin());
++ nPos = static_cast<sal_uInt16>(it-maOldParaOrder.begin());
+ else
+ nPos = 0xffff;
+
DBG_ASSERT(nPos != 0xffff, "Absatz nicht gefunden");
}
mpDoc->MovePages(nPos);
// deselect the pages again
- USHORT nPageCount = (USHORT)maSelectedParas.size();
- sal_uInt16 nPageCount = (sal_uInt16)mpSelectedParas->Count();
++ sal_uInt16 nPageCount = (sal_uInt16)maSelectedParas.size();
while (nPageCount)
{
SdPage* pPage = mpDoc->GetSdPage(nPosNewOrder, PK_STANDARD);
@@@ -1343,22 -1350,17 +1343,22 @@@ SdPage* OutlineView::GetActualPage(
{
::sd::Window* pWin = mpOutlineViewShell->GetActiveWindow();
OutlinerView* pActiveView = GetViewByWindow(pWin);
- std::auto_ptr<List> pSelList( static_cast< List* >(pActiveView->CreateSelectionList()) );
- SdPage* pCurrent = GetPageForParagraph(static_cast<Paragraph*>(pSelList->First()) );
+ std::vector<Paragraph*> aSelList;
+ pActiveView->CreateSelectionList(aSelList);
+
+ Paragraph *pPar = aSelList.empty() ? NULL : *(aSelList.begin());
+ SdPage* pCurrent = GetPageForParagraph(pPar);
+
DBG_ASSERT( pCurrent ||
- (mpDocSh->GetUndoManager() && static_cast< sd::UndoManager *>(mpDocSh->GetUndoManager())->isInUndo()) ||
+ (mpDocSh->GetUndoManager() && static_cast< sd::UndoManager *>(mpDocSh->GetUndoManager())->IsDoing()) ||
maDragAndDropModelGuard.get(),
"sd::OutlineView::GetActualPage(), no current page?" );
+
if( pCurrent )
return pCurrent;
- else
- return mpDoc->GetSdPage( 0, PK_STANDARD );
+
+ return mpDoc->GetSdPage( 0, PK_STANDARD );
}
SdPage* OutlineView::GetPageForParagraph( Paragraph* pPara )
@@@ -1375,9 -1377,9 +1375,9 @@@
}
if( nPageToSelect < (sal_uInt32)mpDoc->GetSdPageCount( PK_STANDARD ) )
- return static_cast< SdPage* >( mpDoc->GetSdPage( (USHORT)nPageToSelect, PK_STANDARD) );
+ return static_cast< SdPage* >( mpDoc->GetSdPage( (sal_uInt16)nPageToSelect, PK_STANDARD) );
- else
- return 0;
+
+ return 0;
}
Paragraph* OutlineView::GetParagraphForPage( ::Outliner* pOutl, SdPage* pPage )
@@@ -1457,10 -1464,9 +1457,10 @@@ void OutlineView::SetSelectedPages(
}
// select the pages belonging to the paragraphs on level 0 to select
- USHORT nPos = 0;
- ULONG nParaPos = 0;
+ sal_uInt16 nPos = 0;
+ sal_uLong nParaPos = 0;
- pPara = mpOutliner->GetParagraph( 0 );
+ Paragraph *pPara = mpOutliner->GetParagraph( 0 );
+ std::vector<Paragraph*>::const_iterator fiter;
while(pPara)
{
commit c4ffa8e23e4192a2494aae24ad79a53865b138a2
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Mar 14 18:05:43 2011 +0100
operator= should accept const args too to make stl implementations happy
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx
index 58bb439..a29b534 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx
@@ -52,7 +52,7 @@ public:
: maBitmap(rBitmap), mbIsExcluded(bIsExcluded) {}
Representative (const Representative& rOther)
: maBitmap(rOther.maBitmap), mbIsExcluded(rOther.mbIsExcluded) {}
- Representative operator= (Representative& rOther)
+ Representative operator= (Representative const& rOther)
{ if (&rOther != this) {maBitmap = rOther.maBitmap; mbIsExcluded = rOther.mbIsExcluded; }
return *this;
}
commit dfba3eedb0842536a261717d19655540b67fde3d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 13 20:24:32 2011 -0500
no more writeInfo
diff --git a/sd/util/sdfilt.map b/sd/util/sdfilt.map
index 0d926cd..2232014 100644
--- a/sd/util/sdfilt.map
+++ b/sd/util/sdfilt.map
@@ -4,7 +4,6 @@ UDK_3_0_0 {
ImportPPT;
SaveVBA;
component_getImplementationEnvironment;
- component_writeInfo;
component_getFactory;
local:
*;
commit 376e4f8b4237f34574b488e515189e4ae2de957c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 13 06:22:49 2011 -0500
fix mis-merge... qa disabled
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
index c887063..1f58994 100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@ -213,6 +213,7 @@
#define CMD_SID_ORIGINAL_SIZE ".uno:OriginalSize"
#define CMD_SID_SAVEGRAPHIC ".uno:SaveGraphic"
#define CMD_SID_OUTLINEMODE ".uno:OutlineMode"
+#define CMD_SID_OUTLINE_TEXT_AUTOFIT ".uno.OutlineTextAutofit"
#define CMD_SID_OUTPUT_QUALITY_BLACKWHITE ".uno:OutputQualityBlackWhite"
#define CMD_SID_OUTPUT_QUALITY_COLOR ".uno:OutputQualityColor"
#define CMD_SID_OUTPUT_QUALITY_CONTRAST ".uno:OutputQualityContrast"
diff --git a/sd/qa/unit/makefile.mk b/sd/qa/unit/makefile.mk
index cf0c35f..27d58cd 100644
--- a/sd/qa/unit/makefile.mk
+++ b/sd/qa/unit/makefile.mk
@@ -45,6 +45,7 @@ SHL1STDLIBS= \
$(SVTOOLLIB) \
$(SVLLIB) \
$(SVXCORELIB) \
+ $(CANVASTOOLSLIB) \
$(EDITENGLIB) \
$(SVXLIB) \
$(BASEGFXLIB) \
@@ -80,31 +81,32 @@ my_file = file://
ALLTAR: test
-$(MISC)$/$(TARGET)$/types.rdb .ERRREMOVE : $(SOLARBINDIR)$/types.rdb
- $(MKDIRHIER) $(@:d)
- $(GNUCOPY) $? $@
+#$(MISC)$/$(TARGET)$/types.rdb .ERRREMOVE : $(SOLARBINDIR)$/types.rdb
+# $(MKDIRHIER) $(@:d)
+# $(GNUCOPY) $? $@
-$(MISC)/$(TARGET)/udkapi.rdb .ERRREMOVE : $(SOLARBINDIR)$/udkapi.rdb
- $(MKDIRHIER) $(@:d)
- $(GNUCOPY) $? $@
+#$(MISC)/$(TARGET)/udkapi.rdb .ERRREMOVE : $(SOLARBINDIR)$/udkapi.rdb
+# $(MKDIRHIER) $(@:d)
+# $(GNUCOPY) $? $@
#Make a services.rdb with the services we know we need to get up and running
-$(MISC)/$(TARGET)/services.rdb .ERRREMOVE : $(MISC)/$(TARGET)/udkapi.rdb makefile.mk
- $(MKDIRHIER) $(@:d)
- $(REGCOMP) -register -br $(MISC)/$(TARGET)/udkapi.rdb -r $@ -wop \
- -c $(DLLPRE)fwk$(DLLPOSTFIX)$(DLLPOST)
+#$(MISC)/$(TARGET)/services.rdb .ERRREMOVE : $(MISC)/$(TARGET)/udkapi.rdb makefile.mk
+# $(MKDIRHIER) $(@:d)
+# $(REGCOMP) -register -br $(MISC)/$(TARGET)/udkapi.rdb -r $@ -wop \
+# -c $(DLLPRE)fwk$(DLLPOSTFIX)$(DLLPOST)
#Tweak things so that we use the .res files in the solver
STAR_RESOURCEPATH:=$(PWD)/$(BIN)$(PATH_SEPERATOR)$(SOLARBINDIR)
.EXPORT : STAR_RESOURCEPATH
-test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb $(MISC)$/$(TARGET)$/types.rdb $(MISC)/$(TARGET)/udkapi.rdb
+test .PHONY: $(SHL1TARGETN) #$(MISC)/$(TARGET)/services.rdb $(MISC)$/$(TARGET)$/types.rdb $(MISC)/$(TARGET)/udkapi.rdb
@echo ----------------------------------------------------------
@echo - start unit test \#1 on library $(SHL1TARGETN)
@echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL1TARGETN) -headless -invisible \
- -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \
- -env:UNO_TYPES="$(my_file)$(PWD)/$(MISC)/$(TARGET)/types.rdb $(my_file)$(PWD)/$(MISC)/$(TARGET)/udkapi.rdb" \
- -env:OOO_BASE_DIR="$(my_file)$(PWD)/$(MISC)/$(TARGET)" \
- -env:BRAND_BASE_DIR="$(my_file)$(PWD)/$(MISC)/$(TARGET)" \
- -env:UNO_USER_PACKAGES_CACHE="$(my_file)$(PWD)/$(MISC)/$(TARGET)"
+ @echo disabled for now
+# $(CPPUNITTESTER) $(SHL1TARGETN) -headless -invisible \
+# -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \
+# -env:UNO_TYPES="$(my_file)$(PWD)/$(MISC)/$(TARGET)/types.rdb $(my_file)$(PWD)/$(MISC)/$(TARGET)/udkapi.rdb" \
+# -env:OOO_BASE_DIR="$(my_file)$(PWD)/$(MISC)/$(TARGET)" \
+# -env:BRAND_BASE_DIR="$(my_file)$(PWD)/$(MISC)/$(TARGET)" \
+# -env:UNO_USER_PACKAGES_CACHE="$(my_file)$(PWD)/$(MISC)/$(TARGET)"
diff --git a/sd/qa/unit/uimpress.cxx b/sd/qa/unit/uimpress.cxx
index 1ce3536..80f6f0f 100644
--- a/sd/qa/unit/uimpress.cxx
+++ b/sd/qa/unit/uimpress.cxx
@@ -124,8 +124,8 @@ void Test::testAddPage()
void Test::testCustomShow()
{
- CPPUNIT_ASSERT_MESSAGE("test generation of custom show list!",
- m_pDoc->GetCustomShowList(TRUE));
+ CPPUNIT_ASSERT_MESSAGE("test generation of custom show list!",
+ m_pDoc->GetCustomShowList(sal_True));
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 4f4b76e..b01ea67 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -255,7 +255,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
rSet.Put( XLineStyleItem(XLINE_NONE) );
rSet.Put( XFillStyleItem(XFILL_NONE) );
rSet.Put( SdrTextFitToSizeTypeItem(SDRTEXTFIT_AUTOFIT) );
- rSet.Put( SdrTextAutoGrowHeightItem(FALSE) );
+ rSet.Put( SdrTextAutoGrowHeightItem(sal_False) );
// #i16874# enable kerning by default but only for new documents
rSet.Put( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) );
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index b610438..4973b25 100755
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -185,7 +185,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
aAny >>= bVisible;
if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Change" ) ) ) )
{
- switch ( *(INT32*)aAny.getValue() )
+ switch ( *(sal_Int32*)aAny.getValue() )
{
case 1 : // automatisch
mnDiaMode++;
@@ -218,7 +218,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LoopSound" ) ) ) )
aAny >>= bLoopSound;
- sal_Bool bNeedsSSSlideInfoAtom = ( bVisible == FALSE )
+ sal_Bool bNeedsSSSlideInfoAtom = ( bVisible == sal_False )
|| ( mnDiaMode == 2 )
|| ( bIsSound )
|| ( bStopSound )
@@ -228,7 +228,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
sal_uInt8 nDirection = 0;
sal_uInt8 nTransitionType = 0;
sal_uInt16 nBuildFlags = 1; // advange by mouseclick
- INT32 nSlideTime = 0; // muss noch !!!
+ sal_Int32 nSlideTime = 0; // muss noch !!!
sal_uInt8 nSpeed = 1;
if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Speed" ) ) ) )
@@ -251,7 +251,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
nTransitionType = GetTransition( eFe, nDirection );
if ( mnDiaMode == 2 ) // automatic ?
nBuildFlags |= 0x400;
- if ( bVisible == FALSE )
+ if ( bVisible == sal_False )
nBuildFlags |= 4;
if ( bIsSound )
nBuildFlags |= 16;
@@ -261,7 +261,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
nBuildFlags |= 256;
if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Duration" ) ) ) )// duration of this slide
- nSlideTime = *(INT32*)aAny.getValue() << 10; // in ticks
+ nSlideTime = *(sal_Int32*)aAny.getValue() << 10; // in ticks
mpPptEscherEx->AddAtom( 16, EPP_SSSlideInfoAtom );
*mpStrm << nSlideTime // standtime in ticks
@@ -279,7 +279,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
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
+ ImplWritePage( rLayout, aSolverContainer, NORMAL, sal_False, nPageNum ); // Die Shapes der Seite werden im PPT Dok. erzeugt
mpPptEscherEx->LeaveGroup();
if ( bHasBackground )
@@ -358,7 +358,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS
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
+ *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 )
@@ -393,8 +393,8 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS
mpPptEscherEx->BeginAtom();
- sal_Bool bFirst = TRUE;
- sal_Bool bSimpleText = FALSE;
+ sal_Bool bFirst = sal_True;
+ sal_Bool bSimpleText = sal_False;
*mpStrm << (sal_uInt16)5; // paragraph count
@@ -402,13 +402,13 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS
{
if ( nInstance >= EPP_TEXTTYPE_CenterBody )
{
- bFirst = FALSE;
- bSimpleText = TRUE;
+ bFirst = sal_False;
+ bSimpleText = sal_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;
+ bFirst = sal_False;
}
mpPptEscherEx->EndAtom( EPP_TxMasterStyleAtom, 0, nInstance );
}
@@ -420,7 +420,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS
mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
mpPptEscherEx->EnterGroup(0,0);
- ImplWritePage( GetLayout( 0 ), aSolverContainer, MASTER, TRUE ); // Die Shapes der Seite werden im PPT Dok. erzeugt
+ ImplWritePage( GetLayout( 0 ), aSolverContainer, MASTER, sal_True ); // Die Shapes der Seite werden im PPT Dok. erzeugt
mpPptEscherEx->LeaveGroup();
ImplWriteBackground( aXBackgroundPropSet );
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index b24aab1..77b6aa6 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -81,9 +81,9 @@ struct PHLayout
sal_uInt8 nTypeOfTitle;
sal_uInt8 nTypeOfOutliner;
- BOOL bTitlePossible;
- BOOL bOutlinerPossible;
- BOOL bSecOutlinerPossible;
+ sal_Bool bTitlePossible;
+ sal_Bool bOutlinerPossible;
+ sal_Bool bSecOutlinerPossible;
};
enum PageType { NORMAL = 0, MASTER = 1, NOTICE = 2, UNDEFINED = 3, LAYOUT = 4 };
@@ -375,7 +375,7 @@ protected:
virtual sal_Bool ImplCreateMainNotes()=0;
sal_Bool GetStyleSheets();
- sal_Bool GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup = FALSE );
+ sal_Bool GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup = sal_False );
sal_Bool CreateMainNotes();
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index 04b7a04..a7c9acb 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -74,7 +74,8 @@ class PowerPointExport : public XmlFilterBase, public PPTWriterBase
friend class PowerPointShapeExport;
public:
- PowerPointExport( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr );
+ PowerPointExport( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rxCtxt );
+
~PowerPointExport();
// from FilterBase
@@ -105,7 +106,7 @@ protected:
virtual sal_Bool ImplCreateDocument();
virtual sal_Bool ImplCreateMainNotes();
-
+ virtual ::oox::ole::VbaProject* implCreateVbaProject() const;
sal_Bool WriteNotesMaster();
void WriteAnimateTo( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Any aValue, const ::rtl::OUString& rAttributeName );
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index e15967d..ba37531 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -790,12 +790,12 @@ sal_Bool AnimationExporter::GetNodeType( const Reference< XAnimationNode >& xNod
if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) )
{
if ( p->Value >>= nType )
- return TRUE;
+ return sal_True;
}
}
}
- return FALSE;
+ return sal_False;
}
void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnimationNode >& xNode,
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index a1f4759..0556dd7 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -32,7 +32,7 @@
#include "eppt.hxx"
#include "epptdef.hxx"
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
#include <tools/globname.hxx>
#include <tools/datetime.hxx>
#include <tools/poly.hxx>
@@ -113,31 +113,31 @@ using ::com::sun::star::uno::UNO_QUERY;
static PHLayout pPHLayout[] =
{
- { EPP_LAYOUT_TITLESLIDE, { 0x0d, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x10, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, TRUE, TRUE },
- { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, FALSE, FALSE, FALSE },
- { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x14, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x15, 0x0d, 0x0e, TRUE, FALSE, FALSE },
- { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, FALSE, FALSE },
- { EPP_LAYOUT_RIGHTCOLUMN2ROWS, { 0x0d, 0x0e, 0x13, 0x13, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_LEFTCOLUMN2ROWS, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_TOPROW2COLUMN, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_4OBJECTS, { 0x0d, 0x13, 0x13, 0x13, 0x13, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, FALSE, FALSE },
- { EPP_LAYOUT_ONLYTITLE, { 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, FALSE, FALSE },
- { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, FALSE, FALSE, FALSE },
- { EPP_LAYOUT_TITLERIGHT2BODIESLEFT, { 0x11, 0x12, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x11, 0x12, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_TITLERIGHTBODYLEFT, { 0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x11, 0x12, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x12, TRUE, TRUE, FALSE },
- { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x12, TRUE, TRUE, FALSE }
+ { EPP_LAYOUT_TITLESLIDE, { 0x0d, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x10, sal_True, sal_True, sal_False },
+ { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+ { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+ { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_True, sal_True, sal_True },
+ { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+ { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_False, sal_False, sal_False },
+ { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+ { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x14, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+ { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x15, 0x0d, 0x0e, sal_True, sal_False, sal_False },
+ { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+ { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+ { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_False, sal_False },
+ { EPP_LAYOUT_RIGHTCOLUMN2ROWS, { 0x0d, 0x0e, 0x13, 0x13, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+ { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+ { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+ { EPP_LAYOUT_LEFTCOLUMN2ROWS, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+ { EPP_LAYOUT_TOPROW2COLUMN, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+ { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+ { EPP_LAYOUT_4OBJECTS, { 0x0d, 0x13, 0x13, 0x13, 0x13, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_False, sal_False },
+ { EPP_LAYOUT_ONLYTITLE, { 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_True, sal_False, sal_False },
+ { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_False, sal_False, sal_False },
+ { EPP_LAYOUT_TITLERIGHT2BODIESLEFT, { 0x11, 0x12, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x11, 0x12, sal_True, sal_True, sal_False },
+ { EPP_LAYOUT_TITLERIGHTBODYLEFT, { 0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x11, 0x12, sal_True, sal_True, sal_False },
+ { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x12, sal_True, sal_True, sal_False },
+ { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x12, sal_True, sal_True, sal_False }
};
#define PPT_WRITER_BASE_INIT_VALUES \
@@ -185,10 +185,10 @@ void PPTWriterBase::exportPPT()
if ( !GetPageByIndex( 0, NOTICE ) )
return;
- INT32 nWidth = 21000;
+ sal_Int32 nWidth = 21000;
if ( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ) ) )
mAny >>= nWidth;
- INT32 nHeight = 29700;
+ sal_Int32 nHeight = 29700;
if ( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ) )
mAny >>= nHeight;
@@ -254,7 +254,7 @@ void PPTWriterBase::exportPPT()
sal_Bool PPTWriterBase::InitSOIface()
{
- while( TRUE )
+ while( sal_True )
{
mXDrawPagesSupplier = Reference< XDrawPagesSupplier >( mXModel, UNO_QUERY );
if ( !mXDrawPagesSupplier.is() )
@@ -274,16 +274,16 @@ sal_Bool PPTWriterBase::InitSOIface()
if ( !GetPageByIndex( 0, NORMAL ) )
break;
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
// ---------------------------------------------------------------------------------------------
sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
{
- while( TRUE )
+ while( sal_True )
{
if ( ePageType != meLatestPageType )
{
@@ -294,7 +294,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
{
mXDrawPages = mXDrawPagesSupplier->getDrawPages();
if( !mXDrawPages.is() )
- return FALSE;
+ return sal_False;
}
break;
@@ -302,7 +302,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
{
mXDrawPages = mXMasterPagesSupplier->getMasterPages();
if( !mXDrawPages.is() )
- return FALSE;
+ return sal_False;
}
break;
default:
@@ -360,9 +360,9 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
}
}
}
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
// ---------------------------------------------------------------------------------------------
@@ -372,7 +372,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum )
Any aAny;
if ( !GetPageByIndex( nPageNum, NORMAL ) )
- return FALSE;
+ return sal_False;
sal_uInt32 nMasterNum = GetMasterIndex( NORMAL );
SetCurrentStyleSheet( nMasterNum );
@@ -409,7 +409,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum )
ImplWriteSlide( nPageNum, nMasterNum, nMode, bHasBackground, aXBackgroundPropSet );
- return TRUE;
+ return sal_True;
};
// ---------------------------------------------------------------------------------------------
@@ -417,12 +417,12 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum )
sal_Bool PPTWriterBase::CreateNotes( sal_uInt32 nPageNum )
{
if ( !GetPageByIndex( nPageNum, NOTICE ) )
- return FALSE;
+ return sal_False;
SetCurrentStyleSheet( GetMasterIndex( NORMAL ) );
ImplWriteNotes( nPageNum );
- return TRUE;
+ return sal_True;
};
// ---------------------------------------------------------------------------------------------
@@ -430,18 +430,18 @@ sal_Bool PPTWriterBase::CreateNotes( sal_uInt32 nPageNum )
sal_Bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum )
{
if ( !GetPageByIndex( nPageNum, MASTER ) )
- return FALSE;
+ return sal_False;
SetCurrentStyleSheet( nPageNum );
if ( !ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ) ) ) // Backgroundshape laden
- return FALSE;
+ return sal_False;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet;
if ( !( mAny >>= aXBackgroundPropSet ) )
- return FALSE;
+ return sal_False;
ImplWriteSlideMaster( nPageNum, aXBackgroundPropSet );
- return TRUE;
+ return sal_True;
};
// ---------------------------------------------------------------------------------------------
@@ -675,30 +675,30 @@ sal_Bool PPTWriterBase::GetStyleSheets()
sal_Bool PPTWriterBase::CreateMainNotes()
{
if ( !GetPageByIndex( 0, NOTICE ) )
- return FALSE;
+ return sal_False;
SetCurrentStyleSheet( 0 );
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XMasterPageTarget >
aXMasterPageTarget( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
if ( !aXMasterPageTarget.is() )
- return FALSE;
+ return sal_False;
mXDrawPage = aXMasterPageTarget->getMasterPage();
if ( !mXDrawPage.is() )
- return FALSE;
+ return sal_False;
mXPropSet = ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >
( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
if ( !mXPropSet.is() )
- return FALSE;
+ return sal_False;
mXShapes = ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes >
( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
if ( !mXShapes.is() )
- return FALSE;
+ return sal_False;
return ImplCreateMainNotes();
}
@@ -739,9 +739,9 @@ Rectangle PPTWriterBase::MapRectangle( const awt::Rectangle& rRect )
sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup )
{
- while(TRUE)
+ while(sal_True)
{
- if ( ( bGroup == FALSE ) || ( GetCurrentGroupLevel() == 0 ) )
+ if ( ( bGroup == sal_False ) || ( GetCurrentGroupLevel() == 0 ) )
{
Any aAny( mXShapes->getByIndex( nIndex ) );
aAny >>= mXShape;
@@ -767,7 +767,7 @@ sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup )
sal_uInt16 nPos = mType.Search( (const char*)"Shape" );
mType.Erase( nPos, 5 );
- mbPresObj = mbEmptyPresObj = FALSE;
+ mbPresObj = mbEmptyPresObj = sal_False;
if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsPresentationObject" ) ) ) )
mAny >>= mbPresObj;
@@ -779,9 +779,9 @@ sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup )
? *((sal_Int32*)aAny.getValue() )
: 0;
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
// -----------------------------------------------------------------------
@@ -995,10 +995,10 @@ sal_Int8 PPTWriterBase::GetTransition( FadeEffect eEffect, sal_uInt8& nDirection
sal_Bool PPTWriterBase::ContainsOtherShapeThanPlaceholders( sal_Bool bForOOMLX )
{
sal_uInt32 nShapes = mXShapes->getCount();
- sal_Bool bOtherThanPlaceHolders = FALSE;
+ sal_Bool bOtherThanPlaceHolders = sal_False;
if ( nShapes )
- for ( sal_uInt32 nIndex = 0; ( nIndex < nShapes ) && ( bOtherThanPlaceHolders == FALSE ); nIndex++ ) {
+ for ( sal_uInt32 nIndex = 0; ( nIndex < nShapes ) && ( bOtherThanPlaceHolders == sal_False ); nIndex++ ) {
if ( GetShapeByIndex( nIndex ) && mType != "drawing.Page" ) {
if( bForOOMLX &&
( mType == "presentation.Page" ||
@@ -1006,9 +1006,9 @@ sal_Bool PPTWriterBase::ContainsOtherShapeThanPlaceholders( sal_Bool bForOOMLX )
Reference< XSimpleText > rXText( mXShape, UNO_QUERY );
if( rXText.is() && rXText->getString().getLength() != 0 )
- bOtherThanPlaceHolders = TRUE;
+ bOtherThanPlaceHolders = sal_True;
} else
- bOtherThanPlaceHolders = TRUE;
+ bOtherThanPlaceHolders = sal_True;
}
DBG(printf("mType == %s\n", mType.GetBuffer()));
}
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index dc20e6e..4b7c191 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -29,11 +29,13 @@
#include <boost/unordered_map.hpp>
#include <stdio.h>
#include <oox/drawingml/chart/chartconverter.hxx>
-#include <oox/core/tokens.hxx>
+#include <oox/token/tokens.hxx>
+#include <oox/ole/vbaproject.hxx>
#include <epptooxml.hxx>
#include <epptdef.hxx>
#include <oox/export/shapes.hxx>
+#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/factory.hxx>
#include <sax/fshelper.hxx>
#include <rtl/ustrbuf.hxx>
@@ -307,8 +309,8 @@ ShapeExport& PowerPointShapeExport::WriteUnknownShape( Reference< XShape > xShap
return *this;
}
-PowerPointExport::PowerPointExport( const Reference< XMultiServiceFactory > & rSMgr )
- : XmlFilterBase( rSMgr ),
+PowerPointExport::PowerPointExport( const Reference< XComponentContext > & rxCtxt )
+ : XmlFilterBase( rxCtxt ),
PPTWriterBase(),
mnLayoutFileIdMax( 1 ),
mnSlideIdMax( 1 << 8 ),
@@ -368,6 +370,11 @@ bool PowerPointExport::exportDocument() throw()
return true;
}
+::oox::ole::VbaProject* PowerPointExport::implCreateVbaProject() const
+{
+ return new ::oox::ole::VbaProject( getComponentContext(), getModel(), CREATE_OUSTRING( "Impress" ) );
+}
+
void PowerPointExport::ImplWriteBackground( FSHelperPtr pFS, Reference< XPropertySet > rXPropSet )
{
FillStyle aFillStyle( FillStyle_NONE );
@@ -824,7 +831,7 @@ void PowerPointExport::WriteAnimationNodeAnimateInside( FSHelperPtr pFS, const R
pFS->startElementNS( XML_p, XML_cBhvr,
XML_additive, pAdditive,
FSEND );
- WriteAnimationNodeCommonPropsStart( pFS, rXNode, TRUE, bMainSeqChild );
+ WriteAnimationNodeCommonPropsStart( pFS, rXNode, sal_True, bMainSeqChild );
WriteAnimationTarget( pFS, rXAnimate->getTarget() );
WriteAnimationAttributeName( pFS, rXAnimate->getAttributeName() );
pFS->endElementNS( XML_p, XML_cBhvr );
@@ -856,7 +863,7 @@ void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, const char* pDe
void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, Any& rAny, sal_Bool bWriteEvent, sal_Bool bMainSeqChild )
{
- sal_Bool bHasFDelay = FALSE;
+ sal_Bool bHasFDelay = sal_False;
double fDelay = 0;
Timing eTiming;
Event aEvent;
@@ -864,7 +871,7 @@ void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, Any& rAny, sal_
const char* pEvent = NULL;
if( rAny >>= fDelay )
- bHasFDelay = TRUE;
+ bHasFDelay = sal_True;
else if( rAny >>= eTiming ) {
if( eTiming == Timing_INDEFINITE )
pDelay = "indefinite";
@@ -914,7 +921,7 @@ void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, Any& rAny, sal_
}
if( aEvent.Offset >>= fDelay ) {
- bHasFDelay = TRUE;
+ bHasFDelay = sal_True;
DBG(printf ("event offset: %f\n", fDelay));
} else if( aEvent.Offset >>= eTiming ) {
if( eTiming == Timing_INDEFINITE )
@@ -1018,7 +1025,7 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons
}
sal_uInt32 nPresetId = 0;
- sal_Bool bPresetId = FALSE;
+ sal_Bool bPresetId = sal_False;
if ( pAny[ DFF_ANIM_PRESET_ID ] ) {
rtl::OUString sPreset;
if ( *pAny[ DFF_ANIM_PRESET_ID ] >>= sPreset )
@@ -1026,7 +1033,7 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons
}
sal_uInt32 nPresetSubType = 0;
- sal_Bool bPresetSubType = FALSE;
+ sal_Bool bPresetSubType = sal_False;
if ( pAny[ DFF_ANIM_PRESET_SUB_TYPE ] ) {
rtl::OUString sPresetSubType;
if ( *pAny[ DFF_ANIM_PRESET_SUB_TYPE ] >>= sPresetSubType ) {
@@ -1072,9 +1079,9 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons
pFS->startElementNS( XML_p, XML_stCondLst, FSEND );
if( aAny >>= aCondSeq ) {
for( int i = 0; i < aCondSeq.getLength(); i ++ )
- WriteAnimationCondition( pFS, aCondSeq[ i ], FALSE, bMainSeqChild );
+ WriteAnimationCondition( pFS, aCondSeq[ i ], sal_False, bMainSeqChild );
} else
- WriteAnimationCondition( pFS, aAny, FALSE, bMainSeqChild );
+ WriteAnimationCondition( pFS, aAny, sal_False, bMainSeqChild );
pFS->endElementNS( XML_p, XML_stCondLst );
}
@@ -1085,9 +1092,9 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons
pFS->startElementNS( XML_p, XML_endCondLst, FSEND );
if( aAny >>= aCondSeq ) {
for( int i = 0; i < aCondSeq.getLength(); i ++ )
- WriteAnimationCondition( pFS, aCondSeq[ i ], FALSE, bMainSeqChild );
+ WriteAnimationCondition( pFS, aCondSeq[ i ], sal_False, bMainSeqChild );
} else
- WriteAnimationCondition( pFS, aAny, FALSE, bMainSeqChild );
+ WriteAnimationCondition( pFS, aAny, sal_False, bMainSeqChild );
pFS->endElementNS( XML_p, XML_stCondLst );
}
@@ -1126,14 +1133,14 @@ void PowerPointExport::WriteAnimationNodeSeq( FSHelperPtr pFS, const Reference<
pFS->startElementNS( XML_p, XML_seq, FSEND );
- WriteAnimationNodeCommonPropsStart( pFS, rXNode, TRUE, bMainSeqChild );
+ WriteAnimationNodeCommonPropsStart( pFS, rXNode, sal_True, bMainSeqChild );
pFS->startElementNS( XML_p, XML_prevCondLst, FSEND );
- WriteAnimationCondition( pFS, NULL, "onPrev", 0, TRUE );
+ WriteAnimationCondition( pFS, NULL, "onPrev", 0, sal_True );
pFS->endElementNS( XML_p, XML_prevCondLst );
pFS->startElementNS( XML_p, XML_nextCondLst, FSEND );
- WriteAnimationCondition( pFS, NULL, "onNext", 0, TRUE );
+ WriteAnimationCondition( pFS, NULL, "onNext", 0, sal_True );
pFS->endElementNS( XML_p, XML_nextCondLst );
pFS->endElementNS( XML_p, XML_seq );
@@ -1152,7 +1159,7 @@ void PowerPointExport::WriteAnimationNodeEffect( FSHelperPtr pFS, const Referenc
XML_transition, pDirection,
FSEND );
- WriteAnimationNodeAnimateInside( pFS, rXNode, bMainSeqChild, FALSE );
+ WriteAnimationNodeAnimateInside( pFS, rXNode, bMainSeqChild, sal_False );
pFS->endElementNS( XML_p, XML_animEffect );
}
@@ -1196,7 +1203,7 @@ void PowerPointExport::WriteAnimationNode( FSHelperPtr pFS, const Reference< XAn
pFS->startElementNS( XML_p, xmlNodeType, FSEND );
- WriteAnimationNodeCommonPropsStart( pFS, rXNode, TRUE, bMainSeqChild );
+ WriteAnimationNodeCommonPropsStart( pFS, rXNode, sal_True, bMainSeqChild );
pFS->endElementNS( XML_p, xmlNodeType );
}
@@ -1215,7 +1222,7 @@ void PowerPointExport::WriteAnimations( FSHelperPtr pFS )
pFS->startElementNS( XML_p, XML_timing, FSEND );
pFS->startElementNS( XML_p, XML_tnLst, FSEND );
- WriteAnimationNode( pFS, xNode, FALSE );
+ WriteAnimationNode( pFS, xNode, sal_False );
pFS->endElementNS( XML_p, XML_tnLst );
pFS->endElementNS( XML_p, XML_timing );
@@ -1281,7 +1288,7 @@ void PowerPointExport::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNu
ImplWriteBackground( pFS, aXBackgroundPropSet );
}
- WriteShapeTree( pFS, NORMAL, FALSE );
+ WriteShapeTree( pFS, NORMAL, sal_False );
pFS->endElementNS( XML_p, XML_cSld );
@@ -1304,7 +1311,7 @@ void PowerPointExport::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNu
void PowerPointExport::ImplWriteNotes( sal_uInt32 nPageNum )
{
- if( !mbCreateNotes || !ContainsOtherShapeThanPlaceholders( TRUE ) )
+ if( !mbCreateNotes || !ContainsOtherShapeThanPlaceholders( sal_True ) )
return;
DBG(printf("write Notes %d\n----------------\n", nPageNum));
@@ -1320,7 +1327,7 @@ void PowerPointExport::ImplWriteNotes( sal_uInt32 nPageNum )
pFS->startElementNS( XML_p, XML_cSld, FSEND );
- WriteShapeTree( pFS, NOTICE, FALSE );
+ WriteShapeTree( pFS, NOTICE, sal_False );
pFS->endElementNS( XML_p, XML_cSld );
@@ -1466,7 +1473,7 @@ void PowerPointExport::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPr
pFS->startElementNS( XML_p, XML_cSld, FSEND );
ImplWriteBackground( pFS, aXBackgroundPropSet );
- WriteShapeTree( pFS, LAYOUT, TRUE );
+ WriteShapeTree( pFS, LAYOUT, sal_True );
pFS->endElementNS( XML_p, XML_cSld );
@@ -1580,7 +1587,7 @@ void PowerPointExport::ImplWritePPTXLayout( sal_Int32 nOffset, sal_uInt32 nMaste
XML_name, aLayoutInfo[ nOffset ].sName,
FSEND );
//pFS->write( MINIMAL_SPTREE ); // TODO: write actual shape tree
- WriteShapeTree( pFS, LAYOUT, TRUE );
+ WriteShapeTree( pFS, LAYOUT, sal_True );
pFS->endElementNS( XML_p, XML_cSld );
@@ -1612,7 +1619,7 @@ void PowerPointExport::WriteShapeTree( FSHelperPtr pFS, PageType ePageType, sal_
DBG(printf( "leave group\n" ));
}
- if ( GetShapeByIndex( GetCurrentGroupIndex(), TRUE ) ) {
+ if ( GetShapeByIndex( GetCurrentGroupIndex(), sal_True ) ) {
DBG(printf( "mType: \"%s\"\n", mType.GetBuffer() ));
aDML.WriteShape( mXShape );
}
@@ -1638,10 +1645,10 @@ sal_Bool PowerPointShapeExport::WritePlaceholder( Reference< XShape > xShape, Pl
if( bMaster && ShapeExport::NonEmptyText( xShape ) ) {
WritePlaceholderShape( xShape, ePlaceholder );
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
ShapeExport& PowerPointShapeExport::WritePlaceholderShape( Reference< XShape > xShape, PlaceholderType ePlaceholder )
@@ -1948,20 +1955,20 @@ void PowerPointExport::WriteTheme( sal_Int32 nThemeNum )
sal_Bool PowerPointExport::ImplCreateDocument()
{
- mbCreateNotes = FALSE;
+ mbCreateNotes = sal_False;
for( sal_uInt32 i = 0; i < mnPages; i++ )
{
if ( !GetPageByIndex( i, NOTICE ) )
- return FALSE;
+ return sal_False;
- if( ContainsOtherShapeThanPlaceholders( TRUE ) ) {
- mbCreateNotes = TRUE;
+ if( ContainsOtherShapeThanPlaceholders( sal_True ) ) {
+ mbCreateNotes = sal_True;
break;
}
}
- return TRUE;
+ return sal_True;
}
sal_Bool PowerPointExport::WriteNotesMaster()
@@ -2004,7 +2011,7 @@ sal_Bool PowerPointExport::WriteNotesMaster()
( mAny >>= aXBackgroundPropSet ) )
ImplWriteBackground( pFS, aXBackgroundPropSet );
- WriteShapeTree( pFS, NOTICE, TRUE );
+ WriteShapeTree( pFS, NOTICE, sal_True );
pFS->endElementNS( XML_p, XML_cSld );
@@ -2028,7 +2035,7 @@ sal_Bool PowerPointExport::WriteNotesMaster()
DBG(printf("----------------\n"));
- return TRUE;
+ return sal_True;
}
sal_Bool PowerPointExport::ImplCreateMainNotes()
@@ -2036,7 +2043,7 @@ sal_Bool PowerPointExport::ImplCreateMainNotes()
if( mbCreateNotes )
return WriteNotesMaster();
- return TRUE;
+ return sal_True;
}
#define IMPL_NAME "com.sun.star.comp.Impress.oox.PowerPointExport"
@@ -2053,9 +2060,9 @@ uno::Sequence< OUString > SAL_CALL PowerPointExport_getSupportedServiceNames() t
return aSeq;
}
-uno::Reference< uno::XInterface > SAL_CALL PowerPointExport_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception )
+uno::Reference< uno::XInterface > SAL_CALL PowerPointExport_createInstance(const uno::Reference< XComponentContext > & rxCtxt ) throw( uno::Exception )
{
- return (cppu::OWeakObject*)new PowerPointExport( rSMgr );
+ return (cppu::OWeakObject*)new PowerPointExport( rxCtxt );
}
OUString PowerPointExport::implGetImplementationName() const
@@ -2070,6 +2077,18 @@ OUString PowerPointExport::implGetImplementationName() const
// - component_getImplementationEnvironment -
// ------------------------------------------
+static struct cppu::ImplementationEntry g_entries[] =
+{
+ {
+ oox::core::PowerPointExport_createInstance,
+ oox::core::PowerPointExport_getImplementationName,
+ oox::core::PowerPointExport_getSupportedServiceNames,
+ cppu::createSingleComponentFactory,
+ 0 , 0
+ },
+ { 0, 0, 0, 0, 0, 0 }
+};
+
#ifdef __cplusplus
extern "C"
{
@@ -2080,61 +2099,13 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-// -----------------------
-// - component_writeInfo -
-// -----------------------
-
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, void* pRegistryKey )
-{
- sal_Bool bRet = sal_False;
-
- if( pRegistryKey )
- {
- try
- {
- uno::Reference< registry::XRegistryKey > xNewKey1(
- static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( IMPL_NAME "/UNO/SERVICES/" )) ) );
- xNewKey1->createKey( oox::core::PowerPointExport_getSupportedServiceNames().getConstArray()[0] );
-
- bRet = sal_True;
- }
- catch( registry::InvalidRegistryException& )
- {
- OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
- }
- }
-
- return bRet;
-}
-
// ------------------------
// - component_getFactory -
// ------------------------
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey )
{
- uno::Reference< lang::XSingleServiceFactory > xFactory;
- void* pRet = 0;
-
- if( rtl_str_compare( pImplName, IMPL_NAME ) == 0 )
- {
- const ::rtl::OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( IMPL_NAME ) );
-
- xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
- reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
- oox::core::PowerPointExport_getImplementationName(),
- oox::core::PowerPointExport_createInstance,
- oox::core::PowerPointExport_getSupportedServiceNames() ) );
- }
-
- if( xFactory.is() )
- {
- xFactory->acquire();
- pRet = xFactory.get();
- }
-
- return pRet;
+ return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
}
#ifdef __cplusplus
diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx
index 43de6be..e287805 100644
--- a/sd/source/filter/eppt/pptx-stylesheet.cxx
+++ b/sd/source/filter/eppt/pptx-stylesheet.cxx
@@ -143,7 +143,7 @@ PPTExParaSheet::PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBull
rBuProv ( rProv ),
mnInstance ( nInstance )
{
- sal_Bool bHasBullet = FALSE;
+ sal_Bool bHasBullet = sal_False;
sal_uInt16 nUpperDist = 0;
sal_uInt16 nBulletChar = 0x2022;
@@ -163,7 +163,7 @@ PPTExParaSheet::PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBull
case EPP_TEXTTYPE_HalfBody :
case EPP_TEXTTYPE_QuarterBody :
{
- bHasBullet = TRUE;
+ bHasBullet = sal_True;
nUpperDist = 0x14;
}
break;
@@ -225,7 +225,7 @@ PPTExParaSheet::PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBull
rLev.mnAsianSettings = 2;
rLev.mnBiDi = 0;
- rLev.mbExtendedBulletsUsed = FALSE;
+ rLev.mbExtendedBulletsUsed = sal_False;
rLev.mnBulletId = 0xffff;
rLev.mnBulletStart = 0;
rLev.mnMappedNumType = 0;
@@ -304,7 +304,7 @@ void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co
{
PPTExParaLevel& rLevel = maParaLevel[ i ];
if ( i )
- aParagraphObj.ImplGetNumberingLevel( rBuProv, i, FALSE );
+ aParagraphObj.ImplGetNumberingLevel( rBuProv, i, sal_False );
rLevel.mnTextOfs = aParagraphObj.nTextOfs;
rLevel.mnBulletOfs = (sal_uInt16)aParagraphObj.nBulletOfs;
rLevel.mnBulletChar = aParagraphObj.cBulletId;
@@ -436,7 +436,7 @@ sal_Bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLev
switch ( eAttr )
{
- case ParaAttr_BulletOn : return ( rPara.mbIsBullet ) ? ( nValue ) ? FALSE : TRUE : ( nValue ) ? TRUE : FALSE;
+ case ParaAttr_BulletOn : return ( rPara.mbIsBullet ) ? ( nValue ) ? sal_False : sal_True : ( nValue ) ? sal_True : sal_False;
case ParaAttr_BuHardFont :
case ParaAttr_BulletFont : return ( rPara.mnBulletFont != nValue );
case ParaAttr_BuHardColor :
@@ -460,7 +460,7 @@ sal_Bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLev
case CharAttr_Embossed : nFlag = 512; break;
case CharAttr_Font : return ( rChar.mnFont != nValue );
case CharAttr_AsianOrComplexFont : return ( rChar.mnAsianOrComplexFont != nValue );
- case CharAttr_Symbol : return TRUE;
+ case CharAttr_Symbol : return sal_True;
case CharAttr_FontHeight : return ( rChar.mnFontHeight != nValue );
case CharAttr_FontColor : return ( rChar.mnFontColor != nValue );
case CharAttr_Escapement : return ( rChar.mnEscapement != nValue );
@@ -474,7 +474,7 @@ sal_Bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLev
else
return ( ( nValue & nFlag ) != 0 );
}
- return TRUE;
+ return sal_True;
}
sal_uInt32 PPTExStyleSheet::SizeOfTxCFStyleAtom() const
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index f26363c..abc9755 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -67,13 +67,13 @@ PortionObj::PortionObj( const ::com::sun::star::uno::Reference< ::com::sun::star
mnFont ( 0 ),
mnAsianOrComplexFont( 0xffff ),
mnTextSize ( 0 ),
- mbLastPortion ( TRUE ),
+ mbLastPortion ( sal_True ),
mpText ( NULL ),
mpFieldEntry ( NULL )
{
mXPropSet = rXPropSet;
- ImplGetPortionValues( rFontCollection, FALSE );
+ ImplGetPortionValues( rFontCollection, sal_False );
}
PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRange,
@@ -88,7 +88,7 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text
{
String aString( rXTextRange->getString() );
String aURL;
- BOOL bRTL_endingParen = FALSE;
+ sal_Bool bRTL_endingParen = sal_False;
mnTextSize = aString.Len();
if ( bLast )
@@ -118,14 +118,14 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text
mpFieldEntry->aFieldUrl = aURL;
}
}
- sal_Bool bSymbol = FALSE;
+ sal_Bool bSymbol = sal_False;
- if ( bPropSetsValid && ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSet" ) ), FALSE ) )
+ if ( bPropSetsValid && ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSet" ) ), sal_False ) )
{
sal_Int16 nCharset = 0;
mAny >>= nCharset;
if ( nCharset == ::com::sun::star::awt::CharSet::SYMBOL )
- bSymbol = TRUE;
+ bSymbol = sal_True;
}
if ( mpFieldEntry && ( nFieldType & 0x800000 ) ) // placeholder ?
{
@@ -143,7 +143,7 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text
if ( bLast && pText[ aString.Len() - 1 ] == sal_Unicode(')') && rFontCollection.GetScriptDirection( aString ) == com::sun::star::i18n::ScriptDirection::RIGHT_TO_LEFT )
{
mnTextSize++;
- bRTL_endingParen = TRUE;
+ bRTL_endingParen = sal_True;
}
mpText = new sal_uInt16[ mnTextSize ];
sal_uInt16 nChar;
@@ -202,7 +202,7 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text
mpText[ mnTextSize - 1 ] = 0xd;
if ( bPropSetsValid )
- ImplGetPortionValues( rFontCollection, TRUE );
+ ImplGetPortionValues( rFontCollection, sal_True );
}
}
@@ -504,7 +504,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com
xFieldPropSet( aXTextField, ::com::sun::star::uno::UNO_QUERY );
if ( xFieldPropSet.is() )
{
- String aFieldKind( aXTextField->getPresentation( TRUE ) );
+ String aFieldKind( aXTextField->getPresentation( sal_True ) );
if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Date" ) ) )
{
if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), sal_True )
@@ -645,13 +645,13 @@ ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::
{
mXPropSet = rXPropSet;
- bExtendedParameters = FALSE;
+ bExtendedParameters = sal_False;
nDepth = 0;
nBulletFlags = 0;
nParaFlags = 0;
- ImplGetParagraphValues( rProv, FALSE );
+ ImplGetParagraphValues( rProv, sal_False );
}
ParagraphObj::ParagraphObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContent,
@@ -661,7 +661,7 @@ ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::
mbFirstParagraph ( aParaFlags.bFirstParagraph ),
mbLastParagraph ( aParaFlags.bLastParagraph )
{
- bExtendedParameters = FALSE;
+ bExtendedParameters = sal_False;
nDepth = 0;
nBulletFlags = 0;
@@ -700,7 +700,7 @@ ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::
}
}
}
- ImplGetParagraphValues( rProv, TRUE );
+ ImplGetParagraphValues( rProv, sal_True );
}
}
@@ -815,7 +815,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
sal_Int32 nPropertyCount = aPropertySequence.getLength();
if ( nPropertyCount )
{
- bExtendedParameters = TRUE;
+ bExtendedParameters = sal_True;
nBulletRealSize = 100;
nMappedNumType = 0;
@@ -910,7 +910,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
{
nBulletId = rBuProv.GetId( aUniqueId, aBuGraSize );
if ( nBulletId != 0xffff )
- bExtendedBulletsUsed = TRUE;
+ bExtendedBulletsUsed = sal_True;
}
}
}
@@ -959,7 +959,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
{
if ( nNumberingType != SVX_NUM_CHAR_SPECIAL )
{
- bExtendedBulletsUsed = TRUE;
+ bExtendedBulletsUsed = sal_True;
if ( nNumberingDepth & 1 )
cBulletId = 0x2013; // defaulting bullet characters for ppt97
else if ( nNumberingDepth == 4 )
@@ -1243,8 +1243,8 @@ ImplTextObj::ImplTextObj( int nInstance )
mnTextSize = 0;
mnInstance = nInstance;
mpList = new List;
- mbHasExtendedBullets = FALSE;
- mbFixedCellHeightUsed = FALSE;
+ mbHasExtendedBullets = sal_False;
+ mbFixedCellHeightUsed = sal_False;
}
ImplTextObj::~ImplTextObj()
@@ -1276,11 +1276,11 @@ TextObj::TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSim
if ( aAny >>= aXParagraph )
{
if ( !aXTextParagraphE->hasMoreElements() )
- aParaFlags.bLastParagraph = TRUE;
+ aParaFlags.bLastParagraph = sal_True;
ParagraphObj* pPara = new ParagraphObj( aXParagraph, aParaFlags, rFontCollection, rProv );
mpImplTextObj->mbHasExtendedBullets |= pPara->bExtendedBulletsUsed;
mpImplTextObj->mpList->Insert( pPara, LIST_APPEND );
- aParaFlags.bFirstParagraph = FALSE;
+ aParaFlags.bFirstParagraph = sal_False;
}
}
}
diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx
index adcf65e..6a0c9fd 100644
--- a/sd/source/filter/eppt/text.hxx
+++ b/sd/source/filter/eppt/text.hxx
@@ -71,12 +71,12 @@ struct SOParagraph
SOParagraph()
{
nDepth = 0;
- bExtendedParameters = FALSE;
+ bExtendedParameters = sal_False;
nParaFlags = 0;
nBulletFlags = 0;
nBulletOfs = 0;
nTextOfs = 0;
- bExtendedBulletsUsed = FALSE;
+ bExtendedBulletsUsed = sal_False;
nBulletId = 0xffff;
bNumberingIsNumber = sal_True;
};
@@ -90,7 +90,7 @@ class PropStateValue : public PropValue
::com::sun::star::uno::Reference
< ::com::sun::star::beans::XPropertyState > mXPropState;
- sal_Bool ImplGetPropertyValue( const String& rString, sal_Bool bGetPropertyState = TRUE );
+ sal_Bool ImplGetPropertyValue( const String& rString, sal_Bool bGetPropertyState = sal_True );
};
@@ -122,7 +122,7 @@ class PortionObj : public PropStateValue
sal_uInt32 ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, String& rURL );
sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition );
- void ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue = FALSE );
+ void ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue = sal_False );
public :
@@ -165,7 +165,7 @@ struct ParaFlags
sal_Bool bFirstParagraph : 1;
sal_Bool bLastParagraph : 1;
- ParaFlags() { bFirstParagraph = TRUE; bLastParagraph = FALSE; };
+ ParaFlags() { bFirstParagraph = sal_True; bLastParagraph = sal_False; };
};
class ParagraphObj : public List, public PropStateValue, public SOParagraph
@@ -182,8 +182,8 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph
void ImplClear();
sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition );
::com::sun::star::awt::Size ImplMapSize( const ::com::sun::star::awt::Size& rSize );
- void ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = FALSE );
- void ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue = FALSE );
+ void ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = sal_False );
+ void ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue = sal_False );
public :
diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src
index fd0fb47..1ef1ccf 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -299,7 +299,7 @@
MenuItem\
{\
Identifier = SID_OUTLINE_TEXT_AUTOFIT ; \
- HelpID = SID_OUTLINE_TEXT_AUTOFIT ; \
+ HelpID = CMD_SID_OUTLINE_TEXT_AUTOFIT ; \
Text [ en-US ] = "~Autofit Text" ; \
};
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 419a496..44086e1 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -449,7 +449,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, SfxMedium* pInMedium,
Image aImgDocClosed=Image( BitmapEx( SdResId( BMP_DOC_CLOSED ) ) );
// Dokumentnamen einfuegen
- InsertEntry( maDocName, aImgDocOpen, aImgDocClosed, NULL, TRUE, LIST_APPEND,
+ InsertEntry( maDocName, aImgDocOpen, aImgDocClosed, NULL, sal_True, LIST_APPEND,
reinterpret_cast< void* >( 1 )
);
}
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 615e047..7ed7f13 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -90,6 +90,7 @@ public:
virtual void Activate( sal_Bool bMDI );
virtual void Deactivate( sal_Bool bMDI );
virtual sal_Bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+ virtual sal_Bool ImportFrom( SfxMedium &rMedium );
virtual sal_Bool ConvertFrom( SfxMedium &rMedium );
virtual sal_Bool Save();
virtual sal_Bool SaveAsOwnFormat( SfxMedium& rMedium );
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index 9b401e2..af200f3 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -171,10 +171,10 @@ protected:
Point maWinPos;
Point maViewOrigin;
Size maViewSize;
+ Size maPrevSize; // contains previous window size in logical coords
sal_uInt16 mnMinZoom;
sal_uInt16 mnMaxZoom;
- sal_uInt16 mnMaxZoom;
/** This flag tells whether to re-calculate the minimal zoom factor
depening on the current zoom factor. Its default value is now sal_False.
*/
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 97d9915..924988c 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -124,7 +124,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
{
case SID_OUTLINE_TEXT_AUTOFIT:
{
- SfxUndoManager* pUndoManager = GetDocSh()->GetUndoManager();
+ ::svl::IUndoManager* pUndoManager = GetDocSh()->GetUndoManager();
SdrObject* pObj = NULL;
const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
if( rMarkList.GetMarkCount() == 1 )
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 9bbd8cd..d520a8b 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -682,7 +682,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq)
const SvxLRSpaceItem& rItem = (const SvxLRSpaceItem&)
pArgs->Get( nId );
- static const USHORT aWhichTable[]=
+ static const sal_uInt16 aWhichTable[]=
{
EE_PARA_OUTLLEVEL, EE_PARA_OUTLLEVEL,
EE_PARA_LRSPACE, EE_PARA_LRSPACE,
@@ -699,7 +699,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq)
rItem.GetRight(), rItem.GetTxtLeft(),
rItem.GetTxtFirstLineOfst(), nId );
- const INT16 nOutlineLevel = ((const SfxInt16Item&)aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue();
+ const sal_Int16 nOutlineLevel = ((const SfxInt16Item&)aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue();
const SvxLRSpaceItem& rOrigLRSpaceItem = (const SvxLRSpaceItem&) aEditAttr.Get( EE_PARA_LRSPACE );
const SvxNumBulletItem& rNumBulletItem = (const SvxNumBulletItem&) aEditAttr.Get( EE_PARA_NUMBULLET );
if( nOutlineLevel != -1 &&
@@ -832,7 +832,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
rLRSpaceItem.GetRight(), rLRSpaceItem.GetTxtLeft(),
rLRSpaceItem.GetTxtFirstLineOfst(), nId );
- const INT16 nOutlineLevel = ((const SfxInt16Item&)aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue();
+ const sal_Int16 nOutlineLevel = ((const SfxInt16Item&)aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue();
const SvxNumBulletItem& rNumBulletItem = (const SvxNumBulletItem&) aEditAttr.Get( EE_PARA_NUMBULLET );
if( nOutlineLevel != -1 &&
rNumBulletItem.GetNumRule() &&
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 69d4c7d..25ea467 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -683,7 +683,7 @@ void Window::UpdateMapOrigin(sal_Bool bInvalidate)
// resizes
maWinPos.X() -= (aWinSize.Width() - maPrevSize.Width()) / 2;
maWinPos.Y() -= (aWinSize.Height() - maPrevSize.Height()) / 2;
- bChanged = TRUE;
+ bChanged = sal_True;
}
if ( maWinPos.X() > maViewSize.Width() - aWinSize.Width() )
commit a9e6c0bb00fb5a6de631476bdffd23174b58d9b3
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Mar 12 18:59:43 2011 -0600
mis-merge clean-up tools types
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index 7965a79..9200f4c 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -372,12 +372,12 @@ bool OGLTransitionerImpl::initialize( const Reference< presentation::XSlideShowV
//
if( pWindow )
{
- pWindow->SetMouseTransparent( TRUE );
+ pWindow->SetMouseTransparent( sal_True );
pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
- pWindow->EnableEraseBackground( FALSE );
+ pWindow->EnableEraseBackground( sal_False );
pWindow->SetControlForeground();
pWindow->SetControlBackground();
- pWindow->EnablePaint(FALSE);
+ pWindow->EnablePaint(sal_False);
pWindow->SetPosSizePixel(pPWindow->GetPosPixel(),pPWindow->GetSizePixel());
// GLWin.dpy = reinterpret_cast<unx::Display*>(pChildSysData->pDisplay);
// GLWin.win = pChildSysData->aWindow;
@@ -455,12 +455,12 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta
if( pWindow )
{
- pWindow->SetMouseTransparent( TRUE );
+ pWindow->SetMouseTransparent( sal_True );
pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
- pWindow->EnableEraseBackground( FALSE );
+ pWindow->EnableEraseBackground( sal_False );
pWindow->SetControlForeground();
pWindow->SetControlBackground();
- pWindow->EnablePaint(FALSE);
+ pWindow->EnablePaint(sal_False);
pWindow->SetPosSizePixel(pPWindow->GetPosPixel(),pPWindow->GetSizePixel());
}
diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
index a64eb04..7172fc8 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
@@ -487,13 +487,13 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
glXGetFBConfigAttrib (GLWin.dpy, fbconfigs[i],
GLX_BIND_TO_TEXTURE_RGB_EXT,
&value);
- if (value == FALSE)
+ if (value == sal_False)
continue;
glXGetFBConfigAttrib (GLWin.dpy, fbconfigs[i],
GLX_BIND_TO_MIPMAP_TEXTURE_EXT,
&value);
- if (value == FALSE)
+ if (value == sal_False)
continue;
/* TODO: handle non Y inverted cases */
@@ -517,7 +517,7 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
winData.nSize = sizeof(winData);
OSL_TRACE("using VisualID %08X", vi->visualid);
winData.pVisual = (void*)(vi->visual);
- pWindow=new SystemChildWindow(pPWindow, 0, &winData, FALSE);
+ pWindow=new SystemChildWindow(pPWindow, 0, &winData, sal_False);
pChildSysData = pWindow->GetSystemData();
if( pChildSysData ) {
break;
@@ -537,18 +537,18 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
const SystemEnvData* pChildSysData = NULL;
SystemWindowData winData;
winData.nSize = sizeof(winData);
- pWindow=new SystemChildWindow(pPWindow, 0, &winData, FALSE);
+ pWindow=new SystemChildWindow(pPWindow, 0, &winData, sal_False);
pChildSysData = pWindow->GetSystemData();
#endif
if( pWindow )
{
- pWindow->SetMouseTransparent( TRUE );
+ pWindow->SetMouseTransparent( sal_True );
pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
- pWindow->EnableEraseBackground( FALSE );
+ pWindow->EnableEraseBackground( sal_False );
pWindow->SetControlForeground();
pWindow->SetControlBackground();
- pWindow->EnablePaint(FALSE);
+ pWindow->EnablePaint(sal_False);
#if defined( WNT )
GLWin.hWnd = sysData->hWnd;
#elif defined( UNX )
diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
index 1583d84..a46e73c 100644
--- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
@@ -456,13 +456,13 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
glXGetFBConfigAttrib (GLWin.dpy, fbconfigs[i],
GLX_BIND_TO_TEXTURE_RGB_EXT,
&value);
- if (value == FALSE)
+ if (value == sal_False)
continue;
glXGetFBConfigAttrib (GLWin.dpy, fbconfigs[i],
GLX_BIND_TO_MIPMAP_TEXTURE_EXT,
&value);
- if (value == FALSE)
+ if (value == sal_False)
continue;
/* TODO: handle non Y inverted cases */
@@ -486,7 +486,7 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
winData.nSize = sizeof(winData);
OSL_TRACE("using VisualID %08X", vi->visualid);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list