summaryrefslogtreecommitdiff
path: root/uui/source
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 /uui/source
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 'uui/source')
-rw-r--r--uui/source/alreadyopen.cxx2
-rw-r--r--uui/source/alreadyopen.hxx2
-rw-r--r--uui/source/filechanged.cxx2
-rw-r--r--uui/source/filechanged.hxx2
-rw-r--r--uui/source/fltdlg.cxx2
-rw-r--r--uui/source/fltdlg.hxx2
-rw-r--r--uui/source/iahndl-authentication.cxx14
-rw-r--r--uui/source/iahndl-errorhandler.cxx2
-rw-r--r--uui/source/iahndl-filter.cxx4
-rw-r--r--uui/source/iahndl-locking.cxx6
-rw-r--r--uui/source/iahndl-ssl.cxx6
-rw-r--r--uui/source/iahndl.cxx6
-rw-r--r--uui/source/iahndl.hxx4
-rw-r--r--uui/source/lockfailed.cxx2
-rw-r--r--uui/source/lockfailed.hxx2
-rw-r--r--uui/source/logindlg.cxx2
-rw-r--r--uui/source/logindlg.hxx2
-rw-r--r--uui/source/masterpasscrtdlg.cxx2
-rw-r--r--uui/source/masterpasscrtdlg.hxx2
-rw-r--r--uui/source/masterpassworddlg.cxx2
-rw-r--r--uui/source/masterpassworddlg.hxx2
-rw-r--r--uui/source/nameclashdlg.cxx2
-rw-r--r--uui/source/nameclashdlg.hxx2
-rw-r--r--uui/source/openlocked.cxx2
-rw-r--r--uui/source/openlocked.hxx2
-rw-r--r--uui/source/passworddlg.cxx2
-rw-r--r--uui/source/passworddlg.hxx2
-rw-r--r--uui/source/secmacrowarnings.cxx2
-rw-r--r--uui/source/secmacrowarnings.hxx2
-rw-r--r--uui/source/sslwarndlg.cxx2
-rw-r--r--uui/source/sslwarndlg.hxx2
-rw-r--r--uui/source/trylater.cxx2
-rw-r--r--uui/source/trylater.hxx2
-rw-r--r--uui/source/unknownauthdlg.cxx2
-rw-r--r--uui/source/unknownauthdlg.hxx2
35 files changed, 49 insertions, 49 deletions
diff --git a/uui/source/alreadyopen.cxx b/uui/source/alreadyopen.cxx
index 5012508d03ed..e53a9b3759ea 100644
--- a/uui/source/alreadyopen.cxx
+++ b/uui/source/alreadyopen.cxx
@@ -20,7 +20,7 @@
#include "ids.hrc"
#include "alreadyopen.hxx"
-AlreadyOpenQueryBox::AlreadyOpenQueryBox( Window* pParent, ResMgr* pResMgr, const OUString& aMessage, bool bIsStoring ) :
+AlreadyOpenQueryBox::AlreadyOpenQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage, bool bIsStoring ) :
MessBox(pParent, 0,
ResId(STR_ALREADYOPEN_TITLE, *pResMgr).toString(),
aMessage )
diff --git a/uui/source/alreadyopen.hxx b/uui/source/alreadyopen.hxx
index 2e7890ec9d6d..7f03ba8f5d7c 100644
--- a/uui/source/alreadyopen.hxx
+++ b/uui/source/alreadyopen.hxx
@@ -24,7 +24,7 @@
class AlreadyOpenQueryBox : public MessBox
{
public:
- AlreadyOpenQueryBox( Window* pParent, ResMgr* pResMgr, const OUString& aMessage, bool bIsStoring );
+ AlreadyOpenQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage, bool bIsStoring );
virtual ~AlreadyOpenQueryBox();
};
diff --git a/uui/source/filechanged.cxx b/uui/source/filechanged.cxx
index 2e143efdf0ed..0a4bd33c582e 100644
--- a/uui/source/filechanged.cxx
+++ b/uui/source/filechanged.cxx
@@ -20,7 +20,7 @@
#include "ids.hrc"
#include "filechanged.hxx"
-FileChangedQueryBox::FileChangedQueryBox( Window* pParent, ResMgr* pResMgr ) :
+FileChangedQueryBox::FileChangedQueryBox( vcl::Window* pParent, ResMgr* pResMgr ) :
MessBox(pParent, 0,
ResId(STR_FILECHANGED_TITLE, *pResMgr).toString(),
OUString() )
diff --git a/uui/source/filechanged.hxx b/uui/source/filechanged.hxx
index de29a2ff4258..aa84c57430a8 100644
--- a/uui/source/filechanged.hxx
+++ b/uui/source/filechanged.hxx
@@ -24,7 +24,7 @@
class FileChangedQueryBox : public MessBox
{
public:
- FileChangedQueryBox( Window* pParent, ResMgr* pResMgr );
+ FileChangedQueryBox( vcl::Window* pParent, ResMgr* pResMgr );
virtual ~FileChangedQueryBox();
};
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index 1d045fa40717..f2d895bff952 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -45,7 +45,7 @@ namespace uui
@param "pParentWindow" , parent window for dialog
@threadsafe no
*//*-*************************************************************************************************************/
-FilterDialog::FilterDialog( Window* pParentWindow )
+FilterDialog::FilterDialog( vcl::Window* pParentWindow )
: ModalDialog (pParentWindow, "FilterSelectDialog", "uui/ui/filterselect.ui" )
, m_pFilterNames(NULL)
{
diff --git a/uui/source/fltdlg.hxx b/uui/source/fltdlg.hxx
index 26ceb81b3cd5..6c245445ab97 100644
--- a/uui/source/fltdlg.hxx
+++ b/uui/source/fltdlg.hxx
@@ -46,7 +46,7 @@ class FilterDialog : public ModalDialog
{
// public interface
public:
- FilterDialog ( Window* pParentWindow );
+ FilterDialog ( vcl::Window* pParentWindow );
void SetURL ( const OUString& sURL );
void ChangeFilters( const FilterNameList* pFilterNames );
bool AskForFilter ( FilterNameListPtr& pSelectedItem );
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index fbb1dba24c3d..81cd93a936da 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -58,7 +58,7 @@ namespace {
void
executeLoginDialog(
- Window * pParent,
+ vcl::Window * pParent,
LoginErrorInfo & rInfo,
OUString const & rRealm)
{
@@ -182,7 +182,7 @@ void getRememberModes(
void
handleAuthenticationRequest_(
- Window * pParent,
+ vcl::Window * pParent,
uno::Reference< task::XInteractionHandler2 > const & xIH,
uno::Reference< uno::XComponentContext > const & xContext,
ucb::AuthenticationRequest const & rRequest,
@@ -403,7 +403,7 @@ handleAuthenticationRequest_(
void
executeMasterPasswordDialog(
- Window * pParent,
+ vcl::Window * pParent,
LoginErrorInfo & rInfo,
task::PasswordRequestMode nMode)
{
@@ -458,7 +458,7 @@ executeMasterPasswordDialog(
void
handleMasterPasswordRequest_(
- Window * pParent,
+ vcl::Window * pParent,
task::PasswordRequestMode nMode,
uno::Sequence< uno::Reference< task::XInteractionContinuation > > const &
rContinuations)
@@ -498,7 +498,7 @@ handleMasterPasswordRequest_(
void
executePasswordDialog(
- Window * pParent,
+ vcl::Window * pParent,
LoginErrorInfo & rInfo,
task::PasswordRequestMode nMode,
const OUString& aDocName,
@@ -558,7 +558,7 @@ executePasswordDialog(
void
handlePasswordRequest_(
- Window * pParent,
+ vcl::Window * pParent,
task::PasswordRequestMode nMode,
uno::Sequence< uno::Reference< task::XInteractionContinuation > > const &
rContinuations,
@@ -666,7 +666,7 @@ UUIInteractionHelper::handlePasswordRequest(
uno::Reference< task::XInteractionRequest > const & rRequest)
{
// parameters to be filled for the call to handlePasswordRequest_
- Window * pParent = getParentProperty();
+ vcl::Window * pParent = getParentProperty();
task::PasswordRequestMode nMode = task::PasswordRequestMode_PASSWORD_ENTER;
uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations = rRequest->getContinuations();
OUString aDocumentName;
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index b70ae0ec2bf9..68b09382baed 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -41,7 +41,7 @@ namespace {
sal_uInt16
executeErrorDialog(
- Window * pParent,
+ vcl::Window * pParent,
task::InteractionClassification eClassification,
OUString const & rContext,
OUString const & rMessage,
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx
index dc244161fc76..bfdb312855e9 100644
--- a/uui/source/iahndl-filter.cxx
+++ b/uui/source/iahndl-filter.cxx
@@ -46,7 +46,7 @@ namespace {
void
executeFilterDialog(
- Window * pParent ,
+ vcl::Window * pParent ,
OUString const & rURL ,
uui::FilterNameList const & rFilters,
OUString & rFilter )
@@ -75,7 +75,7 @@ executeFilterDialog(
void
handleNoSuchFilterRequest_(
- Window * pParent,
+ vcl::Window * pParent,
uno::Reference< uno::XComponentContext > const & xContext,
document::NoSuchFilterRequest const & rRequest,
uno::Sequence< uno::Reference< task::XInteractionContinuation > > const &
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index a6b32b5459df..e7e911bb8aef 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -56,7 +56,7 @@ namespace {
void
handleLockedDocumentRequest_(
- Window * pParent,
+ vcl::Window * pParent,
const OUString& aDocumentURL,
const OUString& aInfo,
uno::Sequence< uno::Reference< task::XInteractionContinuation > > const &
@@ -145,7 +145,7 @@ handleLockedDocumentRequest_(
void
handleChangedByOthersRequest_(
- Window * pParent,
+ vcl::Window * pParent,
uno::Sequence< uno::Reference< task::XInteractionContinuation > > const &
rContinuations )
{
@@ -180,7 +180,7 @@ handleChangedByOthersRequest_(
void
handleLockFileIgnoreRequest_(
- Window * pParent,
+ vcl::Window * pParent,
uno::Sequence< uno::Reference< task::XInteractionContinuation > > const &
rContinuations )
{
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index e415091e1e4a..4925d34064dc 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -137,7 +137,7 @@ getLocalizedDatTimeStr(
bool
executeUnknownAuthDialog(
- Window * pParent,
+ vcl::Window * pParent,
uno::Reference< uno::XComponentContext > const & xContext,
const uno::Reference< security::XCertificate >& rXCert)
{
@@ -177,7 +177,7 @@ executeUnknownAuthDialog(
bool
executeSSLWarnDialog(
- Window * pParent,
+ vcl::Window * pParent,
uno::Reference< uno::XComponentContext > const & xContext,
const uno::Reference< security::XCertificate >& rXCert,
sal_Int32 const & failure,
@@ -246,7 +246,7 @@ executeSSLWarnDialog(
void
handleCertificateValidationRequest_(
- Window * pParent,
+ vcl::Window * pParent,
uno::Reference< uno::XComponentContext > const & xContext,
ucb::CertificateValidationRequest const & rRequest,
uno::Sequence< uno::Reference< task::XInteractionContinuation > > const &
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index ffe9bc85a9cc..ac56d73352f0 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -976,7 +976,7 @@ UUIInteractionHelper::getInteractionHandlerList(
}
}
-Window *
+vcl::Window *
UUIInteractionHelper::getParentProperty()
{
uno::Reference< awt::XWindow > xWindow = getParentXWindow();
@@ -1010,7 +1010,7 @@ namespace {
sal_uInt16
executeMessageBox(
- Window * pParent,
+ vcl::Window * pParent,
OUString const & rTitle,
OUString const & rMessage,
WinBits nButtonMask )
@@ -1042,7 +1042,7 @@ executeMessageBox(
return aResult;
}
-NameClashResolveDialogResult executeSimpleNameClashResolveDialog( Window *pParent,
+NameClashResolveDialogResult executeSimpleNameClashResolveDialog( vcl::Window *pParent,
OUString const & rTargetFolderURL,
OUString const & rClashingName,
OUString & rProposedNewName,
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 688a35854777..68e6b638bbe8 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -61,7 +61,7 @@ namespace com { namespace sun { namespace star {
#include <boost/unordered_map.hpp>
-class Window;
+namespace vcl { class Window; }
struct InteractionHandlerData
{
@@ -143,7 +143,7 @@ private:
static long
getstringfromrequest(void* pHandleData, void* pInteractionHandler);
- Window *
+ vcl::Window *
getParentProperty();
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>
diff --git a/uui/source/lockfailed.cxx b/uui/source/lockfailed.cxx
index 3fa467434e65..48c4f23a935d 100644
--- a/uui/source/lockfailed.cxx
+++ b/uui/source/lockfailed.cxx
@@ -22,7 +22,7 @@
#include <vcl/button.hxx>
-LockFailedQueryBox::LockFailedQueryBox( Window* pParent, ResMgr* pResMgr ) :
+LockFailedQueryBox::LockFailedQueryBox( vcl::Window* pParent, ResMgr* pResMgr ) :
MessBox(pParent, 0,
ResId(STR_LOCKFAILED_TITLE, *pResMgr).toString(),
OUString() )
diff --git a/uui/source/lockfailed.hxx b/uui/source/lockfailed.hxx
index da16c1b56af5..7b7bc59503e7 100644
--- a/uui/source/lockfailed.hxx
+++ b/uui/source/lockfailed.hxx
@@ -24,7 +24,7 @@
class LockFailedQueryBox : public MessBox
{
public:
- LockFailedQueryBox( Window* pParent, ResMgr* pResMgr );
+ LockFailedQueryBox( vcl::Window* pParent, ResMgr* pResMgr );
virtual ~LockFailedQueryBox();
};
diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index 4122d5309dbe..c28e17098a51 100644
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -142,7 +142,7 @@ IMPL_LINK_NOARG(LoginDialog, UseSysCredsHdl_Impl)
return 1;
}
-LoginDialog::LoginDialog(Window* pParent, sal_uInt16 nFlags,
+LoginDialog::LoginDialog(vcl::Window* pParent, sal_uInt16 nFlags,
const OUString& rServer, const OUString& rRealm)
: ModalDialog(pParent, "LoginDialog", "uui/ui/logindialog.ui")
{
diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx
index 07943b3446da..4fe319effecc 100644
--- a/uui/source/logindlg.hxx
+++ b/uui/source/logindlg.hxx
@@ -67,7 +67,7 @@ class LoginDialog : public ModalDialog
DECL_LINK(UseSysCredsHdl_Impl, void *);
public:
- LoginDialog(Window* pParent, sal_uInt16 nFlags,
+ LoginDialog(vcl::Window* pParent, sal_uInt16 nFlags,
const OUString& rServer, const OUString &rRealm);
OUString GetPath() const { return m_pPathED->GetText(); }
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index 1ec8c852db62..a7acc0189a26 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -50,7 +50,7 @@ IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl)
return 1;
}
-MasterPasswordCreateDialog::MasterPasswordCreateDialog(Window* pParent, ResMgr* pResMgr)
+MasterPasswordCreateDialog::MasterPasswordCreateDialog(vcl::Window* pParent, ResMgr* pResMgr)
: ModalDialog(pParent, "SetMasterPasswordDialog", "uui/ui/setmasterpassworddlg.ui")
, pResourceMgr(pResMgr)
, nMinLen(1)
diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx
index 44fdcf07e76f..31e9eb60ab87 100644
--- a/uui/source/masterpasscrtdlg.hxx
+++ b/uui/source/masterpasscrtdlg.hxx
@@ -41,7 +41,7 @@ private:
DECL_LINK(EditHdl_Impl, void *);
public:
- MasterPasswordCreateDialog( Window* pParent, ResMgr * pResMgr );
+ MasterPasswordCreateDialog( vcl::Window* pParent, ResMgr * pResMgr );
OUString GetMasterPassword() const { return m_pEDMasterPasswordCrt->GetText(); }
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx
index ed297a860e69..3b6a071968a3 100644
--- a/uui/source/masterpassworddlg.cxx
+++ b/uui/source/masterpassworddlg.cxx
@@ -36,7 +36,7 @@ IMPL_LINK_NOARG(MasterPasswordDialog, OKHdl_Impl)
MasterPasswordDialog::MasterPasswordDialog
(
- Window* pParent,
+ vcl::Window* pParent,
::com::sun::star::task::PasswordRequestMode aDialogMode,
ResMgr* pResMgr
)
diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx
index 3bd9a9508366..4b834d4fa5ed 100644
--- a/uui/source/masterpassworddlg.hxx
+++ b/uui/source/masterpassworddlg.hxx
@@ -36,7 +36,7 @@ class MasterPasswordDialog : public ModalDialog
DECL_LINK(OKHdl_Impl, void *);
public:
- MasterPasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr );
+ MasterPasswordDialog( vcl::Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr );
OUString GetMasterPassword() const { return m_pEDMasterPassword->GetText(); }
diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx
index bfa3994aa926..63ad0926dc02 100644
--- a/uui/source/nameclashdlg.cxx
+++ b/uui/source/nameclashdlg.cxx
@@ -49,7 +49,7 @@ IMPL_LINK( NameClashDialog, ButtonHdl_Impl, PushButton *, pBtn )
}
-NameClashDialog::NameClashDialog( Window* pParent, ResMgr* pResMgr,
+NameClashDialog::NameClashDialog( vcl::Window* pParent, ResMgr* pResMgr,
OUString const & rTargetFolderURL,
OUString const & rClashingName,
OUString const & rProposedNewName,
diff --git a/uui/source/nameclashdlg.hxx b/uui/source/nameclashdlg.hxx
index a6369a672f42..6185e996305c 100644
--- a/uui/source/nameclashdlg.hxx
+++ b/uui/source/nameclashdlg.hxx
@@ -43,7 +43,7 @@ class NameClashDialog : public ModalDialog
DECL_LINK( ButtonHdl_Impl, PushButton * );
public:
- NameClashDialog( Window* pParent, ResMgr* pResMgr,
+ NameClashDialog( vcl::Window* pParent, ResMgr* pResMgr,
OUString const & rTargetFolderURL,
OUString const & rClashingName,
OUString const & rProposedNewName,
diff --git a/uui/source/openlocked.cxx b/uui/source/openlocked.cxx
index 20904a5a2e5b..b4f7ee594f12 100644
--- a/uui/source/openlocked.cxx
+++ b/uui/source/openlocked.cxx
@@ -20,7 +20,7 @@
#include "ids.hrc"
#include "openlocked.hxx"
-OpenLockedQueryBox::OpenLockedQueryBox( Window* pParent, ResMgr* pResMgr, const OUString& aMessage ) :
+OpenLockedQueryBox::OpenLockedQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage ) :
MessBox(pParent, 0,
ResId(STR_OPENLOCKED_TITLE, *pResMgr).toString(),
aMessage )
diff --git a/uui/source/openlocked.hxx b/uui/source/openlocked.hxx
index 8662d7bfc601..72878db38951 100644
--- a/uui/source/openlocked.hxx
+++ b/uui/source/openlocked.hxx
@@ -24,7 +24,7 @@
class OpenLockedQueryBox : public MessBox
{
public:
- OpenLockedQueryBox( Window* pParent, ResMgr* pResMgr, const OUString& aMessage );
+ OpenLockedQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage );
virtual ~OpenLockedQueryBox();
};
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index 3d4326eb10ff..2e5ed497b599 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -24,7 +24,7 @@
using namespace ::com::sun::star;
-PasswordDialog::PasswordDialog(Window* _pParent,
+PasswordDialog::PasswordDialog(vcl::Window* _pParent,
task::PasswordRequestMode nDlgMode, ResMgr * pResMgr,
const OUString& aDocURL, bool bOpenToModify, bool bIsSimplePasswordRequest)
: ModalDialog(_pParent, "PasswordDialog", "uui/ui/password.ui")
diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx
index b58ce1fab43f..3cec5ca190d3 100644
--- a/uui/source/passworddlg.hxx
+++ b/uui/source/passworddlg.hxx
@@ -44,7 +44,7 @@ class PasswordDialog : public ModalDialog
DECL_LINK(OKHdl_Impl, void *);
public:
- PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, const OUString& aDocURL,
+ PasswordDialog( vcl::Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, const OUString& aDocURL,
bool bOpenToModify = false, bool bIsSimplePasswordRequest = false );
void SetMinLen( sal_uInt16 nMin ) { nMinLen = nMin; }
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 32713a5a174f..935ecf66ecf4 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -63,7 +63,7 @@ namespace
}
-MacroWarning::MacroWarning( Window* _pParent, bool _bWithSignatures, ResMgr& )
+MacroWarning::MacroWarning( vcl::Window* _pParent, bool _bWithSignatures, ResMgr& )
:ModalDialog ( _pParent, "MacroWarnMedium", "uui/ui/macrowarnmedium.ui" )
,mpInfos ( NULL )
,mbSignedMode ( true )
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index da05fa576654..84daaad9ee3a 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -66,7 +66,7 @@ private:
void InitControls();
public:
- MacroWarning( Window* pParent, bool _bShowSignatures, ResMgr& rResMgr );
+ MacroWarning( vcl::Window* pParent, bool _bShowSignatures, ResMgr& rResMgr );
virtual ~MacroWarning();
void SetDocumentURL( const OUString& rDocURL );
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index 11e183f2a7af..1e3a55edda88 100644
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
@@ -38,7 +38,7 @@ void SSLWarnDialog::ViewCert()
-SSLWarnDialog::SSLWarnDialog(Window* pParent,
+SSLWarnDialog::SSLWarnDialog(vcl::Window* pParent,
const css::uno::Reference< css::security::XCertificate >& rXCert,
const css::uno::Reference< css::uno::XComponentContext >& xContext)
: MessageDialog(pParent, "SSLWarnDialog", "uui/ui/sslwarndialog.ui")
diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx
index 30146e128e0e..73b25c2c4c0d 100644
--- a/uui/source/sslwarndlg.hxx
+++ b/uui/source/sslwarndlg.hxx
@@ -38,7 +38,7 @@ private:
void ViewCert();
public:
- SSLWarnDialog( Window* pParent,
+ SSLWarnDialog( vcl::Window* pParent,
const css::uno::Reference< css::security::XCertificate >& rXCert,
const css::uno::Reference< css::uno::XComponentContext >& xContext );
diff --git a/uui/source/trylater.cxx b/uui/source/trylater.cxx
index 93170a1a3fa3..8c1c5705b2d4 100644
--- a/uui/source/trylater.cxx
+++ b/uui/source/trylater.cxx
@@ -20,7 +20,7 @@
#include "ids.hrc"
#include "trylater.hxx"
-TryLaterQueryBox::TryLaterQueryBox( Window* pParent, ResMgr* pResMgr, const OUString& aMessage ) :
+TryLaterQueryBox::TryLaterQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage ) :
MessBox(pParent, 0,
ResId(STR_TRYLATER_TITLE, *pResMgr).toString(),
aMessage )
diff --git a/uui/source/trylater.hxx b/uui/source/trylater.hxx
index f7e3ceb74063..18f3680a1f47 100644
--- a/uui/source/trylater.hxx
+++ b/uui/source/trylater.hxx
@@ -24,7 +24,7 @@
class TryLaterQueryBox : public MessBox
{
public:
- TryLaterQueryBox( Window* pParent, ResMgr* pResMgr, const OUString& aMessage );
+ TryLaterQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage );
virtual ~TryLaterQueryBox();
};
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index 44e4bdd28f8d..34f706fec139 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -58,7 +58,7 @@ IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl)
-UnknownAuthDialog::UnknownAuthDialog(Window* pParent,
+UnknownAuthDialog::UnknownAuthDialog(vcl::Window* pParent,
const css::uno::Reference< css::security::XCertificate >& rXCert,
const css::uno::Reference< css::uno::XComponentContext >& xContext)
: MessageDialog(pParent, "UnknownAuthDialog",
diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx
index f78b91aab604..0b8d1e64ab2b 100644
--- a/uui/source/unknownauthdlg.hxx
+++ b/uui/source/unknownauthdlg.hxx
@@ -43,7 +43,7 @@ private:
DECL_LINK(ViewCertHdl_Impl, void *);
public:
- UnknownAuthDialog(Window* pParent,
+ UnknownAuthDialog(vcl::Window* pParent,
const css::uno::Reference< css::security::XCertificate >& rXCert,
const css::uno::Reference< css::uno::XComponentContext >& xContext);