diff options
Diffstat (limited to 'sd/source/ui/inc')
52 files changed, 73 insertions, 616 deletions
diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx index 7698b2a28..2c4d8e802 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 57f6ae01e..ea5f358e8 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 3520686c3..2709340ff 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 6c6bceaa8..1fce00ee9 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 52c0d60c9..beeb8ca77 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 4ed0fe533..9c88723b9 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 7a5db109e..de40a6949 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 a9ed9b587..5f96a5bff 100644..100755 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -161,8 +161,10 @@ public: cursor position. */ 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 515501690..6fcc19849 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/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index 5daa35ae1..f80a169a5 100755 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -65,6 +65,68 @@ public: virtual ~PaneDockingWindow (void); virtual void StateChanged( StateChangedType nType ); +<<<<<<< local +======= + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + + /** Initializing the title tool box either creates a new title tool box + or clears all items from an existing one. A closer is added as only + item. + */ + void InitializeTitleToolBox (void); + + /** Add a top down menu to the title bar or rather the top-level menu + entry. The given callback is called when the menu is clicked and it + is the task of the callback to show the menu. + @return + The id of the new menu is returned. It can be compared by the + callback to the value of GetCurItemId() when called at the given + tool box. + */ + USHORT AddMenu (const String& rsMenuName, ULONG nHelpId, const Link& rCallback); + + ::Window* GetContentWindow (void); + + ::boost::shared_ptr<ToolBox> GetTitleToolBox (void) const; + +private: + /** The pane which is represented by the docking window. + */ + ::rtl::OUString msPaneURL; + + /** Title that is shown at the top of the docking window. + */ + ::rtl::OUString msTitle; + + /** The tool box that is displayed in the window title area contains + menus and the closer button. + */ + ::boost::shared_ptr<ToolBox> mpTitleToolBox; + + /** The border that is painted arround the inner window. The bevel + shadow lines are part of the border, so where the border is 0 no + such line is painted. + */ + SvBorder maBorder; + + sal_uInt16 mnChildWindowId; + + ::boost::scoped_ptr< ::Window> mpContentWindow; + + /** Remember that a layout is pending, i.e. Resize() has been called + since the last Paint(). + */ + bool mbIsLayoutPending; + + DECL_LINK(ToolboxSelectHandler, ToolBox*); + + /** This does the actual placing and sizing of the title bar and the + content window after the size of the docking window has changed. + This method is called from withing the Paint() method when since its + last invocation the size of the docking window has changed. + */ + void Layout (void); +>>>>>>> other }; } // end of namespace ::sd diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index d78def6af..54da9d8f5 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 5faf2349c..10b73bcce 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/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx index bb027b5cd..e37143eb2 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 2ff1f0258..238c41c32 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 372b2e71a..16605c4f7 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 6cad2939f..587a12e2e 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 00bcaf042..1dcde8358 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 93ad54ccb..14919dabc 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 82238f11b..fc3e19518 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 71f0f8317..6a908fff5 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 94b5200cb..aff737f8f 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 734b1e642..e7d4286f7 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 179113c78..e37bfef4b 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 086a961b6..6061ca8ce 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 7a40f326f..15e2b55ab 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 19ec554d7..30db09834 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/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index 376219ff5..657a16b85 100755 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -89,6 +89,10 @@ public: */ ::boost::shared_ptr<ViewShell> GetViewShell (void); +<<<<<<< local +======= + +>>>>>>> other // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx index 962820be7..99e0fd20b 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 885fa2bb4..ed91048ac 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 a0999b205..49dcd01fe 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 1aea49318..28d413bb6 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 d51dfdf47..000000000 --- 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 ddbc9f56d..9fe7c37ee 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 3ba2bdad0..fedd33d5c 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 6bcf98c5d..034358530 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 ff080933a..000000000 --- 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 0ebeb187a..31ac861f6 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 f5f5fd77c..4848c32a4 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 0aff0ad4e..436b9616f 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 ec3374be9..000000000 --- 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 64464d8cb..ac56511ea 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 395856c1d..4bc94197a 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 2ff417c30..19a6da2f1 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 6d32b8359..0ac37bbf1 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 64d686406..635133331 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 10b975b71..f5a9a3060 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 54bff1212..8541c2b6c 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 9c126b168..ba9c3ea0f 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 @@ -104,14 +97,6 @@ public: @throws DisposedException */ 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 ========================================== diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index bf6d8f2b0..05622ca4a 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 76e4cdd98..873e7e738 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 39b7649d1..36add6793 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 f34341353..b1798ec1b 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; |