diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-01 13:56:48 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-02 06:20:35 +0000 |
commit | d68a0fc050ea4d57e15246f8e71781cd42ebdaa1 (patch) | |
tree | d8f8e8823de13253a1bb41a8a4804dfec042694b /sd | |
parent | de020fc9c3c67541067bc7e0b72ed41eae650288 (diff) |
loplugin:unusedmethods
Change-Id: Ie1603adf3908fd0668bcbe8f75c6bafa0d0bfd6c
Reviewed-on: https://gerrit.libreoffice.org/19072
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sd')
31 files changed, 4 insertions, 113 deletions
diff --git a/sd/inc/SdShapeTypes.hxx b/sd/inc/SdShapeTypes.hxx index 307a8cf1251b..6fbcc3de2c13 100644 --- a/sd/inc/SdShapeTypes.hxx +++ b/sd/inc/SdShapeTypes.hxx @@ -51,16 +51,6 @@ enum SdShapeTypes PRESENTATION_PAGENUMBER }; -/** Factory method that creates accessibility objects corresponding to the - type of the given shape. -*/ -AccessibleShape* - CreateSdAccessibleShape (const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& rxShape - ); - } // end of namespace accessibility #endif diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx index 7de91629c544..03cd717b2e10 100644 --- a/sd/source/filter/eppt/epptbase.hxx +++ b/sd/source/filter/eppt/epptbase.hxx @@ -313,7 +313,6 @@ class PPTExStyleSheet ~PPTExStyleSheet(); PPTExParaSheet& GetParaSheet( int nInstance ) { return *mpParaSheet[ nInstance ]; }; - PPTExCharSheet& GetCharSheet( int nInstance ) { return *mpCharSheet[ nInstance ]; }; void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, FontCollection& rFontCollection, int nInstance, int nLevel ); diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx index 7a5ab073b1d2..db80f2100bba 100644 --- a/sd/source/filter/eppt/epptooxml.hxx +++ b/sd/source/filter/eppt/epptooxml.hxx @@ -74,7 +74,6 @@ public: virtual bool exportDocument() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // only needed for import, leave them empty, refactor later XmlFilterBase to export and import base? - static sal_Int32 getSchemeClr( sal_Int32 /* nColorSchemeToken */ ) { return 0; } virtual oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE { return NULL; } virtual const oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE { return NULL; } virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE { return oox::drawingml::table::TableStyleListPtr(); } diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx index fce5f12d09e9..ba7755016a6a 100644 --- a/sd/source/filter/eppt/text.hxx +++ b/sd/source/filter/eppt/text.hxx @@ -255,8 +255,7 @@ public: sal_uInt32 ParagraphCount() const; sal_uInt32 Count() const; int GetInstance() const; - bool HasExtendedBullets(); - void WriteTextSpecInfo( SvStream* pStrm ); + bool HasExtendedBullets(); }; #endif diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx index 0d909f8dfc92..3e54f6da4329 100644 --- a/sd/source/filter/ppt/pptanimations.hxx +++ b/sd/source/filter/ppt/pptanimations.hxx @@ -250,7 +250,6 @@ struct transition bool mbDirection; // true: default geometric direction static const transition* find( const OUString& rName ); - static const sal_Char* find( const sal_Int16 mnType, const sal_Int16 mnSubType, const bool bDirection ); }; static const transition gTransitions[] = { diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx index 3900b02f0da2..efbd72092604 100644 --- a/sd/source/filter/ppt/pptatom.hxx +++ b/sd/source/filter/ppt/pptatom.hxx @@ -36,8 +36,6 @@ public: /** imports this atom and its child atoms */ static Atom* import( const DffRecordHeader& rRootRecordHeader, SvStream& rStCtrl ); - inline const DffRecordHeader& getHeader() const; - /** @return true if at least one atom with the given nRecType is found */ inline bool hasChildAtom( sal_uInt16 nRecType ) const; @@ -87,11 +85,6 @@ inline const Atom* Atom::findFirstChildAtom( sal_uInt16 nRecType ) const return findNextChildAtom( nRecType, NULL ); } -inline const DffRecordHeader& Atom::getHeader() const -{ - return maRecordHeader; -} - inline const Atom* Atom::findFirstChildAtom() const { return mpFirstChild; diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index de129e1bab4d..8e6eae1144e3 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -135,8 +135,6 @@ class AnnotationWindow : public FloatingWindow void ToggleInsMode(); - DECL_LINK_TYPED( OnlineSpellCallback, SpellCallbackInfo&, void ); - virtual void Deactivate() SAL_OVERRIDE; virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx index 723f20aa4ef7..a82f0aad4f6d 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx @@ -74,7 +74,6 @@ private: DECL_LINK_TYPED(CreateHdl, Button*, void); DECL_LINK_TYPED(FileHdl, Button*, void); - DECL_LINK(TextHdl, void*); DECL_LINK_TYPED(UpHdl, Button*, void); DECL_LINK_TYPED(DownHdl, Button*, void); DECL_LINK_TYPED(RemoveHdl, Button*, void); diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index c4679e6f3072..0d7e63241c7e 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -73,7 +73,6 @@ ClientBox::ClientBox( vcl::Window* pParent, WinBits nStyle ) : m_nActive( 0 ), m_nTopIndex( 0 ), m_nActiveHeight( 0 ), - m_nExtraHeight( 2 ), m_aPinBox( VclPtr<NumericBox>::Create( this, 0 ) ), m_aDeauthoriseButton( VclPtr<PushButton>::Create( this ) ), m_aScrollBar( VclPtr<ScrollBar>::Create( this, WB_VERT ) ) diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index efcf9b89d61c..c90a8d7b1f86 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -98,7 +98,6 @@ class ClientBox : public Control long m_nTopIndex; long m_nStdHeight; long m_nActiveHeight; - long m_nExtraHeight; Size m_aOutputSize; VclPtr<NumericBox> m_aPinBox; @@ -129,9 +128,6 @@ class ClientBox : public Control DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void ); DECL_DLLPRIVATE_LINK_TYPED( DeauthoriseHdl, Button*, void ); - //Index starts with 1. - //Throws an com::sun::star::lang::IllegalArgumentException, when the index is invalid. - void checkIndex(sal_Int32 pos) const; public: ClientBox( vcl::Window* pParent, WinBits nStyle ); @@ -144,24 +140,17 @@ public: Size GetOptimalSize() const SAL_OVERRIDE; bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - const Size GetMinOutputSizePixel() const; - void SetExtraSize( long nSize ) { m_nExtraHeight = nSize; } TClientBoxEntry GetEntryData( long nPos ) { return m_vEntries[ nPos ]; } long GetActiveEntryIndex(); - long GetEntryCount() { return (long) m_vEntries.size(); } Rectangle GetEntryRect( const long nPos ) const; long PointToPos( const Point& rPos ); void DoScroll( long nDelta ); void RecalcAll(); - void RemoveUnlocked(); void selectEntry( const long nPos ); long addEntry(std::shared_ptr<ClientInfo> pClientInfo); void clearEntries(); - void prepareChecking(); - void checkEntries(); - OUString getPin(); void populateEntries(); }; diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 9f116095bd78..88bc1506ed69 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -99,7 +99,6 @@ SdActionDlg::SdActionDlg ( SdTPAction::SdTPAction(vcl::Window* pWindow, const SfxItemSet& rInAttrs) : SfxTabPage(pWindow, "InteractionPage", "modules/simpress/ui/interactionpage.ui", &rInAttrs) - , rOutAttrs(rInAttrs) , mpView(NULL) , mpDoc(NULL) , bTreeUpdated(false) diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx index 946bba06ea7c..e4fb5c35aad6 100644 --- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx +++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx @@ -195,11 +195,6 @@ public: virtual void Reverse() SAL_OVERRIDE; protected: - /** Initialize this iterator with respect to the given location. After - this call the object looks like newly constructed. - */ - void Init (IteratorLocation aLocation); - /** Set up page pointer and object list iterator for the specified page. @param nPageIndex diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index f645e9fdd28f..96c79583abb1 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -142,10 +142,8 @@ private: static sal_uInt16 GetDragTypeSdResId( NavigatorDragType eDT, bool bImage = false ); NavDocInfo* GetDocInfo(); - DECL_LINK( GetFocusObjectsHdl, void * ); DECL_LINK_TYPED( SelectToolboxHdl, ToolBox *, void ); DECL_LINK_TYPED( DropdownClickToolBoxHdl, ToolBox *, void ); - DECL_LINK( ClickPageHdl, void * ); DECL_LINK_TYPED( ClickObjectHdl, SvTreeListBox*, bool ); DECL_LINK( SelectDocumentHdl, void * ); DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool ); diff --git a/sd/source/ui/inc/taskpane/PanelId.hxx b/sd/source/ui/inc/taskpane/PanelId.hxx index b67f1eec1fad..77dc340b159a 100644 --- a/sd/source/ui/inc/taskpane/PanelId.hxx +++ b/sd/source/ui/inc/taskpane/PanelId.hxx @@ -37,7 +37,6 @@ namespace sd { namespace toolpanel PID_UNKNOWN = 5 }; - PanelId GetStandardPanelId( const OUString& i_rTaskPanelResourceURL ); } } // namespace sd::toolpanel diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 05b504e6ea60..aced93545f74 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -69,7 +69,6 @@ private: VclPtr<PushButton> m_pBtnSearch; VclPtr<PushButton> m_pBtnSeek; - const SfxItemSet& rOutAttrs; const ::sd::View* mpView; SdDrawDocument* mpDoc; XColorListRef pColList; @@ -88,11 +87,9 @@ private: void OpenFileDialog(); ::com::sun::star::presentation::ClickAction GetActualClickAction(); void SetActualClickAction( ::com::sun::star::presentation::ClickAction eCA ); - void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE ); void SetEditText( OUString const & rStr ); OUString GetEditText( bool bURL = false ); static sal_uInt16 GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA ); - sal_uInt16 GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); public: SdTPAction( vcl::Window* pParent, const SfxItemSet& rInAttrs ); diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx index 944a1b2ec0b8..c732ed925693 100644 --- a/sd/source/ui/inc/vectdlg.hxx +++ b/sd/source/ui/inc/vectdlg.hxx @@ -64,7 +64,6 @@ class SdVectorizeDlg : public ModalDialog void LoadSettings(); void SaveSettings() const; void InitPreviewBmp(); - void UpdatePreviewMtf(); static Rectangle GetRect( const Size& rDispSize, const Size& rBmpSize ); Bitmap GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale ); diff --git a/sd/source/ui/remotecontrol/BluetoothServer.hxx b/sd/source/ui/remotecontrol/BluetoothServer.hxx index bb24268a000b..2cbd040adb29 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.hxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.hxx @@ -36,7 +36,9 @@ namespace sd static void doEnsureDiscoverable(); static void doRestoreDiscoverable(); +#if defined(MACOSX) void addCommunicator( Communicator* pCommunicator ); +#endif private: BluetoothServer( std::vector<Communicator*>* pCommunicators ); virtual ~BluetoothServer(); diff --git a/sd/source/ui/remotecontrol/ZeroconfService.hxx b/sd/source/ui/remotecontrol/ZeroconfService.hxx index aec8e6e964e5..42381baf98ec 100644 --- a/sd/source/ui/remotecontrol/ZeroconfService.hxx +++ b/sd/source/ui/remotecontrol/ZeroconfService.hxx @@ -40,10 +40,6 @@ namespace sd{ :name(aname), port(aport){} virtual ~ZeroconfService(){} - std::string getName() const {return name;} - void setName(const char * n) {name = n;} - uint getPort() const {return port;} - // Clean up the service when closing virtual void clear() = 0; // Bonjour for OSX, Avahi for Linux diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index da045f527ed1..6ec03406c5ee 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -129,7 +129,6 @@ LayoutMenu::LayoutMenu ( DropTargetHelper(this), mrBase(rViewShellBase), mbUseOwnScrollBar(false), - mnPreferredColumnCount(3), mxListener(NULL), mbSelectionUpdatePending(true), mbIsMainViewChangePending(false), diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index 0969de6c525f..2c41d89c041c 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -129,7 +129,6 @@ private: /** If we are asked for the preferred window size, then use this many columns for the calculation. */ - const int mnPreferredColumnCount; css::uno::Reference<css::frame::XStatusListener> mxListener; bool mbSelectionUpdatePending; bool mbIsMainViewChangePending; @@ -189,7 +188,6 @@ private: /** When clicked then set the current page of the view in the center pane. */ DECL_LINK_TYPED(ClickHandler, ValueSet*, void); - DECL_LINK_TYPED(RightClickHandler, const MouseEvent&, void); DECL_LINK_TYPED(StateChangeHandler, const OUString&, void); DECL_LINK_TYPED(EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, void); DECL_LINK_TYPED(WindowEventHandler, VclWindowEvent&, void); diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index 8d65e5ad2b78..e901e1f66575 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -193,7 +193,6 @@ private: */ DECL_LINK_TYPED(ClickHandler, ValueSet*, void); DECL_LINK_TYPED(RightClickHandler, const MouseEvent&, void); - DECL_LINK(ContextMenuCallback, CommandEvent*); DECL_LINK_TYPED(ContainerChangeListener, MasterPageContainerChangeEvent&, void); DECL_LINK_TYPED(OnMenuItemSelected, Menu*, bool); diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx index 53b182acf33b..8ba346487271 100644 --- a/sd/source/ui/sidebar/PanelFactory.hxx +++ b/sd/source/ui/sidebar/PanelFactory.hxx @@ -51,10 +51,8 @@ class PanelFactory public PanelFactoryInterfaceBase { public: - static ::rtl::OUString SAL_CALL getImplementationName(); static css::uno::Reference<css::uno::XInterface> SAL_CALL createInstance ( const css::uno::Reference<css::lang::XMultiServiceFactory>& rxFactory); - static css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames(); explicit PanelFactory (const css::uno::Reference<css::uno::XComponentContext>& rxContext); virtual ~PanelFactory(); diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx index 240d6ec77ef7..46a8563efea9 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.hxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx @@ -69,12 +69,6 @@ private: SfxDispatcher* mpDispatcher; sal_Int32 mnCurrentSlideNumber; - /** The display count is used to determine whether the number of - displays has changed and thus whether restarting the slide show is - really necessary. - */ - sal_Int32 GetDisplayCount(); - DECL_LINK_TYPED(EndPresentation, void*, void); /** Restart the presentation on the slide last shown before the restart diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index c419b9f75c17..9046109bf8b5 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -324,7 +324,6 @@ SelectionFunction::SelectionFunction ( rRequest), mrSlideSorter(rSlideSorter), mrController(mrSlideSorter.GetController()), - mbDragSelection(false), maInsertionMarkerBox(), mbProcessingMouseButtonDown(false), mnShiftKeySelectionAnchor(-1), diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx index 257aaec0839d..47ce0de0b61f 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx @@ -143,15 +143,6 @@ private: const Size& rPreviewSize, const std::shared_ptr<Cache>& rpCache); - /** Return a sorted list of the available caches, both active caches and - those recently used, for the given document. The sort order is so - that an exact match of the preview size is at the front. Other - caches follow with the largest size first. - */ - BestFittingPageCaches GetBestFittingCaches ( - DocumentKey pDocument, - const Size& rPreviewSize); - /** This method is used internally to initialize a newly created BitmapCache with already exisiting previews. */ diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index 723a3567e06e..0ec870cd0799 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx @@ -80,11 +80,6 @@ public: */ void NotifyDragFinished(); - /** Call when drag-and-drop or multi selection is started or stopped in - order to update permission of mouse over indication. - */ - void UpdateMouseOverIndicationPermission(); - class EventDescriptor; class ModeHandler; friend class ModeHandler; @@ -121,7 +116,6 @@ private: /// The rectangle of the mouse drag selection. Rectangle maDragSelectionRectangle; - bool mbDragSelection; /// Box of the insert marker in model coordinates. Rectangle maInsertionMarkerBox; @@ -172,8 +166,6 @@ private: const bool bIsShiftDown, const bool bIsControlDown); - void StopDragAndDrop(); - void SwitchMode (const std::shared_ptr<ModeHandler>& rpHandler); }; diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index 348595652152..fbbc804c00ce 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -43,7 +43,6 @@ class SlideSorter; namespace sd { namespace slidesorter { namespace model { inline sal_Int32 FromCoreIndex (const sal_uInt16 nCoreIndex) { return (nCoreIndex-1)/2; } -inline sal_uInt16 ToCoreIndex (const sal_Int32 nIndex) { return static_cast<sal_uInt16>(nIndex*2+1); } /** The model of the slide sorter gives access to the slides that are to be displayed in the slide sorter view. Via the SetDocumentSlides() method diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx index 71ea6642d90a..4f6026336225 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx @@ -88,7 +88,6 @@ private: Point maIconOffset; std::unique_ptr<FramePainter> mpShadowPainter; - void SetPositionAndSize (const Rectangle& rBoundingBox); Point PaintRepresentatives ( OutputDevice& rContent, const Size& rPreviewSize, diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx index b2bde6c2f5ac..ac3d6dd0f20e 100644 --- a/sd/source/ui/unoidl/unocpres.hxx +++ b/sd/source/ui/unoidl/unocpres.hxx @@ -54,7 +54,6 @@ public: virtual ~SdXCustomPresentation() throw(); // internal - void Invalidate() { mpSdCustomShow = NULL; } SdCustomShow* GetSdCustomShow() const throw() { return mpSdCustomShow; } void SetSdCustomShow( SdCustomShow* pShow ) throw() { mpSdCustomShow = pShow; } SdXImpressDocument* GetModel() const throw() { return mpModel; } diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 47b97e4a068c..b5381cffdaae 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -281,9 +281,7 @@ SdXShape::SdXShape( SvxShape* pShape, SdXImpressDocument* pModel) throw() mpMap( pModel? lcl_ImplGetShapePropertyMap(pModel->IsImpressDocument(), pShape->getShapeKind() == OBJ_GRAF ) : lcl_GetEmpty_SdXShapePropertyMap_Impl() ), - mpModel(pModel), - mpImplementationId( NULL ) - + mpModel(pModel) { pShape->setMaster( this ); diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 5ec8ae052566..ddb45cd9749c 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -54,7 +54,6 @@ private: throw (std::exception); bool IsPresObj() const throw (std::exception); - void SetPresObj( bool bPresObj ) throw(); bool IsEmptyPresObj() const throw(); void SetEmptyPresObj(bool bEmpty) @@ -65,8 +64,6 @@ private: OUString GetPlaceholderText() const; - com::sun::star::uno::Sequence< sal_Int8 >* mpImplementationId; - public: SdXShape(SvxShape* pShape, SdXImpressDocument* pModel) throw(); virtual ~SdXShape() throw(); @@ -108,26 +105,6 @@ public: // XEventsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - -private: - void setOldEffect( const com::sun::star::uno::Any& aValue ); - void setOldTextEffect( const com::sun::star::uno::Any& aValue ); - void setOldSpeed( const com::sun::star::uno::Any& aValue ); - void setOldDimColor( const com::sun::star::uno::Any& aValue ); - void setOldDimHide( const com::sun::star::uno::Any& aValue ); - void setOldDimPrevious( const com::sun::star::uno::Any& aValue ); - void setOldPresOrder( const com::sun::star::uno::Any& aValue ); - void updateOldSoundEffect( SdAnimationInfo* pInfo ); - - void getOldEffect( com::sun::star::uno::Any& rValue ) const; - void getOldTextEffect( com::sun::star::uno::Any& rValue ) const; - void getOldSpeed( com::sun::star::uno::Any& rValue ) const; - void getOldSoundFile( com::sun::star::uno::Any& rValue ) const; - void getOldSoundOn( com::sun::star::uno::Any& rValue ) const; - void getOldDimColor( com::sun::star::uno::Any& rValue ) const; - void getOldDimHide( com::sun::star::uno::Any& rValue ) const; - void getOldDimPrev( com::sun::star::uno::Any& rValue ) const; - void getOldPresOrder( com::sun::star::uno::Any& rValue ) const; }; struct SvEventDescription; |