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/workben | |
| 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/workben')
| -rw-r--r-- | sc/workben/test.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx index 9ce306f3d4cb..d91803c1a817 100644 --- a/sc/workben/test.cxx +++ b/sc/workben/test.cxx @@ -54,10 +54,10 @@ class MyFixedText : public FixedText protected: void RequestHelp( const HelpEvent& rHEvt ); public: - MyFixedText(Window* pParent) : FixedText(pParent) {} + MyFixedText(vcl::Window* pParent) : FixedText(pParent) {} }; -class MyWindow : public Window +class MyWindow : public vcl::Window { private: NumericField aCountField; @@ -74,7 +74,7 @@ private: PushButton aViewButton; public: - MyWindow( Window *pParent ); + MyWindow( vcl::Window *pParent ); DECL_LINK(CountHdl, PushButton*); DECL_LINK(TextHdl, PushButton*); @@ -157,7 +157,7 @@ void ScTestListener::selectionChanged(const EventObject& aEvent) pFixedText->SetText(aStr); } -extern "C" Window* SAL_CALL CreateWindow( Window *pParent, const String& rParam ) +extern "C" vcl::Window* SAL_CALL CreateWindow( vcl::Window *pParent, const String& rParam ) { MyWindow *pWin = new MyWindow( pParent ); return pWin; @@ -175,7 +175,7 @@ void MyFixedText::RequestHelp( const HelpEvent& rHEvt ) FixedText::RequestHelp( rHEvt ); } -MyWindow::MyWindow( Window *pParent ) : +MyWindow::MyWindow( vcl::Window *pParent ) : Window( pParent ), aCountField( this, WinBits(WB_SPIN | WB_REPEAT | WB_BORDER) ), aCountButton( this ), |