diff options
| author | Noel Grandin <noel@peralex.com> | 2015-07-15 15:13:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-16 05:48:12 +0000 |
| commit | b7f9a397fbf8459d166d7bb961d5d8c2c87a0868 (patch) | |
| tree | 7991b4d6a75db21a2261e461108d0f44e858f992 | |
| parent | 4ca2cf1b7e57c823e911bcbae0c87102a7c9851e (diff) | |
loplugin:unusedmethods sfx2(part2)
Change-Id: I82223b72ddb6a9df1ee52a300b083002234602dc
Reviewed-on: https://gerrit.libreoffice.org/17075
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
64 files changed, 12 insertions, 288 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 11a2244c4082..dfa5e78a0466 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -219,8 +219,6 @@ public: SAL_DLLPRIVATE void MiscState_Impl(SfxItemSet &); SAL_DLLPRIVATE void PropExec_Impl(SfxRequest &); SAL_DLLPRIVATE void PropState_Impl(SfxItemSet &); - SAL_DLLPRIVATE void INetExecute_Impl(SfxRequest &); - SAL_DLLPRIVATE void INetState_Impl(SfxItemSet &); SAL_DLLPRIVATE void OfaExec_Impl(SfxRequest &); SAL_DLLPRIVATE void OfaState_Impl(SfxItemSet &); diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index 2e97b1052b5b..eba4dd6b26dd 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -193,7 +193,6 @@ public: SAL_DLLPRIVATE void DeleteControllers_Impl(); SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl() { return pDispatcher; } SAL_DLLPRIVATE void ClearCache_Impl( sal_uInt16 nSlotId ); - SAL_DLLPRIVATE bool IsInUpdate_Impl() const{ return IsInUpdate(); } SAL_DLLPRIVATE void RegisterInternal_Impl( SfxControllerItem& rBinding ); SAL_DLLPRIVATE void Register_Impl( SfxControllerItem& rBinding, bool ); SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl() const; diff --git a/include/sfx2/brokenpackageint.hxx b/include/sfx2/brokenpackageint.hxx index e8302ba7ff62..d198da65c2db 100644 --- a/include/sfx2/brokenpackageint.hxx +++ b/include/sfx2/brokenpackageint.hxx @@ -44,7 +44,6 @@ class SFX2_DLLPUBLIC NotifyBrokenPackage public: NotifyBrokenPackage( const OUString& aName ); ~NotifyBrokenPackage(); - bool isAborted(); com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest(); }; diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index b91b9c7404e3..dc9ec5f9ac26 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -159,10 +159,6 @@ protected: private: SfxChildWindowContext* pContext; // With context-sensitive ChildWindows: // Annother window in pWindow - SAL_DLLPRIVATE SfxChildWindowContext* - GetContext() const - { return pContext; } - SAL_DLLPRIVATE void ClearWorkwin(); protected: diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 353c59a8d0c9..9db822ee4ff6 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -626,7 +626,6 @@ class SfxCmisPropertiesPage : public SfxTabPage private: CmisPropertiesControl m_pPropertiesCtrl; using TabPage::DeactivatePage; - DECL_LINK(UpdateHdl, void *); protected: virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index aa9949a34b69..1c325e4189bb 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -92,7 +92,6 @@ friend class SfxViewFrame; SAL_DLLPRIVATE void Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, bool bRecord ); SAL_DLLPRIVATE void _Update_Impl( bool,bool,bool,SfxWorkWindow*); - SAL_DLLPRIVATE void CollectTools_Impl(SfxWorkWindow*); protected: friend class SfxBindings; @@ -196,7 +195,6 @@ public: SAL_DLLPRIVATE void DoActivate_Impl( bool bMDI, SfxViewFrame* pOld ); SAL_DLLPRIVATE void DoDeactivate_Impl( bool bMDI, SfxViewFrame* pNew ); SAL_DLLPRIVATE void InvalidateBindings_Impl(bool); - SAL_DLLPRIVATE sal_uInt16 GetNextToolBox_Impl( sal_uInt16 nPos, sal_uInt16 nType, OUString *pStr ); }; #endif diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx index 492cb4f61d4e..02eb3451b5f2 100644 --- a/include/sfx2/docfac.hxx +++ b/include/sfx2/docfac.hxx @@ -46,7 +46,6 @@ private: const char* pShortName; SfxObjectFactory_Impl* pImpl; // Additional Data SfxObjectShellFlags nFlags; - SAL_DLLPRIVATE void Construct(); public: SfxObjectFactory( const SvGlobalName &rName, SfxObjectShellFlags nFlags, const char* pShortName ); diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index 21568fee72fb..338986e2c0ea 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -168,11 +168,8 @@ public: css::uno::Reference< css::embed::XStorage > GetStorage( bool bCreateTempIfNo = true ); css::uno::Reference< css::embed::XStorage > GetOutputStorage(); void ResetError(); - SAL_WARN_UNUSED_RESULT bool UsesCache() const; SAL_WARN_UNUSED_RESULT bool IsExpired() const; void SetName( const OUString& rName, bool bSetOrigURL = false ); - SAL_WARN_UNUSED_RESULT bool IsAllowedForExternalBrowser() const; - SAL_WARN_UNUSED_RESULT long GetFileVersion() const; const css::uno::Sequence < css::util::RevisionTag >& GetVersionList( bool _bNoReload = false ); @@ -206,7 +203,6 @@ public: // the storage that will be returned by the medium on GetStorage request SAL_DLLPRIVATE void SetStorage_Impl( const css::uno::Reference< css::embed::XStorage >& xNewStorage ); - SAL_DLLPRIVATE css::uno::Reference< css::io::XInputStream > GetInputStream_Impl(); SAL_DLLPRIVATE void CloseAndReleaseStreams_Impl(); SAL_DLLPRIVATE sal_uInt16 AddVersion_Impl( css::util::RevisionTag& rVersion ); SAL_DLLPRIVATE bool TransferVersionList_Impl( SfxMedium& rMedium ); @@ -216,9 +212,6 @@ public: SAL_DLLPRIVATE void SetExpired_Impl( const DateTime& rDateTime ); SAL_DLLPRIVATE SvKeyValueIterator* GetHeaderAttributes_Impl(); - // Diese Protokolle liefern MIME Typen - SAL_DLLPRIVATE bool SupportsMIME_Impl() const; - SAL_DLLPRIVATE void Init_Impl(); SAL_DLLPRIVATE void ForceSynchronStream_Impl( bool bSynchron ); @@ -234,7 +227,6 @@ public: SAL_DLLPRIVATE const OUString & GetLongName() const; SAL_DLLPRIVATE bool IsPreview_Impl(); SAL_DLLPRIVATE void ClearBackup_Impl(); - SAL_DLLPRIVATE void Done_Impl( ErrCode ); SAL_DLLPRIVATE void SetPhysicalName_Impl(const OUString& rName); SAL_DLLPRIVATE void CanDisposeStorage_Impl( bool bDisposeStorage ); SAL_DLLPRIVATE bool WillDisposeStorageOnClose_Impl(); diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx index 95108a24b8d7..04058868cfd1 100644 --- a/include/sfx2/docinsert.hxx +++ b/include/sfx2/docinsert.hxx @@ -58,9 +58,6 @@ public: void StartExecuteModal( const Link<>& _rDialogClosedLink ); SfxMedium* CreateMedium(); SfxMediumList* CreateMediumList(); - - inline ErrCode GetError() const { return m_nError; } - inline OUString GetFilter() const { return m_sFilter; } }; } // namespace sfx2 diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 4db39d4d11f0..5768a3b3bfdc 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -146,7 +146,6 @@ public: sal_uInt32 GetFrameType() const; static void GetDefaultTargetList( TargetList& ); void GetTargetList( TargetList& ) const; - SAL_DLLPRIVATE SfxFrame* GetContainingDocFrame_Impl( SfxFrame* pSelf ); void UpdateDescriptor( SfxObjectShell *pDoc ); void Resize(); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > @@ -172,7 +171,6 @@ public: // Methods for accessing the current set SAL_DLLPRIVATE SfxFrameDescriptor* GetDescriptor() const; - SAL_DLLPRIVATE void Lock_Impl( bool bLock ); SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl() const; SAL_DLLPRIVATE bool IsAutoLoadLocked_Impl() const; @@ -180,9 +178,6 @@ public: SAL_DLLPRIVATE static void RemoveTopFrame_Impl( SfxFrame* pFrame ); SAL_DLLPRIVATE void SetOwnsBindings_Impl( bool bSet ); SAL_DLLPRIVATE bool OwnsBindings_Impl() const; - SAL_DLLPRIVATE void InvalidateUnoControllers_Impl(); - SAL_DLLPRIVATE void RegisterUnoController_Impl( SfxUnoControllerItem* ); - SAL_DLLPRIVATE void ReleaseUnoController_Impl( SfxUnoControllerItem* ); SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl() const; SAL_DLLPRIVATE void SetToolSpaceBorderPixel_Impl( const SvBorder& ); SAL_DLLPRIVATE Rectangle GetTopOuterRectPixel_Impl() const; diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index 08e3a407321a..fbc14c71c40d 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -92,8 +92,6 @@ public: const INetURLObject& GetURL() const { return aURL; } void SetURL( const OUString& rURL ); - const INetURLObject& GetActualURL() const - { return aActualURL; } void SetActualURL( const INetURLObject& rURL ); void SetActualURL( const OUString& rURL ); void SetReadOnly( bool bSet ) { bReadOnly = bSet;} @@ -102,20 +100,6 @@ public: bool IsEditable() const; // Size - void SetWidth( long n ) - { nWidth = n; } - void SetWidthPercent( long n ) - { nWidth = n; eSizeSelector = SIZE_PERCENT; } - void SetWidthRel( long n ) - { nWidth = n; eSizeSelector = SIZE_REL; } - void SetWidthAbs( long n ) - { nWidth = n; eSizeSelector = SIZE_ABS; } - long GetWidth() const - { return nWidth; } - SizeSelector GetSizeSelector() const - { return eSizeSelector; } - bool IsResizable() const - { return bResizeHorizontal && bResizeVertical; } void SetResizable( bool bRes ) { bResizeHorizontal = bResizeVertical = bRes; } @@ -153,17 +137,6 @@ public: void ResetBorder() { nHasBorder = 0; } - bool HasUI() const - { return bHasUI; } - void SetHasUI( bool bOn ) - { bHasUI = bOn; } - - // Attribute for Splitwindow - sal_uInt16 GetItemId() const - { return nItemId; } - void SetItemId( sal_uInt16 nId ) - { nItemId = nId; } - // Copy for example for Views SfxFrameDescriptor* Clone( bool bWithIds = true ) const; }; @@ -246,11 +219,6 @@ public: OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - - const SfxFrameProperties& GetProperties() const - { return aProperties; } - void SetProperties( const SfxFrameProperties& rProp ) - { aProperties = rProp; } }; #endif // INCLUDED_SFX2_FRMDESCR_HXX diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx index 9022f73573c7..9f798d5dff64 100644 --- a/include/sfx2/ipclient.hxx +++ b/include/sfx2/ipclient.hxx @@ -55,9 +55,6 @@ friend class SfxInPlaceClient_Impl; // notify the client that an active object has changed its VisualAreaSize SAL_DLLPRIVATE virtual void ViewChanged(); - // an object wants to become visible - SAL_DLLPRIVATE virtual void MakeVisible(); - public: SfxInPlaceClient( SfxViewShell* pViewShell, vcl::Window* pDraw, sal_Int64 nAspect = com::sun::star::embed::Aspects::MSOLE_CONTENT ); virtual ~SfxInPlaceClient(); @@ -67,7 +64,6 @@ public: com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject() const; void SetObject( const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& rObject ); void SetObjectState( sal_Int32 ); - Size GetObjectVisAreaSize() const; bool IsObjectUIActive() const; bool IsObjectInPlaceActive() const; void DeactivateObject(); diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx index 7167075e098b..ceaea4963b7d 100644 --- a/include/sfx2/itemconnect.hxx +++ b/include/sfx2/itemconnect.hxx @@ -180,9 +180,6 @@ class SFX2_DLLPUBLIC ItemConnectionBase public: virtual ~ItemConnectionBase(); - /** Returns the flags passed in the constructor. */ - inline ItemConnFlags GetFlags() const { return mnFlags; } - /** Returns true if this connection is active. */ bool IsActive() const; diff --git a/include/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx index cf8183d14ecd..80287e598439 100644 --- a/include/sfx2/mailmodelapi.hxx +++ b/include/sfx2/mailmodelapi.hxx @@ -75,9 +75,6 @@ private: AddressList_Impl* mpBccList; OUString maFromAddress; OUString maSubject; - MailPriority mePriority; - - bool mbLoadDone; static SaveResult ShowFilterOptionsDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMGR, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel, @@ -87,8 +84,6 @@ private: sal_Int32& rNumArgs, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); - DECL_LINK( DoneHdl, void* ); - public: enum SendMailResult { @@ -101,9 +96,7 @@ public: ~SfxMailModel(); void AddAddress( const OUString& rAddress, AddressRole eRole ); - void SetFromAddress( const OUString& rAddress ) { maFromAddress = rAddress; } void SetSubject( const OUString& rSubject ) { maSubject = rSubject; } - void SetPriority( MailPriority ePrio ) { mePriority = ePrio; } /** attaches a document to the current attachment list, can be called more than once. * at the moment there will be a dialog for export executed for every model which is going to be attached. diff --git a/include/sfx2/mieclip.hxx b/include/sfx2/mieclip.hxx index ca32932f7340..c0f509e4d407 100644 --- a/include/sfx2/mieclip.hxx +++ b/include/sfx2/mieclip.hxx @@ -38,15 +38,7 @@ public: MSE40HTMLClipFormatObj() : pStrm(0) {} ~MSE40HTMLClipFormatObj(); -//JP 31.01.2001: old interfaces - SAL_DLLPRIVATE bool GetData( SotDataObject& ); - SAL_DLLPRIVATE bool GetData( SvData& ); -//JP 31.01.2001: the new one SvStream* IsValid( SvStream& ); - - const SvStream* GetStream() const { return pStrm; } - SvStream* GetStream() { return pStrm; } - const OUString& GetBaseURL() const { return sBaseURL; } }; diff --git a/include/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx index f752575c6415..786b477b6cc1 100644 --- a/include/sfx2/mnumgr.hxx +++ b/include/sfx2/mnumgr.hxx @@ -47,10 +47,7 @@ class SfxMenuManager friend class SfxPopupMenuManager; SfxVirtualMenu* pMenu; // the actual Menu - SfxVirtualMenu* pOldMenu; // only while reconfiguring SfxBindings* pBindings; - ResMgr* pResMgr; - sal_uInt32 nType; bool bAddClipboardFuncs : 1; void Construct( SfxVirtualMenu& rMenu ); @@ -58,20 +55,12 @@ friend class SfxPopupMenuManager; protected: SfxMenuManager( Menu*, SfxBindings& ); ~SfxMenuManager(); - sal_uInt16 GetItemPos( sal_uInt16 nId ); - sal_uInt32 GetType() { return nType; } public: DECL_LINK( Select, Menu* ); SfxVirtualMenu* GetMenu() const { return pMenu; } - - SfxBindings& GetBindings() { return *pBindings; } - const SfxBindings& GetBindings() const { return *pBindings; } - void SetResMgr(ResMgr* pMgr) {pResMgr = pMgr; } - ResMgr* GetResMgr() const { return pResMgr; } - void SetPopupMenu( sal_uInt16 nId, PopupMenu *pMenu ); }; diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index 5ae302bbb082..1fe4a08e3aec 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -75,7 +75,6 @@ public: sal_uInt16 GetObjectBarPos( sal_uInt16 nNo ) const; sal_uInt32 GetObjectBarFeature( sal_uInt16 nNo ) const; sal_uInt16 GetObjectBarCount() const; - void SetObjectBarPos( sal_uInt16 nPos, sal_uInt16 nId ); bool IsObjectBarVisible( sal_uInt16 nNo) const; sal_uInt32 GetChildWindowFeature( sal_uInt16 nNo ) const; sal_uInt32 GetChildWindowId( sal_uInt16 nNo ) const; diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 06b0c29699e1..2908f97e06c3 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -696,7 +696,6 @@ public: SAL_DLLPRIVATE SfxObjectShell* GetParentShellByModel_Impl(); // configuration items - SAL_DLLPRIVATE SfxToolBoxConfig* GetToolBoxConfig_Impl(); SAL_DLLPRIVATE SignatureState ImplGetSignatureState( bool bScriptingContent = false ); SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > diff --git a/include/sfx2/printer.hxx b/include/sfx2/printer.hxx index d419b356507d..dbcb94611c8f 100644 --- a/include/sfx2/printer.hxx +++ b/include/sfx2/printer.hxx @@ -41,8 +41,6 @@ private: SAL_DLLPRIVATE void operator =(SfxPrinter &) SAL_DELETED_FUNCTION; - SAL_DLLPRIVATE void UpdateFonts_Impl(); - public: SfxPrinter( SfxItemSet *pTheOptions ); SfxPrinter( SfxItemSet *pTheOptions, @@ -58,14 +56,10 @@ public: static VclPtr<SfxPrinter> Create( SvStream &rStream, SfxItemSet *pOptions ); SvStream& Store( SvStream &rStream ) const; - const JobSetup& GetOrigJobSetup() const { return aOrigJobSetup; } - void SetOrigJobSetup( const JobSetup &rNewJobSetup ); - const SfxItemSet& GetOptions() const { return *pOptions; } void SetOptions( const SfxItemSet &rNewOptions ); bool IsKnown() const { return bKnown; } - bool IsOriginal() const { return bKnown; } }; #endif diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx index ff42cb0253df..7655ccb58667 100644 --- a/include/sfx2/prnmon.hxx +++ b/include/sfx2/prnmon.hxx @@ -47,11 +47,9 @@ public: virtual ~SfxPrintOptionsDialog(); virtual void dispose() SAL_OVERRIDE; - bool Construct(); virtual short Execute() SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - SfxTabPage* GetTabPage() const { return pPage; } const SfxItemSet& GetOptions() const { return *pOptions; } void DisableHelp(); }; diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx index a074263d0550..497878fe3335 100644 --- a/include/sfx2/sfxbasemodel.hxx +++ b/include/sfx2/sfxbasemodel.hxx @@ -858,9 +858,6 @@ private: SAL_DLLPRIVATE void postEvent_Impl( const OUString& aName, const css::uno::Reference< css::frame::XController2 >& xController = css::uno::Reference< css::frame::XController2 >() ); - SAL_DLLPRIVATE OUString getEventName_Impl( long nID ); - SAL_DLLPRIVATE bool QuerySaveSizeExceededModules( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xHandler ); - SAL_DLLPRIVATE css::uno::Reference< css::frame::XTitle > impl_getTitleHelper (); SAL_DLLPRIVATE css::uno::Reference< css::frame::XUntitledNumbers > impl_getUntitledHelper (); diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index b21943fccdd9..ea171df67c6e 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -162,8 +162,6 @@ protected: void SetViewShell_Impl( SfxViewShell* pView ); SAL_DLLPRIVATE void Invalidate_Impl( SfxBindings& rBindings, sal_uInt16 nId ); - SAL_DLLPRIVATE SfxShellObject* GetShellObj_Impl() const; - SAL_DLLPRIVATE void SetShellObj_Impl( SfxShellObject* pObj ); static void HandleOpenXmlFilterSettings(SfxRequest &); public: diff --git a/include/sfx2/sidebar/ContextList.hxx b/include/sfx2/sidebar/ContextList.hxx index 5171072fa942..7ce63eec24c2 100644 --- a/include/sfx2/sidebar/ContextList.hxx +++ b/include/sfx2/sidebar/ContextList.hxx @@ -55,8 +55,6 @@ public: const bool bIsInitiallyVisible, const ::rtl::OUString& rsMenuCommand); - sal_Int32 GetCount(); - private: ::std::vector<Entry> maEntries; diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx index ef1a6db600fa..0a3802126401 100644 --- a/include/sfx2/sidebar/ControllerItem.hxx +++ b/include/sfx2/sidebar/ControllerItem.hxx @@ -134,8 +134,6 @@ private: css::uno::Reference<css::frame::XFrame> mxFrame; css::uno::Reference<css::lang::XComponent> mxFrameActionListener; const ::rtl::OUString msCommandName; - - void SetupCommandURL (const sal_Char* sCommandName); }; } } // end of namespace sfx2::sidebar diff --git a/include/sfx2/sidebar/DeckTitleBar.hxx b/include/sfx2/sidebar/DeckTitleBar.hxx index 3b42958f459e..e42bbe7d29d3 100644 --- a/include/sfx2/sidebar/DeckTitleBar.hxx +++ b/include/sfx2/sidebar/DeckTitleBar.hxx @@ -38,7 +38,6 @@ protected: virtual Rectangle GetTitleArea(const Rectangle& rTitleBarBox) SAL_OVERRIDE; virtual void PaintDecoration(vcl::RenderContext& rRenderContext, const Rectangle& rTitleBarBox) SAL_OVERRIDE; virtual sidebar::Paint GetBackgroundPaint() SAL_OVERRIDE; - virtual Color GetTextColor() SAL_OVERRIDE; virtual void HandleToolBoxItemClick(const sal_uInt16 nItemIndex) SAL_OVERRIDE; virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; diff --git a/include/sfx2/sidebar/PanelTitleBar.hxx b/include/sfx2/sidebar/PanelTitleBar.hxx index c08140244fb8..e3f00641f824 100644 --- a/include/sfx2/sidebar/PanelTitleBar.hxx +++ b/include/sfx2/sidebar/PanelTitleBar.hxx @@ -47,7 +47,6 @@ protected: virtual Rectangle GetTitleArea(const Rectangle& rTitleBarBox) SAL_OVERRIDE; virtual void PaintDecoration(vcl::RenderContext& rRenderContext, const Rectangle& rTitleBarBox) SAL_OVERRIDE; virtual sidebar::Paint GetBackgroundPaint() SAL_OVERRIDE; - virtual Color GetTextColor() SAL_OVERRIDE; virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex) SAL_OVERRIDE; virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index 1fe2a27a9085..457e51022c57 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -84,12 +84,6 @@ public: const ResourceManager::DeckContextDescriptorContainer& rDecks); void HighlightDeck (const ::rtl::OUString& rsDeckId); void RemoveDeckHighlight (); - void AddPopupMenuEntries ( - PopupMenu& rMenu, - const sal_Int32 nFirstIndex); - void AddCustomizationMenuEntries ( - PopupMenu& rMenu, - const sal_Int32 nFirstIndex); const ::rtl::OUString GetDeckIdForIndex (const sal_Int32 nIndex) const; void ToggleHideFlag (const sal_Int32 nIndex); void RestoreHideFlags(); @@ -120,8 +114,6 @@ private: void Layout(); void UpdateButtonIcons(); - ::boost::shared_ptr<PopupMenu> CreatePopupMenu() const; - void ShowPopupMenu() const; DECL_LINK(OnToolboxClicked, void*); SidebarController* pParentSidebarController; diff --git a/include/sfx2/sidebar/TitleBar.hxx b/include/sfx2/sidebar/TitleBar.hxx index 9a4d343cf067..0f918e43fdd1 100644 --- a/include/sfx2/sidebar/TitleBar.hxx +++ b/include/sfx2/sidebar/TitleBar.hxx @@ -62,7 +62,6 @@ protected: virtual void PaintDecoration (vcl::RenderContext& rRenderContext, const Rectangle& rTitleBarBox) = 0; void PaintFocus(vcl::RenderContext& rRenderContext, const Rectangle& rFocusBox); virtual sidebar::Paint GetBackgroundPaint() = 0; - virtual Color GetTextColor() = 0; virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex); virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx index 12f708310f9f..ecb247dba3c0 100644 --- a/include/sfx2/styfitem.hxx +++ b/include/sfx2/styfitem.hxx @@ -49,9 +49,7 @@ public: SfxStyleFamilyItem( const ResId &rId ); ~SfxStyleFamilyItem(); - const Bitmap& GetBitmap() const { return aBitmap; } const OUString& GetText() const { return aText; } - const OUString& GetHelpText() const { return aHelpText; } SfxStyleFamily GetFamily() const { return (SfxStyleFamily)nFamily; } const SfxStyleFilter& GetFilterList() const { return aFilterList; } const Image& GetImage() const { return aImage; } diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 3fc2c41cb0f4..719a5995dddd 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -221,8 +221,6 @@ private: bool bHasExchangeSupport; TabPageImpl* pImpl; - SAL_DLLPRIVATE void SetInputSet( const SfxItemSet* pNew ) { pSet = pNew; } - protected: SfxTabPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet); diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index ac87d6bc70fc..49b69bbcfcb5 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -343,7 +343,6 @@ protected: virtual void Click() SAL_OVERRIDE; virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - DECL_LINK( Activate, Menu * ); public: SFX_DECL_TOOLBOX_CONTROL(); SfxAddonsToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); diff --git a/include/sfx2/templateviewitem.hxx b/include/sfx2/templateviewitem.hxx index 744eedcf8273..9ed06cac7bce 100644 --- a/include/sfx2/templateviewitem.hxx +++ b/include/sfx2/templateviewitem.hxx @@ -24,18 +24,8 @@ public: const OUString& getPath () const { return maPath; } - void setAuthor (const OUString &rAuthor) { maAuthor = rAuthor; } - - const OUString& getAuthor () const { return maAuthor; } - - void setKeywords (const OUString &rKeywords) { maKeywords = rKeywords; } - - const OUString& getKeywords () const { return maKeywords; } - void setSubTitle (const OUString &rTitle) { maSubTitle = rTitle; } - const OUString& getSubTitle () const { return maSubTitle; } - virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight, const long nPadding, sal_uInt32 nMaxTextLength, const ThumbnailItemAttributes *pAttrs) SAL_OVERRIDE; diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index bf0ea16e12f7..a14ad32e6647 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -207,17 +207,11 @@ public: sal_uInt16 getNextItemId () const; - long GetItemWidth() const { return mnItemWidth; } - - long GetItemHeight() const { return mnItemHeight; } - void setItemMaxTextLength (sal_uInt32 nLength); void setItemDimensions (long ItemWidth, long ThumbnailHeight, long DisplayHeight, int itemPadding); - sal_uInt16 GetFirstLine() const { return mnFirstLine; } - void SelectItem( sal_uInt16 nItemId ); bool IsItemSelected( sal_uInt16 nItemId ) const; @@ -290,7 +284,6 @@ protected: SFX2_DLLPRIVATE void ImplInitScrollBar(); SFX2_DLLPRIVATE void ImplDeleteItems(); - SFX2_DLLPRIVATE void ImplDraw(); SFX2_DLLPRIVATE size_t ImplGetItem( const Point& rPoint ) const; SFX2_DLLPRIVATE ThumbnailViewItem* ImplGetItem( size_t nPos ); SFX2_DLLPRIVATE sal_uInt16 ImplGetVisibleItemCount() const; diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx index 8929b8ed115a..a68f0b7300f8 100644 --- a/include/sfx2/thumbnailviewitem.hxx +++ b/include/sfx2/thumbnailviewitem.hxx @@ -119,10 +119,6 @@ public: const long nPadding, sal_uInt32 nMaxTextLength, const ThumbnailItemAttributes *pAttrs); - const Point& getTextPos () const { return maTextPos; } - - const Point& getPrev1Pos () const { return maPrev1Pos; } - void setSelectClickHdl (const Link<> &link); virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor, diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index af4859f2da50..4200910e4f56 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -61,7 +61,6 @@ namespace sfx2 } void SetEndDockingHdl( const Link<>& i_rEndDockingHdl ) { m_aEndDockingHdl = i_rEndDockingHdl; } - const Link<>& GetEndDockingHdl() const { return m_aEndDockingHdl; } /** resets the toolbox. Upon return, the only item in the toolbox is the closer. */ @@ -76,9 +75,6 @@ namespace sfx2 vcl::Window& GetContentWindow() { return *m_aContentWindow.get(); } const vcl::Window& GetContentWindow() const { return *m_aContentWindow.get(); } - ToolBox& GetToolBox() { return *m_aToolbox.get(); } - const ToolBox& GetToolBox() const { return *m_aToolbox.get(); } - /** Return the border that is painted around the inner window as decoration. */ diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index c89915b56302..c5e844ac31b1 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -198,8 +198,6 @@ public: SAL_DLLPRIVATE SfxViewFrame* GetParentViewFrame_Impl() const; SAL_DLLPRIVATE void ForceOuterResize_Impl(bool bOn=true); SAL_DLLPRIVATE bool IsResizeInToOut_Impl() const; - SAL_DLLPRIVATE bool IsAdjustPosSizePixelLocked_Impl() const - { return nAdjustPosPixelLock != 0; } SAL_DLLPRIVATE void UpdateDocument_Impl(); SAL_DLLPRIVATE void LockObjectShell_Impl(bool bLock=true); diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index c6e7f4a2ca12..e88203d3a641 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -309,8 +309,6 @@ public: SAL_DLLPRIVATE void ExecPrint_Impl(SfxRequest &); SAL_DLLPRIVATE void ExecMisc_Impl(SfxRequest &); SAL_DLLPRIVATE void GetState_Impl(SfxItemSet&); - SAL_DLLPRIVATE SfxFrameSetDescriptor* GetFrameSet_Impl() const; - SAL_DLLPRIVATE void SetFrameSet_Impl(SfxFrameSetDescriptor*); SAL_DLLPRIVATE void CheckIPClient_Impl( SfxInPlaceClient*, const Rectangle& ); SAL_DLLPRIVATE void PushSubShells_Impl( bool bPush=true ); SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( false ); } diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx index efc6a96644d2..0f859e47f7ec 100644 --- a/include/sfx2/zoomitem.hxx +++ b/include/sfx2/zoomitem.hxx @@ -67,8 +67,6 @@ public: void SetValueSet( SvxZoomEnableFlags nValues ) { nValueSet = nValues; } SvxZoomEnableFlags GetValueSet() const { return nValueSet; } - bool IsValueAllowed( SvxZoomEnableFlags nValue ) const - { return bool( nValue & nValueSet ); } SvxZoomType GetType() const { return eType; } void SetType( SvxZoomType eNewType ) { eType = eNewType; } diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx index 97665f04fa36..0fea634e739b 100644 --- a/sc/source/ui/app/client.cxx +++ b/sc/source/ui/app/client.cxx @@ -242,16 +242,4 @@ void ScClient::ViewChanged() } } -void ScClient::MakeVisible() -{ - SdrOle2Obj* pDrawObj = GetDrawObj(); - if (pDrawObj) - { - SfxViewShell* pSfxViewSh = GetViewShell(); - ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, pSfxViewSh ); - if (pViewSh) - pViewSh->ScrollToObject( pDrawObj ); - } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/client.hxx b/sc/source/ui/inc/client.hxx index 43841987d74e..769ce16d5336 100644 --- a/sc/source/ui/inc/client.hxx +++ b/sc/source/ui/inc/client.hxx @@ -36,7 +36,6 @@ private: virtual void ObjectAreaChanged() SAL_OVERRIDE; virtual void RequestNewObjectArea( Rectangle& ) SAL_OVERRIDE; virtual void ViewChanged() SAL_OVERRIDE; - virtual void MakeVisible() SAL_OVERRIDE; public: ScClient( ScTabViewShell* pViewShell, vcl::Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj ); diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx index fc6887d9e878..e77ae5849151 100644 --- a/sd/source/ui/docshell/sdclient.cxx +++ b/sd/source/ui/docshell/sdclient.cxx @@ -189,19 +189,6 @@ void Client::ViewChanged() } } -/** - * Scroll object into visible area. - */ -void Client::MakeVisible() -{ - if (mpViewShell->ISA(DrawViewShell)) - { - static_cast<DrawViewShell*>(mpViewShell)->MakeVisible( - pSdrOle2Obj->GetLogicRect(), - *mpViewShell->GetActiveWindow()); - } -} - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/Client.hxx b/sd/source/ui/inc/Client.hxx index 279add7ec642..dd965219395b 100644 --- a/sd/source/ui/inc/Client.hxx +++ b/sd/source/ui/inc/Client.hxx @@ -39,7 +39,6 @@ class Client : public SfxInPlaceClient virtual void ObjectAreaChanged() SAL_OVERRIDE; virtual void RequestNewObjectArea( Rectangle& ) SAL_OVERRIDE; virtual void ViewChanged() SAL_OVERRIDE; - virtual void MakeVisible() SAL_OVERRIDE; public: Client (SdrOle2Obj* pObj, ViewShell* pSdViewShell, vcl::Window* pWindow); diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 246652604026..f3a588e943a1 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -336,12 +336,11 @@ public: void AddBookmarks( const OUString& rTitle, const OUString& rURL ); bool IsValidFactory( const OUString& _rFactory ); inline OUString GetActiveFactoryTitle() const { return m_pActiveLB->GetSelectEntry(); } - inline void UpdateTabControl() { m_pTabCtrl->Invalidate(); } void ClearSearchPage(); void GrabFocusBack(); - bool HasFocusOnEdit() const; + bool HasFocusOnEdit() const; OUString GetSearchText() const; - bool IsFullWordSearch() const; + bool IsFullWordSearch() const; void OpenKeyword( const OUString& rKeyword ); void SelectExecutableEntry(); inline bool WasCursorLeftOrRight(); @@ -537,8 +536,6 @@ public: ::com::sun::star::uno::Reference < ::com::sun::star::awt::XWindow > xWin ); inline ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 > getTextFrame() const { return pTextWin->getFrame(); } - inline ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatchResultListener > - getOpenListener() const { return xOpenListener; } void SetFactory( const OUString& rFactory ); void SetHelpURL( const OUString& rURL ); @@ -547,15 +544,14 @@ public: void UpdateToolbox(); inline void OpenKeyword( const OUString& rKeyword ) { pIndexWin->OpenKeyword( rKeyword ); } - inline OUString GetFactory() const { return pIndexWin->GetFactory(); } - bool HasHistoryPredecessor() const; // forward to interceptor - bool HasHistorySuccessor() const; // forward to interceptor + bool HasHistoryPredecessor() const; // forward to interceptor + bool HasHistorySuccessor() const; // forward to interceptor void openDone(const OUString& sURL , bool bSuccess); - static OUString buildHelpURL(const OUString& sFactory , + static OUString buildHelpURL(const OUString& sFactory , const OUString& sContent , const OUString& sAnchor , bool bUseQuestionMark); diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index dbff7e29048d..201aa09d2d65 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -185,8 +185,6 @@ public: void ParentDestroyed(); - bool HasAccessibleListeners() const { return( mxEventListeners.size() > 0 ); } - static ThumbnailViewItemAcc* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); public: diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index c2c146220502..4b9df07715fe 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -95,8 +95,6 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer void setupButton(PushButton* pButton); void setupButton(MenuButton* pButton); - //Template Manager - void OnTemplateOpen(); void dispatchURL(const OUString& i_rURL, const OUString& i_rTarget = OUString("_default"), diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 97b748d950e3..9103318581d0 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -128,8 +128,6 @@ namespace sfx2 sal_Int16 implDoExecute(); void implStartExecute(); - void correctVirtualDialogType(); - void setControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ); bool CheckFilterOptionsCapability( const SfxFilter* _pFilter ); @@ -150,7 +148,6 @@ namespace sfx2 const SfxFilter* pFilter ); DECL_LINK_TYPED(TimeOutHdl_Impl, Idle *, void); - DECL_LINK( HandleEvent, FileDialogHelper* ); DECL_LINK( InitControls, void* ); public: diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 6b31c592d6b9..c584078c5aa0 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -656,9 +656,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( SfxMailModel::SfxMailModel() : mpToList ( NULL ), mpCcList ( NULL ), - mpBccList ( NULL ), - mePriority ( PRIO_NORMAL ), - mbLoadDone ( true ) + mpBccList ( NULL ) { } diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 46f18b97e16e..33592178024c 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -462,7 +462,7 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton ) } else if (pButton == m_pCmisButton) { - VclPtrInstance< SfxCmisVersionsDialog > pDlg(pViewFrame, false); + VclPtrInstance< SfxCmisVersionsDialog > pDlg(pViewFrame); pDlg->Execute(); } @@ -531,11 +531,10 @@ IMPL_LINK(SfxViewVersionDialog_Impl, ButtonHdl, Button*, pButton) return 0L; } -SfxCmisVersionsDialog::SfxCmisVersionsDialog ( SfxViewFrame* pVwFrame, bool bIsSaveVersionOnClose ) +SfxCmisVersionsDialog::SfxCmisVersionsDialog ( SfxViewFrame* pVwFrame ) : SfxModalDialog(NULL, "VersionsCmisDialog", "sfx/ui/versionscmis.ui") , pViewFrame(pVwFrame) , m_pTable(NULL) - , m_bIsSaveVersionOnClose(bIsSaveVersionOnClose) { get(m_pOpenButton, "open"); get(m_pViewButton, "show"); diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx index 81f37d0d60f5..00fa397d4ce6 100644 --- a/sfx2/source/doc/oleprops.hxx +++ b/sfx2/source/doc/oleprops.hxx @@ -219,7 +219,6 @@ public: inline sal_Int32 GetPropType() const { return mnPropType; } protected: - inline void SetPropId( sal_Int32 nPropId ) { mnPropId = nPropId; } inline void SetPropType( sal_Int32 nPropType ) { mnPropType = nPropType; } private: diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx index f970bed57d71..81c966707921 100644 --- a/sfx2/source/inc/docundomanager.hxx +++ b/sfx2/source/inc/docundomanager.hxx @@ -54,14 +54,10 @@ protected: void acquireModel() { m_rModel.acquire(); } void releaseModel() { m_rModel.release(); } - bool isDisposed() const { return m_rModel.IsDisposed(); } - protected: const SfxBaseModel& getBaseModel() const { return m_rModel; } SfxBaseModel& getBaseModel() { return m_rModel; } - ::osl::Mutex& getMutex() { return m_rModel.getMutex(); } - private: SfxBaseModel& m_rModel; }; @@ -91,11 +87,6 @@ public: { } - void reset() - { - m_aGuard.reset(); - } - void clear() { m_aGuard.clear(); diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx index b81a88fd084c..c3c1bfdfae6b 100644 --- a/sfx2/source/inc/partwnd.hxx +++ b/sfx2/source/inc/partwnd.hxx @@ -71,7 +71,6 @@ public: bool QueryClose(); virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; - ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > ForgetFrame(); }; #endif diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx index 502492c0e61f..ca228616c355 100644 --- a/sfx2/source/inc/sfxpicklist.hxx +++ b/sfx2/source/inc/sfxpicklist.hxx @@ -64,8 +64,6 @@ class SfxPickList : public SfxListener static SfxPickList& Get(); static void ensure() { Get(); } - sal_uInt32 GetAllowedMenuSize() { return m_nAllowedMenuSize; } - sal_uInt32 GetNumOfEntries() const { return m_aPicklistVector.size(); } void CreateMenuEntries( Menu* pMenu ); static void ExecuteMenuEntry( sal_uInt16 nId ); static void ExecuteEntry( sal_uInt32 nIndex ); diff --git a/sfx2/source/inc/slotserv.hxx b/sfx2/source/inc/slotserv.hxx index c98a9c4ece4e..b8eff4334b30 100644 --- a/sfx2/source/inc/slotserv.hxx +++ b/sfx2/source/inc/slotserv.hxx @@ -37,7 +37,6 @@ public: _pSlot = pSlot; } const SfxSlot* GetSlot() const; - void Invalidate() { _pSlot = 0; } }; inline SfxSlotServer::SfxSlotServer( const SfxSlot &rSlot, sal_uInt16 nShell ): diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx index 442183d7393b..176722b0f6ce 100644 --- a/sfx2/source/inc/splitwin.hxx +++ b/sfx2/source/inc/splitwin.hxx @@ -105,8 +105,8 @@ public: bLocked = bLock; SetUpdateMode( !bLock ); } - using Window::IsLocked; - bool IsLocked() const { return bLocked; } + using Window::IsLocked; + bool GetWindowPos( const SfxDockingWindow* pWindow, sal_uInt16& rLine, sal_uInt16& rPos ) const; bool GetWindowPos( const Point& rTestPos, diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx index 88867861a3ba..20cd3028773c 100644 --- a/sfx2/source/inc/statcach.hxx +++ b/sfx2/source/inc/statcach.hxx @@ -92,7 +92,6 @@ public: void Dispatch( const SfxItemSet* pSet, bool bForceSynchron = false ); bool IsControllerDirty() const { return bCtrlDirty; } - SfxPoolItem* GetItem() const { return pLastItem; } void ClearCache(); void SetState( SfxItemState, const SfxPoolItem*, bool bMaybeDirty=false ); diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 5171cacab46e..28e8d2419a64 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -231,10 +231,6 @@ protected: } virtual void LoadedFamilies() {} - void Update() - { - UpdateStyles_Impl(UPDATE_FAMILY_LIST); - } void InvalidateBindings(); virtual void InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pItem ) = 0; @@ -333,29 +329,6 @@ public: return pCurObjShell; } - inline bool CanEdit() const - { - return bCanEdit; - } - inline bool CanDel() const - { - return bCanDel; - } - inline bool CanNew() const - { - return bCanNew; - } - - inline bool CanHide() const - { - return bCanHide; - } - - inline bool CanShow() const - { - return bCanShow; - } - // normally for derivates from SvTreeListBoxes, but in this case the dialog handles context menus PopupMenu* CreateContextMenu(); }; diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index 67453efa3a51..9ad3f3bf983b 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -97,15 +97,11 @@ class SfxCmisVersionsDialog : public SfxModalDialog VclPtr<PushButton> m_pCompareButton; SfxViewFrame* pViewFrame; SfxVersionTableDtor* m_pTable; - bool m_bIsSaveVersionOnClose; - DECL_LINK(DClickHdl_Impl, void *); - DECL_LINK(SelectHdl_Impl, void *); - DECL_LINK( ButtonHdl_Impl, Button* ); void LoadVersions(); public: - SfxCmisVersionsDialog ( SfxViewFrame* pFrame, bool ); + SfxCmisVersionsDialog ( SfxViewFrame* pFrame ); virtual ~SfxCmisVersionsDialog (); virtual void dispose() SAL_OVERRIDE; }; diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 74ee7b664e02..9fefbe5b2edd 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -263,10 +263,7 @@ sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPos, vcl::Window* pWindow SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings ) : pMenu(0), - pOldMenu(0), - pBindings(&rBindings), - pResMgr(NULL), - nType(0) + pBindings(&rBindings) { bAddClipboardFuncs = false; SfxVirtualMenu* pVMenu = new SfxVirtualMenu( pMenuArg, false, rBindings, true, true ); diff --git a/sfx2/source/sidebar/ContextList.cxx b/sfx2/source/sidebar/ContextList.cxx index 20cdcbc8806b..5b4225e80d6d 100644 --- a/sfx2/source/sidebar/ContextList.cxx +++ b/sfx2/source/sidebar/ContextList.cxx @@ -85,11 +85,6 @@ void ContextList::AddContextDescription ( maEntries.back().msMenuCommand = rsMenuCommand; } -sal_Int32 ContextList::GetCount() -{ - return maEntries.size(); -} - } } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx index a55fef62e719..59a0aa4d81ff 100644 --- a/sfx2/source/sidebar/DeckTitleBar.cxx +++ b/sfx2/source/sidebar/DeckTitleBar.cxx @@ -92,11 +92,6 @@ sidebar::Paint DeckTitleBar::GetBackgroundPaint() return Theme::GetPaint(Theme::Paint_DeckTitleBarBackground); } -Color DeckTitleBar::GetTextColor() -{ - return Theme::GetColor(Theme::Color_DeckTitleFont); -} - void DeckTitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex) { if (nItemIndex == mnCloserItemIndex && maCloserAction) diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index fd6c06ee3376..479bd2e86206 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -136,11 +136,6 @@ Paint PanelTitleBar::GetBackgroundPaint() return Theme::GetPaint(Theme::Paint_PanelTitleBarBackground); } -Color PanelTitleBar::GetTextColor() -{ - return Theme::GetColor(Theme::Color_PanelTitleFont); -} - void PanelTitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex) { if (nItemIndex == mnMenuItemIndex) diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 5a30bbab54c2..d5513fcaec2f 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -1012,11 +1012,6 @@ void SfxInPlaceClient::ViewChanged() // dummy implementation } -void SfxInPlaceClient::MakeVisible() -{ - // dummy implementation -} - void SfxInPlaceClient::FormatChanged() { // dummy implementation diff --git a/sw/inc/swcli.hxx b/sw/inc/swcli.hxx index 90b384eafaa7..632a7aba7284 100644 --- a/sw/inc/swcli.hxx +++ b/sw/inc/swcli.hxx @@ -35,7 +35,6 @@ class SwOleClient : public SfxInPlaceClient virtual void ObjectAreaChanged() SAL_OVERRIDE; virtual void RequestNewObjectArea( Rectangle& ) SAL_OVERRIDE; virtual void ViewChanged() SAL_OVERRIDE; - virtual void MakeVisible() SAL_OVERRIDE; public: SwOleClient( SwView *pView, SwEditWin *pWin, const svt::EmbeddedObjectRef& ); diff --git a/sw/source/uibase/uiview/swcli.cxx b/sw/source/uibase/uiview/swcli.cxx index 5ce19ed798a2..d2195b7f62c4 100644 --- a/sw/source/uibase/uiview/swcli.cxx +++ b/sw/source/uibase/uiview/swcli.cxx @@ -153,12 +153,6 @@ void SwOleClient::ViewChanged() rSh.LockView( false ); } -void SwOleClient::MakeVisible() -{ - const SwWrtShell &rSh = static_cast<SwView*>(GetViewShell())->GetWrtShell(); - rSh.MakeObjVisible( GetObject() ); -} - void SwOleClient::FormatChanged() { const uno::Reference < embed::XEmbeddedObject >& xObj( GetObject() ); |