diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
| commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
| tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /sc/inc/scmod.hxx | |
| parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) | |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'sc/inc/scmod.hxx')
| -rw-r--r-- | sc/inc/scmod.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index df6bbfe1a6f2..136f08fbd573 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -111,7 +111,7 @@ class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener bool mbIsInSharedDocLoading:1; bool mbIsInSharedDocSaving:1; - std::map<sal_uInt16, std::list<Window*> > m_mapRefWindow; + std::map<sal_uInt16, std::list<vcl::Window*> > m_mapRefWindow; std::stack<ScAnyRefModalDlg*> maAnyRefDlgStack; public: SFX_DECL_INTERFACE(SCID_APP) @@ -246,16 +246,16 @@ SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rO // virtual methods for the options dialog virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE; virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE; void SetInSharedDocLoading( bool bNew ) { mbIsInSharedDocLoading = bNew; } bool IsInSharedDocLoading() const { return mbIsInSharedDocLoading; } void SetInSharedDocSaving( bool bNew ) { mbIsInSharedDocSaving = bNew; } bool IsInSharedDocSaving() const { return mbIsInSharedDocSaving; } - SC_DLLPUBLIC bool RegisterRefWindow( sal_uInt16 nSlotId, Window *pWnd ); - SC_DLLPUBLIC bool UnregisterRefWindow( sal_uInt16 nSlotId, Window *pWnd ); - SC_DLLPUBLIC Window * Find1RefWindow( sal_uInt16 nSlotId, Window *pWndAncestor ); + SC_DLLPUBLIC bool RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ); + SC_DLLPUBLIC bool UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ); + SC_DLLPUBLIC vcl::Window * Find1RefWindow( sal_uInt16 nSlotId, vcl::Window *pWndAncestor ); ScAnyRefModalDlg* GetCurrentAnyRefDlg(); void PushNewAnyRefDlg( ScAnyRefModalDlg* pDlg ); |