summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Lippka <christian.lippka@sun.com>2010-06-22 13:38:49 +0200
committerChristian Lippka <christian.lippka@sun.com>2010-06-22 13:38:49 +0200
commitaadcf75a9c3c46385e5f36fc824b1103888bb7b9 (patch)
tree420f75b035c55673a7711d0b6bde693ca45534d3
parentaa366fe3f135659ebd9bfe516f5efafa6e4f7b2d (diff)
parent8c75156a84a5088506c49101efad199dc7b8d05e (diff)
cws avmedia102: rebase m83
-rwxr-xr-x[-rw-r--r--]sd/inc/Outliner.hxx21
-rwxr-xr-x[-rw-r--r--]sd/inc/OutlinerIterator.hxx31
-rwxr-xr-x[-rw-r--r--]sd/inc/drawdoc.hxx14
-rwxr-xr-x[-rw-r--r--]sd/inc/sdmod.hxx2
-rwxr-xr-xsd/inc/shapelist.hxx4
-rwxr-xr-x[-rw-r--r--]sd/inc/stlpool.hxx2
-rwxr-xr-x[-rw-r--r--]sd/inc/textapi.hxx1
-rwxr-xr-x[-rw-r--r--]sd/sdi/_drvwsh.sdi15
-rwxr-xr-x[-rw-r--r--]sd/sdi/drtxtob.sdi6
-rwxr-xr-x[-rw-r--r--]sd/sdi/outlnvsh.sdi15
-rwxr-xr-x[-rw-r--r--]sd/source/core/CustomAnimationEffect.cxx9
-rwxr-xr-xsd/source/core/drawdoc2.cxx31
-rwxr-xr-x[-rw-r--r--]sd/source/core/drawdoc4.cxx77
-rwxr-xr-xsd/source/core/shapelist.cxx19
-rwxr-xr-x[-rw-r--r--]sd/source/core/stlpool.cxx50
-rwxr-xr-x[-rw-r--r--]sd/source/core/text/textapi.cxx27
-rwxr-xr-x[-rw-r--r--]sd/source/filter/eppt/eppt.hxx18
-rwxr-xr-x[-rw-r--r--]sd/source/filter/eppt/epptso.cxx41
-rwxr-xr-x[-rw-r--r--]sd/source/filter/html/htmlattr.cxx12
-rwxr-xr-x[-rw-r--r--]sd/source/filter/html/htmlattr.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/filter/html/htmlex.cxx9
-rwxr-xr-x[-rw-r--r--]sd/source/filter/html/htmlex.hxx1
-rwxr-xr-x[-rw-r--r--]sd/source/filter/ppt/ppt97animations.cxx8
-rwxr-xr-x[-rw-r--r--]sd/source/filter/ppt/ppt97animations.hxx3
-rwxr-xr-x[-rw-r--r--]sd/source/filter/ppt/pptatom.cpp22
-rwxr-xr-x[-rw-r--r--]sd/source/filter/ppt/pptatom.hxx19
-rwxr-xr-x[-rw-r--r--]sd/source/filter/ppt/pptinanimations.cxx58
-rwxr-xr-x[-rw-r--r--]sd/source/filter/ppt/pptinanimations.hxx7
-rwxr-xr-x[-rw-r--r--]sd/source/ui/accessibility/AccessibleViewForwarder.cxx21
-rw-r--r--sd/source/ui/animations/AnimationSchemesPane.cxx443
-rw-r--r--sd/source/ui/animations/AnimationSchemesPane.hrc50
-rw-r--r--sd/source/ui/animations/AnimationSchemesPane.hxx114
-rw-r--r--sd/source/ui/animations/AnimationSchemesPane.src113
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/CustomAnimationCreateDialog.cxx7
-rw-r--r--sd/source/ui/animations/CustomAnimationSchemesPane.hrc32
-rw-r--r--sd/source/ui/animations/CustomAnimationSchemesPane.src71
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/makefile.mk3
-rwxr-xr-x[-rw-r--r--]sd/source/ui/annotations/annotationmanager.cxx4
-rwxr-xr-xsd/source/ui/annotations/annotationmanagerimpl.hxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/annotations/annotationwindow.cxx110
-rwxr-xr-x[-rw-r--r--]sd/source/ui/annotations/annotationwindow.hxx1
-rwxr-xr-xsd/source/ui/app/makefile.mk3
-rwxr-xr-xsd/source/ui/app/optsitem.cxx229
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/sdmod.cxx17
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/sdmod2.cxx5
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/LayerDialogContent.cxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/SpellDialogChildWindow.cxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/animobjs.cxx13
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/dlgass.cxx15
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/dlgassim.cxx284
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/dlgassim.hxx51
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/dlgctrls.cxx6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/dlgsnap.cxx18
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/docprev.cxx19
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/filedlg.cxx88
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/headerfooterdlg.cxx6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/inspagob.cxx1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/prntopts.cxx16
-rwxr-xr-xsd/source/ui/dlg/sdtreelb.cxx55
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/tpaction.cxx45
-rwxr-xr-x[-rw-r--r--]sd/source/ui/docshell/docshel4.cxx12
-rwxr-xr-x[-rw-r--r--]sd/source/ui/docshell/docshell.cxx15
-rwxr-xr-x[-rw-r--r--]sd/source/ui/framework/configuration/ConfigurationClassifier.cxx7
-rwxr-xr-xsd/source/ui/framework/configuration/ConfigurationController.cxx26
-rwxr-xr-xsd/source/ui/framework/configuration/ConfigurationTracer.cxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/framework/configuration/ConfigurationTracer.hxx4
-rwxr-xr-xsd/source/ui/framework/configuration/ConfigurationUpdater.cxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/framework/configuration/ConfigurationUpdater.hxx3
-rwxr-xr-x[-rw-r--r--]sd/source/ui/framework/configuration/ResourceId.cxx11
-rwxr-xr-xsd/source/ui/framework/factories/BasicPaneFactory.cxx26
-rwxr-xr-xsd/source/ui/framework/factories/BasicPaneFactory.hxx6
-rwxr-xr-xsd/source/ui/framework/factories/TaskPanelFactory.cxx17
-rwxr-xr-xsd/source/ui/framework/factories/TaskPanelFactory.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/framework/module/ReadOnlyModeObserver.cxx11
-rwxr-xr-x[-rw-r--r--]sd/source/ui/framework/module/ReadOnlyModeObserver.hxx6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/framework/module/ResourceManager.cxx21
-rwxr-xr-x[-rw-r--r--]sd/source/ui/framework/module/ResourceManager.hxx2
-rwxr-xr-xsd/source/ui/framework/tools/FrameworkHelper.cxx22
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuconstr.cxx7
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fudraw.cxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fuoutl.cxx6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fupoor.cxx22
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fusearch.cxx9
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fusnapln.cxx1
-rw-r--r--sd/source/ui/func/fuspell.cxx166
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/futransf.cxx25
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/makefile.mk4
-rw-r--r--sd/source/ui/func/outlinfo.cxx301
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/sdundogr.cxx11
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/unoaprms.cxx46
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/AccessibleViewForwarder.hxx3
-rwxr-xr-xsd/source/ui/inc/DrawController.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/DrawDocShell.hxx3
-rwxr-xr-xsd/source/ui/inc/DrawViewShell.hxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/GraphicViewShell.hxx5
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/LayerDialogContent.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/MasterPageObserver.hxx6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/OutlineView.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/OutlineViewShell.hxx5
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/SlideSorterViewShell.hxx6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/SlideView.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/SpellDialogChildWindow.hxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/ToolBarManager.hxx16
-rwxr-xr-xsd/source/ui/inc/View.hxx3
-rwxr-xr-xsd/source/ui/inc/ViewShell.hxx7
-rwxr-xr-xsd/source/ui/inc/ViewShellBase.hxx29
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/ViewShellManager.hxx43
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/Window.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/animobjs.hxx1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/bmcache.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/dlgass.hxx3
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/dlgctrls.hxx1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/docprev.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/filedlg.hxx31
-rwxr-xr-xsd/source/ui/inc/framework/FrameworkHelper.hxx17
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/framework/ResourceId.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fuconstr.hxx1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fudraw.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fuoutl.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/fupoor.hxx2
-rw-r--r--sd/source/ui/inc/fuspell.hxx71
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/futransf.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/headerfooterdlg.hxx1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/optsitem.hxx28
-rw-r--r--sd/source/ui/inc/outlinfo.hxx125
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/prntopts.hxx1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/sdtreelb.hxx1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/sdundogr.hxx1
-rw-r--r--sd/source/ui/inc/showview.hxx88
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/slideshow.hxx1
-rwxr-xr-xsd/source/ui/inc/taskpane/ScrollPanel.hxx5
-rwxr-xr-xsd/source/ui/inc/taskpane/SubToolPanel.hxx18
-rwxr-xr-xsd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx17
-rwxr-xr-xsd/source/ui/inc/taskpane/TitledControl.hxx7
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/tools/PropertySet.hxx7
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx11
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/tools/SlotStateListener.hxx15
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/tpaction.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/unoaprms.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/unosrch.hxx7
-rwxr-xr-x[-rw-r--r--]sd/source/ui/inc/zoomlist.hxx1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/presenter/PresenterCanvas.cxx16
-rwxr-xr-x[-rw-r--r--]sd/source/ui/presenter/PresenterTextView.cxx12
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slideshow/slideshow.cxx7
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slideshow/slideshowimpl.cxx9
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slideshow/slideshowimpl.hxx3
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx37
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx14
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx20
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx10
-rw-r--r--sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx66
-rw-r--r--sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx51
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/cache/SlsPageCache.cxx20
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/cache/makefile.mk1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/controller/SlideSorterController.cxx69
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx15
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/controller/SlsPageSelector.cxx11
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx20
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx20
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx13
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx89
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx6
-rwxr-xr-xsd/source/ui/slidesorter/controller/SlsSlotManager.cxx94
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx29
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx18
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx7
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx3
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx7
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx11
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx13
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx23
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx2
-rwxr-xr-xsd/source/ui/slidesorter/model/SlideSorterModel.cxx45
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx16
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/shell/SlideSorterService.cxx12
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/shell/SlideSorterService.hxx1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx16
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/view/SlideSorterView.cxx70
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/view/SlsLayouter.cxx55
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx15
-rwxr-xr-xsd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx16
-rw-r--r--sd/source/ui/toolpanel/EmptyWindow.cxx96
-rw-r--r--sd/source/ui/toolpanel/EmptyWindow.hxx57
-rwxr-xr-xsd/source/ui/toolpanel/LayoutMenu.cxx8
-rwxr-xr-xsd/source/ui/toolpanel/LayoutMenu.hxx4
-rwxr-xr-xsd/source/ui/toolpanel/ScrollPanel.cxx9
-rw-r--r--sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx98
-rw-r--r--sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx70
-rwxr-xr-xsd/source/ui/toolpanel/SubToolPanel.cxx58
-rwxr-xr-xsd/source/ui/toolpanel/TaskPaneShellManager.cxx13
-rwxr-xr-xsd/source/ui/toolpanel/TaskPaneTreeNode.cxx28
-rwxr-xr-xsd/source/ui/toolpanel/TestMenu.cxx6
-rwxr-xr-xsd/source/ui/toolpanel/TestMenu.hxx3
-rwxr-xr-xsd/source/ui/toolpanel/TestPanel.cxx5
-rwxr-xr-xsd/source/ui/toolpanel/TestPanel.hxx4
-rwxr-xr-xsd/source/ui/toolpanel/TitleToolBox.cxx67
-rwxr-xr-xsd/source/ui/toolpanel/TitleToolBox.hxx52
-rwxr-xr-xsd/source/ui/toolpanel/TitledControl.cxx16
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx86
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx70
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/MasterPageContainer.cxx148
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/MasterPageContainer.hxx10
-rwxr-xr-xsd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx40
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx15
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx22
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx5
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/MasterPageObserver.cxx9
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx30
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/toolpanel/controls/makefile.mk3
-rwxr-xr-xsd/source/ui/toolpanel/makefile.mk3
-rwxr-xr-x[-rw-r--r--]sd/source/ui/tools/PropertySet.cxx16
-rwxr-xr-x[-rw-r--r--]sd/source/ui/tools/SdGlobalResourceContainer.cxx25
-rwxr-xr-x[-rw-r--r--]sd/source/ui/tools/SlotStateListener.cxx18
-rwxr-xr-xsd/source/ui/unoidl/DrawController.cxx24
-rwxr-xr-xsd/source/ui/unoidl/makefile.mk1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/unoidl/unocpres.cxx21
-rwxr-xr-x[-rw-r--r--]sd/source/ui/unoidl/unocpres.hxx1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/unoidl/unoobj.cxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/unoidl/unoobj.hxx1
-rwxr-xr-xsd/source/ui/unoidl/unopage.cxx29
-rwxr-xr-x[-rw-r--r--]sd/source/ui/unoidl/unopage.hxx3
-rwxr-xr-x[-rw-r--r--]sd/source/ui/unoidl/unosrch.cxx5
-rw-r--r--sd/source/ui/unoidl/unovwcrs.cxx209
-rwxr-xr-x[-rw-r--r--]sd/source/ui/unoidl/unowcntr.cxx25
-rwxr-xr-x[-rw-r--r--]sd/source/ui/unoidl/unowcntr.hxx3
-rwxr-xr-xsd/source/ui/view/Outliner.cxx84
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/OutlinerIterator.cxx36
-rwxr-xr-xsd/source/ui/view/ToolBarManager.cxx98
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx66
-rwxr-xr-xsd/source/ui/view/ViewShellImplementation.cxx42
-rwxr-xr-xsd/source/ui/view/ViewShellManager.cxx207
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/bmcache.cxx109
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drtxtob.cxx31
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drtxtob1.cxx14
-rwxr-xr-xsd/source/ui/view/drviews1.cxx1
-rwxr-xr-xsd/source/ui/view/drviews2.cxx42
-rwxr-xr-xsd/source/ui/view/drviews6.cxx26
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviews8.cxx0
-rwxr-xr-xsd/source/ui/view/drviewsa.cxx15
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviewse.cxx15
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviewsf.cxx3
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/grviewsh.cxx18
-rw-r--r--sd/source/ui/view/makefile.mk1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/outlnvs2.cxx0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/outlnvsh.cxx45
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/outlview.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/sdview.cxx83
-rwxr-xr-xsd/source/ui/view/sdview4.cxx5
-rwxr-xr-xsd/source/ui/view/sdwindow.cxx29
-rw-r--r--sd/source/ui/view/showview.cxx170
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/viewshe2.cxx40
-rwxr-xr-xsd/source/ui/view/viewshel.cxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/zoomlist.cxx13
-rwxr-xr-xsd/uiconfig/sdraw/menubar/menubar.xml17
-rw-r--r--sd/uiconfig/sdraw/toolbar/findbar.xml8
-rwxr-xr-xsd/uiconfig/simpress/menubar/menubar.xml9
-rw-r--r--sd/uiconfig/simpress/toolbar/findbar.xml8
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx4
263 files changed, 527 insertions, 6948 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 0c14dec72583..dfc7e3e3bf88 100644..100755
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -179,13 +179,6 @@ public:
enum ChangeHint { CH_VIEW_SHELL_INVALID, CH_VIEW_SHELL_VALID };
- /** Handle a change outside the outliner which may affect the outliner.
- At the moment this is restricted to changes of the main view shell
- but later may include any changes that are detected now by
- DetectChange().
- */
- void HandleOutsideChange (ChangeHint eHint);
-
int GetIgnoreCurrentPageChangesLevel() const { return mnIgnoreCurrentPageChangesLevel; };
void IncreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel++; };
void DecreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel--; };
@@ -421,15 +414,6 @@ private:
*/
void EndOfSearch (void);
- /** Prepare to commence searching/spell checking on the specified page.
- This also creates a proper page iterator.
- @param nPageIndex
- Index of the page to prepare for searching. The default value
- of -1 is a flag for using the first/last page of the current
- edit mode/view mode depending on the search direction.
- */
- void InitPage (USHORT nPageIndex = (USHORT)-1);
-
/** Show a dialog that tells the user that the search has ended either
because there are no more matches after finding at least one or that
no match has been found at all.
@@ -521,11 +505,6 @@ private:
*/
bool HandleFailedSearch (void);
- /** Return a parent window for a dialog. The returned window depends on
- the search mode.
- */
- ::Window* GetParentForDialog (void);
-
/** Take a position as returned by an object iterator and switch to the
view and page on which the object specified by this position is
located.
diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx
index ce291a6f5a00..92301f06289c 100644..100755
--- a/sd/inc/OutlinerIterator.hxx
+++ b/sd/inc/OutlinerIterator.hxx
@@ -109,13 +109,6 @@ public:
*/
explicit Iterator (IteratorImplBase* pObject);
- /** Create a new iterator with the implementation object being the copy
- of the provided one.
- @param rObject
- A copy of this object will become the implementation object.
- */
- explicit Iterator (const IteratorImplBase& rObject);
-
~Iterator (void);
/** Assign the iterator from the given one. The implementation object
@@ -240,9 +233,8 @@ private:
This specifies whether the returned iterator points to the
first, (one past the) last, or current object.
@return
- Returns an iterator as constructed by one of the
+ Returns an iterator as constructed by
<member>CreateSelectionIterator()</member>,
- <member>CreateViewIterator()</member>, or <member>CreateDocumentIterator()</member>.
*/
Iterator CreateIterator (IteratorLocation aLocation);
@@ -270,24 +262,6 @@ private:
IteratorLocation aLocation=BEGIN);
/** Create an iterator that iterates over all <type>SdrObjects</type>
- objects of the <member>mpOutliner</member> outliner that belong to
- the current view.
- @param pDocument
- The document to which the objects belong.
- @param pViewShell
- The view shell which displays the objects.
- @param bDirectionIsForward
- The direction of iteration. It defaults to forward.
- @param aLocation
- This specifies at which object the iterator points initially.
- */
- Iterator CreateViewIterator (
- SdDrawDocument* pDocument,
- const boost::shared_ptr<ViewShell>& rpViewShell,
- bool bDirectionIsForward=true,
- IteratorLocation aLocation=BEGIN);
-
- /** Create an iterator that iterates over all <type>SdrObjects</type>
objects of the <member>mpOutliner</member> outliner.
@param pDocument
The document to which the objects belong.
@@ -356,9 +330,6 @@ public:
assigned to the data members of this object.
*/
IteratorPosition (const IteratorPosition& aPosition);
- /** Create a new object and set its data members to the given values.
- */
- IteratorPosition (SdrObject* pObject, sal_Int32 nText, sal_Int32 nPageIndex, PageKind ePageKind, EditMode eEditMode);
/// The destructor is a no-op at the moment.
~IteratorPosition (void);
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 1d801baa5d3c..6811da762934 100644..100755
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -441,7 +441,6 @@ public:
CharClass* GetCharClass() const { return mpCharClass; }
void RestoreLayerNames();
- void MakeUniqueLayerNames();
void UpdateAllLinks();
@@ -465,18 +464,6 @@ public:
static SdDrawDocument* pDocLockedInsertingLinks; // static to prevent recursions while resolving links
- /** This method acts as a simplified front end for the more complex
- <member>CreatePage()</member> method.
- @param nPageNum
- The page number as passed to the <member>GetSdPage()</member>
- method from which to use certain properties for the new pages.
- These include the auto layout.
- @return
- Returns an index of the inserted pages that can be used with the
- <member>GetSdPage()</member> method.
- */
- USHORT CreatePage (USHORT nPageNum);
-
/** Create and insert a set of two new pages: a standard (draw) page and
the associated notes page. The new pages are inserted direclty
after the specified page set.
@@ -687,7 +674,6 @@ namespace sd
class ModifyGuard
{
public:
- ModifyGuard( DrawDocShell* pDocShell );
ModifyGuard( SdDrawDocument* pDoc );
~ModifyGuard();
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 0dad3ca237cb..f0d5cc64a3c4 100644..100755
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -141,8 +141,6 @@ public:
SD_DLLPUBLIC SvNumberFormatter* GetNumberFormatter();
- ::com::sun::star::text::WritingMode GetDefaultWritingMode() const;
-
//virtuelle Methoden fuer den Optionendialog
virtual SfxItemSet* CreateItemSet( USHORT nId );
virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet );
diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx
index d1ce1b0af8c0..1b87a6a9e10f 100755
--- a/sd/inc/shapelist.hxx
+++ b/sd/inc/shapelist.hxx
@@ -62,10 +62,6 @@ namespace sd
returns the first shape if pObj is 0 */
SdrObject* getNextShape(SdrObject* pObj) const;
- /** returns the shape prior to the given shape in the list or 0
- returns the last shape if pObj is 0 */
- SdrObject* getPreviousShape( SdrObject* pObj ) const;
-
/**
*/
SdrObject* getNextShape();
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index 7dfeac99121b..fd9dbeae5977 100644..100755
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -68,7 +68,6 @@ public:
SfxStyleSheetBase* GetActualStyleSheet() { return mpActualStyleSheet; }
SfxStyleSheetBase* GetTitleSheet(const String& rLayoutName);
- String GetLayoutName() const;
// Caller muss Liste loeschen
List* CreateOutlineSheetList(const String& rLayoutName);
@@ -82,7 +81,6 @@ public:
when styles are missing.
*/
SD_DLLPUBLIC void CreateLayoutStyleSheets(const String& rLayoutName, sal_Bool bCheck = sal_False );
- void EraseLayoutStyleSheets(const String& rLayoutName);
List* CreateLayoutSheetNames(const String& rLayoutName) const;
void CreateLayoutSheetList(const String& rLayoutName, SdStyleSheetVector& rLayoutSheets);
void CopyLayoutSheets(const String& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets );
diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx
index ced8a48c5bb6..6fa186596fba 100644..100755
--- a/sd/inc/textapi.hxx
+++ b/sd/inc/textapi.hxx
@@ -53,7 +53,6 @@ public:
virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
OutlinerParaObject* CreateText();
- void SetString( const String& rText );
void SetText( OutlinerParaObject& rText );
String GetText();
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 53813365a686..6d0d3ef33ce9 100644..100755
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -2173,6 +2173,21 @@ interface DrawView
ExecMethod = FuSupport ;
StateMethod = GetCtrlState ;
]
+ SID_TRANSLITERATE_SENTENCE_CASE // ole : no, status : ?
+ [
+ ExecMethod = FuSupport ;
+ StateMethod = GetCtrlState ;
+ ]
+ SID_TRANSLITERATE_TITLE_CASE // ole : no, status : ?
+ [
+ ExecMethod = FuSupport ;
+ StateMethod = GetCtrlState ;
+ ]
+ SID_TRANSLITERATE_TOGGLE_CASE // ole : no, status : ?
+ [
+ ExecMethod = FuSupport ;
+ StateMethod = GetCtrlState ;
+ ]
SID_TRANSLITERATE_LOWER // ole : no, status : ?
[
ExecMethod = FuSupport ;
diff --git a/sd/sdi/drtxtob.sdi b/sd/sdi/drtxtob.sdi
index 4e2ca49c0b82..f4133f0f4643 100644..100755
--- a/sd/sdi/drtxtob.sdi
+++ b/sd/sdi/drtxtob.sdi
@@ -202,5 +202,11 @@ shell TextObjectBar
ExecMethod = Execute;
StateMethod = GetAttrState;
]
+ SID_THES
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetAttrState ;
+ ]
+
}
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index 1632b2fa4163..9639f1adc9dc 100644..100755
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
@@ -433,6 +433,21 @@ interface OutlineView
ExecMethod = FuSupport ;
StateMethod = GetMenuState ;
]
+ SID_TRANSLITERATE_SENTENCE_CASE // ole : no, status : ?
+ [
+ ExecMethod = FuSupport ;
+ StateMethod = GetCtrlState ;
+ ]
+ SID_TRANSLITERATE_TITLE_CASE // ole : no, status : ?
+ [
+ ExecMethod = FuSupport ;
+ StateMethod = GetCtrlState ;
+ ]
+ SID_TRANSLITERATE_TOGGLE_CASE // ole : no, status : ?
+ [
+ ExecMethod = FuSupport ;
+ StateMethod = GetCtrlState ;
+ ]
SID_TRANSLITERATE_UPPER // ole : no, status : ?
[
ExecMethod = FuSupport ;
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 7852f7cc8fcf..33b9c233909b 100644..100755
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -1809,15 +1809,6 @@ void EffectSequenceHelper::append( const CustomAnimationEffectPtr& pEffect )
// --------------------------------------------------------------------
-void EffectSequenceHelper::insert( EffectSequence::iterator& rPos, const CustomAnimationEffectPtr& pEffect )
-{
- pEffect->setEffectSequence( this );
- maEffects.insert( rPos, pEffect );
- rebuild();
-}
-
-// --------------------------------------------------------------------
-
CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPresetPtr& pPreset, const Any& rTarget, double fDuration /* = -1.0 */ )
{
CustomAnimationEffectPtr pEffect;
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index e12ee30552e7..74a1bde5f5f8 100755
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -1346,37 +1346,6 @@ void SdDrawDocument::CheckMasterPages()
}
}
-
-
-
-USHORT SdDrawDocument::CreatePage (USHORT nPageNum)
-{
- PageKind ePageKind = PK_STANDARD;
-
- // Get current page.
- SdPage* pActualPage = GetSdPage(nPageNum, ePageKind);
-
- // Get background flags.
- SdrLayerAdmin& rLayerAdmin = GetLayerAdmin();
- BYTE aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE);
- BYTE aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE);
- SetOfByte aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers();
-
- // Get layout from current page.
- AutoLayout eAutoLayout = pActualPage->GetAutoLayout();
-
- return CreatePage (
- pActualPage, ePageKind,
- // No names for the new slides.
- String(), String(),
- eAutoLayout, eAutoLayout,
- aVisibleLayers.IsSet(aBckgrnd),
- aVisibleLayers.IsSet(aBckgrndObj));
-}
-
-
-
-
USHORT SdDrawDocument::CreatePage (
SdPage* pActualPage,
PageKind ePageKind,
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index b615c7e76c05..89f74de30494 100644..100755
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -242,26 +242,6 @@ void SdDrawDocument::CreateLayoutTemplates()
rISet.Put(SvxLRSpaceItem(EE_PARA_LRSPACE));
rISet.Put(SvxULSpaceItem(EE_PARA_ULSPACE));
- // only change paragraph text direction,
- // if this is a new document and
- // text direction is set explicitly to RTL
-/*
- if( mpDocSh &&
- mpDocSh->IsNewDocument() &&
- SD_MOD()->GetDefaultWritingMode() == ::com::sun::star::text::WritingMode_RL_TB )
- {
- SvxAdjustItem aAdjust( SVX_ADJUST_RIGHT );
- SvxFrameDirectionItem aFrameDirectionItem( FRMDIR_HORI_RIGHT_TOP, EE_PARA_WRITINGDIR );
-
- rISet.Put( aAdjust );
- rISet.Put( aFrameDirectionItem );
-
- pItemPool->SetPoolDefaultItem( aAdjust );
- pItemPool->SetPoolDefaultItem( aFrameDirectionItem );
- }
- else
- rISet.Put( SvxAdjustItem() );
-*/
rISet.Put( SdrTextLeftDistItem( 250 ) ); // sj: (i33745) using text frame distances seems to be a better default
rISet.Put( SdrTextRightDistItem( 250 ) );
rISet.Put( SdrTextUpperDistItem( 125 ) );
@@ -1121,57 +1101,6 @@ void SdDrawDocument::ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject*
/*************************************************************************
|*
-|* Sprachabhaengige Namen der StandardLayer durch eindeutigen Namen ersetzen
-|*
-\************************************************************************/
-
-void SdDrawDocument::MakeUniqueLayerNames()
-{
- String aLayerLayout(SdResId(STR_LAYER_LAYOUT));
- String aLayerBckgrnd(SdResId(STR_LAYER_BCKGRND));
- String aLayerBckgrndObj(SdResId(STR_LAYER_BCKGRNDOBJ));
- String aLayerControls(SdResId(STR_LAYER_CONTROLS));
- String aLayerMeasurelines(SdResId(STR_LAYER_MEASURELINES));
- SdrLayerAdmin& rLayerAdmin = GetLayerAdmin();
- USHORT nStandardLayer = 5;
- USHORT nLayerCount = Min(rLayerAdmin.GetLayerCount(), nStandardLayer);
-
- for (USHORT nLayer = 0; nLayer < nLayerCount; nLayer++)
- {
- // Die sprachabhaengigen Namen der Default-Layer werden nicht mehr
- // gespeichert. Es werden stattdessen eindeutige Namen verwendet.
- SdrLayer* pLayer = rLayerAdmin.GetLayer(nLayer);
-
- if (pLayer)
- {
- String aLayerName(pLayer->GetName());
-
- if (aLayerName == aLayerLayout)
- {
- pLayer->SetName( String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_LAYOUT" )));
- }
- else if (aLayerName == aLayerBckgrnd)
- {
- pLayer->SetName( String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_BCKGRND" )));
- }
- else if (aLayerName == aLayerBckgrndObj)
- {
- pLayer->SetName( String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_BACKGRNDOBJ" )));
- }
- else if (aLayerName == aLayerControls)
- {
- pLayer->SetName( String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_CONTROLS" )));
- }
- else if (aLayerName == aLayerMeasurelines)
- {
- pLayer->SetName( String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_MEASURELINES" )));
- }
- }
- }
-}
-
-/*************************************************************************
-|*
|* Eindeutige Namen der StandardLayer durch sprachabhaengige Namen ersetzen
|*
\************************************************************************/
@@ -1545,12 +1474,6 @@ SdStyleSheetPool* SdDrawDocument::GetSdStyleSheetPool() const
return dynamic_cast< SdStyleSheetPool* >( GetStyleSheetPool() );
}
-ModifyGuard::ModifyGuard( DrawDocShell* pDocShell )
-: mpDocShell( pDocShell ), mpDoc( 0 )
-{
- init();
-}
-
ModifyGuard::ModifyGuard( SdDrawDocument* pDoc )
: mpDocShell( 0 ), mpDoc( pDoc )
{
diff --git a/sd/source/core/shapelist.cxx b/sd/source/core/shapelist.cxx
index f9f923f77270..bf5b98471b53 100755
--- a/sd/source/core/shapelist.cxx
+++ b/sd/source/core/shapelist.cxx
@@ -170,25 +170,6 @@ SdrObject* ShapeList::getNextShape(SdrObject* pObj) const
return 0;
}
-SdrObject* ShapeList::getPreviousShape( SdrObject* pObj ) const
-{
- if( pObj )
- {
- ListImpl::const_iterator aIter( std::find( maShapeList.begin(), maShapeList.end(), pObj ) );
- if( (aIter != maShapeList.end()) && (aIter != maShapeList.begin()) )
- {
- aIter--;
- return (*aIter);
- }
- }
- else if( !maShapeList.empty() )
- {
- return (*--maShapeList.end());
- }
-
- return 0;
-}
-
void ShapeList::ObjectInDestruction(const SdrObject& rObject)
{
ListImpl::iterator aIter( std::find( maShapeList.begin(), maShapeList.end(), &rObject ) );
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index c91fee735954..138863cc313a 100644..100755
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -144,30 +144,6 @@ SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(const String& rLayoutName)
return pResult;
}
-// ----------------------------------------------------------
-// find layout name of first layout
-// ----------------------------------------------------------
-
-String SdStyleSheetPool::GetLayoutName() const
-{
- String aName( SdResId(STR_LAYOUT_DEFAULT_NAME ) );
- sal_uInt32 nCount = aStyles.size();
-
- for( sal_uInt32 n = 0; n < nCount; n++ )
- {
- aName = aStyles[n]->GetName();
- sal_uInt16 nPos = aName.SearchAscii( SD_LT_SEPARATOR );
- if( nPos != STRING_NOTFOUND )
- break;
- }
-
- sal_uInt16 nPos = aName.Search( sal_Unicode( ' ' ));
- if( nPos != STRING_NOTFOUND )
- aName.Erase( nPos ); // removing blanks and number (e.g. "Gliederung 1")
-
- return aName;
-}
-
/*************************************************************************
|*
|* eine Liste der Gliederungstextvorlagen fuer ein Praesentationlayout
@@ -573,32 +549,6 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
/*************************************************************************
|*
-|* StyleSheets des genannten Praesentationslayouts loeschen
-|*
-\************************************************************************/
-
-void SdStyleSheetPool::EraseLayoutStyleSheets(const String& rLayoutName)
-{
- SfxStyleSheetBase* pSheet = NULL;
-
- List* pNameList = CreateLayoutSheetNames(rLayoutName);
-
- String* pName = (String*)pNameList->First();
- while (pName)
- {
- pSheet = Find(*pName, SD_STYLE_FAMILY_MASTERPAGE);
- DBG_ASSERT(pSheet, "EraseLayoutStyleSheets: Vorlage nicht gefunden");
- if (pSheet)
- Remove(pSheet);
- delete pName;
- pName = (String*)pNameList->Next();
- }
- delete pNameList;
-}
-
-
-/*************************************************************************
-|*
|* Graphik-StyleSheets aus dem Quellpool in diesen Pool kopieren
|*
|* (rSourcePool kann nicht const sein, weil SfxStyleSheetPoolBase::Find
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index 0856e867f4e1..ab6c69ee8fdc 100644..100755
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -118,7 +118,6 @@ public:
void Dispose();
void SetText( OutlinerParaObject& rText );
- void SetString( const String& rText );
OutlinerParaObject* CreateText();
String GetText();
SdDrawDocument* GetDoc() { return pImpl->mpDoc; }
@@ -177,16 +176,6 @@ OutlinerParaObject* TextApiObject::CreateText()
return mpSource->CreateText();
}
-void TextApiObject::SetString( const String& rText )
-{
- SdrModel* pModel = mpSource->GetDoc();
- if( pModel && pModel->IsUndoEnabled() )
- pModel->AddUndo( new UndoTextAPIChanged( *pModel, this ) );
-
- mpSource->SetString( rText );
- maSelection.nStartPara = 0xffff;
-}
-
void TextApiObject::SetText( OutlinerParaObject& rText )
{
SdrModel* pModel = mpSource->GetDoc();
@@ -288,22 +277,6 @@ void TextAPIEditSource::SetText( OutlinerParaObject& rText )
}
}
-void TextAPIEditSource::SetString( const String& rText )
-{
- if ( pImpl->mpDoc )
- {
- if( !pImpl->mpOutliner )
- {
- //init draw model first
- pImpl->mpOutliner = new Outliner( pImpl->mpDoc, OUTLINERMODE_TEXTOBJECT );
- pImpl->mpDoc->SetCalcFieldValueHdl( pImpl->mpOutliner );
- }
- else
- pImpl->mpOutliner->Clear();
- pImpl->mpOutliner->Insert( rText );
- }
-}
-
OutlinerParaObject* TextAPIEditSource::CreateText()
{
if ( pImpl->mpDoc && pImpl->mpOutliner )
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index f3ec27d8093c..3d8797beb328 100644..100755
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -476,7 +476,6 @@ class GroupTable
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > &
GetCurrentGroupAccess() const { return mpGroupEntry[ mnCurrentGroupEntry - 1 ]->mXIndexAccess; };
sal_uInt32 GetGroupsClosed();
- void SkipCurrentGroup();
void ResetGroupTable( sal_uInt32 nCount );
void ClearGroupTable();
sal_Bool EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & rIndex );
@@ -534,7 +533,7 @@ class PortionObj : public PropStateValue
protected :
void ImplClear();
- void ImplConstruct( PortionObj& rPortionObj );
+ void ImplConstruct( const PortionObj& rPortionObj );
sal_uInt32 ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, String& rURL );
sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition );
@@ -567,13 +566,13 @@ class PortionObj : public PropStateValue
sal_Bool bLast, FontCollection& rFontCollection );
PortionObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef,
FontCollection& rFontCollection );
- PortionObj( PortionObj& rPortionObj );
+ PortionObj( const PortionObj& rPortionObj );
~PortionObj();
void Write( SvStream* pStrm, sal_Bool bLast );
sal_uInt32 Count() const { return mnTextSize; };
- PortionObj& operator=( PortionObj& rPortionObj );
+ PortionObj& operator=( const PortionObj& rPortionObj );
};
struct ParaFlags
@@ -594,10 +593,9 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph
protected :
- void ImplConstruct( ParagraphObj& rParagraphObj );
+ void ImplConstruct( const ParagraphObj& rParagraphObj );
void ImplClear();
sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition );
- ::com::sun::star::awt::Size ImplMapSize( const ::com::sun::star::awt::Size& rSize );
void ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = FALSE );
void ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue = FALSE );
@@ -631,7 +629,7 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph
ParagraphObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContentRef,
ParaFlags, FontCollection& rFontCollection,
PPTExBulletProvider& rBuProv );
- ParagraphObj( ParagraphObj& rParargraphObj );
+ ParagraphObj( const ParagraphObj& rParargraphObj );
ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef,
PPTExBulletProvider& rBuProv );
@@ -641,7 +639,7 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph
void Write( SvStream* pStrm );
sal_uInt32 Count() const { return mnTextSize; };
- ParagraphObj& operator=( ParagraphObj& rParagraphObj );
+ ParagraphObj& operator=( const ParagraphObj& rParagraphObj );
};
struct ImplTextObj
@@ -659,13 +657,13 @@ struct ImplTextObj
class TextObj
{
- ImplTextObj* mpImplTextObj;
+ mutable ImplTextObj* mpImplTextObj;
void ImplCalculateTextPositions();
public :
TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > &
rXText, int nInstance, FontCollection& rFontCollection, PPTExBulletProvider& rBuProv );
- TextObj( TextObj& rTextObj );
+ TextObj( const TextObj& rTextObj );
~TextObj();
void Write( SvStream* pStrm );
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index c9d083db86d9..f4462da6b8b8 100644..100755
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -312,14 +312,6 @@ sal_Bool GroupTable::GetNextGroupEntry()
// ---------------------------------------------------------------------------------------------
-void GroupTable::SkipCurrentGroup()
-{
- if ( mnCurrentGroupEntry )
- delete ( mpGroupEntry[ --mnCurrentGroupEntry ] );
-}
-
-// ---------------------------------------------------------------------------------------------
-
FontCollectionEntry::~FontCollectionEntry()
{
}
@@ -1869,7 +1861,7 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text
}
}
-PortionObj::PortionObj( PortionObj& rPortionObj )
+PortionObj::PortionObj( const PortionObj& rPortionObj )
: PropStateValue( rPortionObj )
{
ImplConstruct( rPortionObj );
@@ -2097,7 +2089,7 @@ void PortionObj::ImplClear()
delete[] mpText;
}
-void PortionObj::ImplConstruct( PortionObj& rPortionObj )
+void PortionObj::ImplConstruct( const PortionObj& rPortionObj )
{
mbLastPortion = rPortionObj.mbLastPortion;
mnTextSize = rPortionObj.mnTextSize;
@@ -2291,7 +2283,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com
return nRetValue;
}
-PortionObj& PortionObj::operator=( PortionObj& rPortionObj )
+PortionObj& PortionObj::operator=( const PortionObj& rPortionObj )
{
if ( this != &rPortionObj )
{
@@ -2369,7 +2361,7 @@ ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::
}
}
-ParagraphObj::ParagraphObj( ParagraphObj& rObj )
+ParagraphObj::ParagraphObj( const ParagraphObj& rObj )
: List()
, PropStateValue()
, SOParagraph()
@@ -2878,7 +2870,7 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Boo
meBiDi = ePropState;
}
-void ParagraphObj::ImplConstruct( ParagraphObj& rParagraphObj )
+void ParagraphObj::ImplConstruct( const ParagraphObj& rParagraphObj )
{
mnTextSize = rParagraphObj.mnTextSize;
mnTextAdjust = rParagraphObj.mnTextAdjust;
@@ -2891,8 +2883,9 @@ void ParagraphObj::ImplConstruct( ParagraphObj& rParagraphObj )
mbForbiddenRules = rParagraphObj.mbForbiddenRules;
mnBiDi = rParagraphObj.mnBiDi;
- for ( void* pPtr = rParagraphObj.First(); pPtr; pPtr = rParagraphObj.Next() )
- Insert( new PortionObj( *(PortionObj*)pPtr ), LIST_APPEND );
+ ParagraphObj& rOther = const_cast<ParagraphObj&>(rParagraphObj);
+ for ( const void* pPtr = rOther.First(); pPtr; pPtr = rOther.Next() )
+ Insert( new PortionObj( *(const PortionObj*)pPtr ), LIST_APPEND );
maTabStop = rParagraphObj.maTabStop;
bExtendedParameters = rParagraphObj.bExtendedParameters;
@@ -2917,16 +2910,6 @@ void ParagraphObj::ImplConstruct( ParagraphObj& rParagraphObj )
nBulletId = rParagraphObj.nBulletId;
}
-::com::sun::star::awt::Size ParagraphObj::ImplMapSize( const ::com::sun::star::awt::Size& rSize )
-{
- Size aSize( OutputDevice::LogicToLogic( Size( rSize.Width, rSize.Height ), maMapModeSrc, maMapModeDest ) );
- if ( !aSize.Width() )
- aSize.Width()++;
- if ( !aSize.Height() )
- aSize.Height()++;
- return ::com::sun::star::awt::Size( aSize.Width(), aSize.Height() );
-}
-
sal_uInt32 ParagraphObj::ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition )
{
mnTextSize = 0;
@@ -2935,7 +2918,7 @@ sal_uInt32 ParagraphObj::ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosi
return mnTextSize;
}
-ParagraphObj& ParagraphObj::operator=( ParagraphObj& rParagraphObj )
+ParagraphObj& ParagraphObj::operator=( const ParagraphObj& rParagraphObj )
{
if ( this != &rParagraphObj )
{
@@ -2998,7 +2981,7 @@ TextObj::TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSim
ImplCalculateTextPositions();
}
-TextObj::TextObj( TextObj& rTextObj )
+TextObj::TextObj( const TextObj& rTextObj )
{
mpImplTextObj = rTextObj.mpImplTextObj;
mpImplTextObj->mnRefCount++;
@@ -4155,6 +4138,7 @@ sal_Bool PPTWriter::ImplCreatePresentationPlaceholder( const sal_Bool bMasterPag
ImplWriteTextStyleAtom( aClientTextBox, nStyleInstance, 0, NULL, aExtBu, &aPropOpt );
aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, sal_False, sal_True );
+ aPropOpt.CreateShapeProperties( mXShape );
aPropOpt.Commit( *mpStrm );
mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor );
*mpStrm << (sal_Int16)maRect.Top() << (sal_Int16)maRect.Left() << (sal_Int16)maRect.Right() << (sal_Int16)maRect.Bottom(); // oben, links, rechts, unten ????
@@ -5406,6 +5390,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
maRect.Justify();
if ( mnAngle )
ImplFlipBoundingBox( aPropOpt );
+ aPropOpt.CreateShapeProperties( mXShape );
aPropOpt.Commit( *mpStrm );
mpPptEscherEx->AddClientAnchor( maRect );
@@ -5475,6 +5460,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
SvMemoryStream aExtBu( 0x200, 0x200 );
ImplWriteTextStyleAtom( *pClientTextBox, EPP_TEXTTYPE_Other, 0, NULL, aExtBu, &aPropOpt );
+ aPropOpt.CreateShapeProperties( mXShape );
aPropOpt.Commit( *mpStrm );
mpPptEscherEx->AddClientAnchor( maRect );
@@ -5652,6 +5638,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x1000100 );
aPropOpt2.AddOpt( ESCHER_Prop_tableProperties, 1 );
aPropOpt2.AddOpt( ESCHER_Prop_tableRowProperties, sal_True, aMemStrm.Tell(), static_cast< sal_uInt8* >( const_cast< void* >( aMemStrm.GetData() ) ), aMemStrm.Tell() );
+ aPropOpt.CreateShapeProperties( rXShape );
aPropOpt.Commit( *mpStrm );
aPropOpt2.Commit( *mpStrm, 3, ESCHER_UDefProp );
mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor );
diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx
index 5adcbd5fc56a..4bcb73535ba1 100644..100755
--- a/sd/source/filter/html/htmlattr.cxx
+++ b/sd/source/filter/html/htmlattr.cxx
@@ -100,15 +100,3 @@ void SdHtmlAttrPreview::SetColors( Color& aBack, Color& aText, Color& aLink,
m_aVLinkColor = aVLink;
m_aALinkColor = aALink;
}
-
-// =====================================================================
-// =====================================================================
-void SdHtmlAttrPreview::GetColors( Color& aBack, Color& aText, Color& aLink,
- Color& aVLink, Color& aALink ) const
-{
- aBack = m_aBackColor;
- aText = m_aTextColor;
- aLink = m_aLinkColor;
- aVLink = m_aVLinkColor;
- aALink = m_aALinkColor;
-}
diff --git a/sd/source/filter/html/htmlattr.hxx b/sd/source/filter/html/htmlattr.hxx
index b076b2a29307..1caa16822ab1 100644..100755
--- a/sd/source/filter/html/htmlattr.hxx
+++ b/sd/source/filter/html/htmlattr.hxx
@@ -46,8 +46,6 @@ public:
void SetColors( Color& aBack, Color& aText, Color& aLink,
Color& aVLink, Color& aALink );
- void GetColors( Color& aBack, Color& aText, Color& aLink,
- Color& aVLink, Color& aALink ) const;
};
#endif // _SD_HTMLATTR_HXX
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 82fabc73aed2..9de46771e14c 100644..100755
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -3371,15 +3371,6 @@ BOOL HtmlErrorContext::GetString( ULONG, String& rCtxStr )
// =====================================================================
-void HtmlErrorContext::SetContext( USHORT nResId )
-{
- mnResId = nResId;
- maURL1.Erase();
- maURL2.Erase();
-}
-
-// =====================================================================
-
void HtmlErrorContext::SetContext( USHORT nResId, const String& rURL )
{
mnResId = nResId;
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index 34ca8182d22f..43bc12419f84 100644..100755
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -88,7 +88,6 @@ public:
virtual BOOL GetString( ULONG nErrId, String& rCtxStr );
- void SetContext( USHORT nResId );
void SetContext( USHORT nResId, const String& rURL );
void SetContext( USHORT nResId, const String& rURL1, const String& rURL2 );
};
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx
index a4a3564d35b0..25ac858ca319 100644..100755
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -84,11 +84,6 @@ Ppt97Animation::Ppt97Animation( SvStream& rInputStream )
m_aAtom.ReadStream( rInputStream );
}
-Ppt97Animation::Ppt97Animation()
- : MEMBER_CONSTRUCTOR_LIST()
-{
-}
-
Ppt97Animation::Ppt97Animation( const Ppt97Animation& rAnimation )
: MEMBER_CONSTRUCTOR_LIST()
{
@@ -163,11 +158,12 @@ bool Ppt97Animation::HasAfterEffect_DimAtNextEffect() const
{
return m_aAtom.nAfterEffect == 2;
}
+#ifdef FUTURE
bool Ppt97Animation::HasAfterEffect_DimAfterEffect() const
{
return m_aAtom.nAfterEffect == 3;
}
-
+#endif
UINT32 Ppt97Animation::GetSoundRef() const
{
return m_aAtom.nSoundRef;
diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx
index 4aa24ab12de8..c68ba9a19382 100644..100755
--- a/sd/source/filter/ppt/ppt97animations.hxx
+++ b/sd/source/filter/ppt/ppt97animations.hxx
@@ -95,7 +95,6 @@ class Ppt97Animation
public: //public methods
Ppt97Animation( SvStream& rIn );
- Ppt97Animation();
Ppt97Animation( const Ppt97Animation& rAnimation );
Ppt97Animation& operator= ( const Ppt97Animation& rAnimation );
bool operator < ( const Ppt97Animation& rAnimation ) const;//later is greater
@@ -129,7 +128,9 @@ private: //private methods
bool HasAfterEffect() const;
bool HasAfterEffect_ChangeColor() const;
bool HasAfterEffect_DimAtNextEffect() const;
+#ifdef FUTURE
bool HasAfterEffect_DimAfterEffect() const;
+#endif
bool HasStopPreviousSound() const;
bool HasReverseOrder() const; //true if the text paragraphs should be animated in reverse order
sal_Int32 GetParagraphLevel() const; //paragraph level that is animated ( that paragraph and higher levels )
diff --git a/sd/source/filter/ppt/pptatom.cpp b/sd/source/filter/ppt/pptatom.cpp
index 21a0c3c3f9f8..0bd31c2119d5 100644..100755
--- a/sd/source/filter/ppt/pptatom.cpp
+++ b/sd/source/filter/ppt/pptatom.cpp
@@ -49,7 +49,15 @@ Atom::Atom( const DffRecordHeader& rRecordHeader, SvStream& rStream )
Atom* pLastAtom = NULL;
- while( (mrStream.GetError() == 0 ) && ( mrStream.Tell() < maRecordHeader.GetRecEndFilePos() ) )
+ // retrieve file size (to allow sanity checks)
+ const sal_Size nStreamPos = mrStream.Tell();
+ mrStream.Seek( STREAM_SEEK_TO_END );
+ const sal_Size nStreamSize = mrStream.Tell();
+ mrStream.Seek( nStreamPos );
+
+ while( (mrStream.GetError() == 0 )
+ && ( mrStream.Tell() < nStreamSize )
+ && ( mrStream.Tell() < maRecordHeader.GetRecEndFilePos() ) )
{
mrStream >> aChildHeader;
@@ -109,15 +117,3 @@ const Atom* Atom::findNextChildAtom( sal_uInt16 nRecType, const Atom* pLast ) co
return pChild;
}
-
-/** returns the next child atom after pLast with nRecType and nRecInstance or NULL */
-const Atom* Atom::findNextChildAtom( sal_uInt16 nRecType, sal_uInt16 nRecInstance, const Atom* pLast ) const
-{
- const Atom* pChild = pLast != NULL ? pLast->mpNextAtom : mpFirstChild;
- while( pChild && (pChild->maRecordHeader.nRecType != nRecType) && (pChild->maRecordHeader.nRecInstance != nRecInstance) )
- {
- pChild = findNextChildAtom( pChild );
- }
-
- return pChild;
-}
diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx
index 0b13dc314584..d430b7bffb7a 100644..100755
--- a/sd/source/filter/ppt/pptatom.hxx
+++ b/sd/source/filter/ppt/pptatom.hxx
@@ -49,21 +49,12 @@ public:
/** returns true if at least one atim with the given nRecType is found */
inline bool hasChildAtom( sal_uInt16 nRecType ) const;
- /** returns true if at least one atim with the given nRecType and nRecInstnace is found */
- inline bool hasChildAtom( sal_uInt16 nRecType, sal_uInt16 nRecInstance ) const;
-
/** returns the first child atom with nRecType or NULL */
inline const Atom* findFirstChildAtom( sal_uInt16 nRecType ) const;
/** returns the next child atom after pLast with nRecType or NULL */
const Atom* findNextChildAtom( sal_uInt16 nRecType, const Atom* pLast ) const;
- /** returns the first child atom with nRecType and nRecInstance or NULL */
- inline const Atom* findFirstChildAtom( sal_uInt16 nRecType, sal_uInt16 nRecInstance ) const;
-
- /** returns the next child atom after pLast with nRecType and nRecInstance or NULL */
- const Atom* findNextChildAtom( sal_uInt16 nRecType, sal_uInt16 nRecInstance, const Atom* pLast ) const;
-
/** returns the first child atom or NULL */
inline const Atom* findFirstChildAtom() const;
@@ -99,11 +90,6 @@ inline bool Atom::hasChildAtom( sal_uInt16 nRecType ) const
return findFirstChildAtom( nRecType ) != NULL;
}
-inline bool Atom::hasChildAtom( sal_uInt16 nRecType, sal_uInt16 nRecInstance ) const
-{
- return findFirstChildAtom( nRecType, nRecInstance ) != NULL;
-}
-
inline const Atom* Atom::findFirstChildAtom( sal_uInt16 nRecType ) const
{
return findNextChildAtom( nRecType, NULL );
@@ -114,11 +100,6 @@ inline const DffRecordHeader& Atom::getHeader() const
return maRecordHeader;
}
-inline const Atom* Atom::findFirstChildAtom( sal_uInt16 nRecType, sal_uInt16 nRecInstance ) const
-{
- return findNextChildAtom( nRecType, nRecInstance, NULL );
-}
-
inline const Atom* Atom::findFirstChildAtom() const
{
return mpFirstChild;
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 16fc1a99dd8a..10b0b152b8f4 100644..100755
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -1522,52 +1522,6 @@ void AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference<
// --------------------------------------------------------------------
-/* todo: for now we dump sub containers into its parent container, what else to do with it? */
-void AnimationImporter::importAnimationSubContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
-{
- DBG_ASSERT( pAtom && xNode.is(), "invalid call to ppt::AnimationImporter::importTimeContainer()!");
- if( pAtom && xNode.is() )
- {
- // import sub containers
- const Atom* pChildAtom = pAtom->findFirstChildAtom();
-
- while( pChildAtom )
- {
- switch( pChildAtom->getType() )
- {
- case DFF_msofbtAnimNode:
- case DFF_msofbtAnimEvent:
- case DFF_msofbtAnimValue:
- case DFF_msofbtAnimAction:
- case DFF_msofbtAnimPropertySet:
- break;
- case DFF_msofbtAnimCommand:
- {
- const OUString aServiceName( OUString::createFromAscii("com.sun.star.animations.Command") );
- Reference< XAnimationNode > xChildNode( ::comphelper::getProcessServiceFactory()->createInstance(aServiceName), UNO_QUERY );
- importAnimationNodeContainer( pChildAtom, xChildNode );
- Reference< XTimeContainer > xParentContainer( xNode, UNO_QUERY );
- if( xParentContainer.is() && xChildNode.is() )
- xParentContainer->appendChild( xChildNode );
- }
- break;
-
- default:
- {
- dump_atom_header( pChildAtom, true, false );
- dump_atom( pChildAtom );
- dump_atom_header( pChildAtom, false, false );
- }
- break;
- }
-
- pChildAtom = pAtom->findNextChildAtom( pChildAtom );
- }
- }
-}
-
-// --------------------------------------------------------------------
-
void AnimationImporter::importAnimationNodeContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
{
DBG_ASSERT( pAtom && xNode.is(), "invalid call to ppt::AnimationImporter::importAnimationNodeContainer()!");
@@ -3894,14 +3848,6 @@ void AnimationImporter::dump_atom( const Atom* , bool )
{
}
-void AnimationImporter::dump( sal_uInt32 , bool )
-{
-}
-
-void AnimationImporter::dump_anim_group( const Atom* , const AnimationNode& , const PropertySet& , bool )
-{
-}
-
void AnimationImporter::dump_target( ::com::sun::star::uno::Any& )
{
}
@@ -3922,10 +3868,6 @@ void AnimationImporter::dump( const char * )
{
}
-void AnimationImporter::dump( const rtl::OUString& )
-{
-}
-
void AnimationImporter::dump( const char * , sal_Int32 )
{
}
diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx
index d29449361861..24f423029e82 100644..100755
--- a/sd/source/filter/ppt/pptinanimations.hxx
+++ b/sd/source/filter/ppt/pptinanimations.hxx
@@ -62,7 +62,6 @@ private:
void importAnimationContainer( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xParent );
void importTimeContainer( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
void importAnimationNodeContainer( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
- void importAnimationSubContainer( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
void importAnimateSetContainer( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
void importAnimateFilterContainer( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
@@ -109,18 +108,18 @@ private:
#ifdef DBG_ANIM_LOG
FILE * mpFile;
+ void dump_anim_group( const Atom* pAtom, const AnimationNode& rNode, const PropertySet& rSet, bool bOpen );
+ void dump( const rtl::OUString& rString );
+ void dump( sal_uInt32 nLen, bool bNewLine = true );
#endif
void dump_atom_header( const Atom* pAtom, bool bOpen, bool bAppend );
void dump_atom( const Atom* pAtom, bool bNewLine = true );
- void dump( sal_uInt32 nLen, bool bNewLine = true );
- void dump_anim_group( const Atom* pAtom, const AnimationNode& rNode, const PropertySet& rSet, bool bOpen );
void dump_target( ::com::sun::star::uno::Any& rAny );
void dump( ::com::sun::star::uno::Any& rAny );
void dump( const PropertySet& rSet );
void dump( const AnimationNode& rNode );
void dump( const char * pText );
- void dump( const rtl::OUString& rString );
void dump( const char * pText, sal_Int32 nInt );
void dump( const char * pText, double fDouble );
void dump( const char * pText, const char * pText2 );
diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
index 70734ac23198..de5342afd23f 100644..100755
--- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
+++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
@@ -44,18 +44,6 @@ namespace accessibility {
May change in the future.
*/
-AccessibleViewForwarder::AccessibleViewForwarder (SdrPaintView* pView, USHORT nWindowId)
- : mpView (pView),
- mnWindowId (nWindowId),
- mrDevice (pView->GetPaintWindow((sal_uInt32)nWindowId)->GetOutputDevice())
-{
- OSL_ASSERT (mpView != NULL);
- // empty
-}
-
-
-
-
AccessibleViewForwarder::AccessibleViewForwarder (SdrPaintView* pView, OutputDevice& rDevice)
: mpView (pView),
mnWindowId (0),
@@ -86,15 +74,6 @@ AccessibleViewForwarder::~AccessibleViewForwarder (void)
-void AccessibleViewForwarder::SetView (SdrPaintView* pView)
-{
- mpView = pView;
- OSL_ASSERT (mpView != NULL);
-}
-
-
-
-
sal_Bool AccessibleViewForwarder::IsValid (void) const
{
return sal_True;
diff --git a/sd/source/ui/animations/AnimationSchemesPane.cxx b/sd/source/ui/animations/AnimationSchemesPane.cxx
deleted file mode 100644
index 337dc64331fd..000000000000
--- a/sd/source/ui/animations/AnimationSchemesPane.cxx
+++ /dev/null
@@ -1,443 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sd.hxx"
-#include "AnimationSchemesPane.hxx"
-#include "AnimationSchemesPane.hrc"
-#include "CustomAnimation.hrc"
-
-#include "TransitionPreset.hxx"
-#include "sdresid.hxx"
-#include "ViewShellBase.hxx"
-#include "DrawDocShell.hxx"
-#include "SlideSorterViewShell.hxx"
-#include "drawdoc.hxx"
-#include "filedlg.hxx"
-#include "strings.hrc"
-#include "EventMultiplexer.hxx"
-#include <com/sun/star/beans/XPropertySet.hpp>
-
-#ifndef _SVT_CONTROLDIMS_HRC_
-#include <svtools/controldims.hrc>
-#endif
-#include <svx/gallery.hxx>
-#include <unotools/pathoptions.hxx>
-#include <vcl/msgbox.hxx>
-#include <tools/urlobj.hxx>
-
-#include <algorithm>
-
-
-using namespace ::com::sun::star;
-
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
-using ::com::sun::star::uno::RuntimeException;
-
-// ______________________
-//
-// Local Helper Functions
-// ______________________
-
-namespace
-{
-
-typedef ::boost::shared_ptr<sd::slidesorter::SlideSorterViewShell::PageSelection>
- SharedPageSelection;
-SharedPageSelection lcl_getSelectedPages (::sd::ViewShellBase& rBase)
-{
- ::sd::slidesorter::SlideSorterViewShell*pSlideSorterViewShell
- = ::sd::slidesorter::SlideSorterViewShell::GetSlideSorter(rBase);
- DBG_ASSERT( pSlideSorterViewShell, "No Slide-Sorter available" );
-
- if (pSlideSorterViewShell != NULL)
- {
- return pSlideSorterViewShell->GetPageSelection();
- }
- else
- {
- return SharedPageSelection(new sd::slidesorter::SlideSorterViewShell::PageSelection());
- }
-}
-
-// void lcl_ApplyToPages( ::std::vector< SdPage * > aPages, const ::sd::impl::TransitionEffect & rEffect )
-// {
-// ::std::vector< SdPage * >::const_iterator aIt( aPages.begin());
-// const ::std::vector< SdPage * >::const_iterator aEndIt( aPages.end());
-// for( ; aIt != aEndIt; ++aIt )
-// {
-// rEffect.applyTo( *(*aIt) );
-// }
-// }
-
-} // anonymous namespace
-
-namespace sd
-{
-
-// ____________________
-//
-// AnimationSchemesPane
-// ____________________
-
-AnimationSchemesPane::AnimationSchemesPane(
- ::Window * pParent,
- ViewShellBase & rBase,
- SdDrawDocument* pDoc ) :
- Control( pParent, SdResId( DLG_ANIMATION_SCHEMES_PANE ) ),
-
- mrBase( rBase ),
- mpDrawDoc( pDoc ),
- maFL_APPLY_SCHEME( this, SdResId( FL_APPLY_SCHEME ) ),
- maLB_ANIMATION_SCHEMES( this, SdResId( LB_ANIMATION_SCHEMES ) ),
- maFL_EMPTY1( this, SdResId( FL_EMPTY1 ) ),
- maPB_APPLY_TO_ALL( this, SdResId( PB_APPLY_TO_ALL ) ),
- maPB_PLAY( this, SdResId( PB_PLAY ) ),
- maPB_SLIDE_SHOW( this, SdResId( PB_SLIDE_SHOW ) ),
- maFL_EMPTY2( this, SdResId( FL_EMPTY2 ) ),
- maCB_AUTO_PREVIEW( this, SdResId( CB_AUTO_PREVIEW ) ),
-
- maSTR_NO_SCHEME( SdResId( STR_NO_SCHEME ) ),
- mbHasSelection( false ),
- mbUpdatingControls( false ),
- mbIsMainViewChangePending( false )
-{
- // use no resource ids from here on
- FreeResource();
-
- if( pDoc )
- mxModel.set( pDoc->getUnoModel(), uno::UNO_QUERY );
- // TODO: get correct view
- if( mxModel.is())
- mxView.set( mxModel->getCurrentController(), uno::UNO_QUERY );
-
- // fill list box of slide transitions
- maLB_ANIMATION_SCHEMES.InsertEntry( maSTR_NO_SCHEME );
-
- // set defaults
- maCB_AUTO_PREVIEW.Check(); // automatic preview on
-
- // update control states before adding handlers
- updateLayout();
- updateControls();
-
- // set handlers
- maPB_APPLY_TO_ALL.SetClickHdl( LINK( this, AnimationSchemesPane, ApplyToAllButtonClicked ));
- maPB_PLAY.SetClickHdl( LINK( this, AnimationSchemesPane, PlayButtonClicked ));
- maPB_SLIDE_SHOW.SetClickHdl( LINK( this, AnimationSchemesPane, SlideShowButtonClicked ));
-
- maLB_ANIMATION_SCHEMES.SetSelectHdl( LINK( this, AnimationSchemesPane, SchemeSelected ));
-
- addListener();
-}
-
-AnimationSchemesPane::~AnimationSchemesPane()
-{
- removeListener();
-}
-
-void AnimationSchemesPane::Resize()
-{
- updateLayout();
-}
-
-void AnimationSchemesPane::onSelectionChanged()
-{
- updateControls();
-}
-
-void AnimationSchemesPane::onChangeCurrentPage()
-{
- updateControls();
-}
-
-void AnimationSchemesPane::updateLayout()
-{
- ::Size aPaneSize( GetSizePixel() );
-
- // start layouting elements from bottom to top. The remaining space is used
- // for the topmost list box
- ::Point aOffset( LogicToPixel( Point( 3, 3 ), MAP_APPFONT ) );
- long nOffsetX = aOffset.getX();
- long nOffsetY = aOffset.getY();
- long nOffsetBtnX = LogicToPixel( Point( 6, 1 ), MAP_APPFONT ).getX();
-
- ::Point aUpperLeft( nOffsetX, aPaneSize.getHeight() - nOffsetY );
- long nMaxWidth = aPaneSize.getWidth() - 2 * nOffsetX;
-
- // auto preview check-box
- ::Size aCtrlSize = maCB_AUTO_PREVIEW.GetSizePixel();
- aCtrlSize.setWidth( maCB_AUTO_PREVIEW.CalcMinimumSize( nMaxWidth ).getWidth());
- aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight());
- maCB_AUTO_PREVIEW.SetPosSizePixel( aUpperLeft, aCtrlSize );
-
- // fixed line above check-box
- aCtrlSize = maFL_EMPTY2.GetSizePixel();
- aCtrlSize.setWidth( nMaxWidth );
- aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight());
- maFL_EMPTY2.SetPosSizePixel( aUpperLeft, aCtrlSize );
-
- // buttons "Play" and "Slide Show"
- long nPlayButtonWidth = maPB_PLAY.CalcMinimumSize().getWidth() + 2 * nOffsetBtnX;
- long nSlideShowButtonWidth = maPB_SLIDE_SHOW.CalcMinimumSize().getWidth() + 2 * nOffsetBtnX;
-
- if( (nPlayButtonWidth + nSlideShowButtonWidth + nOffsetX) <= nMaxWidth )
- {
- // place buttons side by side
- aCtrlSize = maPB_PLAY.GetSizePixel();
- aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight());
- aCtrlSize.setWidth( nPlayButtonWidth );
- maPB_PLAY.SetPosSizePixel( aUpperLeft, aCtrlSize );
-
- aUpperLeft.setX( aUpperLeft.getX() + nPlayButtonWidth + nOffsetX );
- aCtrlSize.setWidth( nSlideShowButtonWidth );
- maPB_SLIDE_SHOW.SetPosSizePixel( aUpperLeft, aCtrlSize );
- aUpperLeft.setX( nOffsetX );
- }
- else
- {
- // place buttons on top of each other
- aCtrlSize = maPB_SLIDE_SHOW.GetSizePixel();
- aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight());
- aCtrlSize.setWidth( nSlideShowButtonWidth );
- maPB_SLIDE_SHOW.SetPosSizePixel( aUpperLeft, aCtrlSize );
-
- aCtrlSize = maPB_PLAY.GetSizePixel();
- aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight() - nOffsetY );
- aCtrlSize.setWidth( nPlayButtonWidth );
- maPB_PLAY.SetPosSizePixel( aUpperLeft, aCtrlSize );
- }
-
- // "Apply to All Slides" button
- aCtrlSize = maPB_APPLY_TO_ALL.GetSizePixel();
- aCtrlSize.setWidth( maPB_APPLY_TO_ALL.CalcMinimumSize( nMaxWidth ).getWidth() + 2 * nOffsetBtnX );
- aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight() - nOffsetY );
- maPB_APPLY_TO_ALL.SetPosSizePixel( aUpperLeft, aCtrlSize );
-
- // fixed line above "Apply to All Slides" button
- aCtrlSize = maFL_EMPTY1.GetSizePixel();
- aCtrlSize.setWidth( nMaxWidth );
- aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight());
- maFL_EMPTY1.SetPosSizePixel( aUpperLeft, aCtrlSize );
-
- // fixed line "Apply to selected slides"
- aCtrlSize = maFL_APPLY_SCHEME.GetSizePixel();
- aCtrlSize.setWidth( nMaxWidth );
- ::Point aUpperLeftCorner( nOffsetX, nOffsetY );
- maFL_APPLY_SCHEME.SetPosSizePixel( aUpperLeftCorner, aCtrlSize );
- aUpperLeftCorner.setY( aUpperLeftCorner.getY() + aCtrlSize.getHeight() + nOffsetY );
- aUpperLeft.setY( aUpperLeft.getY() - nOffsetY );
-
- // list box animation scheme
- aCtrlSize.setWidth( nMaxWidth );
- aCtrlSize.setHeight( aUpperLeft.getY() - aUpperLeftCorner.getY() );
- maLB_ANIMATION_SCHEMES.SetPosSizePixel( aUpperLeftCorner, aCtrlSize );
-}
-
-void AnimationSchemesPane::updateControls()
-{
- SharedPageSelection aSelectedPages( lcl_getSelectedPages( mrBase ));
- if( aSelectedPages->empty())
- {
- mbHasSelection = false;
- return;
- }
- mbHasSelection = true;
-
- DBG_ASSERT( ! mbUpdatingControls, "Multiple Control Updates" );
- mbUpdatingControls = true;
-
- // get model data for first page
-#ifdef DBG_UTIL
- SdPage * pFirstPage = aSelectedPages->front();
- DBG_ASSERT( pFirstPage, "Invalid Page" );
-#endif
-
-// // merge with other pages
-// ::std::vector< SdPage * >::const_iterator aIt( aSelectedPages.begin());
-// const ::std::vector< SdPage * >::const_iterator aEndIt( aSelectedPages.end());
-
-// // start with second page (note aIt != aEndIt, because ! aSelectedPages.empty())
-// for( ++aIt ;aIt != aEndIt; ++aIt )
-// {
-// if( *aIt )
-// // merge
-// }
-
- mbUpdatingControls = false;
-
- updateControlState();
-}
-
-void AnimationSchemesPane::updateControlState()
-{
- maLB_ANIMATION_SCHEMES.Enable( mbHasSelection );
-
- maPB_APPLY_TO_ALL.Enable( mbHasSelection );
- maPB_PLAY.Enable( mbHasSelection );
-// maPB_SLIDE_SHOW.Enable( TRUE );
- maCB_AUTO_PREVIEW.Enable( mbHasSelection );
-}
-
-void AnimationSchemesPane::getAnimationSchemeFromControls() const
-{
- // TODO: Implement
-}
-
-void AnimationSchemesPane::applyToSelectedPages()
-{
- if( ! mbUpdatingControls )
- {
- SharedPageSelection aSelectedPages( lcl_getSelectedPages( mrBase ));
- if( ! aSelectedPages->empty())
- {
-// lcl_ApplyToPages( aSelectedPages, getAnimationSchemeFromControls() );
- }
- if( maCB_AUTO_PREVIEW.IsEnabled() &&
- maCB_AUTO_PREVIEW.IsChecked())
- {
- playCurrentScheme();
- }
- }
-}
-
-void AnimationSchemesPane::playCurrentScheme()
-{
- // TODO: Implement a preview in the center view
-}
-
-void AnimationSchemesPane::addListener()
-{
- Link aLink( LINK(this,AnimationSchemesPane,EventMultiplexerListener) );
- mrBase.GetEventMultiplexer()->AddEventListener(
- aLink,
- tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION
- | tools::EventMultiplexerEvent::EID_CURRENT_PAGE
- | tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED
- | tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED
- | tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED);
-}
-
-void AnimationSchemesPane::removeListener()
-{
- Link aLink( LINK(this,AnimationSchemesPane,EventMultiplexerListener) );
- mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
-}
-
-IMPL_LINK(AnimationSchemesPane,EventMultiplexerListener,
- tools::EventMultiplexerEvent*,pEvent)
-{
- switch (pEvent->meEventId)
- {
- case tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION:
- onSelectionChanged();
- break;
-
- case tools::EventMultiplexerEvent::EID_CURRENT_PAGE:
- onChangeCurrentPage();
- break;
-
- case tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED:
- mxView = Reference<drawing::XDrawView>();
- onSelectionChanged();
- onChangeCurrentPage();
- break;
-
- case tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED:
- mbIsMainViewChangePending = true;
- break;
-
- case tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED:
- if (mbIsMainViewChangePending)
- {
- mbIsMainViewChangePending = false;
- mxView = Reference<drawing::XDrawView>::query( mxModel->getCurrentController() );
- onSelectionChanged();
- onChangeCurrentPage();
- }
- break;
- }
- return 0;
-}
-
-IMPL_LINK( AnimationSchemesPane, ApplyToAllButtonClicked, void *, EMPTYARG )
-{
- DBG_ASSERT( mpDrawDoc, "Invalid Draw Document!" );
- if( !mpDrawDoc )
- return 0;
-
- ::std::vector< SdPage * > aPages;
-
- sal_uInt16 nPageCount = mpDrawDoc->GetSdPageCount( PK_STANDARD );
- aPages.reserve( nPageCount );
- for( sal_uInt16 i=0; i<nPageCount; ++i )
- {
- SdPage * pPage = mpDrawDoc->GetSdPage( i, PK_STANDARD );
- if( pPage )
- aPages.push_back( pPage );
- }
-
-// if( ! aPages.empty())
-// lcl_ApplyToPages( aPages, getAnimationSchemeFromControls() );
-
- return 0;
-}
-
-
-IMPL_LINK( AnimationSchemesPane, PlayButtonClicked, void *, EMPTYARG )
-{
- playCurrentScheme();
- return 0;
-}
-
-IMPL_LINK( AnimationSchemesPane, SlideShowButtonClicked, void *, EMPTYARG )
-{
- mrBase.StartPresentation();
- return 0;
-}
-
-IMPL_LINK( AnimationSchemesPane, SchemeSelected, void *, EMPTYARG )
-{
- applyToSelectedPages();
- return 0;
-}
-
-::Window * createAnimationSchemesPanel( ::Window* pParent, ViewShellBase& rBase )
-{
- ::Window* pWindow = 0;
-
- DrawDocShell* pDocSh = rBase.GetDocShell();
- if( pDocSh )
- pWindow = new AnimationSchemesPane( pParent, rBase, pDocSh->GetDoc() );
-
- return pWindow;
-}
-
-
-} // namespace sd
diff --git a/sd/source/ui/animations/AnimationSchemesPane.hrc b/sd/source/ui/animations/AnimationSchemesPane.hrc
deleted file mode 100644
index 2b9ec9be3611..000000000000
--- a/sd/source/ui/animations/AnimationSchemesPane.hrc
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************************************
- *
- * 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_ANIMATIONSCHEMESPANE_HRC
-#define _SD_ANIMATIONSCHEMESPANE_HRC
-
-#define FL_APPLY_SCHEME 1
-// spec: 1
-#define LB_ANIMATION_SCHEMES 2
-
-#define FL_EMPTY1 3
-// spec: 2
-#define PB_APPLY_TO_ALL 4
-// spec: 3
-#define PB_PLAY 5
-// spec: 4
-#define PB_SLIDE_SHOW 6
-
-#define FL_EMPTY2 7
-// spec: 5
-#define CB_AUTO_PREVIEW 8
-
-#define STR_NO_SCHEME 9
-
-
-#endif // _SD_ANIMATIONSCHEMESPANE_HRC
diff --git a/sd/source/ui/animations/AnimationSchemesPane.hxx b/sd/source/ui/animations/AnimationSchemesPane.hxx
deleted file mode 100644
index 8528e5e6ef64..000000000000
--- a/sd/source/ui/animations/AnimationSchemesPane.hxx
+++ /dev/null
@@ -1,114 +0,0 @@
-/*************************************************************************
- *
- * 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_ANIMATIONSCHEMESPANE_HXX
-#define SD_ANIMATIONSCHEMESPANE_HXX
-
-#include <vcl/ctrl.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
-#include <vcl/button.hxx>
-#endif
-#include <vcl/field.hxx>
-#include <com/sun/star/drawing/XDrawView.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-
-#include <vector>
-
-class SdDrawDocument;
-class SdPage;
-
-namespace sd { namespace tools {
-class EventMultiplexerEvent;
-} }
-
-namespace sd
-{
-
-class ViewShellBase;
-
-class AnimationSchemesPane : public Control
-{
-public:
- explicit AnimationSchemesPane(
- ::Window * pParent,
- ViewShellBase & rBase,
- SdDrawDocument* pDoc );
- virtual ~AnimationSchemesPane();
-
- virtual void Resize();
-
- void onSelectionChanged();
- void onChangeCurrentPage();
-
-private:
- void updateLayout();
- void updateControls();
- void updateControlState();
-
- void applyToSelectedPages();
- void playCurrentScheme();
-
- void addListener();
- void removeListener();
-
- void getAnimationSchemeFromControls() const;
-
- DECL_LINK( ApplyToAllButtonClicked, void * );
- DECL_LINK( PlayButtonClicked, void * );
- DECL_LINK( SlideShowButtonClicked, void * );
-
- DECL_LINK( SchemeSelected, void * );
- DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*);
-
-private:
- ViewShellBase & mrBase;
- SdDrawDocument * mpDrawDoc;
-
- FixedLine maFL_APPLY_SCHEME;
- ListBox maLB_ANIMATION_SCHEMES;
- FixedLine maFL_EMPTY1;
- PushButton maPB_APPLY_TO_ALL;
- PushButton maPB_PLAY;
- PushButton maPB_SLIDE_SHOW;
- FixedLine maFL_EMPTY2;
- CheckBox maCB_AUTO_PREVIEW;
-
- String maSTR_NO_SCHEME;
-
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView > mxView;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel;
-
- bool mbHasSelection;
- bool mbUpdatingControls;
- bool mbIsMainViewChangePending;
-};
-
-} // namespace sd
-
-// SD_ANIMATIONSCHEMESPANE_HXX
-#endif
diff --git a/sd/source/ui/animations/AnimationSchemesPane.src b/sd/source/ui/animations/AnimationSchemesPane.src
deleted file mode 100644
index 12447c917930..000000000000
--- a/sd/source/ui/animations/AnimationSchemesPane.src
+++ /dev/null
@@ -1,113 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-#include "CustomAnimation.hrc"
-#include "AnimationSchemesPane.hrc"
-#include "helpids.h"
-
-#ifndef _SVT_CONTROLDIMS_HRC_
-#include <svtools/controldims.hrc>
-#endif
-
-// Note: Sizes of 1 usually mean they are auto-calculated
-
-Control DLG_ANIMATION_SCHEMES_PANE
-{
- OutputSize = TRUE;
- Size = MAP_APPFONT( 1, 1 );
-
- Text [ en-US ] = "Animation Schemes";
-
- FixedLine FL_APPLY_SCHEME
- {
- Size = MAP_APPFONT( 1, RSC_CD_FIXEDLINE_HEIGHT );
- Text [ en-US ] = "Apply to selected slides ";
- };
-
- ListBox LB_ANIMATION_SCHEMES
- {
- HelpId = HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES;
- Border = TRUE ;
- TabStop = TRUE ;
-
- Size = MAP_APPFONT( 1, 1 );
- };
-
- FixedLine FL_EMPTY1
- {
- Size = MAP_APPFONT( 1, RSC_CD_FIXEDLINE_HEIGHT );
- };
-
- PushButton PB_APPLY_TO_ALL
- {
- HelpId = HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL;
- Size = MAP_APPFONT( 1, RSC_CD_PUSHBUTTON_HEIGHT );
- TabStop = TRUE ;
-
- Text [ en-US ] = "Apply to All Slides";
- };
-
-
- PushButton PB_PLAY
- {
- HelpId = HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY;
- Size = MAP_APPFONT( 1, RSC_CD_PUSHBUTTON_HEIGHT );
- TabStop = TRUE ;
-
- Text [ en-US ] = "Play";
- };
-
- PushButton PB_SLIDE_SHOW
- {
- HelpId = HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW;
- Size = MAP_APPFONT( 1, RSC_CD_PUSHBUTTON_HEIGHT );
- TabStop = TRUE ;
-
- Text [ en-US ] = "Slide Show";
- };
-
- FixedLine FL_EMPTY2
- {
- Size = MAP_APPFONT( 1, RSC_CD_FIXEDLINE_HEIGHT );
- };
-
- Checkbox CB_AUTO_PREVIEW
- {
- HelpId = HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW;
- Size = MAP_APPFONT( 1, RSC_CD_CHECKBOX_HEIGHT );
- TabStop = TRUE ;
-
- Text [ en-US ] = "Automatic preview";
- };
-
- // --------------------
-
- String STR_NO_SCHEME
- {
- Text [ en-US ] = "No Animation";
- };
-};
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 3ac3d1f24a07..f76b84d29826 100644..100755
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -92,7 +92,6 @@ extern void fillDurationComboBox( ComboBox* pBox );
class CategoryListBox : public ListBox
{
public:
- CategoryListBox( Window* pParent, WinBits nStyle = WB_BORDER );
CategoryListBox( Window* pParent, const ResId& rResId );
~CategoryListBox();
@@ -110,12 +109,6 @@ private:
Link maDoubleClickHdl;
};
-CategoryListBox::CategoryListBox( Window* pParent, WinBits nStyle /* = WB_BORDER */ )
-: ListBox( pParent, nStyle )
-{
- EnableUserDraw( TRUE );
-}
-
CategoryListBox::CategoryListBox( Window* pParent, const ResId& rResId )
: ListBox( pParent, rResId )
{
diff --git a/sd/source/ui/animations/CustomAnimationSchemesPane.hrc b/sd/source/ui/animations/CustomAnimationSchemesPane.hrc
deleted file mode 100644
index 70168d2662cf..000000000000
--- a/sd/source/ui/animations/CustomAnimationSchemesPane.hrc
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************
- *
- * 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_CUSTOMANIMATIONSCHEMESPANE_HRC
-#define _SD_CUSTOMANIMATIONSCHEMESPANE_HRC
-
-
-#endif // _SD_CUSTOMANIMATIONSCHEMESPANE_HRC \ No newline at end of file
diff --git a/sd/source/ui/animations/CustomAnimationSchemesPane.src b/sd/source/ui/animations/CustomAnimationSchemesPane.src
deleted file mode 100644
index 1499b79bbb4b..000000000000
--- a/sd/source/ui/animations/CustomAnimationSchemesPane.src
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-#include "CustomAnimation.hrc"
-
-ModalDialog DLG_CUSTOMANIMATION_SCHEMES_PANE
-{
- DialogControl = TRUE;
-
- Text [ en-US ] = "Animation Schemes";
-
- Fixedline 1
- {
- Text [ en-US ] = "Apply to selected slides";
- };
-
- PushButton 1
- {
- Text [ en-US ] = "Apply to All Slides";
- };
-
- PushButton 2
- {
- Text [ en-US ] = "Play";
- };
-
- PushButton 3
- {
- Text [ en-US ] = "Slide Show";
- };
-
- Checkbox 4
- {
- Text [ en-US ] = "Automatic preview";
- };
-
- String 2
- {
- Text [ en-US ] = "No Animation";
- };
-
- String 3
- {
- Text [ en-US ] = "Recently used Schemes";
- };
-};
-
diff --git a/sd/source/ui/animations/makefile.mk b/sd/source/ui/animations/makefile.mk
index 2194dad6eafc..db010bf4ef23 100644..100755
--- a/sd/source/ui/animations/makefile.mk
+++ b/sd/source/ui/animations/makefile.mk
@@ -42,16 +42,13 @@ ENABLE_EXCEPTIONS=TRUE
SRS1NAME=$(TARGET)
SRC1FILES =\
- AnimationSchemesPane.src\
CustomAnimationPane.src\
CustomAnimationDialog.src\
CustomAnimationCreateDialog.src\
SlideTransitionPane.src\
- CustomAnimationSchemesPane.src\
CustomAnimation.src
SLOFILES = \
- $(SLO)$/AnimationSchemesPane.obj \
$(SLO)$/CustomAnimationCreateDialog.obj\
$(SLO)$/CustomAnimationDialog.obj\
$(SLO)$/CustomAnimationPane.obj \
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index aa42fec50f9c..1e64617edab8 100644..100755
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -971,7 +971,7 @@ IMPL_LINK(AnnotationManagerImpl,EventMultiplexerListener,
}
return 0;
}
-
+#if 0
OUString AnnotationManagerImpl::GetHelpText( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation )
{
OUString sRet;
@@ -994,7 +994,7 @@ OUString AnnotationManagerImpl::GetHelpText( ::com::sun::star::uno::Reference< :
return sRet;
}
-
+#endif
void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation > xAnnotation, ::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu /* = false */ )
{
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx
index 43b53d8467f9..70b95c2a509b 100755
--- a/sd/source/ui/annotations/annotationmanagerimpl.hxx
+++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx
@@ -99,9 +99,9 @@ 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 --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index ad6709c776ce..a4642bb68096 100644..100755
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -136,14 +136,25 @@ AnnotationTextWindow::~AnnotationTextWindow()
void AnnotationTextWindow::Paint( const Rectangle& rRect)
{
- if ( !Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
+ const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
+ if ( !bHighContrast )
{
DrawGradient(Rectangle(Point(0,0),PixelToLogic(GetSizePixel())),
Gradient(GRADIENT_LINEAR,mpAnnotationWindow->maColorLight,mpAnnotationWindow->maColor));
}
if( mpOutlinerView )
+ {
+ Color aBackgroundColor( mpAnnotationWindow->maColor );
+ if( bHighContrast )
+ {
+ aBackgroundColor = GetSettings().GetStyleSettings().GetWindowColor();
+ }
+
+ mpOutlinerView->SetBackgroundColor( aBackgroundColor );
+
mpOutlinerView->Paint( rRect );
+ }
}
void AnnotationTextWindow::KeyInput( const KeyEvent& rKeyEvt )
@@ -493,12 +504,6 @@ void AnnotationWindow::ResizeIfNeccessary(long aOldHeight, long aNewHeight)
}
}
-void AnnotationWindow::SetReadonly(bool bSet)
-{
- mbReadonly = bSet;
- getView()->SetReadOnly(bSet);
-}
-
void AnnotationWindow::SetLanguage(const SvxLanguageItem aNewItem)
{
Engine()->SetModifyHdl( Link() );
@@ -615,16 +620,34 @@ void AnnotationWindow::SetColor()
{
sal_uInt16 nAuthorIdx = mpDoc->GetAnnotationAuthorIndex( mxAnnotation->getAuthor() );
- maColor = mrManager.GetColor( nAuthorIdx );
- maColorDark = mrManager.GetColorDark( nAuthorIdx );
- maColorLight = mrManager.GetColorLight( nAuthorIdx );
+ const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
+ if( bHighContrast )
+ {
+ StyleSettings aStyleSettings = GetSettings().GetStyleSettings();
+
+ maColor = aStyleSettings.GetWindowColor();
+ maColorDark = maColor;
+ maColorLight = aStyleSettings.GetWindowTextColor();
+ }
+ else
+ {
+ maColor = mrManager.GetColor( nAuthorIdx );
+ maColorDark = mrManager.GetColorDark( nAuthorIdx );
+ maColorLight = mrManager.GetColorLight( nAuthorIdx );
+ }
mpOutlinerView->SetBackgroundColor(maColor);
+ Engine()->SetBackgroundColor(maColor);
+
+ {
+ SvtAccessibilityOptions aOptions;
+ Engine()->ForceAutoColor( bHighContrast || aOptions.GetIsAutomaticFontColor() );
+ }
mpMeta->SetControlBackground(maColor);
AllSettings aSettings = mpMeta->GetSettings();
StyleSettings aStyleSettings = aSettings.GetStyleSettings();
- aStyleSettings.SetFieldTextColor(maColorDark);
+ aStyleSettings.SetFieldTextColor( bHighContrast ? maColorLight : maColorDark);
aSettings.SetStyleSettings(aStyleSettings);
mpMeta->SetSettings(aSettings);
@@ -641,59 +664,35 @@ void AnnotationWindow::SetColor()
void AnnotationWindow::Deactivate()
{
Reference< XAnnotation > xAnnotation( mxAnnotation );
-/*
- // check if text is empty
- Paragraph* p1stPara=Engine()->GetParagraph( 0 );
- ULONG nParaAnz=Engine()->GetParagraphCount();
- if(p1stPara==NULL)
- nParaAnz=0;
- if(nParaAnz==1)
+ // write changed text back to annotation
+ if ( Engine()->IsModified() )
{
- // if it is only one paragraph, check if that paragraph is empty
- XubString aStr(Engine()->GetText(p1stPara));
-
- if(!aStr.Len())
- nParaAnz = 0;
- }
+ TextApiObject* pTextApi = getTextApiObject( xAnnotation );
- if( nParaAnz == 0 )
- {
- // text is empty, delete postit
- DeleteAnnotation( xAnnotation );
- }
- else
-*/
- {
- // write changed text back to annotation
- if ( Engine()->IsModified() )
+ if( pTextApi )
{
- TextApiObject* pTextApi = getTextApiObject( xAnnotation );
-
- if( pTextApi )
+ OutlinerParaObject* pOPO = Engine()->CreateParaObject();
+ if( pOPO )
{
- OutlinerParaObject* pOPO = Engine()->CreateParaObject();
- if( pOPO )
- {
- if( mpDoc->IsUndoEnabled() )
- mpDoc->BegUndo( String( SdResId( STR_ANNOTATION_UNDO_EDIT ) ) );
+ if( mpDoc->IsUndoEnabled() )
+ mpDoc->BegUndo( String( SdResId( STR_ANNOTATION_UNDO_EDIT ) ) );
- pTextApi->SetText( *pOPO );
- delete pOPO;
+ pTextApi->SetText( *pOPO );
+ delete pOPO;
- // set current time to changed annotation
- xAnnotation->setDateTime( getCurrentDateTime() );
+ // set current time to changed annotation
+ xAnnotation->setDateTime( getCurrentDateTime() );
- if( mpDoc->IsUndoEnabled() )
- mpDoc->EndUndo();
-
- DocView()->GetDocSh()->SetModified(sal_True);
- }
+ if( mpDoc->IsUndoEnabled() )
+ mpDoc->EndUndo();
+ DocView()->GetDocSh()->SetModified(sal_True);
}
+
}
- Engine()->ClearModifyFlag();
}
+ Engine()->ClearModifyFlag();
Engine()->GetUndoManager().Clear();
}
@@ -704,15 +703,16 @@ void AnnotationWindow::Paint( const Rectangle& rRect)
if(mpMeta->IsVisible() && !mbReadonly)
{
+ const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
//draw left over space
- if ( Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
+ if ( bHighContrast )
SetFillColor(COL_BLACK);
else
SetFillColor(maColor);
SetLineColor();
DrawRect(PixelToLogic(Rectangle(Point(mpMeta->GetPosPixel().X()+mpMeta->GetSizePixel().Width(),mpMeta->GetPosPixel().Y()),Size(METABUTTON_AREA_WIDTH,mpMeta->GetSizePixel().Height()))));
- if ( Application::GetSettings().GetStyleSettings().GetHighContrastMode())
+ if ( bHighContrast )
{
//draw rect around button
SetFillColor(COL_BLACK);
@@ -734,7 +734,7 @@ void AnnotationWindow::Paint( const Rectangle& rRect)
DrawRect(maRectMetaButton);
//draw arrow
- if ( Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
+ if( bHighContrast )
SetFillColor(COL_WHITE);
else
SetFillColor(COL_BLACK);
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index ba82d4e862d3..264cb2fa1afe 100644..100755
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -144,7 +144,6 @@ class AnnotationWindow : public FloatingWindow
void Rescale();
- void SetReadonly(bool bSet);
bool IsReadOnly() { return mbReadonly;}
bool IsProtected() { return mbProtected; }
diff --git a/sd/source/ui/app/makefile.mk b/sd/source/ui/app/makefile.mk
index d64d9b672f7e..b0ac26018877 100755
--- a/sd/source/ui/app/makefile.mk
+++ b/sd/source/ui/app/makefile.mk
@@ -73,8 +73,11 @@ SLOFILES = \
$(SLO)$/tmplctrl.obj
EXCEPTIONSFILES= \
+ $(SLO)$/sddll1.obj \
+ $(SLO)$/sddll2.obj \
$(SLO)$/sdxfer.obj \
$(SLO)$/sdmod1.obj \
+ $(SLO)$/tbxww.obj \
$(SLO)$/tmplctrl.obj
.IF "$(GUI)" == "WNT"
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index e3181f792d04..4355da3011c9 100755
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -222,22 +222,6 @@ SdOptionsLayout::SdOptionsLayout( USHORT nConfigId, BOOL bUseConfig ) :
// -----------------------------------------------------------------------------
-void SdOptionsLayout::SetDefaults()
-{
- SetRulerVisible( TRUE );
- SetHelplines( TRUE );
- SetHandlesBezier( FALSE );
- SetMoveOutline( TRUE );
- SetDragStripes( FALSE );
- if ( isMetricSystem() )
- SetMetric( FUNIT_CM ); // default for countries with metric system
- else
- SetMetric( FUNIT_INCH ); // default for others
- SetDefTab( 1250 );
-}
-
-// -----------------------------------------------------------------------------
-
BOOL SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const
{
return( IsRulerVisible() == rOpt.IsRulerVisible() &&
@@ -406,12 +390,6 @@ SdOptionsContents::SdOptionsContents( USHORT nConfigId, BOOL bUseConfig ) :
// -----------------------------------------------------------------------------
-void SdOptionsContents::SetDefaults()
-{
-}
-
-// -----------------------------------------------------------------------------
-
BOOL SdOptionsContents::operator==(const SdOptionsContents&) const
{
return true;
@@ -459,14 +437,6 @@ BOOL SdOptionsContents::WriteData( Any* pValues ) const
|*
\************************************************************************/
-SdOptionsContentsItem::SdOptionsContentsItem( USHORT _nWhich )
-: SfxPoolItem ( _nWhich )
-, maOptionsContents ( 0, FALSE )
-{
-}
-
-// ----------------------------------------------------------------------
-
SdOptionsContentsItem::SdOptionsContentsItem(USHORT _nWhich, SdOptions*, ::sd::FrameView*)
: SfxPoolItem ( _nWhich )
, maOptionsContents ( 0, FALSE )
@@ -542,40 +512,6 @@ SdOptionsMisc::SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ) :
// -----------------------------------------------------------------------------
-void SdOptionsMisc::SetDefaults()
-{
- SetStartWithTemplate( TRUE );
- SetMarkedHitMovesAlways( TRUE );
- SetMoveOnlyDragging( FALSE );
- SetCrookNoContortion( FALSE );
- SetQuickEdit( GetConfigId() != SDCFG_DRAW );
- SetMasterPagePaintCaching( TRUE );
- SetDragWithCopy( FALSE );
- SetPickThrough( TRUE );
- SetBigHandles( FALSE );
- SetDoubleClickTextEdit( TRUE );
- SetClickChangeRotation( FALSE );
- SetStartWithActualPage( FALSE );
- SetSummationOfParagraphs( FALSE );
- SetSolidDragging( TRUE );
- SetSolidMarkHdl( TRUE );
- // #90356#
- SetShowUndoDeleteWarning( TRUE );
- // The default for 6.1-and-above documents is to use printer-independent
- // formatting.
- SetPrinterIndependentLayout (1);
- // #97016#
- SetDefaultObjectSizeWidth(8000);
- SetDefaultObjectSizeHeight(5000);
- SetPreviewNewEffects(true);
- SetPreviewChangedEffects(false);
- SetPreviewTransitions(true);
- SetDisplay(0);
- SetShowComments(true);
-}
-
-// -----------------------------------------------------------------------------
-
BOOL SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const
{
return( IsStartWithTemplate() == rOpt.IsStartWithTemplate() &&
@@ -909,22 +845,6 @@ SdOptionsSnap::SdOptionsSnap( USHORT nConfigId, BOOL bUseConfig ) :
// -----------------------------------------------------------------------------
-void SdOptionsSnap::SetDefaults()
-{
- SetSnapHelplines( TRUE );
- SetSnapBorder( TRUE );
- SetSnapFrame( FALSE );
- SetSnapPoints( FALSE );
- SetOrtho( FALSE );
- SetBigOrtho( TRUE );
- SetRotate( FALSE );
- SetSnapArea( 5 );
- SetAngle( 1500 );
- SetEliminatePolyPointLimitAngle( 1500 );
-}
-
-// -----------------------------------------------------------------------------
-
BOOL SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const
{
return( IsSnapHelplines() == rOpt.IsSnapHelplines() &&
@@ -1098,13 +1018,6 @@ SdOptionsZoom::SdOptionsZoom( USHORT nConfigId, BOOL bUseConfig ) :
// -----------------------------------------------------------------------------
-void SdOptionsZoom::SetDefaults()
-{
- SetScale( 1, 1 );
-}
-
-// -----------------------------------------------------------------------------
-
BOOL SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const
{
INT32 nX1, nX2, nY1, nY2;
@@ -1160,63 +1073,6 @@ BOOL SdOptionsZoom::WriteData( Any* pValues ) const
/*************************************************************************
|*
-|* SdOptionsZoomItem
-|*
-\************************************************************************/
-
-SdOptionsZoomItem::SdOptionsZoomItem( USHORT _nWhich )
-: SfxPoolItem ( _nWhich )
-, maOptionsZoom ( 0, FALSE )
-{
-}
-
-// ----------------------------------------------------------------------
-
-SdOptionsZoomItem::SdOptionsZoomItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* )
-: SfxPoolItem ( _nWhich )
-, maOptionsZoom ( 0, FALSE )
-{
- if( pOpts )
- {
- INT32 nX, nY;
-
- pOpts->GetScale( nX, nY );
- maOptionsZoom.SetScale( nX, nY );
- }
-}
-
-// ----------------------------------------------------------------------
-
-SfxPoolItem* SdOptionsZoomItem::Clone( SfxItemPool* ) const
-{
- return new SdOptionsZoomItem( *this );
-}
-
-
-// ----------------------------------------------------------------------
-
-int SdOptionsZoomItem::operator==( const SfxPoolItem& rAttr ) const
-{
- const bool bSameType = SfxPoolItem::operator==(rAttr);
- DBG_ASSERT( bSameType, "SdOptionsZoomItem::operator==(), differen pool item type!" );
- return bSameType && ( maOptionsZoom == static_cast< const SdOptionsZoomItem& >(rAttr).maOptionsZoom );
-}
-
-// -----------------------------------------------------------------------
-
-void SdOptionsZoomItem::SetOptions( SdOptions* pOpts ) const
-{
- if( pOpts )
- {
- INT32 nX, nY;
-
- maOptionsZoom.GetScale( nX, nY );
- pOpts->SetScale( nX, nY );
- }
-}
-
-/*************************************************************************
-|*
|* SdOptionsGrid
|*
\************************************************************************/
@@ -1366,13 +1222,6 @@ BOOL SdOptionsGrid::WriteData( Any* pValues ) const
|*
\************************************************************************/
-SdOptionsGridItem::SdOptionsGridItem( USHORT _nWhich ) :
- SvxGridItem( _nWhich )
-{
-}
-
-// -----------------------------------------------------------------------------
-
SdOptionsGridItem::SdOptionsGridItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) :
SvxGridItem( _nWhich )
{
@@ -1458,33 +1307,6 @@ SdOptionsPrint::SdOptionsPrint( USHORT nConfigId, BOOL bUseConfig ) :
// -----------------------------------------------------------------------------
-void SdOptionsPrint::SetDefaults()
-{
- SetDraw( TRUE );
- SetNotes( FALSE );
- SetHandout( FALSE );
- SetOutline( FALSE );
- SetDate( FALSE );
- SetTime( FALSE );
- SetPagename( FALSE );
- SetHiddenPages( TRUE );
- SetPagesize( FALSE );
- SetPagetile( FALSE );
- SetWarningPrinter( TRUE );
- SetWarningSize( FALSE );
- SetWarningOrientation( FALSE );
- SetBooklet( FALSE );
- SetFrontPage( TRUE );
- SetBackPage( TRUE );
- SetCutPage( FALSE );
- SetPaperbin( FALSE );
- SetOutputQuality( 0 );
- SetHandoutHorizontal( TRUE );
- SetHandoutPages( 6 );
-}
-
-// -----------------------------------------------------------------------------
-
BOOL SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const
{
return( IsDraw() == rOpt.IsDraw() &&
@@ -1630,31 +1452,6 @@ BOOL SdOptionsPrint::WriteData( Any* pValues ) const
return TRUE;
}
-void SdOptionsPrint::SetPrinterOptions( const SdOptionsPrint* pOptions )
-{
- bDraw = pOptions->bDraw;
- bNotes = pOptions->bNotes;
- bHandout = pOptions->bHandout;
- bOutline = pOptions->bOutline;
- bDate = pOptions->bDate;
- bTime = pOptions->bTime;
- bPagename = pOptions->bPagename;
- bHiddenPages = pOptions->bHiddenPages;
- bPagesize = pOptions->bPagesize;
- bPagetile = pOptions->bPagetile;
- bWarningPrinter = pOptions->bWarningPrinter;
- bWarningSize = pOptions->bWarningSize;
- bWarningOrientation = pOptions->bWarningOrientation;
- bBooklet = pOptions->bBooklet;
- bFront = pOptions->bFront;
- bBack = pOptions->bBack;
- bCutPage = pOptions->bCutPage;
- bPaperbin = pOptions->bPaperbin;
- nQuality = pOptions->nQuality;
- mnHandoutPages = pOptions->mnHandoutPages;
- mbHandoutHorizontal = pOptions->mbHandoutHorizontal;
-}
-
/*************************************************************************
|*
|* SdOptionsPrintItem
@@ -1766,32 +1563,6 @@ SdOptions::~SdOptions()
// ----------------------------------------------------------------------
-void SdOptions::SetRangeDefaults( ULONG nOptionsRange )
-{
- if( nOptionsRange & SD_OPTIONS_LAYOUT )
- SdOptionsLayout::SetDefaults();
-
- if( nOptionsRange & SD_OPTIONS_CONTENTS )
- SdOptionsContents::SetDefaults();
-
- if( nOptionsRange & SD_OPTIONS_MISC )
- SdOptionsMisc::SetDefaults();
-
- if( nOptionsRange & SD_OPTIONS_SNAP )
- SdOptionsSnap::SetDefaults();
-
- if( nOptionsRange & SD_OPTIONS_ZOOM )
- SdOptionsZoom::SetDefaults();
-
- if( nOptionsRange & SD_OPTIONS_GRID )
- SdOptionsGrid::SetDefaults();
-
- if( nOptionsRange & SD_OPTIONS_PRINT )
- SdOptionsPrint::SetDefaults();
-}
-
-// ----------------------------------------------------------------------
-
void SdOptions::StoreConfig( ULONG nOptionsRange )
{
if( nOptionsRange & SD_OPTIONS_LAYOUT )
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index fb180509cff9..ccbc7c8f5665 100644..100755
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -336,20 +336,3 @@ OutputDevice* SdModule::GetRefDevice (::sd::DrawDocShell& )
{
return GetVirtualRefDevice();
}
-
-
-/*************************************************************************
-|*
-\************************************************************************/
-
-::com::sun::star::text::WritingMode SdModule::GetDefaultWritingMode() const
-{
-/*
- const SvtLanguageOptions aLanguageOptions;
-
- return( aLanguageOptions.IsCTLFontEnabled() ?
- ::com::sun::star::text::WritingMode_RL_TB :
- ::com::sun::star::text::WritingMode_LR_TB );
-*/
- return ::com::sun::star::text::WritingMode_LR_TB;
-}
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 9aa36ddd3f82..58aba6823d3a 100644..100755
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -171,9 +171,10 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo)
::sd::DrawDocShell* pDocShell = NULL;
SdDrawDocument* pDoc = 0;
- if( pInfo->GetOutliner() )
+ SdrOutliner* pSdrOutliner = dynamic_cast< SdrOutliner* >( pInfo->GetOutliner() );
+ if( pSdrOutliner )
{
- const SdrTextObj* pTextObj = static_cast< SdrOutliner* >( pInfo->GetOutliner() )->GetTextObj();
+ const SdrTextObj* pTextObj = pSdrOutliner->GetTextObj();
if( pTextObj )
pDoc = dynamic_cast< SdDrawDocument* >( pTextObj->GetModel() );
diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx
index 7420319ab491..975d277c7dff 100644..100755
--- a/sd/source/ui/dlg/LayerDialogContent.cxx
+++ b/sd/source/ui/dlg/LayerDialogContent.cxx
@@ -86,14 +86,6 @@ LayerDialogContent::~LayerDialogContent (void)
-LayerTabBar& LayerDialogContent::GetLayerTabBar (void)
-{
- return maLayerTabBar;
-}
-
-
-
-
BOOL LayerDialogContent::Close (void)
{
return SfxDockingWindow::Close();
diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
index 95d4277f8f42..7aee12f23bbd 100644..100755
--- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx
+++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
@@ -96,14 +96,14 @@ void SpellDialogChildWindow::InvalidateSpellDialog (void)
-::svx::SpellPortions SpellDialogChildWindow::GetNextWrongSentence (void)
+::svx::SpellPortions SpellDialogChildWindow::GetNextWrongSentence( bool /*bRecheck*/ )
{
::svx::SpellPortions aResult;
if (mpSdOutliner != NULL)
{
ProvideOutliner();
- aResult = mpSdOutliner->GetNextSpellSentence ();
+ aResult = mpSdOutliner->GetNextSpellSentence();
}
// Close the spell check dialog when there are no more sentences to
@@ -125,7 +125,7 @@ void SpellDialogChildWindow::InvalidateSpellDialog (void)
void SpellDialogChildWindow::ApplyChangedSentence (
- const ::svx::SpellPortions& rChanged)
+ const ::svx::SpellPortions& rChanged, bool bRecheck )
{
if (mpSdOutliner != NULL)
{
@@ -133,7 +133,7 @@ void SpellDialogChildWindow::ApplyChangedSentence (
if (pOutlinerView != NULL)
mpSdOutliner->ApplyChangedSentence (
pOutlinerView->GetEditView(),
- rChanged, false);
+ rChanged, bRecheck);
}
}
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 2ac4801aba0c..e179a0ba9f86 100644..100755
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -691,19 +691,6 @@ void AnimationWindow::ResetAttrs()
// -----------------------------------------------------------------------
-void AnimationWindow::WaitInEffect( ULONG nMilliSeconds ) const
-{
- ULONG nEnd = Time::GetSystemTicks() + nMilliSeconds;
- ULONG nCurrent = Time::GetSystemTicks();
- while (nCurrent < nEnd)
- {
- nCurrent = Time::GetSystemTicks();
- Application::Reschedule();
- }
-}
-
-// -----------------------------------------------------------------------
-
void AnimationWindow::WaitInEffect( ULONG nMilliSeconds, ULONG nTime,
SfxProgress* pProgress ) const
{
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index d398724a3074..1eb3a3d0cedc 100644..100755
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -1928,21 +1928,6 @@ SfxObjectShellLock AssistentDlg::GetDocument()
return mpImpl->GetDocument();
}
-String AssistentDlg::GetTopic() const
-{
- return mpImpl->mpPage4AskTopicEDT->GetText();
-}
-
-String AssistentDlg::GetUserName() const
-{
- return mpImpl->mpPage4AskNameEDT->GetText();
-}
-
-String AssistentDlg::GetInformation() const
-{
- return mpImpl->mpPage4AskInfoEDT->GetText();
-}
-
OutputType AssistentDlg::GetOutputMedium() const
{
if(mpImpl->mpPage2Medium1RB->IsChecked())
diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx
index 40bfae16c2a4..f9dcf5046189 100644..100755
--- a/sd/source/ui/dlg/dlgassim.cxx
+++ b/sd/source/ui/dlg/dlgassim.cxx
@@ -207,287 +207,3 @@ void SdPageListControl::DataChanged( const DataChangedEvent& rDCEvt )
SvTreeListBox::DataChanged( rDCEvt );
}
-// ====================================================================
-// TemplateCache
-// ====================================================================
-
-// Kennung fuer die Config Datei mit den Cache Daten
-static const UINT16 nMagic = (UINT16)0x4127;
-
-TemplateCacheInfo::TemplateCacheInfo()
-{
- m_bImpress = FALSE;
- m_bValid = FALSE;
- m_bModified = TRUE;
-}
-
-TemplateCacheInfo::TemplateCacheInfo( const String& rFile, const DateTime& rDateTime, BOOL bImpress )
-{
- m_aFile = rFile;
- m_aDateTime = rDateTime;
- m_bImpress = bImpress;
- m_bValid = FALSE;
- m_bModified = TRUE;
-}
-
-SvStream& operator >> (SvStream& rIn, TemplateCacheInfo& rInfo)
-{
- rIn.ReadByteString( rInfo.m_aFile, RTL_TEXTENCODING_UTF8 );
- USHORT nDay, nMonth, nYear;
- rIn >> nDay;
- rIn >> nMonth;
- rIn >> nYear;
- rInfo.m_aDateTime.SetDay( nDay );
- rInfo.m_aDateTime.SetMonth( nMonth );
- rInfo.m_aDateTime.SetYear( nYear);
-
- USHORT nHour, nMin, nSec, n100Sec;
-
- rIn >> nHour;
- rIn >> nMin;
- rIn >> nSec;
- rIn >> n100Sec;
-
- rInfo.m_aDateTime.SetHour( nHour );
- rInfo.m_aDateTime.SetMin( nMin );
- rInfo.m_aDateTime.SetSec( nSec );
- rInfo.m_aDateTime.Set100Sec( n100Sec );
-
- rIn >> rInfo.m_bImpress;
-
- rInfo.m_bModified = FALSE;
-
- return rIn;
-}
-
-SvStream& operator << (SvStream& rOut, const TemplateCacheInfo& rInfo)
-{
- USHORT nTemp;
-
- rOut.WriteByteString( rInfo.m_aFile, RTL_TEXTENCODING_UTF8 );
-
- nTemp = rInfo.m_aDateTime.GetDay();
- rOut << nTemp;
-
- nTemp = rInfo.m_aDateTime.GetMonth();
- rOut << nTemp;
-
- nTemp = rInfo.m_aDateTime.GetYear();
- rOut << nTemp;
-
- nTemp = rInfo.m_aDateTime.GetHour();
- rOut << nTemp;
-
- nTemp = rInfo.m_aDateTime.GetMin();
- rOut << nTemp;
-
- nTemp = rInfo.m_aDateTime.GetSec();
- rOut << nTemp;
-
- nTemp = rInfo.m_aDateTime.Get100Sec();
- rOut << nTemp;
-
- rOut << rInfo.m_bImpress;
-
- return rOut;
-}
-
-TemplateCache::TemplateCache()
-{
-}
-
-TemplateCache::~TemplateCache()
-{
- Clear();
-}
-
-void TemplateCache::Clear()
-{
- for( TemplateCacheDirEntry* pDir = m_aDirs.First(); pDir; pDir = m_aDirs.Next() )
- {
- for( TemplateCacheInfo* pEntry = pDir->m_aFiles.First(); pEntry; pEntry = pDir->m_aFiles.Next() )
- delete pEntry;
- delete pDir;
- }
-}
-
-void TemplateCache::Load()
-{
- INetURLObject aURL( SvtPathOptions().GetUserConfigPath() );
- aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM( "template.sod" ) ) );
- SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ | STREAM_NOCREATE, TRUE ); // Download
- SvStream* pStream = aMedium.GetInStream();
-
- if( !pStream )
- return;
-
- UINT16 aCheck;
- *pStream >> aCheck;
-
- if(aCheck != nMagic)
- return;
-
- UINT16 nDirs;
- *pStream >> nDirs;
-
- for( UINT16 nDir = 0; pStream->GetError() == SVSTREAM_OK && nDir < nDirs; nDir++ )
- {
- TemplateCacheDirEntry* pDir = new TemplateCacheDirEntry();
- m_aDirs.Insert(pDir);
-
- pStream->ReadByteString( pDir->m_aPath, RTL_TEXTENCODING_UTF8 );
-
- UINT16 nFiles;
- *pStream >> nFiles;
-
- for( UINT16 nFile = 0; pStream->GetError() == SVSTREAM_OK && nFile < nFiles; nFile++ )
- {
- TemplateCacheInfo* pEntry = new TemplateCacheInfo();
- *pStream >> *pEntry;
- pDir->m_aFiles.Insert(pEntry);
- }
- }
-
- if( pStream->GetError() != SVSTREAM_OK )
- {
- // Ein I/O Problem ist doch kein Beinbruch, dann wird der Cache halt neu erzeugt
- Clear();
- }
-}
-
-void TemplateCache::Save()
-{
- INetURLObject aURL( SvtPathOptions().GetUserConfigPath() );
- aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM( "template.sod" ) ) );
- SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC, FALSE ); // Download
- SvStream* pStream = aMedium.GetInStream();
-
- if( !pStream )
- return;
-
- UINT16 nCheck = nMagic;
- *pStream << nCheck;
-
- const UINT16 nDirs = (UINT16) m_aDirs.Count();
- *pStream << nDirs;
-
- for( TemplateCacheDirEntry* pDir = m_aDirs.First();
- pStream->GetError() == SVSTREAM_OK && pDir;
- pDir = m_aDirs.Next() )
- {
- pStream->WriteByteString( pDir->m_aPath, RTL_TEXTENCODING_UTF8 );
-
- const UINT16 nFiles = (UINT16) pDir->m_aFiles.Count();
- *pStream << nFiles;
-
- for( TemplateCacheInfo* pEntry = pDir->m_aFiles.First();
- pStream->GetError() == SVSTREAM_OK && pEntry;
- pEntry = pDir->m_aFiles.Next() )
- {
- *pStream << *pEntry;
- }
- }
-}
-
-TemplateCacheDirEntry* TemplateCache::GetDirEntry( const String& rPath )
-{
- TemplateCacheDirEntry* pDir = m_aDirs.GetCurObject();
- if( pDir && pDir->m_aPath == rPath )
- return pDir;
-
- for( pDir = m_aDirs.First(); pDir; pDir = m_aDirs.Next() )
- {
- if( pDir->m_aPath == rPath )
- return pDir;
- }
-
- return NULL;
-}
-
-TemplateCacheInfo* TemplateCache::GetFileInfo( const String& rPath )
-{
- INetURLObject aUrl( rPath );
- String aPath( aUrl.GetPath() );
- String aName( aUrl.GetName( INetURLObject::DECODE_UNAMBIGUOUS ) );
-
- DBG_ASSERT( aUrl.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
-
- TemplateCacheDirEntry* pDir = GetDirEntry( aPath );
-
- if( NULL != pDir )
- {
- for( TemplateCacheInfo* pEntry = pDir->m_aFiles.First(); pEntry; pEntry = pDir->m_aFiles.Next() )
- {
- if( pEntry->GetFile() == aName )
- return pEntry;
- }
- }
-
- return NULL;
-}
-
-TemplateCacheInfo* TemplateCache::AddFileInfo( const String& rPath )
-{
- INetURLObject aUrl( rPath );
- String aPath( aUrl.GetPath() );
- String aName( aUrl.GetName( INetURLObject::DECODE_UNAMBIGUOUS ) );
-
- DBG_ASSERT( aUrl.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
-
- TemplateCacheDirEntry* pDir = GetDirEntry( aPath );
- TemplateCacheInfo* pEntry = NULL;
-
- if( pDir == NULL )
- {
- pDir = new TemplateCacheDirEntry();
- pDir->m_aPath = aPath;
- m_aDirs.Insert(pDir);
- }
-
- if( NULL != pDir )
- {
- for( pEntry = pDir->m_aFiles.First(); pEntry; pEntry = pDir->m_aFiles.Next() )
- {
- if( pEntry->GetFile() == aName)
- return pEntry;
- }
-
- pEntry = new TemplateCacheInfo();
- pEntry->SetFile( aName );
- pDir->m_aFiles.Insert(pEntry);
- }
-
- return pEntry;
-}
-
-BOOL TemplateCache::ClearInvalidEntrys()
-{
- BOOL bModified = FALSE;
-
- for( TemplateCacheDirEntry* pDir = m_aDirs.First(); pDir; pDir = m_aDirs.Next() )
- {
- for( TemplateCacheInfo* pEntry = pDir->m_aFiles.First(); pEntry; pEntry = pDir->m_aFiles.Next() )
- {
- if(!pEntry->IsValid())
- {
- pDir->m_aFiles.Remove(pEntry);
- delete pEntry;
- bModified = TRUE;
- }
- else if( pEntry->IsModified() )
- {
- bModified = TRUE;
- }
- }
-
- if( pDir->m_aFiles.Count() == 0 )
- {
- m_aDirs.Remove(pDir);
- delete pDir;
- }
- }
-
- return bModified;
-}
-
-
diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx
index dc3e7f636e8d..35bbd41de448 100644..100755
--- a/sd/source/ui/dlg/dlgassim.hxx
+++ b/sd/source/ui/dlg/dlgassim.hxx
@@ -56,37 +56,7 @@ public:
};
-class TemplateCacheInfo
-{
-private:
- DateTime m_aDateTime;
- String m_aFile;
- BOOL m_bImpress;
- BOOL m_bValid;
- BOOL m_bModified;
-
-public:
- TemplateCacheInfo();
- TemplateCacheInfo( const String& rFile, const DateTime& rDateTime, BOOL bImpress );
-
- BOOL IsValid() const { return m_bValid; }
- void SetValid( BOOL bValid = TRUE ) { m_bValid = bValid; }
-
- BOOL IsImpress() const { return m_bImpress; }
- void SetImpress( BOOL bImpress = TRUE ) { m_bImpress = bImpress; }
-
- const String& GetFile() const { return m_aFile; }
- void SetFile( const String& rFile ) { m_aFile = rFile; }
-
- const DateTime& GetDateTime() const { return m_aDateTime; }
- void SetDateTime( const DateTime& rDateTime ) { m_aDateTime = rDateTime; }
-
- BOOL IsModified() const { return m_bModified; }
- void SetModified( BOOL bModified = TRUE ) { m_bModified = bModified; }
-
- friend SvStream& operator >> (SvStream& rIn, TemplateCacheInfo& rInfo);
- friend SvStream& operator << (SvStream& rOut, const TemplateCacheInfo& rInfo);
-};
+class TemplateCacheInfo;
DECLARE_LIST( TemplateCacheInfoList, TemplateCacheInfo * )
@@ -98,22 +68,3 @@ public:
};
DECLARE_LIST( TemplateCacheDirEntryList, TemplateCacheDirEntry * )
-
-class TemplateCache
-{
-private:
- TemplateCacheDirEntryList m_aDirs;
- TemplateCacheDirEntry* GetDirEntry( const String& rPath );
- void Clear();
-public:
- TemplateCache();
- ~TemplateCache();
-
- void Load();
- void Save();
-
- TemplateCacheInfo* GetFileInfo( const String& rPath );
- TemplateCacheInfo* AddFileInfo( const String& rPath );
-
- BOOL ClearInvalidEntrys();
-};
diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx
index 14c1209875ef..1a5a612d37ad 100644..100755
--- a/sd/source/ui/dlg/dlgctrls.cxx
+++ b/sd/source/ui/dlg/dlgctrls.cxx
@@ -51,12 +51,6 @@ FadeEffectLB::FadeEffectLB( Window* pParent, SdResId Id )
{
}
-FadeEffectLB::FadeEffectLB( Window* pParent, WinBits aWB )
-: ListBox( pParent, aWB ),
- mpImpl( new FadeEffectLBImpl )
-{
-}
-
FadeEffectLB::~FadeEffectLB()
{
delete mpImpl;
diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx
index 2b78a649eaef..6cd220d5a5bc 100644..100755
--- a/sd/source/ui/dlg/dlgsnap.cxx
+++ b/sd/source/ui/dlg/dlgsnap.cxx
@@ -96,27 +96,35 @@ SdSnapLineDlg::SdSnapLineDlg(
DBG_ASSERT( pPool, "Wo ist der Pool?" );
SfxMapUnit ePoolUnit = pPool->GetMetric( SID_ATTR_FILL_HATCH );
- // Hier werden die Max- und MinWerte in Ahaengigkeit von der
+ // #i48497# Consider page origin
+ SdrPageView* pPV = pView->GetSdrPageView();
+ Point aLeftTop(aWorkArea.Left()+1, aWorkArea.Top()+1);
+ pPV->LogicToPagePos(aLeftTop);
+ Point aRightBottom(aWorkArea.Right()-2, aWorkArea.Bottom()-2);
+ pPV->LogicToPagePos(aRightBottom);
+
+ // Hier werden die Max- und MinWerte in Abhaengigkeit von der
// WorkArea, PoolUnit und der FieldUnit:
- SetMetricValue( aMtrFldX, aWorkArea.Left(), ePoolUnit );
+ SetMetricValue( aMtrFldX, aLeftTop.X(), ePoolUnit );
+
long nValue = static_cast<long>(aMtrFldX.GetValue());
nValue = Fraction( nValue ) / aUIScale;
aMtrFldX.SetMin( nValue );
aMtrFldX.SetFirst( nValue );
- SetMetricValue( aMtrFldX, aWorkArea.Right()+1, ePoolUnit );
+ SetMetricValue( aMtrFldX, aRightBottom.X(), ePoolUnit );
nValue = static_cast<long>(aMtrFldX.GetValue());
nValue = Fraction( nValue ) / aUIScale;
aMtrFldX.SetMax( nValue );
aMtrFldX.SetLast( nValue );
- SetMetricValue( aMtrFldY, aWorkArea.Top(), ePoolUnit );
+ SetMetricValue( aMtrFldY, aLeftTop.Y(), ePoolUnit );
nValue = static_cast<long>(aMtrFldY.GetValue());
nValue = Fraction( nValue ) / aUIScale;
aMtrFldY.SetMin( nValue );
aMtrFldY.SetFirst( nValue );
- SetMetricValue( aMtrFldY, aWorkArea.Bottom()+1, ePoolUnit );
+ SetMetricValue( aMtrFldY, aRightBottom.Y(), ePoolUnit );
nValue = static_cast<long>(aMtrFldY.GetValue());
nValue = Fraction( nValue ) / aUIScale;
aMtrFldY.SetMax( nValue );
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index 71a7145425b7..a42ce43a2c6d 100644..100755
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -45,7 +45,6 @@
#include "DrawDocShell.hxx"
#include "ViewShell.hxx"
#include "ViewShellBase.hxx"
-#include "showview.hxx"
#include "drawview.hxx"
#include "sdpage.hxx"
#include "sfx2/viewfrm.hxx"
@@ -81,17 +80,6 @@ SdDocPreviewWin::SdDocPreviewWin( Window* pParent, const ResId& rResId )
SetBackground( aEmpty );
}
-SdDocPreviewWin::SdDocPreviewWin( Window* pParent )
-: Control(pParent, 0 ), pMetaFile( 0 ), bInEffect(FALSE), mpObj(NULL), mnShowPage(0)
-{
- SetBorderStyle( WINDOW_BORDER_MONO );
- svtools::ColorConfig aColorConfig;
- Wallpaper aEmpty;
- SetBackground( aEmpty );
- Resize();
- Show();
-}
-
SdDocPreviewWin::~SdDocPreviewWin()
{
delete pMetaFile;
@@ -104,13 +92,6 @@ void SdDocPreviewWin::Resize()
mxSlideShow->resize( GetSizePixel() );
}
-void SdDocPreviewWin::SetGDIFile( GDIMetaFile* pFile )
-{
- delete pMetaFile;
- pMetaFile = pFile;
- Invalidate();
-}
-
void SdDocPreviewWin::CalcSizeAndPos( GDIMetaFile* pFile, Size& rSize, Point& rPoint )
{
Size aTmpSize = pFile ? pFile->GetPrefSize() : Size(1,1 );
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 182c70954111..71fad02f24a7 100644..100755
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -69,7 +69,6 @@ private:
using sfx2::FileDialogHelper::Execute;
#endif
- friend class SdExportFileDialog;
friend class SdOpenSoundFileDialog;
css::uno::Reference< css::ui::dialogs::XFilePickerControlAccess > mxControlAccess;
@@ -95,8 +94,6 @@ public:
// overwritten from FileDialogHelper, to receive user feedback
virtual void SAL_CALL ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent );
-
- sal_Bool SelectionBoxState() const;
};
// ------------------------------------------------------------------------
@@ -313,91 +310,6 @@ ErrCode SdFileDialog_Imp::Execute()
return FileDialogHelper::Execute();
}
-// ------------------------------------------------------------------------
-sal_Bool SdFileDialog_Imp::SelectionBoxState() const
-{
- if ( !mbUsableSelection || !mxControlAccess.is() )
- return sal_False;
-
- sal_Bool bState(0);
- try
- {
- mxControlAccess->getValue( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, 0 ) >>= bState;
- }
- catch( css::lang::IllegalArgumentException )
- {
-#ifdef DBG_UTIL
- DBG_ERROR( "Cannot access \"selection\" checkbox" );
-#endif
- }
-
- return bState;
-}
-
-
-// --------------------------------------------------------------------
-// ----------- SdExportFileDialog ---------------------------
-// --------------------------------------------------------------------
-
-// these are simple forwarders
-SdExportFileDialog::SdExportFileDialog(BOOL bHaveCheckbox) :
- mpImpl( new SdFileDialog_Imp( css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION_SELECTION,
- bHaveCheckbox ) )
-{
- // setup filter
- const String aHTMLFilter( SdResId( STR_EXPORT_HTML_NAME ) );
- GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter();
- const USHORT nFilterCount = pFilter->GetExportFormatCount();
-
- // add HTML filter
- mpImpl->AddFilter( aHTMLFilter, String( SdResId( STR_EXPORT_HTML_FILTER ) ) );
-
- // add other graphic filters
- for ( USHORT i = 0; i < nFilterCount; i++ )
- {
- mpImpl->AddFilter( pFilter->GetExportFormatName( i ),
- pFilter->GetExportWildcard( i ) );
- }
-
- // set dialog title
- mpImpl->SetTitle( String( SdResId( STR_EXPORT_DIALOG_TITLE ) ) );
-}
-
-// ------------------------------------------------------------------------
-SdExportFileDialog::~SdExportFileDialog()
-{
-}
-
-// ------------------------------------------------------------------------
-ErrCode SdExportFileDialog::Execute()
-{
- return mpImpl->Execute();
-}
-
-String SdExportFileDialog::GetPath() const
-{
- return mpImpl->GetPath();
-}
-
-// ------------------------------------------------------------------------
-void SdExportFileDialog::SetPath( const String& rPath )
-{
- mpImpl->SetDisplayDirectory( rPath );
-}
-
-// ------------------------------------------------------------------------
-String SdExportFileDialog::ReqCurrentFilter() const
-{
- return mpImpl->GetCurrentFilter();
-}
-
-// ------------------------------------------------------------------------
-BOOL SdExportFileDialog::IsExportSelection() const
-{
- return mpImpl->SelectionBoxState();
-}
-
-
// --------------------------------------------------------------------
// ----------- SdOpenSoundFileDialog -----------------------
// --------------------------------------------------------------------
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index 294e61f3fe40..b48a1682bba6 100644..100755
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -291,12 +291,6 @@ HeaderFooterDialog::~HeaderFooterDialog()
// -----------------------------------------------------------------------
-void HeaderFooterDialog::initTabPages()
-{
-}
-
-// -----------------------------------------------------------------------
-
IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl )
{
const USHORT nId = pTabCtrl->GetCurPageId();
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index f16e90dd7791..5d260367f383 100644..100755
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -142,7 +142,6 @@ List* SdInsertPagesObjsDlg::GetList( USHORT nType )
// wird das gesamte Dokument (und nicht mehr!) eingefuegt.
if( aLbTree.GetSelectionCount() == 0 ||
( aLbTree.IsSelected( aLbTree.First() ) ) )
- //return( aLbTree.GetBookmarkList( nType ) );
return( NULL ); // #37350#
}
return( aLbTree.GetSelectEntryList( nType ) );
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index ea7a702e539e..3c9aad38c332 100644..100755
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -41,15 +41,6 @@
#include "app.hrc"
#include <svl/intitem.hxx>
#include <sfx2/request.hxx>
-// STATIC DATA -----------------------------------------------------------
-
-static USHORT pPrintOptRanges[] =
-{
- ATTR_OPTIONS_PRINT,
- ATTR_OPTIONS_PRINT,
- 0
-};
-
/*************************************************************************
|*
@@ -236,13 +227,6 @@ SfxTabPage* SdPrintOptions::Create( Window* pWindow,
//-----------------------------------------------------------------------
-USHORT* SdPrintOptions::GetRanges()
-{
- return pPrintOptRanges;
-}
-
-//-----------------------------------------------------------------------
-
IMPL_LINK( SdPrintOptions, ClickCheckboxHdl, CheckBox *, pCbx )
{
// there must be at least one of them checked
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index e6fa5df0de04..275d39af4ea5 100755
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -731,61 +731,6 @@ List* SdPageObjsTLB::GetSelectEntryList( USHORT nDepth )
/*************************************************************************
|*
-|* Alle Pages (und Objekte) des Docs zurueckgeben
-|* nType == 0 -> Seiten
-|* nType == 1 -> Objekte
-|*
-\************************************************************************/
-
-List* SdPageObjsTLB::GetBookmarkList( USHORT nType )
-{
- List* pList = NULL;
-
- if( GetBookmarkDoc() )
- {
- SdPage* pPage = NULL;
- String* pName = NULL;
- USHORT nPage = 0;
- const USHORT nMaxPages = mpBookmarkDoc->GetSdPageCount( PK_STANDARD );
-
- while( nPage < nMaxPages )
- {
- pPage = mpBookmarkDoc->GetSdPage( nPage, PK_STANDARD );
-
- if( nType == 0 ) // Seitennamen einfuegen
- {
- if( !pList )
- pList = new List();
-
- pName = new String( pPage->GetRealName() );
- pList->Insert( pName, LIST_APPEND );
- }
- else // Objektnamen einfuegen
- {
- // Ueber Objekte der Seite iterieren
- SdrObjListIter aIter( *pPage, IM_DEEPWITHGROUPS );
- while( aIter.IsMore() )
- {
- SdrObject* pObj = aIter.Next();
- String aStr( GetObjectName( pObj ) );
- if( aStr.Len() )
- {
- if( !pList )
- pList = new List();
-
- pName = new String( aStr );
- pList->Insert( pName, LIST_APPEND );
- }
- }
- }
- nPage++;
- }
- }
- return( pList );
-}
-
-/*************************************************************************
-|*
|* Eintraege werden erst auf Anforderung (Doppelklick) eingefuegt
|*
\************************************************************************/
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index ebe0243f7d99..af2668fc9dad 100644..100755
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -86,15 +86,6 @@ using namespace ::com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-static USHORT pActionRanges[] =
-{
- ATTR_ANIMATION_TRANSPCOLOR,
- ATTR_ANIMATION_TRANSPCOLOR,
- ATTR_ACTION_START,
- ATTR_ACTION_END,
- 0
-};
-
#define DOCUMENT_TOKEN (sal_Unicode('#'))
/*************************************************************************
@@ -423,13 +414,6 @@ SfxTabPage* SdTPAction::Create( Window* pWindow,
//------------------------------------------------------------------------
-USHORT* SdTPAction::GetRanges()
-{
- return( pActionRanges );
-}
-
-//------------------------------------------------------------------------
-
void SdTPAction::UpdateTree()
{
if( !bTreeUpdated && mpDoc && mpDoc->GetDocSh() && mpDoc->GetDocSh()->GetMedium() )
@@ -849,35 +833,6 @@ void SdTPAction::SetEditText( String const & rStr )
}
}
-String SdTPAction::GetMacroName( const String& rMacroPath )
-{
- String result = rMacroPath;
-
- // try to get name by parsing the macro path
- // using the new URI parsing services
-
- Reference< XMultiServiceFactory > xSMgr =
- ::comphelper::getProcessServiceFactory();
-
- Reference< com::sun::star::uri::XUriReferenceFactory >
- xFactory( xSMgr->createInstance(
- ::rtl::OUString::createFromAscii(
- "com.sun.star.uri.UriReferenceFactory" ) ), UNO_QUERY );
-
- if ( xFactory.is() )
- {
- Reference< com::sun::star::uri::XVndSunStarScriptUrl >
- xUrl( xFactory->parse( rMacroPath ), UNO_QUERY );
-
- if ( xUrl.is() )
- {
- result = xUrl->getName();
- }
- }
-
- return result;
-}
-
//------------------------------------------------------------------------
String SdTPAction::GetEditText( BOOL bFullDocDestination )
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 29218a7b985a..a033661e7c85 100644..100755
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -312,18 +312,6 @@ BOOL DrawDocShell::InitNew( const ::com::sun::star::uno::Reference< ::com::sun::
|*
\************************************************************************/
-sal_Bool DrawDocShell::IsNewDocument() const
-{
- return( mbNewDocument &&
- ( !GetMedium() || GetMedium()->GetURLObject().GetProtocol() == INET_PROT_NOT_VALID ) );
-}
-
-/*************************************************************************
-|*
-|* Load: Pools und Dokument laden
-|*
-\************************************************************************/
-
BOOL DrawDocShell::Load( SfxMedium& rMedium )
{
mbNewDocument = sal_False;
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index f284651b91e5..78b1b9434ad0 100644..100755
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -548,21 +548,6 @@ void DrawDocShell::SetModified( BOOL bSet /* = TRUE */ )
}
}
-::Window* DrawDocShell::GetWindow() const
-{
- SfxViewFrame* pFrame = GetFrame();
- if( pFrame == NULL )
- pFrame = SfxViewFrame::GetFirst( this );
-
- if( pFrame )
- return &(pFrame->GetWindow());
- else
- {
- DBG_ASSERT( 0, "No active window for DrawDocShell found! (next gpf is caused by this assertion)" );
- return NULL;
- }
-}
-
/*************************************************************************
|*
|* Callback fuer ExecuteSpellPopup()
diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
index c8256bc2c0a6..55e22361ad3a 100644..100755
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
@@ -87,15 +87,12 @@ const ConfigurationClassifier::ResourceIdVector& ConfigurationClassifier::GetC2m
-
const ConfigurationClassifier::ResourceIdVector& ConfigurationClassifier::GetC1andC2 (void) const
{
return maC1andC2;
}
-
-
void ConfigurationClassifier::PartitionResources (
const ::com::sun::star::uno::Sequence<Reference<XResourceId> >& rS1,
const ::com::sun::star::uno::Sequence<Reference<XResourceId> >& rS2)
@@ -222,8 +219,6 @@ void ConfigurationClassifier::CopyResources (
}
-
-
void ConfigurationClassifier::TraceResourceIdVector (
const sal_Char* pMessage,
const ResourceIdVector& rResources) const
@@ -240,6 +235,4 @@ void ConfigurationClassifier::TraceResourceIdVector (
}
-
-
} } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index a33bfdcda268..2f846e50be25 100755
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -101,8 +101,6 @@ public:
const Reference<frame::XController>& rxController);
~Implementation (void);
- void Initialize (const Reference<frame::XController>& rxController);
-
Reference<XControllerManager> mxControllerManager;
/** The Broadcaster class implements storing and calling of listeners.
@@ -119,8 +117,6 @@ public:
ViewShellBase* mpBase;
- bool mbIsInitialized;
-
::boost::shared_ptr<ResourceFactoryManager> mpResourceFactoryContainer;
::boost::shared_ptr<ConfigurationControllerResourceManager> mpResourceManager;
@@ -705,7 +701,6 @@ ConfigurationController::Implementation::Implementation (
mpBroadcaster(new ConfigurationControllerBroadcaster(&rController)),
mxRequestedConfiguration(new Configuration(&rController, true)),
mpBase(NULL),
- mbIsInitialized(false),
mpResourceFactoryContainer(new ResourceFactoryManager(mxControllerManager)),
mpResourceManager(
new ConfigurationControllerResourceManager(mpResourceFactoryContainer,mpBroadcaster)),
@@ -721,27 +716,6 @@ ConfigurationController::Implementation::Implementation (
-void ConfigurationController::Implementation::Initialize (
- const Reference<frame::XController>& rxController)
-{
- mxControllerManager = Reference<XControllerManager>(rxController, UNO_QUERY_THROW);
-
- mpConfigurationUpdater->SetControllerManager(mxControllerManager);
-
- // Tunnel through the controller to obtain a ViewShellBase.
- Reference<lang::XUnoTunnel> xTunnel (rxController, UNO_QUERY_THROW);
- if (xTunnel.is())
- {
- ::sd::DrawController* pController = reinterpret_cast<sd::DrawController*>(
- xTunnel->getSomething(sd::DrawController::getUnoTunnelId()));
- if (pController != NULL)
- mpBase = pController->GetViewShellBase();
- }
-}
-
-
-
-
ConfigurationController::Implementation::~Implementation (void)
{
}
diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
index 498f0670542e..b9552940060e 100755
--- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
@@ -60,12 +60,12 @@ void ConfigurationTracer::TraceConfiguration (
+#ifdef DEBUG
void ConfigurationTracer::TraceBoundResources (
const Reference<XConfiguration>& rxConfiguration,
const Reference<XResourceId>& rxResourceId,
const int nIndentation)
{
-#ifdef DEBUG
Sequence<Reference<XResourceId> > aResourceList (
rxConfiguration->getResources(rxResourceId, ::rtl::OUString(), AnchorBindingMode_DIRECT));
const ::rtl::OUString sIndentation (::rtl::OUString::createFromAscii(" "));
@@ -77,11 +77,7 @@ void ConfigurationTracer::TraceBoundResources (
OSL_TRACE("%s", OUStringToOString(sLine, RTL_TEXTENCODING_UTF8).getStr());
TraceBoundResources(rxConfiguration, aResourceList[nIndex], nIndentation+1);
}
-#else
- (void)rxConfiguration;
- (void)rxResourceId;
- (void)nIndentation;
-#endif
}
+#endif
} } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx
index 8a789a051584..b04206fd65e1 100644..100755
--- a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx
@@ -32,7 +32,6 @@
namespace sd { namespace framework {
-
/** Print debug information about configurations to the standard error
output channel.
*/
@@ -43,13 +42,14 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::framework::XConfiguration>& rxConfiguration,
const char* pMessage);
-
+#ifdef DEBUG
static void TraceBoundResources (
const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::framework::XConfiguration>& rxConfiguration,
const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::framework::XResourceId>& rxResourceId,
const int nIndentation);
+#endif
};
} } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index aa8aca5a5ffd..4ab361a9490d 100755
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -163,14 +163,6 @@ Reference<XConfiguration> ConfigurationUpdater::GetCurrentConfiguration (void) c
-Reference<XConfiguration> ConfigurationUpdater::GetRequestedConfiguration (void) const
-{
- return mxRequestedConfiguration;
-}
-
-
-
-
bool ConfigurationUpdater::IsUpdatePossible (void)
{
return ! mbUpdateBeingProcessed
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
index 87c92be5e5c4..a9f3e09f2a64 100644..100755
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
@@ -84,9 +84,6 @@ public:
css::uno::Reference<
css::drawing::framework::XConfiguration> GetCurrentConfiguration (void) const;
- css::uno::Reference<
- css::drawing::framework::XConfiguration> GetRequestedConfiguration (void) const;
-
friend class ConfigurationUpdaterLock;
/** Return a lock of the called ConfigurationUpdater. While the
returned object exists no update of the current configuration is
diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx
index 32894411547a..15d7c3a6f4ec 100644..100755
--- a/sd/source/ui/framework/configuration/ResourceId.cxx
+++ b/sd/source/ui/framework/configuration/ResourceId.cxx
@@ -592,17 +592,6 @@ bool ResourceId::IsBoundToAnchor (
-bool ResourceId::IsValid (void) const
-{
- return maResourceURLs.size() == 0
- || maResourceURLs[0].getLength()>0
- || maResourceURLs.size() == 1;
-
-}
-
-
-
-
void ResourceId::ParseResourceURL (void)
{
::osl::Guard< ::osl::Mutex > aGuard (::osl::Mutex::getGlobalMutex());
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index d6f60506c62f..f406501bd114 100755
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -552,32 +552,6 @@ Reference<XResource> BasicPaneFactory::CreateChildWindowPane (
return xPane;
}
-
-
-
-bool BasicPaneFactory::IsBoundToChildWindow (const Reference<XResourceId>& rxResourceId) const
-{
- if ( ! rxResourceId.is())
- return false;
-
- Reference<XResourceId> xAnchorId (rxResourceId->getAnchor());
- if ( ! xAnchorId.is())
- return false;
-
- const OUString sAnchorURL (xAnchorId->getResourceURL());
- if (sAnchorURL == FrameworkHelper::msLeftImpressPaneURL)
- return true;
- else if (sAnchorURL == FrameworkHelper::msLeftDrawPaneURL)
- return true;
- else if (sAnchorURL == FrameworkHelper::msRightPaneURL)
- return true;
- else
- return false;
-}
-
-
-
-
void BasicPaneFactory::ThrowIfDisposed (void) const
throw (lang::DisposedException)
{
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
index bceeae60003a..9b41866180fc 100755
--- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
@@ -159,12 +159,6 @@ private:
css::drawing::framework::XResourceId>& rxPaneId,
const PaneDescriptor& rDescriptor);
- /** Return <TRUE/> when the specified resource is bound to one of the
- child windows.
- */
- bool IsBoundToChildWindow (
- const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId) const;
-
void ThrowIfDisposed (void) const
throw (css::lang::DisposedException);
};
diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
index 1cd156817afc..d7c45ceb803b 100755
--- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx
+++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
@@ -284,23 +284,6 @@ void SAL_CALL TaskPanelFactory::releaseResource (
-//=============================================================================
-
-void TaskPanelFactory::ThrowIfDisposed (void) const
- throw (lang::DisposedException)
-{
- if (rBHelper.bDisposed || rBHelper.bInDispose)
- {
- throw lang::DisposedException (
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "TaskPanelFactory object has already been disposed")),
- const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
- }
-}
-
-
-
-
//===== ToolPanelResource =====================================================
namespace {
diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.hxx b/sd/source/ui/framework/factories/TaskPanelFactory.hxx
index 1ab2fa783a4a..086788a6763e 100755
--- a/sd/source/ui/framework/factories/TaskPanelFactory.hxx
+++ b/sd/source/ui/framework/factories/TaskPanelFactory.hxx
@@ -89,8 +89,6 @@ public:
private:
ViewShellBase* mpViewShellBase;
-
- void ThrowIfDisposed (void) const throw (css::lang::DisposedException);
};
} } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx
index cf9b095072b1..090247e7f68c 100644..100755
--- a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx
+++ b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx
@@ -145,17 +145,6 @@ void ReadOnlyModeObserver::AddStatusListener (
-void ReadOnlyModeObserver::RemoveStatusListener (
- const Reference<frame::XStatusListener>& rxListener)
-{
- mpBroadcaster->removeListener(
- getCppuType((Reference<frame::XStatusListener>*)NULL),
- rxListener);
-}
-
-
-
-
bool ReadOnlyModeObserver::ConnectToDispatch (void)
{
if ( ! mxDispatch.is())
diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx b/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx
index f01649bdf8bd..d783d6d83abf 100644..100755
--- a/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx
+++ b/sd/source/ui/framework/module/ReadOnlyModeObserver.hxx
@@ -91,12 +91,6 @@ public:
const ::com::sun::star::uno::Reference<
com::sun::star::frame::XStatusListener>& rxListener);
- /** Remove the given listener.
- */
- void RemoveStatusListener (
- const ::com::sun::star::uno::Reference<
- com::sun::star::frame::XStatusListener>& rxListener);
-
// XEventListener
virtual void SAL_CALL disposing (
diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx
index 8f79ed41f24b..fcd90ca6454b 100644..100755
--- a/sd/source/ui/framework/module/ResourceManager.cxx
+++ b/sd/source/ui/framework/module/ResourceManager.cxx
@@ -291,25 +291,4 @@ void SAL_CALL ResourceManager::disposing (
}
}
-
-
-
-void ResourceManager::Trace (void) const
-{
- OSL_TRACE("main views with resource %s:",
- ::rtl::OUStringToOString(
- FrameworkHelper::ResourceIdToString(mxResourceId), RTL_TEXTENCODING_UTF8).getStr());
-
- MainViewContainer::const_iterator iDescriptor;
- for (iDescriptor=mpActiveMainViewContainer->begin();
- iDescriptor!=mpActiveMainViewContainer->end();
- ++iDescriptor)
- {
- OSL_TRACE(" %s",
- ::rtl::OUStringToOString(*iDescriptor, RTL_TEXTENCODING_UTF8).getStr());
- }
-}
-
-
-
} } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx
index 23cb1ed7dd48..d00ee78c2de3 100644..100755
--- a/sd/source/ui/framework/module/ResourceManager.hxx
+++ b/sd/source/ui/framework/module/ResourceManager.hxx
@@ -126,8 +126,6 @@ private:
const ::com::sun::star::uno::Reference<
com::sun::star::drawing::framework::XConfiguration>& rxConfiguration);
void UpdateForMainViewShell (void);
-
- void Trace (void) const;
};
} } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 8c63a6871483..078f86a88d86 100755
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -1002,28 +1002,6 @@ void SAL_CALL FrameworkHelper::DisposeListener::disposing (const lang::EventObje
-//----- DispatchCaller --------------------------------------------------------
-
-DispatchCaller::DispatchCaller (
- SfxDispatcher& rDispatcher,
- USHORT nSId)
- : mrDispatcher(rDispatcher),
- mnSId(nSId)
-{
-}
-
-
-
-
-void DispatchCaller::operator() (bool bEventSeen)
-{
- (void)bEventSeen;
- mrDispatcher.Execute(mnSId, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
-}
-
-
-
-
//===== FrameworkHelperResourceIdFilter =======================================
FrameworkHelperResourceIdFilter::FrameworkHelperResourceIdFilter (
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index 26119b6a03b9..c0d8235e97fb 100644..100755
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -72,13 +72,6 @@ FuConstruct::FuConstruct (
{
}
-FunctionReference FuConstruct::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
-{
- FunctionReference xFunc( new FuConstruct( pViewSh, pWin, pView, pDoc, rReq ) );
- xFunc->DoExecute(rReq);
- return xFunc;
-}
-
void FuConstruct::DoExecute( SfxRequest& rReq )
{
FuDraw::DoExecute( rReq );
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index bbe13c114931..5cc3cc49ca88 100644..100755
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -99,14 +99,6 @@ FuDraw::FuDraw(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView,
{
}
-FunctionReference FuDraw::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent )
-{
- FuDraw* pFunc;
- FunctionReference xFunc( pFunc = new FuDraw( pViewSh, pWin, pView, pDoc, rReq ) );
- pFunc->SetPermanent(bPermanent);
- return xFunc;
-}
-
/*************************************************************************
|*
|* Destruktor
diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx
index 2bb056f55e42..c0ef53f144b3 100644..100755
--- a/sd/source/ui/func/fuoutl.cxx
+++ b/sd/source/ui/func/fuoutl.cxx
@@ -60,12 +60,6 @@ FuOutline::FuOutline (
{
}
-FunctionReference FuOutline::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
-{
- FunctionReference xFunc( new FuOutline( pViewSh, pWin, pView, pDoc, rReq ) );
- return xFunc;
-}
-
/*************************************************************************
|*
|* Command, weiterleiten an OutlinerView
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index c1df44e52677..0342c5f2bbc5 100644..100755
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -247,16 +247,6 @@ IMPL_LINK_INLINE_END( FuPoor, ScrollHdl, Timer *, pTimer )
/*************************************************************************
|*
-|* String in Applikations-Statuszeile ausgeben
-|*
-\************************************************************************/
-
-void FuPoor::WriteStatus(const String& )
-{
-}
-
-/*************************************************************************
-|*
|* Tastaturereignisse bearbeiten
|*
|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
@@ -1121,18 +1111,6 @@ void FuPoor::StartDelayToScrollTimer ()
/*************************************************************************
|*
-|* Handler fuer Maustaste
-|*
-\************************************************************************/
-
-long FuPoor::diffPoint (long pos1, long pos2)
-{
- return (pos1 > pos2) ? pos1 - pos2
- : pos2 - pos1;
-}
-
-/*************************************************************************
-|*
|* Help-event
|*
\************************************************************************/
diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx
index 82007fe61893..04fcf124cc14 100644..100755
--- a/sd/source/ui/func/fusearch.cxx
+++ b/sd/source/ui/func/fusearch.cxx
@@ -38,7 +38,6 @@
#include <svx/srchdlg.hxx>
#include <sfx2/bindings.hxx>
#include "fupoor.hxx"
-#include "fuspell.hxx" // wegen SidArraySpell[]
#ifndef SD_WINDOW_SHELL_HXX
#include "Window.hxx"
#endif
@@ -55,6 +54,14 @@ class SfxRequest;
namespace sd {
+static USHORT SidArraySpell[] = {
+ SID_DRAWINGMODE,
+ SID_OUTLINEMODE,
+ SID_DIAMODE,
+ SID_NOTESMODE,
+ SID_HANDOUTMODE,
+ 0 };
+
TYPEINIT1( FuSearch, FuPoor );
/*************************************************************************
diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx
index ab686481b402..fad1cb324fd2 100644..100755
--- a/sd/source/ui/func/fusnapln.cxx
+++ b/sd/source/ui/func/fusnapln.cxx
@@ -123,6 +123,7 @@ void FuSnapLine::DoExecute( SfxRequest& rReq )
{
OSL_ASSERT(pPV!=NULL);
aLinePos = (pPV->GetHelpLines())[nHelpLine].GetPos();
+ pPV->LogicToPagePos(aLinePos);
bLineExist = true;
}
aNewAttr.Put(SfxUInt32Item(ATTR_SNAPLINE_X, aLinePos.X()));
diff --git a/sd/source/ui/func/fuspell.cxx b/sd/source/ui/func/fuspell.cxx
deleted file mode 100644
index 526efb0087e4..000000000000
--- a/sd/source/ui/func/fuspell.cxx
+++ /dev/null
@@ -1,166 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sd.hxx"
-
-
-#include "fuspell.hxx"
-
-#include <editeng/outliner.hxx>
-#include <sfx2/bindings.hxx>
-
-#include <sfx2/viewfrm.hxx>
-#include "fupoor.hxx"
-#include "Outliner.hxx"
-#include "drawdoc.hxx"
-#include "DrawViewShell.hxx"
-#include "OutlineViewShell.hxx"
-#include "ViewShellBase.hxx"
-
-#include "app.hrc"
-
-class SfxRequest;
-
-namespace sd {
-
-USHORT SidArraySpell[] = {
- SID_DRAWINGMODE,
- SID_OUTLINEMODE,
- SID_DIAMODE,
- SID_NOTESMODE,
- SID_HANDOUTMODE,
- 0 };
-
-TYPEINIT1( FuSpell, FuPoor );
-
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
-
-FuSpell::FuSpell (
- ViewShell* pViewSh,
- ::sd::Window* pWin,
- ::sd::View* pView,
- SdDrawDocument* pDoc,
- SfxRequest& rReq )
- : FuPoor(pViewSh, pWin, pView, pDoc, rReq),
- pSdOutliner(NULL),
- bOwnOutliner(FALSE)
-{
-}
-
-FunctionReference FuSpell::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
-{
- FunctionReference xFunc( new FuSpell( pViewSh, pWin, pView, pDoc, rReq ) );
- xFunc->DoExecute(rReq);
- return xFunc;
-}
-
-void FuSpell::DoExecute( SfxRequest& )
-{
- mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArraySpell );
-
- if ( mpViewShell->ISA(DrawViewShell) )
- {
- bOwnOutliner = TRUE;
- pSdOutliner = new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT );
- }
- else if ( mpViewShell->ISA(OutlineViewShell) )
- {
- bOwnOutliner = FALSE;
- pSdOutliner = mpDoc->GetOutliner();
- }
-
- if (pSdOutliner)
- pSdOutliner->PrepareSpelling();
-}
-
-
-
-/*************************************************************************
-|*
-|* Destruktor
-|*
-\************************************************************************/
-
-FuSpell::~FuSpell()
-{
- mpDocSh->GetViewShell()->GetViewFrame()->GetBindings().Invalidate( SidArraySpell );
-
- if (pSdOutliner)
- pSdOutliner->EndSpelling();
-
- if (bOwnOutliner)
- delete pSdOutliner;
-}
-
-/*************************************************************************
-|*
-|* Pruefung starten
-|*
-\************************************************************************/
-
-void FuSpell::StartSpelling()
-{
- // Get current main view shell.
- ViewShellBase* pBase (ViewShellBase::GetViewShellBase (
- mpDocSh->GetViewShell()->GetViewFrame()));
- if (pBase != NULL)
- mpViewShell = pBase->GetMainViewShell().get();
- else
- mpViewShell = NULL;
- if (mpViewShell != NULL)
- {
- if ( pSdOutliner && mpViewShell->ISA(DrawViewShell) && !bOwnOutliner )
- {
- pSdOutliner->EndSpelling();
-
- bOwnOutliner = TRUE;
- pSdOutliner = new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT );
- pSdOutliner->PrepareSpelling();
- }
- else if ( pSdOutliner && mpViewShell->ISA(OutlineViewShell) && bOwnOutliner )
- {
- pSdOutliner->EndSpelling();
- delete pSdOutliner;
-
- bOwnOutliner = FALSE;
- pSdOutliner = mpDoc->GetOutliner();
- pSdOutliner->PrepareSpelling();
- }
-
- if (pSdOutliner)
- pSdOutliner->StartSpelling();
- }
-}
-
-
-
-} // end of namespace sd
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index f62b1b087aee..31797f3c8a03 100644..100755
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -136,29 +136,4 @@ void FuTransform::DoExecute( SfxRequest& rReq )
}
}
-/*************************************************************************
-|*
-|* Function ResizeObject
-|*
-\************************************************************************/
-
-Point FuTransform::GetPoint( Rectangle aRect, RECT_POINT eRP )
-{
-
- switch( eRP )
- {
- case RP_LT: return( Point( aRect.Left(), aRect.Top() ) );
- case RP_MT: return( Point( aRect.Center().X(), aRect.Top() ) );
- case RP_RT: return( Point( aRect.Right(), aRect.Top() ) );
- case RP_LM: return( Point( aRect.Left(), aRect.Center().Y() ) );
- case RP_MM: return( Point( aRect.Center().X(), aRect.Center().Y() ) );
- case RP_RM: return( Point( aRect.Right(), aRect.Center().Y() ) );
- case RP_LB: return( Point( aRect.Left(), aRect.Bottom() ) );
- case RP_MB: return( Point( aRect.Center().X(), aRect.Bottom() ) );
- case RP_RB: return( Point( aRect.Right(), aRect.Bottom() ) );
- }
- return( Point ( 0, 0 ) ); // Sollte nicht vorkommen !
-}
-
-
} // end of namespace sd
diff --git a/sd/source/ui/func/makefile.mk b/sd/source/ui/func/makefile.mk
index 9ec946325239..e4df8fe9d65a 100644..100755
--- a/sd/source/ui/func/makefile.mk
+++ b/sd/source/ui/func/makefile.mk
@@ -84,7 +84,6 @@ SLOFILES = \
$(SLO)$/fuolbull.obj \
$(SLO)$/fucopy.obj \
$(SLO)$/fulink.obj \
- $(SLO)$/fuspell.obj \
$(SLO)$/futhes.obj \
$(SLO)$/fusearch.obj \
$(SLO)$/fuinsfil.obj \
@@ -98,7 +97,6 @@ SLOFILES = \
$(SLO)$/fumorph.obj \
$(SLO)$/fuexpand.obj \
$(SLO)$/fusumry.obj \
- $(SLO)$/outlinfo.obj \
$(SLO)$/fucushow.obj \
$(SLO)$/fuvect.obj \
$(SLO)$/bulmaper.obj \
@@ -159,7 +157,6 @@ LIB3OBJFILES= \
$(SLO)$/fuolbull.obj \
$(SLO)$/fucopy.obj \
$(SLO)$/fulink.obj \
- $(SLO)$/fuspell.obj \
$(SLO)$/futhes.obj \
$(SLO)$/fusearch.obj \
$(SLO)$/fuinsfil.obj \
@@ -173,7 +170,6 @@ LIB3OBJFILES= \
$(SLO)$/fumorph.obj \
$(SLO)$/fuexpand.obj \
$(SLO)$/fusumry.obj \
- $(SLO)$/outlinfo.obj \
$(SLO)$/fucushow.obj \
$(SLO)$/fuvect.obj \
$(SLO)$/bulmaper.obj \
diff --git a/sd/source/ui/func/outlinfo.cxx b/sd/source/ui/func/outlinfo.cxx
deleted file mode 100644
index 0a52da329b20..000000000000
--- a/sd/source/ui/func/outlinfo.cxx
+++ /dev/null
@@ -1,301 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sd.hxx"
-
-#include <vcl/metric.hxx>
-#include <editeng/outliner.hxx>
-#include <svx/svdorect.hxx>
-#include <svx/svdoutl.hxx>
-#include <editeng/svxfont.hxx>
-#include "drawdoc.hxx"
-#include "outlinfo.hxx"
-#include <algorithm>
-
-// #101500#
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
-#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
-#include <com/sun/star/i18n/ScriptType.hdl>
-#endif
-#include <com/sun/star/i18n/XBreakIterator.hpp>
-#include <comphelper/processfactory.hxx>
-
-#ifndef _COM_SUN_STAR_I18N_CHARACTERITERATORMODE_HDL_
-#include <com/sun/star/i18n/CharacterIteratorMode.hdl>
-#endif
-#include <editeng/unolingu.hxx>
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::i18n;
-
-// ----------------
-// - OutlinerInfo -
-// ----------------
-
-OutlinerInfo::OutlinerInfo() :
- pParagraphs ( NULL ),
- nParaCount ( 0UL ),
- nExtraData ( 0L )
-{
-}
-
-// -----------------------------------------------------------------------------
-
-OutlinerInfo::~OutlinerInfo()
-{
- Clear();
-}
-
-// -----------------------------------------------------------------------------
-
-void OutlinerInfo::SetTextObj( SdDrawDocument* pDoc, SdrRectObj* pObj, OutputDevice* pOut )
-{
- Clear();
-
- SdrOutliner& rOutliner = pDoc->GetDrawOutliner();
-
- mpOut = pOut;
- rOutliner.SetText( *pObj->GetOutlinerParaObject() );
-
- aObjBound = pObj->GetCurrentBoundRect();
- nParaCount = rOutliner.GetParagraphCount();
- nExtraData = 0L;
-
- if( nParaCount )
- {
- mbVertical = rOutliner.IsVertical();
- pObj->TakeTextRect( rOutliner, aParaBound, TRUE );
-
- if( IsVertical() )
- aTextOffset = aParaBound.TopRight();
- else
- aTextOffset = aParaBound.TopLeft();
-
- nCurPara = 0;
- bInit = TRUE;
-
- rOutliner.SetDrawPortionHdl( LINK( this, OutlinerInfo, DrawPortionHdl ) );
- pParagraphs = new OutlinerParagraph[ nParaCount ];
- rOutliner.StripPortions();
- rOutliner.SetDrawPortionHdl( Link() );
-
- if( 1 == nParaCount )
- pParagraphs[ 0 ].aRect = aParaBound;
- else if( IsVertical() )
- {
- pParagraphs[ 0 ].aRect.Right() = aParaBound.Right();
-
- for( USHORT i = 0; i < nParaCount; i++ )
- {
- if( i > 0 )
- pParagraphs[i].aRect.Right() = pParagraphs[ i - 1 ].aRect.Left();
-
- pParagraphs[i].aRect.Left() = pParagraphs[i].aRect.Right() - rOutliner.GetTextHeight( i );
- }
- }
- else
- {
- pParagraphs[ 0 ].aRect.Top() = aParaBound.Top();
-
- for( USHORT i = 0; i < nParaCount; i++ )
- {
- if( i > 0 )
- pParagraphs[ i ].aRect.Top() = pParagraphs[ i - 1 ].aRect.Bottom();
-
- pParagraphs[ i ].aRect.Bottom() = pParagraphs[ i ].aRect.Top() + rOutliner.GetTextHeight( i );
- }
- }
- }
- else
- {
- pParagraphs = NULL;
- aParaBound = Rectangle();
- aTextOffset = Point();
- }
-
- nCurPara = 0;
- bInit = FALSE;
-}
-
-// -----------------------------------------------------------------------------
-
-void OutlinerInfo::Clear()
-{
- for( void* pChar = aCharacterList.First(); pChar; pChar = aCharacterList.Next() )
- delete (OutlinerCharacter*) pChar;
- aCharacterList.Clear();
-
- delete[] pParagraphs;
- pParagraphs = NULL;
-
- nCurPara = nParaCount = 0UL;
- aObjBound = aParaBound = Rectangle();
- aTextOffset = Point();
-}
-
-// -----------------------------------------------------------------------------
-
-const Rectangle& OutlinerInfo::GetParaRect( const ULONG nPara ) const
-{
- DBG_ASSERT( nPara < nParaCount, "Para out of range!" );
- return pParagraphs[ nPara ].aRect;
-}
-
-// -----------------------------------------------------------------------------
-
-BOOL OutlinerInfo::GetParaCharCount( const ULONG nPara ) const
-{
- DBG_ASSERT( nPara < nParaCount, "Para out of range!" );
- return (0 != pParagraphs[ nPara ].nCharCount);
-}
-
-// -----------------------------------------------------------------------------
-
-IMPL_LINK(OutlinerInfo, DrawPortionHdl, DrawPortionInfo*, pInfo)
-{
- // #101500#
- Point aStart;
- sal_Bool bIsVertical(IsVertical());
- mpOut->SetFont((const Font&)pInfo->mrFont);
- FontMetric aFontMetric(mpOut->GetFontMetric());
- sal_Bool bUseBreakIterator(sal_False);
-
- // initialize BreakIterator
- Reference < com::sun::star::i18n::XBreakIterator > xBreak;
- Reference < XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
- Reference < XInterface > xInterface = xMSF->createInstance(::rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator"));
- ::com::sun::star::lang::Locale aFontLocale = SvxCreateLocale(pInfo->mrFont.GetLanguage());
-
- if(xInterface.is())
- {
- Any x = xInterface->queryInterface(::getCppuType((const Reference< XBreakIterator >*)0));
- x >>= xBreak;
- }
-
- if(xBreak.is())
- {
- bUseBreakIterator = sal_True;
- }
-
- if(bIsVertical)
- {
- aStart.X() = pInfo->mrStartPos.X() + aTextOffset.X() - aFontMetric.GetDescent();
- aStart.Y() = pInfo->mrStartPos.Y() + aTextOffset.Y();
-
- const Point aTopLeft(aStart.X(), aParaBound.Top());
- const Point aBottomRight(aStart.X() + aFontMetric.GetLineHeight(), aParaBound.Bottom());
- const Rectangle aCurRect(aTopLeft, aBottomRight);
-
- if(pInfo->mnPara != nCurPara)
- {
- nCurPara = pInfo->mnPara;
- pParagraphs[nCurPara].aRect = aCurRect;
- }
- else
- {
- pParagraphs[nCurPara].aRect.Union(aCurRect);
- }
- }
- else
- {
- aStart.X() = pInfo->mrStartPos.X() + aTextOffset.X();
- aStart.Y() = pInfo->mrStartPos.Y() + aTextOffset.Y() - aFontMetric.GetAscent();
-
- const Point aTopLeft(aParaBound.Left(), aStart.Y());
- const Point aBottomRight(aParaBound.Right(), aStart.Y() + aFontMetric.GetLineHeight());
- const Rectangle aCurRect(aTopLeft, aBottomRight);
-
- if(pInfo->mnPara != nCurPara)
- {
- nCurPara = pInfo->mnPara;
- pParagraphs[nCurPara].aRect = aCurRect;
- }
- else
- {
- pParagraphs[nCurPara].aRect.Union(aCurRect);
- }
- }
-
- if(pInfo->mnTextLen && (0xFFFF != pInfo->mnIndex))
- {
- pParagraphs[nCurPara].nCharCount += pInfo->mnTextLen;
- sal_uInt16 nInsertIndex(0xffff);
-
- if(pInfo->IsRTL())
- nInsertIndex = (sal_uInt16)aCharacterList.Count();
-
- for(sal_uInt16 nCharIndex(0); nCharIndex < pInfo->mnTextLen; )
- {
- xub_StrLen nNextGlyphLen(1);
- sal_Bool bIsSingleSpace(sal_False);
-
- if(bUseBreakIterator)
- {
- sal_Int32 nDone(0L);
- nNextGlyphLen = (xub_StrLen)xBreak->nextCharacters( pInfo->mrText, pInfo->mnTextStart, aFontLocale,
- CharacterIteratorMode::SKIPCELL, 1, nDone) - (pInfo->mnTextStart);
- }
-
- if(!bIsSingleSpace)
- {
- Size aGlyphSize(pInfo->mrFont.GetPhysTxtSize(mpOut,
- pInfo->mrText, nCharIndex + pInfo->mnTextStart, nNextGlyphLen));
-
- if(bIsVertical)
- {
- ::std::swap(aGlyphSize.Width(), aGlyphSize.Height());
- }
-
- const Rectangle aRect(aStart, aGlyphSize);
-
- aCharacterList.Insert(new OutlinerCharacter(
- aRect,
- pInfo->mnPara,
- pInfo->mrFont.GetColor()),
- nInsertIndex);
-
- long dx = 0;
- if( pInfo->mpDXArray )
- dx = (pInfo->mpDXArray)[nCharIndex];
-
- if(bIsVertical)
- aStart.Y() = pInfo->mrStartPos.Y() + aTextOffset.Y() + dx;
- else
- aStart.X() = pInfo->mrStartPos.X() + aTextOffset.X() + dx;
- }
-
- nCharIndex = nCharIndex + nNextGlyphLen;
- }
- }
-
- return 0L;
-}
-
-// eof
diff --git a/sd/source/ui/func/sdundogr.cxx b/sd/source/ui/func/sdundogr.cxx
index daea6eef49a2..7b7a361bba80 100644..100755
--- a/sd/source/ui/func/sdundogr.cxx
+++ b/sd/source/ui/func/sdundogr.cxx
@@ -116,14 +116,3 @@ void SdUndoGroup::AddAction(SdUndoAction* pAction)
{
aCtn.Insert(pAction, CONTAINER_APPEND);
}
-
-/*************************************************************************
-|*
-|* Zeiger auf eine Aktion liefern
-|*
-\************************************************************************/
-
-SdUndoAction* SdUndoGroup::GetAction(ULONG nAction) const
-{
- return (SdUndoAction*)aCtn.GetObject(nAction);
-}
diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx
index 684487d0c592..933e961ed927 100644..100755
--- a/sd/source/ui/func/unoaprms.cxx
+++ b/sd/source/ui/func/unoaprms.cxx
@@ -39,52 +39,6 @@ TYPEINIT1(SdAnimationPrmsUndoAction, SdUndoAction);
/*************************************************************************
|*
-|* 2. Ctor, der den ersten (inline) nach der Version 4.0 einmal ersetzen
-|* soll (mit 3. Parameter dann)
-|* Hier werden die Member mit den Animations-Informationen vorbelegt,
-|* um nicht immer alle inline-Methoden aufrufen zu muessen, auch im
-|* Hinblick auf zukuenftige Erweiterungen (neue Member etc.)
-|*
-\************************************************************************/
-
-SdAnimationPrmsUndoAction::SdAnimationPrmsUndoAction(
- SdDrawDocument* pTheDoc,
- SdrObject* pObj ) :
- SdUndoAction ( pTheDoc ),
- pObject ( pObj ),
- bInfoCreated ( FALSE ) // Fuer Animationsreihenfolge existiert Info
-{
- SdAnimationInfo* pInfo = pTheDoc->GetAnimationInfo( pObject );
- if( pInfo )
- {
- bNewActive = bOldActive = pInfo->mbActive;
- eNewEffect = eOldEffect = pInfo->meEffect;
- eNewTextEffect = eOldTextEffect = pInfo->meTextEffect;
- eNewSpeed = eOldSpeed = pInfo->meSpeed;
- bNewDimPrevious = bOldDimPrevious= pInfo->mbDimPrevious;
- aNewDimColor = aOldDimColor = pInfo->maDimColor;
- bNewDimHide = bOldDimHide = pInfo->mbDimHide;
- bNewSoundOn = bOldSoundOn = pInfo->mbSoundOn;
- aNewSoundFile = aOldSoundFile = pInfo->maSoundFile;
- bNewPlayFull = bOldPlayFull = pInfo->mbPlayFull;
-
- pNewPathObj = pOldPathObj = pInfo->mpPathObj;
-
- eNewClickAction = eOldClickAction = pInfo->meClickAction;
- aNewBookmark = aOldBookmark = pInfo->GetBookmark();
-// bNewInvisibleInPres = bOldInvisibleInPres= pInfo->mbInvisibleInPresentation;
- nNewVerb = nOldVerb = pInfo->mnVerb;
- nNewPresOrder = nOldPresOrder = pInfo->mnPresOrder;
-
- eNewSecondEffect = eOldSecondEffect = pInfo->meSecondEffect;
- eNewSecondSpeed = eOldSecondSpeed = pInfo->meSecondSpeed;
- bNewSecondSoundOn = bOldSecondSoundOn = pInfo->mbSecondSoundOn;
- bNewSecondPlayFull = bOldSecondPlayFull = pInfo->mbSecondPlayFull;
- }
-}
-
-/*************************************************************************
-|*
|* Undo()
|*
\************************************************************************/
diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx
index 33e0bbf725ab..5c8fba1e6b2d 100644..100755
--- a/sd/source/ui/inc/AccessibleViewForwarder.hxx
+++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx
@@ -53,13 +53,10 @@ class AccessibleViewForwarder
public:
//===== internal ========================================================
- AccessibleViewForwarder (SdrPaintView* pView, USHORT nWindowId);
AccessibleViewForwarder (SdrPaintView* pView, OutputDevice& rDevice);
virtual ~AccessibleViewForwarder (void);
- void SetView (SdrPaintView* pView);
-
//===== IAccessibleViewforwarder ========================================
/** This method informs you about the state of the forwarder. Do not
diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx
index d2f56501f492..da0b6ade7327 100755
--- a/sd/source/ui/inc/DrawController.hxx
+++ b/sd/source/ui/inc/DrawController.hxx
@@ -127,8 +127,6 @@ public:
void SetSubController (
const css::uno::Reference<css::drawing::XDrawSubController>& rxSubController);
- ::com::sun::star::awt::Rectangle GetVisArea (void) const;
-
/** Call this method when the VisArea has changed.
*/
void FireVisAreaChanged (const Rectangle& rVisArea) throw();
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index f2b77d01f96c..4ad4b0d09392 100644..100755
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -115,7 +115,6 @@ public:
sd::ViewShell* GetViewShell() { return mpViewShell; }
::sd::FrameView* GetFrameView();
- ::Window* GetWindow() const;
::sd::FunctionReference GetDocShellFunction() const { return mxDocShellFunction; }
void SetDocShellFunction( const ::sd::FunctionReference& xFunction );
@@ -164,8 +163,6 @@ public:
UINT16 GetStyleFamily() const { return mnStyleFamily; }
void SetStyleFamily( UINT16 nSF ) { mnStyleFamily = nSF; }
- sal_Bool IsNewDocument() const;
-
/** executes the SID_OPENDOC slot to let the framework open a document
with the given URL and this document as a referer */
void OpenBookmark( const String& rBookmarkURL );
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 51b8479dae1e..4abb1a22946d 100755
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -94,11 +94,6 @@ public:
PageKind ePageKind = PK_STANDARD,
FrameView* pFrameView = NULL);
- DrawViewShell(
- SfxViewFrame* pFrame,
- ::Window* pParentWindow,
- const DrawViewShell& rShell);
-
virtual ~DrawViewShell (void);
virtual void Init (bool bIsMainViewShell);
@@ -199,9 +194,6 @@ public:
void ExecFormText(SfxRequest& rReq);
void GetFormTextState(SfxItemSet& rSet);
- void ExecObjPalette(SfxRequest& rReq);
- void GetObjPaletteState(SfxItemSet& rSet);
-
void ExecAnimationWin(SfxRequest& rReq);
void GetAnimationWinState(SfxItemSet& rSet);
diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx
index 39e12e47d1e1..6b5d96be95c6 100644..100755
--- a/sd/source/ui/inc/GraphicViewShell.hxx
+++ b/sd/source/ui/inc/GraphicViewShell.hxx
@@ -52,11 +52,6 @@ public:
SFX_DECL_VIEWFACTORY(GraphicViewShell);
SFX_DECL_INTERFACE(SD_IF_SDGRAPHICVIEWSHELL)
- GraphicViewShell (
- SfxViewFrame* pFrame,
- ::Window* pParentWindow,
- const DrawViewShell& rShell);
-
/** Create a new view shell for the Draw application.
@param rViewShellBase
The new object will be stacked on this view shell base.
diff --git a/sd/source/ui/inc/LayerDialogContent.hxx b/sd/source/ui/inc/LayerDialogContent.hxx
index f06b785737b0..3c0b00025307 100644..100755
--- a/sd/source/ui/inc/LayerDialogContent.hxx
+++ b/sd/source/ui/inc/LayerDialogContent.hxx
@@ -50,8 +50,6 @@ public:
ViewShellBase& rBase);
virtual ~LayerDialogContent (void);
- LayerTabBar& GetLayerTabBar (void);
-
protected:
virtual BOOL Close (void);
virtual void Resize (void);
diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx
index 4e74d922d256..caaa8c175f68 100644..100755
--- a/sd/source/ui/inc/MasterPageObserver.hxx
+++ b/sd/source/ui/inc/MasterPageObserver.hxx
@@ -80,12 +80,6 @@ public:
*/
void RemoveEventListener (const Link& rEventListener);
- /** Return a set of the names of master pages for the given document.
- This convenience method exists because this set is part of the
- internal data structure and thus takes no time to create.
- */
- MasterPageNameSet GetMasterPageNames (SdDrawDocument& rDocument);
-
private:
static ::osl::Mutex maMutex;
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 710ee3a96cf7..78481294bf94 100644..100755
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -162,7 +162,9 @@ public:
*/
void IgnoreCurrentPageChanges (bool bIgnore);
+#if 0
sal_Int32 GetPageNumberWidthPixel();
+#endif
void InvalidateSlideNumberArea();
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx
index 0bc083b12b2e..6c3848f39926 100644..100755
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -67,11 +67,6 @@ public:
::Window* pParentWindow,
FrameView* pFrameView = NULL);
- OutlineViewShell (
- SfxViewFrame* pFrame,
- ::Window* pParentWindow,
- const OutlineViewShell& rShell);
-
virtual ~OutlineViewShell (void);
virtual void Shutdown (void);
diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx
index 6f8ebb285886..4e6033d67ad1 100644..100755
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -53,12 +53,6 @@ public:
TYPEINFO();
SFX_DECL_INTERFACE(SD_IF_SDSLIDESORTERVIEWSHELL)
- static SfxShell* CreateInstance (
- sal_Int32 nId,
- SfxShell* pParent,
- void* pUserData,
- ViewShellBase& rBase);
-
static ::boost::shared_ptr<SlideSorterViewShell> Create(
SfxViewFrame* pFrame,
ViewShellBase& rViewShellBase,
diff --git a/sd/source/ui/inc/SlideView.hxx b/sd/source/ui/inc/SlideView.hxx
index 3764347f2a4b..17f7f17e3a9a 100644..100755
--- a/sd/source/ui/inc/SlideView.hxx
+++ b/sd/source/ui/inc/SlideView.hxx
@@ -36,7 +36,6 @@ class SdPage;
namespace sd {
-class ShowView;
class SlideViewShell;
class Window;
@@ -129,7 +128,6 @@ private:
List aDelayedPaints;
SlideViewShell* pSlideViewShell;
BitmapCache* pCache;
- ShowView* pShowView;
VirtualDevice* mpVDev;
USHORT nAllowInvalidateSmph;
USHORT nPagesPerRow;
diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx
index 898df6865280..4e08dd99b063 100644..100755
--- a/sd/source/ui/inc/SpellDialogChildWindow.hxx
+++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx
@@ -62,12 +62,12 @@ protected:
next sentence with spelling errors. While doing so the view
mode may be changed and text shapes are set into edit mode.
*/
- virtual ::svx::SpellPortions GetNextWrongSentence (void);
+ virtual ::svx::SpellPortions GetNextWrongSentence( bool bRecheck );
/** This method is responsible for merging corrections made in the
spelling dialog back into the document.
*/
- virtual void ApplyChangedSentence (const ::svx::SpellPortions& rChanged);
+ virtual void ApplyChangedSentence(const ::svx::SpellPortions& rChanged, bool bRecheck);
virtual void GetFocus (void);
virtual void LoseFocus (void);
diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx
index 2caead9a3c5d..d8b84d1d7b61 100644..100755
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -144,14 +144,6 @@ public:
TBG__LAST = TBG_MASTER_MODE
};
- /** Only after calls with bValid=<TRUE/> may the tool bar manager use
- the frame::XLayoutManager to change the visible tool bars. Call
- this method when the controller is attached to or detachted from the
- frame. When called with <FALSE/> then ResetAllToolBars() is
- executed.
- */
- void SetValid (bool bValid);
-
/** Reset the set of visible object bars in the specified group. Tool
bars in other groups are not affected.
@param rParentShell
@@ -209,10 +201,6 @@ public:
ToolBarGroup eGroup,
const ::rtl::OUString& rsToolBarName);
- void RemoveToolBarShell (
- ToolBarGroup eGroup,
- ShellId nToolBarId);
-
/** This is basically a shortcut for ResetToolBars(),AddToolBar(). The
main difference is, that all sub shells of the specified parent
shell are deactivated as well.
@@ -275,10 +263,6 @@ public:
};
friend class UpdateLock;
- /** Return whether updates of tool bars are locked.
- */
- bool IsUpdateLocked (void) const;
-
void ToolBarsDestroyed(void);
private:
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 2b6c1a8abb77..f78051bdd719 100755
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -160,10 +160,7 @@ public:
void SetMarkedOriginalSize();
- VirtualDevice* CreatePageVDev(USHORT nSdPage, PageKind ePageKind, ULONG nWidthPixel);
-
void LockRedraw(BOOL bLock);
- bool IsRedrawLocked (void) const;
BOOL IsMorphingAllowed() const;
BOOL IsVectorizeAllowed() const;
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 64bc5cbc02b7..ffefb9de7359 100755
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -141,10 +141,6 @@ public:
::Window* pParentWindow,
ViewShellBase& rViewShellBase,
bool bAllowCenter = true);
- ViewShell (
- SfxViewFrame *pFrame,
- ::Window* pParentWindow,
- const ViewShell& rShell);
virtual ~ViewShell (void);
/** The Init method has to be called from the outside directly
@@ -235,7 +231,6 @@ public:
void InitWindows(const Point& rViewOrigin, const Size& rViewSize,
const Point& rWinPos, BOOL bUpdate = FALSE);
void InvalidateWindows();
- void UpdateWindows();
/** This method is still used by the OutlineViewShell to update the
model according to the content of the outline view. This in turn
updates the previews in the slide sorter.
@@ -243,8 +238,6 @@ public:
virtual void UpdatePreview (SdPage* pPage, BOOL bInit = FALSE);
void DrawMarkRect(const Rectangle& rRect) const;
- void DrawFilledRect( const Rectangle& rRect, const Color& rLColor,
- const Color& rFColor ) const;
void ExecReq( SfxRequest &rReq );
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index bda748559399..38f7223f1d83 100755
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -57,7 +57,6 @@ class ToolBarManager;
class UpdateLockManager;
class ViewShell;
class ViewShellManager;
-class CustomHandleManager;
/** SfxViewShell descendant that the stacked Draw/Impress shells are
based on.
@@ -112,10 +111,6 @@ public:
DrawDocShell* GetDocShell (void) const;
SdDrawDocument* GetDocument (void) const;
- /** Callback function for retrieving item values related to menu entries.
- */
- void GetMenuState (SfxItemSet& rSet);
-
/** Callback function for general slot calls. At the moment these are
slots for switching the pane docking windows on and off.
*/
@@ -165,12 +160,6 @@ public:
PrintDialog *pPrintDialog,
BOOL bSilent, BOOL bIsAPI );
- /// Forwarded to the print manager.
- USHORT SetPrinterOptDlg (
- SfxPrinter* pNewPrinter,
- USHORT nDiffFlags = SFX_PRINTER_ALL,
- BOOL _bShowDialog = TRUE);
-
virtual void PreparePrint (PrintDialog* pPrintDialog);
/// Forward methods to main sub shell.
@@ -261,8 +250,6 @@ public:
*/
::Window* GetViewWindow (void);
- CustomHandleManager& getCustomHandleManager() const;
-
/** returns the ui descriptive name for the given uno slot. The result is taken from the configuration
and not cached, so do not use it excessive (f.e. in status updates) */
::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const;
@@ -295,22 +282,6 @@ public:
virtual void addCustomHandler( SdrView& rSourceView, ViewShell::ShellType eShellType, SdrHdlList& rHandlerList ) = 0;
};
-class CustomHandleManager : public ICustomhandleSupplier
-{
-public:
- CustomHandleManager( ViewShellBase& rViewShellBase );
- virtual ~CustomHandleManager();
-
- void registerSupplier( ICustomhandleSupplier* pSupplier );
- void unRegisterSupplier( ICustomhandleSupplier* pSupplier );
-
- virtual void addCustomHandler( SdrView& rSourceView, ViewShell::ShellType eShellType, SdrHdlList& rHandlerList );
-
-private:
- ViewShellBase& mrViewShellBase;
- std::set< ICustomhandleSupplier* > maSupplier;
-};
-
} // end of namespace sd
#endif
diff --git a/sd/source/ui/inc/ViewShellManager.hxx b/sd/source/ui/inc/ViewShellManager.hxx
index 27f88b72bf11..d674e7d07eff 100644..100755
--- a/sd/source/ui/inc/ViewShellManager.hxx
+++ b/sd/source/ui/inc/ViewShellManager.hxx
@@ -90,23 +90,6 @@ public:
ViewShell* pViewShell,
const SharedShellFactory& rpFactory);
- /** Create a new (or possibly recycle an existing) instance of a view
- shell that is specified by the given id. When called multiple times
- with the same id then multiple instances of the associated view
- shell are created. Use the returned pointer to distinguish between
- these.
- @param nId
- The id of the shell to activate.
- @return
- A pointer to the activated shell is returned. Use this pointer
- to identify the shell in other method calls. When an activation
- is not possible then NULL is returned.
- */
- ViewShell* ActivateViewShell (
- ShellId nId,
- ::Window* pParentWindow,
- FrameView* pFrameView);
-
/** Activate the given view shell.
*/
void ActivateViewShell (ViewShell* pViewShell);
@@ -156,10 +139,6 @@ public:
*/
void DeactivateSubShell (const ViewShell& rParentShell, ShellId nId);
- /** Deactivate all sub shells of the given view shell.
- */
- void DeactivateAllSubShells (const ViewShell& rParentShell);
-
/** Move the specified sub shells to the top position among the sub
shells of the parent view shell. The rest of the SFX shell stack
does not change (but the all shells above the sub shells have to be
@@ -173,14 +152,6 @@ public:
void InvalidateAllSubShells (
ViewShell* pViewShell);
- /** Call this method to when a 'secondary' shell is moved to or from the
- stack, e.g. an object bar. As a result a pending
- TakeShellsFromStack() is executed and at the next UnlockUpdate() to
- lock level 0 the shells are asked about their secondary shells to
- push on the shell stack.
- */
- void InvalidateShellStack (const SfxShell* pShell);
-
/** Move the specified view shell to the top most position on the stack
of view shells in relation to the other view shells. After this the
only shells that are higher on the stack are its object bars.
@@ -211,20 +182,6 @@ public:
*/
SfxShell* GetTopShell (void) const;
- /** Return the id of the given shell.
- */
- ShellId GetShellId (const SfxShell* pShell) const;
-
- /** Replace the references to one SfxUndoManager to that of another at all
- shells on the SFX shell stack. Call this method when an undo
- manager is about to be destroyed.
- @param pManager
- The undo manager to be replaced.
- @param pReplacement
- The undo manager that replaces pManager.
- */
- void ReplaceUndoManager (SfxUndoManager* pManager, SfxUndoManager* pReplacement);
-
/** Use this class to safely lock updates of the view shell stack.
*/
class UpdateLock
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index dbf2a1ed40a6..8dd522d8212d 100644..100755
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -66,8 +66,6 @@ public:
void SetViewShell (ViewShell* pViewSh);
- void ShareViewArea(::sd::Window* pOtherWin);
-
/** Set the zoom factor to the specified value and center the display
area arround the zoom center.
@param nZoom
diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx
index 846863c3a68a..7a7a34362c48 100644..100755
--- a/sd/source/ui/inc/animobjs.hxx
+++ b/sd/source/ui/inc/animobjs.hxx
@@ -172,7 +172,6 @@ private:
void UpdateControl( ULONG nPos, BOOL bDisableCtrls = FALSE );
void ResetAttrs();
- void WaitInEffect( ULONG nMilliSeconds ) const;
void WaitInEffect( ULONG nMilliSeconds, ULONG nTime,
SfxProgress* pStbMgr ) const;
Fraction GetScale();
diff --git a/sd/source/ui/inc/bmcache.hxx b/sd/source/ui/inc/bmcache.hxx
index 26658333dca3..c04f7d2ed2c4 100644..100755
--- a/sd/source/ui/inc/bmcache.hxx
+++ b/sd/source/ui/inc/bmcache.hxx
@@ -45,8 +45,6 @@ public:
: nMaxSize(nMaxSizeKB), nCurSize(0) {}
virtual ~BitmapCache();
- void Add(const SdPage* pPage, const Bitmap& rBmp, long nZoomPercent);
- const GraphicObject* Get(const SdPage* pPage, long& rZoomPercent, long nZoomTolerancePercent);
void Remove(const SdPage* pPage);
};
diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx
index 418d72618b4c..523b86cf66a8 100644..100755
--- a/sd/source/ui/inc/dlgass.hxx
+++ b/sd/source/ui/inc/dlgass.hxx
@@ -64,9 +64,6 @@ public:
DECL_LINK( FinishHdl, OKButton * );
SfxObjectShellLock GetDocument();
- String GetTopic() const;
- String GetUserName() const;
- String GetInformation() const;
OutputType GetOutputMedium() const;
BOOL IsSummary() const;
StartType GetStartType() const;
diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx
index df48868d473d..72b5921d8e86 100644..100755
--- a/sd/source/ui/inc/dlgctrls.hxx
+++ b/sd/source/ui/inc/dlgctrls.hxx
@@ -50,7 +50,6 @@ class SD_DLLPUBLIC FadeEffectLB : public ListBox
{
public:
FadeEffectLB( Window* pParent, SdResId Id );
- FadeEffectLB( Window* pParent, WinBits aWB );
~FadeEffectLB();
virtual void Fill();
diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx
index 0827371da3be..76b8fe06f318 100644..100755
--- a/sd/source/ui/inc/docprev.hxx
+++ b/sd/source/ui/inc/docprev.hxx
@@ -70,10 +70,8 @@ protected:
public:
SdDocPreviewWin( Window* pParent, const ResId& rResId );
- SdDocPreviewWin( Window* pParent );
~SdDocPreviewWin();
void SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage = 0 );
- void SetGDIFile( GDIMetaFile* pFile );
virtual void Resize();
void startPreview();
diff --git a/sd/source/ui/inc/filedlg.hxx b/sd/source/ui/inc/filedlg.hxx
index 74b4c5d1d6a6..2aaa7be9f123 100644..100755
--- a/sd/source/ui/inc/filedlg.hxx
+++ b/sd/source/ui/inc/filedlg.hxx
@@ -40,40 +40,9 @@
class SdFileDialog_Imp;
-/******************************************************************************/
-
-/**
- The class SdExportFileDialog wraps the FileDialogHelper, displaying the
- FILESAVE_AUTOEXTENSION_SELECTION dialog template. The interface is a downstripped
- version of the aforementioned class, with similar semantics.
- */
-class SdExportFileDialog
-{
- const std::auto_ptr< SdFileDialog_Imp > mpImpl;
-
- // forbidden and not implemented
- SdExportFileDialog ();
- SdExportFileDialog (const SdExportFileDialog &);
- SdExportFileDialog & operator= (const SdExportFileDialog &);
-
-public:
- explicit SdExportFileDialog( BOOL haveCheckbox );
- ~SdExportFileDialog();
-
- ErrCode Execute();
- String GetPath() const;
- void SetPath( const String& rPath );
-
- String ReqDisplayDirectory() const;
-
- String ReqCurrentFilter() const;
- BOOL IsExportSelection() const; // whether the "selection" checkbox is checked.
-};
-
/******************************************************************************/
-
/**
The class SdOpenSoundFileDialog wraps the FileDialogHelper, displaying the
FILEOPEN_PLAY dialog template and performing the 'preview' functionality
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index a25839b3e637..58c663449bbc 100755
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -383,23 +383,6 @@ private:
};
-
-/** This functor wraps a slot call. It is used to call a slot after an
- asynchronous configuration update, eg after switching views.
-*/
-class DispatchCaller
-{
- SfxDispatcher& mrDispatcher;
- USHORT mnSId;
-public:
- /** Create a new DispatchCaller object that, when executed, will call
- the given slot at the given dispatcher.
- */
- DispatchCaller(SfxDispatcher& rDispatcher, USHORT nSId);
- void operator() (bool bEventSeen);
-};
-
-
} } // end of namespace sd::framework
diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx
index a4d5390d15d0..e8124e895ee6 100644..100755
--- a/sd/source/ui/inc/framework/ResourceId.hxx
+++ b/sd/source/ui/inc/framework/ResourceId.hxx
@@ -236,8 +236,6 @@ private:
const ::std::vector<rtl::OUString>& rResourceURLs,
css::drawing::framework::AnchorBindingMode eMode) const;
- bool IsValid (void) const;
-
void ParseResourceURL (void);
};
diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx
index c4199986a5b6..390060a16e3c 100644..100755
--- a/sd/source/ui/inc/fuconstr.hxx
+++ b/sd/source/ui/inc/fuconstr.hxx
@@ -50,7 +50,6 @@ public:
TYPEINFO();
- static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq );
// Mouse- & Key-Events
diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx
index 77427a7f346e..23f68eda327b 100644..100755
--- a/sd/source/ui/inc/fudraw.hxx
+++ b/sd/source/ui/inc/fudraw.hxx
@@ -50,8 +50,6 @@ class FuDraw
public:
TYPEINFO();
- static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
-
virtual BOOL KeyInput(const KeyEvent& rKEvt);
virtual BOOL MouseMove(const MouseEvent& rMEvt);
virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx
index a8743fea8a50..92299387849a 100644..100755
--- a/sd/source/ui/inc/fuoutl.hxx
+++ b/sd/source/ui/inc/fuoutl.hxx
@@ -54,8 +54,6 @@ class FuOutline
public:
TYPEINFO();
- static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
-
virtual BOOL Command(const CommandEvent& rCEvt);
virtual void ScrollStart();
diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx
index c3c95a384a38..2650e99767b5 100644..100755
--- a/sd/source/ui/inc/fupoor.hxx
+++ b/sd/source/ui/inc/fupoor.hxx
@@ -98,7 +98,6 @@ public:
virtual void ScrollEnd() {} // ForceScroll aufgerufen
void SetWindow(::sd::Window* pWin) { mpWindow = pWin; }
- void WriteStatus(const String& aStr); // Statuszeile schreiben
// #97016# II
virtual void SelectionHasChanged();
@@ -145,7 +144,6 @@ protected:
virtual ~FuPoor (void);
DECL_LINK( DelayHdl, Timer * );
- long diffPoint (long pos1, long pos2);
void ImpForceQuadratic(Rectangle& rRect);
diff --git a/sd/source/ui/inc/fuspell.hxx b/sd/source/ui/inc/fuspell.hxx
deleted file mode 100644
index 1bb37d3a873d..000000000000
--- a/sd/source/ui/inc/fuspell.hxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************
- *
- * 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_FU_SPELL_HXX
-#define SD_FU_SPELL_HXX
-
-#include "fupoor.hxx"
-
-namespace sd {
-
-extern USHORT SidArraySpell[];
-
-class Outliner;
-
-class FuSpell
- : public FuPoor
-{
-public:
- TYPEINFO();
-
- static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
- virtual void DoExecute( SfxRequest& rReq );
-
- void StartSpelling();
-
- ::sd::Outliner* GetOutliner() const { return pSdOutliner; }
-
-protected:
- virtual ~FuSpell (void);
-
- ::sd::Outliner* pSdOutliner;
- BOOL bOwnOutliner;
-
-private:
- FuSpell (
- ViewShell* pViewSh,
- ::sd::Window* pWin,
- ::sd::View* pView,
- SdDrawDocument* pDoc,
- SfxRequest& rReq);
-};
-
-} // end of namespace sd
-
-#endif
-
-
diff --git a/sd/source/ui/inc/futransf.hxx b/sd/source/ui/inc/futransf.hxx
index be554e941400..85041334c7f0 100644..100755
--- a/sd/source/ui/inc/futransf.hxx
+++ b/sd/source/ui/inc/futransf.hxx
@@ -51,8 +51,6 @@ private:
::sd::View* pView,
SdDrawDocument* pDoc,
SfxRequest& rReq);
-
- Point GetPoint( Rectangle aRect, RECT_POINT eRP );
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx
index 382727475f84..fa0c4d9282c0 100644..100755
--- a/sd/source/ui/inc/headerfooterdlg.hxx
+++ b/sd/source/ui/inc/headerfooterdlg.hxx
@@ -65,7 +65,6 @@ private:
SdPage* mpCurrentPage;
ViewShell* mpViewShell;
- void initTabPages();
void apply( bool bToAll, bool bForceSlides );
void change( SdUndoGroup* pUndoGroup, SdPage* pPage, const HeaderFooterSettings& rNewSettings );
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index dcf53fc6ffc3..13088dfc64cb 100644..100755
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -163,7 +163,6 @@ public:
SdOptionsLayout( USHORT nConfigId, BOOL bUseConfig );
virtual ~SdOptionsLayout() {}
- void SetDefaults();
BOOL operator==( const SdOptionsLayout& rOpt ) const;
BOOL IsRulerVisible() const { Init(); return (BOOL) bRuler; }
@@ -220,7 +219,6 @@ public:
SdOptionsContents( USHORT nConfigId, BOOL bUseConfig );
virtual ~SdOptionsContents() {}
- void SetDefaults();
BOOL operator==( const SdOptionsContents& rOpt ) const;
};
@@ -230,7 +228,6 @@ class SD_DLLPUBLIC SdOptionsContentsItem : public SfxPoolItem
{
public:
- SdOptionsContentsItem( USHORT nWhich);
SdOptionsContentsItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
@@ -301,7 +298,6 @@ public:
SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig );
virtual ~SdOptionsMisc() {}
- void SetDefaults();
BOOL operator==( const SdOptionsMisc& rOpt ) const;
BOOL IsStartWithTemplate() const { Init(); return (BOOL) bStartWithTemplate; }
@@ -427,7 +423,6 @@ public:
SdOptionsSnap( USHORT nConfigId, BOOL bUseConfig );
virtual ~SdOptionsSnap() {}
- void SetDefaults();
BOOL operator==( const SdOptionsSnap& rOpt ) const;
BOOL IsSnapHelplines() const { Init(); return (BOOL) bSnapHelplines; }
@@ -494,7 +489,6 @@ public:
SdOptionsZoom( USHORT nConfigId, BOOL bUseConfig );
virtual ~SdOptionsZoom() {}
- void SetDefaults();
BOOL operator==( const SdOptionsZoom& rOpt ) const;
void GetScale( INT32& rX, INT32& rY ) const { Init(); rX = nX; rY = nY; }
@@ -503,23 +497,6 @@ public:
// -----------------------------------------------------------------------------
-class SdOptionsZoomItem : public SfxPoolItem
-{
-public:
-
- SdOptionsZoomItem( USHORT nWhich);
- SdOptionsZoomItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL );
-
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
-
- void SetOptions( SdOptions* pOpts ) const;
-
- SdOptionsZoom& GetOptionsZoom() { return maOptionsZoom; }
-private:
- SdOptionsZoom maOptionsZoom;
-};
-
// -----------------
// - SdOptionsGrid -
// -----------------
@@ -569,7 +546,6 @@ class SdOptionsGridItem : public SvxGridItem
{
public:
- SdOptionsGridItem( USHORT nWhich );
SdOptionsGridItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL );
void SetOptions( SdOptions* pOpts ) const;
@@ -616,9 +592,6 @@ public:
SdOptionsPrint( USHORT nConfigId, BOOL bUseConfig );
virtual ~SdOptionsPrint() {}
- void SetPrinterOptions( const SdOptionsPrint* pOptions );
-
- void SetDefaults();
BOOL operator==( const SdOptionsPrint& rOpt ) const;
BOOL IsDraw() const { Init(); return (BOOL) bDraw; }
@@ -700,7 +673,6 @@ public:
SdOptions( USHORT nConfigId );
virtual ~SdOptions();
- void SetRangeDefaults( ULONG nOptionRange );
void StoreConfig( ULONG nOptionRange = SD_OPTIONS_ALL );
};
diff --git a/sd/source/ui/inc/outlinfo.hxx b/sd/source/ui/inc/outlinfo.hxx
deleted file mode 100644
index 4f277c0fa320..000000000000
--- a/sd/source/ui/inc/outlinfo.hxx
+++ /dev/null
@@ -1,125 +0,0 @@
-/*************************************************************************
- *
- * 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 _OUTLINFO_HXX
-#define _OUTLINFO_HXX
-
-#include <tools/gen.hxx>
-#include <vcl/outdev.hxx>
-
-// ---------------
-// - SdLaserInfo -
-// ---------------
-
-struct OutlinerCharacter
-{
- Rectangle aRect;
- ULONG nPara;
- Color aColor;
-
- // #101500# Removed CharCode, it's only used in one place to compare
- // for single space character. This can be done at creation, too.
- //USHORT nCharCode;
-
- OutlinerCharacter( const Rectangle& _rRect, ULONG _nPara, const Color& _rCol /* #101500#, USHORT _nCharCode*/ )
- : aRect( _rRect ),
- nPara( _nPara ),
- aColor( _rCol )
- {
- }
-};
-
-// -----------------------------------------------------------------------------
-
-struct OutlinerParagraph
-{
- Rectangle aRect;
- ULONG nCharCount;
-
- OutlinerParagraph() : nCharCount( 0 ) {}
- ~OutlinerParagraph() {};
-};
-
-// ----------------
-// - OutlinerInfo -
-// ----------------
-
-class DrawPortionInfo;
-class SdDrawDocument;
-class SdrRectObj;
-
-class OutlinerInfo
-{
-private:
-
- List aCharacterList;
- Rectangle aObjBound;
- Rectangle aParaBound;
- Point aTextOffset;
- OutlinerParagraph* pParagraphs;
- OutputDevice* mpOut;
- ULONG nParaCount;
- ULONG nCurPara;
- long nExtraData;
- BOOL bInit;
- BOOL mbVertical;
-
- OutlinerInfo( const OutlinerInfo& ) {}
- OutlinerInfo& operator=( const OutlinerInfo& ) { return *this; }
-
- DECL_LINK( DrawPortionHdl, DrawPortionInfo* );
-
-public:
-
- OutlinerInfo();
- ~OutlinerInfo();
-
- void Clear();
-
- void SetTextObj( SdDrawDocument* pDoc, SdrRectObj* pObj, OutputDevice* _pOut );
-
- const Rectangle& GetObjRect() const { return aObjBound; }
- const Rectangle& GetTextRect() const { return aParaBound; }
- const Point& GetTextOffset() const { return aTextOffset; }
-
- ULONG GetParaCount() const { return nParaCount; }
-
- const Rectangle& GetParaRect( const ULONG nPara ) const;
- BOOL GetParaCharCount( const ULONG nPara ) const;
-
- ULONG GetCharacterCount() const { return aCharacterList.Count(); }
- OutlinerCharacter* GetCharacter( ULONG nPos ) const { return (OutlinerCharacter*) aCharacterList.GetObject( nPos ); };
- OutlinerCharacter* GetFirstCharacter() { return (OutlinerCharacter*) aCharacterList.First(); }
- OutlinerCharacter* GetNextCharacter() { return (OutlinerCharacter*) aCharacterList.Next(); }
-
- void SetExtraData( const long _nExtraData = 0L ) { nExtraData = _nExtraData; }
- long GetExtraData() const { return nExtraData; }
-
- BOOL IsVertical() const { return mbVertical; }
-};
-
-#endif
diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx
index 288bcfb3e359..da9bc20c02d6 100644..100755
--- a/sd/source/ui/inc/prntopts.hxx
+++ b/sd/source/ui/inc/prntopts.hxx
@@ -94,7 +94,6 @@ public:
~SdPrintOptions();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static USHORT* GetRanges();
virtual BOOL FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet & );
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 948a55d3754c..dc98929a9ed1 100644..100755
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -210,7 +210,6 @@ public:
BOOL SelectEntry( const String& rName );
String GetSelectEntry();
List* GetSelectEntryList( USHORT nDepth );
- List* GetBookmarkList( USHORT nType );
SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL);
::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); }
diff --git a/sd/source/ui/inc/sdundogr.hxx b/sd/source/ui/inc/sdundogr.hxx
index b4665dbe5a46..f02977234475 100644..100755
--- a/sd/source/ui/inc/sdundogr.hxx
+++ b/sd/source/ui/inc/sdundogr.hxx
@@ -48,7 +48,6 @@ public:
virtual void Redo();
void AddAction(SdUndoAction* pAction);
- SdUndoAction* GetAction(ULONG nAction) const;
ULONG Count() const { return aCtn.Count(); }
};
diff --git a/sd/source/ui/inc/showview.hxx b/sd/source/ui/inc/showview.hxx
deleted file mode 100644
index 748effbe1985..000000000000
--- a/sd/source/ui/inc/showview.hxx
+++ /dev/null
@@ -1,88 +0,0 @@
-/*************************************************************************
- *
- * 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_SHOW_VIEW_HXX
-#define SD_SHOW_VIEW_HXX
-
-#include <svx/fmview.hxx>
-
-class SdDrawDocument;
-
-namespace sd {
-
-class ViewShell;
-
-/*************************************************************************
-|*
-|* Beschreibung ShowView ist die View fuer die Diashow
-|*
-\************************************************************************/
-
-class ShowView
- : public FmFormView
-{
-public:
- // wenn waehrend des Zeichnens Plugins 'connected'
- // werden sollen, muss pWWin ein Zeiger auf das Fenster
- // sein, das das Plugin benutzen soll
- ShowView (
- SdDrawDocument* pDoc,
- OutputDevice* pOut,
- ViewShell* pViewShell,
- ::Window* pWin = NULL);
- virtual ~ShowView (void);
-
- SdDrawDocument& GetDoc() const { return *pDrDoc; }
-
- void SetAllowInvalidate(BOOL bFlag);
- BOOL IsInvalidateAllowed() const;
-
- void SetAllowMasterPageCaching(BOOL bAllow)
- { bAllowMasterPageCaching = bAllow; }
- BOOL IsMasterPageCachingAllowed() const
- { return(bAllowMasterPageCaching); }
-
- virtual void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L);
- virtual void InvalidateOneWin(::Window& rWin);
- virtual void InvalidateOneWin(::Window& rWin, const Rectangle& rRect);
-
- virtual void DoConnect(SdrOle2Obj* pOleObj);
-
-private:
- SdDrawDocument* pDrDoc;
- ViewShell* mpViewSh;
- Window* pWindowForPlugIns;
- USHORT nAllowInvalidateSmph;
- BOOL bAllowMasterPageCaching;
-
-};
-
-} // end of namespace sd
-
-#endif
-
-
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index bc4df5aa44f5..eda80feeb825 100644..100755
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -173,7 +173,6 @@ public:
ShowWindow* getShowWindow(); // a.k.a. FuSlideShow::GetShowWindow()
int getAnimationMode(); // a.k.a. FuSlideShow::GetAnimationMode()
sal_Int32 getCurrentPageNumber(); // a.k.a. FuSlideShow::GetCurrentPage()
- sal_Int32 getCurrentPageIndex();
sal_Int32 getFirstPageNumber();
sal_Int32 getLastPageNumber();
bool isEndless();
diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx
index b3620255f913..f820edc69f09 100755
--- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx
+++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx
@@ -131,11 +131,6 @@ public:
Rectangle& aRectangle,
::Window* pWindow);
-protected:
- /** Initiate a rearrangement of the controls.
- */
- void ListHasChanged (void);
-
private:
::Control maScrollWindow;
ScrollBar maVerticalScrollBar;
diff --git a/sd/source/ui/inc/taskpane/SubToolPanel.hxx b/sd/source/ui/inc/taskpane/SubToolPanel.hxx
index 94a73bc70996..669c51cfcfad 100755
--- a/sd/source/ui/inc/taskpane/SubToolPanel.hxx
+++ b/sd/source/ui/inc/taskpane/SubToolPanel.hxx
@@ -68,19 +68,6 @@ public:
SubToolPanel (Window& i_rParentWindow);
virtual ~SubToolPanel (void);
- /** Add a control to the sub panel.
- @param rTitle
- The title that will be shown in the two title bars that
- belong to the control.
- @param nHelpId
- The help id is set at the title bar not the actual control.
- */
- void AddControl (
- ::std::auto_ptr<TreeNode> pControl,
- const String& rTitle,
- ULONG nHelpId);
- void AddControl (::std::auto_ptr<TreeNode> pControl);
-
virtual void Paint (const Rectangle& rRect);
/** Initiate a rearrangement of the controls and title bars.
@@ -106,11 +93,6 @@ public:
::com::sun::star::accessibility::XAccessible>& rxParent);
using Window::GetWindow;
-protected:
- /** Initiate a rearrangement of the controls.
- */
- void ListHasChanged (void);
-
private:
::Window maWindowFiller;
bool mbIsRearrangePending;
diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx
index 0dbec3b292c3..a1a430c49328 100755
--- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx
+++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx
@@ -69,15 +69,6 @@ public:
TreeNode (TreeNode* pParent);
virtual ~TreeNode (void);
- /** Returns <TRUE/> if the node has no children, i.e. is a leaf of a
- tree. In this case mpControlContainer is NULL.
- */
- bool IsLeaf (void);
-
- /** Returns true if the node has no parent, i.e. is the root of a tree.
- */
- bool IsRoot (void);
-
void SetParentNode (TreeNode* pNewParent);
TreeNode* GetParentNode (void);
@@ -179,14 +170,6 @@ public:
*/
void AddStateChangeListener (const Link& rListener);
- /** Remove the listener form the list of state change listeners.
- @param rListener
- It is OK to specify a listener that is not currently
- registered. Only when the listener is registered it is
- removed. Otherwise the call is ignored.
- */
- void RemoveStateChangeListener (const Link& rListener);
-
/** Call the state change listeners and pass a state change event with
the specified event id. The source field is set to this.
@param pChild
diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx
index 0aa63344fcd5..cb7cd3b2159c 100755
--- a/sd/source/ui/inc/taskpane/TitledControl.hxx
+++ b/sd/source/ui/inc/taskpane/TitledControl.hxx
@@ -125,13 +125,6 @@ public:
virtual void SetEnabledState(bool bFlag);
- /** Ownership of the given data remains with the caller. The data
- is thus not destroyed when the destructor of this class is
- called.
- */
- void SetUserData (void* pUserData);
- void* GetUserData (void) const;
-
virtual bool IsShowing (void) const;
virtual void Show (bool bVisible);
diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx
index c74253092adf..998b4f0e2142 100644..100755
--- a/sd/source/ui/inc/tools/PropertySet.hxx
+++ b/sd/source/ui/inc/tools/PropertySet.hxx
@@ -62,13 +62,6 @@ public:
virtual void SAL_CALL disposing (void);
-
- /** Create an UnknownPropertyException, but do not yet throw it. This
- method fills in the fields of the exception.
- */
- css::beans::UnknownPropertyException CreateUnknownPropertyException (
- const rtl::OUString& rsPropertyName);
-
// XPropertySet
virtual css::uno::Reference<css::beans::XPropertySetInfo>
diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
index d86ac3cf6433..d0661a61636b 100644..100755
--- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
+++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
@@ -92,17 +92,6 @@ public:
*/
void AddResource (const ::css::uno::Reference<css::uno::XInterface>& rxResource);
- /** Tell the container that it is not any longer responsible for the
- specified resource.
- @return
- When the specified resource has previously added to the
- container the resource is returned (which is, of course, the
- same pointer as the given one.) Otherwise a NULL pointer is
- returned.
- */
- ::std::auto_ptr<SdGlobalResource> ReleaseResource (
- SdGlobalResource* pResource);
-
protected:
friend class ::SdModule;
friend class ::std::auto_ptr<SdGlobalResourceContainer>;
diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx
index 418e4dbf1766..1f45aef331ab 100644..100755
--- a/sd/source/ui/inc/tools/SlotStateListener.hxx
+++ b/sd/source/ui/inc/tools/SlotStateListener.hxx
@@ -57,13 +57,6 @@ class SlotStateListener
public SlotStateListenerInterfaceBase
{
public:
- /** Create a new object that has yet to be told about the the frame and
- slots to listen to and the callback that state changes are relayed
- to. When you want to listen to one single slot then you can use the
- three argument variant of this constructor.
- */
- SlotStateListener (void);
-
/** This convenience version of the constructor takes all parameters
that are necessary to observe a single slot. See descriptions of
the SetCallback(), ConnectToFrame(), and ObserveSlot() methods for
@@ -105,14 +98,6 @@ public:
*/
void ObserveSlot (const ::rtl::OUString& rSlotName);
- /** Return whether the called SlotStateListener is connected to a slot.
- One reason for returning <FALSE/> is that the SlotStateListener has
- been created before the controller and frame have been properly
- initialized.
- */
- bool IsValid (void) const;
-
-
//===== frame::XStatusListener ==========================================
/** Called by slot state change broadcasters. In turn the callback is
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index d07f24a2dcc2..2ee8bbe6771a 100644..100755
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -114,7 +114,6 @@ private:
void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE );
void SetEditText( String const & rStr );
String GetEditText( BOOL bURL = FALSE );
- String GetMacroName( const String& rPath );
USHORT GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA );
USHORT GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE );
@@ -123,7 +122,6 @@ public:
~SdTPAction();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static USHORT* GetRanges();
virtual BOOL FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet & );
diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx
index 9cc3555dce3b..a2a80963ad63 100644..100755
--- a/sd/source/ui/inc/unoaprms.hxx
+++ b/sd/source/ui/inc/unoaprms.hxx
@@ -97,8 +97,6 @@ public:
bInfoCreated (bCreated)
{}
- SdAnimationPrmsUndoAction( SdDrawDocument* pTheDoc, SdrObject* pObj );
-
void SetActive(BOOL bTheOldActive, BOOL bTheNewActive)
{ bOldActive = bTheOldActive; bNewActive = bTheNewActive; }
void SetEffect(::com::sun::star::presentation::AnimationEffect eTheOldEffect, ::com::sun::star::presentation::AnimationEffect eTheNewEffect)
diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx
index e30605181c4c..b19f3751e836 100644..100755
--- a/sd/source/ui/inc/unosrch.hxx
+++ b/sd/source/ui/inc/unosrch.hxx
@@ -58,9 +58,10 @@ protected:
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetCurrentShape() const throw();
public:
- SdUnoSearchReplaceShape( ::com::sun::star::drawing::XDrawPage* xPage ) throw(); // danger, these c'tors are only usable if
- SdUnoSearchReplaceShape( ::com::sun::star::drawing::XShape* xShape ) throw(); // the given shape or page is derived from
- virtual ~SdUnoSearchReplaceShape() throw(); // this class!!!
+ // danger, this c'tor is only usable if the given shape or page is derived
+ // from this class!!!
+ SdUnoSearchReplaceShape( ::com::sun::star::drawing::XDrawPage* xPage ) throw();
+ virtual ~SdUnoSearchReplaceShape() throw();
// XReplaceable
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor( ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/sd/source/ui/inc/zoomlist.hxx b/sd/source/ui/inc/zoomlist.hxx
index 1e31eaa598ac..6957bfed25ce 100644..100755
--- a/sd/source/ui/inc/zoomlist.hxx
+++ b/sd/source/ui/inc/zoomlist.hxx
@@ -44,7 +44,6 @@ public:
virtual ~ZoomList();
void InsertZoomRect(const Rectangle& rRect);
- Rectangle GetCurrentZoomRect() const;
Rectangle GetNextZoomRect();
Rectangle GetPreviousZoomRect();
BOOL IsNextPossible() const;
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index 8a87a10e43d0..a1f583a4e40c 100644..100755
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -908,22 +908,6 @@ css::rendering::ViewState PresenterCanvas::MergeViewState (
-Reference<rendering::XCanvas> PresenterCanvas::GetSharedCanvas (void) const
-{
- return mxSharedCanvas;
-}
-
-
-
-
-void PresenterCanvas::SetClip (const awt::Rectangle& rClipRectangle)
-{
- maClipRectangle = rClipRectangle;
-}
-
-
-
-
awt::Point PresenterCanvas::GetOffset (const Reference<awt::XWindow>& rxBaseWindow)
{
mbOffsetUpdatePending = false;
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index 3734f488d370..ba90a92939ca 100644..100755
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -113,7 +113,6 @@ public:
void SetFontDescriptor (const awt::FontDescriptor& rFontDescriptor);
sal_Int32 GetTop (void) const;
void SetTop (const sal_Int32 nTop);
- void ClearText (void);
void SetText (const OUString& Text);
sal_Int32 ParseDistance (const OUString& rsDistance) const;
Reference<rendering::XBitmap> GetBitmap (void);
@@ -533,17 +532,6 @@ void PresenterTextView::Implementation::SetTop (const sal_Int32 nTop)
-void PresenterTextView::Implementation::ClearText (void)
-{
- DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing");
- msText = OUString();
- mnTotalHeight = 0;
- mxBitmap = NULL;
-}
-
-
-
-
void PresenterTextView::Implementation::SetText (const OUString& rText)
{
DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing");
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index c951f68d9b74..187d0d5ea715 100644..100755
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -947,13 +947,6 @@ sal_Int32 SlideShow::getCurrentPageNumber()
// ---------------------------------------------------------
-sal_Int32 SlideShow::getCurrentPageIndex()
-{
- return mxController.is() ? mxController->getCurrentSlideIndex() : 0;
-}
-
-// ---------------------------------------------------------
-
void SlideShow::jumpToBookmark( const OUString& sBookmark )
{
if( mxController.is() )
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 0afcb7df053b..5afcb65ab90c 100644..100755
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -3697,14 +3697,7 @@ Reference< XSlideShow > SAL_CALL SlideshowImpl::getSlideShow() throw (RuntimeExc
// --------------------------------------------------------------------
-PresentationSettingsEx::PresentationSettingsEx()
-: mbRehearseTimings(sal_False)
-, mbPreview(sal_False)
-, mpParentWindow( 0 )
-{
-}
-
-PresentationSettingsEx::PresentationSettingsEx( PresentationSettingsEx& r )
+PresentationSettingsEx::PresentationSettingsEx( const PresentationSettingsEx& r )
: PresentationSettings( r )
, mbRehearseTimings(r.mbRehearseTimings)
, mbPreview(r.mbPreview)
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 48dca432671c..cb33c4a740c7 100644..100755
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -112,8 +112,7 @@ struct PresentationSettingsEx : public PresentationSettings
css::uno::Reference< css::drawing::XDrawPage > mxStartPage;
css::uno::Reference< css::animations::XAnimationNode > mxAnimationNode;
- PresentationSettingsEx();
- PresentationSettingsEx( PresentationSettingsEx& );
+ PresentationSettingsEx( const PresentationSettingsEx& );
PresentationSettingsEx( PresentationSettings& );
void SetArguments( const css::uno::Sequence< css::beans::PropertyValue >& rArguments ) throw (css::lang::IllegalArgumentException);
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index 47818b73d193..1bbecbef3d66 100644..100755
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -178,14 +178,6 @@ void BitmapCache::Clear (void)
-bool BitmapCache::IsEmpty (void) const
-{
- return mpBitmapContainer->empty();
-}
-
-
-
-
bool BitmapCache::IsFull (void) const
{
return mbIsFull;
@@ -261,21 +253,6 @@ bool BitmapCache::BitmapIsUpToDate (const CacheKey& rKey)
-void BitmapCache::ReleaseBitmap (const CacheKey& rKey)
-{
- ::osl::MutexGuard aGuard (maMutex);
-
- CacheBitmapContainer::iterator aIterator (mpBitmapContainer->find(rKey));
- if (aIterator != mpBitmapContainer->end())
- {
- UpdateCacheSize(aIterator->second, REMOVE);
- mpBitmapContainer->erase(aIterator);
- }
-}
-
-
-
-
void BitmapCache::InvalidateBitmap (const CacheKey& rKey)
{
::osl::MutexGuard aGuard (maMutex);
@@ -348,20 +325,6 @@ void BitmapCache::SetBitmap (
-bool BitmapCache::IsPrecious (const CacheKey& rKey)
-{
- ::osl::MutexGuard aGuard (maMutex);
-
- CacheBitmapContainer::iterator aIterator (mpBitmapContainer->find(rKey));
- if (aIterator != mpBitmapContainer->end())
- return aIterator->second.IsPrecious();
- else
- return false;
-}
-
-
-
-
void BitmapCache::SetPrecious (const CacheKey& rKey, bool bIsPrecious)
{
::osl::MutexGuard aGuard (maMutex);
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
index d0f8766cabf5..2c33e042342f 100644..100755
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
@@ -81,10 +81,6 @@ public:
*/
void Clear (void);
- /** Returns <TRUE/> when there is no preview bitmap in the cache.
- */
- bool IsEmpty (void) const;
-
/** Return <TRUE/> when the cache is full, i.e. the cache compactor had
to be run.
*/
@@ -108,11 +104,6 @@ public:
*/
::boost::shared_ptr<BitmapEx> GetBitmap (const CacheKey& rKey);
- /** Release the reference to the preview bitmap that is associated with
- the given key.
- */
- void ReleaseBitmap (const CacheKey& rKey);
-
/** Mark the specified preview bitmap as not being up-to-date anymore.
*/
void InvalidateBitmap (const CacheKey& rKey);
@@ -128,11 +119,6 @@ public:
const ::boost::shared_ptr<BitmapEx>& rpPreview,
bool bIsPrecious);
- /** Return whether the specified preview bitmap has been marked as
- precious.
- */
- bool IsPrecious (const CacheKey& rKey);
-
/** Mark the specified preview bitmap as precious, i.e. that it must not
be compressed or otherwise removed from the cache.
*/
diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
index 7658d1f3b663..780a429df29e 100644..100755
--- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
@@ -199,15 +199,6 @@ void GenericPageCache::RequestPreviewBitmap (
-void GenericPageCache::InvalidatePreviewBitmap (CacheKey aKey)
-{
- if (mpBitmapCache.get() != NULL)
- mpBitmapCache->InvalidateBitmap(mpCacheContext->GetPage(aKey));
-}
-
-
-
-
void GenericPageCache::ReleasePreviewBitmap (CacheKey aKey)
{
if (mpBitmapCache.get() != NULL)
@@ -294,17 +285,6 @@ void GenericPageCache::SetPreciousFlag (CacheKey aKey, bool bIsPrecious)
-bool GenericPageCache::IsEmpty (void) const
-{
- if (mpBitmapCache.get() != NULL)
- return mpBitmapCache->IsEmpty();
- else
- return true;
-}
-
-
-
-
void GenericPageCache::Pause (void)
{
ProvideCacheAndProcessor();
diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
index e38745e2844f..89fc657004e8 100644..100755
--- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
@@ -99,12 +99,6 @@ public:
const Size& rSize,
bool bMayBeUpToDate = true);
- /** Tell the cache to replace the bitmap associated with the given
- request data with a new one that reflects recent changes in the
- content of the page object.
- */
- void InvalidatePreviewBitmap (CacheKey aKey);
-
/** Call this method when a view-object-contact object is being deleted
and does not need (a) its current bitmap in the cache and (b) a
requested a new bitmap.
@@ -124,10 +118,6 @@ public:
*/
void SetPreciousFlag (CacheKey aKey, bool bIsPrecious);
- /** Return <TRUE/> when there is no preview bitmap in the cache.
- */
- bool IsEmpty (void) const;
-
void Pause (void);
void Resume (void);
diff --git a/sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx b/sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx
deleted file mode 100644
index 6df77bf52800..000000000000
--- a/sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx
+++ /dev/null
@@ -1,66 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sd.hxx"
-
-#include "precompiled_sd.hxx"
-
-#include "SlsIdleDetector.hxx"
-
-#include "view/SlideSorterView.hxx"
-#include "tools/IdleDetection.hxx"
-#include "Window.hxx"
-
-namespace sd { namespace slidesorter { namespace cache {
-
-IdleDetector::IdleDetector (
- const ::Window* pWindow,
- const bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation)
- : mpWindow(pWindow),
- mbIsSuspendPreviewUpdatesDuringFullScreenPresentation(
- bIsSuspendPreviewUpdatesDuringFullScreenPresentation)
-{
-}
-
-
-
-
-bool IdleDetector::operator() (void)
-{
- // Determine whether the system is idle.
- sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mpWindow));
- if (nIdleState == tools::IdleDetection::IDET_IDLE)
- return true;
- else
- return false;
-}
-
-
-} } } // end of namespace ::sd::slidesorter::cache
-
-
-
diff --git a/sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx b/sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx
deleted file mode 100644
index a0ad5422496a..000000000000
--- a/sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************
- *
- * 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_SLIDESORTER_IDLE_DETECTOR_HXX
-#define SD_SLIDESORTER_IDLE_DETECTOR_HXX
-
-class Window;
-
-namespace sd { namespace slidesorter { namespace cache {
-
-class IdleDetector
-{
-public:
- IdleDetector (const ::Window* pWindow, const bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation);
- bool operator() (void);
-
-private:
- const ::Window* mpWindow;
- const bool mbIsSuspendPreviewUpdatesDuringFullScreenPresentation;
-};
-
-
-
-
-} } } // end of namespace ::sd::slidesorter::cache
-
-#endif
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
index 29b7cdb687d1..714e1f008329 100644..100755
--- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
@@ -29,7 +29,6 @@
#include "SlsGenericPageCache.hxx"
#include "SlsRequestFactory.hxx"
-#include "SlsIdleDetector.hxx"
#include "cache/SlsPageCache.hxx"
#include "model/SlideSorterModel.hxx"
#include <boost/bind.hpp>
@@ -81,25 +80,6 @@ BitmapEx PageCache::GetPreviewBitmap (
-void PageCache::RequestPreviewBitmap (
- CacheKey aKey,
- const Size& rSize)
-{
- return mpImplementation->RequestPreviewBitmap(aKey, rSize);
-}
-
-
-
-
-void PageCache::InvalidatePreviewBitmap (
- CacheKey aKey)
-{
- mpImplementation->InvalidatePreviewBitmap(aKey);
-}
-
-
-
-
void PageCache::ReleasePreviewBitmap (
CacheKey aKey)
{
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index 86354c823b7e..bec9c7fa369d 100644..100755
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -30,7 +30,6 @@
#include "SlsQueueProcessor.hxx"
#include "SlsCacheConfiguration.hxx"
#include "SlsRequestQueue.hxx"
-#include "SlsIdleDetector.hxx"
namespace sd { namespace slidesorter { namespace cache {
diff --git a/sd/source/ui/slidesorter/cache/makefile.mk b/sd/source/ui/slidesorter/cache/makefile.mk
index d9766e892992..58862a28645a 100644..100755
--- a/sd/source/ui/slidesorter/cache/makefile.mk
+++ b/sd/source/ui/slidesorter/cache/makefile.mk
@@ -49,7 +49,6 @@ SLOFILES = \
$(SLO)$/SlsCacheCompactor.obj \
$(SLO)$/SlsCacheConfiguration.obj \
$(SLO)$/SlsGenericPageCache.obj \
- $(SLO)$/SlsIdleDetector.obj \
$(SLO)$/SlsPageCache.obj \
$(SLO)$/SlsPageCacheManager.obj \
$(SLO)$/SlsQueueProcessor.obj \
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index d90f6f0f824f..69c2a02ddc24 100644..100755
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -210,14 +210,6 @@ SlideSorterController::~SlideSorterController (void)
-SlideSorter& SlideSorterController::GetSlideSorter (void) const
-{
- return mrSlideSorter;
-}
-
-
-
-
model::SharedPageDescriptor SlideSorterController::GetPageAt (
const Point& aPixelPosition)
{
@@ -229,23 +221,6 @@ model::SharedPageDescriptor SlideSorterController::GetPageAt (
return pDescriptorAtPoint;
}
-
-
-
-model::SharedPageDescriptor SlideSorterController::GetFadePageAt (
- const Point& aPixelPosition)
-{
- sal_Int32 nHitPageIndex (mrView.GetFadePageIndexAtPoint(aPixelPosition));
- model::SharedPageDescriptor pDescriptorAtPoint;
- if (nHitPageIndex >= 0)
- pDescriptorAtPoint = mrModel.GetPageDescriptor(nHitPageIndex);
-
- return pDescriptorAtPoint;
-}
-
-
-
-
PageSelector& SlideSorterController::GetPageSelector (void)
{
OSL_ASSERT(mpPageSelector.get()!=NULL);
@@ -800,50 +775,6 @@ Rectangle SlideSorterController::Rearrange (bool bForce)
-void SlideSorterController::SetZoom (long int nZoom)
-{
- ::sd::Window* pWindow = mrSlideSorter.GetActiveWindow();
- long int nCurrentZoom ((long int)(
- pWindow->GetMapMode().GetScaleX().operator double() * 100));
-
- if (nZoom > nCurrentZoom)
- {
- Size aPageSize (mrView.GetPageBoundingBox(
- 0,
- view::SlideSorterView::CS_MODEL,
- view::SlideSorterView::BBT_SHAPE).GetSize());
- Size aWindowSize (pWindow->PixelToLogic(
- pWindow->GetOutputSizePixel()));
-
- // The zoom factor must not grow by more then the ratio of the
- // widths of the output window and the page objects.
- long nMaxFactor
- = nCurrentZoom * aWindowSize.Width() / aPageSize.Width();
- // Apply rounding, so that a current zoom factor of 1 is still
- // increased.
- nMaxFactor = (nCurrentZoom * 18 + 5) / 10;
- nZoom = Min(nMaxFactor, nZoom);
- }
- if (nZoom < 1)
- nZoom = 1;
-
- mrView.LockRedraw (TRUE);
- mrView.GetLayouter().SetZoom(nZoom/100.0, pWindow);
- mrView.Layout();
- GetScrollBarManager().UpdateScrollBars (false);
- mrView.GetPreviewCache()->InvalidateCache();
- mrView.RequestRepaint();
- mrView.LockRedraw (FALSE);
-
- /*
- ViewShell::SetZoom (nZoom);
- GetViewFrame()->GetBindings().Invalidate (SID_ATTR_ZOOM);
- */
-}
-
-
-
-
FunctionReference SlideSorterController::CreateSelectionFunction (SfxRequest& rRequest)
{
FunctionReference xFunc( SelectionFunction::Create(mrSlideSorter, rRequest) );
diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
index 5fdee6400959..f5864c3307a1 100644..100755
--- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
@@ -253,19 +253,4 @@ void CurrentSlideManager::HandleModelChange (void)
}
}
-
-
-
-SdPage* GetCurrentSdPage (SlideSorter& rSlideSorter)
-{
- SharedPageDescriptor pDescriptor (
- rSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide());
- if (pDescriptor.get() == NULL)
- return NULL;
- else
- return pDescriptor->GetPage();
-}
-
-
-
} } } // end of namespace ::sd::slidesorter::controller
diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
index b50be47a0188..0e8f5e100d1c 100644..100755
--- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
@@ -177,17 +177,6 @@ void PageSelector::DeselectPage (int nPageIndex)
-void PageSelector::DeselectPage (const SdPage* pPage)
-{
- int nPageIndex = (pPage->GetPageNum()-1) / 2;
- SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(nPageIndex));
- if (pDescriptor.get()!=NULL && pDescriptor->GetPage()==pPage)
- DeselectPage(pDescriptor);
-}
-
-
-
-
void PageSelector::DeselectPage (const SharedPageDescriptor& rpDescriptor)
{
if (rpDescriptor.get()!=NULL && rpDescriptor->Deselect())
diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
index b928eeb9f4ce..5ee7f6f58b82 100644..100755
--- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
@@ -219,26 +219,6 @@ void ScrollBarManager::PlaceFiller (const Rectangle& aArea)
-void ScrollBarManager::AdaptWindowSize (const Rectangle& rArea)
-{
- Size aPixelContentSize (mpContentWindow->LogicToPixel(
- mrSlideSorter.GetView().GetLayouter().GetPageBox (
- mrSlideSorter.GetModel().GetPageCount()).GetSize()));
- int nHeightDifference = aPixelContentSize.Height() - rArea.GetHeight();
- ::Window* pParentWindow = mpContentWindow->GetParent();
- Size aNewWindowSize (pParentWindow->GetSizePixel());
- if (nHeightDifference != 0)
- {
- aNewWindowSize.Height() += nHeightDifference;
- pParentWindow->SetPosSizePixel(
- pParentWindow->GetPosPixel(),
- aNewWindowSize);
- }
-}
-
-
-
-
void ScrollBarManager::UpdateScrollBars (bool bResetThumbPosition, bool bUseScrolling)
{
Rectangle aModelArea (mrSlideSorter.GetView().GetModelArea());
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx
index d24f8a347646..687019954feb 100644..100755
--- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx
@@ -54,18 +54,6 @@ SelectionCommand::SelectionCommand (
-void SelectionCommand::AddSlides (
- const ::boost::shared_ptr<PageSelector::PageSelection>& rpSelection)
-{
- PageSelector::PageSelection::iterator iPage = rpSelection->begin();
- PageSelector::PageSelection::iterator iEnd = rpSelection->end();
- for (; iPage!=iEnd; ++iPage)
- AddSlide(((*iPage)->GetPageNum()-1)/2);
-}
-
-
-
-
void SelectionCommand::AddSlide (USHORT nPageIndex)
{
maPagesToSelect.push_back(nPageIndex);
@@ -74,14 +62,6 @@ void SelectionCommand::AddSlide (USHORT nPageIndex)
-void SelectionCommand::SetCurrentSlide (USHORT nPageIndex)
-{
- mnCurrentPageIndex = nPageIndex;
-}
-
-
-
-
void SelectionCommand::operator() (void)
{
OSL_ASSERT(mpCurrentSlideManager.get()!=NULL);
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx
index 88ce0ea29b75..7a9d0f27369e 100644..100755
--- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx
@@ -64,24 +64,11 @@ public:
const ::boost::shared_ptr<controller::CurrentSlideManager>& rpCurrentSlideManager,
const model::SlideSorterModel& rModel);
- /** Add the pages in the given list of selected pages to those that will
- be selected when this command is executed, i.e. its operator()
- method is called.
- The first page will be set as current page when the new current page
- has not been specified previously.
- */
- void AddSlides (const ::boost::shared_ptr<PageSelector::PageSelection>& rpSelection);
-
/** Remember the specified page to be selected when this command is
executed.
*/
void AddSlide (USHORT nPageIndex);
- /** Call this method to explicitly set the page that will be made the
- current page when this command is executed.
- */
- void SetCurrentSlide (USHORT nPageIndex);
-
/** Execute the command and select the pages added by previous calls to
AddPages() and AddPage().
*/
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 710e7c2eb02d..c1d742ce7158 100644..100755
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -47,7 +47,6 @@
#include "view/SlsLayouter.hxx"
#include "view/SlsPageObjectViewObjectContact.hxx"
#include "framework/FrameworkHelper.hxx"
-#include "showview.hxx"
#include "ViewShellBase.hxx"
#include "DrawController.hxx"
#include <vcl/sound.hxx>
@@ -136,26 +135,6 @@ private:
};
-class SelectionFunction::InsertionIndicatorHandler
-{
-public:
- InsertionIndicatorHandler (SlideSorter& rSlideSorter);
- ~InsertionIndicatorHandler (void);
-
- /** Show the insertion marker at the given coordinates.
- */
- void Start (const Point& rMouseModelPosition);
-
- void UpdatePosition (const Point& rMouseModelPosition);
-
- /** Hide the insertion marker.
- */
- void End (void);
-
-private:
- SlideSorter& mrSlideSorter;
-};
-
class SelectionFunction::EventDescriptor
{
public:
@@ -188,8 +167,7 @@ SelectionFunction::SelectionFunction (
mbDragSelection(false),
maInsertionMarkerBox(),
mbProcessingMouseButtonDown(false),
- mpSubstitutionHandler(new SubstitutionHandler(mrSlideSorter)),
- mpInsertionIndicatorHandler(new InsertionIndicatorHandler(mrSlideSorter))
+ mpSubstitutionHandler(new SubstitutionHandler(mrSlideSorter))
{
//af aDelayToScrollTimer.SetTimeout(50);
aDragTimer.SetTimeoutHdl( LINK( this, SelectionFunction, DragSlideHdl ) );
@@ -710,20 +688,6 @@ void SelectionFunction::GotoNextPage (int nOffset)
-void SelectionFunction::ClearOverlays (void)
-{
- view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay());
-
- rOverlay.GetSubstitutionOverlay().setVisible(false);
- rOverlay.GetSubstitutionOverlay().Clear();
-
- mpInsertionIndicatorHandler->End();
- rOverlay.GetMouseOverIndicatorOverlay().SetSlideUnderMouse(model::SharedPageDescriptor());
-}
-
-
-
-
void SelectionFunction::ProcessMouseEvent (sal_uInt32 nEventType, const MouseEvent& rEvent)
{
// #95491# remember button state for creation of own MouseEvents
@@ -1350,55 +1314,4 @@ bool SelectionFunction::SubstitutionHandler::IsSubstitutionInsertionNonTrivial (
return bIsNonTrivial;
}
-
-
-
-//===== InsertionIndicatorHandler =============================================
-
-SelectionFunction::InsertionIndicatorHandler::InsertionIndicatorHandler (
- SlideSorter& rSlideSorter)
- : mrSlideSorter(rSlideSorter)
-{
-}
-
-
-
-
-SelectionFunction::InsertionIndicatorHandler::~InsertionIndicatorHandler (void)
-{
-}
-
-
-
-
-void SelectionFunction::InsertionIndicatorHandler::Start (const Point& rMouseModelPosition)
-{
- if (mrSlideSorter.GetController().GetProperties()->IsUIReadOnly())
- return;
-
- view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay());
- rOverlay.GetInsertionIndicatorOverlay().SetPosition(rMouseModelPosition);
- rOverlay.GetInsertionIndicatorOverlay().setVisible(true);
-}
-
-
-
-
-void SelectionFunction::InsertionIndicatorHandler::UpdatePosition (const Point& rMouseModelPosition)
-{
- if (mrSlideSorter.GetController().GetProperties()->IsUIReadOnly())
- return;
-
- view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay());
- rOverlay.GetInsertionIndicatorOverlay().SetPosition(rMouseModelPosition);
-}
-
-
-
-
-void SelectionFunction::InsertionIndicatorHandler::End (void)
-{
- mrSlideSorter.GetView().GetOverlay().GetInsertionIndicatorOverlay().setVisible(false);
-}
-
} } } // end of namespace ::sd::slidesorter::controller
diff --git a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx
index 1b70cb1e154e..7fe090ad5541 100644..100755
--- a/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlideFunction.cxx
@@ -53,12 +53,6 @@ SlideFunction::SlideFunction (
{
}
-FunctionReference SlideFunction::Create( SlideSorter& rSlideSorter, SfxRequest& rRequest )
-{
- FunctionReference xFunc( new SlideFunction( rSlideSorter, rRequest ) );
- return xFunc;
-}
-
void SlideFunction::ScrollStart (void)
{
}
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 85d07f0e74df..6c1123abc031 100755
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -477,68 +477,6 @@ void SlotManager::GetAttrState (SfxItemSet& rSet)
}
}
-
-
-
-void SlotManager::GetCtrlState (SfxItemSet& rSet)
-{
- if (rSet.GetItemState(SID_RELOAD) != SFX_ITEM_UNKNOWN)
- {
- // "Letzte Version" vom SFx en/disablen lassen
- ViewShell* pShell = mrSlideSorter.GetViewShell();
- if (pShell != NULL)
- {
- SfxViewFrame* pSlideViewFrame = pShell->GetViewFrame();
- DBG_ASSERT(pSlideViewFrame!=NULL,
- "SlideSorterController::GetCtrlState: ViewFrame not found");
- pSlideViewFrame->GetSlotState (SID_RELOAD, NULL, &rSet);
- }
- }
-
- // Output quality.
- if (rSet.GetItemState(SID_OUTPUT_QUALITY_COLOR)==SFX_ITEM_AVAILABLE
- ||rSet.GetItemState(SID_OUTPUT_QUALITY_GRAYSCALE)==SFX_ITEM_AVAILABLE
- ||rSet.GetItemState(SID_OUTPUT_QUALITY_BLACKWHITE)==SFX_ITEM_AVAILABLE
- ||rSet.GetItemState(SID_OUTPUT_QUALITY_CONTRAST)==SFX_ITEM_AVAILABLE)
- {
- ULONG nMode = mrSlideSorter.GetView().GetWindow()->GetDrawMode();
- UINT16 nQuality = 0;
-
- switch (nMode)
- {
- case ::sd::ViewShell::OUTPUT_DRAWMODE_COLOR:
- nQuality = 0;
- break;
- case ::sd::ViewShell::OUTPUT_DRAWMODE_GRAYSCALE:
- nQuality = 1;
- break;
- case ::sd::ViewShell::OUTPUT_DRAWMODE_BLACKWHITE:
- nQuality = 2;
- break;
- case ::sd::ViewShell::OUTPUT_DRAWMODE_CONTRAST:
- nQuality = 3;
- break;
- }
-
- rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_COLOR,
- (BOOL)(nQuality==0)));
- rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_GRAYSCALE,
- (BOOL)(nQuality==1)));
- rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_BLACKWHITE,
- (BOOL)(nQuality==2)));
- rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_CONTRAST,
- (BOOL)(nQuality==3)));
- }
-
- if (rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN) == SFX_ITEM_AVAILABLE)
- {
- rSet.Put (SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, TRUE));
- }
-}
-
-
-
-
void SlotManager::GetMenuState ( SfxItemSet& rSet)
{
EditMode eEditMode = mrSlideSorter.GetModel().GetEditMode();
@@ -1154,38 +1092,6 @@ void SlotManager::InsertSlide (SfxRequest& rRequest)
mrSlideSorter.GetView().LockRedraw(FALSE);
}
-
-
-
-void SlotManager::AssignTransitionEffect (void)
-{
- model::SlideSorterModel& rModel (mrSlideSorter.GetModel());
-
- // We have to manually select the pages in the document that are
- // selected in the slide sorter.
- rModel.SynchronizeDocumentSelection();
-
- // #i34011#: Needs review, AF's bugfix is removed here
- //rShell.AssignFromSlideChangeWindow(rModel.GetEditMode());
-
- // We have to remove the selection of master pages to not confuse the
- // model.
- if (rModel.GetEditMode() == EM_MASTERPAGE)
- {
- SdDrawDocument* pDocument = mrSlideSorter.GetModel().GetDocument();
- USHORT nMasterPageCount = pDocument->GetMasterSdPageCount(PK_STANDARD);
- for (USHORT nIndex=0; nIndex<nMasterPageCount; nIndex++)
- {
- SdPage* pPage = pDocument->GetMasterSdPage(nIndex, PK_STANDARD);
- if (pPage != NULL)
- pPage->SetSelected (FALSE);
- }
- }
-}
-
-
-
-
void SlotManager::ExecuteCommandAsynchronously (::std::auto_ptr<Command> pCommand)
{
// Ownership of command is (implicitely) transferred to the queue.
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
index 9a3256a07d86..4a5c2b51ac28 100644..100755
--- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
@@ -68,18 +68,11 @@ class RequestData;
bitmaps and throw.</li>
</p>
- <p>There are three somewhat similar methods for requesting new previews:
- a) GetPreviewBitmap() schedules a re-rendering (when necessary) and
+ <p>There is another somewhat similar methods for requesting new previews:
+ GetPreviewBitmap() schedules a re-rendering (when necessary) and
returns the preview what is currently available, either as a preview of
the preview or, when nothing has changed since the last call, as the
final thing.
- b) RequestPreviewBitmap() schedules, like GetPreviewBitmap(), a
- re-rendering when the currently available preview is not up-to-date. It
- does not, however, return anything. Use this if you can wait for the
- preview.
- c) InvalidatePreviewBitmap() does not schedule a re-rendering, but
- remembers that one is necessary when one of the other two methods is
- called.
</p>
*/
class PageCache
@@ -120,24 +113,6 @@ public:
CacheKey aKey,
const Size& rSize);
- /** When the requested preview bitmap does not yet exist or is not
- up-to-date then the rendering of one is scheduled. Otherwise this
- method does nothing.
- */
- void RequestPreviewBitmap (
- CacheKey aKey,
- const Size& rSize);
-
- /** Tell the cache that the bitmap associated with the given request
- data is not up-to-date anymore. Unlike the RequestPreviewBitmap()
- method this does not trigger the rendering itself. It just
- remembers to render it when the preview is requested the next time.
- @param rRequestData
- It is safe to pass a (barly) living object. It will called only
- once to obtain its page object.
- */
- void InvalidatePreviewBitmap (CacheKey aKey);
-
/** Call this method when a view-object-contact object is being deleted
and does not need (a) its current bitmap in the cache and (b) a
requested new bitmap.
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index af90b60932b9..667aa768ee8f 100644..100755
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -105,8 +105,6 @@ public:
*/
Rectangle Rearrange (bool bForce = false);
- SlideSorter& GetSlideSorter (void) const;
-
/** Return the descriptor of the page that is rendered under the
given position.
@return
@@ -116,14 +114,6 @@ public:
*/
model::SharedPageDescriptor GetPageAt (const Point& rPixelPosition);
- /** Return the descriptor of the page that is associated to the page
- visible fade symbol at the given position.
- @return
- When the given position is not over a visible page fade symbol
- then NULL is returned.
- */
- model::SharedPageDescriptor GetFadePageAt (const Point& rPixelPosition);
-
PageSelector& GetPageSelector (void);
FocusManager& GetFocusManager (void);
controller::Clipboard& GetClipboard (void);
@@ -189,14 +179,6 @@ public:
*/
void UpdateAllPages (void);
- /** Set the zoom factor. The given value is clipped against an upper
- bound.
- @param nZoom
- An integer percent value, i.e. nZoom/100 is the actual zoom
- factor.
- */
- void SetZoom (long int nZoom);
-
/** This factory method creates a selection function.
*/
virtual FunctionReference CreateSelectionFunction (SfxRequest& rRequest);
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
index 24420160b8cd..57aaf9293301 100644..100755
--- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
@@ -91,7 +91,6 @@ public:
/** Deselect the descriptor that is associated with the given page.
*/
void DeselectPage (int nPageIndex);
- void DeselectPage (const SdPage* pPage);
void DeselectPage (const model::SharedPageDescriptor& rpDescriptor);
/** This convenience method returns the same number of pages that
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
index 9d4c5a9329e2..c93ed7708650 100644..100755
--- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
@@ -242,13 +242,6 @@ private:
void PlaceHorizontalScrollBar (const Rectangle& aArea);
void PlaceVerticalScrollBar (const Rectangle& aArea);
void PlaceFiller (const Rectangle& aArea);
-
- /** Make the height of the content window larger or smaller, so that the
-
- content size fits exactly in. This is achieved by changing the size
- of the parent window and rely on the resulting resize.
- */
- void AdaptWindowSize (const Rectangle& rArea);
};
} } } // end of namespace ::sd::slidesorter::controller
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
index ef2bcd7b5617..79b8a1ff5d44 100644..100755
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
@@ -99,7 +99,6 @@ protected:
private:
class SubstitutionHandler;
class EventDescriptor;
- class InsertionIndicatorHandler;
/// Set in MouseButtonDown this flag indicates that a page has been hit.
bool mbPageHit;
@@ -121,8 +120,6 @@ private:
::std::auto_ptr<SubstitutionHandler> mpSubstitutionHandler;
- ::std::auto_ptr<InsertionIndicatorHandler> mpInsertionIndicatorHandler;
-
DECL_LINK( DragSlideHdl, Timer* );
void StartDrag (void);
@@ -182,11 +179,6 @@ private:
*/
void ProcessRectangleSelection (bool bToggleSelection);
- /** Hide and clear the insertion indiciator, substitution display and
- selection rectangle.
- */
- void ClearOverlays (void);
-
/** Compute a numerical code that describes a mouse event and that can
be used for fast look up of the appropriate reaction.
*/
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx
index 843e6e82b45c..5b8c7d9a08b6 100644..100755
--- a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx
@@ -50,8 +50,6 @@ class SlideFunction
public:
TYPEINFO();
- static FunctionReference Create( SlideSorter& rSlideSorter, SfxRequest& rRequest );
-
virtual BOOL MouseMove (const MouseEvent& rMEvt);
virtual BOOL MouseButtonUp (const MouseEvent& rMEvt);
virtual BOOL MouseButtonDown (const MouseEvent& rMEvt);
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
index d7b7a0e06831..0e58d5d3b411 100644..100755
--- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
@@ -63,7 +63,6 @@ public:
void FuTemporary (SfxRequest& rRequest);
void FuPermanent (SfxRequest& rRequest);
void FuSupport (SfxRequest& rRequest);
- void GetCtrlState (SfxItemSet &rSet);
void GetMenuState (SfxItemSet &rSet);
void GetClipboardState (SfxItemSet &rSet);
void GetStatusBarState (SfxItemSet& rSet);
@@ -94,8 +93,6 @@ private:
*/
void InsertSlide (SfxRequest& rRequest);
- void AssignTransitionEffect (void);
-
DECL_LINK(UserEventCallback, void*);
};
diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
index 42bc6c2140f7..4ade19087304 100644..100755
--- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
@@ -83,9 +83,6 @@ public:
*/
bool SetEditMode (EditMode eEditMode);
- /** Set the edit mode to that currently used by the controller.
- */
- bool SetEditModeFromController (void);
EditMode GetEditMode (void) const;
PageKind GetPageType (void) const;
@@ -147,10 +144,6 @@ public:
*/
void SynchronizeDocumentSelection (void);
- /** Set the selection of the called model to exactly that of the document.
- */
- void SynchronizeModelSelection (void);
-
/** Replace the factory for the creation of the page objects and
contacts with the given object. The old factory is destroyed.
*/
diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
index 0854ad5e678a..81877ce7465c 100644..100755
--- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
@@ -100,13 +100,6 @@ public:
*/
css::uno::Reference<css::drawing::XDrawPage> GetXDrawPage (void) const;
- /** Returns the index of the page as it is displayed in the view as page
- number. The value may differ from the index returned by the
- XDrawPage when there are hidden slides and the XIndexAccess used to
- access the model filters them out.
- */
- sal_Int32 GetPageIndex (void) const;
-
/** Return the page shape that is used for visualizing the page.
*/
view::PageObject* GetPageObject (void);
@@ -176,10 +169,6 @@ public:
void SetPageNumberAreaModelSize (const Size& rSize);
Size GetPageNumberAreaModelSize (void) const;
- /** Returns <TRUE/> when the slide is the current slide.
- */
- bool IsCurrentPage (void) const;
-
/** Set or revoke the state of this slide being the current slide.
*/
void SetIsCurrentPage (const bool bIsCurrent);
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index d5c8dd4bf241..6c16a154ecfd 100644..100755
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -134,7 +134,6 @@ public:
given position.
*/
sal_Int32 GetPageIndexAtPoint (const Point& rPosition) const;
- sal_Int32 GetFadePageIndexAtPoint (const Point& rPosition) const;
view::Layouter& GetLayouter (void);
@@ -206,8 +205,6 @@ public:
*/
void SetSelectionRectangleVisibility (bool bVisible);
- ::sdr::contact::ObjectContact& GetObjectContact (void) const;
-
typedef ::std::pair<sal_Int32,sal_Int32> PageRange;
/** Return the range of currently visible page objects including the
first and last one in that range.
@@ -217,16 +214,6 @@ public:
*/
PageRange GetVisiblePageRange (void);
- /** Return the size of the area where the page numbers are displayed.
- @return
- The returned size is given in model coordinates.
- */
- Size GetPageNumberAreaModelSize (void) const;
-
- /** Return the size of the border around the original SdrPageObj.
- */
- SvBorder GetModelBorder (void) const;
-
/** Add a shape to the page. Typically used from inside
PostModelChange().
*/
diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
index 246dcbc05ee7..9b1fd996e9c0 100644..100755
--- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
@@ -69,14 +69,6 @@ public:
Layouter (void);
~Layouter (void);
- /** Set the minimal, the maximal, and the desired width of the page
- objects. The three parameters have to fullfill the constraint
- nMinimalWidth <= nPreferredWidth <= nMaximalWidth or the call is
- ignored.
- */
- void SetObjectWidth (sal_Int32 nMinimalWidth, sal_Int32 nMaximalWidth,
- sal_Int32 nPreferredWidth);
-
/** Set the horizontal and vertical borders in pixel coordinates between
the enclosing window and page objects. The borders may be painted
larger then the given values when the space for the insertion marker
@@ -114,13 +106,6 @@ public:
void SetPageBorders (sal_Int32 nLeftBorder, sal_Int32 nRightBorder,
sal_Int32 nTopBorder, sal_Int32 nBottomBorder);
- /** Set the horizontal and vertical gaps between adjacent page objects.
- These gaps are only relevant when there is more than one column or
- more than one row. Negative values indicate that the respective gap
- is not set.
- */
- void SetGaps (sal_Int32 nHorizontalGap, sal_Int32 nVerticalGap);
-
/** Set the interval of valid column counts. When nMinimalColumnCount
<= nMaximalColumnCount is not fullfilled then the call is ignored.
@param nMinimalColumnCount
@@ -160,19 +145,12 @@ public:
/** Change the zoom factor. This does not change the general layout
(number of columns).
*/
- void SetZoom (double nZoomFactor, OutputDevice* pDevice);
void SetZoom (Fraction nZoomFactor, OutputDevice* pDevice);
/** Return the number of columns.
*/
sal_Int32 GetColumnCount (void) const;
- /** Returns whether the column count is fixed (<TRUE/>) or variable
- (<FALSE/>). It is fixed if SetColumnCount() was called with the
- same value for minimal and maximal column count.
- */
- bool IsColumnCountFixed (void) const;
-
/** Return the scale factor that can be set at the map mode of the
output window.
*/
@@ -289,7 +267,6 @@ public:
const DoublePoint&rLayouterPoint) const;
typedef ::std::vector<Rectangle> BackgroundRectangleList;
- const BackgroundRectangleList& GetBackgroundRectangleList (void) const;
private:
class ScreenAndModelValue {public:
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx
index c0083ff92d73..31899d3b3e44 100644..100755
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewContact.hxx
@@ -69,8 +69,6 @@ public:
SdrPageObj& GetPageObject (void) const;
- Rectangle GetPageObjectBoundingBox (void) const;
-
virtual void ActionChanged (void);
protected:
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
index b149320cf0f2..0bf9052f5382 100755
--- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
+++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
@@ -121,30 +121,6 @@ bool SlideSorterModel::SetEditMode (EditMode eEditMode)
-bool SlideSorterModel::SetEditModeFromController (void)
-{
- bool bIsMasterPageMode = false;
- // Get the edit mode from the controller.
- try
- {
- Reference<beans::XPropertySet> xSet (mrSlideSorter.GetXController(), UNO_QUERY_THROW);
- Any aValue (xSet->getPropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsMasterPageMode"))));
- aValue >>= bIsMasterPageMode;
- }
- catch (RuntimeException&)
- {
- // When the property is not supported then the master
- // page mode is not supported, too.
- bIsMasterPageMode = false;
- }
-
- return SetEditMode(bIsMasterPageMode ? EM_MASTERPAGE : EM_PAGE);
-}
-
-
-
-
EditMode SlideSorterModel::GetEditMode (void) const
{
return meEditMode;
@@ -311,27 +287,6 @@ void SlideSorterModel::SynchronizeDocumentSelection (void)
}
}
-
-
-
-void SlideSorterModel::SynchronizeModelSelection (void)
-{
- ::osl::MutexGuard aGuard (maMutex);
-
- PageEnumeration aAllPages (PageEnumerationProvider::CreateAllPagesEnumeration(*this));
- while (aAllPages.HasMoreElements())
- {
- SharedPageDescriptor pDescriptor (aAllPages.GetNextElement());
- if (pDescriptor->GetPage()->IsSelected())
- pDescriptor->Select ();
- else
- pDescriptor->Deselect ();
- }
-}
-
-
-
-
void SlideSorterModel::SetPageObjectFactory(
::std::auto_ptr<controller::PageObjectFactory> pPageObjectFactory)
{
diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx
index 2010d313c9dd..ffd93cbf0a13 100644..100755
--- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx
+++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx
@@ -92,14 +92,6 @@ Reference<drawing::XDrawPage> PageDescriptor::GetXDrawPage (void) const
-sal_Int32 PageDescriptor::GetPageIndex (void) const
-{
- return mnIndex;
-}
-
-
-
-
view::PageObject* PageDescriptor::GetPageObject (void)
{
if (mpPageObject==NULL && mpPageObjectFactory!=NULL && mpPage != NULL)
@@ -279,14 +271,6 @@ Size PageDescriptor::GetPageNumberAreaModelSize (void) const
-bool PageDescriptor::IsCurrentPage (void) const
-{
- return mbIsCurrent;
-}
-
-
-
-
void PageDescriptor::SetIsCurrentPage (const bool bIsCurrent)
{
mbIsCurrent = bIsCurrent;
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
index db5d948b52fc..787086b4596e 100644..100755
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
@@ -631,18 +631,6 @@ void SlideSorterService::Resize (void)
-void SlideSorterService::Rearrange (void)
-{
- if (mxParentWindow.is())
- {
- awt::Rectangle aWindowBox = mxParentWindow->getPosSize();
- mpSlideSorter->GetController().Rearrange();
- }
-}
-
-
-
-
void SlideSorterService::ThrowIfDisposed (void)
throw (::com::sun::star::lang::DisposedException)
{
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
index a502442ab9f2..9af239c64fd1 100644..100755
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
@@ -204,7 +204,6 @@ private:
::boost::scoped_ptr<cppu::IPropertyArrayHelper> mpPropertyArrayHelper;
void Resize (void);
- void Rearrange (void);
/** This method throws a DisposedException when the object has already been
disposed.
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 83475948fab2..86ec4002cd02 100644..100755
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -327,22 +327,6 @@ SfxUndoManager* SlideSorterViewShell::ImpGetUndoManager (void) const
-SfxShell* SlideSorterViewShell::CreateInstance (
- sal_Int32,
- SfxShell*,
- void* pUserData,
- ViewShellBase& rBase)
-{
- return new SlideSorterViewShell (
- rBase.GetViewFrame(),
- rBase,
- static_cast< ::Window*>(pUserData),
- NULL);
-}
-
-
-
-
void SlideSorterViewShell::GetFocus (void)
{
OSL_ASSERT(mpSlideSorter.get()!=NULL);
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 82aac5b2cd9e..47ce907be637 100644..100755
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -171,52 +171,6 @@ sal_Int32 SlideSorterView::GetPageIndexAtPoint (const Point& rPosition) const
-sal_Int32 SlideSorterView::GetFadePageIndexAtPoint (
- const Point& rPosition) const
-{
- sal_Int32 nIndex (-1);
-
- ::sd::Window* pWindow = GetWindow();
- if (pWindow != NULL)
- {
- Point aModelPosition (pWindow->PixelToLogic (rPosition));
- nIndex = mpLayouter->GetIndexAtPoint(
- aModelPosition,
- true // Include page borders into hit test
- );
-
- // Clip the page index against the page count.
- if (nIndex >= mrModel.GetPageCount())
- nIndex = -1;
-
- if (nIndex >= 0)
- {
- // Now test whether the given position is inside the area of the
- // fade effect indicator.
- view::PageObjectViewObjectContact* pContact
- = mrModel.GetPageDescriptor(nIndex)->GetViewObjectContact();
- if (pContact != NULL)
- {
- if ( ! pContact->GetBoundingBox(
- *pWindow,
- PageObjectViewObjectContact::FadeEffectIndicatorBoundingBox,
- PageObjectViewObjectContact::ModelCoordinateSystem).IsInside (
- aModelPosition))
- {
- nIndex = -1;
- }
- }
- else
- nIndex = -1;
- }
- }
-
- return nIndex;
-}
-
-
-
-
Layouter& SlideSorterView::GetLayouter (void)
{
return *mpLayouter.get();
@@ -725,14 +679,6 @@ ViewOverlay& SlideSorterView::GetOverlay (void)
-::sdr::contact::ObjectContact& SlideSorterView::GetObjectContact (void) const
-{
- return GetSdrPageView()->GetPageWindow(0)->GetObjectContact();
-}
-
-
-
-
SlideSorterView::PageRange SlideSorterView::GetVisiblePageRange (void)
{
const int nMaxPageIndex (mrModel.GetPageCount() - 1);
@@ -821,22 +767,6 @@ void SlideSorterView::UpdatePageBorders (void)
-Size SlideSorterView::GetPageNumberAreaModelSize (void) const
-{
- return maPageNumberAreaModelSize;
-}
-
-
-
-
-SvBorder SlideSorterView::GetModelBorder (void) const
-{
- return maModelBorder;
-}
-
-
-
-
void SlideSorterView::AddSdrObject (SdrObject& rObject)
{
mpPage->InsertObject(&rObject);
diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index 1ba44caa24b0..3767a655c48b 100644..100755
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -71,22 +71,6 @@ Layouter::~Layouter (void)
}
-void Layouter::SetObjectWidth (
- sal_Int32 nMinimalWidth,
- sal_Int32 nMaximalWidth,
- sal_Int32 nPreferredWidth)
-{
- if (nMinimalWidth <= nPreferredWidth && nPreferredWidth <= nMaximalWidth)
- {
- mnMinimalWidth = nMinimalWidth;
- mnPreferredWidth = nMaximalWidth;
- mnMaximalWidth = nPreferredWidth;
- }
-}
-
-
-
-
void Layouter::SetBorders (
sal_Int32 nLeftBorder,
sal_Int32 nRightBorder,
@@ -125,20 +109,6 @@ void Layouter::SetPageBorders (
-void Layouter::SetGaps (
- sal_Int32 nHorizontalGap,
- sal_Int32 nVerticalGap)
-{
- if (nHorizontalGap >= 0)
- mnHorizontalGap.mnScreen = nHorizontalGap;
- if (nVerticalGap >= 0)
- mnVerticalGap.mnScreen = nVerticalGap;
-}
-
-
-
-
-
void Layouter::SetColumnCount (
sal_Int32 nMinimalColumnCount,
sal_Int32 nMaximalColumnCount)
@@ -337,14 +307,6 @@ bool Layouter::RearrangeVertical (
-void Layouter::SetZoom (double nZoomFactor, OutputDevice* pDevice)
-{
- SetZoom(Fraction(nZoomFactor), pDevice);
-}
-
-
-
-
void Layouter::SetZoom (Fraction nZoomFactor, OutputDevice* pDevice)
{
MapMode aMapMode (pDevice->GetMapMode());
@@ -406,14 +368,6 @@ sal_Int32 Layouter::GetColumnCount (void) const
-bool Layouter::IsColumnCountFixed (void) const
-{
- return mnMinimalColumnCount == mnMaximalColumnCount;
-}
-
-
-
-
Size Layouter::GetPageObjectSize (void) const
{
return maPageObjectModelSize;
@@ -801,13 +755,4 @@ sal_Int32 Layouter::ResolvePositionInGap (
-const Layouter::BackgroundRectangleList&
- Layouter::GetBackgroundRectangleList (void) const
-{
- return maBackgroundRectangleList;
-}
-
-
-
-
} } } // end of namespace ::sd::slidesorter::namespace
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx
index 5ef90ad2830b..303e78eeff61 100644..100755
--- a/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewContact.cxx
@@ -93,21 +93,6 @@ void PageObjectViewContact::ActionChanged (void)
ViewContactOfPageObj::ActionChanged();
}
-Rectangle PageObjectViewContact::GetPageObjectBoundingBox (void) const
-{
- // use model data directly here
- OSL_ASSERT(mpDescriptor.get()!=NULL);
- Rectangle aRetval(GetPageObject().GetLastBoundRect());
- const SvBorder aPageDescriptorBorder(mpDescriptor->GetModelBorder());
-
- aRetval.Left() -= aPageDescriptorBorder.Left();
- aRetval.Top() -= aPageDescriptorBorder.Top();
- aRetval.Right() += aPageDescriptorBorder.Right();
- aRetval.Bottom() += aPageDescriptorBorder.Bottom();
-
- return aRetval;
-}
-
SdrPageObj& PageObjectViewContact::GetPageObject (void) const
{
return ViewContactOfPageObj::GetPageObj();
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
index 32098abb523f..b1e4e80fdf1f 100755
--- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
@@ -627,7 +627,6 @@ private:
// private helpers
const BitmapEx& getFadeEffectIconBitmap() const;
- const BitmapEx& getCommentsIconBitmap() const;
protected:
// method which is to be used to implement the local decomposition of a 2D primitive.
@@ -685,21 +684,6 @@ const BitmapEx& SdPageObjectFadeNameNumberPrimitive::getFadeEffectIconBitmap() c
const sal_Int32 SdPageObjectFadeNameNumberPrimitive::mnCommentsIndicatorOffset(9);
BitmapEx* SdPageObjectFadeNameNumberPrimitive::mpCommentsIconBitmap = 0;
-const BitmapEx& SdPageObjectFadeNameNumberPrimitive::getCommentsIconBitmap() const
-{
- if(mpCommentsIconBitmap == NULL)
- {
- // prepare CommentsIconBitmap on demand
- const sal_uInt16 nIconId(Application::GetSettings().GetStyleSettings().GetHighContrastMode()
- ? BMP_COMMENTS_INDICATOR_H
- : BMP_COMMENTS_INDICATOR);
- const BitmapEx aCommentsIconBitmap(IconCache::Instance().GetIcon(nIconId).GetBitmapEx());
- const_cast< SdPageObjectFadeNameNumberPrimitive* >(this)->mpCommentsIconBitmap = new BitmapEx(aCommentsIconBitmap);
- }
-
- return *mpCommentsIconBitmap;
-}
-
Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const
{
const xub_StrLen nTextLength(getPageName().Len());
diff --git a/sd/source/ui/toolpanel/EmptyWindow.cxx b/sd/source/ui/toolpanel/EmptyWindow.cxx
deleted file mode 100644
index 2e964fa4e30b..000000000000
--- a/sd/source/ui/toolpanel/EmptyWindow.cxx
+++ /dev/null
@@ -1,96 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sd.hxx"
-
-#include "EmptyWindow.hxx"
-
-namespace sd { namespace toolpanel {
-
-
-EmptyWindow::EmptyWindow (
- Window* pParentWindow,
- Color aBackgroundColor,
- const String& rText)
- : Window (pParentWindow, WinBits()),
- msText (rText)
-{
- SetBackground (aBackgroundColor);
-}
-
-
-
-
-EmptyWindow::~EmptyWindow (void)
-{
-}
-
-
-
-
-void EmptyWindow::Paint (const Rectangle& )
-{
- Size aWindowSize (GetOutputSizePixel());
- Point aPosition(aWindowSize.Width()/2,aWindowSize.Height()/2);
-
- Rectangle aBBox;
- aPosition = Point(10,aWindowSize.Height()/2);
- if (GetTextBoundRect (aBBox, msText))
- aPosition = Point (
- (aWindowSize.Width()-aBBox.GetWidth())/2,
- (aWindowSize.Height()-aBBox.GetHeight())/2);
- DrawText (aPosition, msText);
-
- String sSizeString = String::CreateFromInt32(aWindowSize.Width());
- sSizeString.Append (String::CreateFromAscii(" x "));
- sSizeString.Append (String::CreateFromInt32(aWindowSize.Height()));
- if (GetTextBoundRect (aBBox, sSizeString))
- aPosition = Point (
- (aWindowSize.Width()-aBBox.GetWidth())/2,
- aPosition.Y() + GetTextHeight() + aBBox.GetHeight());
- DrawText (aPosition, sSizeString);
-}
-
-
-
-
-void EmptyWindow::Resize (void)
-{
- Window::Resize();
-}
-
-
-
-
-void EmptyWindow::GetFocus (void)
-{
- GetParent()->GrabFocus();
-}
-
-
-} } // end of namespace ::sd::tpv
diff --git a/sd/source/ui/toolpanel/EmptyWindow.hxx b/sd/source/ui/toolpanel/EmptyWindow.hxx
deleted file mode 100644
index 4137020874f5..000000000000
--- a/sd/source/ui/toolpanel/EmptyWindow.hxx
+++ /dev/null
@@ -1,57 +0,0 @@
-/*************************************************************************
- *
- * 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_EMPTY_WINDOW_HXX
-#define SD_EMPTY_WINDOW_HXX
-
-#include <vcl/window.hxx>
-
-namespace sd { namespace toolpanel {
-
-/** Simply paint a solid background and a centered text.
-*/
-class EmptyWindow
- : public ::Window
-{
-public:
- EmptyWindow (
- ::Window* pParentWindow,
- Color rBackgroundColor,
- const String& rText);
- virtual ~EmptyWindow (void);
-
- virtual void Paint (const Rectangle& rBoundingBox);
- virtual void Resize (void);
- virtual void GetFocus (void);
-
-private:
- String msText;
-};
-
-} } // end of namespace ::sd::toolpanel
-
-#endif
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx
index 7e0fd41ffb89..ec4eb1e43d4d 100755
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -263,14 +263,6 @@ LayoutMenu::~LayoutMenu (void)
-String LayoutMenu::GetSelectedLayoutName (void)
-{
- return GetItemText (GetSelectItemId());
-}
-
-
-
-
AutoLayout LayoutMenu::GetSelectedAutoLayout (void)
{
AutoLayout aResult = AUTOLAYOUT_NONE;
diff --git a/sd/source/ui/toolpanel/LayoutMenu.hxx b/sd/source/ui/toolpanel/LayoutMenu.hxx
index 86e01e9f803b..627a363fb576 100755
--- a/sd/source/ui/toolpanel/LayoutMenu.hxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.hxx
@@ -90,10 +90,6 @@ public:
static std::auto_ptr<ControlFactory> CreateControlFactory (
ToolPanelViewShell& i_rPanelViewShell );
- /** Return the name of the currently selected layout.
- */
- String GetSelectedLayoutName (void);
-
/** Return a numerical value representing the currently selected
layout.
*/
diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx
index cae08c76ca39..6b10ed889424 100755
--- a/sd/source/ui/toolpanel/ScrollPanel.cxx
+++ b/sd/source/ui/toolpanel/ScrollPanel.cxx
@@ -134,15 +134,6 @@ ScrollPanel::~ScrollPanel (void)
-void ScrollPanel::ListHasChanged (void)
-{
- mpControlContainer->ListHasChanged ();
- RequestResize ();
-}
-
-
-
-
TitledControl* ScrollPanel::AddControl (
::std::auto_ptr<TreeNode> pControl,
const String& rTitle,
diff --git a/sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx b/sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx
deleted file mode 100644
index 0aa2d3f91760..000000000000
--- a/sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx
+++ /dev/null
@@ -1,98 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sd.hxx"
-
-#include "SimpleLayoutWrapper.hxx"
-
-#include <vcl/window.hxx>
-
-namespace sd { namespace toolpanel {
-
-SimpleLayoutWrapper::SimpleLayoutWrapper (
- ::std::auto_ptr< ::Window> pWindow,
- int nPreferredWidth,
- int nPreferredHeight,
- bool bIsResizable)
- : mpWindow (pWindow),
- mnPreferredWidth(nPreferredWidth),
- mnPreferredHeight(nPreferredHeight),
- mbIsResizable (bIsResizable)
-{
-}
-
-
-
-
-SimpleLayoutWrapper::~SimpleLayoutWrapper (void)
-{
-}
-
-
-
-
-Size SimpleLayoutWrapper::GetPreferredSize (void)
-{
- return Size (mnPreferredWidth, mnPreferredHeight);
-}
-
-
-
-
-sal_Int32 SimpleLayoutWrapper::GetPreferredWidth (sal_Int32)
-{
- return mnPreferredWidth;
-}
-
-
-
-
-sal_Int32 SimpleLayoutWrapper::GetPreferredHeight (sal_Int32)
-{
- return mnPreferredHeight;
-}
-
-
-
-
-bool SimpleLayoutWrapper::IsResizable (void)
-{
- return mbIsResizable;
-}
-
-
-
-
-::Window* SimpleLayoutWrapper::GetWindow (void)
-{
- return mpWindow.get();
-}
-
-
-} } // end of namespace ::sd::toolpanel
-
diff --git a/sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx b/sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx
deleted file mode 100644
index a05d9d6ff295..000000000000
--- a/sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************
- *
- * 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_TASKPANE_SIMPLE_LAYOUT_WRAPPER_HXX
-#define SD_TASKPANE_SIMPLE_LAYOUT_WRAPPER_HXX
-
-#include "taskpane/ILayoutableWindow.hxx"
-
-#include <memory>
-
-namespace sd { namespace toolpanel {
-
-
-/** Simple wrapper arround a regular VCL window that implements the
- methods that return the preferred size of the window. They are
- given once to the constructor and are not modified by the wrapper.
-*/
-class SimpleLayoutWrapper
- : public virtual ILayoutableWindow
-{
-public:
- SimpleLayoutWrapper (
- ::std::auto_ptr< ::Window> pWindow,
- int nPreferredWidth,
- int nPreferredHeight,
- bool bIsResizable);
- virtual ~SimpleLayoutWrapper (void);
-
- virtual Size GetPreferredSize (void);
- virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight);
- virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth);
- virtual bool IsResizable (void);
- virtual ::Window* GetWindow (void);
-
- using sd::toolpanel::ILayoutableWindow::GetPreferredWidth;
- using sd::toolpanel::ILayoutableWindow::GetPreferredHeight;
-private:
- ::std::auto_ptr< ::Window> mpWindow;
- int mnPreferredWidth;
- int mnPreferredHeight;
- bool mbIsResizable;
-};
-
-} } // end of namespace ::sd::toolpanel
-
-#endif
diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx b/sd/source/ui/toolpanel/SubToolPanel.cxx
index f554d44e8f18..73783b0f0a41 100755
--- a/sd/source/ui/toolpanel/SubToolPanel.cxx
+++ b/sd/source/ui/toolpanel/SubToolPanel.cxx
@@ -115,64 +115,6 @@ SubToolPanel::~SubToolPanel (void)
-void SubToolPanel::ListHasChanged (void)
-{
- mpControlContainer->ListHasChanged ();
- RequestResize ();
-}
-
-
-
-
-void SubToolPanel::AddControl (
- ::std::auto_ptr<TreeNode> pControl,
- const String& rTitle,
- ULONG nHelpId)
-{
- pControl->GetWindow()->AddEventListener (
- LINK(this,SubToolPanel,WindowEventListener));
-
- // We are interested only in the title. The control itself is
- // managed by the content object.
- TitledControl* pTitledControl = new TitledControl(
- this,
- pControl,
- rTitle,
- TitledControlStandardClickHandler(GetControlContainer(), ControlContainer::ES_TOGGLE),
- TitleBar::TBT_SUB_CONTROL_HEADLINE);
- pTitledControl->GetWindow()->SetParent(this);
- pTitledControl->GetWindow()->SetHelpId(nHelpId);
- ::std::auto_ptr<TreeNode> pChild (pTitledControl);
-
- // Add a down link only for the first control so that when
- // entering the sub tool panel the focus is set to the first control.
- if (mpControlContainer->GetControlCount() == 0)
- FocusManager::Instance().RegisterDownLink(GetParent(), pTitledControl->GetWindow());
- FocusManager::Instance().RegisterUpLink(pTitledControl->GetWindow(), GetParent());
-
- mpControlContainer->AddControl (pChild);
-}
-
-
-
-
-void SubToolPanel::AddControl (::std::auto_ptr<TreeNode> pControl)
-{
- pControl->GetWindow()->AddEventListener (
- LINK(this,SubToolPanel,WindowEventListener));
-
- // Add a down link only for the first control so that when
- // entering the sub tool panel the focus is set to the first control.
- if (mpControlContainer->GetControlCount() == 0)
- FocusManager::Instance().RegisterDownLink(GetParent(), pControl->GetWindow());
- FocusManager::Instance().RegisterUpLink(pControl->GetWindow(), GetParent());
-
- mpControlContainer->AddControl (pControl);
-}
-
-
-
-
void SubToolPanel::Paint (const Rectangle& rRect)
{
if (mbIsRearrangePending)
diff --git a/sd/source/ui/toolpanel/TaskPaneShellManager.cxx b/sd/source/ui/toolpanel/TaskPaneShellManager.cxx
index 52054c43fe8b..0a9667dd2431 100755
--- a/sd/source/ui/toolpanel/TaskPaneShellManager.cxx
+++ b/sd/source/ui/toolpanel/TaskPaneShellManager.cxx
@@ -76,19 +76,6 @@ void TaskPaneShellManager::ReleaseShell (SfxShell* )
// Nothing to do.
}
-// hack for annotation panel, better fix?
-void TaskPaneShellManager_AddSubShell ( TaskPaneShellManager* pManager, sal_Int32 nId, SfxShell* pShell, ::Window* pWindow )
-{
- if( pManager != NULL )
- pManager->AddSubShell( (ShellId)nId, pShell, pWindow );
-}
-
-void TaskPaneShellManager_RemoveSubShell ( TaskPaneShellManager* pManager, const SfxShell* pShell)
-{
- if( pManager != NULL )
- pManager->RemoveSubShell( pShell );
-}
-
void TaskPaneShellManager::AddSubShell (
ShellId nId,
SfxShell* pShell,
diff --git a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx
index f70e643636d5..8c69e12c504d 100755
--- a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx
+++ b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx
@@ -55,22 +55,6 @@ TreeNode::~TreeNode (void)
-bool TreeNode::IsLeaf (void)
-{
- return (mpControlContainer.get()==NULL);
-}
-
-
-
-
-bool TreeNode::IsRoot (void)
-{
- return (mpParent==NULL);
-}
-
-
-
-
void TreeNode::SetParentNode (TreeNode* pNewParent)
{
mpParent = pNewParent;
@@ -277,18 +261,6 @@ void TreeNode::AddStateChangeListener (const Link& rListener)
-void TreeNode::RemoveStateChangeListener (const Link& rListener)
-{
- maStateChangeListeners.erase (
- ::std::find (
- maStateChangeListeners.begin(),
- maStateChangeListeners.end(),
- rListener));
-}
-
-
-
-
void TreeNode::FireStateChangeEvent (
TreeNodeStateChangeEventId eEventId,
TreeNode* pChild) const
diff --git a/sd/source/ui/toolpanel/TestMenu.cxx b/sd/source/ui/toolpanel/TestMenu.cxx
index 54c865f12728..a8f0b6df7893 100755
--- a/sd/source/ui/toolpanel/TestMenu.cxx
+++ b/sd/source/ui/toolpanel/TestMenu.cxx
@@ -37,6 +37,7 @@
namespace sd { namespace toolpanel {
+#ifdef SHOW_COLOR_MENU
/** This factory class is used to create instances of ColorMenu. It can be
extended so that its constructor stores arguments that later are passed
to new ColorMenu objects.
@@ -82,16 +83,12 @@ ColorMenu::~ColorMenu (void)
}
-
-
::std::auto_ptr<ControlFactory> ColorMenu::CreateControlFactory (void)
{
return ::std::auto_ptr<ControlFactory>(new ColorMenuFactory());
}
-
-
/** The preferred size depends on the preferred number of columns, the
number of items, and the size of the items.
*/
@@ -316,5 +313,6 @@ void ColorMenu::Fill (void)
maSet.InsertItem (++i, rSettings.GetFontColor());
maSet.SetItemText (i, String::CreateFromAscii("FontColor"));
}
+#endif
} } // end of namespace ::sd::toolpanel
diff --git a/sd/source/ui/toolpanel/TestMenu.hxx b/sd/source/ui/toolpanel/TestMenu.hxx
index 2b5dfe2e2e57..0c4b3bfe6530 100755
--- a/sd/source/ui/toolpanel/TestMenu.hxx
+++ b/sd/source/ui/toolpanel/TestMenu.hxx
@@ -39,6 +39,8 @@ namespace sd { namespace toolpanel {
class ControlFactory;
+#ifdef SHOW_COLOR_MENU
+
/** This demo menu shows the colors that are available from the
StyleSettings.
*/
@@ -75,6 +77,7 @@ private:
int CalculateRowCount (const Size& rItemSize, int nColumnCount);
void Fill (void);
};
+#endif
} } // end of namespace ::sd::toolpanel
diff --git a/sd/source/ui/toolpanel/TestPanel.cxx b/sd/source/ui/toolpanel/TestPanel.cxx
index f0b6951cefc4..044b40dcdb4f 100755
--- a/sd/source/ui/toolpanel/TestPanel.cxx
+++ b/sd/source/ui/toolpanel/TestPanel.cxx
@@ -37,6 +37,7 @@
namespace sd { namespace toolpanel {
+#ifdef SHOW_TEST_PANEL
/** This factory class is used to create instances of TestPanel. It can be
extended so that its constructor stores arguments that later are passed
to new TestPanel objects.
@@ -163,13 +164,11 @@ TestPanel::~TestPanel (void)
{
}
-
-
-
std::auto_ptr<ControlFactory> TestPanel::CreateControlFactory (void)
{
return std::auto_ptr<ControlFactory>(new TestPanelFactory());
}
+#endif
} } // end of namespace ::sd::toolpanel
diff --git a/sd/source/ui/toolpanel/TestPanel.hxx b/sd/source/ui/toolpanel/TestPanel.hxx
index af1b97d0f885..494e5086b179 100755
--- a/sd/source/ui/toolpanel/TestPanel.hxx
+++ b/sd/source/ui/toolpanel/TestPanel.hxx
@@ -36,6 +36,8 @@ namespace sd { namespace toolpanel {
class ControlFactory;
class TreeNode;
+#ifdef SHOW_TEST_PANEL
+
/** This panel demonstrates how to create a panel for the task pane.
*/
class TestPanel
@@ -48,6 +50,8 @@ public:
static std::auto_ptr<ControlFactory> CreateControlFactory (void);
};
+#endif
+
} } // end of namespace ::sd::toolpanel
#endif
diff --git a/sd/source/ui/toolpanel/TitleToolBox.cxx b/sd/source/ui/toolpanel/TitleToolBox.cxx
deleted file mode 100755
index 403e826ee27a..000000000000
--- a/sd/source/ui/toolpanel/TitleToolBox.cxx
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sd.hxx"
-
-#include "TitleToolBox.hxx"
-
-#include "res_bmp.hrc"
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmapex.hxx>
-#include "sdresid.hxx"
-#include <rtl/ustring.hxx>
-
-namespace sd { namespace toolpanel {
-
-
-TitleToolBox::TitleToolBox (::Window* pParent, WinBits nStyle )
- : ToolBox( pParent, nStyle )
-{
- SetOutStyle (TOOLBOX_STYLE_FLAT);
- SetBackground (Wallpaper (
- GetSettings().GetStyleSettings().GetDialogColor()));
-}
-
-
-
-
-void TitleToolBox::DataChanged (const DataChangedEvent& rDCEvt)
-{
- Window::DataChanged (rDCEvt);
-
- if (rDCEvt.GetFlags() & SETTINGS_STYLE)
- {
- SetBackground (
- Wallpaper (GetSettings().GetStyleSettings().GetDialogColor()));
- }
-}
-
-
-
-
-} } // end of namespace ::sd::toolbox
diff --git a/sd/source/ui/toolpanel/TitleToolBox.hxx b/sd/source/ui/toolpanel/TitleToolBox.hxx
deleted file mode 100755
index db2c971c3539..000000000000
--- a/sd/source/ui/toolpanel/TitleToolBox.hxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************
- *
- * 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_TOOLBOX_TITLETOOLBOX_HXX
-#define SD_TOOLBOX_TITLETOOLBOX_HXX
-
-#include <vcl/toolbox.hxx>
-
-class PushButton;
-
-namespace sd { namespace toolpanel {
-
-/** Copied from vcl/menu.cxx
-// To get the transparent mouse-over look, the TitleToolBox is actually a toolbox
-// overload DataChange to handle style changes correctly
-*/
-class TitleToolBox
- : public ToolBox
-{
-public:
- TitleToolBox (::Window* pParent, WinBits nStyle = 0);
-
- void DataChanged (const DataChangedEvent& rDCEvt);
-};
-
-} } // end of namespace ::sd::toolbox
-
-#endif
diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx
index 4843102feb48..e83e6c47c10a 100755
--- a/sd/source/ui/toolpanel/TitledControl.cxx
+++ b/sd/source/ui/toolpanel/TitledControl.cxx
@@ -311,22 +311,6 @@ void TitledControl::SetEnabledState(bool bFlag)
-void TitledControl::SetUserData (void* pUserData)
-{
- mpUserData = pUserData;
-}
-
-
-
-
-void* TitledControl::GetUserData (void) const
-{
- return mpUserData;
-}
-
-
-
-
bool TitledControl::IsShowing (void) const
{
return mbVisible;
diff --git a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx
index c4fc41e97744..730fc74795f2 100644..100755
--- a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx
+++ b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx
@@ -24,7 +24,93 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: AnimationSchemesPanel.cxx,v $
+ * $Revision: 1.6 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sd.hxx"
+#include "AnimationSchemesPanel.hxx"
+
+#include "strings.hrc"
+#include "sdresid.hxx"
+#include <com/sun/star/frame/XModel.hpp>
+
+namespace sd
+{
+
+ class ViewShellBase;
+ extern ::Window * createAnimationSchemesPanel( ::Window* pParent, ViewShellBase& rBase );
+
+namespace toolpanel { namespace controls {
+
+AnimationSchemesPanel::AnimationSchemesPanel(TreeNode* pParent, ViewShellBase& rBase)
+ : SubToolPanel (pParent),
+ maPreferredSize( 100, 200 )
+{
+ mpWrappedControl = createAnimationSchemesPanel( pParent->GetWindow(), rBase );
+ mpWrappedControl->Show();
+}
+
+AnimationSchemesPanel::~AnimationSchemesPanel()
+{
+ delete mpWrappedControl;
+}
+
+Size AnimationSchemesPanel::GetPreferredSize()
+{
+ return maPreferredSize;
+}
+sal_Int32 AnimationSchemesPanel::GetPreferredWidth(sal_Int32 )
+{
+ return maPreferredSize.Width();
+}
+sal_Int32 AnimationSchemesPanel::GetPreferredHeight(sal_Int32 )
+{
+ return maPreferredSize.Height();
+}
+::Window* AnimationSchemesPanel::GetWindow()
+{
+ return mpWrappedControl;
+}
+bool AnimationSchemesPanel::IsResizable()
+{
+ return true;
+}
+bool AnimationSchemesPanel::IsExpandable() const
+{
+ return true;
+}
+
+
+} } } // end of namespace ::sd::toolpanel::controls
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sd.hxx"
#include "AnimationSchemesPanel.hxx"
diff --git a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx
index 4cee546dae0d..dd3388fb0342 100644..100755
--- a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx
+++ b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx
@@ -24,6 +24,35 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: AnimationSchemesPanel.hxx,v $
+ * $Revision: 1.6 $
+ *
+ * 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_TASKPANE_CONTROLS_ANIMATION_SCHEMES_PANEL_HXX
#define SD_TASKPANE_CONTROLS_ANIMATION_SCHEMES_PANEL_HXX
@@ -66,3 +95,44 @@ private:
} } } // end of namespace ::sd::toolpanel::controls
#endif
+#ifndef SD_TASKPANE_CONTROLS_ANIMATION_SCHEMES_PANEL_HXX
+#define SD_TASKPANE_CONTROLS_ANIMATION_SCHEMES_PANEL_HXX
+
+#include "taskpane/SubToolPanel.hxx"
+
+namespace sd {
+class ViewShellBase;
+}
+
+namespace sd { namespace toolpanel {
+class TreeNode;
+} }
+
+namespace sd { namespace toolpanel { namespace controls {
+
+class AnimationSchemesPanel
+ : public SubToolPanel
+{
+public:
+ AnimationSchemesPanel (
+ TreeNode* pParent,
+ ViewShellBase& rBase);
+ virtual ~AnimationSchemesPanel (void);
+
+ virtual Size GetPreferredSize (void);
+ virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeigh);
+ virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth);
+ virtual ::Window* GetWindow (void);
+ virtual bool IsResizable (void);
+ virtual bool IsExpandable (void) const;
+
+ using Window::GetWindow;
+
+private:
+ Size maPreferredSize;
+ ::Window* mpWrappedControl;
+};
+
+} } } // end of namespace ::sd::toolpanel::controls
+
+#endif
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
index 444ecd6dacb4..80a094ec1a66 100644..100755
--- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
@@ -73,24 +73,6 @@ namespace {
typedef ::std::vector<SharedMasterPageDescriptor> MasterPageContainerType;
-
-class PreviewCreationRequest
-{
-public:
- PreviewCreationRequest (MasterPageContainer::Token aToken, int nPriority);
- MasterPageContainer::Token maToken;
- int mnPriority;
- class Compare {public:
- bool operator() (const PreviewCreationRequest& r1,const PreviewCreationRequest& r2);
- };
- class CompareToken {public:
- MasterPageContainer::Token maToken;
- CompareToken(MasterPageContainer::Token aToken);
- bool operator() (const PreviewCreationRequest& rRequest);
- };
-};
-
-
} // end of anonymous namespace
@@ -423,28 +405,6 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForURL (
-MasterPageContainer::Token MasterPageContainer::GetTokenForPageName (
- const String& sPageName)
-{
- const ::osl::MutexGuard aGuard (mpImpl->maMutex);
-
- Token aResult (NIL_TOKEN);
- if (sPageName.Len() > 0)
- {
- MasterPageContainerType::iterator iEntry (
- ::std::find_if (
- mpImpl->maContainer.begin(),
- mpImpl->maContainer.end(),
- MasterPageDescriptor::PageNameComparator(sPageName)));
- if (iEntry != mpImpl->maContainer.end())
- aResult = (*iEntry)->maToken;
- }
- return aResult;
-}
-
-
-
-
MasterPageContainer::Token MasterPageContainer::GetTokenForStyleName (const String& sStyleName)
{
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
@@ -589,46 +549,6 @@ sal_Int32 MasterPageContainer::GetTemplateIndexForToken (Token aToken)
-void MasterPageContainer::SetPreviewProviderForToken (
- Token aToken,
- const ::boost::shared_ptr<PreviewProvider>& rpPreviewProvider)
-{
- const ::osl::MutexGuard aGuard (mpImpl->maMutex);
-
- SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken);
- if (pDescriptor.get()!=NULL)
- {
- pDescriptor->mpPreviewProvider = rpPreviewProvider;
- mpImpl->InvalidatePreview(aToken);
- }
-}
-
-
-
-
-SdPage* MasterPageContainer::GetSlideForToken (
- MasterPageContainer::Token aToken,
- bool bLoad)
-{
- const ::osl::MutexGuard aGuard (mpImpl->maMutex);
-
- SdPage* pSlide = NULL;
- SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken);
- if (pDescriptor.get() != NULL)
- {
- pSlide = pDescriptor->mpSlide;
- if (pSlide==NULL && bLoad)
- {
- GetPageObjectForToken(aToken, bLoad);
- pSlide = pDescriptor->mpSlide;
- }
- }
- return pSlide;
-}
-
-
-
-
SharedMasterPageDescriptor MasterPageContainer::GetDescriptorForToken (
MasterPageContainer::Token aToken)
{
@@ -639,19 +559,6 @@ SharedMasterPageDescriptor MasterPageContainer::GetDescriptorForToken (
-
-bool MasterPageContainer::UpdateDescriptor (
- const SharedMasterPageDescriptor& rpDescriptor,
- bool bForcePageObject,
- bool bForcePreview,
- bool bSendEvents)
-{
- return mpImpl->UpdateDescriptor(rpDescriptor, bForcePageObject, bForcePreview, bSendEvents);
-}
-
-
-
-
void MasterPageContainer::InvalidatePreview (MasterPageContainer::Token aToken)
{
mpImpl->InvalidatePreview(aToken);
@@ -1311,58 +1218,3 @@ void MasterPageContainer::Implementation::FillingDone (void)
} } } // end of namespace ::sd::toolpanel::controls
-
-
-
-
-namespace {
-
-//===== PreviewCreationRequest ================================================
-
-PreviewCreationRequest::PreviewCreationRequest (
- MasterPageContainer::Token aToken,
- int nPriority)
- : maToken(aToken),
- mnPriority(nPriority)
-{
-}
-
-
-
-
-bool PreviewCreationRequest::Compare::operator() (
- const PreviewCreationRequest& aRequest1,
- const PreviewCreationRequest& aRequest2)
-{
- if (aRequest1.mnPriority != aRequest2.mnPriority)
- {
- // Prefer requests with higher priority.
- return aRequest1.mnPriority > aRequest2.mnPriority;
- }
- else
- {
- // Prefer tokens that have been earlier created (those with lower
- // value).
- return aRequest1.maToken < aRequest2.maToken;
- }
-}
-
-
-
-
-PreviewCreationRequest::CompareToken::CompareToken (MasterPageContainer::Token aToken)
- : maToken(aToken)
-{
-}
-
-
-
-
-bool PreviewCreationRequest::CompareToken::operator() (const PreviewCreationRequest& aRequest)
-{
- return maToken==aRequest.maToken;
-}
-
-
-
-} // end of anonymous namespace
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx
index d922c089ffb4..60f760f63e34 100644..100755
--- a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx
@@ -143,26 +143,16 @@ public:
Token GetTokenForIndex (int nIndex);
Token GetTokenForURL (const String& sURL);
- Token GetTokenForPageName (const String& sPageName);
Token GetTokenForStyleName (const String& sStyleName);
Token GetTokenForPageObject (const SdPage* pPage);
String GetURLForToken (Token aToken);
String GetPageNameForToken (Token aToken);
String GetStyleNameForToken (Token aToken);
- SdPage* GetSlideForToken (Token aToken, bool bLoad=true);
SdPage* GetPageObjectForToken (Token aToken, bool bLoad=true);
Origin GetOriginForToken (Token aToken);
sal_Int32 GetTemplateIndexForToken (Token aToken);
::boost::shared_ptr<MasterPageDescriptor> GetDescriptorForToken (Token aToken);
- bool UpdateDescriptor (
- const ::boost::shared_ptr<MasterPageDescriptor>& rpDescriptor,
- bool bForcePageObject,
- bool bForcePreview,
- bool bSendEvents);
-
- void SetPreviewProviderForToken (Token aToken,
- const ::boost::shared_ptr<PreviewProvider>& rpPreviewProvider);
void InvalidatePreview (Token aToken);
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx
index 9a5eefb6d925..61483f278a4f 100755
--- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx
@@ -387,46 +387,6 @@ bool DefaultPageObjectProvider::operator== (const PageObjectProvider& rProvider)
-//===== DefaultPagePreviewProvider ============================================
-
-DefaultPagePreviewProvider::DefaultPagePreviewProvider (void)
-{
-}
-
-
-
-Image DefaultPagePreviewProvider::operator() (
- int nWidth,
- SdPage* pPage,
- ::sd::PreviewRenderer& rRenderer)
-{
- // Unused parameters.
- (void)nWidth;
- (void)pPage;
- (void)rRenderer;
-
- return Image();
-}
-
-
-
-
-int DefaultPagePreviewProvider::GetCostIndex (void)
-{
- return 0;
-}
-
-
-
-
-bool DefaultPagePreviewProvider::NeedsPageObject (void)
-{
- return false;
-}
-
-
-
-
//===== ExistingPageProvider ==================================================
ExistingPageProvider::ExistingPageProvider (SdPage* pPage)
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx
index 7cde148b3e3d..071b23cdbb16 100644..100755
--- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx
@@ -170,21 +170,6 @@ public:
-
-/** Used temporarily to avoid the (expensive) creation of the default page
- too early.
-*/
-class DefaultPagePreviewProvider : public PreviewProvider
-{
-public:
- DefaultPagePreviewProvider (void);
- virtual Image operator() (int nWidth, SdPage* pPage, ::sd::PreviewRenderer& rRenderer);
- virtual int GetCostIndex (void);
- virtual bool NeedsPageObject (void);
-};
-
-
-
/** This implementation of the PageObjectProvider simply returns an already
existing master page object.
*/
diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
index 49ae6dff264d..6871883d65f5 100644..100755
--- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
@@ -337,28 +337,6 @@ bool MasterPageDescriptor::URLComparator::operator() (
-//===== PageNameComparator ====================================================
-
-MasterPageDescriptor::PageNameComparator::PageNameComparator (const ::rtl::OUString& sPageName)
- : msPageName(sPageName)
-{
-}
-
-
-
-
-bool MasterPageDescriptor::PageNameComparator::operator() (
- const SharedMasterPageDescriptor& rDescriptor)
-{
- if (rDescriptor.get() == NULL)
- return false;
- else
- return rDescriptor->msPageName.equals(msPageName);
-}
-
-
-
-
// ===== StyleNameComparator ==================================================
MasterPageDescriptor::StyleNameComparator::StyleNameComparator (const ::rtl::OUString& sStyleName)
diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx
index 1eea46bd1802..0303989e3379 100644..100755
--- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx
@@ -214,11 +214,6 @@ public:
URLComparator (const ::rtl::OUString& sURL);
bool operator() (const SharedMasterPageDescriptor& rDescriptor);
};
- class PageNameComparator { public:
- ::rtl::OUString msPageName;
- PageNameComparator (const ::rtl::OUString& sPageName);
- bool operator() (const SharedMasterPageDescriptor& rDescriptor);
- };
class StyleNameComparator { public:
::rtl::OUString msStyleName;
StyleNameComparator (const ::rtl::OUString& sStyleName);
diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
index 0f485174009d..2ba0cc678403 100644..100755
--- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
@@ -187,15 +187,6 @@ MasterPageObserver::~MasterPageObserver (void)
-MasterPageObserver::MasterPageNameSet MasterPageObserver::GetMasterPageNames (
- SdDrawDocument& rDocument)
-{
- return mpImpl->GetMasterPageNames (rDocument);
-}
-
-
-
-
//===== MasterPageObserver::Implementation ====================================
void MasterPageObserver::Implementation::RegisterDocument (
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
index 4571d4278140..b321dbf8dd14 100644..100755
--- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
@@ -41,7 +41,6 @@
#include "app.hrc"
#include "res_bmp.hrc"
#include "strings.hrc"
-#include "showview.hxx"
#include "DrawViewShell.hxx"
#include "DrawController.hxx"
#include "SlideSorterViewShell.hxx"
@@ -699,21 +698,6 @@ void MasterPagesSelector::RemoveTokenToIndexEntry (
-void MasterPagesSelector::InvalidatePreview (MasterPageContainer::Token aToken)
-{
- const ::osl::MutexGuard aGuard (maMutex);
-
- int nIndex (GetIndexForToken(aToken));
- if (nIndex > 0)
- {
- mpContainer->InvalidatePreview(aToken);
- mpContainer->RequestPreview(aToken);
- }
-}
-
-
-
-
void MasterPagesSelector::InvalidatePreview (const SdPage* pPage)
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -734,20 +718,6 @@ void MasterPagesSelector::InvalidatePreview (const SdPage* pPage)
}
}
-
-
-
-void MasterPagesSelector::InvalidateAllPreviews (void)
-{
- const ::osl::MutexGuard aGuard (maMutex);
-
- for (USHORT nIndex=1; nIndex<=mpPageSet->GetItemCount(); nIndex++)
- InvalidatePreview(nIndex);
-}
-
-
-
-
void MasterPagesSelector::UpdateAllPreviews (void)
{
const ::osl::MutexGuard aGuard (maMutex);
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx
index a480729aa9c8..a2df51f2bd4b 100644..100755
--- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx
+++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx
@@ -131,14 +131,8 @@ public:
Index into the value set control that is used for displaying the
previews.
*/
- void InvalidatePreview (MasterPageContainer::Token aToken);
void InvalidatePreview (const SdPage* pPage);
- /** Mark all previews as no being up-to-date anymore. This method is
- typically called when the size of the previews has changed.
- */
- void InvalidateAllPreviews (void);
-
void UpdateAllPreviews (void);
protected:
diff --git a/sd/source/ui/toolpanel/controls/makefile.mk b/sd/source/ui/toolpanel/controls/makefile.mk
index 33871a415a7e..b2218e55008c 100644..100755
--- a/sd/source/ui/toolpanel/controls/makefile.mk
+++ b/sd/source/ui/toolpanel/controls/makefile.mk
@@ -59,8 +59,7 @@ SLOFILES = \
$(SLO)$/RecentMasterPagesSelector.obj \
$(SLO)$/CustomAnimationPanel.obj \
$(SLO)$/SlideTransitionPanel.obj \
- $(SLO)$/TableDesignPanel.obj \
- $(SLO)$/AnimationSchemesPanel.obj
+ $(SLO)$/TableDesignPanel.obj
# --- Tagets -------------------------------------------------------
diff --git a/sd/source/ui/toolpanel/makefile.mk b/sd/source/ui/toolpanel/makefile.mk
index 4d83b8a85a70..262b32535ef3 100755
--- a/sd/source/ui/toolpanel/makefile.mk
+++ b/sd/source/ui/toolpanel/makefile.mk
@@ -45,10 +45,8 @@ PRJINC=..$/slidesorter
SLOFILES = \
$(SLO)$/ControlContainer.obj \
$(SLO)$/ScrollPanel.obj \
- $(SLO)$/SimpleLayoutWrapper.obj \
$(SLO)$/SubToolPanel.obj \
$(SLO)$/TitleBar.obj \
- $(SLO)$/TitleToolBox.obj \
$(SLO)$/TitledControl.obj \
$(SLO)$/TaskPaneControlFactory.obj \
$(SLO)$/TaskPaneFocusManager.obj \
@@ -59,7 +57,6 @@ SLOFILES = \
$(SLO)$/ToolPanelFactory.obj \
$(SLO)$/ToolPanelUIElement.obj \
\
- $(SLO)$/EmptyWindow.obj \
$(SLO)$/LayoutMenu.obj \
$(SLO)$/TestMenu.obj \
$(SLO)$/TestPanel.obj \
diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx
index 010571b10927..9cf24dccd508 100644..100755
--- a/sd/source/ui/tools/PropertySet.cxx
+++ b/sd/source/ui/tools/PropertySet.cxx
@@ -58,22 +58,6 @@ void SAL_CALL PropertySet::disposing (void)
{
}
-
-
-
-beans::UnknownPropertyException PropertySet::CreateUnknownPropertyException (
- const rtl::OUString& rsPropertyName)
-{
- return beans::UnknownPropertyException(
- OUString::createFromAscii("property ")
- + rsPropertyName
- + OUString::createFromAscii(" is not known"),
- static_cast<XWeak*>(this));
-}
-
-
-
-
//----- XPropertySet ----------------------------------------------------------
Reference<beans::XPropertySetInfo> SAL_CALL PropertySet::getPropertySetInfo (void)
diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
index 878ef16a52f4..4ed95bbf5b99 100644..100755
--- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx
+++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
@@ -152,31 +152,6 @@ void SdGlobalResourceContainer::AddResource (const Reference<XInterface>& rxReso
-
-::std::auto_ptr<SdGlobalResource> SdGlobalResourceContainer::ReleaseResource (
- SdGlobalResource* pResource)
-{
- ::std::auto_ptr<SdGlobalResource> pResult (NULL);
-
- ::osl::MutexGuard aGuard (mpImpl->maMutex);
-
- Implementation::ResourceList::iterator iResource;
- iResource = ::std::find (
- mpImpl->maResources.begin(),
- mpImpl->maResources.end(),
- pResource);
- if (iResource != mpImpl->maResources.end())
- {
- pResult.reset (*iResource);
- mpImpl->maResources.erase(iResource);
- }
-
- return pResult;
-}
-
-
-
-
SdGlobalResourceContainer::SdGlobalResourceContainer (void)
: mpImpl (new SdGlobalResourceContainer::Implementation())
{
diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx
index e8e2ffb24f2b..b3175b7fdb4a 100644..100755
--- a/sd/source/ui/tools/SlotStateListener.cxx
+++ b/sd/source/ui/tools/SlotStateListener.cxx
@@ -45,16 +45,6 @@ using namespace ::rtl;
namespace sd { namespace tools {
-SlotStateListener::SlotStateListener (void)
- : SlotStateListenerInterfaceBase(maMutex),
- maCallback(),
- mxDispatchProviderWeak(NULL)
-{
-}
-
-
-
-
SlotStateListener::SlotStateListener (
Link& rCallback,
const uno::Reference<frame::XDispatchProvider>& rxDispatchProvider,
@@ -125,14 +115,6 @@ void SlotStateListener::ObserveSlot (const ::rtl::OUString& rSlotName)
-bool SlotStateListener::IsValid (void) const
-{
- return maRegisteredURLList.size() > 0;
-}
-
-
-
-
void SlotStateListener::disposing (void)
{
ReleaseListeners();
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index 230feabe956a..2bc98cd66de3 100755
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -29,6 +29,7 @@
#include "precompiled_sd.hxx"
#include "DrawController.hxx"
+#include "DrawDocShell.hxx"
#include "DrawSubController.hxx"
#include "sdpage.hxx"
@@ -54,6 +55,7 @@
#include <svx/fmshell.hxx>
#include <vos/mutex.hxx>
#include <vcl/svapp.hxx>
+#include <boost/shared_ptr.hpp>
using namespace ::std;
using ::rtl::OUString;
@@ -164,6 +166,16 @@ void SAL_CALL DrawController::dispose (void)
{
mbDisposing = true;
+ boost::shared_ptr<ViewShell> pViewShell = mpBase->GetMainViewShell();
+ if ( pViewShell )
+ {
+ pViewShell->DeactivateCurrentFunction();
+ DrawDocShell* pDocShell = pViewShell->GetDocSh();
+ if ( pDocShell != NULL )
+ pDocShell->SetDocShellFunction(0);
+ }
+ pViewShell.reset();
+
// When the controller has not been detached from its view
// shell, i.e. mpViewShell is not NULL, then tell PaneManager
// and ViewShellManager to clear the shell stack.
@@ -368,18 +380,6 @@ void SAL_CALL
-::awt::Rectangle DrawController::GetVisArea (void) const
-{
- return awt::Rectangle(
- maLastVisArea.Left(),
- maLastVisArea.Top(),
- maLastVisArea.GetWidth(),
- maLastVisArea.GetHeight());
-}
-
-
-
-
// XDrawView
void SAL_CALL DrawController::setCurrentPage( const Reference< drawing::XDrawPage >& xPage )
diff --git a/sd/source/ui/unoidl/makefile.mk b/sd/source/ui/unoidl/makefile.mk
index 66d80e1a529a..cf4910b29186 100755
--- a/sd/source/ui/unoidl/makefile.mk
+++ b/sd/source/ui/unoidl/makefile.mk
@@ -65,7 +65,6 @@ SLO1FILES = \
$(SLO)$/unowcntr.obj \
$(SLO)$/unokywds.obj \
$(SLO)$/unopback.obj \
- $(SLO)$/unovwcrs.obj \
$(SLO)$/unodoc.obj \
$(SLO)$/unomodule.obj \
$(SLO)$/randomnode.obj
diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx
index b8f48a6928aa..1935c424ec03 100644..100755
--- a/sd/source/ui/unoidl/unocpres.cxx
+++ b/sd/source/ui/unoidl/unocpres.cxx
@@ -493,24 +493,3 @@ SdCustomShow * SdXCustomPresentationAccess::getSdCustomShow( const OUString& Nam
}
return NULL;
}
-
-sal_Int32 SdXCustomPresentationAccess::getSdCustomShowIdx( const OUString& Name ) const throw()
-{
- sal_Int32 nIdx = 0;
-
- List* pList = GetCustomShowList();
- const sal_Int32 nCount = pList?pList->Count():0;
-
- const String aName( Name );
-
- while( nIdx < nCount )
- {
- SdCustomShow* pShow = (SdCustomShow*)pList->GetObject(nIdx);
- if( pShow->GetName() == aName )
- return nIdx;
- nIdx++;
- }
- return -1;
-}
-
-
diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx
index 1267b3a58b0a..615d5ba7007c 100644..100755
--- a/sd/source/ui/unoidl/unocpres.hxx
+++ b/sd/source/ui/unoidl/unocpres.hxx
@@ -124,7 +124,6 @@ private:
// intern
inline List* GetCustomShowList() const throw();
- sal_Int32 getSdCustomShowIdx( const ::rtl::OUString& Name ) const throw();
SdCustomShow * getSdCustomShow( const ::rtl::OUString& Name ) const throw();
public:
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index d4ea1dce196f..f31c960d432d 100644..100755
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -311,14 +311,6 @@ typedef SORT* PSORT;
extern "C" int __LOADONCALLAPI SortFunc( const void* p1, const void* p2 );
-SdXShape::SdXShape() throw()
-: mpPropSet(lcl_GetEmpty_SdXShapePropertySet_Impl()),
- mpMap(lcl_GetEmpty_SdXShapePropertyMap_Impl()),
- mpModel(NULL),
- mpImplementationId(NULL)
-{
-}
-
SdXShape::SdXShape( SvxShape* pShape, SdXImpressDocument* pModel) throw()
: mpShape( pShape ),
mpPropSet( pModel?
diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx
index 3e7c3fab7d3c..0e472f41ff16 100644..100755
--- a/sd/source/ui/unoidl/unoobj.hxx
+++ b/sd/source/ui/unoidl/unoobj.hxx
@@ -75,7 +75,6 @@ private:
com::sun::star::uno::Sequence< sal_Int8 >* mpImplementationId;
public:
- SdXShape() throw();
SdXShape(SvxShape* pShape, SdXImpressDocument* pModel) throw();
virtual ~SdXShape() throw();
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 0a7469d22373..379344667a0c 100755
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -345,7 +345,34 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind )
return pRet;
}
-UNO3_GETIMPLEMENTATION2_IMPL( SdGenericDrawPage, SvxFmDrawPage );
+const ::com::sun::star::uno::Sequence< sal_Int8 > & SdGenericDrawPage::getUnoTunnelId() throw()
+{
+ static ::com::sun::star::uno::Sequence< sal_Int8 > * pSeq = 0;
+ if( !pSeq )
+ {
+ ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() );
+ if( !pSeq )
+ {
+ static ::com::sun::star::uno::Sequence< sal_Int8 > aSeq( 16 );
+ rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
+ pSeq = &aSeq;
+ }
+ }
+ return *pSeq;
+}
+
+sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException)
+{
+ if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
+ rId.getConstArray(), 16 ) )
+ {
+ return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this));
+ }
+ else
+ {
+ return SvxFmDrawPage::getSomething( rId );
+ }
+}
/***********************************************************************
* *
diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx
index 52e5cc061f7d..5d525b0f0f04 100644..100755
--- a/sd/source/ui/unoidl/unopage.hxx
+++ b/sd/source/ui/unoidl/unopage.hxx
@@ -113,7 +113,8 @@ public:
SdPage* GetPage() const { return (SdPage*)SvxDrawPage::mpPage; }
SdXImpressDocument* GetModel() const;
- UNO3_GETIMPLEMENTATION_DECL( SdGenericDrawPage )
+ static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
// this is called whenever a SdrObject must be created for a empty api shape wrapper
virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw();
diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx
index a1cd11861d3a..56133e03a375 100644..100755
--- a/sd/source/ui/unoidl/unosrch.cxx
+++ b/sd/source/ui/unoidl/unosrch.cxx
@@ -105,11 +105,6 @@ SdUnoSearchReplaceShape::SdUnoSearchReplaceShape( drawing::XDrawPage* pPage ) th
mpPage = pPage;
}
-SdUnoSearchReplaceShape::SdUnoSearchReplaceShape( drawing::XShape* pShape ) throw()
-{
- mpShape = pShape;
-}
-
SdUnoSearchReplaceShape::~SdUnoSearchReplaceShape() throw()
{
}
diff --git a/sd/source/ui/unoidl/unovwcrs.cxx b/sd/source/ui/unoidl/unovwcrs.cxx
deleted file mode 100644
index 8b72cbe1fd96..000000000000
--- a/sd/source/ui/unoidl/unovwcrs.cxx
+++ /dev/null
@@ -1,209 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sd.hxx"
-#include <com/sun/star/text/XTextViewCursor.hpp>
-#include <com/sun/star/view/XScreenCursor.hpp>
-#include <sfx2/request.hxx>
-#include <vos/mutex.hxx>
-#include "View.hxx"
-#ifndef SVX_LIGHT
-#ifndef SD_DRAW_DOC_SHELL_HXX
-#include "DrawDocShell.hxx"
-#endif
-#endif
-#include "ViewShell.hxx"
-#include "slideshow.hxx"
-
-#include <cppuhelper/implbase2.hxx>
-#include <vcl/svapp.hxx>
-
-using namespace ::vos;
-using namespace ::rtl;
-using namespace ::com::sun::star;
-
-class SdXTextViewCursor
- : public ::cppu::WeakImplHelper2<
- text::XTextViewCursor,
- view::XScreenCursor >
-{
-public:
- SdXTextViewCursor(::sd::View* pVw) throw();
- virtual ~SdXTextViewCursor() throw();
-
- //XTextViewCursor
- virtual sal_Bool SAL_CALL isVisible(void) throw( uno::RuntimeException );
- virtual void SAL_CALL setVisible(sal_Bool bVisible) throw( uno::RuntimeException );
- virtual awt::Point SAL_CALL getPosition(void) throw( uno::RuntimeException );
-
- //XTextCursor
- virtual void SAL_CALL collapseToStart(void) throw( uno::RuntimeException );
- virtual void SAL_CALL collapseToEnd(void) throw( uno::RuntimeException );
- virtual sal_Bool SAL_CALL isCollapsed(void) throw( uno::RuntimeException );
- virtual sal_Bool SAL_CALL goLeft(sal_Int16 nCount, sal_Bool Expand) throw( uno::RuntimeException );
- virtual sal_Bool SAL_CALL goRight(sal_Int16 nCount, sal_Bool Expand) throw( uno::RuntimeException );
- virtual void SAL_CALL gotoStart(sal_Bool Expand) throw( uno::RuntimeException );
- virtual void SAL_CALL gotoEnd(sal_Bool Expand) throw( uno::RuntimeException );
- virtual void SAL_CALL gotoRange(const uno::Reference< text::XTextRange > & rRange, sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException);
-
- //XTextRange
- virtual uno::Reference< text::XText > SAL_CALL getText(void) throw( uno::RuntimeException );
- virtual uno::Reference< text::XTextRange > SAL_CALL getStart(void) throw( uno::RuntimeException );
- virtual uno::Reference< text::XTextRange > SAL_CALL getEnd(void) throw( uno::RuntimeException );
- virtual OUString SAL_CALL getString(void) throw( uno::RuntimeException );
- virtual void SAL_CALL setString(const OUString& aString) throw( uno::RuntimeException );
-
- //XScreenCursor
- virtual sal_Bool SAL_CALL screenDown(void) throw( uno::RuntimeException );
- virtual sal_Bool SAL_CALL screenUp(void) throw( uno::RuntimeException );
-
- void Invalidate() { mpView = 0; }
-
-private:
- ::sd::View* mpView;
-};
-
-
-text::XTextViewCursor* CreateSdXTextViewCursor(::sd::View* mpView )
-{
- return new SdXTextViewCursor( mpView );
-}
-
-SdXTextViewCursor::SdXTextViewCursor(::sd::View* pSdView ) throw()
- : mpView(pSdView)
-{
-
-}
-
-SdXTextViewCursor::~SdXTextViewCursor() throw()
-{
-}
-
-sal_Bool SdXTextViewCursor::isVisible(void) throw( uno::RuntimeException )
-{
- DBG_WARNING("not implemented");
- return sal_True;
-}
-
-void SdXTextViewCursor::setVisible(sal_Bool ) throw( uno::RuntimeException )
-{
- DBG_WARNING("not implemented");
-}
-
-awt::Point SdXTextViewCursor::getPosition(void) throw( uno::RuntimeException )
-{
- DBG_WARNING("not implemented");
- return awt::Point();
-}
-
-void SdXTextViewCursor::collapseToStart(void) throw( uno::RuntimeException )
-{
- DBG_WARNING("not implemented");
-}
-
-void SdXTextViewCursor::collapseToEnd(void) throw( uno::RuntimeException )
-{
- DBG_WARNING("not implemented");
-}
-
-sal_Bool SdXTextViewCursor::isCollapsed(void) throw( uno::RuntimeException )
-{
- DBG_WARNING("not implemented");
- return sal_True;
-
-}
-
-sal_Bool SdXTextViewCursor::goLeft(sal_Int16 , sal_Bool ) throw( uno::RuntimeException )
-{
- DBG_WARNING("not implemented");
- return sal_False;
-}
-
-sal_Bool SdXTextViewCursor::goRight(sal_Int16, sal_Bool ) throw( uno::RuntimeException )
-{
- DBG_WARNING("not implemented");
- return sal_False;
-}
-
-void SdXTextViewCursor::gotoRange(const uno::Reference< text::XTextRange > &, sal_Bool ) throw (::com::sun::star::uno::RuntimeException)
-{
- DBG_WARNING("not implemented");
-}
-
-void SdXTextViewCursor::gotoStart(sal_Bool ) throw( uno::RuntimeException )
-{
- DBG_WARNING("not implemented");
-}
-
-void SdXTextViewCursor::gotoEnd(sal_Bool ) throw( uno::RuntimeException )
-{
- DBG_WARNING("not implemented");
-}
-
-sal_Bool SdXTextViewCursor::screenDown(void) throw( uno::RuntimeException )
-{
- OGuard aGuard(Application::GetSolarMutex());
- return sal_False;
-}
-
-sal_Bool SdXTextViewCursor::screenUp(void) throw( uno::RuntimeException )
-{
- OGuard aGuard(Application::GetSolarMutex());
- return sal_False;
-}
-
-uno::Reference< text::XText > SdXTextViewCursor::getText(void) throw( uno::RuntimeException )
-{
- DBG_WARNING("not implemented");
- return uno::Reference< text::XText > ();
-}
-
-uno::Reference< text::XTextRange > SdXTextViewCursor::getStart(void) throw( uno::RuntimeException )
-{
- DBG_WARNING("not implemented");
- return uno::Reference< text::XTextRange > ();
-}
-
-uno::Reference< text::XTextRange > SdXTextViewCursor::getEnd(void) throw( uno::RuntimeException )
-{
- DBG_WARNING("not implemented");
- return uno::Reference< text::XTextRange > ();
-}
-
-OUString SdXTextViewCursor::getString(void) throw( uno::RuntimeException )
-{
- DBG_WARNING("not implemented");
- return OUString();
-}
-
-void SdXTextViewCursor::setString(const OUString& ) throw( uno::RuntimeException )
-{
- DBG_WARNING("not implemented");
-}
-
-
diff --git a/sd/source/ui/unoidl/unowcntr.cxx b/sd/source/ui/unoidl/unowcntr.cxx
index fbb9991981f9..e29ee1e1516e 100644..100755
--- a/sd/source/ui/unoidl/unowcntr.cxx
+++ b/sd/source/ui/unoidl/unowcntr.cxx
@@ -77,31 +77,6 @@ void SvUnoWeakContainer::insert( uno::WeakReference< uno::XInterface > xRef ) th
mpList->Insert( new uno::WeakReference< uno::XInterface >( xRef ) );
}
-/** removes the given ref from this container */
-void SvUnoWeakContainer::remove( uno::WeakReference< uno::XInterface > xRef ) throw()
-{
- uno::WeakReference< uno::XInterface >* pRef = mpList->First();
- while( pRef )
- {
- uno::Reference< uno::XInterface > xTestRef( *pRef );
- if(!xTestRef.is())
- {
- delete mpList->Remove();
- pRef = mpList->GetCurObject();
- }
- else
- {
- if( *pRef == xRef )
- {
- delete mpList->Remove();
- break;
- }
-
- pRef = mpList->Next();
- }
- }
-}
-
/** searches the container for a ref that returns true on the given
search function
*/
diff --git a/sd/source/ui/unoidl/unowcntr.hxx b/sd/source/ui/unoidl/unowcntr.hxx
index 86d68f3c4d22..a35c27cfd583 100644..100755
--- a/sd/source/ui/unoidl/unowcntr.hxx
+++ b/sd/source/ui/unoidl/unowcntr.hxx
@@ -46,9 +46,6 @@ public:
/** inserts the given ref into this container */
void insert( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > xRef ) throw();
- /** removes the given ref from this container */
- void remove( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > xRef ) throw();
-
/** searches the container for a ref that returns true on the given
search function
*/
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index a7c9786dd160..356c03b82387 100755
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -427,23 +427,6 @@ BOOL Outliner::SpellNextDocument (void)
}
-void Outliner::HandleOutsideChange (ChangeHint eHint)
-{
- switch (eHint)
- {
- case CH_VIEW_SHELL_INVALID:
- EndSpelling();
- mbPrepareSpellingPending = true;
- mbViewShellValid = false;
- break;
-
- case CH_VIEW_SHELL_VALID:
- mbViewShellValid = true;
- break;
- }
-}
-
-
/*************************************************************************
|*
@@ -568,7 +551,8 @@ bool Outliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem)
void Outliner::Initialize (bool bDirectionIsForward)
{
- bool bOldDirectionIsForward = mbDirectionIsForward;
+ const bool bIsAtEnd (maObjectIterator == ::sd::outliner::OutlinerContainer(this).end());
+ const bool bOldDirectionIsForward = mbDirectionIsForward;
mbDirectionIsForward = bDirectionIsForward;
if (maObjectIterator == ::sd::outliner::Iterator())
@@ -603,10 +587,19 @@ void Outliner::Initialize (bool bDirectionIsForward)
{
// Requested iteration direction has changed. Turn arround the iterator.
maObjectIterator.Reverse();
- // The iterator has pointed to the object one ahead/before the current
- // one. Now move it to the one before/ahead the current one.
- ++maObjectIterator;
- ++maObjectIterator;
+ if (bIsAtEnd)
+ {
+ // The iterator has pointed to end(), which after the search
+ // direction is reversed, becomes begin().
+ maObjectIterator = ::sd::outliner::OutlinerContainer(this).begin();
+ }
+ else
+ {
+ // The iterator has pointed to the object one ahead/before the current
+ // one. Now move it to the one before/ahead the current one.
+ ++maObjectIterator;
+ ++maObjectIterator;
+ }
mbMatchMayExist = true;
}
@@ -1078,23 +1071,6 @@ void Outliner::EndOfSearch (void)
}
}
-
-
-
-void Outliner::InitPage (USHORT nPageIndex)
-{
- (void)nPageIndex;
-
- ::sd::outliner::IteratorPosition aPosition (*maObjectIterator);
- if (aPosition.meEditMode == EM_PAGE)
- mnPageCount = mpDrawDocument->GetSdPageCount(aPosition.mePageKind);
- else
- mnPageCount = mpDrawDocument->GetMasterSdPageCount(aPosition.mePageKind);
-}
-
-
-
-
void Outliner::ShowEndOfSearchDialog (void)
{
String aString;
@@ -1477,36 +1453,6 @@ bool Outliner::HandleFailedSearch (void)
}
-#if ENABLE_LAYOUT
-#define SvxSearchDialog Window
-#endif
-
-/** See task #95227# for discussion about correct parent for dialogs/info boxes.
-*/
-::Window* Outliner::GetParentForDialog (void)
-{
- ::Window* pParent = NULL;
-
- if (meMode == SEARCH)
- pParent = static_cast<SvxSearchDialog*>(
- SfxViewFrame::Current()->GetChildWindow(
- SvxSearchDialogWrapper::GetChildWindowId())->GetWindow());
-
- if (pParent == NULL)
- pParent = mpViewShell->GetActiveWindow();
-
- if (pParent == NULL)
- pParent = Application::GetDefDialogParent();
- //1.30->1.31 of sdoutl.cxx pParent = Application::GetDefModalDialogParent();
-
- return pParent;
-}
-
-#if ENABLE_LAYOUT
-#undef SvxSearchDialog
-#endif
-
-
SdrObject* Outliner::SetObject (
const ::sd::outliner::IteratorPosition& rPosition)
{
diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx
index 81f9a50d256d..226d767c6c91 100644..100755
--- a/sd/source/ui/view/OutlinerIterator.cxx
+++ b/sd/source/ui/view/OutlinerIterator.cxx
@@ -67,15 +67,6 @@ IteratorPosition::IteratorPosition (const IteratorPosition& aPosition)
{
}
-IteratorPosition::IteratorPosition (SdrObject* pObject, sal_Int32 nText, sal_Int32 nPageIndex, PageKind ePageKind, EditMode eEditMode)
-: mxObject(pObject)
-, mnText(nText)
-, mnPageIndex(nPageIndex)
-, mePageKind(ePageKind)
-, meEditMode(eEditMode)
-{
-}
-
IteratorPosition::~IteratorPosition (void)
{
}
@@ -119,11 +110,6 @@ Iterator::Iterator (IteratorImplBase* pObject)
mpIterator = pObject;
}
-Iterator::Iterator (const IteratorImplBase& rObject)
-{
- mpIterator = rObject.Clone();
-}
-
Iterator::~Iterator (void)
{
delete mpIterator;
@@ -266,28 +252,6 @@ Iterator OutlinerContainer::CreateSelectionIterator (
rObjectList, nObjectIndex, pDocument, rpViewShell, bDirectionIsForward));
}
-Iterator OutlinerContainer::CreateViewIterator (
- SdDrawDocument* pDocument,
- const ::boost::shared_ptr<ViewShell>& rpViewShell,
- bool bDirectionIsForward,
- IteratorLocation aLocation)
-{
- OSL_ASSERT(rpViewShell.get());
-
- const ::boost::shared_ptr<DrawViewShell> pDrawViewShell(
- ::boost::dynamic_pointer_cast<DrawViewShell>(rpViewShell));
- sal_Int32 nPageIndex = GetPageIndex (
- pDocument,
- rpViewShell,
- pDrawViewShell.get() ? pDrawViewShell->GetPageKind() : PK_STANDARD,
- pDrawViewShell.get() ? pDrawViewShell->GetEditMode() : EM_PAGE,
- bDirectionIsForward,
- aLocation);
-
- return Iterator (new ViewIteratorImpl (
- nPageIndex, pDocument, rpViewShell, bDirectionIsForward));
-}
-
Iterator OutlinerContainer::CreateDocumentIterator (
SdDrawDocument* pDocument,
const ::boost::shared_ptr<ViewShell>& rpViewShell,
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 4919a9fe2bbb..ce3064392d40 100755
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -119,10 +119,9 @@ private:
/** Manage tool bars that are implemented as sub shells of a view shell.
The typical procedure of updating the sub shells of a view shell is to
rebuild a list of sub shells that the caller would like to have active.
- The methods ClearGroup(), AddShellId(), and RemoveShellId() allow the
- caller to do that. A final call to UpdateShells() activates the
- requested shells that are not active and deactivates the active shells
- that are not requested.
+ The methods ClearGroup() and AddShellId() allow the caller to do that. A
+ final call to UpdateShells() activates the requested shells that are not
+ active and deactivates the active shells that are not requested .
This is done by maintaining two lists. One (the current list)
reflects the current state. The other (the requested list) contains the
@@ -157,18 +156,6 @@ public:
*/
void AddShellId (sd::ToolBarManager::ToolBarGroup eGroup, sd::ShellId nId);
- /** Remove a shell. This is done only when the specified shell is a
- member of the specified group. If it has been requested for another
- group or if it has not been requested then this call is ignored.
- @param eGroup
- The group from which to remove the shell.
- @param nId
- The id of the shell to remove.
- @return
- Returns whether the shell is removed.
- */
- bool RemoveShellId (sd::ToolBarManager::ToolBarGroup eGroup, sd::ShellId nId);
-
/** Releasing all shells means that the given ToolBarRules object is
informed that every shell mananged by the called ToolBarShellList is
about to be removed and that the associated framework tool bars can
@@ -296,7 +283,6 @@ public:
void AddToolBar (ToolBarGroup eGroup, const ::rtl::OUString& rsToolBarName);
void AddToolBarShell (ToolBarGroup eGroup, ShellId nToolBarId);
void RemoveToolBar (ToolBarGroup eGroup, const ::rtl::OUString& rsToolBarName);
- void RemoveToolBarShell (ToolBarGroup eGroup, ShellId nToolBarId);
/** Release all tool bar shells and the associated framework tool bars.
Typically called when the main view shell is being replaced by
@@ -332,7 +318,6 @@ public:
};
void LockViewShellManager (void);
- bool IsUpdateLocked (void) const;
void LockUpdate (void);
void UnlockUpdate (void);
@@ -430,15 +415,6 @@ void ToolBarManager::Shutdown (void)
-void ToolBarManager::SetValid (bool bValid)
-{
- if (mpImpl.get() != NULL)
- mpImpl->SetValid(bValid);
-}
-
-
-
-
void ToolBarManager::ResetToolBars (ToolBarGroup eGroup)
{
if (mpImpl.get() != NULL)
@@ -505,20 +481,6 @@ void ToolBarManager::RemoveToolBar (
-void ToolBarManager::RemoveToolBarShell (
- ToolBarGroup eGroup,
- ShellId nToolBarId)
-{
- if (mpImpl.get() != NULL)
- {
- UpdateLock aLock (shared_from_this());
- mpImpl->RemoveToolBarShell(eGroup,nToolBarId);
- }
-}
-
-
-
-
void ToolBarManager::SetToolBar (
ToolBarGroup eGroup,
const ::rtl::OUString& rsToolBarName)
@@ -576,17 +538,6 @@ void ToolBarManager::LockViewShellManager (void)
-bool ToolBarManager::IsUpdateLocked (void) const
-{
- if (mpImpl.get() != NULL)
- return mpImpl->IsUpdateLocked();
- else
- return false;
-}
-
-
-
-
void ToolBarManager::LockUpdate (void)
{
if (mpImpl.get()!=NULL)
@@ -819,21 +770,6 @@ void ToolBarManager::Implementation::AddToolBarShell (
-void ToolBarManager::Implementation::RemoveToolBarShell (
- ToolBarGroup eGroup,
- ShellId nToolBarId)
-{
- ViewShell* pMainViewShell = mrBase.GetMainViewShell().get();
- if (pMainViewShell != NULL)
- {
- GetToolBarRules().SubShellRemoved(eGroup, nToolBarId);
- maToolBarShellList.RemoveShellId(eGroup,nToolBarId);
- }
-}
-
-
-
-
void ToolBarManager::Implementation::ReleaseAllToolBarShells (void)
{
maToolBarShellList.ReleaseAllShells(GetToolBarRules());
@@ -946,14 +882,6 @@ void ToolBarManager::Implementation::LockViewShellManager (void)
-bool ToolBarManager::Implementation::IsUpdateLocked (void) const
-{
- return mnLockCount;
-}
-
-
-
-
void ToolBarManager::Implementation::LockUpdate (void)
{
#ifdef VERBOSE
@@ -1705,26 +1633,6 @@ void ToolBarShellList::AddShellId (sd::ToolBarManager::ToolBarGroup eGroup, sd::
-bool ToolBarShellList::RemoveShellId (sd::ToolBarManager::ToolBarGroup eGroup, sd::ShellId nId)
-{
- bool bRemoved (false);
-
- GroupedShellList::iterator iDescriptor (maNewList.find(ShellDescriptor(nId,eGroup)));
- if (iDescriptor != maNewList.end())
- {
- if (iDescriptor->meGroup == eGroup)
- {
- maNewList.erase(iDescriptor);
- bRemoved = true;
- }
- }
-
- return bRemoved;
-}
-
-
-
-
void ToolBarShellList::ReleaseAllShells (ToolBarRules& rRules)
{
// Release the currently active tool bars.
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 14da3ea1a526..1e18ad5c5ee9 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -164,8 +164,6 @@ public:
::boost::shared_ptr<FormShellManager> mpFormShellManager;
- ::boost::shared_ptr<CustomHandleManager> mpCustomHandleManager;
-
Implementation (ViewShellBase& rBase);
~Implementation (void);
@@ -461,13 +459,6 @@ ViewShellBase* ViewShellBase::GetViewShellBase (SfxViewFrame* pViewFrame)
-void ViewShellBase::GetMenuState (SfxItemSet& )
-{
-}
-
-
-
-
DrawDocShell* ViewShellBase::GetDocShell (void) const
{
return mpDocShell;
@@ -713,21 +704,6 @@ ErrCode ViewShellBase::DoPrint (
-USHORT ViewShellBase::SetPrinterOptDlg (
- SfxPrinter* pNewPrinter,
- USHORT nDiffFlags,
- BOOL bShowDialog)
-{
- (void)pNewPrinter;
- (void)nDiffFlags;
- (void)bShowDialog;
- return 0;
- // return mpImpl->mpPrintManager->SetPrinterOptDlg ( pNewPrinter, nDiffFlags, bShowDialog);
-}
-
-
-
-
void ViewShellBase::PreparePrint (PrintDialog* pPrintDialog)
{
SfxViewShell::PreparePrint (pPrintDialog);
@@ -1246,18 +1222,6 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB
}
-
-
-CustomHandleManager& ViewShellBase::getCustomHandleManager() const
-{
- OSL_ASSERT(mpImpl.get()!=NULL);
-
- if( !mpImpl->mpCustomHandleManager.get() )
- mpImpl->mpCustomHandleManager.reset( new ::sd::CustomHandleManager(*const_cast< ViewShellBase* >(this)) );
-
- return *mpImpl->mpCustomHandleManager.get();
-}
-
::rtl::OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const ::rtl::OUString& aCmdURL )
{
::rtl::OUString aLabel;
@@ -1820,34 +1784,4 @@ void FocusForwardingWindow::Command (const CommandEvent& rEvent)
} // end of anonymouse namespace
-// ====================================================================
-
-CustomHandleManager::CustomHandleManager( ViewShellBase& rViewShellBase )
-: mrViewShellBase( rViewShellBase )
-{
-}
-
-CustomHandleManager::~CustomHandleManager()
-{
- DBG_ASSERT( maSupplier.empty(), "sd::CustomHandleManager::~CustomHandleManager(), still suppliers attached!" );
-}
-
-void CustomHandleManager::registerSupplier( ICustomhandleSupplier* pSupplier )
-{
- maSupplier.insert( pSupplier );
-}
-
-void CustomHandleManager::unRegisterSupplier( ICustomhandleSupplier* pSupplier )
-{
- maSupplier.erase( pSupplier );
-}
-
-void CustomHandleManager::addCustomHandler( SdrView& rSourceView, ViewShell::ShellType eShellType, SdrHdlList& rHandlerList )
-{
- for( std::set< ICustomhandleSupplier* >::iterator aIter( maSupplier.begin() ); aIter != maSupplier.end(); aIter++ )
- {
- (*aIter)->addCustomHandler( rSourceView, eShellType, rHandlerList );
- }
-}
-
} // end of namespace sd
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 926d579e93e9..fdd7c530137f 100755
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -69,48 +69,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
using ::sd::framework::FrameworkHelper;
-namespace {
-
-class ImpUndoDeleteWarning : public ModalDialog
-{
-private:
- FixedImage maImage;
- FixedText maWarningFT;
- CheckBox maDisableCB;
- OKButton maYesBtn;
- CancelButton maNoBtn;
-
-public:
- ImpUndoDeleteWarning(Window* pParent);
- BOOL IsWarningDisabled() const { return maDisableCB.IsChecked(); }
-};
-
-ImpUndoDeleteWarning::ImpUndoDeleteWarning(Window* pParent)
-: ModalDialog(pParent, SdResId(RID_UNDO_DELETE_WARNING)),
- maImage(this, SdResId(IMG_UNDO_DELETE_WARNING)),
- maWarningFT(this, SdResId(FT_UNDO_DELETE_WARNING)),
- maDisableCB(this, SdResId(CB_UNDO_DELETE_DISABLE)),
- maYesBtn(this, SdResId(BTN_UNDO_DELETE_YES)),
- maNoBtn(this, SdResId(BTN_UNDO_DELETE_NO))
-{
- FreeResource();
-
- SetHelpId( HID_SD_UNDODELETEWARNING_DLG );
- maDisableCB.SetHelpId( HID_SD_UNDODELETEWARNING_CBX );
-
- maYesBtn.SetText(Button::GetStandardText(BUTTON_YES));
- maNoBtn.SetText(Button::GetStandardText(BUTTON_NO));
- maImage.SetImage(WarningBox::GetStandardImage());
-
- // #93721# Set focus to YES-Button
- maYesBtn.GrabFocus();
-}
-
-} // end of anonymous namespace
-
-
-
-
namespace sd {
ViewShell::Implementation::Implementation (ViewShell& rViewShell)
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index 059e0fde06fb..c25c0f11270a 100755
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -124,10 +124,6 @@ public:
void RemoveShellFactory (
const SfxShell* pViewShell,
const SharedShellFactory& rpFactory);
- ViewShell* ActivateViewShell (
- ShellId nId,
- ::Window* pParentWindow,
- FrameView* pFrameView);
void ActivateViewShell (
ViewShell* pViewShell);
void DeactivateViewShell (const ViewShell& rShell);
@@ -137,13 +133,10 @@ public:
void SetFormShell (const ViewShell* pViewShell, FmFormShell* pFormShell, bool bAbove);
void ActivateSubShell (const SfxShell& rParentShell, ShellId nId);
void DeactivateSubShell (const SfxShell& rParentShell, ShellId nId);
- void DeactivateAllSubShells (const SfxShell& rViewShell);
void MoveSubShellToTop (const SfxShell& rParentShell, ShellId nId);
void MoveToTop (const SfxShell& rParentShell);
SfxShell* GetShell (ShellId nId) const;
SfxShell* GetTopShell (void) const;
- ShellId GetShellId (const SfxShell* pShell) const;
- void ReplaceUndoManager (SfxUndoManager* pManager, SfxUndoManager* pReplacement);
void Shutdown (void);
void InvalidateAllSubShells (const SfxShell* pParentShell);
@@ -235,7 +228,6 @@ private:
DECL_LINK(WindowEventHandler, VclWindowEvent*);
- void DumpActiveShell (const ActiveShellList& rList);
void DumpShellStack (const ShellStack& rStack);
void DumpSfxShellStack (void);
@@ -246,10 +238,6 @@ private:
*/
void Deactivate (SfxShell* pShell);
- ShellDescriptor CreateViewShell (
- ShellId nShellId,
- ::Window* pParentWindow,
- FrameView* pFrameView);
ShellDescriptor CreateSubShell (
SfxShell* pShell,
ShellId nShellId,
@@ -304,20 +292,6 @@ void ViewShellManager::RemoveSubShellFactory (
-ViewShell* ViewShellManager::ActivateViewShell (
- ShellId nShellId,
- ::Window* pParentWindow,
- FrameView* pFrameView)
-{
- if (mbValid)
- return mpImpl->ActivateViewShell(nShellId,pParentWindow,pFrameView);
- else
- return NULL;
-}
-
-
-
-
void ViewShellManager::ActivateViewShell (ViewShell* pViewShell)
{
if (mbValid)
@@ -377,15 +351,6 @@ void ViewShellManager::DeactivateSubShell (const ViewShell& rViewShell, ShellId
-void ViewShellManager::DeactivateAllSubShells (const ViewShell& rViewShell)
-{
- if (mbValid)
- mpImpl->DeactivateAllSubShells(rViewShell);
-}
-
-
-
-
void ViewShellManager::InvalidateAllSubShells (ViewShell* pViewShell)
{
if (mbValid)
@@ -413,15 +378,6 @@ void ViewShellManager::DeactivateShell (const SfxShell* pShell)
-void ViewShellManager::InvalidateShellStack (const SfxShell* pShell)
-{
- if (mbValid)
- mpImpl->TakeShellsFromStack(pShell);
-}
-
-
-
-
void ViewShellManager::MoveToTop (const ViewShell& rParentShell)
{
if (mbValid)
@@ -453,26 +409,6 @@ SfxShell* ViewShellManager::GetTopShell (void) const
-ShellId ViewShellManager::GetShellId (const SfxShell* pShell) const
-{
- if (mbValid)
- return mpImpl->GetShellId(pShell);
- else
- return snInvalidShellId;
-}
-
-
-
-
-void ViewShellManager::ReplaceUndoManager (SfxUndoManager* pManager, SfxUndoManager* pReplacement)
-{
- if (mbValid)
- mpImpl->ReplaceUndoManager(pManager,pReplacement);
-}
-
-
-
-
void ViewShellManager::Shutdown (void)
{
if (mbValid)
@@ -572,24 +508,6 @@ void ViewShellManager::Implementation::RemoveShellFactory (
-ViewShell* ViewShellManager::Implementation::ActivateViewShell (
- ShellId nShellId,
- ::Window* pParentWindow,
- FrameView* pFrameView)
-{
- ::osl::MutexGuard aGuard (maMutex);
-
- // Create a new shell or recycle on in the cache.
- ShellDescriptor aDescriptor (CreateViewShell(nShellId, pParentWindow, pFrameView));
-
- ActivateShell(aDescriptor);
-
- return dynamic_cast<ViewShell*>(aDescriptor.mpShell);
-}
-
-
-
-
void ViewShellManager::Implementation::ActivateViewShell (ViewShell* pViewShell)
{
::osl::MutexGuard aGuard (maMutex);
@@ -953,66 +871,6 @@ SfxShell* ViewShellManager::Implementation::GetTopShell (void) const
-ShellId ViewShellManager::Implementation::GetShellId (const SfxShell* pShell) const
-{
- ::osl::MutexGuard aGuard (maMutex);
-
- ShellId nId = snInvalidShellId;
-
- // First search the active view shells.
- const ViewShell* pViewShell = dynamic_cast<const ViewShell*>(pShell);
- if (pShell != NULL)
- {
- ActiveShellList::const_iterator iShell (
- ::std::find_if (
- maActiveViewShells.begin(),
- maActiveViewShells.end(),
- IsShell(pViewShell)));
- if (iShell != maActiveViewShells.end())
- nId = iShell->mnId;
- }
- if (nId == snInvalidShellId)
- {
- // Now search the active sub shells of every active view shell.
- SubShellList::const_iterator iList;
- for (iList=maActiveSubShells.begin(); iList!=maActiveSubShells.end(); ++iList)
- {
- const SubShellSubList& rList (iList->second);
- SubShellSubList::const_iterator iSubShell(
- ::std::find_if(rList.begin(),rList.end(), IsShell(pShell)));
- if (iSubShell != rList.end())
- {
- nId = iSubShell->mnId;
- break;
- }
- }
- }
-
- return nId;
-}
-
-
-
-
-void ViewShellManager::Implementation::ReplaceUndoManager (
- SfxUndoManager* pManager,
- SfxUndoManager* pReplacement)
-{
- for (USHORT i=0; ;++i)
- {
- SfxShell* pShell = mrBase.GetSubShell(i);
- if (pShell == NULL)
- break;
- if (pShell->GetUndoManager() == pManager)
- pShell->SetUndoManager(pReplacement);
- }
-}
-
-
-
-
-
-
void ViewShellManager::Implementation::LockUpdate (void)
{
mnUpdateLockCount++;
@@ -1333,44 +1191,6 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*,
-ShellDescriptor ViewShellManager::Implementation::CreateViewShell (
- ShellId nShellId,
- ::Window* pParentWindow,
- FrameView* pFrameView)
-{
- ShellDescriptor aResult;
-
- if (pParentWindow != NULL)
- {
- ShellDescriptor aDescriptor (
- CreateSubShell(NULL,nShellId,pParentWindow,pFrameView));
- aResult.mpShell = dynamic_cast<ViewShell*>(aDescriptor.mpShell);
- aResult.mpFactory = aDescriptor.mpFactory;
- aResult.mnId = aDescriptor.mnId;
-
- // Register as window listener so that the shells of the current
- // window can be moved to the top of the shell stack.
- if (aResult.mpShell != NULL)
- {
- ::Window* pWindow = aResult.GetWindow();
- if (pWindow != NULL)
- pWindow->AddEventListener(
- LINK(this, ViewShellManager::Implementation, WindowEventHandler));
- else
- {
- DBG_ASSERT (false,
- "ViewShellManager::ActivateViewShell: "
- "new view shell has no active window");
- }
- }
- }
-
- return aResult;
-}
-
-
-
-
ShellDescriptor ViewShellManager::Implementation::CreateSubShell (
SfxShell* pParentShell,
ShellId nShellId,
@@ -1499,15 +1319,6 @@ void ViewShellManager::Implementation::Shutdown (void)
-void ViewShellManager::Implementation::DumpActiveShell (const ActiveShellList& rList)
-{
- for (ActiveShellList::const_iterator aI=rList.begin(); aI!=rList.end(); ++aI)
- OSL_TRACE (" %d %p\r", aI->mnId, aI->mpShell);
-}
-
-
-
-
void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack)
{
ShellStack::const_reverse_iterator iEntry;
@@ -1580,24 +1391,6 @@ void ViewShellManager::Implementation::SetFormShell (
-void ViewShellManager::Implementation::DeactivateAllSubShells (
- const SfxShell& rViewShell)
-{
- ::osl::MutexGuard aGuard (maMutex);
-
- SubShellList::iterator iList (maActiveSubShells.find(&rViewShell));
- if (iList != maActiveSubShells.end())
- {
- SubShellSubList& rList (iList->second);
- UpdateLock aLock (*this);
- while ( ! rList.empty())
- DeactivateSubShell(rViewShell, rList.front().mnId);
- }
-}
-
-
-
-
namespace {
ShellDescriptor::ShellDescriptor (void)
diff --git a/sd/source/ui/view/bmcache.cxx b/sd/source/ui/view/bmcache.cxx
index d8781733c520..c7f313037ff8 100644..100755
--- a/sd/source/ui/view/bmcache.cxx
+++ b/sd/source/ui/view/bmcache.cxx
@@ -58,115 +58,6 @@ BitmapCache::~BitmapCache()
}
}
-/*************************************************************************
-|*
-|* Cache-Eintrag einfuegen
-|*
-\************************************************************************/
-
-void BitmapCache::Add(const SdPage* pPage, const Bitmap& rBmp, long nZoom)
-{
- BitmapCacheEntry* pEntry = NULL;
- ULONG nSizeOfBitmap = rBmp.GetSizeBytes();
-
- if( nSizeOfBitmap < nMaxSize )
- {
- while (nCurSize + nSizeOfBitmap > nMaxSize)
- {
- if( aEntries.Count() )
- {
- pEntry = (BitmapCacheEntry*) aEntries.Remove(aEntries.Count() - 1);
-
- if( pEntry && pEntry->pGraphicObject )
- {
- nCurSize -= pEntry->nSizeBytes;
- delete pEntry->pGraphicObject;
- }
-
- delete pEntry;
- }
- else
- break;
- }
-
- pEntry = new BitmapCacheEntry;
- pEntry->pPage = pPage;
- pEntry->pGraphicObject = new GraphicObject( rBmp );
- pEntry->nSizeBytes = nSizeOfBitmap;
- pEntry->nZoom = nZoom;
-
- aEntries.Insert( pEntry, (ULONG) 0 );
- nCurSize += nSizeOfBitmap;
- }
-}
-
-/*************************************************************************
-|*
-|* Cache-Eintrag suchen, Bitmap-Zeiger zurueckgeben (NULL, wenn Bitmap nicht
-|* im Cache)
-|* - auf rZoomPercent wird der Zoomfaktor der Bitmap geschrieben
-|* - abs(nZoomTolerance) gibt die maximal erlaubte Abweichung des
-|* Zoomfaktors an; ist die Toleranz negativ, so sucht der Cache den
-|* "best fit", sonst den "first fit",
-|* - es werden nur Bitmaps mit Zoomfaktoren kleiner oder gleich rZoomPercent
-|* beruecksichtigt, um ein Verkleinern der Bitmap beim Zeichnen zu vermeiden
-|*
-\************************************************************************/
-
-const GraphicObject* BitmapCache::Get( const SdPage* pPage, long& rZoomPercent, long nZoomTolerancePercent)
-{
- BitmapCacheEntry* pEntry = NULL;
- GraphicObject* pGraphicObject = NULL;
-
- if( nZoomTolerancePercent < 0 )
- {
- // "best fit"-Suche
- long nTolerance = -nZoomTolerancePercent;
- BitmapCacheEntry* pBest = NULL;
- long nBest = LONG_MAX;
- long nTest = 0L;
-
- for( ULONG nPos = 0; nPos < aEntries.Count(); nPos++ )
- {
- pEntry = (BitmapCacheEntry*) aEntries.GetObject( nPos );
-
- if( pEntry->pPage == pPage )
- {
- nTest = rZoomPercent - pEntry->nZoom;
-
- if( nTest >= 0 && nTest < nBest && nTest <= nTolerance )
- pBest = pEntry;
- }
- }
-
- pEntry = pBest;
- }
- else
- {
- // "first fit"-suche
- for( ULONG nPos = 0; nPos < aEntries.Count(); nPos++ )
- {
- pEntry = (BitmapCacheEntry*)aEntries.GetObject( nPos );
-
- if (pEntry->pPage == pPage && Abs( pEntry->nZoom - rZoomPercent ) <= nZoomTolerancePercent )
- break;
- else
- pEntry = NULL;
- }
- }
-
- // was passendes gefunden?
- if( pEntry )
- {
- pGraphicObject = pEntry->pGraphicObject;
- aEntries.Remove( pEntry );
- aEntries.Insert( pEntry, (ULONG) 0 );
- rZoomPercent = pEntry->nZoom;
- }
-
- return pGraphicObject;
-}
-
void BitmapCache::Remove( const SdPage* pPage )
{
for( ULONG nPos = 0; nPos < aEntries.Count(); )
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index bcff1c573b14..8b88be3682e3 100644..100755
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -32,6 +32,14 @@
#include <svx/svxids.hrc>
+#include <i18npool/mslangid.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/unolingu.hxx>
#include <editeng/ulspitem.hxx>
#include <editeng/lspcitem.hxx>
#include <editeng/adjitem.hxx>
@@ -39,6 +47,7 @@
#include <sfx2/app.hxx>
#include <svl/whiter.hxx>
#include <svl/itempool.hxx>
+#include <svl/stritem.hxx>
#include <svl/style.hxx>
#include <svl/languageoptions.hxx>
#include <sfx2/tplpitem.hxx>
@@ -71,6 +80,8 @@
using namespace sd;
+using namespace ::com::sun::star;
+
#define TextObjectBar
#include "sdslots.hxx"
@@ -371,6 +382,26 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
}
break;
+ case SID_THES:
+ {
+ EditView & rEditView = mpView->GetTextEditOutlinerView()->GetEditView();;
+ String aStatusVal;
+ LanguageType nLang = LANGUAGE_NONE;
+ bool bIsLookUpWord = GetStatusValueForThesaurusFromContext( aStatusVal, nLang, rEditView );
+ rSet.Put( SfxStringItem( SID_THES, aStatusVal ) );
+
+ // disable "Thesaurus" context menu entry if there is nothing to look up
+ lang::Locale aLocale( SvxCreateLocale( nLang ) );
+ uno::Reference< linguistic2::XThesaurus > xThes( LinguMgr::GetThesaurus() );
+ if (!bIsLookUpWord ||
+ !xThes.is() || nLang == LANGUAGE_NONE || !xThes->hasLocale( aLocale ))
+ rSet.DisableItem( SID_THES );
+
+ //! avoid puting the same item as SfxBoolItem at the end of this function
+ nSlotId = 0;
+ }
+ break;
+
default:
break;
}
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 4ca26501fedb..4a6d83e376e7 100644..100755
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -30,8 +30,12 @@
#include "TextObjectBar.hxx"
+
#include <svx/svxids.hrc>
+#include <editeng/editview.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/unolingu.hxx>
#include <editeng/outliner.hxx>
#include <editeng/ulspitem.hxx>
#include <editeng/lspcitem.hxx>
@@ -331,6 +335,16 @@ void TextObjectBar::Execute( SfxRequest &rReq )
}
break;
+ case SID_THES:
+ {
+ String aReplaceText;
+ SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES, sal_False );
+ if (pItem2)
+ aReplaceText = pItem2->GetValue();
+ if (aReplaceText.Len() > 0)
+ ReplaceTextWithSynonym( pOLV->GetEditView(), aReplaceText );
+ }
+ break;
default:
{
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 55479228f918..98d0b7551705 100755
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -94,7 +94,6 @@
#include "slideshow.hxx"
#include "optsitem.hxx"
#include "fusearch.hxx"
-#include "fuspell.hxx"
#include "Outliner.hxx"
#include "AnimationChildWindow.hxx"
#include "SdUnoDrawView.hxx"
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 2e33ab909f00..3102dc726a61 100755
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -105,48 +105,6 @@ namespace sd {
/*************************************************************************
|*
-|* modal dialog for #90356#
-|*
-\************************************************************************/
-
-class ImpUndoDeleteWarning : public ModalDialog
-{
-private:
- FixedImage maImage;
- FixedText maWarningFT;
- CheckBox maDisableCB;
- OKButton maYesBtn;
- CancelButton maNoBtn;
-
-public:
- ImpUndoDeleteWarning(Window* pParent);
- BOOL IsWarningDisabled() const { return maDisableCB.IsChecked(); }
-};
-
-ImpUndoDeleteWarning::ImpUndoDeleteWarning(Window* pParent)
-: ModalDialog(pParent, SdResId(RID_UNDO_DELETE_WARNING)),
- maImage(this, SdResId(IMG_UNDO_DELETE_WARNING)),
- maWarningFT(this, SdResId(FT_UNDO_DELETE_WARNING)),
- maDisableCB(this, SdResId(CB_UNDO_DELETE_DISABLE)),
- maYesBtn(this, SdResId(BTN_UNDO_DELETE_YES)),
- maNoBtn(this, SdResId(BTN_UNDO_DELETE_NO))
-{
- FreeResource();
-
- SetHelpId( HID_SD_UNDODELETEWARNING_DLG );
- maDisableCB.SetHelpId( HID_SD_UNDODELETEWARNING_CBX );
-
- maYesBtn.SetText(Button::GetStandardText(BUTTON_YES));
- maNoBtn.SetText(Button::GetStandardText(BUTTON_NO));
- maImage.SetImage(WarningBox::GetStandardImage());
-
- // #93721# Set focus to YES-Button
- maYesBtn.GrabFocus();
-}
-
-
-/*************************************************************************
-|*
|* SfxRequests fuer temporaere Funktionen
|*
\************************************************************************/
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index c4c6b20f8ca8..681192ff351b 100755
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -192,32 +192,6 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet)
/*************************************************************************
|*
-|* SfxRequests fuer Objektpalette bearbeiten
-|*
-\************************************************************************/
-
-void DrawViewShell::ExecObjPalette( SfxRequest& )
-{
- // Diese Methode muss erhalten bleiben, bis
- // der/die Slots entfernt wurden;
- // ==> Voll-Update
-}
-
-/*************************************************************************
-|*
-|* Statuswerte fuer Objektpalette zurueckgeben
-|*
-\************************************************************************/
-
-void DrawViewShell::GetObjPaletteState(SfxItemSet& )
-{
- // Diese Methode muss erhalten bleiben, bis
- // der/die Slots entfernt wurden;
- // ==> Voll-Update
-}
-
-/*************************************************************************
-|*
|* SfxRequests fuer Animator bearbeiten
|*
\************************************************************************/
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index 54cd0c792c94..54cd0c792c94 100644..100755
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index ad42a9251878..3628a11ac5a1 100755
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -151,21 +151,6 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas
/*************************************************************************
|*
-|* Copy-Konstruktor
-|*
-\************************************************************************/
-
-DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ::Window* pParentWindow, const DrawViewShell& rShell )
-: ViewShell(pFrame, pParentWindow, rShell)
-, maTabControl(this, pParentWindow)
-, mbIsInSwitchPage(false)
-{
- mpFrameView = new FrameView(GetDoc());
- Construct (GetDocSh(), PK_STANDARD);
-}
-
-/*************************************************************************
-|*
|* Destruktor
|*
\************************************************************************/
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 1a667b28f6d4..6f6f49fdc93c 100644..100755
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -31,7 +31,8 @@
#include <com/sun/star/presentation/XPresentation2.hpp>
#include <com/sun/star/form/FormButtonType.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/i18n/TransliterationModules.hdl>
+#include <com/sun/star/i18n/TransliterationModules.hpp>
+#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
#include <comphelper/processfactory.hxx>
@@ -1401,6 +1402,9 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
}
break;
+ case SID_TRANSLITERATE_SENTENCE_CASE:
+ case SID_TRANSLITERATE_TITLE_CASE:
+ case SID_TRANSLITERATE_TOGGLE_CASE:
case SID_TRANSLITERATE_UPPER:
case SID_TRANSLITERATE_LOWER:
case SID_TRANSLITERATE_HALFWIDTH:
@@ -1416,6 +1420,15 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
switch( nSId )
{
+ case SID_TRANSLITERATE_SENTENCE_CASE:
+ nType = TransliterationModulesExtra::SENTENCE_CASE;
+ break;
+ case SID_TRANSLITERATE_TITLE_CASE:
+ nType = TransliterationModulesExtra::TITLE_CASE;
+ break;
+ case SID_TRANSLITERATE_TOGGLE_CASE:
+ nType = TransliterationModulesExtra::TOGGLE_CASE;
+ break;
case SID_TRANSLITERATE_UPPER:
nType = TransliterationModules_LOWERCASE_UPPERCASE;
break;
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 0a5f743bb738..ac6b46f3018b 100644..100755
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -250,6 +250,9 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet)
GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, sal_True );
}
+ rSet.DisableItem( SID_TRANSLITERATE_SENTENCE_CASE );
+ rSet.DisableItem( SID_TRANSLITERATE_TITLE_CASE );
+ rSet.DisableItem( SID_TRANSLITERATE_TOGGLE_CASE );
rSet.DisableItem( SID_TRANSLITERATE_UPPER );
rSet.DisableItem( SID_TRANSLITERATE_LOWER );
rSet.DisableItem( SID_TRANSLITERATE_HALFWIDTH );
diff --git a/sd/source/ui/view/grviewsh.cxx b/sd/source/ui/view/grviewsh.cxx
index 1c22348f8b87..646a437c42bf 100644..100755
--- a/sd/source/ui/view/grviewsh.cxx
+++ b/sd/source/ui/view/grviewsh.cxx
@@ -61,24 +61,6 @@ GraphicViewShell::GraphicViewShell (
ConstructGraphicViewShell();
}
-/*************************************************************************
-|*
-|* Copy-Konstruktor
-|*
-\************************************************************************/
-
-GraphicViewShell::GraphicViewShell (
- SfxViewFrame* pFrame,
- ::Window* pParentWindow,
- const DrawViewShell& rShell)
- : DrawViewShell (pFrame, pParentWindow, rShell)
-{
- ConstructGraphicViewShell();
-}
-
-
-
-
GraphicViewShell::~GraphicViewShell (void)
{
}
diff --git a/sd/source/ui/view/makefile.mk b/sd/source/ui/view/makefile.mk
index 2cc2a96d46a2..0ee8280d3fad 100644
--- a/sd/source/ui/view/makefile.mk
+++ b/sd/source/ui/view/makefile.mk
@@ -85,7 +85,6 @@ SLOFILES = \
$(SLO)$/presvish.obj \
$(SLO)$/outlview.obj \
$(SLO)$/tabcontr.obj \
- $(SLO)$/showview.obj \
$(SLO)$/bmcache.obj \
$(SLO)$/drbezob.obj \
$(SLO)$/drtxtob.obj \
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index 2acf143ff0b3..2acf143ff0b3 100644..100755
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 1467e6c24bd0..955a9d167b49 100644..100755
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -59,7 +59,8 @@
#include <svx/svdorect.hxx>
#include <sot/formats.hxx>
#include <com/sun/star/linguistic2/XThesaurus.hpp>
-#include <com/sun/star/i18n/TransliterationModules.hdl>
+#include <com/sun/star/i18n/TransliterationModules.hpp>
+#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
#include <editeng/unolingu.hxx>
#include <comphelper/processfactory.hxx>
#include <editeng/outlobj.hxx>
@@ -235,31 +236,6 @@ OutlineViewShell::OutlineViewShell (
Construct(GetDocSh());
}
-
-/*************************************************************************
-|*
-|* Copy-Konstruktor
-|*
-\************************************************************************/
-
-OutlineViewShell::OutlineViewShell (
- SfxViewFrame* pFrame,
- ::Window* pParentWindow,
- const OutlineViewShell& rShell)
- : ViewShell (pFrame, pParentWindow, rShell),
- pOlView(NULL),
- pLastPage( NULL ),
- pClipEvtLstnr(NULL),
- bPastePossible(FALSE),
- mbInitialized(false)
-
-{
- mpFrameView = new FrameView(GetDoc());
- mpFrameView->Connect();
-
- Construct(GetDocSh());
-}
-
/*************************************************************************
|*
|* Destruktor
@@ -528,6 +504,9 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq)
std::auto_ptr< OutlineViewModelChangeGuard > aGuard;
if( pOlView && (
+ (nSlot == SID_TRANSLITERATE_SENTENCE_CASE) ||
+ (nSlot == SID_TRANSLITERATE_TITLE_CASE) ||
+ (nSlot == SID_TRANSLITERATE_TOGGLE_CASE) ||
(nSlot == SID_TRANSLITERATE_UPPER) ||
(nSlot == SID_TRANSLITERATE_LOWER) ||
(nSlot == SID_TRANSLITERATE_HALFWIDTH) ||
@@ -661,6 +640,9 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq)
}
break;
+ case SID_TRANSLITERATE_SENTENCE_CASE:
+ case SID_TRANSLITERATE_TITLE_CASE:
+ case SID_TRANSLITERATE_TOGGLE_CASE:
case SID_TRANSLITERATE_UPPER:
case SID_TRANSLITERATE_LOWER:
case SID_TRANSLITERATE_HALFWIDTH:
@@ -676,6 +658,15 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq)
switch( nSlot )
{
+ case SID_TRANSLITERATE_SENTENCE_CASE:
+ nType = TransliterationModulesExtra::SENTENCE_CASE;
+ break;
+ case SID_TRANSLITERATE_TITLE_CASE:
+ nType = TransliterationModulesExtra::TITLE_CASE;
+ break;
+ case SID_TRANSLITERATE_TOGGLE_CASE:
+ nType = TransliterationModulesExtra::TOGGLE_CASE;
+ break;
case SID_TRANSLITERATE_UPPER:
nType = TransliterationModules_LOWERCASE_UPPERCASE;
break;
@@ -988,7 +979,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
GetDoc()->SetChanged(TRUE);
}
- // Da Überladen, muss hier der Status gesetzt werden
+ // Da ´┐Żberladen, muss hier der Status gesetzt werden
if( !GetDocSh()->IsModified() )
{
rSet.DisableItem( SID_SAVEDOC );
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 30daec8b636e..dfad4b34c6f2 100644..100755
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -2040,6 +2040,7 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo)
return 0;
}
+#if 0
sal_Int32 OutlineView::GetPageNumberWidthPixel()
{
Window* pActWin = mpOutlineViewShell->GetActiveWindow();
@@ -2062,6 +2063,7 @@ sal_Int32 OutlineView::GetPageNumberWidthPixel()
}
return mnPageNumberWidthPixel;
}
+#endif
// --------------------------------------------------------------------
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 813c6caba95a..3aed9c6c0d9c 100644..100755
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -969,89 +969,6 @@ void View::SetMarkedOriginalSize()
delete pUndoGroup;
}
-/** create a virtual device and paints the slide contents into it.
- The caller must delete the returned device */
-VirtualDevice* View::CreatePageVDev(USHORT nSdPage, PageKind ePageKind, ULONG nWidthPixel)
-{
- ViewShell* pViewShell = mpDocSh->GetViewShell();
- OutputDevice* pRefDevice = 0;
- if( pViewShell )
- pRefDevice = pViewShell->GetActiveWindow();
-
- if( !pRefDevice )
- pRefDevice = Application::GetDefaultDevice();
-
- DBG_ASSERT( pRefDevice, "sd::View::CreatePageVDev(), I need a reference device to work properly!" );
-
- VirtualDevice* pVDev;
- if( pRefDevice )
- pVDev = new VirtualDevice( *pRefDevice );
- else
- pVDev = new VirtualDevice();
-
- MapMode aMM( MAP_100TH_MM );
-
- SdPage* pPage = mpDoc->GetSdPage(nSdPage, ePageKind);
- DBG_ASSERT(pPage, "sd::View::CreatePageVDev(), slide not found!");
-
- if( pPage )
- {
- Size aPageSize(pPage->GetSize());
- aPageSize.Width() -= pPage->GetLftBorder();
- aPageSize.Width() -= pPage->GetRgtBorder();
- aPageSize.Height() -= pPage->GetUppBorder();
- aPageSize.Height() -= pPage->GetLwrBorder();
-
- // use scaling?
- if( nWidthPixel )
- {
- const Fraction aFrac( (long) nWidthPixel, pVDev->LogicToPixel( aPageSize, aMM ).Width() );
-
- aMM.SetScaleX( aFrac );
- aMM.SetScaleY( aFrac );
- }
-
- pVDev->SetMapMode( aMM );
- if( pVDev->SetOutputSize(aPageSize) )
- {
- std::auto_ptr< SdrView > pView( new SdrView(mpDoc, pVDev) );
- pView->SetPageVisible( FALSE );
- pView->SetBordVisible( FALSE );
- pView->SetGridVisible( FALSE );
- pView->SetHlplVisible( FALSE );
- pView->SetGlueVisible( FALSE );
- pView->ShowSdrPage(pPage); // WAITING FOR SJ , Point(-pPage->GetLftBorder(), -pPage->GetUppBorder()));
- SdrPageView* pPageView = pView->GetSdrPageView();
- if( pViewShell )
- {
- FrameView* pFrameView = pViewShell->GetFrameView();
- if( pFrameView )
- {
- pPageView->SetVisibleLayers( pFrameView->GetVisibleLayers() );
- pPageView->SetLockedLayers( pFrameView->GetLockedLayers() );
- pPageView->SetPrintableLayers( pFrameView->GetPrintableLayers() );
- }
- }
-
- // SJ: i40609, the vdev mapmode seems to be dangled after CompleteRedraw,
- // so we are pushing here, because the mapmode is used afterwards
- pVDev->Push();
-
- Point aPoint( 0, 0 );
- Region aRegion (Rectangle( aPoint, aPageSize ) );
- pView->CompleteRedraw(pVDev, aRegion);
- pVDev->Pop();
- }
- else
- {
- DBG_ERROR("sd::View::CreatePageVDev(), virt. device creation failed!");
- }
- }
- return pVDev;
-}
-
-
-
/*************************************************************************
|*
|* OLE-Obj am Client connecten
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index a980496cecf3..9fbe223c276a 100755
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -623,11 +623,6 @@ void View::LockRedraw(BOOL bLock)
-bool View::IsRedrawLocked (void) const
-{
- return mnLockRedrawSmph>0;
-}
-
/*************************************************************************
|*
|* StyleSheet aus der Sleketion besorgen
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 5ae673b8769f..28873b3946a3 100755
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -146,35 +146,6 @@ void Window::SetViewShell (ViewShell* pViewSh)
}
}
-
-
-
-/*************************************************************************
-|*
-|* Die Haelfte des Sichtbaren Bereich eines anderen Fensters darstellen
-|*
-\************************************************************************/
-
-void Window::ShareViewArea(Window* pOtherWin)
-{
- mpShareWin = pOtherWin;
- maViewOrigin = pOtherWin->maViewOrigin;
- maViewSize = pOtherWin->maViewSize;
- mnMinZoom = pOtherWin->mnMinZoom;
- mnMaxZoom = pOtherWin->mnMaxZoom;
- mbCenterAllowed = pOtherWin->mbCenterAllowed;
-
- long nZoom = pOtherWin->GetZoom();
- MapMode aMap(GetMapMode());
- aMap.SetScaleX(Fraction(nZoom, 100));
- aMap.SetScaleY(Fraction(nZoom, 100));
- aMap.SetOrigin(pOtherWin->GetMapMode().GetOrigin());
- SetMapMode(aMap);
-}
-
-
-
-
void Window::CalcMinZoom()
{
// Are we entitled to change the minimal zoom factor?
diff --git a/sd/source/ui/view/showview.cxx b/sd/source/ui/view/showview.cxx
deleted file mode 100644
index a60195eac1b8..000000000000
--- a/sd/source/ui/view/showview.cxx
+++ /dev/null
@@ -1,170 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sd.hxx"
-
-#include "showview.hxx"
-#include <svx/svdmodel.hxx>
-#include <svx/fmview.hxx>
-
-
-#include "drawdoc.hxx"
-#include "sdpage.hxx"
-#include "ViewShell.hxx"
-#include "FrameView.hxx"
-
-namespace sd {
-
-#ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED
-#define SO2_DECL_SVINPLACEOBJECT_DEFINED
-SO2_DECL_REF(SvInPlaceObject)
-#endif
-#ifndef SO2_DECL_SVINPLACECLIENT_DEFINED
-#define SO2_DECL_SVINPLACECLIENT_DEFINED
-SO2_DECL_REF(SvInPlaceClient)
-#endif
-
-/*************************************************************************
-|*
-|* der Konstruktor setzt den MapMode und arrangiert die einzelnen Seiten
-|*
-\************************************************************************/
-
-ShowView::ShowView (
- SdDrawDocument* pDoc,
- OutputDevice* pOut,
- ViewShell* pViewShell,
- ::Window* pWin)
- : FmFormView(pDoc, pOut),
- pDrDoc(pDoc),
- mpViewSh(pViewShell),
- pWindowForPlugIns(pWin),
- nAllowInvalidateSmph(0),
- bAllowMasterPageCaching(TRUE)
-{
- // #i73602# Use default from the configuration
- SetBufferedOverlayAllowed(getOptionsDrawinglayer().IsOverlayBuffer_DrawImpress());
-
- // #i74769#, #i75172# Use default from the configuration
- SetBufferedOutputAllowed(getOptionsDrawinglayer().IsPaintBuffer_DrawImpress());
-
- EnableExtendedKeyInputDispatcher(FALSE);
- EnableExtendedMouseEventDispatcher(FALSE);
- EnableExtendedCommandEventDispatcher(FALSE);
-}
-
-/*************************************************************************
-|*
-|* Destruktor
-|*
-\************************************************************************/
-
-ShowView::~ShowView()
-{
-}
-
-/*************************************************************************
-|*
-|* Zaehler fuer Invalidierungserlaubnis hoch- oder runter zaehlen
-|*
-\************************************************************************/
-
-void ShowView::SetAllowInvalidate(BOOL bFlag)
-{
- if (!bFlag)
- {
- nAllowInvalidateSmph++;
- }
- else if (nAllowInvalidateSmph > 0)
- {
- nAllowInvalidateSmph--;
- }
-}
-
-/*************************************************************************
-|*
-|* ermittelt, ob invalidiert werden darf
-|*
-\************************************************************************/
-
-BOOL ShowView::IsInvalidateAllowed() const
-{
- return (nAllowInvalidateSmph == 0);
-}
-
-/*************************************************************************
-|*
-|* Invalidate abfangen
-|*
-\************************************************************************/
-
-void ShowView::InvalidateOneWin (::Window& rWin)
-{
- if (IsInvalidateAllowed())
- {
- FmFormView::InvalidateOneWin(rWin);
- }
-}
-
-/*************************************************************************
-|*
-|* Invalidate abfangen
-|*
-\************************************************************************/
-
-void ShowView::InvalidateOneWin (::Window& rWin, const Rectangle& rRect)
-{
- if (IsInvalidateAllowed())
- {
- FmFormView::InvalidateOneWin(rWin, rRect);
- }
-}
-
-/*************************************************************************
-|*
-|* Paint-Methode: das Ereignis wird an die View weitergeleitet
-|*
-\************************************************************************/
-
-void ShowView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/)
-{
- FmFormView::CompleteRedraw(pOutDev, rReg, pRedirector);
-}
-
-/*************************************************************************
-|*
-|* DoConnect
-|*
-\************************************************************************/
-
-void ShowView::DoConnect(SdrOle2Obj* )
-{
- // connected wird jetzt in FuSlideShow::ShowPlugIns()
-}
-
-} // end of namespace sd
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 5a3426a42533..616516782be3 100644..100755
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -526,34 +526,6 @@ void ViewShell::DrawMarkRect(const Rectangle& rRect) const
}
}
-
-/*************************************************************************
-|*
-|* Auf allen Split-Windows ein Rechteck zeichnen. Fuer den Rahmen wird der
-|* uebergebene Pen, zum Fuellen die uebergebene Brush benutzt.
-|*
-\************************************************************************/
-
-void ViewShell::DrawFilledRect( const Rectangle& rRect, const Color& rLColor,
- const Color& rFColor ) const
-{
- if (mpContentWindow.get() != NULL)
- {
- const Color& rOldLineColor = mpContentWindow->GetLineColor();
- const Color& rOldFillColor = mpContentWindow->GetFillColor();
-
- mpContentWindow->SetLineColor( rLColor );
- mpContentWindow->SetFillColor( rFColor );
-
- mpContentWindow->DrawRect(rRect);
-
- mpContentWindow->SetLineColor( rOldLineColor );
- mpContentWindow->SetFillColor( rOldFillColor );
- }
-}
-
-
-
/*************************************************************************
|*
|* Groesse und Raender aller Seiten setzen
@@ -851,18 +823,6 @@ void ViewShell::WriteFrameViewData()
/*************************************************************************
|*
-|* Auf allen Split-Windows ein Update erzwingen.
-|*
-\************************************************************************/
-
-void ViewShell::UpdateWindows()
-{
- if (mpContentWindow.get() != NULL)
- mpContentWindow->Update();
-}
-
-/*************************************************************************
-|*
|* OLE-Object aktivieren
|*
\************************************************************************/
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 578026018b9f..c1f4bc070bcf 100755
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -173,14 +173,6 @@ ViewShell::ViewShell( SfxViewFrame*, ::Window* pParentWindow, ViewShellBase& rVi
construct();
}
-ViewShell::ViewShell( SfxViewFrame*, ::Window* pParentWindow, const ViewShell& rShell)
-: SfxShell(rShell.GetViewShell())
-, mbCenterAllowed(rShell.mbCenterAllowed)
-, mpParentWindow(pParentWindow)
-{
- construct();
-}
-
ViewShell::~ViewShell()
{
// Keep the content window from accessing in its destructor the
diff --git a/sd/source/ui/view/zoomlist.cxx b/sd/source/ui/view/zoomlist.cxx
index 6f4d56b6f0a3..9ae178e3d7a6 100644..100755
--- a/sd/source/ui/view/zoomlist.cxx
+++ b/sd/source/ui/view/zoomlist.cxx
@@ -112,19 +112,6 @@ void ZoomList::InsertZoomRect(const Rectangle& rRect)
rBindings.Invalidate( SID_ZOOM_PREV );
}
-
-/*************************************************************************
-|*
-|* Aktuelles ZoomRect herausgeben
-|*
-\************************************************************************/
-
-Rectangle ZoomList::GetCurrentZoomRect() const
-{
- Rectangle aRect(*(Rectangle*) GetObject(mnCurPos));
- return (aRect);
-}
-
/*************************************************************************
|*
|* Naechstes ZoomRect herausgeben
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index 1373bfd60e10..c03c6ce435cd 100755
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -164,8 +164,6 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:InsertObject"/>
<menu:menuitem menu:id=".uno:InsertPlugin"/>
- <menu:menuitem menu:id=".uno:InsertSound"/>
- <menu:menuitem menu:id=".uno:InsertVideo"/>
<menu:menuitem menu:id=".uno:InsertMath"/>
</menu:menupopup>
</menu:menu>
@@ -186,12 +184,15 @@
<menu:menuseparator/>
<menu:menu menu:id=".uno:TransliterateMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:ChangeCaseToUpper"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToLower"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHalfWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToFullWidth"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToHiragana"/>
- <menu:menuitem menu:id=".uno:ChangeCaseToKatakana"/>
+ <menu:menuitem menu:id=".uno:ChangeCaseToSentenceCase"/>
+ <menu:menuitem menu:id=".uno:ChangeCaseToLower"/>
+ <menu:menuitem menu:id=".uno:ChangeCaseToUpper"/>
+ <menu:menuitem menu:id=".uno:ChangeCaseToTitleCase"/>
+ <menu:menuitem menu:id=".uno:ChangeCaseToToggleCase"/>
+ <menu:menuitem menu:id=".uno:ChangeCaseToHalfWidth"/>
+ <menu:menuitem menu:id=".uno:ChangeCaseToFullWidth"/>
+ <menu:menuitem menu:id=".uno:ChangeCaseToHiragana"/>
+ <menu:menuitem menu:id=".uno:ChangeCaseToKatakana"/>
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
diff --git a/sd/uiconfig/sdraw/toolbar/findbar.xml b/sd/uiconfig/sdraw/toolbar/findbar.xml
new file mode 100644
index 000000000000..9ef9d8a1a78f
--- /dev/null
+++ b/sd/uiconfig/sdraw/toolbar/findbar.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+ <toolbar:toolbaritem xlink:href=".uno:FindText" toolbar:helpid="helpid:100105" />
+ <toolbar:toolbaritem xlink:href=".uno:DownSearch" toolbar:helpid="helpid:100105" />
+ <toolbar:toolbaritem xlink:href=".uno:UpSearch" toolbar:helpid="helpid:100105" />
+ <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:text="Find &amp; Replace" toolbar:visible="false" toolbar:helpid="helpid:100105"/>
+</toolbar:toolbar>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 59bf75aa1025..bf669992c86a 100755
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -181,8 +181,6 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:InsertObject"/>
<menu:menuitem menu:id=".uno:InsertPlugin"/>
- <menu:menuitem menu:id=".uno:InsertSound"/>
- <menu:menuitem menu:id=".uno:InsertVideo"/>
<menu:menuitem menu:id=".uno:InsertMath"/>
</menu:menupopup>
</menu:menu>
@@ -203,8 +201,11 @@
<menu:menuseparator/>
<menu:menu menu:id=".uno:TransliterateMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:ChangeCaseToUpper"/>
+ <menu:menuitem menu:id=".uno:ChangeCaseToSentenceCase"/>
<menu:menuitem menu:id=".uno:ChangeCaseToLower"/>
+ <menu:menuitem menu:id=".uno:ChangeCaseToUpper"/>
+ <menu:menuitem menu:id=".uno:ChangeCaseToTitleCase"/>
+ <menu:menuitem menu:id=".uno:ChangeCaseToToggleCase"/>
<menu:menuitem menu:id=".uno:ChangeCaseToHalfWidth"/>
<menu:menuitem menu:id=".uno:ChangeCaseToFullWidth"/>
<menu:menuitem menu:id=".uno:ChangeCaseToHiragana"/>
@@ -239,7 +240,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HangulHanjaConversion"/>
<menu:menuitem menu:id=".uno:ChineseConversion"/>
- <menu:menuitem menu:id=".uno:Thesaurus"/>
+ <menu:menuitem menu:id=".uno:ThesaurusDialog"/>
<menu:menuitem menu:id=".uno:Hyphenation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:MoreDictionaries"/>
diff --git a/sd/uiconfig/simpress/toolbar/findbar.xml b/sd/uiconfig/simpress/toolbar/findbar.xml
new file mode 100644
index 000000000000..9ef9d8a1a78f
--- /dev/null
+++ b/sd/uiconfig/simpress/toolbar/findbar.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+ <toolbar:toolbaritem xlink:href=".uno:FindText" toolbar:helpid="helpid:100105" />
+ <toolbar:toolbaritem xlink:href=".uno:DownSearch" toolbar:helpid="helpid:100105" />
+ <toolbar:toolbaritem xlink:href=".uno:UpSearch" toolbar:helpid="helpid:100105" />
+ <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:text="Find &amp; Replace" toolbar:visible="false" toolbar:helpid="helpid:100105"/>
+</toolbar:toolbar>
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index d2af8c0daaed..d736c3f52d64 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -1545,7 +1545,9 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult
for( sal_uInt32 n = 0; n < nPoints; n++ )
{
//Create a point from the polygon
- *pInnerSequence++ = awt::Point( aPoly.getB2DPoint(n).getX(), aPoly.getB2DPoint(n).getY());
+ *pInnerSequence++ = awt::Point(
+ basegfx::fround(aPoly.getB2DPoint(n).getX()),
+ basegfx::fround(aPoly.getB2DPoint(n).getY()));
}
//Fill the properties