From 3d2f43438d4fe6947965a98262b0db42c8d5e680 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 21 Jul 2015 09:05:31 +0200 Subject: loplugin:unusedmethods sd Change-Id: I9b5399ace50db3259df2e619f28ae547a38e6c6d Reviewed-on: https://gerrit.libreoffice.org/17254 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- compilerplugins/clang/unusedmethods.py | 12 ++--- editeng/source/items/numitem.cxx | 13 ------ include/editeng/brushitem.hxx | 1 - include/editeng/numitem.hxx | 1 - sd/inc/CustomAnimationEffect.hxx | 12 ----- sd/inc/CustomAnimationPreset.hxx | 2 - sd/inc/EffectMigration.hxx | 5 --- sd/inc/Outliner.hxx | 5 --- sd/inc/drawdoc.hxx | 1 - sd/inc/sdabstdlg.hxx | 7 --- sd/inc/sdattr.hxx | 5 --- sd/inc/sddll.hxx | 4 -- sd/inc/sdfilter.hxx | 2 - sd/inc/sdiocmpt.hxx | 1 - sd/inc/sdobjfac.hxx | 4 -- sd/inc/sdpage.hxx | 5 --- sd/source/ui/animations/CustomAnimationDialog.hxx | 1 - sd/source/ui/animations/SlideTransitionPane.hxx | 1 - sd/source/ui/annotations/annotationwindow.hxx | 6 --- sd/source/ui/dlg/sddlgfact.cxx | 25 ----------- sd/source/ui/dlg/sddlgfact.hxx | 5 --- sd/source/ui/docshell/sdclient.cxx | 3 +- .../configuration/ConfigurationClassifier.cxx | 13 ------ .../configuration/ConfigurationClassifier.hxx | 13 ------ sd/source/ui/inc/Client.hxx | 6 --- sd/source/ui/inc/DrawViewShell.hxx | 1 - sd/source/ui/inc/FrameView.hxx | 1 - sd/source/ui/inc/PaneShells.hxx | 4 -- sd/source/ui/inc/TabControl.hxx | 2 - sd/source/ui/inc/View.hxx | 4 -- sd/source/ui/inc/ViewShell.hxx | 2 - sd/source/ui/inc/ViewShellBase.hxx | 1 - sd/source/ui/inc/Window.hxx | 1 - sd/source/ui/inc/docprev.hxx | 1 - sd/source/ui/inc/framework/ResourceId.hxx | 5 --- sd/source/ui/inc/fuhhconv.hxx | 6 +-- sd/source/ui/inc/fupoor.hxx | 5 --- sd/source/ui/inc/fusearch.hxx | 5 +-- sd/source/ui/inc/navigatr.hxx | 1 - sd/source/ui/inc/optsitem.hxx | 4 +- sd/source/ui/inc/sdtreelb.hxx | 1 - sd/source/ui/inc/sdundogr.hxx | 1 - sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 52 ---------------------- .../inc/controller/SlideSorterController.hxx | 16 ------- .../ui/slidesorter/inc/model/SlideSorterModel.hxx | 3 -- .../ui/slidesorter/inc/view/SlideSorterView.hxx | 25 ----------- sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx | 5 --- sd/source/ui/slidesorter/view/SlideSorterView.cxx | 1 - sd/source/ui/view/Outliner.cxx | 18 -------- sd/source/ui/view/ViewShellBase.cxx | 2 - 50 files changed, 11 insertions(+), 309 deletions(-) diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py index cf9ce793d255..600fcf8a2d92 100755 --- a/compilerplugins/clang/unusedmethods.py +++ b/compilerplugins/clang/unusedmethods.py @@ -64,35 +64,35 @@ exclusionSet = set([ "void oox::drawingml::TextParagraphProperties::dump() const", "class std::basic_string, class std::allocator > writerfilter::ooxml::OOXMLPropertySet::toString()", # called from the writerfilter generated code in $WORKDIR, not sure why it is not being picked up + "_Bool writerfilter::ooxml::OOXMLFactory_ns::getElementId(unsigned int,unsigned int,enum writerfilter::ooxml::ResourceType_t &,unsigned int &)", "void writerfilter::ooxml::OOXMLFastContextHandler::setDefaultIntegerValue()", "void writerfilter::ooxml::OOXMLFastContextHandler::positivePercentage(const class rtl::OUString &)", - "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleOLE()", "void writerfilter::ooxml::OOXMLFastContextHandler::positionOffset(const class rtl::OUString &)", "void writerfilter::ooxml::OOXMLFastContextHandler::alignH(const class rtl::OUString &)", "void writerfilter::ooxml::OOXMLFastContextHandler::alignV(const class rtl::OUString &)", "void writerfilter::ooxml::OOXMLFastContextHandler::setDefaultStringValue()", - "_Bool writerfilter::ooxml::OOXMLFactory_ns::getElementId(unsigned int,unsigned int,enum writerfilter::ooxml::ResourceType_t &,unsigned int &)", "void writerfilter::ooxml::OOXMLFastContextHandler::clearProps()", "void writerfilter::ooxml::OOXMLFastContextHandler::sendPropertiesWithId(const unsigned int &)", "void writerfilter::ooxml::OOXMLFastContextHandler::cr()", "void writerfilter::ooxml::OOXMLFastContextHandler::softHyphen()", "void writerfilter::ooxml::OOXMLFastContextHandler::noBreakHyphen()", "void writerfilter::ooxml::OOXMLFastContextHandler::setDefaultBooleanValue()", - "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handlePicture()", "void writerfilter::ooxml::OOXMLFastContextHandler::endField()", "void writerfilter::ooxml::OOXMLFastContextHandler::propagateCharacterPropertiesAsSet(const unsigned int &)", - "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleHdrFtr()", - "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleBreak()", "void writerfilter::ooxml::OOXMLFastContextHandler::tab()", "void writerfilter::ooxml::OOXMLFastContextHandler::ftnednref()", "void writerfilter::ooxml::OOXMLFastContextHandler::ftnednsep()", "void writerfilter::ooxml::OOXMLFastContextHandler::ftnedncont()", "void writerfilter::ooxml::OOXMLFastContextHandler::pgNum()", "void writerfilter::ooxml::OOXMLFastContextHandler::sendRowProperties()", - "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleComment()", "void writerfilter::ooxml::OOXMLFastContextHandler::setLastSectionGroup()", "void writerfilter::ooxml::OOXMLFastContextHandler::endTxbxContent()", "void writerfilter::ooxml::OOXMLFastContextHandler::setDefaultHexValue()", + "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleComment()", + "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleOLE()", + "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handlePicture()", + "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleHdrFtr()", + "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleBreak()", ]) diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 0edc0a4e85c7..14dea27e675f 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -481,19 +481,6 @@ void SvxNumberFormat::SetIndentAt( const long nIndentAt ) mnIndentAt = nIndentAt; } -IMPL_LINK_NOARG( SvxNumberFormat, GraphicArrived ) -{ - // if necessary, set the GrfSize: - if( !aGraphicSize.Width() || !aGraphicSize.Height() ) - { - const Graphic* pGrf = pGraphicBrush->GetGraphic(); - if( pGrf ) - aGraphicSize = SvxNumberFormat::GetGraphicSizeMM100( pGrf ); - } - NotifyGraphicArrived(); - return 0; -} - void SvxNumberFormat::NotifyGraphicArrived() { } diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index 0c2c26f7d5f3..15a2e2674ff0 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -53,7 +53,6 @@ class EDITENG_DLLPUBLIC SvxBrushItem : public SfxPoolItem mutable bool bLoadAgain; void ApplyGraphicTransparency_Impl(); - DECL_STATIC_LINK( SvxBrushItem, DoneHdl_Impl, void *); // wird nur von Create benutzt SvxBrushItem( SvStream& rStrm, sal_uInt16 nVersion, sal_uInt16 nWhich ); diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index 9a0e5f8145e3..bd07c4dfe765 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -140,7 +140,6 @@ private: OUString sCharStyleName; // Character Style - DECL_LINK( GraphicArrived, void * ); virtual void NotifyGraphicArrived(); public: explicit SvxNumberFormat( sal_Int16 nNumberingType, diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx index 1250238f1999..ceb7333d08c8 100644 --- a/sd/inc/CustomAnimationEffect.hxx +++ b/sd/inc/CustomAnimationEffect.hxx @@ -95,9 +95,6 @@ public: SAL_DLLPRIVATE double getAbsoluteDuration() const { return mfAbsoluteDuration; } - SAL_DLLPRIVATE const OUString& getName() const { return maName; } - SAL_DLLPRIVATE void setName( const OUString& rName ) { maName = rName; } - SAL_DLLPRIVATE sal_Int16 getIterateType() const { return mnIterateType; } void setIterateType( sal_Int16 nIterateType ); @@ -140,9 +137,6 @@ public: SAL_DLLPRIVATE ::com::sun::star::uno::Any getColor( sal_Int32 nIndex ); SAL_DLLPRIVATE void setColor( sal_Int32 nIndex, const ::com::sun::star::uno::Any& rColor ); - SAL_DLLPRIVATE ::com::sun::star::uno::Any getRotation(); - SAL_DLLPRIVATE void setRotation( const ::com::sun::star::uno::Any& rRotation ); - SAL_DLLPRIVATE sal_Int32 getGroupId() const { return mnGroupId; } SAL_DLLPRIVATE void setGroupId( sal_Int32 nGroupId ); @@ -243,7 +237,6 @@ public: void reset(); void addEffect( CustomAnimationEffectPtr& pEffect ); - const ::com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& getTarget() const { return maTarget; } const EffectSequence& getEffects() const { return maEffects; } /* -1: as single object, 0: all at once, n > 0: by n Th paragraph */ @@ -285,7 +278,6 @@ public: SAL_DLLPRIVATE CustomAnimationEffectPtr append( const CustomAnimationPresetPtr& pDescriptor, const ::com::sun::star::uno::Any& rTarget, double fDuration = -1.0 ); SAL_DLLPRIVATE CustomAnimationEffectPtr append( const SdrPathObj& rPathObj, const ::com::sun::star::uno::Any& rTarget, double fDuration = -1.0 ); void append( const CustomAnimationEffectPtr& pEffect ); - SAL_DLLPRIVATE void insert( EffectSequence::iterator& rPos, const CustomAnimationEffectPtr& pEffect ); SAL_DLLPRIVATE void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, double fDuration = -1.0 ); SAL_DLLPRIVATE void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, const OUString& rPresetSubType, double fDuration = -1.0 ); SAL_DLLPRIVATE void remove( const CustomAnimationEffectPtr& pEffect ); @@ -305,10 +297,6 @@ public: SAL_DLLPRIVATE virtual bool hasEffect( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); SAL_DLLPRIVATE virtual void onTextChanged( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); - /** this must be called if effects from this sequence are changed. - the method will call the registered listeners */ - SAL_DLLPRIVATE void update( const CustomAnimationEffectPtr& pEffect ); - /** this method rebuilds the animation nodes */ SAL_DLLPRIVATE virtual void rebuild(); diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx index d92fc05ec3b3..1c447f0b4870 100644 --- a/sd/inc/CustomAnimationPreset.hxx +++ b/sd/inc/CustomAnimationPreset.hxx @@ -50,9 +50,7 @@ public: SD_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > create( const OUString& rstrSubType ); const OUString& getPresetId() const { return maPresetId; } - const OUString& getProperty() const { return maProperty; } const OUString& getLabel() const { return maLabel; } - sal_Int16 getPresetClass() const { return mnPresetClass; } double getDuration() const { return mfDuration; } UStringList getSubTypes(); diff --git a/sd/inc/EffectMigration.hxx b/sd/inc/EffectMigration.hxx index f12290167ca7..62103d03ceda 100644 --- a/sd/inc/EffectMigration.hxx +++ b/sd/inc/EffectMigration.hxx @@ -45,14 +45,9 @@ public: static bool ConvertPreset( const OUString& rPresetId, const OUString* pPresetSubType, ::com::sun::star::presentation::AnimationEffect& rEffect ); static bool ConvertAnimationEffect( const ::com::sun::star::presentation::AnimationEffect& rEffect, OUString& rPresetId, OUString& rPresetSubType ); -public: - void AddEffectFromAnimationInfo( SdrObject* pObject, SdAnimationInfo* pInfo ); - -public: static void SetFadeEffect( SdPage* pPage, ::com::sun::star::presentation::FadeEffect eNewEffect); static ::com::sun::star::presentation::FadeEffect GetFadeEffect( const SdPage* pPage ); -public: static void SetAnimationEffect( SvxShape* pShape, ::com::sun::star::presentation::AnimationEffect eValue ); static ::com::sun::star::presentation::AnimationEffect GetAnimationEffect( SvxShape* pShape ); static void SetTextAnimationEffect( SvxShape* pShape, ::com::sun::star::presentation::AnimationEffect eValue ); diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index 26ad3495357a..a97d2092ecc5 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -127,9 +127,6 @@ public: */ void StartSpelling(); - /** Proxy for method from base class to avoid compiler warning */ - void StartSpelling(EditView&, unsigned char); - /** Initiate a find and/or replace on the next relevant text object. @return Returns when the search/replace is finished (as @@ -166,8 +163,6 @@ public: /** Release all resources that have been created during the conversion */ void EndConversion(); - DECL_LINK( SpellError, void * ); - enum ChangeHint { CH_VIEW_SHELL_INVALID, CH_VIEW_SHELL_VALID }; int GetIgnoreCurrentPageChangesLevel() const { return mnIgnoreCurrentPageChangesLevel; }; diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 1a3e359b3f4c..df9597191b83 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -144,7 +144,6 @@ public: private: bool bReadOnly; public: - SAL_DLLPRIVATE virtual void setDocReadOnly( bool b){ bReadOnly = b; } SAL_DLLPRIVATE virtual bool getDocReadOnly() const { return bReadOnly; } private: ::sd::Outliner* mpOutliner; ///< local outliner for outline mode diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index a2391f78603e..51a4b660e253 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -113,8 +113,6 @@ public: class AbstractSdInsertPasteDlg : public VclAbstractDialog { -public: - virtual bool IsInsertBefore() const = 0; }; class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog @@ -161,10 +159,6 @@ public: class AbstractHeaderFooterDialog : public VclAbstractDialog { -public: - virtual void ApplyToAll() = 0; - virtual void Apply() = 0; - virtual void Cancel() = 0; }; class SdAbstractDialogFactory @@ -181,7 +175,6 @@ public: virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) = 0; virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) = 0; virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) = 0; - virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( vcl::Window* pWindow ) = 0; virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( vcl::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) = 0; virtual AbstractMorphDlg* CreateMorphDlg( vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) = 0; virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) = 0; diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx index 1fcafb138e6a..570ef7d9bde8 100644 --- a/sd/inc/sdattr.hxx +++ b/sd/inc/sdattr.hxx @@ -93,8 +93,6 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; sal_uInt16 GetValueCount() const SAL_OVERRIDE { return FADE_EFFECT_COUNT; } - ::com::sun::star::presentation::FadeEffect GetValue() const - { return (::com::sun::star::presentation::FadeEffect) SfxEnumItem::GetValue(); } }; class DiaSpeedItem : public SfxEnumItem @@ -107,8 +105,6 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; sal_uInt16 GetValueCount() const SAL_OVERRIDE { return FADE_SPEED_COUNT; } - FadeSpeed GetValue() const - { return (FadeSpeed) SfxEnumItem::GetValue(); } }; class DiaAutoItem : public SfxEnumItem @@ -121,7 +117,6 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; sal_uInt16 GetValueCount() const SAL_OVERRIDE { return PRESCHANGE_COUNT; } - PresChange GetValue() const { return (PresChange) SfxEnumItem::GetValue(); } }; class DiaTimeItem : public SfxUInt32Item diff --git a/sd/inc/sddll.hxx b/sd/inc/sddll.hxx index 36c9c0e1bfed..22e8e61fbe1b 100644 --- a/sd/inc/sddll.hxx +++ b/sd/inc/sddll.hxx @@ -47,10 +47,6 @@ public: SdDLL(); ~SdDLL(); - // static-init/exit-code must be linked to the application - static void LibInit(); // called from SfxApplication-subclass::Init() - static void LibExit(); // called from SfxApplication-subclass::Exit() - // DLL-init/exit-code must be linked to the DLL only static void Init(); // called directly after loading the DLL }; diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx index 15cf1a632b06..6b9293509c3a 100644 --- a/sd/inc/sdfilter.hxx +++ b/sd/inc/sdfilter.hxx @@ -40,9 +40,7 @@ public: SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ); virtual ~SdFilter(); - bool IsProgress() const { return mbShowProgress; } bool IsDraw() const { return mbIsDraw; } - bool IsImpress() const { return !mbIsDraw; } virtual bool Export() = 0; protected: diff --git a/sd/inc/sdiocmpt.hxx b/sd/inc/sdiocmpt.hxx index cc18b4a0265f..f1a3f7bdbf11 100644 --- a/sd/inc/sdiocmpt.hxx +++ b/sd/inc/sdiocmpt.hxx @@ -57,7 +57,6 @@ public: SdIOCompat(SvStream& rNewStream, StreamMode nNewMode, sal_uInt16 nVer = SDIOCOMPAT_VERSIONDONTKNOW); ~SdIOCompat(); - sal_uInt16 GetVersion() const { return nVersion; } }; #endif // INCLUDED_SD_INC_SDIOCMPT_HXX diff --git a/sd/inc/sdobjfac.hxx b/sd/inc/sdobjfac.hxx index 5e42f93ee0f3..cfca8b089f59 100644 --- a/sd/inc/sdobjfac.hxx +++ b/sd/inc/sdobjfac.hxx @@ -34,10 +34,6 @@ protected: public: SdObjectFactory() {} - void SetOldMakeUserDataHdl( const Link<>& rLink ) - { aOldMakeUserDataLink = rLink; } - Link<> GetOldMakeUserDataHdl() const { return aOldMakeUserDataLink; } - DECL_LINK( MakeUserData, SdrObjFactory * ); }; diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 6e6a354408b1..08d49afaab01 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -235,7 +235,6 @@ public: void SetExcluded(bool bNewExcluded) { mbExcluded = bNewExcluded; } bool IsExcluded() const { return mbExcluded; } - void SetScaleObjects(bool bScale) { mbScaleObjects = bScale; } bool IsScaleObjects() const { return mbScaleObjects; } void SetSoundFile(const OUString& rStr) { maSoundFile = rStr; } @@ -272,7 +271,6 @@ public: OUString GetFileName() const { return maFileName; } void SetBookmarkName(const OUString& aName) { maBookmarkName = aName; } OUString GetBookmarkName() const { return maBookmarkName; } - SdPageLink* GetLink() { return mpPageLink; } void ConnectLink(); void DisconnectLink(); @@ -292,8 +290,6 @@ public: void SetBackgroundFullSize( bool bIn ); bool IsBackgroundFullSize() const { return mbBackgroundFullSize; } - rtl_TextEncoding GetCharSet() { return meCharSet; } - void SetPaperBin(sal_uInt16 nBin) { mnPaperBin = nBin; } sal_uInt16 GetPaperBin() const { return mnPaperBin; } virtual void SetOrientation(Orientation eOrient) SAL_OVERRIDE; @@ -382,7 +378,6 @@ public: void addAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation, int nIndex = -1 ); void removeAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ); const sd::AnnotationVector& getAnnotations() const { return maAnnotations; } - bool hasAnnotations() const { return !maAnnotations.empty(); } sal_Int32 getHash() const; OString stringify() const; diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index 4a082c36b780..ed4997869f59 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -146,7 +146,6 @@ public: virtual ~CustomAnimationDialog(); virtual void dispose() SAL_OVERRIDE; - STLPropertySet* getDefaultSet() { return mpSet; } STLPropertySet* getResultSet(); static STLPropertySet* createDefaultSet(); diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx index fbfc3cf33e16..24606c146dca 100644 --- a/sd/source/ui/animations/SlideTransitionPane.hxx +++ b/sd/source/ui/animations/SlideTransitionPane.hxx @@ -67,7 +67,6 @@ public: void onChangeCurrentPage(); private: - void updateLayout(); void updateControls(); void updateControlState(); diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 2981dc632818..a574c1edc1dd 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -109,12 +109,9 @@ class AnnotationWindow : public FloatingWindow SvxLanguageItem GetLanguage(); void setAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation, bool bGrabFocus = false ); - const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& getAnnotation() const { return mxAnnotation; } void ExecuteSlot( sal_uInt16 nSID ); - ScrollBar* Scrollbar() { return mpVScrollbar;} - DrawDocShell* DocShell() { return mpDocShell; } OutlinerView* getView() { return mpOutlinerView; } sd::View* DocView() { return mpView; } @@ -124,15 +121,12 @@ class AnnotationWindow : public FloatingWindow long GetPostItTextHeight(); void InitControls(); - void HidePostIt(); void DoResize(); void ResizeIfNecessary(long aOldHeight, long aNewHeight); void SetScrollbar(); void Rescale(); - bool IsReadOnly() { return mbReadonly;} - bool IsProtected() { return mbProtected; } void SetLanguage(const SvxLanguageItem &aNewItem); diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index b3cba83e3d91..7837a8ab3997 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -274,11 +274,6 @@ void AbstractSdInsertLayerDlg_Impl::SetHelpId( const OString& rHelpId ) pDlg->SetHelpId( rHelpId ); } -bool AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const -{ - return pDlg->IsInsertBefore(); -} - vcl::Window* AbstractSdInsertPagesObjsDlg_Impl::GetWindow() { return static_cast(pDlg); @@ -354,21 +349,6 @@ void AbstractSdPublishingDlg_Impl::GetParameterSequence( ::com::sun::star::uno:: pDlg->GetParameterSequence( rParams ); } -void AbstractHeaderFooterDialog_Impl::ApplyToAll() -{ - pDlg->ApplyToAll(); -} - -void AbstractHeaderFooterDialog_Impl::Apply() -{ - pDlg->Apply( ); -} - -void AbstractHeaderFooterDialog_Impl::Cancel() -{ - pDlg->Cancel( ); -} - //-------------- SdAbstractDialogFactory implementation-------------- VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateBreakDlg( @@ -424,11 +404,6 @@ AbstractSdInsertLayerDlg * SdAbstractDialogFactory_Impl::CreateSdInsertLayerDlg( return new AbstractSdInsertLayerDlg_Impl( VclPtr::Create( pWindow, rInAttrs, bDeletable, aStr ) ); } -AbstractSdInsertPasteDlg * SdAbstractDialogFactory_Impl::CreateSdInsertPasteDlg( vcl::Window* pWindow ) -{ - return new AbstractSdInsertPasteDlg_Impl( VclPtr::Create( pWindow ) ); -} - AbstractSdInsertPagesObjsDlg * SdAbstractDialogFactory_Impl::CreateSdInsertPagesObjsDlg( vcl::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) { return new AbstractSdInsertPagesObjsDlg_Impl( VclPtr::Create( pParent, pDoc, pSfxMedium, rFileName ) ); diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 3ba9b486d787..732a9b49cf4e 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -157,7 +157,6 @@ class SdInsertPasteDlg; class AbstractSdInsertPasteDlg_Impl : public AbstractSdInsertPasteDlg { DECL_ABSTDLG_BASE(AbstractSdInsertPasteDlg_Impl,SdInsertPasteDlg) - virtual bool IsInsertBefore() const SAL_OVERRIDE; }; class SdInsertPagesObjsDlg; @@ -218,9 +217,6 @@ class AbstractSdPublishingDlg_Impl :public AbstractSdPublishingDlg class AbstractHeaderFooterDialog_Impl :public AbstractHeaderFooterDialog { DECL_ABSTDLG_BASE(AbstractHeaderFooterDialog_Impl,::sd::HeaderFooterDialog) - virtual void ApplyToAll() SAL_OVERRIDE; - virtual void Apply() SAL_OVERRIDE; - virtual void Cancel() SAL_OVERRIDE; }; //AbstractDialogFactory_Impl implementations @@ -239,7 +235,6 @@ public: virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) SAL_OVERRIDE; virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) SAL_OVERRIDE; virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) SAL_OVERRIDE; - virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( vcl::Window* pWindow ) SAL_OVERRIDE; virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( vcl::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) SAL_OVERRIDE; virtual AbstractMorphDlg* CreateMorphDlg( vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) SAL_OVERRIDE; diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx index e77ae5849151..d33e05478896 100644 --- a/sd/source/ui/docshell/sdclient.cxx +++ b/sd/source/ui/docshell/sdclient.cxx @@ -41,8 +41,7 @@ Client::Client(SdrOle2Obj* pObj, ViewShell* pViewShell, vcl::Window* pWindow) : SfxInPlaceClient(pViewShell->GetViewShell(), pWindow, pObj->GetAspect() ), mpViewShell(pViewShell), pSdrOle2Obj(pObj), - pSdrGrafObj(NULL), - pOutlinerParaObj (NULL) + pSdrGrafObj(NULL) { SetObject( pObj->GetObjRef() ); DBG_ASSERT( GetObject().is(), "No object connected!" ); diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx index 05d1c9589e85..6989223cd136 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx @@ -162,20 +162,7 @@ void ConfigurationClassifier::CopyResources ( } } -void ConfigurationClassifier::TraceResourceIdVector ( - const sal_Char* pMessage, - const ResourceIdVector& rResources) -{ - SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": " << pMessage); - ResourceIdVector::const_iterator iResource; - for (iResource=rResources.begin(); iResource!=rResources.end(); ++iResource) - { - OUString sResource (FrameworkHelper::ResourceIdToString(*iResource)); - SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": " << - OUStringToOString(sResource, RTL_TEXTENCODING_UTF8).getStr()); - } -} } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx index 27dde875fa56..2470f01ffc04 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx @@ -76,19 +76,6 @@ public: */ const ResourceIdVector& GetC2minusC1() const { return maC2minusC1;} - /** Return the resources that belong to both the configurations that - where given to the constructor. - @return - A reference to the, possibly empty, list of resources is - returned. This reference remains valid as long as the called - ConfigurationClassifier object stays alive. - */ - const ResourceIdVector& GetC1andC2() const { return maC1andC2;} - - static void TraceResourceIdVector ( - const sal_Char* pMessage, - const ResourceIdVector& rResources); - private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XConfiguration> mxConfiguration1; diff --git a/sd/source/ui/inc/Client.hxx b/sd/source/ui/inc/Client.hxx index dd965219395b..bd7a78423fdd 100644 --- a/sd/source/ui/inc/Client.hxx +++ b/sd/source/ui/inc/Client.hxx @@ -34,7 +34,6 @@ class Client : public SfxInPlaceClient ViewShell* mpViewShell; SdrOle2Obj* pSdrOle2Obj; SdrGrafObj* pSdrGrafObj; - OutlinerParaObject* pOutlinerParaObj; virtual void ObjectAreaChanged() SAL_OVERRIDE; virtual void RequestNewObjectArea( Rectangle& ) SAL_OVERRIDE; @@ -43,12 +42,7 @@ class Client : public SfxInPlaceClient public: Client (SdrOle2Obj* pObj, ViewShell* pSdViewShell, vcl::Window* pWindow); virtual ~Client(); - - SdrOle2Obj* GetSdrOle2Obj() const { return pSdrOle2Obj; } void SetSdrGrafObj(SdrGrafObj* pObj) { pSdrGrafObj = pObj; } - SdrGrafObj* GetSdrGrafObj() const { return pSdrGrafObj; } - void SetOutlinerParaObj (OutlinerParaObject* pObj) { pOutlinerParaObj = pObj; } - OutlinerParaObject* GetOutlinerParaObject () const { return pOutlinerParaObj; } }; } // end of namespace sd diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 34b0929b439a..b2d2d10e8235 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -250,7 +250,6 @@ public: PageKind GetPageKind() { return mePageKind; } void SetPageKind( PageKind ePageKind ) { mePageKind = ePageKind; } Point GetMousePos() { return maMousePos; } - bool IsMousePosFreezed() { return mbMousePosFreezed; } void SetMousePosFreezed( bool bIn ) { mbMousePosFreezed = bIn; } EditMode GetEditMode() const { return meEditMode; } diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx index 1cfe9d1c5fa4..dea23ec839f4 100644 --- a/sd/source/ui/inc/FrameView.hxx +++ b/sd/source/ui/inc/FrameView.hxx @@ -155,7 +155,6 @@ public: sal_uInt16 GetPresentationViewShellId() const { return mnPresViewShellId; } void SetSlotId(sal_uInt16 nId) { mnSlotId = nId; } - sal_uInt16 GetSlotId() const { return mnSlotId; } void SetSlidesPerRow(sal_uInt16 nSlides) { mnSlidesPerRow = nSlides; } sal_uInt16 GetSlidesPerRow() const { return mnSlidesPerRow; } diff --git a/sd/source/ui/inc/PaneShells.hxx b/sd/source/ui/inc/PaneShells.hxx index b362d3e35c95..7447159602c4 100644 --- a/sd/source/ui/inc/PaneShells.hxx +++ b/sd/source/ui/inc/PaneShells.hxx @@ -73,10 +73,6 @@ public: TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE( SD_IF_SDTOOLPANELPANESHELL ) -private: - /// SfxInterface initializer. - static void InitInterface_Impl(); - public: ToolPanelPaneShell(); virtual ~ToolPanelPaneShell(); diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx index b767cc8b2ba7..d73d29ae51a6 100644 --- a/sd/source/ui/inc/TabControl.hxx +++ b/sd/source/ui/inc/TabControl.hxx @@ -79,8 +79,6 @@ protected: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; - DECL_LINK(DeactivatePageHdl, void*); - private: // nested class to implement the TransferableHelper class TabControlTransferable : public TransferableHelper diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index f2509c52194a..94bb84689106 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -208,7 +208,6 @@ public: virtual void AddCustomHdl() SAL_OVERRIDE; SmartTagSet& getSmartTags() { return maSmartTags; } - void selectSmartTag( const SmartTagReference& xTag ); void updateHandles(); virtual SdrViewContext GetContext() const SAL_OVERRIDE; @@ -250,9 +249,6 @@ public: void SetResizePropAllowed( bool bSet ) { bResizePropAllowed = bSet; } void SetResizeProtected( bool bSet ) { bResizeProtect = bSet; } - void SetMarkedPointsSmoothPossible( bool bSet ) { bSetMarkedPointsSmoothPossible = bSet; } - void SetMarkedSegmentsKindPossible( bool bSet ) { bSetMarkedSegmentsKindPossible = bSet; } - SdrObject* GetEmptyPresentationObject( PresObjKind eKind ); SdPage* GetPage(); SdrObject* GetSelectedSingleObject(SdPage* pPage); diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 75705c32dc5f..c710bd57817f 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -584,8 +584,6 @@ private: */ void construct(); - DECL_LINK(FrameWindowEventListener, VclSimpleEvent*); - /** Create the rulers. */ void SetupRulers(); diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index f67da17348b4..832add5cfb3f 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -63,7 +63,6 @@ class ViewShellBase { public: TYPEINFO_OVERRIDE(); - SFX_DECL_VIEWFACTORY(ViewShellBase); SFX_DECL_INTERFACE(SD_IF_SDVIEWSHELLBASE) private: diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index c1cc2143d858..b615356ac83e 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -87,7 +87,6 @@ public: long GetZoomForRect( const Rectangle& rZoomRect ); void SetMinZoomAutoCalc (bool bAuto); - void SetCalcMinZoomByMinSide (bool bMin); /** Calculate the minimal zoom factor as the value at which the application area would completely fill the window. All values set diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index ff1f4b97c778..f28e7a7d3dfe 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -73,7 +73,6 @@ public: virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void SetClickHdl( const Link<>& rLink ) { aClickHdl = rLink; } - const Link<>& GetClickHdl() const { return aClickHdl; } virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index d9694bb5bd35..9c6bf20a38df 100644 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -101,11 +101,6 @@ public: virtual ~ResourceId(); - /** Return the list of URLs of both the resource URL and the anchor - URLs. - */ - const ::std::vector& GetResourceURLs() const; - //===== XResourceId ======================================================= virtual OUString SAL_CALL diff --git a/sd/source/ui/inc/fuhhconv.hxx b/sd/source/ui/inc/fuhhconv.hxx index 25669f68bdad..015116744ccd 100644 --- a/sd/source/ui/inc/fuhhconv.hxx +++ b/sd/source/ui/inc/fuhhconv.hxx @@ -28,7 +28,7 @@ class Outliner; class FuHangulHanjaConversion : public FuPoor { - public: +public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); @@ -40,9 +40,7 @@ class FuHangulHanjaConversion : public FuPoor void ConvertStyles( sal_Int16 nTargetLanguage, const vcl::Font *pTargetFont ); - Outliner* GetOutliner() const { return pSdOutliner; } - - protected: +protected: virtual ~FuHangulHanjaConversion(); Outliner* pSdOutliner; diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index 72e88fd19b93..34153b4b8a01 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -60,7 +60,6 @@ public: sal_uInt16 GetMouseButtonCode() const { return mnCode; } DrawDocShell* GetDocSh() { return mpDocSh; } - SdDrawDocument* GetDoc() { return mpDoc; } virtual void DoCut(); virtual void DoCopy(); @@ -87,10 +86,6 @@ public: virtual void SelectionHasChanged(); sal_uInt16 GetSlotID() const { return nSlotId; } - sal_uInt16 GetSlotValue() const { return nSlotValue; } - - void SetNoScrollUntilInside(bool bNoScroll = true) - { bNoScrollUntilInside = bNoScroll; } void StartDelayToScrollTimer (); diff --git a/sd/source/ui/inc/fusearch.hxx b/sd/source/ui/inc/fusearch.hxx index 3e9a73b26269..55f2d4343ffa 100644 --- a/sd/source/ui/inc/fusearch.hxx +++ b/sd/source/ui/inc/fusearch.hxx @@ -28,8 +28,7 @@ namespace sd { class Outliner; -class FuSearch - : public FuPoor +class FuSearch : public FuPoor { public: TYPEINFO_OVERRIDE(); @@ -39,8 +38,6 @@ public: void SearchAndReplace( const SvxSearchItem* pSearchItem ); - ::sd::Outliner* GetOutliner() const { return pSdOutliner; } - protected: virtual ~FuSearch(); diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index 493cebcda495..7c9f26689ebb 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -108,7 +108,6 @@ public: bool InsertFile(const OUString& rFileName); NavigatorDragType GetNavigatorDragType(); - void SetNavigatorDragType(NavigatorDragType eType) { meDragType = eType; } protected: virtual void Resize() SAL_OVERRIDE; diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 57c4569eba25..47e1bae7f3cc 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -102,8 +102,7 @@ public: SdOptionsGeneric( sal_uInt16 nConfigId, const OUString& rSubTree ); virtual ~SdOptionsGeneric(); - const OUString& GetSubTree() const { return maSubTree; } - sal_uInt16 GetConfigId() const { return mnConfigId; } + sal_uInt16 GetConfigId() const { return mnConfigId; } void EnableModify( bool bModify ) { mbEnableModify = bModify; } @@ -196,7 +195,6 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - SdOptionsContents& GetOptionsContents() { return maOptionsContents; } private: SdOptionsContents maOptionsContents; }; diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 31e812510907..7e918976d2b6 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -195,7 +195,6 @@ public: virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; void SetViewFrame( SfxViewFrame* pViewFrame ) { mpFrame = pViewFrame; } - SfxViewFrame* GetViewFrame() const { return mpFrame; } void Fill( const SdDrawDocument*, bool bAllPages, const OUString& rDocName ); void Fill( const SdDrawDocument*, SfxMedium* pSfxMedium, const OUString& rDocName ); diff --git a/sd/source/ui/inc/sdundogr.hxx b/sd/source/ui/inc/sdundogr.hxx index 47ae4694a04e..c91373c1c817 100644 --- a/sd/source/ui/inc/sdundogr.hxx +++ b/sd/source/ui/inc/sdundogr.hxx @@ -42,7 +42,6 @@ public: virtual void Redo() SAL_OVERRIDE; void AddAction(SdUndoAction* pAction); - sal_uLong Count() const { return aCtn.size(); } }; diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index bd69db1766f3..4260f07d06a4 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -58,10 +58,6 @@ public: TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SD_IF_SDTOOLPANELSHELL) -private: - /// SfxInterface initializer. - static void InitInterface_Impl(); - public: ToolPanelViewShell ( SfxViewFrame* pFrame, @@ -70,9 +66,6 @@ public: FrameView* pFrameView); virtual ~ToolPanelViewShell(); - void GetFocus(); - void LoseFocus(); - void KeyInput (const KeyEvent& rEvent); using sd::ViewShell::KeyInput; virtual SdPage* GetActualPage() SAL_OVERRIDE; @@ -80,25 +73,6 @@ public: virtual void ArrangeGUIElements() SAL_OVERRIDE; - TaskPaneShellManager& GetSubShellManager() const; - - /** deactivates the given panel, bypassing the configuration controller. Only valid for tool panels which are - not under the drawing framework's control. - */ - void ActivatePanel( const OUString& i_rPanelResourceURL ); - - /** deactivates the given panel, bypassing the configuration controller - */ - void DeactivatePanel( const OUString& i_rPanelResourceURL ); - - /** Return a pointer to the docking window that is the parent or a - predecessor of the content window. - @return - When the view shell is not placed in a docking window, e.g. when - shown in the center pane, then is returned. - */ - DockingWindow* GetDockingWindow(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> CreateAccessibleDocumentView (::sd::Window* pWindow) SAL_OVERRIDE; @@ -109,17 +83,6 @@ public: */ virtual bool RelocateToParentWindow (vcl::Window* pParentWindow) SAL_OVERRIDE; - /// returns if and only if the given window is the panel anchor window of our ToolPanelDeck - bool IsPanelAnchorWindow( const vcl::Window& i_rWindow ) const; - - /** creates an XUIElement for the given standard panel - */ - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > - CreatePanelUIElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocFrame, - const OUString& i_rPanelResourceURL - ); - private: ::boost::scoped_ptr< ToolPanelViewShell_Impl > mpImpl; @@ -129,21 +92,6 @@ private: window. */ sal_uInt16 mnMenuId; - - /** Create a popup menu. it contains two sections, one for - docking or un-docking the tool panel, one for toggling the - visibility state of the tool panel items. - @param bIsDocking - According to this flag one of the lock/unlock entries is - made disabled. - */ - ::std::unique_ptr CreatePopupMenu (bool bIsDocking); - - /** Initialize the task pane view shell if that has not yet been done - before. If mbIsInitialized is already set to then this - method returns immediately. - */ - void Initialize(); }; } } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index 6923b111bbb4..d56c056339ab 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -139,8 +139,6 @@ public: void ExecCtrl (SfxRequest& rRequest); void GetAttrState (SfxItemSet& rSet); - bool IsLocked() const; - /** Create an object of this inner class to prevent updates due to model changes. */ @@ -278,20 +276,6 @@ private: */ bool mbIsContextMenuOpen; - /** Delete the given list of normal pages. This method is a helper - function for DeleteSelectedPages(). - @param rSelectedNormalPages - A list of normal pages. Supplying master pages is an error. - */ - void DeleteSelectedNormalPages (const ::std::vector& rSelectedNormalPages); - - /** Delete the given list of master pages. This method is a helper - function for DeleteSelectedPages(). - @param rSelectedMasterPages - A list of master pages. Supplying normal pages is an error. - */ - void DeleteSelectedMasterPages (const ::std::vector& rSelectedMasterPages); - /** Prepare for several model changes, i.e. prevent time-consuming and non-critical operations like repaints until UnlockModelChange() is called. Ciritcal operations like releasing references to pages that diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index c2f20cf781a4..348595652152 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -74,9 +74,6 @@ public: */ bool SetEditMode (EditMode eEditMode); - /** Set the edit mode to that currently used by the controller. - */ - bool SetEditModeFromController(); EditMode GetEditMode() const { return meEditMode;} PageKind GetPageType() const { return mePageKind;} diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index 9ec37e4546e0..8242d24970ea 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -145,32 +145,8 @@ public: */ void InvalidatePageObjectVisibilities(); - /** Return the window to which this view renders its output. - */ - // ::boost::shared_ptr GetWindow() const; - ::boost::shared_ptr GetPreviewCache(); - /** Set the bounding box of the insertion marker in model coordinates. - - It will be painted as a dark rectangle that fills the given box. - */ - void SetInsertionMarker (const Rectangle& rBBox); - - /** Specify whether the insertion marker will be painted or not. - */ - void SetInsertionMarkerVisibility (bool bVisible); - - /** Set the size and position of the selection rectangle. - - It will be painted as a dashed rectangle. - */ - void SetSelectionRectangle (const Rectangle& rBox); - - /** Specify whether the selection rectangle will be painted or not. - */ - void SetSelectionRectangleVisibility (bool bVisible); - /** Return the range of currently visible page objects including the first and last one in that range. @return @@ -252,7 +228,6 @@ private: Layouter::Orientation meOrientation; ::boost::shared_ptr mpProperties; model::SharedPageDescriptor mpPageUnderMouse; - sal_Int32 mnButtonUnderMouse; ::boost::shared_ptr mpPageObjectPainter; ::boost::shared_ptr mpSelectionPainter; vcl::Region maRedrawRegion; diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index ff2c2a8d60ae..15068205a5f4 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx @@ -111,11 +111,6 @@ public: sal_Int32 GetIndex (const sal_Int32 nRow, const sal_Int32 nColumn) const; - /** Return the scale factor that can be set at the map mode of the - output window. - */ - Fraction GetScaleFactor() const; - Size GetPageObjectSize() const; /** Return the bounding box in window coordinates of the nIndex-th page diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 1661844100c8..2b15485e12eb 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -147,7 +147,6 @@ SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter) meOrientation(Layouter::GRID), mpProperties(rSlideSorter.GetProperties()), mpPageUnderMouse(), - mnButtonUnderMouse(-1), mpPageObjectPainter(), mpSelectionPainter(), mpBackgroundPainter( diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index dc208c918f44..4a332660ff86 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -285,12 +285,6 @@ void Outliner::StartSpelling() mpSearchItem = NULL; } -/** Proxy for method from base class to avoid compiler warning */ -void Outliner::StartSpelling(EditView& rView, unsigned char c) -{ - SdrOutliner::StartSpelling( rView, c ); -} - /** Free all resources acquired during the search/spell check. After a spell check the start position is restored here. */ @@ -1303,18 +1297,6 @@ void Outliner::EnterEditMode (bool bGrabFocus) } } -/** - * SpellChecker: Error link handler - */ -IMPL_LINK( Outliner, SpellError, void *, nLang ) -{ - mbError = true; - OUString aError( SvtLanguageTable::GetLanguageString( (LanguageType)reinterpret_cast(nLang) ) ); - ErrorHandler::HandleError(* new StringErrorInfo( - ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aError) ); - return 0; -} - ESelection Outliner::GetSearchStartPosition() { ESelection aPosition; diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index d67a1ab621a3..a6fda969ca9f 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -220,8 +220,6 @@ TYPEINIT1(ViewShellBase, SfxViewShell); // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a // new ViewShellBase object has been constructed. -SfxViewFactory* ViewShellBase::pFactory; - SFX_IMPL_SUPERCLASS_INTERFACE(ViewShellBase, SfxViewShell) void ViewShellBase::InitInterface_Impl() -- cgit v1.2.3