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 /basctl/source/inc/basobj.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 'basctl/source/inc/basobj.hxx')
-rw-r--r-- | basctl/source/inc/basobj.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx index 0c6af6cf536a..ef996125840a 100644 --- a/basctl/source/inc/basobj.hxx +++ b/basctl/source/inc/basobj.hxx @@ -30,7 +30,7 @@ class StarBASIC; class SfxUInt16Item; class SfxBindings; class SfxDispatcher; -class Window; +namespace vcl { class Window; } namespace basctl { @@ -68,7 +68,7 @@ namespace basctl Will show an error message when renaming fails because the new name is already used. */ bool RenameModule( - Window* pErrorParent, const ScriptDocument& rDocument, + vcl::Window* pErrorParent, const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rOldName, const OUString& rNewName ); // new methods for macros @@ -91,7 +91,7 @@ namespace basctl Will show an error message when renaming fails because the new name is already used. */ bool RenameDialog( - Window* pErrorParent, const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rOldName, const OUString& rNewName ) + vcl::Window* pErrorParent, const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rOldName, const OUString& rNewName ) throw (css::container::ElementExistException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); bool RemoveDialog( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rDlgName ); |