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 /svtools/source/edit | |
| 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 'svtools/source/edit')
| -rw-r--r-- | svtools/source/edit/editsyntaxhighlighter.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/edit/svmedit.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/edit/svmedit2.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx index 0042d8e50d8d..1410921320f7 100644 --- a/svtools/source/edit/editsyntaxhighlighter.cxx +++ b/svtools/source/edit/editsyntaxhighlighter.cxx @@ -25,13 +25,13 @@ #include <vcl/txtattr.hxx> -MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle, +MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( vcl::Window* pParent, WinBits nWinStyle, HighlighterLanguage aLanguage): MultiLineEdit(pParent,nWinStyle), mbDoBracketHilight(true), aHighlighter(aLanguage) { EnableUpdateData(300); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeMultiLineEditSyntaxHighlight(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeMultiLineEditSyntaxHighlight(vcl::Window *pParent, VclBuilder::stringmap &) { return new MultiLineEditSyntaxHighlight(pParent); } diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx index c1319e57cf2a..3f645d556932 100644 --- a/svtools/source/edit/svmedit.cxx +++ b/svtools/source/edit/svmedit.cxx @@ -21,7 +21,7 @@ #include "unoiface.hxx" -MultiLineEdit::MultiLineEdit( Window* pParent, WinBits nWinStyle ) +MultiLineEdit::MultiLineEdit( vcl::Window* pParent, WinBits nWinStyle ) : VclMultiLineEdit( pParent,nWinStyle ) { } diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx index a50a4a62871b..9bb4c5f85478 100644 --- a/svtools/source/edit/svmedit2.cxx +++ b/svtools/source/edit/svmedit2.cxx @@ -21,7 +21,7 @@ #include <svtools/svmedit2.hxx> #include <vcl/xtextedt.hxx> -ExtMultiLineEdit::ExtMultiLineEdit( Window* pParent, WinBits nWinStyle ) : +ExtMultiLineEdit::ExtMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle ) : MultiLineEdit( pParent, nWinStyle ) |