diff options
Diffstat (limited to 'include/sfx2')
-rw-r--r-- | include/sfx2/childwin.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/ctrlitem.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/dockwin.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/frame.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/hintpost.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/module.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/objsh.hxx | 34 | ||||
-rw-r--r-- | include/sfx2/shell.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/stbitem.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/taskpane.hxx | 20 | ||||
-rw-r--r-- | include/sfx2/tbxctrl.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/templdlg.hxx | 6 | ||||
-rw-r--r-- | include/sfx2/viewfrm.hxx | 36 | ||||
-rw-r--r-- | include/sfx2/viewsh.hxx | 14 |
14 files changed, 58 insertions, 78 deletions
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 9001c5d1b5a3..d4a8efbcc494 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -127,7 +127,7 @@ public: FloatingWindow* GetFloatingWindow() const; virtual void Resizing( Size& rSize ); - bool Close(); + bool Close(); static void RegisterChildWindowContext(SfxModule*, sal_uInt16, SfxChildWinContextFactory*); }; diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx index 91ae1f25ac5e..fa5b7b9ac853 100644 --- a/include/sfx2/ctrlitem.hxx +++ b/include/sfx2/ctrlitem.hxx @@ -65,11 +65,11 @@ public: SfxControllerItem* ChangeItemLink( SfxControllerItem* pNewLink ); void SetId( sal_uInt16 nItemId ); - sal_uInt16 GetId() const { return nId; } + sal_uInt16 GetId() const { return nId; } virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - void DeleteFloatingWindow(); + void DeleteFloatingWindow(); SfxMapUnit GetCoreMetric() const; diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index e5c919900fe5..6fc50597ba3d 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -103,7 +103,7 @@ public: void SetMinOutputSizePixel( const Size& rSize ); Size GetMinOutputSizePixel() const; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void FadeIn( bool ); + void FadeIn( bool ); DECL_LINK(TimerHdl, void *); SAL_DLLPRIVATE void Initialize_Impl(); diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 1bb50587d722..cf778f417fe7 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -236,7 +236,7 @@ public: SfxFrameItem( sal_uInt16 nWhich, SfxFrame *p ); virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - OUString GetValueText() const; + OUString GetValueText() const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; diff --git a/include/sfx2/hintpost.hxx b/include/sfx2/hintpost.hxx index 6474682c0d7c..da7563457b1e 100644 --- a/include/sfx2/hintpost.hxx +++ b/include/sfx2/hintpost.hxx @@ -50,7 +50,7 @@ private: protected: virtual ~SfxHintPoster(); - void Event( SfxHint* pPostedHint ); + void Event( SfxHint* pPostedHint ); public: SfxHintPoster( const GenLink& rLink ); diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 173e259bf8e0..b3646bcdbb94 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -75,7 +75,7 @@ public: SfxObjectFactory* pFactoryP, ... ); virtual ~SfxModule(); - ResMgr* GetResMgr(); + ResMgr* GetResMgr(); SfxSlotPool* GetSlotPool() const; void RegisterToolBoxControl(SfxTbxCtrlFactory*); diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 0b1bb68d8d07..ddec48274d31 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -191,7 +191,7 @@ protected: SfxObjectShell( const sal_uInt64 i_nCreationFlags ); // see sfxmodelfactory.hxx virtual ~SfxObjectShell(); - void ModifyChanged(); + void ModifyChanged(); virtual bool Close() SAL_OVERRIDE; /** declares the document to have capabilities to contain basic/dialog libraries @@ -247,7 +247,7 @@ public: void UpdateDocInfoForSave( ); void FlushDocInfo(); bool HasName() const { return bHasName; } - OUString GetAPIName() const; + OUString GetAPIName() const; void SetReadOnly(); bool IsReadOnly() const; bool IsReadOnlyMedium() const; @@ -257,7 +257,7 @@ public: void SetNoName(); bool IsInModalMode() const; bool IsInPrepareClose() const; - bool AcceptStateUpdate() const; + bool AcceptStateUpdate() const; bool IsHelpDocument() const; bool IsDocShared() const; @@ -296,7 +296,7 @@ public: // TODO/LATER: currently only overridden in Calc, should be made non-virtual virtual bool DoSaveCompleted( SfxMedium* pNewStor=0 ); - bool LoadOwnFormat( SfxMedium& pMedium ); + bool LoadOwnFormat( SfxMedium& pMedium ); virtual bool SaveAsOwnFormat( SfxMedium& pMedium ); virtual bool ConvertFrom( SfxMedium &rMedium ); virtual bool ConvertTo( SfxMedium &rMedium ); @@ -306,7 +306,7 @@ public: virtual bool Save(); virtual bool SaveAs( SfxMedium &rMedium ); virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); - bool SwitchPersistance( + bool SwitchPersistance( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); virtual void UpdateLinks(); virtual bool LoadExternal( SfxMedium& rMedium ); @@ -402,17 +402,17 @@ public: static sal_uInt32 HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDoc ); - void ViewAssigned(); + void ViewAssigned(); virtual bool PrepareClose(bool bUI = true); virtual bool IsInformationLost(); virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates ); sal_Int16 QueryHiddenInformation( HiddenWarningFact eFact, vcl::Window* pParent ); - bool HasSecurityOptOpenReadOnly() const; + bool HasSecurityOptOpenReadOnly() const; bool IsSecurityOptOpenReadOnly() const; void SetSecurityOptOpenReadOnly( bool bOpenReadOnly = true ); virtual Size GetFirstPageSize(); - bool DoClose(); + bool DoClose(); virtual void PrepareReload(); ::boost::shared_ptr<GDIMetaFile> GetPreviewMetaFile( bool bFullContent = false ) const; virtual void CancelTransfers(); @@ -453,7 +453,7 @@ public: void InvalidateName(); // Re-set to unnamed // DDE-Interface - long DdeExecute( const OUString& rCmd ); + long DdeExecute( const OUString& rCmd ); virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any & rValue ); @@ -473,7 +473,7 @@ public: // Determine the position of the "Automatic" filter in the stylist void SetAutoStyleFilterIndex(sal_uInt16 nSet); sal_uInt16 GetAutoStyleFilterIndex(); - bool HasBasic() const; + bool HasBasic() const; BasicManager* GetBasicManager() const; com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer > GetBasicContainer(); @@ -497,7 +497,7 @@ public: virtual SfxObjectShell* GetObjectShell() SAL_OVERRIDE; - SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); + SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModel() const; @@ -508,7 +508,7 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > GetEventNames(); - vcl::Window* GetDialogParent( SfxMedium* pMedium=0 ); + vcl::Window* GetDialogParent( SfxMedium* pMedium=0 ); static SfxObjectShell* CreateObject( const OUString& rServiceName, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); static SfxObjectShell* CreateObjectByFactoryName( const OUString& rURL, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > @@ -518,7 +518,7 @@ public: bool IsInPlaceActive(); bool IsUIActive(); virtual void InPlaceActivate( bool ); - void UIActivate( bool ); + void UIActivate( bool ); static bool CopyStoragesOfUnknownMediaType( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xSource, @@ -560,12 +560,12 @@ public: // The functions from SvEmbeddedObject virtual Printer * GetDocumentPrinter(); - virtual OutputDevice* GetDocumentRefDev(); + virtual OutputDevice* GetDocumentRefDev(); virtual void OnDocumentPrinterChanged( Printer * pNewPrinter ); virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const; - virtual void SetVisArea( const Rectangle & rVisArea ); + virtual void SetVisArea( const Rectangle & rVisArea ); const Rectangle & GetVisArea() const; - void SetVisAreaSize( const Size & rVisSize ); + void SetVisAreaSize( const Size & rVisSize ); virtual sal_uIntPtr GetMiscStatus() const; MapUnit GetMapUnit() const; @@ -800,7 +800,7 @@ public: {} virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - OUString GetValueText() const; + OUString GetValueText() const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index ba3404ee3676..b833ce17c335 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -387,7 +387,7 @@ public: SfxShell::Activate() */ - void ParentActivate(); + void ParentActivate(); /** The active parent of the <SfxDispatcher> on which the SfxShell is located, @@ -399,7 +399,7 @@ public: SfxShell::Deactivate() */ - void ParentDeactivate(); + void ParentDeactivate(); /** This method returns a pointer to the <SfxDispatcher>, when the SfxShell diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index e3046c624398..07121f89fa00 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -98,11 +98,11 @@ protected: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Click(); - void DoubleClick(); + void DoubleClick(); virtual void Command( const CommandEvent& rCEvt ); virtual bool MouseButtonDown( const MouseEvent & ); virtual bool MouseMove( const MouseEvent & ); - bool MouseButtonUp( const MouseEvent & ); + bool MouseButtonUp( const MouseEvent & ); virtual void Paint( const UserDrawEvent &rUDEvt ); static sal_uInt16 convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons ); diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx index f64401823ab8..5495c0b0bc6d 100644 --- a/include/sfx2/taskpane.hxx +++ b/include/sfx2/taskpane.hxx @@ -73,26 +73,6 @@ namespace sfx2 }; - //= IToolPanelCompare - - class SFX2_DLLPUBLIC SAL_NO_VTABLE IToolPanelCompare - { - public: - /** compares to tool panel URLs - @return - <ul> - <li>-1 if the tool panel described by i_rLHS should precede the one described by i_rRHS</li> - <li>0 if the two panels have no particular relative order</li> - <li>1 if the tool panel described by i_rLHS should succeed the one described by i_rRHS</li> - - */ - ; - - protected: - ~IToolPanelCompare() {} - }; - - //= ModuleTaskPane class ModuleTaskPane_Impl; diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index f3ca152c5f2a..168b8c4aaebf 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -120,9 +120,9 @@ private: protected: virtual void PopupModeEnd() SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE; - void DeleteFloatingWindow(); + void DeleteFloatingWindow(); - sal_uInt16 GetId() const { return m_nId; } + sal_uInt16 GetId() const { return m_nId; } const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& GetFrame() const { return m_xFrame; } void BindListener(); diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx index 91361265ed3f..a56376304d84 100644 --- a/include/sfx2/templdlg.hxx +++ b/include/sfx2/templdlg.hxx @@ -46,10 +46,10 @@ public: virtual ~SfxTemplatePanelControl(); void Update(); - virtual void DataChanged( const DataChangedEvent& _rDCEvt ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& _rDCEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ); - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; void FreeResource (void); private: diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 5f8232872e96..18a3158158dd 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -115,11 +115,11 @@ public: SfxViewFrame* GetParentViewFrame() const; using SfxShell::GetDispatcher; - SfxDispatcher* GetDispatcher() { return pDispatcher; } + SfxDispatcher* GetDispatcher() { return pDispatcher; } SfxBindings& GetBindings() { return *pBindings; } const SfxBindings& GetBindings() const { return *pBindings; } - vcl::Window& GetWindow() const; - void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); + vcl::Window& GetWindow() const; + void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); SfxProgress* GetProgress() const; @@ -136,19 +136,19 @@ public: bool IsVisible() const; void ToTop(); void Enable( bool bEnable ); - bool Close(); + bool Close(); virtual void Activate( bool bUI ) SAL_OVERRIDE; virtual void Deactivate( bool bUI ) SAL_OVERRIDE; // DDE-Interface - long DdeExecute( const OUString& rCmd ); - bool DdeGetData( const OUString& rItem, + long DdeExecute( const OUString& rCmd ); + bool DdeGetData( const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any & rValue ); - bool DdeSetData( const OUString& rItem, + bool DdeSetData( const OUString& rItem, const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ); - ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ); + ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ); void UpdateTitle(); @@ -160,12 +160,12 @@ public: SAL_DLLPRIVATE virtual void InvalidateBorderImpl( const SfxViewShell *pSh ); virtual SfxObjectShell* GetObjectShell() SAL_OVERRIDE; - sal_uInt16 GetCurViewId() const; + sal_uInt16 GetCurViewId() const; SfxFrame& GetFrame() const; SfxViewFrame* GetTopViewFrame() const; bool DoClose(); - sal_uIntPtr GetFrameType() const + sal_uIntPtr GetFrameType() const { return GetFrame().GetFrameType(); } SfxFrame& GetTopFrame() const { return GetFrame().GetTopFrame(); } @@ -178,14 +178,14 @@ public: bool IsInModalMode() const; void Resize(bool bForce=false); - void SetChildWindow(sal_uInt16 nId, bool bVisible, bool bSetFocus=true); - void ToggleChildWindow(sal_uInt16); - bool HasChildWindow(sal_uInt16); - bool KnowsChildWindow(sal_uInt16); - void ShowChildWindow(sal_uInt16,bool bVisible=true); - SfxChildWindow* GetChildWindow(sal_uInt16); - void ChildWindowExecute(SfxRequest&); - void ChildWindowState(SfxItemSet&); + void SetChildWindow(sal_uInt16 nId, bool bVisible, bool bSetFocus=true); + void ToggleChildWindow(sal_uInt16); + bool HasChildWindow(sal_uInt16); + bool KnowsChildWindow(sal_uInt16); + void ShowChildWindow(sal_uInt16,bool bVisible=true); + SfxChildWindow* GetChildWindow(sal_uInt16); + void ChildWindowExecute(SfxRequest&); + void ChildWindowState(SfxItemSet&); /** Append a new InfoBar (see https://wiki.documentfoundation.org/Design/Whiteboards/Infobar). diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 3498dc98a5b7..39bebeec25d8 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -172,9 +172,9 @@ public: virtual ErrCode DoVerb(long nVerb); - void OutplaceActivated( bool bActive, SfxInPlaceClient* pClient ); - void InplaceActivating( SfxInPlaceClient* pClient ); - void InplaceDeactivated( SfxInPlaceClient* pClient ); + void OutplaceActivated( bool bActive, SfxInPlaceClient* pClient ); + void InplaceActivating( SfxInPlaceClient* pClient ); + void InplaceDeactivated( SfxInPlaceClient* pClient ); virtual void UIActivating( SfxInPlaceClient* pClient ); virtual void UIDeactivated( SfxInPlaceClient* pClient ); @@ -188,7 +188,7 @@ public: * has been set. By the time this is called the document has been fully * imported. */ - void Initialize(); + void Initialize(); virtual bool PrepareClose( bool bUI = true ); virtual OUString GetSelectionText( bool bCompleteWords = false ); virtual bool HasSelection( bool bText = true ) const; @@ -210,7 +210,7 @@ public: bool Escape(); // Viewing Interface - vcl::Window* GetWindow() const { return pWindow; } + vcl::Window* GetWindow() const { return pWindow; } void SetWindow( vcl::Window *pViewPort ); virtual void AdjustPosSizePixel( const Point &rOfs, const Size &rSize ); const SvBorder& GetBorderPixel() const; @@ -223,7 +223,7 @@ public: virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); virtual bool HasPrintOptionsPage() const; virtual SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ); - JobSetup GetJobSetup() const; + JobSetup GetJobSetup() const; Printer* GetActivePrinter() const; // Working set @@ -256,7 +256,7 @@ public: const Size& GetMargin() const; void SetMargin( const Size& ); void DisconnectAllClients(); - SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); + SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); bool NewWindowAllowed() const { return !bNoNewWindow; } void SetNewWindowAllowed( bool bSet ) { bNoNewWindow = !bSet; } |