summaryrefslogtreecommitdiff
path: root/include/formula/funcutl.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-23 11:20:40 +0200
committerNoel Grandin <noel@peralex.com>2014-09-23 14:11:39 +0300
commit827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch)
tree3a84ccc45d54607c61328b18f58f914c1d6ec240 /include/formula/funcutl.hxx
parent7cbbefae224ab85343accb42b03f9431ec693a83 (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 'include/formula/funcutl.hxx')
-rw-r--r--include/formula/funcutl.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index 5752cf078de8..097d73772bf5 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -34,7 +34,7 @@ class FORMULA_DLLPUBLIC RefEdit : public Edit
private:
Timer aTimer;
IControlReferenceHandler* pAnyRefDlg; // parent dialog
- Window* pLabelWidget;
+ vcl::Window* pLabelWidget;
DECL_LINK( UpdateHdl, void* );
@@ -44,8 +44,8 @@ protected:
virtual void LoseFocus() SAL_OVERRIDE;
public:
- RefEdit( Window* _pParent,IControlReferenceHandler* pParent, Window* pShrinkModeLabel, const ResId& rResId );
- RefEdit( Window* _pParent, Window* pShrinkModeLabel, WinBits nStyle = WB_BORDER );
+ RefEdit( vcl::Window* _pParent,IControlReferenceHandler* pParent, vcl::Window* pShrinkModeLabel, const ResId& rResId );
+ RefEdit( vcl::Window* _pParent, vcl::Window* pShrinkModeLabel, WinBits nStyle = WB_BORDER );
virtual ~RefEdit();
@@ -64,14 +64,14 @@ public:
void StartUpdateData();
- void SetReferences( IControlReferenceHandler* pDlg, Window *pLabelWidget );
+ void SetReferences( IControlReferenceHandler* pDlg, vcl::Window *pLabelWidget );
IControlReferenceHandler* GetRefDialog()
{
return pAnyRefDlg;
}
- Window* GetLabelWidgetForShrinkMode()
+ vcl::Window* GetLabelWidgetForShrinkMode()
{
return pLabelWidget;
}
@@ -95,7 +95,7 @@ protected:
virtual void LoseFocus() SAL_OVERRIDE;
public:
- RefButton(Window* _pParent, WinBits nStyle = 0);
+ RefButton(vcl::Window* _pParent, WinBits nStyle = 0);
void SetReferences( IControlReferenceHandler* pDlg, RefEdit* pEdit );
void SetStartImage();
void SetEndImage();