[Libreoffice-commits] .: Branch 'integration/dev300_m98' - 601 commits - animations/prj animations/source sd/inc sd/prj sd/qa sd/sdi sd/source sd/uiconfig sd/util slideshow/prj slideshow/qa slideshow/source slideshow/util
Thorsten Behrens
thorsten at kemper.freedesktop.org
Fri Mar 4 03:10:36 PST 2011
animations/prj/build.lst | 2
animations/prj/d.lst | 1
animations/source/animcore/animcore.component | 67
animations/source/animcore/factreg.cxx | 6
animations/source/animcore/makefile.mk | 8
animations/source/animcore/targetpropertiescreator.cxx | 1
sd/inc/app.hrc | 46
sd/inc/drawdoc.hxx | 19
sd/inc/glob.hrc | 3
sd/inc/helpids.h | 471 +-
sd/inc/pch/precompiled_sd.hxx | 6
sd/inc/sdabstdlg.hxx | 2
sd/inc/sdcommands.h | 311 +
sd/inc/sdmod.hxx | 2
sd/inc/shapelist.hxx | 2
sd/prj/build.lst | 4
sd/prj/d.lst | 2
sd/qa/unoapi/knownissues.xcl | 7
sd/sdi/SlideSorterController.sdi | 20
sd/sdi/ViewShellBase.sdi | 213 -
sd/sdi/_drvwsh.sdi | 5
sd/sdi/sdraw.sdi | 391 +
sd/source/core/drawdoc2.cxx | 43
sd/source/core/drawdoc3.cxx | 36
sd/source/core/drawdoc4.cxx | 22
sd/source/core/sdpage.cxx | 2
sd/source/core/shapelist.cxx | 38
sd/source/core/stlpool.cxx | 12
sd/source/core/stlsheet.cxx | 41
sd/source/filter/eppt/eppt.cxx | 2
sd/source/filter/html/pubdlg.cxx | 2
sd/source/filter/html/pubdlg.src | 47
sd/source/filter/ppt/propread.hxx | 2
sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx | 11
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 74
sd/source/ui/accessibility/AccessibleTreeNode.cxx | 21
sd/source/ui/animations/CustomAnimationCreateDialog.src | 4
sd/source/ui/animations/CustomAnimationDialog.src | 41
sd/source/ui/animations/CustomAnimationList.cxx | 2
sd/source/ui/animations/CustomAnimationPane.cxx | 10
sd/source/ui/animations/SlideTransitionPane.cxx | 2
sd/source/ui/annotations/annotationmanager.cxx | 2
sd/source/ui/annotations/annotationmanagerimpl.hxx | 1
sd/source/ui/annotations/annotations.src | 29
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 | 40
sd/source/ui/app/popup.src | 57
sd/source/ui/app/popup2_tmpl.src | 28
sd/source/ui/app/res_bmp.src | 25
sd/source/ui/app/sdmod.cxx | 40
sd/source/ui/app/strings.src | 7
sd/source/ui/app/toolbox.src | 737 ---
sd/source/ui/controller/slidelayoutcontroller.cxx | 1
sd/source/ui/dlg/PaneDockingWindow.cxx | 58
sd/source/ui/dlg/PaneDockingWindow.src | 6
sd/source/ui/dlg/animobjs.src | 20
sd/source/ui/dlg/brkdlg.src | 1
sd/source/ui/dlg/copydlg.src | 14
sd/source/ui/dlg/custsdlg.src | 13
sd/source/ui/dlg/dlgass.cxx | 8
sd/source/ui/dlg/dlgass.src | 25
sd/source/ui/dlg/dlgassim.cxx | 6
sd/source/ui/dlg/dlgfield.src | 5
sd/source/ui/dlg/dlgsnap.cxx | 2
sd/source/ui/dlg/dlgsnap.src | 10
sd/source/ui/dlg/headerfooterdlg.src | 14
sd/source/ui/dlg/ins_paste.src | 3
sd/source/ui/dlg/inspagob.src | 4
sd/source/ui/dlg/layeroptionsdlg.src | 9
sd/source/ui/dlg/makefile.mk | 3
sd/source/ui/dlg/masterlayoutdlg.src | 5
sd/source/ui/dlg/morphdlg.src | 8
sd/source/ui/dlg/navigatr.cxx | 14
sd/source/ui/dlg/paragr.src | 6
sd/source/ui/dlg/present.src | 19
sd/source/ui/dlg/prntopts.src | 18
sd/source/ui/dlg/sddlgfact.cxx | 4
sd/source/ui/dlg/sddlgfact.hxx | 2
sd/source/ui/dlg/sdpreslt.src | 7
sd/source/ui/dlg/sdtreelb.cxx | 11
sd/source/ui/dlg/tpaction.cxx | 4
sd/source/ui/dlg/tpaction.src | 11
sd/source/ui/dlg/tpoption.src | 19
sd/source/ui/dlg/vectdlg.src | 8
sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx | 3
sd/source/ui/framework/factories/BasicViewFactory.cxx | 16
sd/source/ui/framework/factories/BasicViewFactory.hxx | 6
sd/source/ui/framework/tools/FrameworkHelper.cxx | 17
sd/source/ui/func/fuconstr.cxx | 92
sd/source/ui/func/fudraw.cxx | 30
sd/source/ui/func/fuexpand.cxx | 3
sd/source/ui/func/fuinsert.cxx | 5
sd/source/ui/func/fupage.cxx | 7
sd/source/ui/func/fusel.cxx | 8
sd/source/ui/func/futempl.cxx | 2
sd/source/ui/func/futext.cxx | 11
sd/source/ui/inc/AccessibleTreeNode.hxx | 24
sd/source/ui/inc/DrawViewShell.hxx | 5
sd/source/ui/inc/OutlineViewShell.hxx | 4
sd/source/ui/inc/PaneDockingWindow.hxx | 20
sd/source/ui/inc/PreviewRenderer.hxx | 16
sd/source/ui/inc/SlideSorter.hxx | 33
sd/source/ui/inc/SlideSorterViewShell.hxx | 11
sd/source/ui/inc/SlideViewShell.hxx | 4
sd/source/ui/inc/ViewShell.hxx | 45
sd/source/ui/inc/ViewShellBase.hxx | 14
sd/source/ui/inc/dlgsnap.hxx | 1
sd/source/ui/inc/framework/FrameworkHelper.hxx | 11
sd/source/ui/inc/morphdlg.hxx | 2
sd/source/ui/inc/optsitem.hxx | 9
sd/source/ui/inc/sdtreelb.hxx | 1
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/ToolPanelViewShell.hxx | 3
sd/source/ui/inc/vectdlg.hxx | 2
sd/source/ui/notes/NotesChildWindow.src | 3
sd/source/ui/presenter/PresenterPreviewCache.cxx | 11
sd/source/ui/slideshow/makefile.mk | 3
sd/source/ui/slideshow/slideshow.cxx | 13
sd/source/ui/slideshow/slideshow.hrc | 33
sd/source/ui/slideshow/slideshow.src | 70
sd/source/ui/slideshow/slideshowimpl.cxx | 563 --
sd/source/ui/slideshow/slideshowimpl.hxx | 10
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 | 45
sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx | 2
sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx | 2
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 337 +
sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx | 294 +
sd/source/ui/slidesorter/controller/SlsAnimator.cxx | 299 +
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 324 +
sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx | 145
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 | 6
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 | 418 +-
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 2003 ++++++----
sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx | 413 --
sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx | 173
sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx | 2
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 513 +-
sd/source/ui/slidesorter/controller/SlsTransferable.cxx | 15
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 | 19
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 | 136
sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx | 88
sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx | 85
sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx | 23
sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx | 90
sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx | 100
sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx | 69
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 | 217 -
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/model/SlideSorterModel.cxx | 408 +-
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/SlideSorterService.cxx | 60
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 108
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 1049 +++--
sd/source/ui/slidesorter/view/SlsButtonBar.cxx | 1558 +++++++
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/SlsResource.hxx | 47
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/makefile.mk | 32
sd/source/ui/table/TableDesignPane.src | 1
sd/source/ui/table/tableobjectbar.cxx | 4
sd/source/ui/toolpanel/ControlContainer.cxx | 55
sd/source/ui/toolpanel/LayoutMenu.cxx | 4
sd/source/ui/toolpanel/ScrollPanel.cxx | 23
sd/source/ui/toolpanel/SubToolPanel.cxx | 29
sd/source/ui/toolpanel/TestPanel.cxx | 6
sd/source/ui/toolpanel/TitleBar.cxx | 4
sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 44
sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx | 2
sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx | 19
sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx | 4
sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx | 3
sd/source/ui/tools/PreviewRenderer.cxx | 183
sd/source/ui/unoidl/DrawController.cxx | 18
sd/source/ui/unoidl/SdUnoSlideView.cxx | 33
sd/source/ui/unoidl/detreg.cxx | 24
sd/source/ui/unoidl/facreg.cxx | 109
sd/source/ui/unoidl/sddetect.cxx | 14
sd/source/ui/view/DocumentRenderer.cxx | 222 -
sd/source/ui/view/DocumentRenderer.hrc | 15
sd/source/ui/view/DocumentRenderer.src | 94
sd/source/ui/view/GraphicViewShellBase.cxx | 6
sd/source/ui/view/ImpressViewShellBase.cxx | 6
sd/source/ui/view/OutlineViewShellBase.cxx | 6
sd/source/ui/view/PresentationViewShellBase.cxx | 7
sd/source/ui/view/SlideSorterViewShellBase.cxx | 6
sd/source/ui/view/ViewShellBase.cxx | 48
sd/source/ui/view/ViewShellManager.cxx | 5
sd/source/ui/view/drawview.cxx | 2
sd/source/ui/view/drviews1.cxx | 2
sd/source/ui/view/drviews2.cxx | 5
sd/source/ui/view/drviews5.cxx | 14
sd/source/ui/view/drviews7.cxx | 42
sd/source/ui/view/drviews8.cxx | 1
sd/source/ui/view/drviewsa.cxx | 17
sd/source/ui/view/drviewsb.cxx | 6
sd/source/ui/view/drviewsc.cxx | 4
sd/source/ui/view/drviewse.cxx | 10
sd/source/ui/view/outlnvsh.cxx | 124
sd/source/ui/view/sdview3.cxx | 21
sd/source/ui/view/viewoverlaymanager.cxx | 1
sd/source/ui/view/viewshe3.cxx | 22
sd/source/ui/view/viewshel.cxx | 8
sd/util/exports.dxp | 1
sd/util/hidother.src | 26
sd/util/makefile.mk | 16
sd/util/sd.component | 102
sd/util/sdd.component | 34
slideshow/prj/build.lst | 2
slideshow/prj/d.lst | 2
slideshow/source/engine/OGLTrans/exports.dxp | 1
slideshow/source/engine/OGLTrans/ogltrans.component | 34
slideshow/source/engine/OGLTrans/win/OGLTrans_Shaders.cxx | 2
slideshow/source/engine/OGLTrans/win/OGLTrans_Shaders.hxx | 2
slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx | 2
slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx | 2
slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx | 2
slideshow/source/engine/OGLTrans/win/makefile.mk | 12
slideshow/source/engine/makefile.mk | 2
slideshow/source/engine/shapes/shapeimporter.cxx | 7
slideshow/source/engine/shapes/viewmediashape.cxx | 34
slideshow/source/engine/shapes/viewmediashape.hxx | 7
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 | 63
slideshow/source/inc/slide.hxx | 7
slideshow/util/exports.dxp | 1
slideshow/util/makefile.mk | 8
slideshow/util/makefile.pmk | 2
slideshow/util/slideshow.component | 34
297 files changed, 19855 insertions(+), 7265 deletions(-)
New commits:
commit 0cbce9090039f3b9c1bb80db1e1dcd1289151edf
Merge: bf70420... 013760b...
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri Mar 4 12:01:49 2011 +0100
Merge remote branch 'stage/ooo/dev300_m98_fixed' into integration/dev300_m98
Conflicts:
sd/inc/app.hrc
sd/inc/glob.hrc
sd/inc/helpids.h
sd/prj/build.lst
sd/qa/unoapi/knownissues.xcl
sd/sdi/ToolPanelViewShell.sdi
sd/sdi/ViewShellBase.sdi
sd/source/core/sdpage.cxx
sd/source/core/stlpool.cxx
sd/source/core/stlsheet.cxx
sd/source/filter/eppt/eppt.cxx
sd/source/filter/eppt/eppt.hxx
sd/source/filter/eppt/epptso.cxx
sd/source/filter/eppt/pptexanimations.cxx
sd/source/filter/html/htmlattr.cxx
sd/source/filter/ppt/ppt97animations.cxx
sd/source/filter/ppt/ppt97animations.hxx
sd/source/filter/ppt/pptatom.cpp
sd/source/filter/ppt/pptin.cxx
sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
sd/source/ui/annotations/annotationmanager.cxx
sd/source/ui/annotations/annotationmanagerimpl.hxx
sd/source/ui/annotations/annotationwindow.cxx
sd/source/ui/app/accel_tmpl.src
sd/source/ui/app/makefile.mk
sd/source/ui/app/menuids3_tmpl.src
sd/source/ui/app/menuids_tmpl.src
sd/source/ui/app/optsitem.cxx
sd/source/ui/app/popup.src
sd/source/ui/app/res_bmp.src
sd/source/ui/app/sddll2.cxx
sd/source/ui/app/sdmod.cxx
sd/source/ui/app/sdmod1.cxx
sd/source/ui/app/tbx_ww.src
sd/source/ui/app/tbxww.cxx
sd/source/ui/controller/makefile.mk
sd/source/ui/controller/slidelayoutcontroller.cxx
sd/source/ui/controller/slidelayoutcontroller.hxx
sd/source/ui/dlg/PaneChildWindows.cxx
sd/source/ui/dlg/PaneDockingWindow.cxx
sd/source/ui/dlg/PaneShells.cxx
sd/source/ui/dlg/animobjs.cxx
sd/source/ui/dlg/copydlg.cxx
sd/source/ui/dlg/dlgass.cxx
sd/source/ui/dlg/dlgassim.cxx
sd/source/ui/dlg/dlgassim.hxx
sd/source/ui/dlg/dlgsnap.cxx
sd/source/ui/dlg/dlgsnap.src
sd/source/ui/dlg/filedlg.cxx
sd/source/ui/dlg/inspagob.cxx
sd/source/ui/dlg/makefile.mk
sd/source/ui/dlg/navigatr.cxx
sd/source/ui/dlg/sdtreelb.cxx
sd/source/ui/dlg/tpoption.src
sd/source/ui/framework/factories/ViewShellWrapper.cxx
sd/source/ui/framework/module/ToolPanelModule.cxx
sd/source/ui/framework/tools/FrameworkHelper.cxx
sd/source/ui/func/fusearch.cxx
sd/source/ui/func/futext.cxx
sd/source/ui/func/sdundogr.cxx
sd/source/ui/inc/OutlineView.hxx
sd/source/ui/inc/PaneDockingWindow.hxx
sd/source/ui/inc/ViewShellBase.hxx
sd/source/ui/inc/dlgsnap.hrc
sd/source/ui/inc/dlgsnap.hxx
sd/source/ui/inc/res_bmp.hrc
sd/source/ui/inc/sdtreelb.hxx
sd/source/ui/inc/taskpane/PanelId.hxx
sd/source/ui/inc/taskpane/ScrollPanel.hxx
sd/source/ui/inc/taskpane/SubToolPanel.hxx
sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
sd/source/ui/slideshow/slideshow.hrc
sd/source/ui/slideshow/slideshowimpl.cxx
sd/source/ui/slideshow/slideshowimpl.hxx
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
sd/source/ui/slidesorter/cache/SlsPageCache.cxx
sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx
sd/source/ui/slidesorter/controller/SlideSorterController.cxx
sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx
sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx
sd/source/ui/slidesorter/model/SlideSorterModel.cxx
sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx
sd/source/ui/slidesorter/view/SlideSorterView.cxx
sd/source/ui/slidesorter/view/SlsLayouter.cxx
sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx
sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
sd/source/ui/slidesorter/view/SlsResource.hxx
sd/source/ui/slidesorter/view/SlsViewOverlay.cxx
sd/source/ui/table/tablefunction.cxx
sd/source/ui/toolpanel/LayoutMenu.cxx
sd/source/ui/toolpanel/MethodGuard.hxx
sd/source/ui/toolpanel/ScrollPanel.cxx
sd/source/ui/toolpanel/TitleBar.cxx
sd/source/ui/toolpanel/ToolPanel.cxx
sd/source/ui/toolpanel/ToolPanel.hxx
sd/source/ui/toolpanel/ToolPanelFactory.cxx
sd/source/ui/toolpanel/ToolPanelUIElement.cxx
sd/source/ui/toolpanel/ToolPanelUIElement.hxx
sd/source/ui/toolpanel/ToolPanelViewShell.cxx
sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx
sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx
sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx
sd/source/ui/toolpanel/controls/DocumentHelper.cxx
sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx
sd/source/ui/toolpanel/controls/TableDesignPanel.cxx
sd/source/ui/tools/PreviewRenderer.cxx
sd/source/ui/unoidl/DrawController.cxx
sd/source/ui/unoidl/SdUnoDrawView.cxx
sd/source/ui/unoidl/SdUnoOutlineView.cxx
sd/source/ui/unoidl/SdUnoSlideView.cxx
sd/source/ui/unoidl/facreg.cxx
sd/source/ui/unoidl/unocpres.cxx
sd/source/ui/unoidl/unomodel.cxx
sd/source/ui/unoidl/unopage.cxx
sd/source/ui/unoidl/unowcntr.cxx
sd/source/ui/unoidl/unowcntr.hxx
sd/source/ui/view/DocumentRenderer.src
sd/source/ui/view/ViewShellBase.cxx
sd/source/ui/view/ViewShellManager.cxx
sd/source/ui/view/drawview.cxx
sd/source/ui/view/drviews7.cxx
sd/source/ui/view/drviewsb.cxx
sd/source/ui/view/drviewsc.cxx
sd/source/ui/view/outlnvsh.cxx
sd/source/ui/view/outlview.cxx
sd/source/ui/view/sdview5.cxx
sd/source/ui/view/viewoverlaymanager.cxx
sd/source/ui/view/viewshe3.cxx
sd/uiconfig/sdraw/menubar/menubar.xml
sd/uiconfig/simpress/menubar/menubar.xml
sd/util/makefile.mk
sd/workben/custompanel/ctp_panel.cxx
sd/workben/custompanel/ctp_panel.hxx
slideshow/prj/build.lst
slideshow/source/engine/OGLTrans/win/makefile.mk
slideshow/source/engine/color.cxx
slideshow/source/engine/shapes/viewmediashape.cxx
slideshow/source/engine/shapes/viewmediashape.hxx
slideshow/source/engine/slide/slideimpl.cxx
slideshow/source/engine/slideshowimpl.cxx
diff --cc sd/inc/app.hrc
index b80afb6,03b22b3..9ca6ec2
mode 100644,100755..100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
diff --cc sd/inc/drawdoc.hxx
index 7dc1165,bad1fae..514ab78
mode 100644,100755..100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
diff --cc sd/inc/glob.hrc
index eebb52f,5a9dcef..118e110
mode 100755,100755..100644
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
@@@ -154,5 -154,7 +154,4 @@@
#define STR_CUSTOMANIMATIONPANE RID_GLOB_START+227
#define STR_SLIDE_TRANSITION_PANE RID_GLOB_START+228
-
-
-#define RID_SLIDESORTER_ICONS RID_GLOB_START+227
-
-
-
++#define RID_SLIDESORTER_ICONS RID_GLOB_START+229
diff --cc sd/inc/helpids.h
index 41d2c34,550fba2..93aaa79
mode 100644,100755..100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@@ -25,259 -24,228 +25,230 @@@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- #ifndef _SOLAR_HRC
- #include <svl/solar.hrc>
- #endif
-
- #define HID_SD_PRINT_OPTIONS (HID_SD_START + 0)
- #define HID_SD_OPTIONS_SNAP (HID_SD_START + 1)
- #define HID_SD_OPTIONS_VIEW (HID_SD_START + 2)
-
- #define HID_SD_AUTOPILOT_PAGE1 (HID_SD_START + 3)
- #define HID_SD_AUTOPILOT_PAGE2 (HID_SD_START + 4)
- #define HID_SD_AUTOPILOT_PAGE3 (HID_SD_START + 5)
- #define HID_SD_AUTOPILOT_PAGE4 (HID_SD_START + 6)
- #define HID_SD_AUTOPILOT_PAGE5 (HID_SD_START + 7)
- #define HID_SD_AUTOPILOT_PAGE6 (HID_SD_START + 8)
-
- #define HID_SD_CBX_ONLYSELECTED (HID_SD_START + 9)
- #define HID_SD_BTN_FILTERDIALOG (HID_SD_START + 10)
-
- #define HID_SD_BTN_PAGE (HID_SD_START + 11)
- #define HID_SD_BTN_MASTERPAGE (HID_SD_START + 12)
- #define HID_SD_BTN_LAYER (HID_SD_START + 13)
-
- #define HID_SD_BTN_DRAW (HID_SD_START + 14)
- #define HID_SD_BTN_SLIDE (HID_SD_START + 15)
- #define HID_SD_BTN_OUTLINE (HID_SD_START + 16)
- #define HID_SD_BTN_NOTES (HID_SD_START + 17)
- #define HID_SD_BTN_HANDOUT (HID_SD_START + 18)
-
- #define HID_SD_WIN_DOCUMENT (HID_SD_START + 19)
-
- #define HID_SD_OPTIONS_LAYOUT (HID_SD_START + 20)
- #define HID_SD_OPTIONS_CONTENTS (HID_SD_START + 21)
- #define HID_SD_OPTIONS_MISC (HID_SD_START + 22)
-
- #define HID_SD_EFFECT_PREVIEW (HID_SD_START + 23)
- #define HID_SD_CTL_NEWFOIL (HID_SD_START + 24)
- #define HID_SD_NAVIGATOR_TLB (HID_SD_START + 25)
- #define HID_SD_NAVIGATOR (HID_SD_START + 26)
-
- #define HID_SD_CTL_EFFECTS (HID_SD_START + 27)
- #define HID_SD_CTL_TEXT_EFFECTS (HID_SD_START + 28)
-
- #define HID_SD_CTL_SLIDE_CHANGE (HID_SD_START + 29)
-
- #define HID_SD_NAVIGATOR_TBX (HID_SD_START + 30)
- #define HID_SD_NAVIGATOR_LB (HID_SD_START + 31)
-
- #define HID_SD_NAVIGATOR_TBI_PEN (HID_SD_START + 33)
- #define HID_SD_NAVIGATOR_TBI_FIRST (HID_SD_START + 34)
- #define HID_SD_NAVIGATOR_TBI_PREV (HID_SD_START + 35)
- #define HID_SD_NAVIGATOR_TBI_NEXT (HID_SD_START + 36)
- #define HID_SD_NAVIGATOR_TBI_LAST (HID_SD_START + 37)
- #define HID_SD_NAVIGATOR_TBI_DRAGTYPE (HID_SD_START + 38)
- #define HID_SD_NAVIGATOR_TBI_SHAPE_FILTER (HID_SD_START + 39)
+ #include <sfx2/sfxcommands.h>
+ #include <svx/svxcommands.h>
+ #include "sdcommands.h"
+
+ #define HID_SDDRAWVIEWSHELL "SD_HID_SDDRAWVIEWSHELL"
+ #define HID_SDGRAPHICVIEWSHELL "SD_HID_SDGRAPHICVIEWSHELL"
+ #define HID_SDOUTLINEVIEWSHELL "SD_HID_SDOUTLINEVIEWSHELL"
+ #define HID_SD_PRINT_OPTIONS "SD_HID_SD_PRINT_OPTIONS"
+ #define HID_SD_OPTIONS_SNAP "SD_HID_SD_OPTIONS_SNAP"
+ #define HID_SD_OPTIONS_VIEW "SD_HID_SD_OPTIONS_VIEW"
+ #define HID_SD_AUTOPILOT_PAGE1 "SD_HID_SD_AUTOPILOT_PAGE1"
+ #define HID_SD_AUTOPILOT_PAGE2 "SD_HID_SD_AUTOPILOT_PAGE2"
+ #define HID_SD_AUTOPILOT_PAGE3 "SD_HID_SD_AUTOPILOT_PAGE3"
+ #define HID_SD_AUTOPILOT_PAGE4 "SD_HID_SD_AUTOPILOT_PAGE4"
+ #define HID_SD_AUTOPILOT_PAGE5 "SD_HID_SD_AUTOPILOT_PAGE5"
+ #define HID_SD_AUTOPILOT_PAGE6 "SD_HID_SD_AUTOPILOT_PAGE6"
+ #define HID_SD_CBX_ONLYSELECTED "SD_HID_SD_CBX_ONLYSELECTED"
+ #define HID_SD_BTN_FILTERDIALOG "SD_HID_SD_BTN_FILTERDIALOG"
+ #define HID_SD_BTN_PAGE "SD_HID_SD_BTN_PAGE"
+ #define HID_SD_BTN_MASTERPAGE "SD_HID_SD_BTN_MASTERPAGE"
+ #define HID_SD_BTN_LAYER "SD_HID_SD_BTN_LAYER"
+ #define HID_SD_BTN_DRAW "SD_HID_SD_BTN_DRAW"
+ #define HID_SD_BTN_SLIDE "SD_HID_SD_BTN_SLIDE"
+ #define HID_SD_BTN_OUTLINE "SD_HID_SD_BTN_OUTLINE"
+ #define HID_SD_BTN_NOTES "SD_HID_SD_BTN_NOTES"
+ #define HID_SD_BTN_HANDOUT "SD_HID_SD_BTN_HANDOUT"
+ #define HID_SD_WIN_DOCUMENT "SD_HID_SD_WIN_DOCUMENT"
+ #define HID_SD_OPTIONS_LAYOUT "SD_HID_SD_OPTIONS_LAYOUT"
+ #define HID_SD_OPTIONS_CONTENTS "SD_HID_SD_OPTIONS_CONTENTS"
+ #define HID_SD_OPTIONS_MISC "SD_HID_SD_OPTIONS_MISC"
+ #define HID_SD_EFFECT_PREVIEW "SD_HID_SD_EFFECT_PREVIEW"
+ #define HID_SD_CTL_NEWFOIL "SD_HID_SD_CTL_NEWFOIL"
+ #define HID_SD_NAVIGATOR_TLB "SD_HID_SD_NAVIGATOR_TLB"
+ #define HID_SD_NAVIGATOR "SD_HID_SD_NAVIGATOR"
+ #define HID_SD_CTL_EFFECTS "SD_HID_SD_CTL_EFFECTS"
+ #define HID_SD_CTL_TEXT_EFFECTS "SD_HID_SD_CTL_TEXT_EFFECTS"
+ #define HID_SD_CTL_SLIDE_CHANGE "SD_HID_SD_CTL_SLIDE_CHANGE"
+ #define HID_SD_NAVIGATOR_TBX "SD_HID_SD_NAVIGATOR_TBX"
+ #define HID_SD_NAVIGATOR_LB "SD_HID_SD_NAVIGATOR_LB"
+ #define HID_SD_NAVIGATOR_TBI_PEN "SD_HID_SD_NAVIGATOR_TBI_PEN"
+ #define HID_SD_NAVIGATOR_TBI_FIRST "SD_HID_SD_NAVIGATOR_TBI_FIRST"
+ #define HID_SD_NAVIGATOR_TBI_PREV "SD_HID_SD_NAVIGATOR_TBI_PREV"
+ #define HID_SD_NAVIGATOR_TBI_NEXT "SD_HID_SD_NAVIGATOR_TBI_NEXT"
+ #define HID_SD_NAVIGATOR_TBI_LAST "SD_HID_SD_NAVIGATOR_TBI_LAST"
+ #define HID_SD_NAVIGATOR_TBI_DRAGTYPE "SD_HID_SD_NAVIGATOR_TBI_DRAGTYPE"
+ #define HID_SD_NAVIGATOR_TBI_SHAPE_FILTER "SD_HID_SD_NAVIGATOR_TBI_SHAPE_FILTER"
// Toolboxen
- #define HID_SD_DRAW_DEFAULTTOOLBOX (HID_SD_START + 40)
- #define HID_SD_PLUGINTOOLBOX (HID_SD_START + 41)
- #define HID_SD_DRAW_TOOLBOX (HID_SD_START + 42)
- #define HID_SD_SLIDE_TOOLBOX (HID_SD_START + 43)
- #define HID_SD_OUTLINE_TOOLBOX (HID_SD_START + 44)
- #define HID_SD_DRAW_OBJ_TOOLBOX (HID_SD_START + 45)
- #define HID_SD_DRAW_OPTIONS_TOOLBOX (HID_SD_START + 46)
- #define HID_SD_DRAW_COMMONTASK_TOOLBOX (HID_SD_START + 47)
- #define HID_SD_BEZIER_TOOLBOX (HID_SD_START + 48)
- #define HID_SD_TEXT_TOOLBOX (HID_SD_START + 49)
- #define HID_SD_GLUEPOINTS_TOOLBOX (HID_SD_START + 50)
- #define HID_SD_SLIDE_OBJ_TOOLBOX (HID_SD_START + 51)
+ #define HID_SD_DRAW_DEFAULTTOOLBOX "SD_HID_SD_DRAW_DEFAULTTOOLBOX"
+ #define HID_SD_PLUGINTOOLBOX "SD_HID_SD_PLUGINTOOLBOX"
+ #define HID_SD_DRAW_TOOLBOX "SD_HID_SD_DRAW_TOOLBOX"
+ #define HID_SD_SLIDE_TOOLBOX "SD_HID_SD_SLIDE_TOOLBOX"
+ #define HID_SD_OUTLINE_TOOLBOX "SD_HID_SD_OUTLINE_TOOLBOX"
+ #define HID_SD_DRAW_OBJ_TOOLBOX "SD_HID_SD_DRAW_OBJ_TOOLBOX"
+ #define HID_SD_DRAW_OPTIONS_TOOLBOX "SD_HID_SD_DRAW_OPTIONS_TOOLBOX"
+ #define HID_SD_DRAW_COMMONTASK_TOOLBOX "SD_HID_SD_DRAW_COMMONTASK_TOOLBOX"
+ #define HID_SD_BEZIER_TOOLBOX "SD_HID_SD_BEZIER_TOOLBOX"
+ #define HID_SD_TEXT_TOOLBOX "SD_HID_SD_TEXT_TOOLBOX"
+ #define HID_SD_GLUEPOINTS_TOOLBOX "SD_HID_SD_GLUEPOINTS_TOOLBOX"
+ #define HID_SD_SLIDE_OBJ_TOOLBOX "SD_HID_SD_SLIDE_OBJ_TOOLBOX"
// FloatingWindows
- #define HID_SD_FW_ALIGNMENT (HID_SD_START + 52)
- #define HID_SD_FW_ZOOM (HID_SD_START + 53)
- #define HID_SD_FW_CHOOSE_MODE (HID_SD_START + 54)
- #define HID_SD_FW_TEXT (HID_SD_START + 55)
- #define HID_SD_FW_RECTANGLES (HID_SD_START + 56)
- #define HID_SD_FW_ELLIPSES (HID_SD_START + 57)
- #define HID_SD_FW_LINES (HID_SD_START + 58)
- #define HID_SD_FW_ARROWS (HID_SD_START + 59)
- #define HID_SD_FW_3D_OBJECTS (HID_SD_START + 60)
- #define HID_SD_FW_CONNECTORS (HID_SD_START + 61)
- #define HID_SD_FW_INSERT (HID_SD_START + 62)
- #define HID_SD_FW_POSITION (HID_SD_START + 63)
-
- #define HID_SD_BTN_PREVIEW (HID_SD_START + 64)
-
- #define HID_SD_NAVIGATOR_MENU1 (HID_SD_START + 65)
- #define HID_SD_NAVIGATOR_MENU2 (HID_SD_START + 66)
- #define HID_SD_NAVIGATOR_MENU3 (HID_SD_START + 67)
-
- #define HID_SD_WIN_PRESENTATION (HID_SD_START + 68)
-
- // HelpIDs fuer Vorlagen
- #define HID_STANDARD_STYLESHEET_NAME (HID_SD_START + 70)
- #define HID_POOLSHEET_OBJWITHARROW (HID_SD_START + 71)
- #define HID_POOLSHEET_OBJWITHSHADOW (HID_SD_START + 72)
- #define HID_POOLSHEET_OBJWITHOUTFILL (HID_SD_START + 73)
- #define HID_POOLSHEET_TEXT (HID_SD_START + 74)
- #define HID_POOLSHEET_TEXTBODY (HID_SD_START + 75)
- #define HID_POOLSHEET_TEXTBODY_JUSTIFY (HID_SD_START + 76)
- #define HID_POOLSHEET_TEXTBODY_INDENT (HID_SD_START + 77)
- #define HID_POOLSHEET_TITLE (HID_SD_START + 78)
- #define HID_POOLSHEET_TITLE1 (HID_SD_START + 79)
- #define HID_POOLSHEET_TITLE2 (HID_SD_START + 80)
- #define HID_POOLSHEET_HEADLINE (HID_SD_START + 81)
- #define HID_POOLSHEET_HEADLINE1 (HID_SD_START + 82)
- #define HID_POOLSHEET_HEADLINE2 (HID_SD_START + 83)
- #define HID_POOLSHEET_MEASURE (HID_SD_START + 84)
-
- #define HID_PSEUDOSHEET_TITLE (HID_SD_START + 85)
- #define HID_PSEUDOSHEET_OUTLINE (HID_SD_START + 86)
- #define HID_PSEUDOSHEET_OUTLINE1 (HID_SD_START + 87)
- #define HID_PSEUDOSHEET_OUTLINE2 (HID_SD_START + 88)
- #define HID_PSEUDOSHEET_OUTLINE3 (HID_SD_START + 89)
- #define HID_PSEUDOSHEET_OUTLINE4 (HID_SD_START + 90)
- #define HID_PSEUDOSHEET_OUTLINE5 (HID_SD_START + 91)
- #define HID_PSEUDOSHEET_OUTLINE6 (HID_SD_START + 92)
- #define HID_PSEUDOSHEET_OUTLINE7 (HID_SD_START + 93)
- #define HID_PSEUDOSHEET_OUTLINE8 (HID_SD_START + 94)
- #define HID_PSEUDOSHEET_OUTLINE9 (HID_SD_START + 95)
- #define HID_PSEUDOSHEET_BACKGROUNDOBJECTS (HID_SD_START + 96)
- #define HID_PSEUDOSHEET_BACKGROUND (HID_SD_START + 97)
- #define HID_PSEUDOSHEET_NOTES (HID_SD_START + 98)
-
- #define HID_DLG_DEFINE_CUSTOMSHOW (HID_SD_START + 99)
- #define HID_DLG_DEFINE_CUSTOMSHOW_CTL (HID_SD_START + 100)
-
- #define HID_PSEUDOSHEET_SUBTITLE (HID_SD_START + 101)
-
- #define HID_CTL_ACTION_DLG_1 (HID_SD_START + 102)
- #define HID_CTL_ACTION_DLG_2 (HID_SD_START + 103)
-
- #define HID_SD_BTN_PRESENTATION (HID_SD_START + 104)
-
- #define HID_SD_HTMLEXPORT_PAGE1 (HID_SD_START + 105)
- #define HID_SD_HTMLEXPORT_PAGE2 (HID_SD_START + 106)
- #define HID_SD_HTMLEXPORT_PAGE3 (HID_SD_START + 107)
- #define HID_SD_HTMLEXPORT_PAGE4 (HID_SD_START + 108)
- #define HID_SD_HTMLEXPORT_PAGE5 (HID_SD_START + 109)
- #define HID_SD_HTMLEXPORT_PAGE6 (HID_SD_START + 110)
-
- #define HID_SD_CHGFOIL_LAYOUT (HID_SD_START + 111)
- #define HID_SD_CHGFOIL_BACKGROUND (HID_SD_START + 112)
- #define HID_SD_CHGFOIL_OBJECTS (HID_SD_START + 113)
- #define HID_SD_CHGFOIL_NAME (HID_SD_START + 114)
-
- #define HID_SD_HTMLEXPORT_DLG_DNAME (HID_SD_START + 115)
-
- #define HID_FM_CTL_SELECTION (HID_SD_START + 116)
-
- #define HID_SD_AUTOPILOT_REGION (HID_SD_START + 117)
- #define HID_SD_AUTOPILOT_TEMPLATES (HID_SD_START + 118)
- #define HID_SD_AUTOPILOT_OPEN (HID_SD_START + 119)
- #define HID_SD_AUTOPILOT_PAGETEMPLATES (HID_SD_START + 120)
-
- #define HID_SD_DRAW_GRAF_TOOLBOX (HID_SD_START + 121)
-
- #define HID_SD_FW_GRAFFILTERS (HID_SD_START + 122)
-
- #define HID_SD_TABBAR_PAGES (HID_SD_START + 123)
- #define HID_SD_TABBAR_LAYERS (HID_SD_START + 124)
-
- #define HID_SD_UNDODELETEWARNING_DLG (HID_SD_START + 125)
- #define HID_SD_UNDODELETEWARNING_CBX (HID_SD_START + 126)
-
- #define HID_SD_PAGEOBJSTLB (HID_SD_START + 127)
-
- #define HID_SD_NAMEDIALOG_OBJECT (HID_SD_START + 128)
- #define HID_SD_NAMEDIALOG_PAGE (HID_SD_START + 129)
- #define HID_SD_NAMEDIALOG_LINEEND (HID_SD_START + 130)
-
- #define HID_SD_DRAW_3D_TOOLBOX (HID_SD_START + 131)
- #define HID_SD_DRAW_FONTWORK_TOOLBOX (HID_SD_START + 132)
-
- #define HID_SD_TABPAGE_HEADERFOOTER_SLIDE (HID_SD_START + 133)
- #define HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT (HID_SD_START + 134)
-
- #define HID_SD_DRAW_MEDIA_TOOLBOX (HID_SD_START + 135)
-
- #define HID_SD_TASK_PANE (HID_SD_START + 136)
- #define HID_SD_SLIDE_DESIGNS (HID_SD_START + 137)
- #define HID_SD_CURRENT_MASTERS (HID_SD_START + 138)
- #define HID_SD_RECENT_MASTERS (HID_SD_START + 139)
- #define HID_SD_ALL_MASTERS (HID_SD_START + 140)
- #define HID_SD_SLIDE_LAYOUTS (HID_SD_START + 141)
- #define HID_SD_CUSTOM_ANIMATIONS (HID_SD_START + 142)
- #define HID_SD_SLIDE_TRANSITIONS (HID_SD_START + 143)
-
- #define HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT (HID_SD_START + 144)
- #define HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT (HID_SD_START + 145)
- #define HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT (HID_SD_START + 146)
- #define HID_SD_CUSTOMANIMATIONPANE_LB_START (HID_SD_START + 147)
- #define HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY (HID_SD_START + 148)
- #define HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE (HID_SD_START + 149)
- #define HID_SD_CUSTOMANIMATIONPANE_CB_SPEED (HID_SD_START + 150)
- #define HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST (HID_SD_START + 151)
- #define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP (HID_SD_START + 152)
- #define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN (HID_SD_START + 153)
- #define HID_SD_CUSTOMANIMATIONPANE_PB_PLAY (HID_SD_START + 154)
- #define HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW (HID_SD_START + 155)
- #define HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW (HID_SD_START + 156)
-
- #define HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES (HID_SD_START + 157)
- #define HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL (HID_SD_START + 158)
- #define HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY (HID_SD_START + 159)
- #define HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW (HID_SD_START + 160)
- #define HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW (HID_SD_START + 161)
-
- #define HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS (HID_SD_START + 162)
- #define HID_SD_SLIDETRANSITIONPANE_LB_SPEED (HID_SD_START + 163)
- #define HID_SD_SLIDETRANSITIONPANE_LB_SOUND (HID_SD_START + 164)
- #define HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND (HID_SD_START + 165)
- #define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE (HID_SD_START + 166)
- #define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO (HID_SD_START + 167)
- #define HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER (HID_SD_START + 168)
- #define HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL (HID_SD_START + 169)
- #define HID_SD_SLIDETRANSITIONPANE_PB_PLAY (HID_SD_START + 170)
- #define HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW (HID_SD_START + 171)
- #define HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW (HID_SD_START + 172)
-
- #define HID_SD_TASK_PANE_VIEW_MENU (HID_SD_START + 173)
- #define HID_SD_TASK_PANE_PREVIEW_CURRENT (HID_SD_START + 174)
- #define HID_SD_TASK_PANE_PREVIEW_RECENT (HID_SD_START + 175)
- #define HID_SD_TASK_PANE_PREVIEW_ALL (HID_SD_START + 176)
- #define HID_SD_TASK_PANE_PREVIEW_LAYOUTS (HID_SD_START + 177)
-
- #define HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE (HID_SD_START + 178)
- #define HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS (HID_SD_START + 179)
- #define HID_SD_CUSTOMANIMATIONDIALOG_EXIT (HID_SD_START + 180)
- #define HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH (HID_SD_START + 181)
- #define HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS (HID_SD_START + 182)
-
- #define HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX (HID_SD_START + 183)
- #define HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX (HID_SD_START + 184)
- #define HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX (HID_SD_START + 185)
- #define HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX (HID_SD_START + 186)
- #define HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX (HID_SD_START + 187)
- #define HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX (HID_SD_START + 188)
- #define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX (HID_SD_START + 189)
- #define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX (HID_SD_START + 190)
-
- #define HID_SD_SLIDESHOW_DISPLAY (HID_SD_START + 191)
-
- #define HID_SD_RULER_HORIZONTAL (HID_SD_START + 192)
- #define HID_SD_RULER_VERTICAL (HID_SD_START + 193)
-
- #define HID_SD_CELL_STYLE_DEFAULT (HID_SD_START + 194)
- #define HID_SD_CELL_STYLE_BANDED (HID_SD_START + 195)
- #define HID_SD_CELL_STYLE_HEADER (HID_SD_START + 196)
- #define HID_SD_CELL_STYLE_TOTAL (HID_SD_START + 197)
- #define HID_SD_CELL_STYLE_FIRST_COLUMN (HID_SD_START + 198)
- #define HID_SD_CELL_STYLE_LAST_COLUMN (HID_SD_START + 199)
-
- #define HID_SD_TABLE_DESIGN (HID_SD_START + 200)
- #define HID_SD_ANNOTATIONS (HID_SD_START + 201)
+ #define HID_SD_FW_ALIGNMENT "SD_HID_SD_FW_ALIGNMENT"
+ #define HID_SD_FW_ZOOM "SD_HID_SD_FW_ZOOM"
+ #define HID_SD_FW_CHOOSE_MODE "SD_HID_SD_FW_CHOOSE_MODE"
+ #define HID_SD_FW_TEXT "SD_HID_SD_FW_TEXT"
+ #define HID_SD_FW_RECTANGLES "SD_HID_SD_FW_RECTANGLES"
+ #define HID_SD_FW_ELLIPSES "SD_HID_SD_FW_ELLIPSES"
+ #define HID_SD_FW_LINES "SD_HID_SD_FW_LINES"
+ #define HID_SD_FW_ARROWS "SD_HID_SD_FW_ARROWS"
+ #define HID_SD_FW_3D_OBJECTS "SD_HID_SD_FW_3D_OBJECTS"
+ #define HID_SD_FW_CONNECTORS "SD_HID_SD_FW_CONNECTORS"
+ #define HID_SD_FW_INSERT "SD_HID_SD_FW_INSERT"
+ #define HID_SD_FW_POSITION "SD_HID_SD_FW_POSITION"
+
+ #define HID_SD_BTN_PREVIEW "SD_HID_SD_BTN_PREVIEW"
+
+ #define HID_SD_NAVIGATOR_MENU1 "SD_HID_SD_NAVIGATOR_MENU1"
+ #define HID_SD_NAVIGATOR_MENU2 "SD_HID_SD_NAVIGATOR_MENU2"
+ #define HID_SD_NAVIGATOR_MENU3 "SD_HID_SD_NAVIGATOR_MENU3"
+
+ #define HID_SD_WIN_PRESENTATION "SD_HID_SD_WIN_PRESENTATION"
+
+ #define HID_DLG_DEFINE_CUSTOMSHOW "SD_HID_DLG_DEFINE_CUSTOMSHOW"
+ #define HID_DLG_DEFINE_CUSTOMSHOW_CTL "SD_HID_DLG_DEFINE_CUSTOMSHOW_CTL"
+
+ #define HID_CTL_ACTION_DLG_1 "SD_HID_CTL_ACTION_DLG_1"
+ #define HID_CTL_ACTION_DLG_2 "SD_HID_CTL_ACTION_DLG_2"
+
+ #define HID_SD_BTN_PRESENTATION "SD_HID_SD_BTN_PRESENTATION"
+
+ #define HID_SD_HTMLEXPORT_PAGE1 "SD_HID_SD_HTMLEXPORT_PAGE1"
+ #define HID_SD_HTMLEXPORT_PAGE2 "SD_HID_SD_HTMLEXPORT_PAGE2"
+ #define HID_SD_HTMLEXPORT_PAGE3 "SD_HID_SD_HTMLEXPORT_PAGE3"
+ #define HID_SD_HTMLEXPORT_PAGE4 "SD_HID_SD_HTMLEXPORT_PAGE4"
+ #define HID_SD_HTMLEXPORT_PAGE5 "SD_HID_SD_HTMLEXPORT_PAGE5"
+ #define HID_SD_HTMLEXPORT_PAGE6 "SD_HID_SD_HTMLEXPORT_PAGE6"
+
+ #define HID_SD_CHGFOIL_LAYOUT "SD_HID_SD_CHGFOIL_LAYOUT"
+ #define HID_SD_CHGFOIL_BACKGROUND "SD_HID_SD_CHGFOIL_BACKGROUND"
+ #define HID_SD_CHGFOIL_OBJECTS "SD_HID_SD_CHGFOIL_OBJECTS"
+ #define HID_SD_CHGFOIL_NAME "SD_HID_SD_CHGFOIL_NAME"
+
+ #define HID_SD_HTMLEXPORT_DLG_DNAME "SD_HID_SD_HTMLEXPORT_DLG_DNAME"
+
+ #define HID_FM_CTL_SELECTION "SD_HID_FM_CTL_SELECTION"
+
+ #define HID_SD_AUTOPILOT_REGION "SD_HID_SD_AUTOPILOT_REGION"
+ #define HID_SD_AUTOPILOT_TEMPLATES "SD_HID_SD_AUTOPILOT_TEMPLATES"
+ #define HID_SD_AUTOPILOT_OPEN "SD_HID_SD_AUTOPILOT_OPEN"
+ #define HID_SD_AUTOPILOT_PAGETEMPLATES "SD_HID_SD_AUTOPILOT_PAGETEMPLATES"
+
+ #define HID_SD_DRAW_GRAF_TOOLBOX "SD_HID_SD_DRAW_GRAF_TOOLBOX"
+
+ #define HID_SD_FW_GRAFFILTERS "SD_HID_SD_FW_GRAFFILTERS"
+
+ #define HID_SD_TABBAR_PAGES "SD_HID_SD_TABBAR_PAGES"
+ #define HID_SD_TABBAR_LAYERS "SD_HID_SD_TABBAR_LAYERS"
+
+ #define HID_SD_UNDODELETEWARNING_DLG "SD_HID_SD_UNDODELETEWARNING_DLG"
+ #define HID_SD_UNDODELETEWARNING_CBX "SD_HID_SD_UNDODELETEWARNING_CBX"
+
+ #define HID_SD_PAGEOBJSTLB "SD_HID_SD_PAGEOBJSTLB"
+
+ #define HID_SD_NAMEDIALOG_OBJECT "SD_HID_SD_NAMEDIALOG_OBJECT"
+ #define HID_SD_NAMEDIALOG_PAGE "SD_HID_SD_NAMEDIALOG_PAGE"
+ #define HID_SD_NAMEDIALOG_LINEEND "SD_HID_SD_NAMEDIALOG_LINEEND"
+
+ #define HID_SD_DRAW_3D_TOOLBOX "SD_HID_SD_DRAW_3D_TOOLBOX"
+ #define HID_SD_DRAW_FONTWORK_TOOLBOX "SD_HID_SD_DRAW_FONTWORK_TOOLBOX"
+
+ #define HID_SD_TABPAGE_HEADERFOOTER_SLIDE "SD_HID_SD_TABPAGE_HEADERFOOTER_SLIDE"
+ #define HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT "SD_HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT"
+
+ #define HID_SD_DRAW_MEDIA_TOOLBOX "SD_HID_SD_DRAW_MEDIA_TOOLBOX"
+
+ #define HID_SD_TASK_PANE "SD_HID_SD_TASK_PANE"
+ #define HID_SD_SLIDE_DESIGNS "SD_HID_SD_SLIDE_DESIGNS"
+ #define HID_SD_CURRENT_MASTERS "SD_HID_SD_CURRENT_MASTERS"
+ #define HID_SD_RECENT_MASTERS "SD_HID_SD_RECENT_MASTERS"
+ #define HID_SD_ALL_MASTERS "SD_HID_SD_ALL_MASTERS"
+ #define HID_SD_SLIDE_LAYOUTS "SD_HID_SD_SLIDE_LAYOUTS"
+ #define HID_SD_CUSTOM_ANIMATIONS "SD_HID_SD_CUSTOM_ANIMATIONS"
+ #define HID_SD_SLIDE_TRANSITIONS "SD_HID_SD_SLIDE_TRANSITIONS"
+
+ #define HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT "SD_HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT"
+ #define HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT "SD_HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT"
+ #define HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT "SD_HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT"
+ #define HID_SD_CUSTOMANIMATIONPANE_LB_START "SD_HID_SD_CUSTOMANIMATIONPANE_LB_START"
+ #define HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY "SD_HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY"
+ #define HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE "SD_HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE"
+ #define HID_SD_CUSTOMANIMATIONPANE_CB_SPEED "SD_HID_SD_CUSTOMANIMATIONPANE_CB_SPEED"
+ #define HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST "SD_HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST"
+ #define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP "SD_HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP"
+ #define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN "SD_HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN"
+ #define HID_SD_CUSTOMANIMATIONPANE_PB_PLAY "SD_HID_SD_CUSTOMANIMATIONPANE_PB_PLAY"
+ #define HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW "SD_HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW"
+ #define HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW "SD_HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW"
+
+ #define HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES "SD_HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES"
+ #define HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL"
+ #define HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY"
+ #define HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW"
+ #define HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW "SD_HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW"
+
+ #define HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS "SD_HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS"
+ #define HID_SD_SLIDETRANSITIONPANE_LB_SPEED "SD_HID_SD_SLIDETRANSITIONPANE_LB_SPEED"
+ #define HID_SD_SLIDETRANSITIONPANE_LB_SOUND "SD_HID_SD_SLIDETRANSITIONPANE_LB_SOUND"
+ #define HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND "SD_HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND"
+ #define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE "SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE"
+ #define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO "SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO"
+ #define HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER "SD_HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER"
+ #define HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL "SD_HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL"
+ #define HID_SD_SLIDETRANSITIONPANE_PB_PLAY "SD_HID_SD_SLIDETRANSITIONPANE_PB_PLAY"
+ #define HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW "SD_HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW"
+ #define HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW "SD_HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW"
+
+ #define HID_SD_TASK_PANE_VIEW_MENU "SD_HID_SD_TASK_PANE_VIEW_MENU"
+ #define HID_SD_TASK_PANE_PREVIEW_CURRENT "SD_HID_SD_TASK_PANE_PREVIEW_CURRENT"
+ #define HID_SD_TASK_PANE_PREVIEW_RECENT "SD_HID_SD_TASK_PANE_PREVIEW_RECENT"
+ #define HID_SD_TASK_PANE_PREVIEW_ALL "SD_HID_SD_TASK_PANE_PREVIEW_ALL"
+ #define HID_SD_TASK_PANE_PREVIEW_LAYOUTS "SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS"
+
+ #define HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE "SD_HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE"
+ #define HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS "SD_HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS"
+ #define HID_SD_CUSTOMANIMATIONDIALOG_EXIT "SD_HID_SD_CUSTOMANIMATIONDIALOG_EXIT"
+ #define HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH "SD_HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH"
+ #define HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS "SD_HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS"
+
+ #define HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX"
+ #define HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX"
+ #define HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX"
+ #define HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX"
+ #define HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX"
+ #define HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX"
+ #define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX"
+ #define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX"
+
+ #define HID_SD_SLIDESHOW_DISPLAY "SD_HID_SD_SLIDESHOW_DISPLAY"
+
+ #define HID_SD_RULER_HORIZONTAL "SD_HID_SD_RULER_HORIZONTAL"
+ #define HID_SD_RULER_VERTICAL "SD_HID_SD_RULER_VERTICAL"
+
+ #define HID_SD_TABLE_DESIGN "SD_HID_SD_TABLE_DESIGN"
+ #define HID_SD_ANNOTATIONS "SD_HID_SD_ANNOTATIONS"
+
+ #define HID_DLG_INSERT_PAGES_OBJS "SD_HID_DLG_INSERT_PAGES_OBJS"
+ #define HID_TABPAGE_PARA_NUMBERING "SD_HID_TABPAGE_PARA_NUMBERING"
+ #define HID_VECTORIZE_DLG "SD_HID_VECTORIZE_DLG"
+ #define HID_UNDO_DELETE_WARNING "SD_HID_UNDO_DELETE_WARNING"
+
+ #define HID_MN_SUB_GROUP "SD_HID_MN_SUB_GROUP"
+ #define HID_MN_SUB_GRAPHIC "SD_HID_MN_SUB_GRAPHIC"
+ #define HID_MN_SUB_SEND "SD_HID_MN_SUB_SEND"
+ #define HID_MN_SUB_MASTER_LAYOUTS "SD_HID_MN_SUB_MASTER_LAYOUTS"
+ #define HID_MN_SUB_VIEW "SD_HID_MN_SUB_VIEW"
+ #define HID_MN_SUB_MASTERPAGE "SD_HID_MN_SUB_MASTERPAGE"
+ #define HID_MN_SUB_FIELD "SD_HID_MN_SUB_FIELD"
+ #define HID_MN_SUB_TEMPLATES "SD_HID_MN_SUB_TEMPLATES"
+ #define HID_MN_SUB_SPELLING "SD_HID_MN_SUB_SPELLING"
+ #define HID_MN_SUB_POSITION "SD_HID_MN_SUB_POSITION"
+ #define HID_MN_SUB_OUTPUT_QUALITY "SD_HID_MN_SUB_OUTPUT_QUALITY"
+ #define HID_MN_SUB_PREVIEW_OUTPUT_QUALITY "SD_HID_MN_SUB_PREVIEW_OUTPUT_QUALITY"
+ #define HID_MN_SUB_CONVERT "SD_HID_MN_SUB_CONVERT"
+ #define HID_MN_SUB_MIRROR "SD_HID_MN_SUB_MIRROR"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc sd/inc/pch/precompiled_sd.hxx
index 0c897bb,b663187..d86c6a1
mode 100644,100755..100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@@ -903,13 -900,15 +901,13 @@@
#include "vcl/virdev.hxx"
#include "vcl/waitobj.hxx"
#include "vcl/window.hxx"
- #include "vcl/wintypes.hxx"
+ #include "tools/wintypes.hxx"
#include "vcl/wrkwin.hxx"
-#include "vos/diagnose.hxx"
-#include "vos/module.hxx"
-#include "vos/mutex.hxx"
-#include "vos/process.hxx"
-#include "vos/thread.hxx"
-#include "vos/xception.hxx"
+#include "osl/diagnose.h"
+#include "osl/module.hxx"
+#include "osl/mutex.hxx"
+#include "osl/process.h"
//---MARKER---
#endif
diff --cc sd/inc/sdabstdlg.hxx
index 8d75a56,854cb04..4ee451c
mode 100644,100755..100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
diff --cc sd/inc/sdcommands.h
index 0000000,c887063..0f63f08
mode 000000,100644..100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@@ -1,0 -1,310 +1,311 @@@
+ /*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+ #ifndef SD_SDCOMMANDS_HRC
+ #define SD_SDCOMMANDS_HRC
+
+ #define CMD_SID_OBJECT_MIRROR ".uno:Mirror"
+ #define CMD_SID_OBJECT_CHOOSE_MODE ".uno:AdvancedMode"
+ #define CMD_SID_ANIMATION_EFFECTS ".uno:AnimationEffects"
+ #define CMD_SID_ANIMATION_OBJECTS ".uno:AnimationObjects"
+ #define CMD_SID_ANIMATOR_ADD ".uno:AnimatorAddObject"
+ #define CMD_SID_ANIMATOR_CREATE ".uno:AnimatorCreateObject"
+ #define CMD_SID_ANIMATOR_INIT ".uno:AnimatorInit"
+ #define CMD_SID_ANIMATOR_STATE ".uno:AnimatorState"
+ #define CMD_SID_DRAWTBX_ARROWS ".uno:ArrowsToolbox"
+ #define CMD_SID_MOREBACK ".uno:Backward"
+ #define CMD_SID_BEFORE_OBJ ".uno:BeforeObject"
+ #define CMD_SID_BEHIND_OBJ ".uno:BehindObject"
+ #define CMD_SID_BIG_HANDLES ".uno:BigHandles"
+ #define CMD_SID_BREAK ".uno:Break"
+ #define CMD_SID_CAPTUREPOINT ".uno:CapturePoint"
+ #define CMD_SID_CHANGEBEZIER ".uno:ChangeBezier"
+ #define CMD_SID_CHANGEPOLYGON ".uno:ChangePolygon"
+ #define CMD_SID_CLICK_CHANGE_ROTATION ".uno:ClickChangeRotation"
+ #define CMD_SID_OBJECT_CLOSE ".uno:CloseObject"
+ #define CMD_SID_COLORVIEW ".uno:ColorView"
+ #define CMD_SID_COMBINE ".uno:Combine"
+ #define CMD_SID_3D_CONE ".uno:Cone"
+ #define CMD_SID_CONNECT ".uno:Connect"
+ #define CMD_SID_TOOL_CONNECTOR ".uno:Connector"
+ #define CMD_SID_CONNECTOR_ARROW_END ".uno:ConnectorArrowEnd"
+ #define CMD_SID_CONNECTOR_ARROWS ".uno:ConnectorArrows"
+ #define CMD_SID_CONNECTOR_ARROW_START ".uno:ConnectorArrowStart"
+ #define CMD_SID_CONNECTION_DLG ".uno:ConnectorAttributes"
+ #define CMD_SID_CONNECTOR_CIRCLE_END ".uno:ConnectorCircleEnd"
+ #define CMD_SID_CONNECTOR_CIRCLES ".uno:ConnectorCircles"
+ #define CMD_SID_CONNECTOR_CIRCLE_START ".uno:ConnectorCircleStart"
+ #define CMD_SID_CONNECTOR_CURVE ".uno:ConnectorCurve"
+ #define CMD_SID_CONNECTOR_CURVE_ARROW_END ".uno:ConnectorCurveArrowEnd"
+ #define CMD_SID_CONNECTOR_CURVE_ARROWS ".uno:ConnectorCurveArrows"
+ #define CMD_SID_CONNECTOR_CURVE_ARROW_START ".uno:ConnectorCurveArrowStart"
+ #define CMD_SID_CONNECTOR_CURVE_CIRCLE_END ".uno:ConnectorCurveCircleEnd"
+ #define CMD_SID_CONNECTOR_CURVE_CIRCLES ".uno:ConnectorCurveCircles"
+ #define CMD_SID_CONNECTOR_CURVE_CIRCLE_START ".uno:ConnectorCurveCircleStart"
+ #define CMD_SID_CONNECTOR_LINE ".uno:ConnectorLine"
+ #define CMD_SID_CONNECTOR_LINE_ARROW_END ".uno:ConnectorLineArrowEnd"
+ #define CMD_SID_CONNECTOR_LINE_ARROWS ".uno:ConnectorLineArrows"
+ #define CMD_SID_CONNECTOR_LINE_ARROW_START ".uno:ConnectorLineArrowStart"
+ #define CMD_SID_CONNECTOR_LINE_CIRCLE_END ".uno:ConnectorLineCircleEnd"
+ #define CMD_SID_CONNECTOR_LINE_CIRCLES ".uno:ConnectorLineCircles"
+ #define CMD_SID_CONNECTOR_LINE_CIRCLE_START ".uno:ConnectorLineCircleStart"
+ #define CMD_SID_CONNECTOR_LINES ".uno:ConnectorLines"
+ #define CMD_SID_CONNECTOR_LINES_ARROW_END ".uno:ConnectorLinesArrowEnd"
+ #define CMD_SID_CONNECTOR_LINES_ARROWS ".uno:ConnectorLinesArrows"
+ #define CMD_SID_CONNECTOR_LINES_ARROW_START ".uno:ConnectorLinesArrowStart"
+ #define CMD_SID_CONNECTOR_LINES_CIRCLE_END ".uno:ConnectorLinesCircleEnd"
+ #define CMD_SID_CONNECTOR_LINES_CIRCLES ".uno:ConnectorLinesCircles"
+ #define CMD_SID_CONNECTOR_LINES_CIRCLE_START ".uno:ConnectorLinesCircleStart"
+ #define CMD_SID_DRAWTBX_CONNECTORS ".uno:ConnectorToolbox"
+ #define CMD_SID_CONVERT_TO_CONTOUR ".uno:convert_to_contour"
+ #define CMD_SID_CONVERT_TO_3D ".uno:ConvertInto3D"
+ #define CMD_SID_CONVERT_TO_3D_LATHE ".uno:ConvertInto3DLathe"
+ #define CMD_SID_CONVERT_TO_3D_LATHE_FAST ".uno:ConvertInto3DLatheFast"
+ #define CMD_SID_CONVERT_TO_BITMAP ".uno:ConvertIntoBitmap"
+ #define CMD_SID_CONVERT_TO_METAFILE ".uno:ConvertIntoMetaFile"
+ #define CMD_SID_CONVERT_TO_1BIT_MATRIX ".uno:ConvertTo1BitMatrix"
+ #define CMD_SID_CONVERT_TO_1BIT_THRESHOLD ".uno:ConvertTo1BitThreshold"
+ #define CMD_SID_CONVERT_TO_4BIT_COLORS ".uno:ConvertTo4BitColors"
+ #define CMD_SID_CONVERT_TO_4BIT_GRAYS ".uno:ConvertTo4BitGrays"
+ #define CMD_SID_CONVERT_TO_8BIT_COLORS ".uno:ConvertTo8BitColors"
+ #define CMD_SID_CONVERT_TO_8BIT_GRAYS ".uno:ConvertTo8BitGrays"
+ #define CMD_SID_CONVERT_TO_24BIT ".uno:ConvertToTrueColor"
+ #define CMD_SID_COPYOBJECTS ".uno:CopyObjects"
+ #define CMD_SID_OBJECT_CROOK_ROTATE ".uno:CrookRotate"
+ #define CMD_SID_OBJECT_CROOK_SLANT ".uno:CrookSlant"
+ #define CMD_SID_OBJECT_CROOK_STRETCH ".uno:CrookStretch"
+ #define CMD_SID_3D_CUBE ".uno:Cube"
+ #define CMD_SID_CUSTOMSHOW_DLG ".uno:CustomShowDialog"
+ #define CMD_SID_3D_CYLINDER ".uno:Cylinder"
+ #define CMD_SID_3D_PYRAMID ".uno:Cyramid"
+ #define CMD_SID_DELETE_LAYER ".uno:DeleteLayer"
+ #define CMD_SID_DELETE_PAGE ".uno:DeletePage"
+ #define CMD_SID_DELETE_SNAPITEM ".uno:DeleteSnapItem"
+ #define CMD_SID_UNSELECT ".uno:DeSelect"
+ #define CMD_SID_DIAMODE ".uno:DiaMode"
+ #define CMD_SID_DISMANTLE ".uno:Dismantle"
+ #define CMD_SID_DOUBLECLICK_TEXTEDIT ".uno:DoubleClickTextEdit"
+ #define CMD_SID_DRAWINGMODE ".uno:DrawingMode"
+ #define CMD_SID_DUPLICATE_PAGE ".uno:DuplicatePage"
+ #define CMD_SID_EDIT_HYPERLINK ".uno:EditHyperlink"
+ #define CMD_SID_EDIT_OUTLINER ".uno:EditOutline"
+ #define CMD_SID_CUSTOM_ANIMATION_PANEL ".uno:CustomAnimation"
+ #define CMD_SID_CUSTOM_ANIMATION_SCHEMES_PANEL ".uno:CustomAnimationSchemes"
+ #define CMD_SID_DRAWTBX_ELLIPSES ".uno:EllipseToolbox"
+ #define CMD_SID_EXPAND_PAGE ".uno:ExpandPage"
+ #define CMD_SID_SETFILLCOLOR ".uno:SetFillColor"
+ #define CMD_SID_MOREFRONT ".uno:Forward"
+ #define CMD_SID_GETBLUE ".uno:GetBlue"
+ #define CMD_SID_GETFILLSTYLE ".uno:GetFillStyle"
+ #define CMD_SID_GETGREEN ".uno:GetGreen"
+ #define CMD_SID_GETLINESTYLE ".uno:GetLineStyle"
+ #define CMD_SID_GETLINEWIDTH ".uno:GetLineWidth"
+ #define CMD_SID_GETRED ".uno:GetRed"
+ #define CMD_SID_GLUE_EDITMODE ".uno:GlueEditMode"
+ #define CMD_SID_GLUE_ESCDIR ".uno:GlueEscapeDirection"
+ #define CMD_SID_GLUE_ESCDIR_BOTTOM ".uno:GlueEscapeDirectionBottom"
+ #define CMD_SID_GLUE_ESCDIR_LEFT ".uno:GlueEscapeDirectionLeft"
+ #define CMD_SID_GLUE_ESCDIR_RIGHT ".uno:GlueEscapeDirectionRight"
+ #define CMD_SID_GLUE_ESCDIR_TOP ".uno:GlueEscapeDirectionTop"
+ #define CMD_SID_GLUE_HORZALIGN_CENTER ".uno:GlueHorzAlignCenter"
+ #define CMD_SID_GLUE_HORZALIGN_LEFT ".uno:GlueHorzAlignLeft"
+ #define CMD_SID_GLUE_HORZALIGN_RIGHT ".uno:GlueHorzAlignRight"
+ #define CMD_SID_GLUE_INSERT_POINT ".uno:GlueInsertPoint"
+ #define CMD_SID_GLUE_PERCENT ".uno:GluePercent"
+ #define CMD_SID_GLUE_VERTALIGN_BOTTOM ".uno:GlueVertAlignBottom"
+ #define CMD_SID_GLUE_VERTALIGN_CENTER ".uno:GlueVertAlignCenter"
+ #define CMD_SID_GLUE_VERTALIGN_TOP ".uno:GlueVertAlignTop"
+ #define CMD_SID_GRADIENT ".uno:Gradient"
+ #define CMD_SID_SETGRADENDCOLOR ".uno:GradientEndColor"
+ #define CMD_SID_SETGRADSTARTCOLOR ".uno:GradientStartColor"
+ #define CMD_SID_GRAPHIC_EXPORT ".uno:GraphicExport"
+ #define CMD_SID_GRID_FRONT ".uno:GridFront"
+ #define CMD_SID_3D_HALF_SPHERE ".uno:HalfSphere"
+ #define CMD_SID_HANDLES_DRAFT ".uno:HandlesDraft"
+ #define CMD_SID_HANDOUT_MASTERPAGE ".uno:HandoutMasterPage"
+ #define CMD_SID_HANDOUTMODE ".uno:HandoutMode"
+ #define CMD_SID_HATCH ".uno:Hatch"
+ #define CMD_SID_SETHATCHCOLOR ".uno:HatchColor"
+ #define CMD_SID_HELPLINES_FRONT ".uno:HelplinesFront"
+ #define CMD_SID_HELPLINES_USE ".uno:HelplinesUse"
+ #define CMD_SID_HELPLINES_VISIBLE ".uno:HelplinesVisible"
+ #define CMD_SID_HIDE_SLIDE ".uno:HideSlide"
+ #define CMD_SID_SHOW_SLIDE ".uno:ShowSlide"
+ #define CMD_SID_HYPHENATION ".uno:Hyphenation"
+ #define CMD_SID_INSERTFILE ".uno:ImportFromFile"
+ #define CMD_SID_INSERT_FLD_AUTHOR ".uno:InsertAuthorField"
+ #define CMD_SID_INSERT_FLD_DATE_FIX ".uno:InsertDateFieldFix"
+ #define CMD_SID_INSERT_FLD_DATE_VAR ".uno:InsertDateFieldVar"
+ #define CMD_SID_INSERT_FLD_FILE ".uno:InsertFileField"
+ #define CMD_SID_INSERTLAYER ".uno:InsertLayer"
+ #define CMD_SID_INSERTPAGE ".uno:InsertPage"
+ #define CMD_SID_INSERT_FLD_PAGE ".uno:InsertPageField"
+ #define CMD_SID_INSERT_FLD_PAGES ".uno:InsertPagesField"
+ #define CMD_SID_INSERTPAGE_QUICK ".uno:InsertPageQuick"
+ #define CMD_SID_INSERT_FLD_TIME_FIX ".uno:InsertTimeFieldFix"
+ #define CMD_SID_INSERT_FLD_TIME_VAR ".uno:InsertTimeFieldVar"
+ #define CMD_SID_DRAWTBX_INSERT ".uno:InsertToolbox"
+ #define CMD_SID_OBJECT_GRADIENT ".uno:InteractiveGradient"
+ #define CMD_SID_OBJECT_TRANSPARENCE ".uno:InteractiveTransparence"
+ #define CMD_SID_LAYERMODE ".uno:LayerMode"
+ #define CMD_SID_STATUS_LAYOUT ".uno:LayoutStatus"
+ #define CMD_SID_LEAVE_ALL_GROUPS ".uno:LeaveAllGroups"
+ #define CMD_SID_LINE_ARROW_CIRCLE ".uno:LineArrowCircle"
+ #define CMD_SID_LINE_ARROW_END ".uno:LineArrowEnd"
+ #define CMD_SID_LINE_ARROWS ".uno:LineArrows"
+ #define CMD_SID_LINE_ARROW_SQUARE ".uno:LineArrowSquare"
+ #define CMD_SID_LINE_ARROW_START ".uno:LineArrowStart"
+ #define CMD_SID_LINE_CIRCLE_ARROW ".uno:LineCircleArrow"
+ #define CMD_SID_SETLINECOLOR ".uno:LineColor"
+ #define CMD_SID_LINEEND_POLYGON ".uno:LineEndPolygon"
+ #define CMD_SID_LINE_SQUARE_ARROW ".uno:LineSquareArrow"
+ #define CMD_SID_LINETO ".uno:LineTo"
+ #define CMD_SID_DRAWTBX_LINES ".uno:LineToolbox"
+ #define CMD_SID_MANAGE_LINKS ".uno:ManageLinks"
+ #define CMD_SID_MASTERPAGE ".uno:MasterPage"
+ #define CMD_SID_MEASURE_DLG ".uno:MeasureAttributes"
+ #define CMD_SID_DRAW_MEASURELINE ".uno:MeasureLine"
+ #define CMD_SID_HORIZONTAL ".uno:MirrorHorz"
+ #define CMD_SID_VERTICAL ".uno:MirrorVert"
+ #define CMD_SID_MODIFY_FIELD ".uno:ModifyField"
+ #define CMD_SID_MODIFYLAYER ".uno:ModifyLayer"
+ #define CMD_SID_MODIFYPAGE ".uno:ModifyPage"
+ #define CMD_SID_ASSIGN_LAYOUT ".uno:AssignLayout"
+ #define CMD_SID_PRESENTATIONOBJECT ".uno:ModifyPresentationObject"
+ #define CMD_SID_POLYGON_MORPHING ".uno:Morphing"
+ #define CMD_SID_MOVETO ".uno:MoveTo"
+ #define CMD_SID_NAME_GROUP ".uno:NameGroup"
+ #define CMD_SID_OBJECT_TITLE_DESCRIPTION ".uno:ObjectTitleDescription"
+ #define CMD_SID_NAVIGATOR_INIT ".uno:NavigatorInit"
+ #define CMD_SID_NAVIGATOR_OBJECT ".uno:NavigatorObject"
+ #define CMD_SID_NAVIGATOR_PAGE ".uno:NavigatorPage"
+ #define CMD_SID_NAVIGATOR_PAGENAME ".uno:NavigatorPageName"
+ #define CMD_SID_NAVIGATOR_PEN ".uno:NavigatorPen"
+ #define CMD_SID_NAVIGATOR_STATE ".uno:NavigatorState"
+ #define CMD_SID_CONNECTION_NEW_ROUTING ".uno:NewRouting"
+ #define CMD_SID_NOTES_MASTERPAGE ".uno:NotesMasterPage"
+ #define CMD_SID_NOTESMODE ".uno:NotesMode"
+ #define CMD_SID_POSITION ".uno:ObjectPosition"
+ #define CMD_SID_DRAWTBX_3D_OBJECTS ".uno:Objects3DToolbox"
+ #define CMD_SID_ORIGINAL_SIZE ".uno:OriginalSize"
+ #define CMD_SID_SAVEGRAPHIC ".uno:SaveGraphic"
+ #define CMD_SID_OUTLINEMODE ".uno:OutlineMode"
+ #define CMD_SID_OUTPUT_QUALITY_BLACKWHITE ".uno:OutputQualityBlackWhite"
+ #define CMD_SID_OUTPUT_QUALITY_COLOR ".uno:OutputQualityColor"
+ #define CMD_SID_OUTPUT_QUALITY_CONTRAST ".uno:OutputQualityContrast"
+ #define CMD_SID_OUTPUT_QUALITY_GRAYSCALE ".uno:OutputQualityGrayscale"
+ #define CMD_SID_PACKNGO ".uno:PackAndGo"
+ #define CMD_SID_PAGEMARGIN ".uno:PageMargin"
+ #define CMD_SID_PAGEMODE ".uno:PageMode"
+ #define CMD_SID_PAGESETUP ".uno:PageSetup"
+ #define CMD_SID_PAGESIZE ".uno:PageSize"
+ #define CMD_SID_PAGES_PER_ROW ".uno:PagesPerRow"
+ #define CMD_SID_STATUS_PAGE ".uno:PageStatus"
+ #define CMD_SID_PARASPACE_DECREASE ".uno:ParaspaceDecrease"
+ #define CMD_SID_PARASPACE_INCREASE ".uno:ParaspaceIncrease"
+ #define CMD_SID_PICK_THROUGH ".uno:PickThrough"
+ #define CMD_SID_DRAW_POLYGON ".uno:Polygon"
+ #define CMD_SID_PRESENTATION ".uno:Presentation"
+ #define CMD_SID_PRESENTATION_DLG ".uno:PresentationDialog"
+ #define CMD_SID_PRESENTATION_END ".uno:PresentationEnd"
+ #define CMD_SID_CLEAR_UNDO_STACK ".uno:ClearUndoStack"
+ #define CMD_SID_PRESENTATION_LAYOUT ".uno:PresentationLayout"
+ #define CMD_SID_PREVIEW_STATE ".uno:PreviewState"
+ #define CMD_SID_PREVIEW_WIN ".uno:PreviewWindow"
+ #define CMD_SID_QUICKEDIT ".uno:QuickEdit"
+ #define CMD_SID_DRAWTBX_RECTANGLES ".uno:RectangleToolbox"
+ #define CMD_SID_REHEARSE_TIMINGS ".uno:RehearseTimings"
+ #define CMD_SID_RENAMELAYER ".uno:RenameLayer"
+ #define CMD_SID_RENAMEPAGE ".uno:RenamePage"
+ #define CMD_SID_RENAMEPAGE_QUICK ".uno:RenamePageQuick"
+ #define CMD_SID_REVERSE_ORDER ".uno:ReverseOrder"
+ #define CMD_SID_RULER_OBJECT ".uno:RulerObject"
+ #define CMD_SID_SELECTAT ".uno:SelectAt"
+ #define CMD_SID_SELECTGRADIENT ".uno:SelectGradient"
+ #define CMD_SID_SELECTHATCH ".uno:SelectHatch"
+ #define CMD_SID_SETFILLSTYLE ".uno:SetFillStyle"
+ #define CMD_SID_SETLINESTYLE ".uno:SetLineStyle"
+ #define CMD_SID_SETLINEWIDTH ".uno:SetLineWidth"
+ #define CMD_SID_SET_SNAPITEM ".uno:SetSnapItem"
+ #define CMD_SID_OBJECT_SHEAR ".uno:Shear"
+ #define CMD_SID_3D_SHELL ".uno:Shell3D"
+ #define CMD_SID_SLIDE_TRANSITIONS_PANEL ".uno:SlideChangeWindow"
+ #define CMD_SID_SLIDE_MASTERPAGE ".uno:SlideMasterPage"
+ #define CMD_SID_SNAP_BORDER ".uno:SnapBorder"
+ #define CMD_SID_SNAP_FRAME ".uno:SnapFrame"
+ #define CMD_SID_SNAP_POINTS ".uno:SnapPoints"
+ #define CMD_SID_SOLID_CREATE ".uno:SolidCreate"
+ #define CMD_SID_3D_SPHERE ".uno:Sphere"
+ #define CMD_SID_STARTAPP ".uno:StartApplication"
+ #define CMD_SID_SUMMARY_PAGE ".uno:SummaryPage"
+ #define CMD_SID_SWITCHLAYER ".uno:SwitchLayer"
+ #define CMD_SID_SWITCHPAGE ".uno:SwitchPage"
+ #define CMD_SID_SWITCH_POINTEDIT ".uno:SwitchPointEdit"
+ #define CMD_SID_TEXTALIGNMENT ".uno:TextAlignment"
+ #define CMD_SID_TEXTATTR_DLG ".uno:TextAttributes"
+ #define CMD_SID_TEXT_FITTOSIZE ".uno:TextFitToSizeTool"
+ #define CMD_SID_DRAWTBX_TEXT ".uno:TextToolbox"
+ #define CMD_SID_TITLE_MASTERPAGE ".uno:TitleMasterPage"
+ #define CMD_SID_3D_TORUS ".uno:Torus"
+ #define CMD_SID_TEXT_FITTOSIZE_VERTICAL ".uno:VerticalTextFitToSizeTool"
+ #define CMD_SID_ZOOM_PANNING ".uno:ZoomPanning"
+ #define CMD_SID_OBJECT_CROP ".uno:Crop"
+ #define CMD_SID_HEADER_AND_FOOTER ".uno:HeaderAndFooter"
+ #define CMD_SID_INSERT_PAGE_NUMBER ".uno:InsertPageNumber"
+ #define CMD_SID_INSERT_DATE_TIME ".uno:InsertDateAndTime"
+ #define CMD_SID_MASTER_LAYOUTS ".uno:MasterLayouts"
+ #define CMD_SID_DRAW_FONTWORK ".uno:DrawFontwork"
+ #define CMD_SID_DRAW_FONTWORK_VERTICAL ".uno:DrawFontworkVertical"
+ #define CMD_SID_LAYER_DIALOG_WIN ".uno:LayerDialogChildWindow"
+ #define CMD_SID_INSERT_MASTER_PAGE ".uno:InsertMasterPage"
+ #define CMD_SID_DELETE_MASTER_PAGE ".uno:DeleteMasterPage"
+ #define CMD_SID_RENAME_MASTER_PAGE ".uno:RenameMasterPage"
+ #define CMD_SID_CLOSE_MASTER_VIEW ".uno:CloseMasterView"
+ #define CMD_SID_SELECT_BACKGROUND ".uno:SelectBackground"
+ #define CMD_SID_DISPLAY_MASTER_BACKGROUND ".uno:DisplayMasterBackground"
+ #define CMD_SID_DISPLAY_MASTER_OBJECTS ".uno:DisplayMasterObjects"
+ #define CMD_SID_TABLE_TOOLBOX ".uno:TableToolBox"
+ #define CMD_SID_TABLE_DISTRIBUTE_COLUMNS ".uno:DistributeColumns"
+ #define CMD_SID_TABLE_DISTRIBUTE_ROWS ".uno:DistributeRows"
+ #define CMD_SID_TP_APPLY_TO_ALL_SLIDES ".uno:TaskPaneApplyToAllSlides"
+ #define CMD_SID_TP_APPLY_TO_SELECTED_SLIDES ".uno:TaskPaneApplyToSelectedSlides"
+ #define CMD_SID_TP_USE_FOR_NEW_PRESENTATIONS ".uno:TaskPaneUseForNewPresentations"
+ #define CMD_SID_TP_SHOW_SMALL_PREVIEW ".uno:TaskPaneShowSmallPreview"
+ #define CMD_SID_TP_SHOW_LARGE_PREVIEW ".uno:TaskPaneShowLargePreview"
+ #define CMD_SID_TP_EDIT_MASTER ".uno:TaskPaneEditMaster"
+ #define CMD_SID_INSERTPAGE_LAYOUT_MENU ".uno:TaskPaneInsertPage"
+ #define CMD_SID_SWITCH_SHELL ".uno:SwitchViewShell"
+ #define CMD_SID_SWITCH_SHELL_PANE ".uno:SwitchViewShellPane"
+ #define CMD_SID_LEFT_PANE_IMPRESS ".uno:LeftPaneImpress"
+ #define CMD_SID_LEFT_PANE_DRAW ".uno:LeftPaneDraw"
+ #define CMD_SID_RIGHT_PANE ".uno:RightPane"
+ #define CMD_SID_NOTES_WINDOW ".uno:NotesChildWindow"
+ #define CMD_SID_NORMAL_MULTI_PANE_GUI ".uno:NormalMultiPaneGUI"
+ #define CMD_SID_SLIDE_SORTER_MULTI_PANE_GUI ".uno:SlideSorterMultiPaneGUI"
+ #define CMD_SID_TASK_PANE ".uno:TaskPaneShowPanel"
++#define CMD_SID_OUTLINE_TEXT_AUTOFIT ".uno:TextAutoFit"
+
+ #endif
diff --cc sd/inc/sdmod.hxx
index 4fe7851,60d36be..b5185ec
mode 100644,100755..100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
diff --cc sd/inc/shapelist.hxx
index 4896d06,87d6c21..e0af951
mode 100644,100755..100644
--- a/sd/inc/shapelist.hxx
+++ b/sd/inc/shapelist.hxx
diff --cc sd/prj/build.lst
index f591af9,0816f2d..1082a5a
--- a/sd/prj/build.lst
+++ b/sd/prj/build.lst
@@@ -1,4 -1,4 +1,4 @@@
- sd sd : filter l10n animations svx sfx2 stoc canvas oox NULL
-sd sd : filter l10n animations svx sfx2 stoc canvas LIBXSLT:libxslt NULL
++sd sd : filter l10n animations svx sfx2 stoc canvas LIBXSLT:libxslt oox NULL
sd sd usr1 - all sd_mkout NULL
sd sd\inc nmake - all sd_inc NULL
sd sd\prj get - all sd_prj NULL
diff --cc sd/prj/d.lst
index 14f85e9,0ebbb9a..0ebbb9a
mode 100755,100755..100644
--- a/sd/prj/d.lst
+++ b/sd/prj/d.lst
diff --cc sd/qa/unoapi/knownissues.xcl
index 0f28aeb,a47bdb8..a47bdb8
mode 100644,100755..100644
--- a/sd/qa/unoapi/knownissues.xcl
+++ b/sd/qa/unoapi/knownissues.xcl
diff --cc sd/sdi/SlideSorterController.sdi
index 38115b8,2077b62..2077b62
mode 100644,100755..100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
diff --cc sd/sdi/ViewShellBase.sdi
index 82eaced,b1607ac..b1607ac
mode 100755,100755..100644
--- a/sd/sdi/ViewShellBase.sdi
+++ b/sd/sdi/ViewShellBase.sdi
diff --cc sd/sdi/_drvwsh.sdi
index c57424b,ddc51c9..3b56bf0
mode 100755,100755..100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
diff --cc sd/sdi/drtxtob.sdi
index a2d48de,a2d48de..a2d48de
mode 100755,100755..100644
--- a/sd/sdi/drtxtob.sdi
+++ b/sd/sdi/drtxtob.sdi
diff --cc sd/sdi/makefile.mk
index a950aad,a950aad..a950aad
mode 100755,100755..100644
--- a/sd/sdi/makefile.mk
+++ b/sd/sdi/makefile.mk
diff --cc sd/sdi/outlnvsh.sdi
index e4f3b2a,e4f3b2a..e4f3b2a
mode 100755,100755..100644
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
diff --cc sd/sdi/sdraw.sdi
index fc8f8a9,e321cd7..016590e
mode 100755,100755..100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
diff --cc sd/sdi/sdslots.sdi
index 10c07bb,10c07bb..10c07bb
mode 100755,100755..100644
--- a/sd/sdi/sdslots.sdi
+++ b/sd/sdi/sdslots.sdi
diff --cc sd/source/core/drawdoc2.cxx
index aa790d1,35b05fa..637ca91
mode 100644,100755..100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
diff --cc sd/source/core/drawdoc3.cxx
index 6372822,aee3e7a..d648b7b
mode 100644,100755..100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
diff --cc sd/source/core/drawdoc4.cxx
index 0360a34,7025f9d..6ef0bda
mode 100644,100755..100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
diff --cc sd/source/core/sdpage.cxx
index b7b00eb,41ef998..c0e72e7
mode 100644,100755..100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
diff --cc sd/source/core/shapelist.cxx
index 2185fbf,695c30b..00a8e5e
mode 100644,100755..100644
--- a/sd/source/core/shapelist.cxx
+++ b/sd/source/core/shapelist.cxx
diff --cc sd/source/core/stlpool.cxx
index 5ca163b,eb7bbed..cc3421d
mode 100644,100755..100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
diff --cc sd/source/core/stlsheet.cxx
index 55d858d,2d83fb3..0edc954
mode 100644,100755..100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@@ -960,15 -1001,13 +960,13 @@@ OUString SAL_CALL SdStyleSheet::getName
void SAL_CALL SdStyleSheet::setName( const OUString& rName ) throw(RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
- if( IsUserDefined() )
+
+ if( SetName( rName ) )
{
- if( SetName( rName ) )
- {
- msApiName = rName;
- Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
- }
+ msApiName = rName;
+ Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
}
}
@@@ -1012,31 -1051,28 +1010,28 @@@ OUString SAL_CALL SdStyleSheet::getPare
void SAL_CALL SdStyleSheet::setParentStyle( const OUString& rParentName ) throw(NoSuchElementException, RuntimeException)
{
- OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
throwIfDisposed();
- if( IsUserDefined() )
+ if( rParentName.getLength() )
{
- if( rParentName.getLength() )
- {
- const SfxStyles& rStyles = mxPool->GetStyles();
+ const SfxStyles& rStyles = mxPool->GetStyles();
- for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); ++iter )
- for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); iter++ )
++ for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); ++iter )
+ {
+ SdStyleSheet* pStyle = static_cast< SdStyleSheet* >( (*iter).get() );
+ if( pStyle && (pStyle->nFamily == nFamily) && (pStyle->msApiName == rParentName) )
{
- SdStyleSheet* pStyle = static_cast< SdStyleSheet* >( (*iter).get() );
- if( pStyle && (pStyle->nFamily == nFamily) && (pStyle->msApiName == rParentName) )
- {
- if( pStyle != this )
- SetParent( pStyle->GetName() );
- return;
- }
+ if( pStyle != this )
+ SetParent( pStyle->GetName() );
+ return;
}
- throw NoSuchElementException();
- }
- else
- {
- SetParent( rParentName );
}
+ throw NoSuchElementException();
+ }
+ else
+ {
+ SetParent( rParentName );
}
}
diff --cc sd/source/filter/eppt/eppt.cxx
index 97ef460,f832add..5f6a8ee
mode 100644,100755..100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@@ -865,7 -671,7 +865,7 @@@ sal_Bool PPTWriter::ImplCreateDocument(
nFlags |= 1;
}
-- if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsEndless" ) ) ) ) // muesste eigendlich heissen IsNotEndless !=)"§()&
++ if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsEndless" ) ) ) ) // muesste eigendlich heissen IsNotEndless !=)"§()&
{
sal_Bool bBool = sal_False;
mAny >>= bBool;
diff --cc sd/source/filter/html/pubdlg.cxx
index 974069b,fc52536..091f7d1
mode 100644,100755..100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
diff --cc sd/source/filter/ppt/propread.hxx
index 9ce6b9e,ece29ff..6bd9e8f
mode 100644,100755..100644
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
diff --cc sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index d62e946,8293146..df55c33
mode 100644,100755..100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@@ -384,12 -385,13 +386,13 @@@ awt::Rectangle SAL_CALL AccessibleSlide
{
ThrowIfDisposed ();
- const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aSolarGuard;
- Rectangle aBBox (mrSlideSorter.GetView().GetPageBoundingBox (
- mnPageNumber,
- ::sd::slidesorter::view::SlideSorterView::CS_SCREEN,
- ::sd::slidesorter::view::SlideSorterView::BBT_INFO));
+ Rectangle aBBox (
+ mrSlideSorter.GetView().GetLayouter().GetPageObjectLayouter()->GetBoundingBox(
+ mrSlideSorter.GetModel().GetPageDescriptor(mnPageNumber),
+ ::sd::slidesorter::view::PageObjectLayouter::PageObject,
+ ::sd::slidesorter::view::PageObjectLayouter::WindowCoordinateSystem));
if (mxParent.is())
{
diff --cc sd/source/ui/accessibility/AccessibleTreeNode.cxx
index fb62178,4f6e975..4773542
mode 100644,100755..100644
--- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx
+++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
diff --cc sd/source/ui/accessibility/makefile.mk
index 25d79aa,25d79aa..25d79aa
mode 100755,100755..100644
--- a/sd/source/ui/accessibility/makefile.mk
+++ b/sd/source/ui/accessibility/makefile.mk
diff --cc sd/source/ui/animations/CustomAnimationList.cxx
index 7435bac,9170f23..fb8581d
mode 100644,100755..100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
diff --cc sd/source/ui/animations/CustomAnimationPane.cxx
index 82d5578,d6696e6..0267a17
mode 100644,100755..100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
diff --cc sd/source/ui/animations/SlideTransitionPane.cxx
index b35693d,182fe67..9e7d0e2
mode 100644,100755..100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
diff --cc sd/source/ui/animations/makefile.mk
index db010bf,db010bf..db010bf
mode 100755,100755..100644
--- a/sd/source/ui/animations/makefile.mk
+++ b/sd/source/ui/animations/makefile.mk
diff --cc sd/source/ui/annotations/annotationmanager.cxx
index 8595635,465fc6f..fc16aa0
mode 100644,100755..100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
diff --cc sd/source/ui/annotations/annotationmanagerimpl.hxx
index 24e90b7,06e57d7..31ebb41
mode 100644,100755..100644
--- a/sd/source/ui/annotations/annotationmanagerimpl.hxx
+++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx
@@@ -99,7 -99,9 +99,6 @@@ public
void onTagDeselected( AnnotationTag& rTag );
void onSelectionChanged();
-
-#if 0
- rtl::OUString GetHelpText( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation );
-#endif
void addListener();
void removeListener();
diff --cc sd/source/ui/annotations/annotations.src
index 369bd02,9dff8d6..9dff8d6
mode 100644,100755..100644
--- a/sd/source/ui/annotations/annotations.src
+++ b/sd/source/ui/annotations/annotations.src
diff --cc sd/source/ui/app/makefile.mk
index 8fbbf31,8c66ae2..070d569
mode 100755,100755..100644
--- a/sd/source/ui/app/makefile.mk
+++ b/sd/source/ui/app/makefile.mk
diff --cc sd/source/ui/app/menuids2_tmpl.src
index ec3422c,33ae6fe..f28ce41
mode 100755,100755..100644
--- a/sd/source/ui/app/menuids2_tmpl.src
+++ b/sd/source/ui/app/menuids2_tmpl.src
@@@ -666,9 -668,10 +666,9 @@@
//
// Praesentations-Menu
//
-/* ### ACHTUNG: Neuer Text in Resource! */
#define MN_SLIDESHOW \
Identifier = 26 ; \
- HelpID = 26 ; \
+ HelpID = "what a hack!" ; \
Command = ".uno:SlideShowMenu" ; \
Text [ en-US ] = "~Slide Show" ; \
diff --cc sd/source/ui/app/menuids3_tmpl.src
index e476cdc,3d49d1a..7e81712
mode 100644,100755..100644
--- a/sd/source/ui/app/menuids3_tmpl.src
+++ b/sd/source/ui/app/menuids3_tmpl.src
@@@ -80,7 -80,8 +80,7 @@@
MenuItem\
{\
Identifier = SID_CONVERT_TO_3D_LATHE_FAST ; \
- HelpID = SID_CONVERT_TO_3D_LATHE_FAST ; \
+ HelpId = CMD_SID_CONVERT_TO_3D_LATHE_FAST ; \
- /* ### ACHTUNG: Neuer Text in Resource? In 3~D-Rotationskörper : In 3~D-Rotationsk÷rper */\
Text [ en-US ] = "To 3D ~Rotation Object" ; \
};
diff --cc sd/source/ui/app/menuids4_tmpl.src
index 5cd541b,30dad8f..30dad8f
mode 100644,100755..100644
--- a/sd/source/ui/app/menuids4_tmpl.src
+++ b/sd/source/ui/app/menuids4_tmpl.src
diff --cc sd/source/ui/app/menuids_tmpl.src
index e25b167,a5496dd..1ef1ccf
mode 100644,100755..100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@@ -72,15 -75,21 +74,15 @@@
MenuItem\
{\
Identifier = SID_PRESENTATION ; \
- HelpID = SID_PRESENTATION ; \
+ HelpId = CMD_SID_PRESENTATION ; \
- /* ### ACHTUNG: Neuer Text in Resource? ~Bildschirmpräsentation : ~Bildschirmpräsentation... */\
- /* ### ACHTUNG: Neuer Text in Resource? ~Bildschirmpräsentation : ~Bildschirmpräsentation... */\
- /* ### ACHTUNG: Neuer Text in Resource? ~Bildschirmpräsentation : ~Bildschirmprõsentation */\
Text [ en-US ] = "Slide Sho~w" ; \
- /* ### ACHTUNG: Neuer Text in Resource? Bildschirmpräsentation starten : Bildschirmprõsentation starten */\
};
#define MN_CAPTUREPOINT \
MenuItem\
{\
Identifier = SID_CAPTUREPOINT ; \
- HelpID = SID_CAPTUREPOINT ; \
+ HelpId = CMD_SID_CAPTUREPOINT ; \
- /* ### ACHTUNG: Neuer Text in Resource? F~angpunkt/-linie einfügen... : F~angpunkt/-linie einf³gen... */\
- /* ### ACHTUNG: Neuer Text in Resource? Fangpunkt oder -linie einfügen : Fangpunkt oder -linie einf³gen */\
Text [ en-US ] = "~Insert Snap Point/Line..." ; \
};
@@@ -88,7 -97,8 +90,7 @@@
MenuItem\
{\
Identifier = SID_SET_SNAPITEM ; \
- HelpID = SID_SET_SNAPITEM ; \
+ HelpId = CMD_SID_SET_SNAPITEM ; \
- /* ### ACHTUNG: Neuer Text in Resource? Fangobjekt bearbeiten oder löschen : Fangobjekt bearbeiten oder l÷schen */\
Text [ en-US ] = "~Edit..." ; \
};
@@@ -96,7 -106,9 +98,7 @@@
MenuItem\
{\
Identifier = SID_DELETE_SNAPITEM ; \
- HelpID = SID_DELETE_SNAPITEM ; \
+ HelpId = CMD_SID_DELETE_SNAPITEM ; \
- /* ### ACHTUNG: Neuer Text in Resource? ~Löschen : ~L÷schen */\
- /* ### ACHTUNG: Neuer Text in Resource? Fangobjekt löschen : Fangobjekt l÷schen */\
Text [ en-US ] = "~Delete" ; \
};
@@@ -113,7 -125,8 +115,7 @@@
MenuItem\
{\
Identifier = SID_PAGESETUP ; \
- HelpID = SID_PAGESETUP ; \
+ HelpId = CMD_SID_PAGESETUP ; \
- /* ### ACHTUNG: Neuer Text in Resource? Seitengröße, Ausrichtung, Rahmen festlegen : Seitengr÷˜e, Ausrichtung, Rahmen festlegen */\
Text [ en-US ] = "~Page Setup..." ; \
};
@@@ -293,14 -306,6 +295,14 @@@
Text [ en-US ] = "~Text..." ; \
};
+#define MN_OUTLINE_TEXT_AUTOFIT \
+ MenuItem\
+ {\
+ Identifier = SID_OUTLINE_TEXT_AUTOFIT ; \
- HelpID = SID_OUTLINE_TEXT_AUTOFIT ; \
++ HelpID = CMD_SID_OUTLINE_TEXT_AUTOFIT ; \
+ Text [ en-US ] = "~Autofit Text" ; \
+ };
+
#define MN_CONNECTION \
MenuItem\
{\
@@@ -313,7 -318,8 +315,7 @@@
MenuItem\
{\
Identifier = SID_CONNECTION_NEW_ROUTING ; \
- HelpID = SID_CONNECTION_NEW_ROUTING ; \
+ HelpId = CMD_SID_CONNECTION_NEW_ROUTING ; \
- /* ### ACHTUNG: Neuer Text in Resource? Linienverlauf ~zurücksetzen : Linienverlauf ~zur³cksetzen */\
Text [ en-US ] = "Reset ~Routing" ; \
};
@@@ -321,7 -327,8 +323,7 @@@
MenuItem\
{\
Identifier = SID_MEASURE_DLG ; \
- HelpID = SID_MEASURE_DLG ; \
+ HelpId = CMD_SID_MEASURE_DLG ; \
- /* ### ACHTUNG: Neuer Text in Resource? Bema~ßung... : Bema~˜ung... */\
Text [ en-US ] = "Dimen~sions..." ; \
};
@@@ -412,8 -419,9 +414,8 @@@
MenuItem\
{\
Identifier = SID_CHAR_DLG ; \
- HelpID = SID_CHAR_DLG ; \
+ HelpId = CMD_SID_CHAR_DLG ; \
Text [ en-US ] = "C~haracter..." ; \
- /* ### ACHTUNG: Neuer Text in Resource? Zeichenattribute für den selektierten Bereich auswählen : Zeichenattribute f³r den selektierten Bereich auswõhlen */\
};
#define MN_CHAR_PARAGRAPH \
@@@ -434,7 -442,8 +436,7 @@@
MenuItem\
{\
Identifier = SID_ATTR_CHAR_FONTHEIGHT ; \
- HelpID = SID_ATTR_CHAR_FONTHEIGHT ; \
+ HelpId = CMD_SID_ATTR_CHAR_FONTHEIGHT ; \
- /* ### ACHTUNG: Neuer Text in Resource? ~Größe : ~Gr÷˜e */\
Text [ en-US ] = "~Size" ; \
};\
MenuItem\
@@@ -636,7 -645,8 +638,7 @@@
MenuItem\
{\
Identifier = SID_OBJECT_CLOSE ; \
- HelpID = SID_OBJECT_CLOSE ; \
+ HelpId = CMD_SID_OBJECT_CLOSE ; \
- /* ### ACHTUNG: Neuer Text in Resource? ~Objekt schließen : ~Objekt schlie˜en */\
Text [ en-US ] = "Close ~Object" ; \
};
@@@ -657,20 -667,23 +659,20 @@@
MenuItem\
{\
Identifier = SID_BEZIER_INSERT ; \
- HelpID = SID_BEZIER_INSERT ; \
+ HelpId = CMD_SID_BEZIER_INSERT ; \
- /* ### ACHTUNG: Neuer Text in Resource? Punkte ~einfügen : Punkte ~einf³gen */\
Text [ en-US ] = "Insert ~Points" ; \
};\
MenuItem\
{\
Identifier = SID_BEZIER_DELETE ; \
- HelpID = SID_BEZIER_DELETE ; \
+ HelpId = CMD_SID_BEZIER_DELETE ; \
- /* ### ACHTUNG: Neuer Text in Resource? Punkte l~öschen : Punkte l~÷schen */\
Text [ en-US ] = "~Delete Points" ; \
};\
SEPARATOR\
MenuItem\
{\
Identifier = SID_BEZIER_CLOSE ; \
- HelpID = SID_BEZIER_CLOSE ; \
+ HelpId = CMD_SID_BEZIER_CLOSE ; \
- /* ### ACHTUNG: Neuer Text in Resource? ~Objekt schließen : ~Objekt schlie˜en */\
Text [ en-US ] = "Close ~Object" ; \
};\
MenuItem\
@@@ -717,8 -730,9 +719,8 @@@
MenuItem\
{\
Identifier = SID_GROUP ; \
- HelpID = SID_GROUP ; \
+ HelpId = CMD_SID_GROUP ; \
Text [ en-US ] = "~Group" ; \
- /* ### ACHTUNG: Neuer Text in Resource? Ausgewählte Objekte gruppieren : Ausgewõhlte Objekte gruppieren */\
};
#define MN_UNGROUP \
@@@ -733,8 -747,9 +735,8 @@@
MenuItem\
{\
Identifier = SID_COMBINE ; \
- HelpID = SID_COMBINE ; \
+ HelpId = CMD_SID_COMBINE ; \
Text [ en-US ] = "Comb~ine" ; \
- /* ### ACHTUNG: Neuer Text in Resource? Ausgewählte Objekte kombinieren : Ausgewõhlte Objekte kombinieren */\
};
#define MN_DISMANTLE \
@@@ -749,16 -764,18 +751,16 @@@
MenuItem\
{\
Identifier = SID_ENTER_GROUP ; \
- HelpID = SID_ENTER_GROUP ; \
+ HelpId = CMD_SID_ENTER_GROUP ; \
Text [ en-US ] = "~Enter Group" ; \
- /* ### ACHTUNG: Neuer Text in Resource? Objekte der Gruppierung können bearbeitet werden : Objekte der Gruppierung k÷nnen bearbeitet werden */\
};
#define MN_LEAVE_GROUP \
MenuItem\
{\
Identifier = SID_LEAVE_GROUP ; \
- HelpID = SID_LEAVE_GROUP ; \
+ HelpId = CMD_SID_LEAVE_GROUP ; \
Text [ en-US ] = "E~xit Group" ; \
- /* ### ACHTUNG: Neuer Text in Resource? Objekte der Gruppierung können nicht mehr bearbeitet werden : Objekte der Gruppierung k÷nnen nicht mehr bearbeitet werden */\
};
#define MN_NAME_GROUP \
@@@ -807,7 -824,9 +809,7 @@@
MenuItem\
{\
Identifier = SID_PRESENTATIONOBJECT ; \
- HelpID = SID_PRESENTATIONOBJECT ; \
+ HelpId = CMD_SID_PRESENTATIONOBJECT ; \
- /* ### ACHTUNG: Neuer Text in Resource? ~Präsentationsobjekt... : ~Prõsentationsobjekt... */\
- /* ### ACHTUNG: Neuer Text in Resource? Selektiertes Präsentationsobjekt bearbeiten : Selektiertes Prõsentationsobjekt bearbeiten */\
Text [ en-US ] = "Presentation ~Object..." ; \
};
@@@ -816,8 -835,10 +818,8 @@@
MenuItem\
{\
Identifier = SID_DELETE ; \
- HelpID = SID_DELETE ; \
+ HelpId = CMD_SID_DELETE ; \
- /* ### ACHTUNG: Neuer Text in Resource? L~öschen : L~÷schen */\
Text [ en-US ] = "~Delete" ; \
- /* ### ACHTUNG: Neuer Text in Resource? Alle selektierten Objekte löschen : Alle selektierten Objekte l÷schen */\
};
@@@ -882,7 -903,8 +884,7 @@@
MenuItem\
{\
Identifier = SID_GLUE_INSERT_POINT ; \
- HelpID = SID_GLUE_INSERT_POINT ; \
+ HelpId = CMD_SID_GLUE_INSERT_POINT ; \
- /* ### ACHTUNG: Neuer Text in Resource? ~Punkt einfügen : ~Punkt einf³gen */\
Text [ en-US ] = "Insert ~Point" ; \
};
@@@ -1025,7 -1047,8 +1027,7 @@@
MenuItem\
{\
Identifier = SID_HELPLINES_VISIBLE ; \
- HelpID = SID_HELPLINES_VISIBLE ; \
+ HelpId = CMD_SID_HELPLINES_VISIBLE ; \
- /* ### ACHTUNG: Neuer Text in Resource? ~Fanglinien sichtbar : ~Hilfslinien sichtbar */\
Text [ en-US ] = "~Snap Lines Visible" ; \
};
@@@ -1041,7 -1064,8 +1043,7 @@@
MenuItem\
{\
Identifier = SID_HELPLINES_FRONT ; \
- HelpID = SID_HELPLINES_FRONT ; \
+ HelpId = CMD_SID_HELPLINES_FRONT ; \
- /* ### ACHTUNG: Neuer Text in Resource? Fanglini~en vorn : H~ilfslinien vorn */\
Text [ en-US ] = "Snap Lines to Front" ; \
};
diff --cc sd/source/ui/app/popup.src
index 6c9fd4a,6f30c56..c6ed5f8
mode 100644,100755..100644
--- a/sd/source/ui/app/popup.src
+++ b/sd/source/ui/app/popup.src
@@@ -428,19 -429,22 +429,19 @@@ Menu RID_LAYERTAB_POPU
MenuItem
{
Identifier = SID_INSERTLAYER ;
- HelpID = SID_INSERTLAYER ;
+ HelpId = CMD_SID_INSERTLAYER ;
- /* ### ACHTUNG: Neuer Text in Resource? ~Ebene einfügen... : ~Ebene einf³gen... */
Text [ en-US ] = "~Insert Layer..." ;
};
MenuItem
{
Identifier = SID_MODIFYLAYER ;
- HelpID = SID_MODIFYLAYER ;
+ HelpId = CMD_SID_MODIFYLAYER ;
- /* ### ACHTUNG: Neuer Text in Resource? E~bene ändern... : E~bene õndern... */
Text [ en-US ] = "Modify La~yer..." ;
};
MenuItem
{
Identifier = SID_DELETE_LAYER ;
- HelpID = SID_DELETE_LAYER ;
+ HelpId = CMD_SID_DELETE_LAYER ;
- /* ### ACHTUNG: Neuer Text in Resource? Ebe~ne löschen... : Ebe~ne l÷schen... */
Text [ en-US ] = "Delete ~Layer..." ;
};
MN_RENAME_LAYER
diff --cc sd/source/ui/app/popup2_tmpl.src
index 6809571,f70e309..d3fe0b4
mode 100644,100755..100644
--- a/sd/source/ui/app/popup2_tmpl.src
+++ b/sd/source/ui/app/popup2_tmpl.src
diff --cc sd/source/ui/app/res_bmp.src
index 3f95026,2996640..c7f485f
mode 100755,100755..100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@@ -87,30 -139,61 +87,6 @@@ Bitmap BMP_LAYOUT_VERTICAL0
{
File = "layout_vertical02.png";
};
- Bitmap BMP_FOILH_01
- {
- File = "foilh01.png";
- };
- Bitmap BMP_FOILH_02
- {
- File = "foilh02.png";
- };
- Bitmap BMP_FOILH_03
- {
- File = "foilh03.png";
- };
- Bitmap BMP_FOILH_04
- {
- File = "foilh04.png";
- };
- Bitmap BMP_FOILH_06
- {
- File = "foilh06.png";
- };
- Bitmap BMP_FOILH_09
- {
- File = "foilh09.png";
- };
-Bitmap BMP_LAYOUT_VERTICAL02_H
-{
- File = "layout_vertical02_h.png";
-};
-
-Bitmap BMP_FOILH_01
-{
- File = "foilh01.png";
-};
-Bitmap BMP_FOILH_01_H
-{
- File = "foilh01_h.png";
-};
-Bitmap BMP_FOILH_02
-{
- File = "foilh02.png";
-};
-Bitmap BMP_FOILH_02_H
-{
- File = "foilh02_h.png";
-};
-Bitmap BMP_FOILH_03
-{
- File = "foilh03.png";
-};
-Bitmap BMP_FOILH_03_H
-{
- File = "foilh03_h.png";
-};
-Bitmap BMP_FOILH_04
-{
- File = "foilh04.png";
-};
-Bitmap BMP_FOILH_04_H
-{
- File = "foilh04_h.png";
-};
-Bitmap BMP_FOILH_06
-{
- File = "foilh06.png";
-};
-Bitmap BMP_FOILH_06_H
-{
- File = "foilh06_h.png";
-};
-Bitmap BMP_FOILH_09
-{
- File = "foilh09.png";
-};
-Bitmap BMP_FOILH_09_H
-{
- File = "foilh09_h.png";
-};
-
-
Bitmap BMP_PLACEHOLDER_CHART_SMALL
{
File = "placeholder_chart_small.png";
@@@ -143,7 -226,7 +119,6 @@@ Bitmap BMP_PLACEHOLDER_TABLE_SMALL_HOVE
{
File = "placeholder_table_small_hover.png";
};
--
Bitmap BMP_PLACEHOLDER_CHART_LARGE
{
File = "placeholder_chart_large.png";
diff --cc sd/source/ui/app/sdmod.cxx
index 3cf2ff8,879b661..5950ae0
mode 100644,100755..100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
diff --cc sd/source/ui/app/strings.src
index 1ba0df6,a1ebf7c..a1ebf7c
mode 100755,100755..100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
diff --cc sd/source/ui/app/toolbox.src
index 945bb0b,92944c3..92944c3
mode 100644,100755..100644
--- a/sd/source/ui/app/toolbox.src
+++ b/sd/source/ui/app/toolbox.src
diff --cc sd/source/ui/controller/makefile.mk
index 5150866,4e37fbd..5150866
mode 100755,100755..100644
--- a/sd/source/ui/controller/makefile.mk
+++ b/sd/source/ui/controller/makefile.mk
diff --cc sd/source/ui/controller/slidelayoutcontroller.cxx
index 569b91f,1b71029..6885933
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@@ -200,7 -207,8 +200,6 @@@ LayoutToolbarMenu::LayoutToolbarMenu( S
String aTitle1( SdResId( STR_GLUE_ESCDIR_HORZ ) );
String aTitle2( SdResId( STR_GLUE_ESCDIR_VERT ) );
-
-
- const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
SvtLanguageOptions aLanguageOptions;
const bool bVerticalEnabled = aLanguageOptions.IsVerticalTextEnabled();
diff --cc sd/source/ui/dlg/PaneDockingWindow.cxx
index a6eafa1,006afb5..0cd119f
--- a/sd/source/ui/dlg/PaneDockingWindow.cxx
+++ b/sd/source/ui/dlg/PaneDockingWindow.cxx
@@@ -79,6 -87,61 +88,53 @@@ void PaneDockingWindow::StateChanged( S
SfxDockingWindow::StateChanged (nType);
}
+ void PaneDockingWindow::MouseButtonDown (const MouseEvent& rEvent)
+ {
+ if (rEvent.GetButtons() == MOUSE_LEFT)
+ {
+ // For some strange reason we have to set the WB_DIALOGCONTROL at
+ // the content window in order to have it pass focus to its content
+ // window. Without setting this flag here that works only on views
+ // that have not been taken from the cash and relocated to this pane
+ // docking window.
+ GetContentWindow().SetStyle(GetContentWindow().GetStyle() | WB_DIALOGCONTROL);
+ GetContentWindow().GrabFocus();
+ }
+ SfxDockingWindow::MouseButtonDown(rEvent);
+ }
+
-
-
-
-
-
-
-
+ void PaneDockingWindow::SetValidSizeRange (const Range aValidSizeRange)
+ {
+ SplitWindow* pSplitWindow = dynamic_cast<SplitWindow*>(GetParent());
+ if (pSplitWindow != NULL)
+ {
+ const USHORT nId (pSplitWindow->GetItemId(static_cast< ::Window*>(this)));
+ const USHORT nSetId (pSplitWindow->GetSet(nId));
+ // Because the PaneDockingWindow paints its own decoration, we have
+ // to compensate the valid size range for that.
+ const SvBorder aBorder (GetDecorationBorder());
+ sal_Int32 nCompensation (pSplitWindow->IsHorizontal()
+ ? mnTitleBarHeight + aBorder.Top() + aBorder.Bottom()
+ : aBorder.Left() + aBorder.Right());
+ pSplitWindow->SetItemSizeRange(
+ nSetId,
+ Range(
+ aValidSizeRange.Min() + nCompensation,
+ aValidSizeRange.Max() + nCompensation));
+ }
+ }
+
-
-
-
+ PaneDockingWindow::Orientation PaneDockingWindow::GetOrientation (void) const
+ {
+ SplitWindow* pSplitWindow = dynamic_cast<SplitWindow*>(GetParent());
+ if (pSplitWindow == NULL)
+ return UnknownOrientation;
+ else if (pSplitWindow->IsHorizontal())
+ return HorizontalOrientation;
+ else
+ return VerticalOrientation;
+ }
+
} // end of namespace ::sd
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc sd/source/ui/dlg/dlgass.cxx
index 2b34d79,1f0f640..7bf7d6d
mode 100644,100755..100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
diff --cc sd/source/ui/dlg/dlgassim.cxx
index 553ee56,724950c..e0bb6a7
mode 100644,100755..100644
--- a/sd/source/ui/dlg/dlgassim.cxx
+++ b/sd/source/ui/dlg/dlgassim.cxx
diff --cc sd/source/ui/dlg/dlgsnap.cxx
index d2ada13,938341d..c91d28c
mode 100644,100755..100644
--- a/sd/source/ui/dlg/dlgsnap.cxx
+++ b/sd/source/ui/dlg/dlgsnap.cxx
diff --cc sd/source/ui/dlg/dlgsnap.src
index bd69737,31fea0d..45938c4
--- a/sd/source/ui/dlg/dlgsnap.src
+++ b/sd/source/ui/dlg/dlgsnap.src
@@@ -57,8 -59,10 +59,9 @@@ ModalDialog DLG_SNAPLIN
};
PushButton BTN_DELETE
{
+ HelpID = "sd:PushButton:DLG_SNAPLINE:BTN_DELETE";
Pos = MAP_APPFONT ( 88 , 63 ) ;
Size = MAP_APPFONT ( 46 , 14 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? ~Löschen : ~L÷schen */
Text [ en-US ] = "~Delete" ;
TabStop = TRUE ;
};
diff --cc sd/source/ui/dlg/makefile.mk
index 13492da,ef763dc..da9fd0d
mode 100755,100755..100644
--- a/sd/source/ui/dlg/makefile.mk
+++ b/sd/source/ui/dlg/makefile.mk
diff --cc sd/source/ui/dlg/morphdlg.src
index df244e5,9d413e9..4668778
--- a/sd/source/ui/dlg/morphdlg.src
+++ b/sd/source/ui/dlg/morphdlg.src
@@@ -86,8 -91,10 +90,9 @@@ ModalDialog DLG_MORP
};
CheckBox CBX_ATTRIBUTES
{
+ HelpID = "sd:CheckBox:DLG_MORPH:CBX_ATTRIBUTES";
Pos = MAP_APPFONT ( 12 , 29 ) ;
Size = MAP_APPFONT ( 121 , 12 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? Attributierung überblenden : Attributierung ³berblenden */
TabStop = TRUE ;
Text [ en-US ] = "Cross-fade attributes" ;
};
diff --cc sd/source/ui/dlg/navigatr.cxx
index b3e97fd,3ac1474..cc7745a
mode 100644,100755..100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@@ -336,10 -345,9 +345,9 @@@ IMPL_LINK( SdNavigatorWin, DropdownClic
pMenu->Execute( this, maToolbox.GetItemRect( nId ), POPUPMENU_EXECUTE_DOWN );
pBox->EndSelection();
delete pMenu;
- //pBox->Invalidate();
}
break;
-
+
case TBI_SHAPE_FILTER:
{
PopupMenu *pMenu = new PopupMenu;
diff --cc sd/source/ui/dlg/present.src
index a414d28,5dd23ec..a584f59
--- a/sd/source/ui/dlg/present.src
+++ b/sd/source/ui/dlg/present.src
@@@ -222,8 -239,10 +238,9 @@@ ModalDialog DLG_START_PRESENTATIO
};
CheckBox CBX_ALWAYS_ON_TOP
{
+ HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_ALWAYS_ON_TOP";
Pos = MAP_APPFONT ( 108, 156 ) ;
Size = MAP_APPFONT ( 145, 12 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? Präsentation immer im ~Vordergrund : Prõsentation immer im ~Vordergrund */
TabStop = TRUE ;
Text [ en-US ] = "Presentation always ~on top" ;
};
diff --cc sd/source/ui/dlg/sddlgfact.cxx
index 4c71a16,efb8d26..baa5173
mode 100644,100755..100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
diff --cc sd/source/ui/dlg/sddlgfact.hxx
index dd5d5e6,b2d3a82..3eddea7
mode 100644,100755..100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
diff --cc sd/source/ui/dlg/sdtreelb.cxx
index eaa105c,fc64682..5aa9553
mode 100644,100755..100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@@ -837,7 -884,7 +838,7 @@@ SdDrawDocument* SdPageObjsTLB::GetBookm
/*************************************************************************
|*
--|* Bookmark-Dokument schlieáen und loeschen
++|* Bookmark-Dokument schlieáen und loeschen
|*
\************************************************************************/
diff --cc sd/source/ui/dlg/tpaction.cxx
index 9aba5fe,5e9bb78..1e48713
mode 100644,100755..100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
diff --cc sd/source/ui/dlg/tpoption.src
index 34e256c,23c8d9d..3102f34
--- a/sd/source/ui/dlg/tpoption.src
+++ b/sd/source/ui/dlg/tpoption.src
@@@ -45,29 -45,33 +45,33 @@@ TabPage TP_OPTIONS_CONTENT
};
CheckBox CBX_RULER
{
+ HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_RULER";
Pos = MAP_APPFONT ( 12 , 83 - 69 ) ;
- Size = MAP_APPFONT ( 242 , 10 ) ;
+ Size = MAP_APPFONT ( 160 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Rulers visible" ;
};
CheckBox CBX_HELPLINES
{
+ HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HELPLINES";
Pos = MAP_APPFONT ( 12 , 97 - 69 ) ;
- Size = MAP_APPFONT ( 242 , 10 ) ;
+ Size = MAP_APPFONT ( 160 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Guides when moving" ;
};
CheckBox CBX_HANDLES_BEZIER
{
+ HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HANDLES_BEZIER";
Pos = MAP_APPFONT ( 12 , 111 - 69 ) ;
- Size = MAP_APPFONT ( 242 , 10 ) ;
+ Size = MAP_APPFONT ( 160 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~All control points in Bézier editor" ;
};
CheckBox CBX_MOVE_OUTLINE
{
+ HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_MOVE_OUTLINE";
Pos = MAP_APPFONT ( 12 , 125 - 69 ) ;
- Size = MAP_APPFONT ( 242 , 10 ) ;
+ Size = MAP_APPFONT ( 160 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Contour of each individual object" ;
};
diff --cc sd/source/ui/dlg/vectdlg.src
index bc75187,6a3fd04..123937f
--- a/sd/source/ui/dlg/vectdlg.src
+++ b/sd/source/ui/dlg/vectdlg.src
@@@ -28,10 -28,17 +28,11 @@@
#include "app.hrc"
#include "vectdlg.hrc"
+ #include "helpids.h"
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
ModalDialog DLG_VECTORIZE
{
- HelpID = SID_VECTORIZE;
+ HelpID = HID_VECTORIZE_DLG;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 200, 237 ) ;
diff --cc sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index fb76e18,9f1aac9..9a4c9c8
mode 100644,100755..100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
diff --cc sd/source/ui/framework/factories/BasicViewFactory.cxx
index e60b805,98b58fc..c409653
mode 100644,100755..100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
diff --cc sd/source/ui/framework/factories/BasicViewFactory.hxx
index ef85c8f,fb433b1..6ec6aa7
mode 100644,100755..100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx
diff --cc sd/source/ui/framework/module/makefile.mk
index bec9b1a,bec9b1a..bec9b1a
mode 100755,100755..100644
--- a/sd/source/ui/framework/module/makefile.mk
+++ b/sd/source/ui/framework/module/makefile.mk
diff --cc sd/source/ui/framework/tools/FrameworkHelper.cxx
index 48eb8fa,5715e5a..37d6af0
mode 100644,100755..100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
diff --cc sd/source/ui/func/fuconstr.cxx
index 408cf87,ca55aa2..6c84e08
mode 100644,100755..100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
diff --cc sd/source/ui/func/fudraw.cxx
index fad80c4,280518b..b684944
mode 100644,100755..100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
diff --cc sd/source/ui/func/fuexpand.cxx
index a3376e0,ffda4fd..2cb7665
mode 100644,100755..100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
diff --cc sd/source/ui/func/fuinsert.cxx
index 2756579,e034579..4a3b882
mode 100644,100755..100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
diff --cc sd/source/ui/func/fupage.cxx
index c688101,c0f9158..5b1c3fe
mode 100644,100755..100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
diff --cc sd/source/ui/func/fusel.cxx
index 240d963,2c22b16..cd96f27
mode 100644,100755..100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
diff --cc sd/source/ui/func/futempl.cxx
index e9c28ba,9942ac1..3c3c06b
mode 100644,100755..100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
diff --cc sd/source/ui/func/futext.cxx
index 4304b1d,ccdf3fd..7d66170
mode 100644,100755..100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
diff --cc sd/source/ui/func/makefile.mk
index e4df8fe,e4df8fe..e4df8fe
mode 100755,100755..100644
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list