diff options
Diffstat (limited to 'sfx2/source')
128 files changed, 465 insertions, 465 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 72e2a0f6e48b..0516b0bc9d2d 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -419,7 +419,7 @@ void SfxApplication::ReleaseIndex(sal_uInt16 i) -Window* SfxApplication::GetTopWindow() const +vcl::Window* SfxApplication::GetTopWindow() const { SfxWorkWindow* pWork = GetWorkWindow_Impl( SfxViewFrame::Current() ); return pWork ? pWork->GetWindow() : NULL; diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 862c76ba3d0e..1d92c5e71e0d 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -153,7 +153,7 @@ Sequence< OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServiceName -typedef bool ( *PFunc_getSpecialCharsForEdit)( Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString ); +typedef bool ( *PFunc_getSpecialCharsForEdit)( vcl::Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString ); // Lazy binding of the GetSpecialCharsForEdit function as it resides in @@ -166,11 +166,11 @@ extern "C" { static void SAL_CALL thisModule() {} } #else -extern "C" bool GetSpecialCharsForEdit( Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString ); +extern "C" bool GetSpecialCharsForEdit( vcl::Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString ); #endif -OUString GetSpecialCharsForEdit(Window* pParent, const vcl::Font& rFont) +OUString GetSpecialCharsForEdit(vcl::Window* pParent, const vcl::Font& rFont) { static bool bDetermineFunction = false; static PFunc_getSpecialCharsForEdit pfunc_getSpecialCharsForEdit = 0; diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 7bc992a85ca9..22908faf7a7f 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -220,7 +220,7 @@ sal_uInt32 CheckPasswd_Impl if ( bIsEncrypted ) { - Window* pWin = pDoc ? pDoc->GetDialogParent( pFile ) : NULL; + vcl::Window* pWin = pDoc ? pDoc->GetDialogParent( pFile ) : NULL; if ( pWin ) pWin->Show(); @@ -461,7 +461,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq ) if ( !pTemplNameItem && !pTemplFileNameItem ) { bool bNewWin = false; - Window* pTopWin = GetTopWindow(); + vcl::Window* pTopWin = GetTopWindow(); SfxTemplateManagerDlg aTemplDlg; int nRet = aTemplDlg.Execute(); @@ -830,7 +830,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if ( eMode == SvtExtendedSecurityOptions::OPEN_NEVER && aINetProtocol != INET_PROT_VND_SUN_STAR_HELP ) { SolarMutexGuard aGuard; - Window *pWindow = SfxGetpApp()->GetTopWindow(); + vcl::Window *pWindow = SfxGetpApp()->GetTopWindow(); MessageDialog aSecurityWarningBox(pWindow, SfxResId(STR_SECURITY_WARNING_NO_HYPERLINKS), diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 7fcb63c9c470..7798695bbbfc 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -237,10 +237,10 @@ namespace private: DECL_LINK(ShowHdl, void *); public: - LicenseDialog(Window *pParent=NULL); + LicenseDialog(vcl::Window *pParent=NULL); }; - LicenseDialog::LicenseDialog(Window *pParent) + LicenseDialog::LicenseDialog(vcl::Window *pParent) : ModalDialog(pParent, "LicenseDialog", "sfx/ui/licensedialog.ui") { get<PushButton>("show")->SetClickHdl(LINK(this, LicenseDialog, ShowHdl)); @@ -885,7 +885,7 @@ ResMgr* SfxApplication::GetOffResManager_Impl() namespace { #ifndef DISABLE_SCRIPTING - Window* lcl_getDialogParent( const Reference< XFrame >& _rxFrame, Window* _pFallback ) + vcl::Window* lcl_getDialogParent( const Reference< XFrame >& _rxFrame, vcl::Window* _pFallback ) { if ( !_rxFrame.is() ) return _pFallback; @@ -893,7 +893,7 @@ namespace try { Reference< awt::XWindow > xContainerWindow( _rxFrame->getContainerWindow(), UNO_SET_THROW ); - Window* pWindow = VCLUnoHelper::GetWindow( xContainerWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xContainerWindow ); OSL_ENSURE( pWindow, "lcl_getDialogParent: cool, somebody implemented a VCL-less toolkit!" ); if ( pWindow ) @@ -1208,7 +1208,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) OUString aLang( aLanguage ); OSL_TRACE("SfxApplication::OfaExec_Impl: about to create dialog for: %s", OUStringToOString( aLang , RTL_TEXTENCODING_ASCII_US ).pData->buffer); - // not sure about the Window* + // not sure about the vcl::Window* VclAbstractDialog* pDlg = pFact->CreateSvxScriptOrgDialog( GetTopWindow(), aLanguage ); if( pDlg ) { diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index cc56952b40a4..65d887456b0c 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -142,7 +142,7 @@ bool GetSplitSizeFromString( const OUString& rStr, Size& rSize ) } -SfxChildWindow::SfxChildWindow(Window *pParentWindow, sal_uInt16 nId) +SfxChildWindow::SfxChildWindow(vcl::Window *pParentWindow, sal_uInt16 nId) : pParent(pParentWindow) , nType(nId) , eChildAlignment(SFX_ALIGN_NOALIGNMENT) @@ -191,7 +191,7 @@ SfxChildWindow::~SfxChildWindow() SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId, - Window *pParent, SfxBindings* pBindings, SfxChildWinInfo& rInfo) + vcl::Window *pParent, SfxBindings* pBindings, SfxChildWinInfo& rInfo) { SfxChildWindow *pChild=0; SfxChildWinFactory* pFact=0; @@ -510,7 +510,7 @@ SfxChildWindowContext::~SfxChildWindowContext() FloatingWindow* SfxChildWindowContext::GetFloatingWindow() const { - Window *pParent = pWindow->GetParent(); + vcl::Window *pParent = pWindow->GetParent(); if (pParent->GetType() == WINDOW_DOCKINGWINDOW || pParent->GetType() == WINDOW_TOOLBOX) { return ((DockingWindow*)pParent)->GetFloatingWindow(); @@ -673,7 +673,7 @@ void SfxChildWindow::Show( sal_uInt16 nFlags ) } } -Window* SfxChildWindow::GetContextWindow( SfxModule *pModule ) const +vcl::Window* SfxChildWindow::GetContextWindow( SfxModule *pModule ) const { return pModule == pImp->pContextModule && pContext ? pContext->GetWindow(): 0; } diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index e123285cbd03..88761455b147 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -388,7 +388,7 @@ OUString impl_getFilter( const OUString& _rURL ) return sFilter; } -void SvFileObject::Edit( Window* pParent, sfx2::SvBaseLink* pLink, const Link& rEndEditHdl ) +void SvFileObject::Edit( vcl::Window* pParent, sfx2::SvBaseLink* pLink, const Link& rEndEditHdl ) { aEndEditLink = rEndEditHdl; OUString sFile, sRange, sTmpFilter; diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx index d43e1ebe52e3..78aa1fb4cef4 100644 --- a/sfx2/source/appl/fileobj.hxx +++ b/sfx2/source/appl/fileobj.hxx @@ -33,7 +33,7 @@ class SvFileObject : public sfx2::SvLinkSource OUString sReferer; Link aEndEditLink; SfxMediumRef xMed; - Window* pOldParent; + vcl::Window* pOldParent; sal_uInt8 nType; @@ -67,7 +67,7 @@ public: bool bSynchron = false ) SAL_OVERRIDE; virtual bool Connect( sfx2::SvBaseLink* ) SAL_OVERRIDE; - virtual void Edit( Window *, sfx2::SvBaseLink *, const Link& rEndEditHdl ) SAL_OVERRIDE; + virtual void Edit( vcl::Window *, sfx2::SvBaseLink *, const Link& rEndEditHdl ) SAL_OVERRIDE; // Ask whether you can access data directly or whether it has to be triggered virtual bool IsPending() const SAL_OVERRIDE; diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index cf34acc42348..8da693405450 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -64,11 +64,11 @@ class SvDDELinkEditDialog : public ModalDialog DECL_STATIC_LINK( SvDDELinkEditDialog, EditHdl_Impl, Edit* ); public: - SvDDELinkEditDialog( Window* pParent, SvBaseLink* ); + SvDDELinkEditDialog( vcl::Window* pParent, SvBaseLink* ); OUString GetCmd() const; }; -SvDDELinkEditDialog::SvDDELinkEditDialog( Window* pParent, SvBaseLink* pLink ) +SvDDELinkEditDialog::SvDDELinkEditDialog( vcl::Window* pParent, SvBaseLink* pLink ) : ModalDialog( pParent, "LinkEditDialog", "sfx/ui/linkeditdialog.ui" ) { get(m_pOKButton, "ok"); @@ -253,7 +253,7 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink ) return true; } -void SvDDEObject::Edit( Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl ) +void SvDDEObject::Edit( vcl::Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl ) { SvDDELinkEditDialog aDlg( pParent, pBaseLink ); if ( RET_OK == aDlg.Execute() && rEndEditHdl.IsSet() ) diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx index 53810ab97c0f..00952d391b55 100644 --- a/sfx2/source/appl/impldde.hxx +++ b/sfx2/source/appl/impldde.hxx @@ -59,7 +59,7 @@ public: bool bSynchron = false ) SAL_OVERRIDE; virtual bool Connect( SvBaseLink * ) SAL_OVERRIDE; - virtual void Edit( Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl ) SAL_OVERRIDE; + virtual void Edit( vcl::Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl ) SAL_OVERRIDE; virtual bool IsPending() const SAL_OVERRIDE; virtual bool IsDataComplete() const SAL_OVERRIDE; diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index c5e38888f4cc..43673a0c5746 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -288,7 +288,7 @@ void LinkManager::UpdateAllLinks( bool bAskUpdate, bool /*bCallErrHdl*/, bool bUpdateGrfLinks, - Window* pParentWin ) + vcl::Window* pParentWin ) { // First make a copy of the array in order to update links // links in ... no contact between them! diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx index b5b6548ee843..8b8ee278fa3e 100644 --- a/sfx2/source/appl/linksrc.cxx +++ b/sfx2/source/appl/linksrc.cxx @@ -423,7 +423,7 @@ bool SvLinkSource::GetData( ::com::sun::star::uno::Any &, const OUString &, bool return false; } -void SvLinkSource::Edit( Window *, SvBaseLink *, const Link& ) +void SvLinkSource::Edit( vcl::Window *, SvBaseLink *, const Link& ) { } diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 81f960b6040d..cc1cdfcbd478 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -48,7 +48,7 @@ struct BaseLink_Impl { Link m_aEndEditLink; LinkManager* m_pLinkMgr; - Window* m_pParentWin; + vcl::Window* m_pParentWin; FileDialogHelper* m_pFileDlg; bool m_bIsConnect; @@ -435,7 +435,7 @@ SvBaseLink::UpdateResult SvBaseLink::DataChanged( const OUString &, const ::com: return SUCCESS; } -void SvBaseLink::Edit( Window* pParent, const Link& rEndEditHdl ) +void SvBaseLink::Edit( vcl::Window* pParent, const Link& rEndEditHdl ) { pImpl->m_pParentWin = pParent; pImpl->m_aEndEditLink = rEndEditHdl; diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 3c783fe5cbf3..e1c4382e4eac 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -299,7 +299,7 @@ ImageList* SfxModule::GetImageList_Impl( bool bBig ) return pImpl->GetImageList( pResMgr, bBig ); } -SfxTabPage* SfxModule::CreateTabPage( sal_uInt16, Window*, const SfxItemSet& ) +SfxTabPage* SfxModule::CreateTabPage( sal_uInt16, vcl::Window*, const SfxItemSet& ) { return NULL; } diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 8210a3a82bbb..7df7d962b770 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -175,9 +175,9 @@ namespace sfx2 { - void HandleTaskPaneList( Window* pWindow, bool bAddToList ) + void HandleTaskPaneList( vcl::Window* pWindow, bool bAddToList ) { - Window* pParent = pWindow->GetParent(); + vcl::Window* pParent = pWindow->GetParent(); DBG_ASSERT( pParent, "HandleTaskPaneList(): every window here should have a parent" ); SystemWindow* pSysWin = pParent->GetSystemWindow(); @@ -271,7 +271,7 @@ struct ContentEntry_Impl // ContentListBox_Impl --------------------------------------------------- -ContentListBox_Impl::ContentListBox_Impl(Window* pParent, WinBits nStyle) +ContentListBox_Impl::ContentListBox_Impl(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) , aOpenBookImage(SfxResId(IMG_HELP_CONTENT_BOOK_OPEN)) , aClosedBookImage(SfxResId(IMG_HELP_CONTENT_BOOK_CLOSED)) @@ -291,7 +291,7 @@ ContentListBox_Impl::ContentListBox_Impl(Window* pParent, WinBits nStyle) InitRoot(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeContentListBox(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeContentListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; @@ -419,7 +419,7 @@ OUString ContentListBox_Impl::GetSelectEntry() const } // class HelpTabPage_Impl ------------------------------------------------ -HelpTabPage_Impl::HelpTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin, +HelpTabPage_Impl::HelpTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin, const OString& rID, const OUString& rUIXMLDescription) : TabPage( pParent, rID, rUIXMLDescription) , m_pIdxWin( _pIdxWin ) @@ -427,7 +427,7 @@ HelpTabPage_Impl::HelpTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pI } // class ContentTabPage_Impl --------------------------------------------- -ContentTabPage_Impl::ContentTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin) +ContentTabPage_Impl::ContentTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin) : HelpTabPage_Impl(pParent, _pIdxWin, "HelpContentPage", "sfx/ui/helpcontentpage.ui") { @@ -450,14 +450,14 @@ Control* ContentTabPage_Impl::GetLastFocusControl() // class IndexBox_Impl --------------------------------------------------- -IndexBox_Impl::IndexBox_Impl(Window* pParent, WinBits nStyle) +IndexBox_Impl::IndexBox_Impl(vcl::Window* pParent, WinBits nStyle) : ComboBox(pParent, nStyle) { EnableAutocomplete(true); EnableUserDraw(true); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeIndexBox(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeIndexBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK; @@ -525,7 +525,7 @@ void IndexBox_Impl::SelectExecutableEntry() // class IndexTabPage_Impl ----------------------------------------------- -IndexTabPage_Impl::IndexTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin) +IndexTabPage_Impl::IndexTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin) : HelpTabPage_Impl(pParent, _pIdxWin, "HelpIndexPage", "sfx/ui/helpindexpage.ui") , bIsActivated(false) @@ -836,7 +836,7 @@ void IndexTabPage_Impl::OpenKeyword() // class SearchBox_Impl -------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSearchBox(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSearchBox(vcl::Window *pParent, VclBuilder::stringmap &) { WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_DROPDOWN; @@ -869,7 +869,7 @@ void SearchBox_Impl::Select() // class SearchResultsBox_Impl ------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSearchResultsBox(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSearchResultsBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK; @@ -896,7 +896,7 @@ bool SearchResultsBox_Impl::Notify( NotifyEvent& rNEvt ) // class SearchTabPage_Impl ---------------------------------------------- -SearchTabPage_Impl::SearchTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin) +SearchTabPage_Impl::SearchTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin) : HelpTabPage_Impl(pParent, _pIdxWin, "HelpSearchPage", "sfx/ui/helpsearchpage.ui") , xBreakIterator(vcl::unohelper::CreateBreakIterator()) @@ -1119,12 +1119,12 @@ void GetBookmarkEntry_Impl } } -BookmarksBox_Impl::BookmarksBox_Impl(Window* pParent, WinBits nStyle) +BookmarksBox_Impl::BookmarksBox_Impl(vcl::Window* pParent, WinBits nStyle) : ListBox(pParent, nStyle) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeBookmarksBox(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBookmarksBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; @@ -1241,7 +1241,7 @@ bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) // class BookmarksTabPage_Impl ------------------------------------------- -BookmarksTabPage_Impl::BookmarksTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin) +BookmarksTabPage_Impl::BookmarksTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin) : HelpTabPage_Impl(pParent, _pIdxWin, "HelpBookmarkPage", "sfx/ui/helpbookmarkpage.ui") { @@ -1573,7 +1573,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, KeywordHdl) void SfxHelpIndexWindow_Impl::Resize() { - Window *pChild = GetWindow(WINDOW_FIRSTCHILD); + vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); if (!pChild) return; VclContainer::setLayoutAllocation(*pChild, Point(0,0), GetSizePixel()); @@ -1581,7 +1581,7 @@ void SfxHelpIndexWindow_Impl::Resize() Size SfxHelpIndexWindow_Impl::GetOptimalSize() const { - const Window *pChild = GetWindow(WINDOW_FIRSTCHILD); + const vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); if (!pChild) return Window::GetOptimalSize(); return VclContainer::getLayoutRequisition(*pChild); @@ -1798,7 +1798,7 @@ void SfxHelpIndexWindow_Impl::SelectExecutableEntry() // class TextWin_Impl ---------------------------------------------------- -TextWin_Impl::TextWin_Impl( Window* p ) : DockingWindow( p, 0 ) +TextWin_Impl::TextWin_Impl( vcl::Window* p ) : DockingWindow( p, 0 ) { } @@ -2320,7 +2320,7 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) if ( EVENT_COMMAND == nType && rNEvt.GetCommandEvent() ) { const CommandEvent* pCmdEvt = rNEvt.GetCommandEvent(); - Window* pCmdWin = rNEvt.GetWindow(); + vcl::Window* pCmdWin = rNEvt.GetWindow(); if ( pCmdEvt->GetCommand() == COMMAND_CONTEXTMENU && pCmdWin != this && pCmdWin != &aToolBox ) { @@ -2660,7 +2660,7 @@ void SfxHelpWindow_Impl::MakeLayout() { if ( nHeight > 0 && xWindow.is() ) { - Window* pScreenWin = VCLUnoHelper::GetWindow(xWindow); + vcl::Window* pScreenWin = VCLUnoHelper::GetWindow(xWindow); /* #i55528# Hide() / Show() will produce strange effects. @@ -2787,7 +2787,7 @@ void SfxHelpWindow_Impl::SaveConfig() aUserData += ";"; aUserData += OUString::number( nH ); - Window* pScreenWin = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pScreenWin = VCLUnoHelper::GetWindow( xWindow ); aWinPos = pScreenWin->GetWindowExtentsRelative( NULL ).TopLeft(); aUserData += ";"; aUserData += OUString::number( aWinPos.X() ); @@ -2948,7 +2948,7 @@ void SfxHelpWindow_Impl::openDone(const OUString& sURL , SfxHelpWindow_Impl::SfxHelpWindow_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >& rFrame, - Window* pParent, WinBits ) : + vcl::Window* pParent, WinBits ) : SplitWindow( pParent, WB_3DLOOK | WB_NOSPLITDRAW ), @@ -2991,7 +2991,7 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl( SfxHelpWindow_Impl::~SfxHelpWindow_Impl() { SaveConfig(); - Window* pDel = pIndexWin; + vcl::Window* pDel = pIndexWin; pIndexWin = NULL; delete pDel; @@ -3195,7 +3195,7 @@ bool SfxHelpWindow_Impl::HasHistorySuccessor() const // class SfxAddHelpBookmarkDialog_Impl ----------------------------------- -SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(Window* pParent, bool bRename) +SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(vcl::Window* pParent, bool bRename) : ModalDialog( pParent, "BookmarkDialog", "sfx/ui/bookmarkdialog.ui") { get(m_pTitleED, "entry"); diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 01dfbb8922b1..46016d9eab1c 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -57,7 +57,7 @@ private: void ClearChildren( SvTreeListEntry* pParent ); public: - ContentListBox_Impl(Window* pParent, WinBits nStyle); + ContentListBox_Impl(vcl::Window* pParent, WinBits nStyle); virtual ~ContentListBox_Impl(); @@ -78,7 +78,7 @@ protected: SfxHelpIndexWindow_Impl* m_pIdxWin; public: - HelpTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin, + HelpTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin, const OString& rID, const OUString& rUIXMLDescription); virtual Control* GetLastFocusControl() = 0; @@ -92,7 +92,7 @@ private: ContentListBox_Impl* m_pContentBox; public: - ContentTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin); + ContentTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin); virtual void ActivatePage() SAL_OVERRIDE; virtual Control* GetLastFocusControl() SAL_OVERRIDE; @@ -107,7 +107,7 @@ public: class IndexBox_Impl : public ComboBox { public: - IndexBox_Impl(Window* pParent, WinBits nStyle); + IndexBox_Impl(vcl::Window* pParent, WinBits nStyle); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -137,7 +137,7 @@ private: DECL_LINK( TimeoutHdl, Timer* ); public: - IndexTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); + IndexTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); virtual ~IndexTabPage_Impl(); virtual void ActivatePage() SAL_OVERRIDE; @@ -167,7 +167,7 @@ private: Link aSearchLink; public: - SearchBox_Impl(Window* pParent, WinBits nStyle) + SearchBox_Impl(vcl::Window* pParent, WinBits nStyle) : ComboBox(pParent, nStyle) { SetDropDownLineCount(5); @@ -182,7 +182,7 @@ public: class SearchResultsBox_Impl : public ListBox { public: - SearchResultsBox_Impl(Window* pParent, WinBits nStyle) + SearchResultsBox_Impl(vcl::Window* pParent, WinBits nStyle) : ListBox(pParent, nStyle) { } @@ -213,7 +213,7 @@ private: DECL_LINK(ModifyHdl, void *); public: - SearchTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); + SearchTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); virtual ~SearchTabPage_Impl(); virtual void ActivatePage() SAL_OVERRIDE; @@ -238,7 +238,7 @@ private: void DoAction( sal_uInt16 nAction ); public: - BookmarksBox_Impl(Window* pParent, WinBits nStyle); + BookmarksBox_Impl(vcl::Window* pParent, WinBits nStyle); virtual ~BookmarksBox_Impl(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -253,7 +253,7 @@ private: DECL_LINK(OpenHdl, void *); public: - BookmarksTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); + BookmarksTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); virtual void ActivatePage() SAL_OVERRIDE; virtual Control* GetLastFocusControl() SAL_OVERRIDE; @@ -268,7 +268,7 @@ public: class SfxHelpWindow_Impl; -class SfxHelpIndexWindow_Impl : public Window, public VclBuilderContainer +class SfxHelpIndexWindow_Impl : public vcl::Window, public VclBuilderContainer { private: ListBox* m_pActiveLB; @@ -389,7 +389,7 @@ bool SfxHelpIndexWindow_Impl::WasCursorLeftOrRight() class TextWin_Impl : public DockingWindow { public: - TextWin_Impl( Window* pParent ); + TextWin_Impl( vcl::Window* pParent ); virtual ~TextWin_Impl(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -400,7 +400,7 @@ public: class SvtMiscOptions; class SfxHelpWindow_Impl; -class SfxHelpTextWindow_Impl : public Window +class SfxHelpTextWindow_Impl : public vcl::Window { private: ToolBox aToolBox; @@ -415,7 +415,7 @@ private: OUString sCurrentFactory; SfxHelpWindow_Impl* pHelpWin; - Window* pTextWin; + vcl::Window* pTextWin; sfx2::SearchDialog* pSrchDlg; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 > xFrame; @@ -516,7 +516,7 @@ friend class SfxHelpIndexWindow_Impl; public: SfxHelpWindow_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >& rFrame, - Window* pParent, WinBits nBits ); + vcl::Window* pParent, WinBits nBits ); virtual ~SfxHelpWindow_Impl(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -557,7 +557,7 @@ class SfxAddHelpBookmarkDialog_Impl : public ModalDialog private: Edit* m_pTitleED; public: - SfxAddHelpBookmarkDialog_Impl( Window* pParent, bool bRename = true ); + SfxAddHelpBookmarkDialog_Impl( vcl::Window* pParent, bool bRename = true ); void SetTitle( const OUString& rTitle ); OUString GetTitle() const { return m_pTitleED->GetText(); } diff --git a/sfx2/source/appl/panelist.hxx b/sfx2/source/appl/panelist.hxx index 5e1ed0e97c69..a10360336635 100644 --- a/sfx2/source/appl/panelist.hxx +++ b/sfx2/source/appl/panelist.hxx @@ -26,15 +26,15 @@ namespace sfx2 { // source in newhelp.cxx - void HandleTaskPaneList( Window* pWindow, bool bAddToList ); + void HandleTaskPaneList( vcl::Window* pWindow, bool bAddToList ); // pWindow: just a system window or something which is child of a system window - inline void AddToTaskPaneList( Window* pWindowToBeHandled ) + inline void AddToTaskPaneList( vcl::Window* pWindowToBeHandled ) { HandleTaskPaneList( pWindowToBeHandled, true ); } - inline void RemoveFromTaskPaneList( Window* pWindowToBeHandled ) + inline void RemoveFromTaskPaneList( vcl::Window* pWindowToBeHandled ) { HandleTaskPaneList( pWindowToBeHandled, false ); } diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 94ed20d45e3b..fa14e7dd5f1f 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -79,12 +79,12 @@ using namespace ::com::sun::star::system; class NoHelpErrorBox : public MessageDialog { public: - NoHelpErrorBox( Window* _pParent ); + NoHelpErrorBox( vcl::Window* _pParent ); virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; }; -NoHelpErrorBox::NoHelpErrorBox( Window* _pParent ) +NoHelpErrorBox::NoHelpErrorBox( vcl::Window* _pParent ) : MessageDialog(_pParent, SfxResId(RID_STR_HLPFILENOTEXIST)) { // Error message: "No help available" @@ -403,7 +403,7 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask , // create all internal windows and sub frames ... Reference< ::com::sun::star::awt::XWindow > xParentWindow = xHelpTask->getContainerWindow(); - Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow ); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow ); SfxHelpWindow_Impl* pHelpWindow = new SfxHelpWindow_Impl( xHelpTask, pParentWindow, WB_DOCKBORDER ); Reference< ::com::sun::star::awt::XWindow > xHelpWindow = VCLUnoHelper::GetInterface( pHelpWindow ); @@ -441,7 +441,7 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask , return pHelpWindow; } -OUString SfxHelp::GetHelpText( const OUString& aCommandURL, const Window* pWindow ) +OUString SfxHelp::GetHelpText( const OUString& aCommandURL, const vcl::Window* pWindow ) { OUString sModuleName = GetHelpModuleName_Impl(); OUString sHelpText = SfxHelp_Impl::GetHelpText( aCommandURL, sModuleName ); @@ -451,7 +451,7 @@ OUString SfxHelp::GetHelpText( const OUString& aCommandURL, const Window* pWindo if (pWindow && sHelpText.isEmpty()) { // no help text found -> try with parent help id. - Window* pParent = pWindow->GetParent(); + vcl::Window* pParent = pWindow->GetParent(); while ( pParent ) { aNewHelpId = pParent->GetHelpId(); @@ -498,7 +498,7 @@ bool SfxHelp::SearchKeyword( const OUString& rKeyword ) return Start_Impl( OUString(), NULL, rKeyword ); } -bool SfxHelp::Start( const OUString& rURL, const Window* pWindow ) +bool SfxHelp::Start( const OUString& rURL, const vcl::Window* pWindow ) { return Start_Impl( rURL, pWindow, OUString() ); } @@ -527,7 +527,7 @@ static bool impl_showOnlineHelp( const OUString& rURL ) return false; } -bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUString& rKeyword) +bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow, const OUString& rKeyword) { OUStringBuffer aHelpRootURL("vnd.sun.star.help://"); AppendConfigToken(aHelpRootURL, true); @@ -563,7 +563,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUSt if ( impl_hasHelpInstalled() && pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) { // no help found -> try with parent help id. - Window* pParent = pWindow->GetParent(); + vcl::Window* pParent = pWindow->GetParent(); bool bTriedTabPage = false; while ( pParent ) { @@ -590,7 +590,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUSt Dialog *pDialog = ((Dialog*)pParent); TabControl *pCtrl = pDialog->hasBuilder() ? pDialog->get<TabControl>("tabcontrol") : NULL; TabPage* pTabPage = pCtrl ? pCtrl->GetTabPage(pCtrl->GetCurPageId()) : NULL; - Window *pTabChild = pTabPage ? pTabPage->GetWindow(WINDOW_FIRSTCHILD) : NULL; + vcl::Window *pTabChild = pTabPage ? pTabPage->GetWindow(WINDOW_FIRSTCHILD) : NULL; if (pTabChild) pParent = pTabChild; } @@ -606,7 +606,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUSt if ( impl_showOnlineHelp( aHelpURL ) ) return true; - NoHelpErrorBox aErrBox( const_cast< Window* >( pWindow ) ); + NoHelpErrorBox aErrBox( const_cast< vcl::Window* >( pWindow ) ); aErrBox.Execute(); return false; } diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index b1f73b57d731..332c32b7c3bd 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -541,7 +541,7 @@ void SfxWorkWindow::Sort_Impl() // constructor for workwin of a Frame -SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( Window *pWin, SfxFrame *pFrm, SfxFrame* pMaster ) +SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( vcl::Window *pWin, SfxFrame *pFrm, SfxFrame* pMaster ) : SfxWorkWindow( pWin, pFrm->GetCurrentViewFrame()->GetBindings(), @@ -579,7 +579,7 @@ SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( Window *pWin, SfxFrame *pFrm, SfxFra // Constructor of the base class -SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pParentWorkwin ) : +SfxWorkWindow::SfxWorkWindow( vcl::Window *pWin, SfxBindings& rB, SfxWorkWindow* pParentWorkwin ) : pParent( pParentWorkwin ), pBindings(&rB), pWorkWin (pWin), @@ -964,7 +964,7 @@ bool SfxWorkWindow::PrepareClose_Impl() -SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow, +SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( vcl::Window& rWindow, SfxChildAlignment eAlign, bool bCanGetFocus ) { DBG_ASSERT( aChildren.size() < 255, "too many children" ); @@ -987,7 +987,7 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow, -void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow ) +void SfxWorkWindow::ReleaseChild_Impl( vcl::Window& rWindow ) { SfxChild_Impl *pChild = 0; @@ -1013,7 +1013,7 @@ void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow ) -SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const Window& rWindow ) const +SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const vcl::Window& rWindow ) const { SfxChild_Impl *pChild = 0; @@ -1671,7 +1671,7 @@ void SfxWorkWindow::HidePopups_Impl(bool bHide, bool bParent, sal_uInt16 nId ) SfxChildWindow *pCW = aChildWins[n]->pWin; if (pCW && pCW->GetAlignment() == SFX_ALIGN_NOALIGNMENT && pCW->GetType() != nId) { - Window *pWin = pCW->GetWindow(); + vcl::Window *pWin = pCW->GetWindow(); SfxChild_Impl *pChild = FindChild_Impl(*pWin); if (bHide) { @@ -1698,7 +1698,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild, { SfxDockingWindow* pDockWin=0; sal_uInt16 nPos = USHRT_MAX; - Window *pWin=0; + vcl::Window *pWin=0; SfxChildWin_Impl *pCW = 0; if ( eChild == SFX_CHILDWIN_OBJECTBAR ) @@ -2586,8 +2586,8 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin ) // size is just being calculated before it is displayed. SfxSplitWindow* pSplitWin = pSplit[n]; bool bDummyWindow = !pSplitWin->IsFadeIn(); - Window *pDummy = pSplitWin->GetSplitWindow(); - Window *pWin = bDummyWindow ? pDummy : pSplitWin; + vcl::Window *pDummy = pSplitWin->GetSplitWindow(); + vcl::Window *pWin = bDummyWindow ? pDummy : pSplitWin; if ( (pSplitWin->IsPinned() && !bDummyWindow) || (!pWin->IsVisible() && pActSplitWin != pSplitWin) ) continue; @@ -2731,7 +2731,7 @@ Rectangle SfxWorkWindow::GetFreeArea( bool bAutoHide ) const return aClientArea; } -void SfxWorkWindow::SetActiveChild_Impl( Window *pChild ) +void SfxWorkWindow::SetActiveChild_Impl( vcl::Window *pChild ) { pActiveChild = pChild; } diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index bbd0d20698e1..f7da5d24b08b 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1915,7 +1915,7 @@ bool SfxDispatcher::_FillState(const SfxSlotServer& rSvr, SfxItemSet& rState, return false; } -SfxPopupMenuManager* SfxDispatcher::Popup( sal_uInt16 nConfigId,Window *pWin, const Point *pPos ) +SfxPopupMenuManager* SfxDispatcher::Popup( sal_uInt16 nConfigId, vcl::Window *pWin, const Point *pPos ) { SfxDispatcher &rDisp = *SfxGetpApp()->GetDispatcher_Impl(); sal_uInt16 nShLevel = 0; @@ -1927,7 +1927,7 @@ SfxPopupMenuManager* SfxDispatcher::Popup( sal_uInt16 nConfigId,Window *pWin, co nShLevel = rDisp.pImp->aStack.size(); } - Window *pWindow = pWin ? pWin : rDisp.pImp->pFrame->GetFrame().GetWorkWindow_Impl()->GetWindow(); + vcl::Window *pWindow = pWin ? pWin : rDisp.pImp->pFrame->GetFrame().GetWorkWindow_Impl()->GetWindow(); for ( pSh = rDisp.GetShell(nShLevel); pSh; ++nShLevel, pSh = rDisp.GetShell(nShLevel) ) { const ResId& rResId = pSh->GetInterface()->GetPopupMenuResId(); @@ -1939,7 +1939,7 @@ SfxPopupMenuManager* SfxDispatcher::Popup( sal_uInt16 nConfigId,Window *pWin, co return 0; } -void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, Window *pWin, const Point *pPos ) +void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, vcl::Window *pWin, const Point *pPos ) { SfxDispatcher &rDisp = *SfxGetpApp()->GetDispatcher_Impl(); sal_uInt16 nShLevel = 0; @@ -1951,7 +1951,7 @@ void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, Window *pWin, const Poin nShLevel = rDisp.pImp->aStack.size(); } - Window *pWindow = pWin ? pWin : rDisp.pImp->pFrame->GetFrame().GetWorkWindow_Impl()->GetWindow(); + vcl::Window *pWindow = pWin ? pWin : rDisp.pImp->pFrame->GetFrame().GetWorkWindow_Impl()->GetWindow(); for ( pSh = rDisp.GetShell(nShLevel); pSh; ++nShLevel, pSh = rDisp.GetShell(nShLevel) ) { const ResId& rResId = pSh->GetInterface()->GetPopupMenuResId(); @@ -1963,9 +1963,9 @@ void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, Window *pWin, const Poin } } -void SfxDispatcher::ExecutePopup( const ResId &rId, Window *pWin, const Point *pPos ) +void SfxDispatcher::ExecutePopup( const ResId &rId, vcl::Window *pWin, const Point *pPos ) { - Window *pWindow = pWin ? pWin : pImp->pFrame->GetFrame().GetWorkWindow_Impl()->GetWindow(); + vcl::Window *pWindow = pWin ? pWin : pImp->pFrame->GetFrame().GetWorkWindow_Impl()->GetWindow(); SfxPopupMenuManager::ExecutePopup( rId, GetFrame(), pPos ? *pPos : pWindow->GetPointerPosPixel(), pWindow ); } diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index 05bb985b3298..dc5f254005f6 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -38,7 +38,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::frame; using namespace com::sun::star::beans; -RecentDocsView::RecentDocsView( Window* pParent ) +RecentDocsView::RecentDocsView( vcl::Window* pParent ) : ThumbnailView(pParent) , mnFileTypes(TYPE_NONE) , mnTextHeight(30) @@ -57,7 +57,7 @@ RecentDocsView::RecentDocsView( Window* pParent ) setItemDimensions( mnItemMaxSize, mnItemMaxSize, mnTextHeight, mnItemPadding ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRecentDocsView(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRecentDocsView(vcl::Window *pParent, VclBuilder::stringmap &) { return new RecentDocsView(pParent); } diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx index 87be587f1506..d7858a47b50a 100644 --- a/sfx2/source/control/templateabstractview.cxx +++ b/sfx2/source/control/templateabstractview.cxx @@ -125,7 +125,7 @@ bool ViewFilter_Keyword::operator ()(const ThumbnailViewItem *pItem) return pItem->maTitle.matchIgnoreAsciiCase(maKeyword); } -TemplateAbstractView::TemplateAbstractView (Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren) +TemplateAbstractView::TemplateAbstractView (vcl::Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren) : ThumbnailView(pParent,nWinStyle,bDisableTransientChildren), mnCurRegionId(0), maAllButton(this, SfxResId(BTN_ALL_TEMPLATES)), @@ -137,7 +137,7 @@ TemplateAbstractView::TemplateAbstractView (Window *pParent, WinBits nWinStyle, maFTName.Hide(); } -TemplateAbstractView::TemplateAbstractView(Window *pParent) +TemplateAbstractView::TemplateAbstractView(vcl::Window *pParent) : ThumbnailView(pParent), mnCurRegionId(0), maAllButton(this, SfxResId(BTN_ALL_TEMPLATES)), diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index 9b92a381e117..28e9be991a25 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -32,13 +32,13 @@ using namespace ::com::sun::star::frame; static void lcl_updateThumbnails (TemplateContainerItem *pItem); -TemplateLocalView::TemplateLocalView ( Window* pParent) +TemplateLocalView::TemplateLocalView ( vcl::Window* pParent) : TemplateAbstractView(pParent), mpDocTemplates(new SfxDocumentTemplates) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTemplateLocalView(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTemplateLocalView(vcl::Window *pParent, VclBuilder::stringmap &) { return new TemplateLocalView(pParent); } diff --git a/sfx2/source/control/templateremoteview.cxx b/sfx2/source/control/templateremoteview.cxx index 75b63ce78b69..0729a6bdf53c 100644 --- a/sfx2/source/control/templateremoteview.cxx +++ b/sfx2/source/control/templateremoteview.cxx @@ -44,7 +44,7 @@ enum ROW_IS_REMOVABLE }; -TemplateRemoteView::TemplateRemoteView (Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren) +TemplateRemoteView::TemplateRemoteView (vcl::Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren) : TemplateAbstractView(pParent,nWinStyle,bDisableTransientChildren) { Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); @@ -54,7 +54,7 @@ TemplateRemoteView::TemplateRemoteView (Window *pParent, WinBits nWinStyle, bool m_xCmdEnv = new ucbhelper::CommandEnvironment( xGlobalInteractionHandler, Reference< XProgressHandler >() ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTemplateRemoteView(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTemplateRemoteView(vcl::Window *pParent, VclBuilder::stringmap &) { return new TemplateRemoteView(pParent, WB_VSCROLL, false); } diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx index 887dbf23b17b..fb21ac654812 100644 --- a/sfx2/source/control/templatesearchview.cxx +++ b/sfx2/source/control/templatesearchview.cxx @@ -12,12 +12,12 @@ #include <vcl/builder.hxx> -TemplateSearchView::TemplateSearchView (Window *pParent, WinBits nWinStyle) +TemplateSearchView::TemplateSearchView (vcl::Window *pParent, WinBits nWinStyle) : ThumbnailView(pParent,nWinStyle) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTemplateSearchView(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTemplateSearchView(vcl::Window *pParent, VclBuilder::stringmap &) { return new TemplateSearchView(pParent); } diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 8c0bbee9bc33..9bf3df12864f 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -56,7 +56,7 @@ enum SCROLL_OFFSET = 4 }; -ThumbnailView::ThumbnailView (Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren) +ThumbnailView::ThumbnailView (vcl::Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren) : Control( pParent, nWinStyle ) { ImplInit(); diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index 60581cbc8888..28de61f3e989 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -156,7 +156,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAcces { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - Window* pParent = mpParent->GetParent(); + vcl::Window* pParent = mpParent->GetParent(); uno::Reference< accessibility::XAccessible > xRet; if( pParent ) @@ -170,7 +170,7 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getAccessibleIndexInParent() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - Window* pParent = mpParent->GetParent(); + vcl::Window* pParent = mpParent->GetParent(); sal_Int32 nRet = 0; if( pParent ) @@ -221,7 +221,7 @@ OUString SAL_CALL ThumbnailViewAcc::getAccessibleName() aRet = mpParent->GetAccessibleName(); if (aRet.isEmpty()) { - Window* pLabel = mpParent->GetAccessibleRelationLabeledBy(); + vcl::Window* pLabel = mpParent->GetAccessibleRelationLabeledBy(); if (pLabel && pLabel != mpParent) aRet = OutputDevice::GetNonMnemonicString( pLabel->GetText() ); } diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index b2e44621a527..ae4fea2dba1e 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -52,7 +52,7 @@ class ResizableMultiLineEdit : public VclMultiLineEdit bool mbIsInGrabFocus; public: - ResizableMultiLineEdit (Window* pParent, ThumbnailViewItem* pItem); + ResizableMultiLineEdit (vcl::Window* pParent, ThumbnailViewItem* pItem); virtual ~ResizableMultiLineEdit (); void SetInGrabFocus(bool bInGrabFocus) { mbIsInGrabFocus = bInGrabFocus; } @@ -61,7 +61,7 @@ class ResizableMultiLineEdit : public VclMultiLineEdit virtual void Modify() SAL_OVERRIDE; }; -ResizableMultiLineEdit::ResizableMultiLineEdit (Window* pParent, ThumbnailViewItem* pItem) : +ResizableMultiLineEdit::ResizableMultiLineEdit (vcl::Window* pParent, ThumbnailViewItem* pItem) : VclMultiLineEdit (pParent, WB_CENTER | WB_BORDER), mpItem(pItem), mbIsInGrabFocus(false) diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx index ab6a923a13cd..d1dc6ea1c136 100644 --- a/sfx2/source/dialog/alienwarn.cxx +++ b/sfx2/source/dialog/alienwarn.cxx @@ -25,7 +25,7 @@ #include <vcl/msgbox.hxx> #include "alienwarn.hxx" -SfxAlienWarningDialog::SfxAlienWarningDialog(Window* pParent, const OUString& _rFormatName) +SfxAlienWarningDialog::SfxAlienWarningDialog(vcl::Window* pParent, const OUString& _rFormatName) : MessageDialog(pParent, "AlienWarnDialog", "sfx/ui/alienwarndialog.ui") { get(m_pWarningOnBox, "ask"); diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index 4a3d45ff90c0..8f5f7d712c7c 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -403,7 +403,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f // initialize the component and its parent window css::uno::Reference< css::awt::XWindow > xParentWindow = xFrame->getContainerWindow(); WorkWindow* pParent = (WorkWindow*)VCLUnoHelper::GetWindow(xParentWindow); - Window* pWindow = VCLUnoHelper::GetWindow(m_xWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(m_xWindow); // disable full screen mode of the frame! if (pParent && pParent->IsFullScreenMode()) @@ -438,7 +438,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f if( pParent && pBack ) { long nMenuHeight = 0; - Window* pMenu = pParent->GetWindow(WINDOW_NEXT); + vcl::Window* pMenu = pParent->GetWindow(WINDOW_NEXT); if( pMenu ) nMenuHeight = pMenu->GetSizePixel().Height(); @@ -717,8 +717,8 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno } // create the component window - Window* pParent = VCLUnoHelper::GetWindow(xParentWindow); - Window* pWindow = new BackingWindow(pParent); + vcl::Window* pParent = VCLUnoHelper::GetWindow(xParentWindow); + vcl::Window* pWindow = new BackingWindow(pParent); m_xWindow = VCLUnoHelper::GetInterface(pWindow); if (!m_xWindow.is()) @@ -791,7 +791,7 @@ void SAL_CALL BackingComp::dispatch( const css::util::URL& aURL, const css::uno: // vnd.org.libreoffice.recentdocs:ClearRecentFileList - clear recent files if ( aURL.Path == "ClearRecentFileList" ) { - Window* pWindow = VCLUnoHelper::GetWindow(m_xWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(m_xWindow); BackingWindow* pBack = dynamic_cast<BackingWindow*>(pWindow ); if( pBack ) { diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 584b1b387ea2..39061f5bc384 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -87,7 +87,7 @@ static bool cmpSelectionItems (const ThumbnailViewItem *pItem1, const ThumbnailV } -BackingWindow::BackingWindow( Window* i_pParent ) : +BackingWindow::BackingWindow( vcl::Window* i_pParent ) : Window( i_pParent ), mxDesktop( Desktop::create(comphelper::getProcessComponentContext()) ), mbInitControls( false ), @@ -193,10 +193,10 @@ BackingWindow::~BackingWindow() // deregister drag&drop helper if (mxDropTargetListener.is()) { - for (std::vector<Window*>::iterator aI = maDndWindows.begin(), + for (std::vector<vcl::Window*>::iterator aI = maDndWindows.begin(), aEnd = maDndWindows.end(); aI != aEnd; ++aI) { - Window *pDndWin = *aI; + vcl::Window *pDndWin = *aI; css::uno::Reference< css::datatransfer::dnd::XDropTarget > xDropTarget = pDndWin->GetDropTarget(); if (xDropTarget.is()) @@ -453,10 +453,10 @@ void BackingWindow::setOwningFrame( const com::sun::star::uno::Reference< com::s // establish drag&drop mode mxDropTargetListener.set(new OpenFileDropTargetListener(mxContext, mxFrame)); - for (std::vector<Window*>::iterator aI = maDndWindows.begin(), + for (std::vector<vcl::Window*>::iterator aI = maDndWindows.begin(), aEnd = maDndWindows.end(); aI != aEnd; ++aI) { - Window *pDndWin = *aI; + vcl::Window *pDndWin = *aI; css::uno::Reference< css::datatransfer::dnd::XDropTarget > xDropTarget = pDndWin->GetDropTarget(); if (xDropTarget.is()) diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index e4f7a39479b6..15df736c9fb9 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -49,7 +49,7 @@ class ToolBox; class BackingWindow - : public Window + : public vcl::Window , public VclBuilderContainer { typedef bool (*selection_cmp_fn)(const ThumbnailViewItem*,const ThumbnailViewItem*); @@ -88,7 +88,7 @@ class BackingWindow TemplateLocalView* mpLocalView; TemplateAbstractView* mpCurrentView; - std::vector<Window*> maDndWindows; + std::vector<vcl::Window*> maDndWindows; Rectangle maStartCentButtons; @@ -120,7 +120,7 @@ class BackingWindow void initControls(); public: - BackingWindow( Window* pParent ); + BackingWindow( vcl::Window* pParent ); virtual ~BackingWindow(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 9bb8497cb81d..f3d4a3d5a86e 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -153,7 +153,7 @@ void SfxModalDialog::init() GetDialogData_Impl(); } -SfxModalDialog::SfxModalDialog(Window *pParent, const OString& rID, const OUString& rUIXMLDescription ) +SfxModalDialog::SfxModalDialog(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription ) : ModalDialog(pParent, rID, rUIXMLDescription), nUniqId(0), //todo: remove this member when the ResId using ctor is removed pInputSet(0), @@ -303,7 +303,7 @@ IMPL_LINK_NOARG(SfxModelessDialog, TimerHdl) } SfxModelessDialog::SfxModelessDialog(SfxBindings* pBindinx, - SfxChildWindow *pCW, Window *pParent, const OString& rID, + SfxChildWindow *pCW, vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription) : ModelessDialog(pParent, rID, rUIXMLDescription) { @@ -447,7 +447,7 @@ bool SfxFloatingWindow::Notify( NotifyEvent& rEvt ) SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* pParent, WinBits nWinBits) : + vcl::Window* pParent, WinBits nWinBits) : FloatingWindow (pParent, nWinBits), pBindings(pBindinx), pImp( new SfxFloatingWindow_Impl ) @@ -464,7 +464,7 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) : FloatingWindow(pParent, rID, rUIXMLDescription, rFrame), pBindings(pBindinx), @@ -674,7 +674,7 @@ IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl) -SfxSingleTabDialog::SfxSingleTabDialog(Window *pParent, const SfxItemSet& rSet, +SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet& rSet, const OString& rID, const OUString& rUIXMLDescription) : SfxModalDialog(pParent, rID, rUIXMLDescription) , fnGetRanges(NULL) @@ -687,7 +687,7 @@ SfxSingleTabDialog::SfxSingleTabDialog(Window *pParent, const SfxItemSet& rSet, SetInputSet( &rSet ); } -SfxSingleTabDialog::SfxSingleTabDialog(Window* pParent, const SfxItemSet* pInSet, +SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window* pParent, const SfxItemSet* pInSet, const OString& rID, const OUString& rUIXMLDescription) : SfxModalDialog(pParent, rID, rUIXMLDescription) , fnGetRanges(NULL) diff --git a/sfx2/source/dialog/checkin.cxx b/sfx2/source/dialog/checkin.cxx index cbe1c620eaec..61d963ef8a5e 100644 --- a/sfx2/source/dialog/checkin.cxx +++ b/sfx2/source/dialog/checkin.cxx @@ -10,7 +10,7 @@ #include <sfx2/checkin.hxx> #include <vcl/msgbox.hxx> -SfxCheckinDialog::SfxCheckinDialog( Window* pParent ) : +SfxCheckinDialog::SfxCheckinDialog( vcl::Window* pParent ) : ModalDialog( pParent, "CheckinDialog", "sfx/ui/checkin.ui" ) { get( m_pCommentED, "VersionComment" ); diff --git a/sfx2/source/dialog/dialoghelper.cxx b/sfx2/source/dialog/dialoghelper.cxx index 3ee59daac68e..8221d3af3866 100644 --- a/sfx2/source/dialog/dialoghelper.cxx +++ b/sfx2/source/dialog/dialoghelper.cxx @@ -18,23 +18,23 @@ //right, get both of their non-preview areas to request the same size //so that the preview appears in the same place in each one so //flipping between tabs isn't distracting as it jumps around -void setPreviewsToSamePlace(Window *pParent, VclBuilderContainer *pPage) +void setPreviewsToSamePlace(vcl::Window *pParent, VclBuilderContainer *pPage) { - Window *pOurGrid = pPage->get<Window>("maingrid"); + vcl::Window *pOurGrid = pPage->get<vcl::Window>("maingrid"); if (!pOurGrid) return; - std::vector<Window*> aGrids; + std::vector<vcl::Window*> aGrids; aGrids.push_back(pOurGrid); - for (Window* pChild = pParent->GetWindow(WINDOW_FIRSTCHILD); pChild; + for (vcl::Window* pChild = pParent->GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) { VclBuilderContainer *pPeer = dynamic_cast<VclBuilderContainer*>(pChild); if (!pPeer || pPeer == pPage || !pPeer->hasBuilder()) continue; - Window *pOtherGrid = pPeer->get<Window>("maingrid"); + vcl::Window *pOtherGrid = pPeer->get<vcl::Window>("maingrid"); if (!pOtherGrid) continue; @@ -44,36 +44,36 @@ void setPreviewsToSamePlace(Window *pParent, VclBuilderContainer *pPage) if (aGrids.size() > 1) { boost::shared_ptr< VclSizeGroup > xGroup(new VclSizeGroup); - for (std::vector<Window*>::iterator aI = aGrids.begin(); aI != aGrids.end(); ++aI) + for (std::vector<vcl::Window*>::iterator aI = aGrids.begin(); aI != aGrids.end(); ++aI) { - Window *pWindow = *aI; + vcl::Window *pWindow = *aI; pWindow->remove_from_all_size_groups(); pWindow->add_to_size_group(xGroup); } } } -Size getParagraphPreviewOptimalSize(const Window *pReference) +Size getParagraphPreviewOptimalSize(const vcl::Window *pReference) { return pReference->LogicToPixel(Size(68 , 112), MAP_APPFONT); } -Size getDrawPreviewOptimalSize(const Window *pReference) +Size getDrawPreviewOptimalSize(const vcl::Window *pReference) { return pReference->LogicToPixel(Size(88, 42), MAP_APPFONT); } -Size getDrawListBoxOptimalSize(const Window *pReference) +Size getDrawListBoxOptimalSize(const vcl::Window *pReference) { return pReference->LogicToPixel(Size(88, 110), MAP_APPFONT); } -Size SFX2_DLLPUBLIC getPreviewStripSize(const Window *pReference) +Size SFX2_DLLPUBLIC getPreviewStripSize(const vcl::Window *pReference) { return pReference->LogicToPixel(Size(70 , 40), MapMode(MAP_APPFONT)); } -Size SFX2_DLLPUBLIC getPreviewOptionsSize(const Window *pReference) +Size SFX2_DLLPUBLIC getPreviewOptionsSize(const vcl::Window *pReference) { return pReference->LogicToPixel(Size(70 , 27), MapMode(MAP_APPFONT)); } diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 561f5ce1bd0c..c1d220eb7a4b 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -615,7 +615,7 @@ bool SfxDocumentInfoItem::PutValue( const Any& rVal, sal_uInt8 nMemberId ) return bRet; } -SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet& rItemSet ) +SfxDocumentDescPage::SfxDocumentDescPage( vcl::Window * pParent, const SfxItemSet& rItemSet ) : SfxTabPage(pParent, "DescriptionInfoPage", "sfx/ui/descriptioninfopage.ui", &rItemSet) , m_pInfoItem ( NULL ) @@ -628,7 +628,7 @@ SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet& rI m_pCommentEd->set_height_request(m_pCommentEd->GetTextHeight() * 16); } -SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet *rItemSet) +SfxTabPage *SfxDocumentDescPage::Create(vcl::Window *pParent, const SfxItemSet *rItemSet) { return new SfxDocumentDescPage(pParent, *rItemSet); } @@ -746,7 +746,7 @@ namespace } } -SfxDocumentPage::SfxDocumentPage(Window* pParent, const SfxItemSet& rItemSet) +SfxDocumentPage::SfxDocumentPage(vcl::Window* pParent, const SfxItemSet& rItemSet) : SfxTabPage(pParent, "DocumentInfoPage", "sfx/ui/documentinfopage.ui", &rItemSet) , bEnableUseUserData( false ) , bHandleDelete( false ) @@ -909,7 +909,7 @@ void SfxDocumentPage::ImplCheckPasswordState() -SfxTabPage* SfxDocumentPage::Create( Window* pParent, const SfxItemSet* rItemSet ) +SfxTabPage* SfxDocumentPage::Create( vcl::Window* pParent, const SfxItemSet* rItemSet ) { return new SfxDocumentPage( pParent, *rItemSet ); } @@ -1156,7 +1156,7 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet ) } -SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent, +SfxDocumentInfoDialog::SfxDocumentInfoDialog( vcl::Window* pParent, const SfxItemSet& rItemSet ) : SfxTabDialog(0, pParent, "DocumentPropertiesDialog", "sfx/ui/documentpropertiesdialog.ui", &rItemSet) @@ -1224,7 +1224,7 @@ void SfxDocumentInfoDialog::AddFontTabPage() // class CustomPropertiesYesNoButton ------------------------------------- -CustomPropertiesYesNoButton::CustomPropertiesYesNoButton( Window* pParent, const ResId& rResId ) : +CustomPropertiesYesNoButton::CustomPropertiesYesNoButton( vcl::Window* pParent, const ResId& rResId ) : Control( pParent, rResId ), m_aYesButton( this, ResId( RB_PROPERTY_YES, *rResId.GetResMgr() ) ), m_aNoButton ( this, ResId( RB_PROPERTY_NO, *rResId.GetResMgr() ) ) @@ -1251,12 +1251,12 @@ class DurationDialog_Impl : public ModalDialog public: - DurationDialog_Impl( Window* pParent, const util::Duration& rDuration ); + DurationDialog_Impl( vcl::Window* pParent, const util::Duration& rDuration ); util::Duration GetDuration() const; }; -DurationDialog_Impl::DurationDialog_Impl(Window* pParent, +DurationDialog_Impl::DurationDialog_Impl(vcl::Window* pParent, const util::Duration& rDuration) : ModalDialog(pParent, "EditDurationDialog", "sfx/ui/editdurationdialog.ui") @@ -1294,7 +1294,7 @@ util::Duration DurationDialog_Impl::GetDuration() const return aRet; } -CustomPropertiesDurationField::CustomPropertiesDurationField( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : +CustomPropertiesDurationField::CustomPropertiesDurationField( vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : Edit( pParent, rResId ), m_pLine( pLine ) { @@ -1333,7 +1333,7 @@ void CustomPropertiesDurationField::SetDuration( const util::Duration& rDuration SetText( sText ); } -CustomPropertiesEditButton::CustomPropertiesEditButton( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : +CustomPropertiesEditButton::CustomPropertiesEditButton( vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : PushButton( pParent, rResId ), m_pLine( pLine ) { SetClickHdl( LINK( this, CustomPropertiesEditButton, ClickHdl )); @@ -1366,7 +1366,7 @@ void CustomPropertiesYesNoButton::Resize() } // struct CustomPropertyLine --------------------------------------------- -CustomPropertyLine::CustomPropertyLine( Window* pParent ) : +CustomPropertyLine::CustomPropertyLine( vcl::Window* pParent ) : m_aNameBox ( pParent, SfxResId( SFX_CB_PROPERTY_NAME ) ), m_aTypeBox ( pParent, SfxResId( SFX_LB_PROPERTY_TYPE ), this ), m_aValueEdit ( pParent, SfxResId( SFX_ED_PROPERTY_VALUE ), this ), @@ -1403,7 +1403,7 @@ void CustomPropertyLine::SetRemoved() m_aRemoveButton.Hide(); } -CustomPropertiesWindow::CustomPropertiesWindow(Window* pParent, +CustomPropertiesWindow::CustomPropertiesWindow(vcl::Window* pParent, FixedText *pHeaderAccName, FixedText *pHeaderAccType, FixedText *pHeaderAccValue) : @@ -1504,11 +1504,11 @@ IMPL_LINK( CustomPropertiesWindow, RemoveHdl, CustomPropertiesRemoveButton*, pBu if ( pLine->m_bIsRemoved ) continue; - Window* pWindows[] = { &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit, + vcl::Window* pWindows[] = { &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit, &pLine->m_aDateField, &pLine->m_aTimeField, &pLine->m_aDurationField, &pLine->m_aEditButton, &pLine->m_aYesNoButton, &pLine->m_aRemoveButton, NULL }; - Window** pCurrent = pWindows; + vcl::Window** pCurrent = pWindows; while ( *pCurrent ) { Point aPos = (*pCurrent)->GetPosPixel(); @@ -1600,7 +1600,7 @@ void CustomPropertiesWindow::ValidateLine( CustomPropertyLine* pLine, bool bIsFr { if ( bIsFromTypeBox ) // LoseFocus of TypeBox pLine->m_bTypeLostFocus = true; - Window* pParent = GetParent()->GetParent(); + vcl::Window* pParent = GetParent()->GetParent(); if (MessageDialog(pParent, SfxResId(STR_SFX_QUERY_WRONG_TYPE), VCL_MESSAGE_QUESTION, VCL_BUTTONS_OK_CANCEL).Execute() == RET_OK) pLine->m_aTypeBox.SelectEntryPos( m_aTypeBox.GetEntryPos( (void*)CUSTOM_TYPE_TEXT ) ); else @@ -1626,8 +1626,8 @@ bool CustomPropertiesWindow::InitControls( HeaderBar* pHeaderBar, const ScrollBa pHeaderBar->SetItemSize( HI_VALUE, nItemWidth ); pHeaderBar->SetItemSize( HI_ACTION, nButtonWidth ); - Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, &m_aRemoveButton, NULL }; - Window** pCurrent = pWindows; + vcl::Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, &m_aRemoveButton, NULL }; + vcl::Window** pCurrent = pWindows; sal_uInt16 nPos = 0; while ( *pCurrent ) { @@ -1688,7 +1688,7 @@ sal_uInt16 CustomPropertiesWindow::GetVisibleLineCount() const void CustomPropertiesWindow::updateLineWidth() { - Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, + vcl::Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, &m_aDateField, &m_aTimeField, &m_aDurationField, &m_aEditButton, &m_aYesNoButton, &m_aRemoveButton, NULL }; @@ -1699,14 +1699,14 @@ void CustomPropertiesWindow::updateLineWidth() { CustomPropertyLine* pNewLine = *aI; - Window* pNewWindows[] = + vcl::Window* pNewWindows[] = { &pNewLine->m_aNameBox, &pNewLine->m_aTypeBox, &pNewLine->m_aValueEdit, &pNewLine->m_aDateField, &pNewLine->m_aTimeField, &pNewLine->m_aDurationField, &pNewLine->m_aEditButton, &pNewLine->m_aYesNoButton, &pNewLine->m_aRemoveButton, NULL }; - Window** pCurrent = pWindows; - Window** pNewCurrent = pNewWindows; + vcl::Window** pCurrent = pWindows; + vcl::Window** pNewCurrent = pNewWindows; while ( *pCurrent ) { Size aSize = (*pCurrent)->GetSizePixel(); @@ -1742,17 +1742,17 @@ void CustomPropertiesWindow::AddLine( const OUString& sName, Any& rAny ) sal_Int32 nPos = GetVisibleLineCount() * GetLineHeight(); m_aCustomPropertiesLines.push_back( pNewLine ); - Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, + vcl::Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, &m_aDateField, &m_aTimeField, &m_aDurationField, &m_aEditButton, &m_aYesNoButton, &m_aRemoveButton, NULL }; - Window* pNewWindows[] = + vcl::Window* pNewWindows[] = { &pNewLine->m_aNameBox, &pNewLine->m_aTypeBox, &pNewLine->m_aValueEdit, &pNewLine->m_aDateField, &pNewLine->m_aTimeField, &pNewLine->m_aDurationField, &pNewLine->m_aEditButton, &pNewLine->m_aYesNoButton, &pNewLine->m_aRemoveButton, NULL }; - Window** pCurrent = pWindows; - Window** pNewCurrent = pNewWindows; + vcl::Window** pCurrent = pWindows; + vcl::Window** pNewCurrent = pNewWindows; while ( *pCurrent ) { Size aSize = (*pCurrent)->GetSizePixel(); @@ -1890,9 +1890,9 @@ void CustomPropertiesWindow::DoScroll( sal_Int32 nNewPos ) if ( pLine->m_bIsRemoved ) continue; - Window* pWindows[] = { &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit, &pLine->m_aDateField, &pLine->m_aTimeField, + vcl::Window* pWindows[] = { &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit, &pLine->m_aDateField, &pLine->m_aTimeField, &pLine->m_aDurationField, &pLine->m_aEditButton, &pLine->m_aYesNoButton, &pLine->m_aRemoveButton, NULL }; - Window** pCurrent = pWindows; + vcl::Window** pCurrent = pWindows; while ( *pCurrent ) { Point aPos = (*pCurrent)->GetPosPixel(); @@ -1984,7 +1984,7 @@ Sequence< beans::PropertyValue > CustomPropertiesWindow::GetCustomProperties() c return aPropertiesSeq; } -CustomPropertiesControl::CustomPropertiesControl(Window* pParent) +CustomPropertiesControl::CustomPropertiesControl(vcl::Window* pParent) : VclVBox(pParent) , m_pHeaderBar(NULL) , m_pBody(NULL) @@ -2063,7 +2063,7 @@ void CustomPropertiesControl::setAllocation(const Size &rAllocation) } } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCustomPropertiesControl(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCustomPropertiesControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new CustomPropertiesControl(pParent); @@ -2105,7 +2105,7 @@ void CustomPropertiesControl::AddLine( const OUString& sName, Any& rAny, bool bI } // class SfxCustomPropertiesPage ----------------------------------------- -SfxCustomPropertiesPage::SfxCustomPropertiesPage( Window* pParent, const SfxItemSet& rItemSet ) +SfxCustomPropertiesPage::SfxCustomPropertiesPage( vcl::Window* pParent, const SfxItemSet& rItemSet ) : SfxTabPage(pParent, "CustomInfoPage", "sfx/ui/custominfopage.ui", &rItemSet) { get(m_pPropertiesCtrl, "properties"); @@ -2190,12 +2190,12 @@ int SfxCustomPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) return nRet; } -SfxTabPage* SfxCustomPropertiesPage::Create( Window* pParent, const SfxItemSet* rItemSet ) +SfxTabPage* SfxCustomPropertiesPage::Create( vcl::Window* pParent, const SfxItemSet* rItemSet ) { return new SfxCustomPropertiesPage( pParent, *rItemSet ); } -CmisValue::CmisValue( Window* pParent, const OUString& aStr ) +CmisValue::CmisValue( vcl::Window* pParent, const OUString& aStr ) { m_pUIBuilder = new VclBuilder( pParent, getUIRootDir(), "sfx/ui/cmisline.ui"); get( m_aValueEdit, "value"); @@ -2203,7 +2203,7 @@ CmisValue::CmisValue( Window* pParent, const OUString& aStr ) m_aValueEdit->SetText( aStr ); } -CmisDateTime::CmisDateTime( Window* pParent, const util::DateTime& aDateTime ) +CmisDateTime::CmisDateTime( vcl::Window* pParent, const util::DateTime& aDateTime ) { m_pUIBuilder = new VclBuilder( pParent, getUIRootDir(), "sfx/ui/cmisline.ui"); get( m_aDateField, "date"); @@ -2215,7 +2215,7 @@ CmisDateTime::CmisDateTime( Window* pParent, const util::DateTime& aDateTime ) aDateTime.Seconds, aDateTime.NanoSeconds ) ); } -CmisYesNo::CmisYesNo( Window* pParent, bool bValue ) +CmisYesNo::CmisYesNo( vcl::Window* pParent, bool bValue ) { m_pUIBuilder = new VclBuilder( pParent, getUIRootDir(), "sfx/ui/cmisline.ui"); get( m_aYesButton, "yes"); @@ -2229,7 +2229,7 @@ CmisYesNo::CmisYesNo( Window* pParent, bool bValue ) } // struct CmisPropertyLine --------------------------------------------- -CmisPropertyLine::CmisPropertyLine(Window* pParent) +CmisPropertyLine::CmisPropertyLine(vcl::Window* pParent) : m_sType(CMIS_TYPE_STRING) , m_bUpdatable(false) , m_bRequired(false) @@ -2587,7 +2587,7 @@ void CmisPropertiesControl::AddLine( const OUString& sId, const OUString& sName, } // class SfxCmisPropertiesPage ----------------------------------------- -SfxCmisPropertiesPage::SfxCmisPropertiesPage( Window* pParent, const SfxItemSet& rItemSet ) +SfxCmisPropertiesPage::SfxCmisPropertiesPage( vcl::Window* pParent, const SfxItemSet& rItemSet ) : SfxTabPage(pParent, "CmisInfoPage", "sfx/ui/cmisinfopage.ui", &rItemSet) , m_pPropertiesCtrl( this ) { @@ -2687,7 +2687,7 @@ int SfxCmisPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) return LEAVE_PAGE; } -SfxTabPage* SfxCmisPropertiesPage::Create( Window* pParent, const SfxItemSet* rItemSet ) +SfxTabPage* SfxCmisPropertiesPage::Create( vcl::Window* pParent, const SfxItemSet* rItemSet ) { return new SfxCmisPropertiesPage( pParent, *rItemSet ); } diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 529096832518..f4a1293164a2 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -61,18 +61,18 @@ static const int NUM_OF_DOCKINGWINDOWS = 10; class SfxTitleDockingWindow : public SfxDockingWindow { - Window* m_pWrappedWindow; + vcl::Window* m_pWrappedWindow; public: SfxTitleDockingWindow( SfxBindings* pBindings , SfxChildWindow* pChildWin , - Window* pParent , + vcl::Window* pParent , WinBits nBits); virtual ~SfxTitleDockingWindow(); - Window* GetWrappedWindow() const { return m_pWrappedWindow; } - void SetWrappedWindow(Window* const pWindow); + vcl::Window* GetWrappedWindow() const { return m_pWrappedWindow; } + void SetWrappedWindow(vcl::Window* const pWindow); virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -119,7 +119,7 @@ static bool lcl_getWindowState( const uno::Reference< container::XNameAccess >& return bResult; } -SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , +SfxDockingWrapper::SfxDockingWrapper( vcl::Window* pParentWnd , sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ) @@ -199,7 +199,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , { } - Window* pContentWindow = VCLUnoHelper::GetWindow(xWindow); + vcl::Window* pContentWindow = VCLUnoHelper::GetWindow(xWindow); if ( pContentWindow ) pContentWindow->SetStyle( pContentWindow->GetStyle() | WB_DIALOGCONTROL | WB_CHILDDLGCTRL ); pTitleDockWindow->SetWrappedWindow(pContentWindow); @@ -211,7 +211,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , } SfxChildWindow* SfxDockingWrapper::CreateImpl( -Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo ) +vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo ) { SfxChildWindow *pWin = new SfxDockingWrapper(pParent, nId, pBindings, pInfo); return pWin; @@ -239,7 +239,7 @@ SfxChildWinInfo SfxDockingWrapper::GetInfo() const SfxTitleDockingWindow::SfxTitleDockingWindow( SfxBindings* pBind , SfxChildWindow* pChildWin , - Window* pParent , + vcl::Window* pParent , WinBits nBits ) : SfxDockingWindow( pBind , pChildWin , @@ -254,7 +254,7 @@ SfxTitleDockingWindow::~SfxTitleDockingWindow() delete m_pWrappedWindow; } -void SfxTitleDockingWindow::SetWrappedWindow( Window* const pWindow ) +void SfxTitleDockingWindow::SetWrappedWindow( vcl::Window* const pWindow ) { m_pWrappedWindow = pWindow; if (m_pWrappedWindow) @@ -274,7 +274,7 @@ void SfxTitleDockingWindow::StateChanged( StateChangedType nType ) { if ( nType == STATE_CHANGE_INITSHOW ) { - Window* pWindow = GetWrappedWindow(); + vcl::Window* pWindow = GetWrappedWindow(); if ( pWindow ) { pWindow->SetSizePixel( GetOutputSizePixel() ); @@ -844,7 +844,7 @@ void SfxDockingWindow::Resizing( Size& /*rSize*/ ) SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* pParent, WinBits nWinBits) : + vcl::Window* pParent, WinBits nWinBits) : DockingWindow (pParent, nWinBits), pBindings(pBindinx), pMgr(pCW), @@ -895,7 +895,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* pParent, const ResId& rResId) : + vcl::Window* pParent, const ResId& rResId) : DockingWindow(pParent, rResId), pBindings(pBindinx), pMgr(pCW), @@ -1147,7 +1147,7 @@ void SfxDockingWindow::Initialize_Impl() if ( !bSet) { SfxViewFrame *pFrame = pBindings->GetDispatcher_Impl()->GetFrame(); - Window* pEditWin = pFrame->GetViewShell()->GetWindow(); + vcl::Window* pEditWin = pFrame->GetViewShell()->GetWindow(); Point aPos = pEditWin->OutputToScreenPixel( pEditWin->GetPosPixel() ); aPos = GetParent()->ScreenToOutputPixel( aPos ); SetFloatingPos( aPos ); diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx index 69b4fd4d9ec6..c942fd25c059 100644 --- a/sfx2/source/dialog/documentfontsdialog.cxx +++ b/sfx2/source/dialog/documentfontsdialog.cxx @@ -23,12 +23,12 @@ using namespace ::com::sun::star; -SfxTabPage* SfxDocumentFontsPage::Create( Window* parent, const SfxItemSet* set ) +SfxTabPage* SfxDocumentFontsPage::Create( vcl::Window* parent, const SfxItemSet* set ) { return new SfxDocumentFontsPage( parent, *set ); } -SfxDocumentFontsPage::SfxDocumentFontsPage( Window* parent, const SfxItemSet& set ) +SfxDocumentFontsPage::SfxDocumentFontsPage( vcl::Window* parent, const SfxItemSet& set ) : SfxTabPage( parent, "DocumentFontsPage", "sfx/ui/documentfontspage.ui", &set ) { get( embedFontsCheckbox, "embedFonts" ); diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 4051b1527228..f3793a1f5322 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -853,7 +853,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( sal_Int16 nDialogType, sal_Int64 nFlags, sal_Int16 nDialog, - Window* _pPreferredParentWindow, + vcl::Window* _pPreferredParentWindow, const OUString& sStandardDir, const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) @@ -2246,7 +2246,7 @@ FileDialogHelper::FileDialogHelper( FileDialogHelper::FileDialogHelper( sal_Int16 nDialogType, sal_Int64 nFlags, - Window* _pPreferredParent ) + vcl::Window* _pPreferredParent ) : m_nError(0) { mpImp = new FileDialogHelper_Impl( this, nDialogType, nFlags, SFX2_IMPL_DIALOG_CONFIG, _pPreferredParent ); @@ -2260,7 +2260,7 @@ FileDialogHelper::FileDialogHelper( const OUString& aExtName, const OUString& rStandardDir, const ::com::sun::star::uno::Sequence< OUString >& rBlackList, - Window* _pPreferredParent ) + vcl::Window* _pPreferredParent ) : m_nError(0) { mpImp = new FileDialogHelper_Impl( this, nDialogType, nFlags, SFX2_IMPL_DIALOG_CONFIG, _pPreferredParent,rStandardDir, rBlackList ); diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 21e3a30912f9..4d663d2e15d2 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -54,7 +54,7 @@ namespace sfx2 SfxFilterMatcher* mpMatcher; GraphicFilter* mpGraphicFilter; FileDialogHelper* mpAntiImpl; - Window* mpPreferredParentWindow; + vcl::Window* mpPreferredParentWindow; ::comphelper::SequenceAsVector< OUString > mlLastURLs; @@ -180,7 +180,7 @@ namespace sfx2 const short nDialogType, sal_Int64 nFlags, sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG, - Window* _pPreferredParentWindow = NULL, + vcl::Window* _pPreferredParentWindow = NULL, const OUString& sStandardDir = OUString(), const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >() ); diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index 928ee164dcd0..b6baf00e0452 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -28,7 +28,7 @@ namespace class SfxCloseButton : public PushButton { public: - SfxCloseButton( Window* pParent ) : PushButton( pParent, 0 ) + SfxCloseButton( vcl::Window* pParent ) : PushButton( pParent, 0 ) { } @@ -95,7 +95,7 @@ namespace } } -SfxInfoBarWindow::SfxInfoBarWindow( Window* pParent, const OUString& sId, +SfxInfoBarWindow::SfxInfoBarWindow( vcl::Window* pParent, const OUString& sId, const OUString& sMessage, vector< PushButton* > aButtons ) : Window( pParent, 0 ), m_sId( sId ), @@ -317,7 +317,7 @@ void SfxInfoBarContainerWindow::Resize( ) SFX_IMPL_POS_CHILDWINDOW_WITHID( SfxInfoBarContainerChild, SID_INFOBARCONTAINER, SFX_OBJECTBAR_OBJECT ); -SfxInfoBarContainerChild::SfxInfoBarContainerChild( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* ) : +SfxInfoBarContainerChild::SfxInfoBarContainerChild( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* ) : SfxChildWindow( _pParent, nId ), m_pBindings( pBindings ) { diff --git a/sfx2/source/dialog/inputdlg.cxx b/sfx2/source/dialog/inputdlg.cxx index d46c9ae5265b..6f1ab9288205 100644 --- a/sfx2/source/dialog/inputdlg.cxx +++ b/sfx2/source/dialog/inputdlg.cxx @@ -14,7 +14,7 @@ #include <vcl/edit.hxx> #include <vcl/fixed.hxx> -InputDialog::InputDialog(const OUString &rLabelText, Window *pParent) +InputDialog::InputDialog(const OUString &rLabelText, vcl::Window *pParent) : ModalDialog(pParent, "InputDialog", "sfx/ui/inputdialog.ui") { get(m_pEntry, "entry"); diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx index de97fa5246dc..595e1b481277 100644 --- a/sfx2/source/dialog/itemconnect.cxx +++ b/sfx2/source/dialog/itemconnect.cxx @@ -82,7 +82,7 @@ ControlWrapperBase::~ControlWrapperBase() // Single control wrappers -DummyWindowWrapper::DummyWindowWrapper( Window& rWindow ) : +DummyWindowWrapper::DummyWindowWrapper( vcl::Window& rWindow ) : SingleControlWrapperType( rWindow ) { } @@ -258,7 +258,7 @@ TriState ItemConnectionBase::GetShowState( bool bKnown ) const // Standard connections -DummyItemConnection::DummyItemConnection( sal_uInt16 nSlot, Window& rWindow, ItemConnFlags nFlags ) : +DummyItemConnection::DummyItemConnection( sal_uInt16 nSlot, vcl::Window& rWindow, ItemConnFlags nFlags ) : ItemConnectionBase( nFlags ), DummyWindowWrapper( rWindow ), mnSlot( nSlot ) diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index ea30e59c557e..6a4b9397d0f5 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -858,7 +858,7 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css: css::uno::Reference< css::awt::XWindow > xParentWindow = xFrame->getContainerWindow(); SolarMutexGuard aGuard; - Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow ); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow ); MessageDialog aBox(pParentWindow, "ErrorFindEmailDialog", "sfx/ui/errorfindemaildialog.ui"); aBox.Execute(); diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index a563b553e769..d09b7cd3227b 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -43,7 +43,7 @@ * * initializes the list box with the templates */ -SfxManageStyleSheetPage::SfxManageStyleSheetPage(Window* pParent, const SfxItemSet& rAttrSet) +SfxManageStyleSheetPage::SfxManageStyleSheetPage(vcl::Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, "ManageStylePage", "sfx/ui/managestylepage.ui", &rAttrSet) , pStyle(&((SfxStyleDialog*)GetParentDialog())->GetStyleSheet()) , pItem(0) @@ -463,7 +463,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet* /*rAttrSet*/ ) -SfxTabPage* SfxManageStyleSheetPage::Create( Window* pParent, +SfxTabPage* SfxManageStyleSheetPage::Create( vcl::Window* pParent, const SfxItemSet *rAttrSet ) /* [Description] diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index 4c3f972bb15c..334e7771a786 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -28,7 +28,7 @@ SFX_IMPL_DOCKINGWINDOW( SfxNavigatorWrapper , SID_NAVIGATOR ); -SfxNavigatorWrapper::SfxNavigatorWrapper( Window* pParentWnd , +SfxNavigatorWrapper::SfxNavigatorWrapper( vcl::Window* pParentWnd , sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ) @@ -47,7 +47,7 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( Window* pParentWnd , SfxNavigator::SfxNavigator( SfxBindings* pBind , SfxChildWindow* pChildWin , - Window* pParent , + vcl::Window* pParent , WinBits nBits ) : SfxDockingWindow( pBind , pChildWin , diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index 56ae0e9c1aca..a2f43fb10ab3 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -57,7 +57,7 @@ IMPL_LINK_INLINE_START( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox ) } IMPL_LINK_INLINE_END( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox ) -SfxNewStyleDlg::SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool& rInPool ) +SfxNewStyleDlg::SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& rInPool ) : ModalDialog(pParent, "CreateStyleDialog", "sfx/ui/newstyle.ui") , aQueryOverwriteBox(this, SfxResId(STR_QUERY_OVERWRITE), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO) diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index 9dd7b9ca5a33..8e34b5cb4919 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -51,7 +51,7 @@ SFX_IMPL_DOCKINGWINDOW( SfxPartChildWnd_Impl, SID_BROWSER ); SfxPartChildWnd_Impl::SfxPartChildWnd_Impl ( - Window* pParentWnd, + vcl::Window* pParentWnd, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo @@ -101,7 +101,7 @@ SfxPartDockWnd_Impl::SfxPartDockWnd_Impl ( SfxBindings* pBind, SfxChildWindow* pChildWin, - Window* pParent, + vcl::Window* pParent, WinBits nBits ) : SfxDockingWindow( pBind, pChildWin, pParent, nBits ) diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 1b746fb44872..ca6764967282 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -83,7 +83,7 @@ IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl) // CTOR / DTOR ----------------------------------------------------------- -SfxPasswordDialog::SfxPasswordDialog(Window* pParent, const OUString* pGroupText) +SfxPasswordDialog::SfxPasswordDialog(vcl::Window* pParent, const OUString* pGroupText) : ModalDialog(pParent, "PasswordDialog", "sfx/ui/password.ui") , maMinLenPwdStr(SFX2_RESSTR(STR_PASSWD_MIN_LEN)) , maMinLenPwdStr1(SFX2_RESSTR(STR_PASSWD_MIN_LEN1)) diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index f13d70d0601f..86eb2c65e6c4 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -36,7 +36,7 @@ static bool bOutputForPrinter = true; #define DPI_COUNT (sizeof(aDPIArray)/sizeof(aDPIArray[0 ])) -SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) +SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptPrintPage", "sfx/ui/optprintpage.ui", &rSet) { get(m_pPrinterOutputRB, "printer"); @@ -89,26 +89,26 @@ SfxCommonPrintOptionsTabPage::~SfxCommonPrintOptionsTabPage() { } -SfxTabPage* SfxCommonPrintOptionsTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SfxCommonPrintOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return( new SfxCommonPrintOptionsTabPage( pParent, *rAttrSet ) ); } -Window* SfxCommonPrintOptionsTabPage::GetParentLabeledBy( const Window* pWindow ) const +vcl::Window* SfxCommonPrintOptionsTabPage::GetParentLabeledBy( const vcl::Window* pWindow ) const { - if ( pWindow == (Window *)m_pReduceGradientsStepCountNF ) + if ( pWindow == (vcl::Window *)m_pReduceGradientsStepCountNF ) return m_pReduceGradientsStripesRB; - else if ( pWindow == (Window *)m_pReduceBitmapsResolutionLB ) + else if ( pWindow == (vcl::Window *)m_pReduceBitmapsResolutionLB ) return m_pReduceBitmapsResolutionRB; else return SfxTabPage::GetParentLabeledBy( pWindow ); } -Window* SfxCommonPrintOptionsTabPage::GetParentLabelFor( const Window* pWindow ) const +vcl::Window* SfxCommonPrintOptionsTabPage::GetParentLabelFor( const vcl::Window* pWindow ) const { - if ( pWindow == (Window *)m_pReduceGradientsStripesRB ) + if ( pWindow == (vcl::Window *)m_pReduceGradientsStripesRB ) return m_pReduceGradientsStepCountNF; - else if ( pWindow == (Window *)m_pReduceBitmapsResolutionRB ) + else if ( pWindow == (vcl::Window *)m_pReduceBitmapsResolutionRB ) return m_pReduceBitmapsResolutionLB; else return SfxTabPage::GetParentLabelFor( pWindow ); diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index 2b0b42944553..12f3540ad0a1 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -124,7 +124,7 @@ static OUString GetLabelFromCommandURL( const OUString& rCommandURL, const uno:: SFX_IMPL_FLOATINGWINDOW( SfxRecordingFloatWrapper_Impl, SID_RECORDING_FLOATWINDOW ); -SfxRecordingFloatWrapper_Impl::SfxRecordingFloatWrapper_Impl( Window* pParentWnd , +SfxRecordingFloatWrapper_Impl::SfxRecordingFloatWrapper_Impl( vcl::Window* pParentWnd , sal_uInt16 nId , SfxBindings* pBind , SfxChildWinInfo* pInfo ) @@ -163,7 +163,7 @@ bool SfxRecordingFloatWrapper_Impl::QueryClose() SfxRecordingFloat_Impl::SfxRecordingFloat_Impl( SfxBindings* pBind , SfxChildWindow* pChildWin , - Window* pParent ) + vcl::Window* pParent ) : SfxFloatingWindow( pBind, pChildWin, pParent, @@ -230,7 +230,7 @@ void SfxRecordingFloat_Impl::StateChanged( StateChangedType nStateChange ) if ( nStateChange == STATE_CHANGE_INITSHOW ) { SfxViewFrame *pFrame = GetBindings().GetDispatcher_Impl()->GetFrame(); - Window* pEditWin = pFrame->GetViewShell()->GetWindow(); + vcl::Window* pEditWin = pFrame->GetViewShell()->GetWindow(); Point aPoint = pEditWin->OutputToScreenPixel( pEditWin->GetPosPixel() ); aPoint = GetParent()->ScreenToOutputPixel( aPoint ); diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index c8bce8afa3d2..1cedc62247a8 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -94,7 +94,7 @@ namespace static bool lcl_GetPassword( - Window *pParent, + vcl::Window *pParent, bool bProtect, /*out*/OUString &rPassword ) { @@ -421,13 +421,13 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl) } -SfxTabPage* SfxSecurityPage::Create( Window * pParent, const SfxItemSet * rItemSet ) +SfxTabPage* SfxSecurityPage::Create( vcl::Window * pParent, const SfxItemSet * rItemSet ) { return new SfxSecurityPage( pParent, *rItemSet ); } -SfxSecurityPage::SfxSecurityPage( Window* pParent, const SfxItemSet& rItemSet ) +SfxSecurityPage::SfxSecurityPage( vcl::Window* pParent, const SfxItemSet& rItemSet ) : SfxTabPage(pParent, "SecurityInfoPage", "sfx/ui/securityinfopage.ui", &rItemSet) { m_pImpl.reset(new SfxSecurityPage_Impl( *this, rItemSet )); diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index e3b7046d4fbb..664cf0fa2f5d 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -205,7 +205,7 @@ void SfxEmptySplitWin_Impl::MouseMove( const MouseEvent& rMEvt ) -SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, +SfxSplitWindow::SfxSplitWindow( vcl::Window* pParent, SfxChildAlignment eAl, SfxWorkWindow *pW, bool bWithButtons, WinBits nBits ) /* [Description] @@ -1086,7 +1086,7 @@ bool SfxSplitWindow::CursorIsOverRect( bool bForceAdding ) const aRect = aRect.GetUnion( aVisRect ); } - if ( aRect.IsInside( OutputToScreenPixel( ((Window*)this)->GetPointerPosPixel() ) ) ) + if ( aRect.IsInside( OutputToScreenPixel( ((vcl::Window*)this)->GetPointerPosPixel() ) ) ) return true; return false; } diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index f88bdd69104a..6e08e6f02c9f 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -39,7 +39,7 @@ namespace sfx2 { // SearchDialog -SearchDialog::SearchDialog(Window* pWindow, const OUString& rConfigName) +SearchDialog::SearchDialog(vcl::Window* pWindow, const OUString& rConfigName) : ModelessDialog(pWindow, "SearchDialog", "sfx/ui/searchdialog.ui") , m_sConfigName(rConfigName) , m_bIsConstructed(false) diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 52669b69e170..1854b4176302 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -32,7 +32,7 @@ SfxStyleDialog::SfxStyleDialog ( - Window* pParent, // Parent + vcl::Window* pParent, // Parent const OString& rID, const OUString& rUIXMLDescription, SfxStyleSheetBase& rStyle // stylesheet to be processed ) diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index d71879ef83cb..c5b964e64cdd 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -163,7 +163,7 @@ void SfxTabPage::SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::st return ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >(); } -SfxTabPage::SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet) +SfxTabPage::SfxTabPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet) : TabPage(pParent, rID, rUIXMLDescription) , pSet ( rAttrSet ) , bHasExchangeSupport ( false ) @@ -311,7 +311,7 @@ SfxTabDialog* SfxTabPage::GetTabDialog() const SfxTabDialog::SfxTabDialog ( SfxViewFrame* pViewFrame, // Frame, to which the Dialog belongs - Window* pParent, // Parent Window + vcl::Window* pParent, // Parent Window const OString& rID, const OUString& rUIXMLDescription, //Dialog Name, Dialog .ui path const SfxItemSet* pItemSet, // Itemset with the data; // can be NULL, when Pages are onDemand @@ -340,7 +340,7 @@ SfxTabDialog::SfxTabDialog */ ( - Window* pParent, // Parent Window + vcl::Window* pParent, // Parent Window const OString& rID, const OUString& rUIXMLDescription, //Dialog Name, Dialog .ui path const SfxItemSet* pItemSet, // Itemset with the data; // can be NULL, when Pages are onDemand diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index 7107fc052f82..1032a68c2db9 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -200,7 +200,7 @@ namespace sfx2 //= TaskPaneDockingWindow - TaskPaneDockingWindow::TaskPaneDockingWindow( SfxBindings* i_pBindings, TaskPaneWrapper& i_rWrapper, Window* i_pParent, WinBits i_nBits ) + TaskPaneDockingWindow::TaskPaneDockingWindow( SfxBindings* i_pBindings, TaskPaneWrapper& i_rWrapper, vcl::Window* i_pParent, WinBits i_nBits ) :TitledDockingWindow( i_pBindings, &i_rWrapper, i_pParent, i_nBits ) ,m_aTaskPane( GetContentWindow(), lcl_getFrame( i_pBindings ) ) ,m_aPaneController( m_aTaskPane, *this ) @@ -235,7 +235,7 @@ namespace sfx2 SFX_IMPL_DOCKINGWINDOW( TaskPaneWrapper, SID_TASKPANE ); - TaskPaneWrapper::TaskPaneWrapper( Window* i_pParent, sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pInfo ) + TaskPaneWrapper::TaskPaneWrapper( vcl::Window* i_pParent, sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pInfo ) :SfxChildWindow( i_pParent, i_nId ) { pWindow = new TaskPaneDockingWindow( i_pBindings, *this, i_pParent, @@ -302,7 +302,7 @@ namespace sfx2 virtual OUString GetDisplayName() const SAL_OVERRIDE; virtual Image GetImage() const SAL_OVERRIDE; virtual OString GetHelpID() const SAL_OVERRIDE; - virtual void Activate( Window& i_rParentWindow ) SAL_OVERRIDE; + virtual void Activate( vcl::Window& i_rParentWindow ) SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; virtual void SetSizePixel( const Size& i_rPanelWindowSize ) SAL_OVERRIDE; virtual void GrabFocus() SAL_OVERRIDE; @@ -317,7 +317,7 @@ namespace sfx2 virtual ~CustomToolPanel(); private: - bool impl_ensureToolPanelWindow( Window& i_rPanelParentWindow ); + bool impl_ensureToolPanelWindow( vcl::Window& i_rPanelParentWindow ); void impl_updatePanelConfig( const bool i_bVisible ) const; private: @@ -350,7 +350,7 @@ namespace sfx2 } - bool CustomToolPanel::impl_ensureToolPanelWindow( Window& i_rPanelParentWindow ) + bool CustomToolPanel::impl_ensureToolPanelWindow( vcl::Window& i_rPanelParentWindow ) { if ( m_bAttemptedCreation ) return m_aCustomPanel.is(); @@ -414,7 +414,7 @@ namespace sfx2 } - void CustomToolPanel::Activate( Window& i_rParentWindow ) + void CustomToolPanel::Activate( vcl::Window& i_rParentWindow ) { ENSURE_OR_RETURN_VOID( impl_ensureToolPanelWindow( i_rParentWindow ), "no panel to activate!" ); @@ -722,7 +722,7 @@ namespace sfx2 //= ModuleTaskPane - ModuleTaskPane::ModuleTaskPane( Window& i_rParentWindow, const Reference< XFrame >& i_rDocumentFrame ) + ModuleTaskPane::ModuleTaskPane( vcl::Window& i_rParentWindow, const Reference< XFrame >& i_rDocumentFrame ) :Window( &i_rParentWindow, WB_DIALOGCONTROL ) ,m_pImpl( new ModuleTaskPane_Impl( *this, i_rDocumentFrame, NULL ) ) { diff --git a/sfx2/source/dialog/templateinfodlg.cxx b/sfx2/source/dialog/templateinfodlg.cxx index 45dcd7837a74..a2514ea23a11 100644 --- a/sfx2/source/dialog/templateinfodlg.cxx +++ b/sfx2/source/dialog/templateinfodlg.cxx @@ -32,13 +32,13 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::task; using namespace ::com::sun::star::util; -SfxTemplateInfoDlg::SfxTemplateInfoDlg (Window *pParent) +SfxTemplateInfoDlg::SfxTemplateInfoDlg (vcl::Window *pParent) : ModalDialog(pParent, "TemplateInfo", "sfx/ui/templateinfodialog.ui") { get(mpBtnClose, "close"); get(mpBox, "box"); get(mpInfoView, "infoDrawingArea"); - mpPreviewView = new Window(mpBox); + mpPreviewView = new vcl::Window(mpBox); Size aSize(LogicToPixel(Size(250, 160), MAP_APPFONT)); mpBox->set_width_request(aSize.Width()); diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index bf134ec4e543..7aac28c40446 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -136,7 +136,7 @@ SfxTemplateDialog::SfxTemplateDialog ( SfxBindings *pBind, SfxChildWindow *pCW, - Window *pParent + vcl::Window *pParent ) /* [Description] @@ -349,7 +349,7 @@ PopupMenu* SfxActionListBox::CreateContextMenu( void ) -SfxTemplateDialogWrapper::SfxTemplateDialogWrapper(Window *pParentWnd, +SfxTemplateDialogWrapper::SfxTemplateDialogWrapper(vcl::Window *pParentWnd, sal_uInt16 nId, SfxBindings *p, SfxChildWinInfo *pInfo) : SfxChildWindow(pParentWnd, nId) { @@ -364,7 +364,7 @@ SfxTemplateDialogWrapper::SfxTemplateDialogWrapper(Window *pParentWnd, //===== SfxTemplatePanelControl =============================================== SfxTemplatePanelControl::SfxTemplatePanelControl ( SfxBindings* pBindings, - Window* pParentWindow) + vcl::Window* pParentWindow) : DockingWindow(pParentWindow, SfxResId(DLG_STYLE_DESIGNER) ), pImpl(new SfxTemplateDialog_Impl(pBindings, this)), mpBindings(pBindings) @@ -455,7 +455,7 @@ void SfxTemplatePanelControl::StateChanged( StateChangedType nStateChange ) if ( nStateChange == STATE_CHANGE_INITSHOW ) { SfxViewFrame *pFrame = mpBindings->GetDispatcher_Impl()->GetFrame(); - Window* pEditWin = pFrame->GetViewShell()->GetWindow(); + vcl::Window* pEditWin = pFrame->GetViewShell()->GetWindow(); Size aSize = pEditWin->GetSizePixel(); Point aPoint = pEditWin->OutputToScreenPixel( pEditWin->GetPosPixel() ); @@ -750,7 +750,7 @@ SvTreeListEntry* FillBox_Impl(SvTreeListBox *pBox, // Constructor -SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Window* pW, bool ) : +SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl::Window* pW, bool ) : mbIgnoreSelect( false ), pBindings ( pB ), pWindow ( pW ), @@ -1984,7 +1984,7 @@ void SfxCommonTemplateDialog_Impl::NewHdl(void *) OUString aEmpty; if ( nActFamily != 0xffff && (pTreeBox || aFmtLb.GetSelectionCount() <= 1)) { - Window* pTmp; + vcl::Window* pTmp; pTmp = Application::GetDefDialogParent(); if ( ISA(SfxTemplateDialog_Impl) ) Application::SetDefDialogParent( pWindow->GetParent() ); @@ -2024,7 +2024,7 @@ void SfxCommonTemplateDialog_Impl::EditHdl(void *) sal_uInt16 nFilter = nActFilter; OUString aTemplName(GetSelectedEntry()); GetSelectedStyle(); // -Wall required?? - Window* pTmp; + vcl::Window* pTmp; //DefModalDialogParent set for modality of the following dialogs pTmp = Application::GetDefDialogParent(); if ( ISA(SfxTemplateDialog_Impl) ) @@ -2193,7 +2193,7 @@ void SfxCommonTemplateDialog_Impl::ResetFocus() { SfxViewFrame *pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame(); SfxViewShell *pVu = pViewFrame->GetViewShell(); - Window *pAppWin = pVu ? pVu->GetWindow(): 0; + vcl::Window *pAppWin = pVu ? pVu->GetWindow(): 0; if(pAppWin) pAppWin->GrabFocus(); } @@ -2293,7 +2293,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu ) -void SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl( const Point& rPos, Window* pWin ) +void SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl( const Point& rPos, vcl::Window* pWin ) { // Bug# 94152: This part should never be called, because before this happens, the TreeListBox should captured this! OSL_FAIL( "+SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl(): How could this happen? Please infirm developer ASAP!" ); @@ -2811,7 +2811,7 @@ void SfxTemplateDialog::StateChanged( StateChangedType nStateChange ) if ( nStateChange == STATE_CHANGE_INITSHOW ) { SfxViewFrame *pFrame = GetBindings().GetDispatcher_Impl()->GetFrame(); - Window* pEditWin = pFrame->GetViewShell()->GetWindow(); + vcl::Window* pEditWin = pFrame->GetViewShell()->GetWindow(); Size aSize = pEditWin->GetSizePixel(); Point aPoint = pEditWin->OutputToScreenPixel( pEditWin->GetPosPixel() ); @@ -2825,7 +2825,7 @@ void SfxTemplateDialog::StateChanged( StateChangedType nStateChange ) SfxDockingWindow::StateChanged( nStateChange ); } -DropToolBox_Impl::DropToolBox_Impl(Window* pParent, SfxTemplateDialog_Impl* pTemplateDialog) : +DropToolBox_Impl::DropToolBox_Impl(vcl::Window* pParent, SfxTemplateDialog_Impl* pTemplateDialog) : ToolBox(pParent), DropTargetHelper(this), rParent(*pTemplateDialog) diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 71eee2c27545..65882136b12b 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -36,7 +36,7 @@ namespace sfx2 //= TitledDockingWindow - TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, Window* i_pParent, + TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, vcl::Window* i_pParent, WinBits i_nStyle ) :SfxDockingWindow( i_pBindings, i_pChildWindow, i_pParent, i_nStyle ) ,m_sTitle() @@ -50,7 +50,7 @@ namespace sfx2 } - TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, Window* i_pParent, + TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, vcl::Window* i_pParent, const ResId& i_rResId ) :SfxDockingWindow( i_pBindings, i_pChildWindow, i_pParent, i_rResId ) ,m_sTitle() diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index eceacca0e6bf..16788ee79baf 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -462,7 +462,7 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton ) return 0L; } -SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl(Window *pParent, SfxVersionInfo& rInfo, bool bEdit) +SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl(vcl::Window *pParent, SfxVersionInfo& rInfo, bool bEdit) : SfxModalDialog(pParent, "VersionCommentDialog", "sfx/ui/versioncommentdialog.ui") , m_rInfo(rInfo) { diff --git a/sfx2/source/doc/QuerySaveDocument.cxx b/sfx2/source/doc/QuerySaveDocument.cxx index 9c073d07c279..63d458f1c955 100644 --- a/sfx2/source/doc/QuerySaveDocument.cxx +++ b/sfx2/source/doc/QuerySaveDocument.cxx @@ -21,7 +21,7 @@ #include <vcl/layout.hxx> #include <vcl/svapp.hxx> -short ExecuteQuerySaveDocument(Window* _pParent, const OUString& _rTitle) +short ExecuteQuerySaveDocument(vcl::Window* _pParent, const OUString& _rTitle) { if (Application::IsHeadlessModeEnabled()) { diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 1922cad4c5b7..6ee6c0f18b47 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -665,7 +665,7 @@ sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8 nCurStatus ) && GetMediaDescr().find( aVersionCommentString ) == GetMediaDescr().end() ) { // notify the user that SaveAs is going to be done - Window* pWin = SfxStoringHelper::GetModelWindow( m_xModel ); + vcl::Window* pWin = SfxStoringHelper::GetModelWindow( m_xModel ); MessageDialog aMessageBox(pWin, SfxResId(STR_NEW_FILENAME_SAVE), VCL_MESSAGE_QUESTION, VCL_BUTTONS_OK_CANCEL); if ( aMessageBox.Execute() == RET_OK ) @@ -1855,15 +1855,15 @@ bool SfxStoringHelper::WarnUnacceptableFormat( const uno::Reference< frame::XMod if ( !SvtSaveOptions().IsWarnAlienFormat() ) return true; - Window* pWin = SfxStoringHelper::GetModelWindow( xModel ); + vcl::Window* pWin = SfxStoringHelper::GetModelWindow( xModel ); SfxAlienWarningDialog aDlg( pWin, aOldUIName ); return aDlg.Execute() == RET_OK; } -Window* SfxStoringHelper::GetModelWindow( const uno::Reference< frame::XModel >& xModel ) +vcl::Window* SfxStoringHelper::GetModelWindow( const uno::Reference< frame::XModel >& xModel ) { - Window* pWin = 0; + vcl::Window* pWin = 0; try { if ( xModel.is() ) { diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index bfa748502772..f2650dcd9096 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -105,17 +105,17 @@ public: virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class IFrameWindow_Impl : public Window +class IFrameWindow_Impl : public vcl::Window { uno::Reference < frame::XFrame2 > mxFrame; public: - IFrameWindow_Impl( Window *pParent, + IFrameWindow_Impl( vcl::Window *pParent, bool bHasBorder, WinBits nWinBits = 0 ); }; -IFrameWindow_Impl::IFrameWindow_Impl( Window *pParent, bool bHasBorder, WinBits nWinBits ) +IFrameWindow_Impl::IFrameWindow_Impl( vcl::Window *pParent, bool bHasBorder, WinBits nWinBits ) : Window( pParent, nWinBits | WB_CLIPCHILDREN | WB_NODIALOGCONTROL | WB_DOCKBORDER ) { if ( !bHasBorder ) @@ -173,7 +173,7 @@ throw( uno::RuntimeException, std::exception ) if ( SvtMiscOptions().IsPluginsEnabled() ) { DBG_ASSERT( !mxFrame.is(), "Frame already existing!" ); - Window* pParent = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); IFrameWindow_Impl* pWin = new IFrameWindow_Impl( pParent, maFrmDescr.IsFrameBorderOn() ); pWin->SetSizePixel( pParent->GetOutputSizePixel() ); pWin->SetBackground(); diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 9997782dc649..65dfc7e2237e 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -49,7 +49,7 @@ void SfxPreviewBase_Impl::SetObjectShell( SfxObjectShell* pObj ) } SfxPreviewBase_Impl::SfxPreviewBase_Impl( - Window* pParent, WinBits nStyle) + vcl::Window* pParent, WinBits nStyle) : Window(pParent, nStyle) , pMetaFile() { @@ -66,7 +66,7 @@ Size SfxPreviewBase_Impl::GetOptimalSize() const } void SfxPreviewWin_Impl::ImpPaint( - const Rectangle&, GDIMetaFile* pFile, Window* pWindow ) + const Rectangle&, GDIMetaFile* pFile, vcl::Window* pWindow ) { pWindow->SetLineColor(); Color aLightGrayCol( COL_LIGHTGRAY ); @@ -115,7 +115,7 @@ void SfxPreviewWin_Impl::Paint( const Rectangle& rRect ) ImpPaint( rRect, pMetaFile.get(), this ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSfxPreviewWin(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxPreviewWin(vcl::Window *pParent, VclBuilder::stringmap &) { return new SfxPreviewWin_Impl(pParent, 0); } @@ -216,7 +216,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update) if ( !xDocShell.Is() ) { - Window *pParent = Application::GetDefDialogParent(); + vcl::Window *pParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( pAntiImpl ); SfxErrorContext eEC(ERRCTX_SFX_LOADTEMPLATE,pAntiImpl); SfxApplication *pSfxApp = SfxGetpApp(); @@ -444,7 +444,7 @@ SfxNewFileDialog_Impl::~SfxNewFileDialog_Impl() rExtra = m_pMoreBt->get_expanded() ? OUString("Y") : OUString("N"); } -SfxNewFileDialog::SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags) +SfxNewFileDialog::SfxNewFileDialog(vcl::Window *pParent, sal_uInt16 nFlags) : SfxModalDialog(pParent, "LoadTemplateDialog", "sfx/ui/loadtemplatedialog.ui") { diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index e1cb06382263..330f6b9e1384 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -289,7 +289,7 @@ void SfxObjectShell::UpdateTime_Impl( SfxDocumentInfoDialog* SfxObjectShell::CreateDocumentInfoDialog ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rSet ) { diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 7939e4246a86..4b99eee87211 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1752,9 +1752,9 @@ bool SfxObjectShell::AdjustMacroMode( const OUString& /*rScriptType*/, bool bSup return pImp->aMacroMode.adjustMacroMode( xInteraction ); } -Window* SfxObjectShell::GetDialogParent( SfxMedium* pLoadingMedium ) +vcl::Window* SfxObjectShell::GetDialogParent( SfxMedium* pLoadingMedium ) { - Window* pWindow = 0; + vcl::Window* pWindow = 0; SfxItemSet* pSet = pLoadingMedium ? pLoadingMedium->GetItemSet() : GetMedium()->GetItemSet(); SFX_ITEMSET_ARG( pSet, pUnoItem, SfxUnoFrameItem, SID_FILLFRAME, false ); if ( pUnoItem ) diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 41f05b33117c..c75880a250eb 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2950,7 +2950,7 @@ sal_uInt16 SfxObjectShell::GetHiddenInformationState( sal_uInt16 nStates ) return nState; } -sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, Window* pParent ) +sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, vcl::Window* pParent ) { sal_Int16 nRet = RET_YES; sal_uInt16 nResId = sal_uInt16(); diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx index 51ce5b185bea..b68a09d0086b 100644 --- a/sfx2/source/doc/plugin.cxx +++ b/sfx2/source/doc/plugin.cxx @@ -45,11 +45,11 @@ using namespace ::com::sun::star; namespace { -class PluginWindow_Impl : public Window +class PluginWindow_Impl : public vcl::Window { public: uno::Reference < awt::XWindow > xWindow; - PluginWindow_Impl( Window* pParent ) + PluginWindow_Impl( vcl::Window* pParent ) : Window( pParent, WB_CLIPCHILDREN ) {} @@ -151,7 +151,7 @@ throw( uno::RuntimeException, std::exception ) if ( SvtMiscOptions().IsPluginsEnabled() ) { - Window* pParent = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); PluginWindow_Impl* pWin = new PluginWindow_Impl( pParent ); pWin->SetSizePixel( pParent->GetOutputSizePixel() ); pWin->SetBackground(); diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx index 94f8658056d1..3718e57922af 100644 --- a/sfx2/source/doc/querytemplate.cxx +++ b/sfx2/source/doc/querytemplate.cxx @@ -27,7 +27,7 @@ namespace sfx2 { -QueryTemplateBox::QueryTemplateBox( Window* pParent, const OUString& rMessage ) : +QueryTemplateBox::QueryTemplateBox( vcl::Window* pParent, const OUString& rMessage ) : MessBox ( pParent, 0, Application::GetDisplayName(), rMessage ) { SetImage( QueryBox::GetStandardImage() ); diff --git a/sfx2/source/doc/querytemplate.hxx b/sfx2/source/doc/querytemplate.hxx index e2d229b791f5..8c7411d5db39 100644 --- a/sfx2/source/doc/querytemplate.hxx +++ b/sfx2/source/doc/querytemplate.hxx @@ -27,7 +27,7 @@ namespace sfx2 class QueryTemplateBox : public MessBox { public: - QueryTemplateBox( Window* pParent, const OUString& rMessage ); + QueryTemplateBox( vcl::Window* pParent, const OUString& rMessage ); }; } // end of namespace sfx2 diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 8defb3e522f1..9975213bcd08 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -348,7 +348,7 @@ class SfxOwnFramesLocker { Sequence< Reference< frame::XFrame > > m_aLockedFrames; - Window* GetVCLWindow( const Reference< frame::XFrame >& xFrame ); + vcl::Window* GetVCLWindow( const Reference< frame::XFrame >& xFrame ); public: SfxOwnFramesLocker( SfxObjectShell* ObjechShell ); ~SfxOwnFramesLocker(); @@ -370,7 +370,7 @@ SfxOwnFramesLocker::SfxOwnFramesLocker( SfxObjectShell* pObjectShell ) { // get vcl window related to the frame and lock it if it is still not locked Reference< frame::XFrame > xFrame = rSfxFrame.GetFrameInterface(); - Window* pWindow = GetVCLWindow( xFrame ); + vcl::Window* pWindow = GetVCLWindow( xFrame ); if ( !pWindow ) throw RuntimeException(); @@ -403,9 +403,9 @@ SfxOwnFramesLocker::~SfxOwnFramesLocker() UnlockFrames(); } -Window* SfxOwnFramesLocker::GetVCLWindow( const Reference< frame::XFrame >& xFrame ) +vcl::Window* SfxOwnFramesLocker::GetVCLWindow( const Reference< frame::XFrame >& xFrame ) { - Window* pWindow = NULL; + vcl::Window* pWindow = NULL; if ( xFrame.is() ) { @@ -426,7 +426,7 @@ void SfxOwnFramesLocker::UnlockFrames() if ( m_aLockedFrames[nInd].is() ) { // get vcl window related to the frame and unlock it - Window* pWindow = GetVCLWindow( m_aLockedFrames[nInd] ); + vcl::Window* pWindow = GetVCLWindow( m_aLockedFrames[nInd] ); if ( !pWindow ) throw RuntimeException(); @@ -3651,7 +3651,7 @@ void SAL_CALL SfxBaseModel::setVisualAreaSize( sal_Int64 nAspect, const awt::Siz SfxViewFrame* pViewFrm = SfxViewFrame::GetFirst( m_pData->m_pObjectShell, false ); if ( pViewFrm && m_pData->m_pObjectShell->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED && !pViewFrm->GetFrame().IsInPlace() ) { - Window* pWindow = VCLUnoHelper::GetWindow( pViewFrm->GetFrame().GetFrameInterface()->getContainerWindow() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( pViewFrm->GetFrame().GetFrameInterface()->getContainerWindow() ); Size aWinSize = pWindow->GetSizePixel(); awt::Size aCurrent = getVisualAreaSize( nAspect ); Size aDiff( aSize.Width-aCurrent.Width, aSize.Height-aCurrent.Height ); diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 2f9f9b5d1886..ba10d497e736 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -174,7 +174,7 @@ static bool cmpSelectionItems (const ThumbnailViewItem *pItem1, const ThumbnailV return pItem1->mnId > pItem2->mnId; } -SfxTemplateManagerDlg::SfxTemplateManagerDlg(Window *parent) +SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent) : ModelessDialog(parent, "TemplateDialog", "sfx/ui/templatedlg.ui"), maSelTemplates(cmpSelectionItems), maSelFolders(cmpSelectionItems), diff --git a/sfx2/source/inc/alienwarn.hxx b/sfx2/source/inc/alienwarn.hxx index 4ad97689d959..8609f68ce861 100644 --- a/sfx2/source/inc/alienwarn.hxx +++ b/sfx2/source/inc/alienwarn.hxx @@ -29,7 +29,7 @@ private: CheckBox* m_pWarningOnBox; public: - SfxAlienWarningDialog(Window* pParent, const OUString& _rFormatName); + SfxAlienWarningDialog(vcl::Window* pParent, const OUString& _rFormatName); virtual ~SfxAlienWarningDialog(); }; diff --git a/sfx2/source/inc/documentfontsdialog.hxx b/sfx2/source/inc/documentfontsdialog.hxx index 39f2d80adea2..360f88713010 100644 --- a/sfx2/source/inc/documentfontsdialog.hxx +++ b/sfx2/source/inc/documentfontsdialog.hxx @@ -30,8 +30,8 @@ class SfxDocumentFontsPage: public SfxTabPage { public: - SfxDocumentFontsPage( Window* parent, const SfxItemSet& set ); - static SfxTabPage* Create( Window* parent, const SfxItemSet* set ); + SfxDocumentFontsPage( vcl::Window* parent, const SfxItemSet& set ); + static SfxTabPage* Create( vcl::Window* parent, const SfxItemSet* set ); protected: virtual bool FillItemSet( SfxItemSet* set ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* set ) SAL_OVERRIDE; diff --git a/sfx2/source/inc/inputdlg.hxx b/sfx2/source/inc/inputdlg.hxx index c91b36cfe735..29b5c45b9453 100644 --- a/sfx2/source/inc/inputdlg.hxx +++ b/sfx2/source/inc/inputdlg.hxx @@ -19,7 +19,7 @@ class PushButton; class InputDialog : public ModalDialog { public: - InputDialog (const OUString &labelText, Window *pParent = NULL); + InputDialog (const OUString &labelText, vcl::Window *pParent = NULL); OUString getEntryText () const; private: diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx index b3a5c946f772..a065593d168d 100644 --- a/sfx2/source/inc/partwnd.hxx +++ b/sfx2/source/inc/partwnd.hxx @@ -45,7 +45,7 @@ namespace com class SfxPartChildWnd_Impl : public SfxChildWindow { public: - SfxPartChildWnd_Impl( Window* pParent, sal_uInt16 nId, + SfxPartChildWnd_Impl( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); @@ -66,7 +66,7 @@ protected: public: SfxPartDockWnd_Impl( SfxBindings* pBindings, SfxChildWindow* pChildWin, - Window* pParent, + vcl::Window* pParent, WinBits nBits ); virtual ~SfxPartDockWnd_Impl(); diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx index adc5de27dcc3..cbd4da7478a9 100644 --- a/sfx2/source/inc/preview.hxx +++ b/sfx2/source/inc/preview.hxx @@ -26,12 +26,12 @@ class SfxObjectShell; class GDIMetaFile; -class SfxPreviewBase_Impl : public Window +class SfxPreviewBase_Impl : public vcl::Window { protected: ::boost::shared_ptr<GDIMetaFile> pMetaFile; public: - SfxPreviewBase_Impl(Window* pParent, WinBits nStyle); + SfxPreviewBase_Impl(vcl::Window* pParent, WinBits nStyle); void SetObjectShell( SfxObjectShell* pObj ); virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -42,12 +42,12 @@ class SfxPreviewWin_Impl: public SfxPreviewBase_Impl protected: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: - SfxPreviewWin_Impl(Window* pParent, WinBits nStyle) + SfxPreviewWin_Impl(vcl::Window* pParent, WinBits nStyle) : SfxPreviewBase_Impl(pParent, nStyle) { } static void ImpPaint( - const Rectangle& rRect, GDIMetaFile* pFile, Window* pWindow ); + const Rectangle& rRect, GDIMetaFile* pFile, vcl::Window* pWindow ); }; #endif diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx index 23c9b362ccc3..06fc314a2795 100644 --- a/sfx2/source/inc/recfloat.hxx +++ b/sfx2/source/inc/recfloat.hxx @@ -27,7 +27,7 @@ class SfxRecordingFloatWrapper_Impl : public SfxChildWindow { SfxBindings* pBindings; public: - SfxRecordingFloatWrapper_Impl( Window* pParent , + SfxRecordingFloatWrapper_Impl( vcl::Window* pParent , sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ); @@ -44,7 +44,7 @@ class SfxRecordingFloat_Impl : public SfxFloatingWindow public: SfxRecordingFloat_Impl( SfxBindings* pBindings , SfxChildWindow* pChildWin , - Window* pParent ); + vcl::Window* pParent ); virtual ~SfxRecordingFloat_Impl(); virtual bool Close() SAL_OVERRIDE; virtual void FillInfo( SfxChildWinInfo& rInfo ) const SAL_OVERRIDE; diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx index e01b44e88f8e..76b690f332a4 100644 --- a/sfx2/source/inc/splitwin.hxx +++ b/sfx2/source/inc/splitwin.hxx @@ -63,7 +63,7 @@ protected: virtual void MouseButtonDown ( const MouseEvent& ) SAL_OVERRIDE; public: - SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, + SfxSplitWindow( vcl::Window* pParent, SfxChildAlignment eAl, SfxWorkWindow *pW, bool bWithButtons, WinBits nBits = WB_BORDER | WB_SIZEABLE | WB_3DLOOK ); diff --git a/sfx2/source/inc/templatesearchview.hxx b/sfx2/source/inc/templatesearchview.hxx index 94a9977053ac..2845c409fcb6 100644 --- a/sfx2/source/inc/templatesearchview.hxx +++ b/sfx2/source/inc/templatesearchview.hxx @@ -16,7 +16,7 @@ class TemplateSearchView : public ThumbnailView { public: - TemplateSearchView ( Window* pParent, WinBits nWinStyle = WB_TABSTOP | WB_VSCROLL); + TemplateSearchView ( vcl::Window* pParent, WinBits nWinStyle = WB_TABSTOP | WB_VSCROLL); virtual ~TemplateSearchView(); diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 2cbe1b7ec544..9da6c9772900 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -61,12 +61,12 @@ protected: sal_uInt16 nModifier; public: - DropListBox_Impl( Window* pParent, const ResId& rId, SfxCommonTemplateDialog_Impl* pD ) + DropListBox_Impl( vcl::Window* pParent, const ResId& rId, SfxCommonTemplateDialog_Impl* pD ) : SvTreeListBox(pParent, rId) , pDialog(pD) , nModifier(0) {} - DropListBox_Impl( Window* pParent, WinBits nWinBits, SfxCommonTemplateDialog_Impl* pD ) + DropListBox_Impl( vcl::Window* pParent, WinBits nWinBits, SfxCommonTemplateDialog_Impl* pD ) : SvTreeListBox(pParent, nWinBits) , pDialog(pD) , nModifier(0) @@ -159,7 +159,7 @@ protected: SfxBindings* pBindings; SfxTemplateControllerItem* pBoundItems[COUNT_BOUND_FUNC]; - Window* pWindow; + vcl::Window* pWindow; SfxModule* pModule; Timer* pTimer; @@ -263,7 +263,7 @@ protected: public: TYPEINFO_OVERRIDE(); - SfxCommonTemplateDialog_Impl( SfxBindings* pB, Window*, bool ); + SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl::Window*, bool ); virtual ~SfxCommonTemplateDialog_Impl(); DECL_LINK( MenuSelectHdl, Menu * ); @@ -274,10 +274,10 @@ public: virtual void EnableHide( bool b = true ) { bCanHide = b; } virtual void EnableShow( bool b = true ) { bCanShow = b; } - Window* GetWindow() { return pWindow; } + vcl::Window* GetWindow() { return pWindow; } void EnableTreeDrag( bool b = true ); - void ExecuteContextMenu_Impl( const Point& rPos, Window* pWin ); + void ExecuteContextMenu_Impl( const Point& rPos, vcl::Window* pWin ); void EnableExample_Impl( sal_uInt16 nId, bool bEnable ); SfxStyleFamily GetActualFamily() const; OUString GetSelectedEntry() const; @@ -302,7 +302,7 @@ protected: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; public: - DropToolBox_Impl(Window* pParent, SfxTemplateDialog_Impl* pTemplateDialog); + DropToolBox_Impl(vcl::Window* pParent, SfxTemplateDialog_Impl* pTemplateDialog); virtual ~DropToolBox_Impl(); }; // class SfxTemplateDialog_Impl ------------------------------------------ @@ -315,7 +315,7 @@ private: friend class DropToolBox_Impl; friend class SfxTemplatePanelControl; - Window* m_pFloat; + vcl::Window* m_pFloat; bool m_bZoomIn; DropToolBox_Impl m_aActionTbL; ToolBox m_aActionTbR; diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index bba4b4f781bc..3204e2d479bf 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -82,7 +82,7 @@ class SfxViewVersionDialog_Impl : public SfxModalDialog DECL_LINK(ButtonHdl, Button*); public: - SfxViewVersionDialog_Impl(Window *pParent, SfxVersionInfo& rInfo, bool bEdit); + SfxViewVersionDialog_Impl(vcl::Window *pParent, SfxVersionInfo& rInfo, bool bEdit); }; class SfxCmisVersionsDialog : public SfxModalDialog diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 8671f43c06f3..970bbd7593ff 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -90,7 +90,7 @@ struct SfxStatBar_Impl struct SfxChild_Impl { - Window* pWin; + vcl::Window* pWin; Size aSize; SfxChildAlignment eAlign; sal_uInt16 nVisible; @@ -98,7 +98,7 @@ struct SfxChild_Impl bool bCanGetFocus; bool bSetFocus; - SfxChild_Impl( Window& rChild, const Size& rSize, + SfxChild_Impl( vcl::Window& rChild, const Size& rSize, SfxChildAlignment eAlignment, bool bIsVisible ): pWin(&rChild), aSize(rSize), eAlign(eAlignment), bResize(false), bCanGetFocus( false ), bSetFocus( false ) @@ -221,9 +221,9 @@ protected: SfxChildList_Impl aChildren; SfxChildWindows_Impl aChildWins; SfxBindings* pBindings; - Window* pWorkWin; + vcl::Window* pWorkWin; SfxShell* pConfigShell; - Window* pActiveChild; + vcl::Window* pActiveChild; sal_uInt16 nUpdateMode; sal_uInt16 nChildren; sal_uInt16 nOrigMode; @@ -244,7 +244,7 @@ protected: void CreateChildWin_Impl(SfxChildWin_Impl*,bool); void RemoveChildWin_Impl(SfxChildWin_Impl*); void Sort_Impl(); - SfxChild_Impl* FindChild_Impl( const Window& rWindow ) const; + SfxChild_Impl* FindChild_Impl( const vcl::Window& rWindow ) const; virtual bool RequestTopToolSpacePixel_Impl( SvBorder aBorder ); virtual Rectangle GetTopRect_Impl(); SvBorder Arrange_Impl(); @@ -252,11 +252,11 @@ protected: static bool IsPluginMode( SfxObjectShell* pObjShell ); public: - SfxWorkWindow( Window *pWin, SfxBindings& rBindings, SfxWorkWindow* pParent = NULL); + SfxWorkWindow( vcl::Window *pWin, SfxBindings& rBindings, SfxWorkWindow* pParent = NULL); virtual ~SfxWorkWindow(); SfxBindings& GetBindings() { return *pBindings; } - Window* GetWindow() const + vcl::Window* GetWindow() const { return pWorkWin; } Rectangle GetFreeArea( bool bAutoHide ) const; void SetDockingAllowed(bool bSet) @@ -272,8 +272,8 @@ public: // Methods for all Child windows void DataChanged_Impl( const DataChangedEvent& rDCEvt ); - void ReleaseChild_Impl( Window& rWindow ); - SfxChild_Impl* RegisterChild_Impl( Window& rWindow, SfxChildAlignment eAlign, bool bCanGetFocus=false ); + void ReleaseChild_Impl( vcl::Window& rWindow ); + SfxChild_Impl* RegisterChild_Impl( vcl::Window& rWindow, SfxChildAlignment eAlign, bool bCanGetFocus=false ); void ShowChildren_Impl(); void HideChildren_Impl(); bool PrepareClose_Impl(); @@ -316,7 +316,7 @@ public: bool IsVisible_Impl( sal_uInt16 nMode ) const; bool IsFloating( sal_uInt16 nId ); - void SetActiveChild_Impl( Window *pChild ); + void SetActiveChild_Impl( vcl::Window *pChild ); virtual bool ActivateNextChild_Impl( bool bForward = true ); bool AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW ) const; @@ -333,7 +333,7 @@ class SfxFrameWorkWin_Impl : public SfxWorkWindow SfxFrame* pMasterFrame; SfxFrame* pFrame; public: - SfxFrameWorkWin_Impl( Window* pWin, SfxFrame* pFrm, SfxFrame* pMaster ); + SfxFrameWorkWin_Impl( vcl::Window* pWin, SfxFrame* pFrm, SfxFrame* pMaster ); virtual void ArrangeChildren_Impl( bool bForce = true ) SAL_OVERRIDE; virtual void UpdateObjectBars_Impl() SAL_OVERRIDE; virtual Rectangle GetTopRect_Impl() SAL_OVERRIDE; diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index cf58c3c6557d..9c22a053a5ce 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -152,7 +152,7 @@ IMPL_STATIC_LINK_NOINSTANCE( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, Execute } -Window* SfxURLToolBoxControl_Impl::CreateItemWindow( Window* pParent ) +vcl::Window* SfxURLToolBoxControl_Impl::CreateItemWindow( vcl::Window* pParent ) { SvtURLBox* pURLBox = new SvtURLBox( pParent ); pURLBox->SetOpenHdl( LINK( this, SfxURLToolBoxControl_Impl, OpenHdl ) ); @@ -181,7 +181,7 @@ IMPL_LINK_NOARG(SfxURLToolBoxControl_Impl, OpenHdl) Reference< XFrame > xFrame( xDesktop->getActiveFrame(), UNO_QUERY ); if ( xFrame.is() ) { - Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); + vcl::Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); if ( pWin ) { pWin->GrabFocus(); diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 6f2f5db14952..55eb9884c7b3 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -252,7 +252,7 @@ void SfxPopupMenuManager::RemoveDisabledEntries() -sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPos, Window* pWindow ) +sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPos, vcl::Window* pWindow ) { sal_uInt16 nVal = ( (PopupMenu*) GetMenu()->GetSVMenu() )->Execute( pWindow, rPos ); delete pStaticThesSubMenu; pStaticThesSubMenu = NULL; @@ -279,7 +279,7 @@ SfxPopupMenuManager::SfxPopupMenuManager( PopupMenu* pMenuArg, SfxBindings& rBin { } -SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, Window* pWindow ) +SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, vcl::Window* pWindow ) { PopupMenu *pSVMenu = new PopupMenu( rResId ); sal_uInt16 n, nCount = pSVMenu->GetItemCount(); @@ -331,7 +331,7 @@ SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFra } -void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFrame, const Point& rPoint, Window* pWindow ) +void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFrame, const Point& rPoint, vcl::Window* pWindow ) { PopupMenu *pSVMenu = new PopupMenu( rResId ); sal_uInt16 n, nCount = pSVMenu->GetItemCount(); diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 59f0fbebc763..4c46417c7338 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -834,7 +834,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu ) if ( xFrame == xCurrentFrame ) nActiveItemId = nItemId; - Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); + vcl::Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); if ( pWin && pWin->IsVisible() ) { aNewWindowListVector.push_back( pWin->GetText() ); @@ -953,7 +953,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu ) Reference< XFrame > xFrame; if (( aItem >>= xFrame ) && xFrame.is() && nTaskId == nSlotId ) { - Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); + vcl::Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); pWin->GrabFocus(); pWin->ToTop( TOTOP_RESTOREWHENMIN ); break; diff --git a/sfx2/source/sidebar/ControlFactory.cxx b/sfx2/source/sidebar/ControlFactory.cxx index ff24c9df16c4..4071d981746e 100644 --- a/sfx2/source/sidebar/ControlFactory.cxx +++ b/sfx2/source/sidebar/ControlFactory.cxx @@ -27,12 +27,12 @@ namespace sfx2 { namespace sidebar { -CheckBox* ControlFactory::CreateMenuButton (Window* pParentWindow) +CheckBox* ControlFactory::CreateMenuButton (vcl::Window* pParentWindow) { return new MenuButton(pParentWindow); } -ImageRadioButton* ControlFactory::CreateTabItem (Window* pParentWindow) +ImageRadioButton* ControlFactory::CreateTabItem (vcl::Window* pParentWindow) { return new TabItem(pParentWindow); } diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx index 8a2b86470d26..16d4acaa4391 100644 --- a/sfx2/source/sidebar/ControllerFactory.cxx +++ b/sfx2/source/sidebar/ControllerFactory.cxx @@ -105,7 +105,7 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController( if (rxParentWindow.is()) { Reference<awt::XWindow> xItemWindow (xController->createItemWindow(rxParentWindow)); - Window* pItemWindow = VCLUnoHelper::GetWindow(xItemWindow); + vcl::Window* pItemWindow = VCLUnoHelper::GetWindow(xItemWindow); if (pItemWindow != NULL) { WindowType nType = pItemWindow->GetType(); diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 20fdb19e7bc7..e5baf1c9d9bd 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -42,7 +42,7 @@ namespace sfx2 { namespace sidebar { Deck::Deck ( const DeckDescriptor& rDeckDescriptor, - Window* pParentWindow, + vcl::Window* pParentWindow, const ::boost::function<void(void)>& rCloserAction) : Window(pParentWindow, 0), msId(rDeckDescriptor.msId), @@ -52,9 +52,9 @@ Deck::Deck ( mnMinimalWidth(0), maPanels(), mpTitleBar(new DeckTitleBar(rDeckDescriptor.msTitle, this, rCloserAction)), - mpScrollClipWindow(new Window(this)), + mpScrollClipWindow(new vcl::Window(this)), mpScrollContainer(new ScrollContainerWindow(mpScrollClipWindow.get())), - mpFiller(new Window(this)), + mpFiller(new vcl::Window(this)), mpVerticalScrollBar(new ScrollBar(this)) { SetBackground(Wallpaper()); @@ -254,7 +254,7 @@ void Deck::RequestLayout (void) *mpVerticalScrollBar); } -::Window* Deck::GetPanelParentWindow (void) +vcl::Window* Deck::GetPanelParentWindow (void) { return mpScrollContainer.get(); } @@ -291,7 +291,7 @@ void Deck::ShowPanel (const Panel& rPanel) -const OUString GetWindowClassification (const Window* pWindow) +const OUString GetWindowClassification (const vcl::Window* pWindow) { const OUString& rsName (pWindow->GetText()); if (!rsName.isEmpty()) @@ -305,7 +305,7 @@ const OUString GetWindowClassification (const Window* pWindow) } -void Deck::PrintWindowSubTree (Window* pRoot, int nIndentation) +void Deck::PrintWindowSubTree (vcl::Window* pRoot, int nIndentation) { static const char* sIndentation = " "; const Point aLocation (pRoot->GetPosPixel()); @@ -345,7 +345,7 @@ IMPL_LINK(Deck, HandleVerticalScrollBarChange,void*, EMPTYARG) //----- Deck::ScrollContainerWindow ------------------------------------------- -Deck::ScrollContainerWindow::ScrollContainerWindow (Window* pParentWindow) +Deck::ScrollContainerWindow::ScrollContainerWindow (vcl::Window* pParentWindow) : Window(pParentWindow), maSeparators() { diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx index a88e2589738f..c071f1d3a5d2 100644 --- a/sfx2/source/sidebar/Deck.hxx +++ b/sfx2/source/sidebar/Deck.hxx @@ -40,12 +40,12 @@ class DeckTitleBar; It displays the deck title. */ class Deck - : public Window + : public vcl::Window { public: Deck ( const DeckDescriptor& rDeckDescriptor, - Window* pParentWindow, + vcl::Window* pParentWindow, const ::boost::function<void(void)>& rCloserAction); virtual ~Deck (void); @@ -57,7 +57,7 @@ public: void SetPanels (const SharedPanelContainer& rPanels); const SharedPanelContainer& GetPanels (void) const { return maPanels;} void RequestLayout (void); - ::Window* GetPanelParentWindow (void); + vcl::Window* GetPanelParentWindow (void); /** Try to make the panel completely visible. When the whole panel does not fit then make its top visible @@ -70,14 +70,14 @@ public: virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE; void PrintWindowTree(); - static void PrintWindowSubTree (Window* pRoot, int nIndentation); + static void PrintWindowSubTree (vcl::Window* pRoot, int nIndentation); sal_Int32 GetMinimalWidth() const { return mnMinimalWidth; } - class ScrollContainerWindow : public Window + class ScrollContainerWindow : public vcl::Window { public: - ScrollContainerWindow (Window* pParentWindow); + ScrollContainerWindow (vcl::Window* pParentWindow); virtual ~ScrollContainerWindow (void); virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; void SetSeparators (const ::std::vector<sal_Int32>& rSeparators); @@ -94,9 +94,9 @@ private: sal_Int32 mnMinimalWidth; SharedPanelContainer maPanels; ::boost::scoped_ptr<DeckTitleBar> mpTitleBar; - ::boost::scoped_ptr<Window> mpScrollClipWindow; + ::boost::scoped_ptr<vcl::Window> mpScrollClipWindow; ::boost::scoped_ptr<ScrollContainerWindow> mpScrollContainer; - ::boost::scoped_ptr<Window> mpFiller; + ::boost::scoped_ptr<vcl::Window> mpFiller; ::boost::scoped_ptr<ScrollBar> mpVerticalScrollBar; DECL_LINK(HandleVerticalScrollBarChange,void*); diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index c4a425945cf0..a7639fbd6aac 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -50,10 +50,10 @@ void DeckLayouter::LayoutDeck ( const Rectangle aContentArea, sal_Int32& rMinimalWidth, SharedPanelContainer& rPanels, - Window& rDeckTitleBar, - Window& rScrollClipWindow, - Window& rScrollContainer, - Window& rFiller, + vcl::Window& rDeckTitleBar, + vcl::Window& rScrollClipWindow, + vcl::Window& rScrollContainer, + vcl::Window& rFiller, ScrollBar& rVerticalScrollBar) { if (aContentArea.GetWidth()<=0 || aContentArea.GetHeight()<=0) @@ -89,8 +89,8 @@ Rectangle DeckLayouter::LayoutPanels ( const Rectangle aContentArea, sal_Int32& rMinimalWidth, ::std::vector<LayoutItem>& rLayoutItems, - Window& rScrollClipWindow, - Window& rScrollContainer, + vcl::Window& rScrollClipWindow, + vcl::Window& rScrollContainer, ScrollBar& rVerticalScrollBar, const bool bShowVerticalScrollBar) { @@ -197,7 +197,7 @@ sal_Int32 DeckLayouter::PlacePanels ( ::std::vector<LayoutItem>& rLayoutItems, const sal_Int32 nWidth, const LayoutMode eMode, - Window& rScrollContainer) + vcl::Window& rScrollContainer) { ::std::vector<sal_Int32> aSeparators; const sal_Int32 nDeckSeparatorHeight (Theme::GetInteger(Theme::Int_DeckSeparatorHeight)); @@ -429,7 +429,7 @@ void DeckLayouter::DistributeHeights ( Rectangle DeckLayouter::PlaceDeckTitle ( - Window& rDeckTitleBar, + vcl::Window& rDeckTitleBar, const Rectangle& rAvailableSpace) { if (static_cast<DockingWindow*>(rDeckTitleBar.GetParent()->GetParent())->IsFloatingMode()) @@ -504,7 +504,7 @@ void DeckLayouter::SetupVerticalScrollBar( void DeckLayouter::UpdateFiller ( - Window& rFiller, + vcl::Window& rFiller, const Rectangle& rBox) { if (rBox.GetHeight() > 0) diff --git a/sfx2/source/sidebar/DeckLayouter.hxx b/sfx2/source/sidebar/DeckLayouter.hxx index 10a90e676528..fa2b5ea8bcda 100644 --- a/sfx2/source/sidebar/DeckLayouter.hxx +++ b/sfx2/source/sidebar/DeckLayouter.hxx @@ -28,7 +28,7 @@ #include <vector> class ScrollBar; -class Window; +namespace vcl { class Window; } namespace sfx2 { namespace sidebar { @@ -45,10 +45,10 @@ public: const Rectangle aContentArea, sal_Int32& rMinimalWidth, SharedPanelContainer& rPanels, - Window& pDeckTitleBar, - Window& pScrollClipWindow, - Window& pScrollContainer, - Window& pFiller, + vcl::Window& pDeckTitleBar, + vcl::Window& pScrollClipWindow, + vcl::Window& pScrollContainer, + vcl::Window& pFiller, ScrollBar& pVerticalScrollBar); private: @@ -80,8 +80,8 @@ private: const Rectangle aContentArea, sal_Int32& rMinimalWidth, ::std::vector<LayoutItem>& rLayoutItems, - Window& rScrollClipWindow, - Window& rScrollContainer, + vcl::Window& rScrollClipWindow, + vcl::Window& rScrollContainer, ScrollBar& pVerticalScrollBar, const bool bShowVerticalScrollBar); static void GetRequestedSizes ( @@ -98,9 +98,9 @@ private: ::std::vector<LayoutItem>& rLayoutItems, const sal_Int32 nWidth, const LayoutMode eMode, - Window& rScrollContainer); + vcl::Window& rScrollContainer); static Rectangle PlaceDeckTitle ( - Window& rTittleBar, + vcl::Window& rTittleBar, const Rectangle& rAvailableSpace); static Rectangle PlaceVerticalScrollBar ( ScrollBar& rVerticalScrollBar, @@ -111,7 +111,7 @@ private: const sal_Int32 nContentHeight, const sal_Int32 nVisibleHeight); static void UpdateFiller ( - Window& rFiller, + vcl::Window& rFiller, const Rectangle& rBox); }; diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx index fb1a6a0b7848..9a476f804b4f 100644 --- a/sfx2/source/sidebar/DeckTitleBar.cxx +++ b/sfx2/source/sidebar/DeckTitleBar.cxx @@ -37,7 +37,7 @@ static const sal_Int32 gaRightGripPadding (3); DeckTitleBar::DeckTitleBar ( const ::rtl::OUString& rsTitle, - Window* pParentWindow, + vcl::Window* pParentWindow, const ::boost::function<void(void)>& rCloserAction) : TitleBar(rsTitle, pParentWindow, GetBackgroundPaint()), mnCloserItemIndex(1), diff --git a/sfx2/source/sidebar/DeckTitleBar.hxx b/sfx2/source/sidebar/DeckTitleBar.hxx index dae392f16616..6717ca28caa4 100644 --- a/sfx2/source/sidebar/DeckTitleBar.hxx +++ b/sfx2/source/sidebar/DeckTitleBar.hxx @@ -32,7 +32,7 @@ class DeckTitleBar public: DeckTitleBar ( const ::rtl::OUString& rsTitle, - Window* pParentWindow, + vcl::Window* pParentWindow, const ::boost::function<void(void)>& rCloserAction); virtual ~DeckTitleBar (void); diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx index 244fc9413412..f7bf4f0492c2 100644 --- a/sfx2/source/sidebar/FocusManager.cxx +++ b/sfx2/source/sidebar/FocusManager.cxx @@ -174,7 +174,7 @@ void FocusManager::SetButtons (const ::std::vector<Button*>& rButtons) -void FocusManager::RegisterWindow (Window& rWindow) +void FocusManager::RegisterWindow (vcl::Window& rWindow) { rWindow.AddEventListener(LINK(this, FocusManager, WindowEventListener)); } @@ -182,7 +182,7 @@ void FocusManager::RegisterWindow (Window& rWindow) -void FocusManager::UnregisterWindow (Window& rWindow) +void FocusManager::UnregisterWindow (vcl::Window& rWindow) { rWindow.RemoveEventListener(LINK(this, FocusManager, WindowEventListener)); } @@ -190,7 +190,7 @@ void FocusManager::UnregisterWindow (Window& rWindow) -FocusManager::FocusLocation FocusManager::GetFocusLocation (const Window& rWindow) const +FocusManager::FocusLocation FocusManager::GetFocusLocation (const vcl::Window& rWindow) const { // Check the deck title. if (mpDeckTitleBar != NULL) @@ -309,7 +309,7 @@ void FocusManager::FocusPanel ( void FocusManager::FocusPanelContent (const sal_Int32 nPanelIndex) { - Window* pWindow = VCLUnoHelper::GetWindow(maPanels[nPanelIndex]->GetElementWindow()); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(maPanels[nPanelIndex]->GetElementWindow()); if (pWindow != NULL) { mbObservingContentControlFocus = true; @@ -342,7 +342,7 @@ void FocusManager::ClickButton (const sal_Int32 nButtonIndex) -void FocusManager::RemoveWindow (Window& rWindow) +void FocusManager::RemoveWindow (vcl::Window& rWindow) { ::std::vector<Panel*>::iterator iPanel (::std::find(maPanels.begin(), maPanels.end(), &rWindow)); if (iPanel != maPanels.end()) @@ -435,7 +435,7 @@ bool FocusManager::MoveFocusInsideDeckTitle ( void FocusManager::HandleKeyEvent ( const vcl::KeyCode& rKeyCode, - const Window& rWindow) + const vcl::Window& rWindow) { const FocusLocation aLocation (GetFocusLocation(rWindow)); mpLastFocusedWindow = NULL; @@ -594,7 +594,7 @@ IMPL_LINK(FocusManager, WindowEventListener, VclSimpleEvent*, pEvent) return 0; VclWindowEvent* pWindowEvent = static_cast<VclWindowEvent*>(pEvent); - Window* pSource = pWindowEvent->GetWindow(); + vcl::Window* pSource = pWindowEvent->GetWindow(); if (pSource == NULL) return 0; @@ -635,7 +635,7 @@ IMPL_LINK(FocusManager, ChildEventListener, VclSimpleEvent*, pEvent) return 0; VclWindowEvent* pWindowEvent = static_cast<VclWindowEvent*>(pEvent); - Window* pSource = pWindowEvent->GetWindow(); + vcl::Window* pSource = pWindowEvent->GetWindow(); if (pSource == NULL) return 0; @@ -647,7 +647,7 @@ IMPL_LINK(FocusManager, ChildEventListener, VclSimpleEvent*, pEvent) // Go up the window hierarchy to find out whether the // parent of the event source is known to us. - Window* pWindow = pSource; + vcl::Window* pWindow = pSource; FocusLocation aLocation (PC_None, -1); while (true) { diff --git a/sfx2/source/sidebar/FocusManager.hxx b/sfx2/source/sidebar/FocusManager.hxx index d0d9c2c2a5b2..f8dba00ebcf4 100644 --- a/sfx2/source/sidebar/FocusManager.hxx +++ b/sfx2/source/sidebar/FocusManager.hxx @@ -73,8 +73,8 @@ private: ::std::vector<Button*> maButtons; const ::boost::function<void(const Panel&)> maShowPanelFunctor; bool mbObservingContentControlFocus; - Window* mpFirstFocusedContentControl; - Window* mpLastFocusedWindow; + vcl::Window* mpFirstFocusedContentControl; + vcl::Window* mpLastFocusedWindow; enum PanelComponent { @@ -105,12 +105,12 @@ private: /** Let the focus manager listen for window events for the given window. */ - void RegisterWindow (Window& rWindow); - void UnregisterWindow (Window& rWindow); + void RegisterWindow (vcl::Window& rWindow); + void UnregisterWindow (vcl::Window& rWindow); /** Remove the window from the panel or the button container. */ - void RemoveWindow (Window& rWindow); + void RemoveWindow (vcl::Window& rWindow); void FocusDeckTitle (void); bool IsDeckTitleVisible (void) const; @@ -141,9 +141,9 @@ private: void HandleKeyEvent ( const vcl::KeyCode& rKeyCode, - const Window& rWindow); + const vcl::Window& rWindow); - FocusLocation GetFocusLocation (const Window& rWindow) const; + FocusLocation GetFocusLocation (const vcl::Window& rWindow) const; }; diff --git a/sfx2/source/sidebar/MenuButton.cxx b/sfx2/source/sidebar/MenuButton.cxx index f2e9a438fabf..7bccc4f87b26 100644 --- a/sfx2/source/sidebar/MenuButton.cxx +++ b/sfx2/source/sidebar/MenuButton.cxx @@ -31,7 +31,7 @@ using namespace css::uno; namespace sfx2 { namespace sidebar { -MenuButton::MenuButton (Window* pParentWindow) +MenuButton::MenuButton (vcl::Window* pParentWindow) : CheckBox(pParentWindow), mbIsLeftButtonDown(false), mePaintType(PT_Theme) diff --git a/sfx2/source/sidebar/MenuButton.hxx b/sfx2/source/sidebar/MenuButton.hxx index 268eff9a3da6..0077c2417dbe 100644 --- a/sfx2/source/sidebar/MenuButton.hxx +++ b/sfx2/source/sidebar/MenuButton.hxx @@ -28,7 +28,7 @@ class MenuButton : public CheckBox { public: - MenuButton (Window* pParentWindow); + MenuButton (vcl::Window* pParentWindow); virtual ~MenuButton (void); virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx index b96b439c0167..bc89d9b45a9f 100644 --- a/sfx2/source/sidebar/Panel.cxx +++ b/sfx2/source/sidebar/Panel.cxx @@ -47,7 +47,7 @@ namespace sfx2 { namespace sidebar { Panel::Panel ( const PanelDescriptor& rPanelDescriptor, - Window* pParentWindow, + vcl::Window* pParentWindow, const bool bIsInitiallyExpanded, const ::boost::function<void(void)>& rDeckLayoutTrigger, const ::boost::function<Context(void)>& rContextAccess) diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx index 7196a77dd3e5..2fea00bcfd56 100644 --- a/sfx2/source/sidebar/Panel.hxx +++ b/sfx2/source/sidebar/Panel.hxx @@ -39,12 +39,12 @@ class PanelTitleBar; class Panel - : public Window + : public vcl::Window { public: Panel ( const PanelDescriptor& rPanelDescriptor, - Window* pParentWindow, + vcl::Window* pParentWindow, const bool bIsInitiallyExpanded, const ::boost::function<void(void)>& rDeckLayoutTrigger, const ::boost::function<Context(void)>& rContextAccess); diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index 5f722cb700bb..983b25de38ab 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -43,7 +43,7 @@ static const sal_Int32 gaRightIconPadding (5); PanelTitleBar::PanelTitleBar ( const ::rtl::OUString& rsTitle, - Window* pParentWindow, + vcl::Window* pParentWindow, Panel* pPanel) : TitleBar(rsTitle, pParentWindow, GetBackgroundPaint()), mbIsLeftButtonDown(false), diff --git a/sfx2/source/sidebar/PanelTitleBar.hxx b/sfx2/source/sidebar/PanelTitleBar.hxx index 2e2adbb9510c..57f9469dfa64 100644 --- a/sfx2/source/sidebar/PanelTitleBar.hxx +++ b/sfx2/source/sidebar/PanelTitleBar.hxx @@ -35,7 +35,7 @@ class PanelTitleBar public: PanelTitleBar ( const ::rtl::OUString& rsTitle, - Window* pParentWindow, + vcl::Window* pParentWindow, Panel* pPanel ); virtual ~PanelTitleBar (void); diff --git a/sfx2/source/sidebar/PopupContainer.cxx b/sfx2/source/sidebar/PopupContainer.cxx index 9167dd61d965..97566fba0a7a 100644 --- a/sfx2/source/sidebar/PopupContainer.cxx +++ b/sfx2/source/sidebar/PopupContainer.cxx @@ -22,7 +22,7 @@ namespace sfx2 { namespace sidebar { -PopupContainer::PopupContainer (Window* pParent) +PopupContainer::PopupContainer (vcl::Window* pParent) : FloatingWindow(pParent, WB_SYSTEMWINDOW | WB_3DLOOK) { } diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx index fc78ac712c82..f6aa2fdf5222 100644 --- a/sfx2/source/sidebar/SidebarChildWindow.cxx +++ b/sfx2/source/sidebar/SidebarChildWindow.cxx @@ -34,7 +34,7 @@ SFX_IMPL_DOCKINGWINDOW_WITHID(SidebarChildWindow, SID_SIDEBAR); SidebarChildWindow::SidebarChildWindow ( - Window* pParentWindow, + vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) @@ -61,7 +61,7 @@ SidebarChildWindow::SidebarChildWindow ( -sal_Int32 SidebarChildWindow::GetDefaultWidth (Window* pWindow) +sal_Int32 SidebarChildWindow::GetDefaultWidth (vcl::Window* pWindow) { if (pWindow != NULL) { diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index ed8861764a63..540de5b49d85 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -330,7 +330,7 @@ void SidebarController::NotifyResize (void) return; } - Window* pParentWindow = mpTabBar->GetParent(); + vcl::Window* pParentWindow = mpTabBar->GetParent(); sal_Int32 nTabBarDefaultWidth = TabBar::GetDefaultWidth() * mpTabBar->GetDPIScaleFactor(); const sal_Int32 nWidth (pParentWindow->GetSizePixel().Width()); @@ -720,7 +720,7 @@ void SidebarController::SwitchToDeck ( SharedPanel SidebarController::CreatePanel ( const OUString& rsPanelId, - ::Window* pParentWindow, + vcl::Window* pParentWindow, const bool bIsInitiallyExpanded, const Context& rContext) { @@ -1096,7 +1096,7 @@ sal_Int32 SidebarController::SetChildWindowWidth (const sal_Int32 nNewWidth) pSplitWindow->GetWindowPos(mpParentWindow, nColumn, nRow); const long nColumnWidth (pSplitWindow->GetLineSize(nColumn)); - Window* pWindow = mpParentWindow; + vcl::Window* pWindow = mpParentWindow; const Size aWindowSize (pWindow->GetSizePixel()); pSplitWindow->MoveWindow( diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx index 31306b2300ce..33cfea65e15a 100644 --- a/sfx2/source/sidebar/SidebarController.hxx +++ b/sfx2/source/sidebar/SidebarController.hxx @@ -184,7 +184,7 @@ private: to indicate that when the current mouse drag operation ends, the sidebar will only show the tab bar. */ - ::boost::scoped_ptr<Window> mpCloseIndicator; + ::boost::scoped_ptr<vcl::Window> mpCloseIndicator; DECL_LINK(WindowEventHandler, VclWindowEvent*); /** Make maRequestedContext the current context. @@ -198,7 +198,7 @@ private: const Context& rContext); SharedPanel CreatePanel ( const ::rtl::OUString& rsPanelId, - ::Window* pParentWindow, + vcl::Window* pParentWindow, const bool bIsInitiallyExpanded, const Context& rContext); void SwitchToDeck ( diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index d6c91db1ce50..1a39746f810d 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -34,7 +34,7 @@ namespace sfx2 { namespace sidebar { SidebarDockingWindow::SidebarDockingWindow( SfxBindings* pSfxBindings, SidebarChildWindow& rChildWindow, - Window* pParentWindow, + vcl::Window* pParentWindow, WinBits nBits) : SfxDockingWindow(pSfxBindings, &rChildWindow, pParentWindow, nBits), mpSidebarController() diff --git a/sfx2/source/sidebar/SidebarDockingWindow.hxx b/sfx2/source/sidebar/SidebarDockingWindow.hxx index 0fde50e6e8b0..2c46e41cc31e 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.hxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.hxx @@ -36,7 +36,7 @@ public: SidebarDockingWindow( SfxBindings* pBindings, SidebarChildWindow& rChildWindow, - Window* pParent, + vcl::Window* pParent, WinBits nBits); virtual ~SidebarDockingWindow (void); diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx index 8e4c9b0f3d12..74f3c0e9d859 100644 --- a/sfx2/source/sidebar/SidebarPanelBase.cxx +++ b/sfx2/source/sidebar/SidebarPanelBase.cxx @@ -37,7 +37,7 @@ namespace sfx2 { namespace sidebar { Reference<ui::XUIElement> SidebarPanelBase::Create ( const ::rtl::OUString& rsResourceURL, const css::uno::Reference<css::frame::XFrame>& rxFrame, - Window* pWindow, + vcl::Window* pWindow, const css::ui::LayoutSize& rLayoutSize) { Reference<ui::XUIElement> xUIElement ( @@ -55,7 +55,7 @@ Reference<ui::XUIElement> SidebarPanelBase::Create ( SidebarPanelBase::SidebarPanelBase ( const ::rtl::OUString& rsResourceURL, const css::uno::Reference<css::frame::XFrame>& rxFrame, - Window* pWindow, + vcl::Window* pWindow, const css::ui::LayoutSize& rLayoutSize) : SidebarPanelBaseInterfaceBase(m_aMutex), mxFrame(rxFrame), diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index f6f1e5c0c5cf..0f038a13c79b 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -38,7 +38,7 @@ using ::rtl::OUString; namespace sfx2 { namespace sidebar { -SidebarToolBox::SidebarToolBox (Window* pParentWindow) +SidebarToolBox::SidebarToolBox (vcl::Window* pParentWindow) : ToolBox(pParentWindow, 0), maItemSeparator(Theme::GetImage(Theme::Image_ToolBoxItemSeparator)), maControllers(), @@ -53,7 +53,7 @@ SidebarToolBox::SidebarToolBox (Window* pParentWindow) #endif } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSidebarToolBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSidebarToolBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new SidebarToolBox(pParent); } diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index c64f0eaeeed8..563b5feb12c8 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -44,7 +44,7 @@ using namespace css::uno; namespace sfx2 { namespace sidebar { TabBar::TabBar ( - Window* pParentWindow, + vcl::Window* pParentWindow, const Reference<frame::XFrame>& rxFrame, const ::boost::function<void(const ::rtl::OUString&)>& rDeckActivationFunctor, const PopupMenuProvider& rPopupMenuProvider) diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx index ffef7729759a..b9cdc556f9a5 100644 --- a/sfx2/source/sidebar/TabBar.hxx +++ b/sfx2/source/sidebar/TabBar.hxx @@ -45,7 +45,7 @@ class TabItem; /** The tab bar is the container for the individual tabs. */ class TabBar - : public Window + : public vcl::Window { public: /** DeckMenuData has entries for display name, deck id, and a flag: @@ -65,7 +65,7 @@ public: const Rectangle&, const ::std::vector<DeckMenuData>& rMenuData)> PopupMenuProvider; TabBar ( - Window* pParentWindow, + vcl::Window* pParentWindow, const css::uno::Reference<css::frame::XFrame>& rxFrame, const ::boost::function<void(const ::rtl::OUString&rsDeckId)>& rDeckActivationFunctor, const PopupMenuProvider& rPopupMenuProvider); diff --git a/sfx2/source/sidebar/TabItem.cxx b/sfx2/source/sidebar/TabItem.cxx index 1d5bc994e34e..a7037da0f73a 100644 --- a/sfx2/source/sidebar/TabItem.cxx +++ b/sfx2/source/sidebar/TabItem.cxx @@ -32,7 +32,7 @@ using namespace css::uno; namespace sfx2 { namespace sidebar { -TabItem::TabItem (Window* pParentWindow) +TabItem::TabItem (vcl::Window* pParentWindow) : ImageRadioButton(pParentWindow), mbIsLeftButtonDown(false), mePaintType(PT_Theme) diff --git a/sfx2/source/sidebar/TabItem.hxx b/sfx2/source/sidebar/TabItem.hxx index 32ee7d5394cb..9872d379ee5d 100644 --- a/sfx2/source/sidebar/TabItem.hxx +++ b/sfx2/source/sidebar/TabItem.hxx @@ -23,7 +23,7 @@ #include "DeckDescriptor.hxx" -class Window; +namespace vcl { class Window; } namespace sfx2 { namespace sidebar { @@ -33,7 +33,7 @@ class TabItem : public ImageRadioButton { public: - TabItem (Window* pParentWindow); + TabItem (vcl::Window* pParentWindow); virtual ~TabItem (void); virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx index 3295859d3066..ca59c4b1c3df 100644 --- a/sfx2/source/sidebar/TitleBar.cxx +++ b/sfx2/source/sidebar/TitleBar.cxx @@ -39,7 +39,7 @@ namespace sfx2 { namespace sidebar { TitleBar::TitleBar ( const ::rtl::OUString& rsTitle, - Window* pParentWindow, + vcl::Window* pParentWindow, const sidebar::Paint& rInitialBackgroundPaint) : Window(pParentWindow), maToolBox(this), diff --git a/sfx2/source/sidebar/TitleBar.hxx b/sfx2/source/sidebar/TitleBar.hxx index a499bca14563..a6bdedf0ff79 100644 --- a/sfx2/source/sidebar/TitleBar.hxx +++ b/sfx2/source/sidebar/TitleBar.hxx @@ -28,12 +28,12 @@ namespace sfx2 { namespace sidebar { class TitleBar - : public Window + : public vcl::Window { public: TitleBar ( const ::rtl::OUString& rsTitle, - Window* pParentWindow, + vcl::Window* pParentWindow, const sidebar::Paint& rInitialBackgroundPaint); virtual ~TitleBar (void); diff --git a/sfx2/source/sidebar/ToolBox.hxx b/sfx2/source/sidebar/ToolBox.hxx index 72e5850b3583..94e91f7dd505 100644 --- a/sfx2/source/sidebar/ToolBox.hxx +++ b/sfx2/source/sidebar/ToolBox.hxx @@ -28,7 +28,7 @@ class ToolBox : public ::ToolBox { public: - MenuButton (Window* pParentWindow); + MenuButton (vcl::Window* pParentWindow); virtual ~MenuButton (void); virtual void Paint (const Rectangle& rUpdateArea); diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index dcd74baf447d..a6c3be44cd3c 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -107,7 +107,7 @@ using namespace ::com::sun::star::ui; SFX_IMPL_TOOLBOX_CONTROL_ARG(SfxToolBoxControl, SfxStringItem, true); SFX_IMPL_TOOLBOX_CONTROL(SfxRecentFilesToolBoxControl, SfxStringItem); -static Window* GetTopMostParentSystemWindow( Window* pWindow ) +static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow ) { OSL_ASSERT( pWindow ); if ( pWindow ) @@ -204,7 +204,7 @@ IMPL_LINK( SfxToolBoxControl_Impl, WindowEventListener, VclSimpleEvent*, pEvent (( pEvent->GetId() == VCLEVENT_WINDOW_MOVE ) || ( pEvent->GetId() == VCLEVENT_WINDOW_ACTIVATE ))) { - Window* pWindow( ((VclWindowEvent*)pEvent)->GetWindow() ); + vcl::Window* pWindow( ((VclWindowEvent*)pEvent)->GetWindow() ); if (( pWindow == mpFloatingWindow ) && ( mpPopupWindow != 0 )) { @@ -274,7 +274,7 @@ void SAL_CALL SfxToolBoxControl::dispose() throw (::com::sun::star::uno::Runtime // Remove and destroy our item window at our toolbox SolarMutexGuard aGuard; - Window* pWindow = pImpl->pBox->GetItemWindow( pImpl->nTbxId ); + vcl::Window* pWindow = pImpl->pBox->GetItemWindow( pImpl->nTbxId ); pImpl->pBox->SetItemWindow( pImpl->nTbxId, 0 ); delete pWindow; @@ -625,7 +625,7 @@ void SAL_CALL SfxToolBoxControl::doubleClick() throw (::com::sun::star::uno::Run Reference< ::com::sun::star::awt::XWindow > SAL_CALL SfxToolBoxControl::createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - Window* pWindow = CreatePopupWindow(); + vcl::Window* pWindow = CreatePopupWindow(); if ( pWindow ) return VCLUnoHelper::GetInterface( pWindow ); else @@ -720,7 +720,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) OUString aPersistentString( "Persistent" ); try { - Window* pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar ); + vcl::Window* pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar ); if ( pTbxWindow && pTbxWindow->GetType() == WINDOW_TOOLBOX ) { Any a; @@ -823,14 +823,14 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const OUString& rSubToolBar } pImpl->mxUIElement = xUIElement; - Window* pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar ); + vcl::Window* pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar ); ToolBox* pToolBar( 0 ); if ( pTbxWindow && pTbxWindow->GetType() == WINDOW_TOOLBOX ) pToolBar = (ToolBox *)pTbxWindow; if ( pToolBar ) { - Window* pParentTbxWindow( pImpl->pBox ); + vcl::Window* pParentTbxWindow( pImpl->pBox ); pToolBar->SetParent( pParentTbxWindow ); ::Size aSize = getPersistentFloatingSize( xFrame, rSubToolBarResName ); if ( aSize.Width() == 0 || aSize.Height() == 0 ) @@ -841,7 +841,7 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const OUString& rSubToolBar pToolBar->SetSizePixel( aSize ); // open subtoolbox in popup mode - Window::GetDockingManager()->StartPopupMode( pImpl->pBox, pToolBar ); + vcl::Window::GetDockingManager()->StartPopupMode( pImpl->pBox, pToolBar ); } } } @@ -992,7 +992,7 @@ SfxPopupWindow* SfxToolBoxControl::CreatePopupWindowCascading() -Window* SfxToolBoxControl::CreateItemWindow( Window * ) +vcl::Window* SfxToolBoxControl::CreateItemWindow( vcl::Window * ) { return 0; } @@ -1148,7 +1148,7 @@ SfxPopupWindow::SfxPopupWindow( , m_xFrame( rFrame ) , m_pStatusListener( 0 ) { - Window* pWindow = GetTopMostParentSystemWindow( this ); + vcl::Window* pWindow = GetTopMostParentSystemWindow( this ); if ( pWindow ) ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); } @@ -1162,7 +1162,7 @@ SfxPopupWindow::SfxPopupWindow(sal_uInt16 nId, const OString& rID, const OUStrin , m_xFrame( rFrame ) , m_pStatusListener( 0 ) { - Window* pWindow = GetTopMostParentSystemWindow( this ); + vcl::Window* pWindow = GetTopMostParentSystemWindow( this ); if ( pWindow ) ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); } @@ -1170,7 +1170,7 @@ SfxPopupWindow::SfxPopupWindow(sal_uInt16 nId, const OString& rID, const OUStrin SfxPopupWindow::SfxPopupWindow( sal_uInt16 nId, const Reference< XFrame >& rFrame, - Window* pParentWindow, + vcl::Window* pParentWindow, WinBits nBits ) : FloatingWindow( pParentWindow, nBits ) , m_bFloating( false ) @@ -1179,14 +1179,14 @@ SfxPopupWindow::SfxPopupWindow( , m_xFrame( rFrame ) , m_pStatusListener( 0 ) { - Window* pWindow = GetTopMostParentSystemWindow( this ); + vcl::Window* pWindow = GetTopMostParentSystemWindow( this ); if ( pWindow ) ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); } SfxPopupWindow::SfxPopupWindow( sal_uInt16 nId, - Window* pParentWindow, + vcl::Window* pParentWindow, const OString& rID, const OUString& rUIXMLDescription, const Reference< XFrame >& rFrame ) : FloatingWindow( pParentWindow, rID, rUIXMLDescription, rFrame) @@ -1196,7 +1196,7 @@ SfxPopupWindow::SfxPopupWindow( , m_xFrame( rFrame ) , m_pStatusListener( 0 ) { - Window* pWindow = GetTopMostParentSystemWindow( this ); + vcl::Window* pWindow = GetTopMostParentSystemWindow( this ); if ( pWindow ) ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); } @@ -1209,7 +1209,7 @@ SfxPopupWindow::~SfxPopupWindow() m_xStatusListener.clear(); } - Window* pWindow = GetTopMostParentSystemWindow( this ); + vcl::Window* pWindow = GetTopMostParentSystemWindow( this ); if ( pWindow ) ((SystemWindow *)pWindow)->GetTaskPaneList()->RemoveWindow( this ); } @@ -1309,7 +1309,7 @@ void SfxPopupWindow::MouseMove( const ::MouseEvent& rMEvt ) ::Point aPos = rMEvt.GetPosPixel(); ::Point aScrPos = OutputToScreenPixel( aPos ); sal_uInt16 i = 0; - Window* pWindow = GetChild( i ); + vcl::Window* pWindow = GetChild( i ); while ( pWindow ) { ::MouseEvent aMEvt( pWindow->ScreenToOutputPixel( aScrPos ), diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 98402fc29acc..9ea3800f7c11 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -858,7 +858,7 @@ void SfxFrame::GrabFocusOnComponent_Impl() return; } - Window* pFocusWindow = &GetWindow(); + vcl::Window* pFocusWindow = &GetWindow(); if ( GetCurrentViewFrame() && GetCurrentViewFrame()->GetViewShell() && GetCurrentViewFrame()->GetViewShell()->GetWindow() ) pFocusWindow = GetCurrentViewFrame()->GetViewShell()->GetWindow(); diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 80442e295543..4a9cb220a4f1 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -62,12 +62,12 @@ using ::com::sun::star::frame::XComponentLoader; -class SfxFrameWindow_Impl : public Window +class SfxFrameWindow_Impl : public vcl::Window { public: SfxFrame* pFrame; - SfxFrameWindow_Impl( SfxFrame* pF, Window& i_rContainerWindow ); + SfxFrameWindow_Impl( SfxFrame* pF, vcl::Window& i_rContainerWindow ); virtual ~SfxFrameWindow_Impl( ); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -79,7 +79,7 @@ public: void DoResize(); }; -SfxFrameWindow_Impl::SfxFrameWindow_Impl( SfxFrame* pF, Window& i_rContainerWindow ) +SfxFrameWindow_Impl::SfxFrameWindow_Impl( SfxFrame* pF, vcl::Window& i_rContainerWindow ) : Window( &i_rContainerWindow, WB_BORDER | WB_CLIPCHILDREN | WB_NODIALOGCONTROL | WB_3DLOOK ) , pFrame( pF ) { @@ -150,7 +150,7 @@ bool SfxFrameWindow_Impl::PreNotify( NotifyEvent& rNEvt ) } else if ( nType == EVENT_MOUSEBUTTONUP || nType == EVENT_MOUSEBUTTONDOWN ) { - Window* pWindow = rNEvt.GetWindow(); + vcl::Window* pWindow = rNEvt.GetWindow(); SfxViewFrame* pView = pFrame->GetCurrentViewFrame(); SfxViewShell* pShell = pView ? pView->GetViewShell() : NULL; if ( pShell ) @@ -161,7 +161,7 @@ bool SfxFrameWindow_Impl::PreNotify( NotifyEvent& rNEvt ) if ( nType == EVENT_MOUSEBUTTONDOWN ) { - Window* pWindow = rNEvt.GetWindow(); + vcl::Window* pWindow = rNEvt.GetWindow(); const MouseEvent* pMEvent = rNEvt.GetMouseEvent(); Point aPos = pWindow->OutputToScreenPixel( pMEvent->GetPosPixel() ); SfxWorkWindow *pWorkWin = pFrame->GetWorkWindow_Impl(); @@ -225,7 +225,7 @@ Reference < XFrame > SfxFrame::CreateBlankFrame() return xFrame; } -SfxFrame* SfxFrame::Create( SfxObjectShell& rDoc, Window& rWindow, sal_uInt16 nViewId, bool bHidden ) +SfxFrame* SfxFrame::Create( SfxObjectShell& rDoc, vcl::Window& rWindow, sal_uInt16 nViewId, bool bHidden ) { SfxFrame* pFrame = NULL; try @@ -287,7 +287,7 @@ SfxFrame* SfxFrame::Create( const Reference < XFrame >& i_rFrame ) { // create a new TopFrame to an external XFrame object ( wrap controller ) ENSURE_OR_THROW( i_rFrame.is(), "NULL frame not allowed" ); - Window* pWindow = VCLUnoHelper::GetWindow( i_rFrame->getContainerWindow() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( i_rFrame->getContainerWindow() ); ENSURE_OR_THROW( pWindow, "frame without container window not allowed" ); SfxFrame* pFrame = new SfxFrame( *pWindow, false ); @@ -295,7 +295,7 @@ SfxFrame* SfxFrame::Create( const Reference < XFrame >& i_rFrame ) return pFrame; } -SfxFrame::SfxFrame( Window& i_rContainerWindow, bool i_bHidden ) +SfxFrame::SfxFrame( vcl::Window& i_rContainerWindow, bool i_bHidden ) :SvCompatWeakBase<SfxFrame>( this ) ,pParentFrame( NULL ) ,pChildArr( NULL ) diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx index e66e59fcf5d3..5f1aaae8e4fc 100644 --- a/sfx2/source/view/impframe.hxx +++ b/sfx2/source/view/impframe.hxx @@ -51,7 +51,7 @@ public: SfxWorkWindow* pWorkWin; SvBorder aBorder; // formerly SfxTopFrame - Window* pExternalContainerWindow; + vcl::Window* pExternalContainerWindow; bool bHidden; bool bLockResize; bool bMenuBarOn; diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx index d91a3a39725e..a1debee4f458 100644 --- a/sfx2/source/view/impviewframe.hxx +++ b/sfx2/source/view/impviewframe.hxx @@ -35,9 +35,9 @@ struct SfxViewFrame_Impl OUString aActualURL; SfxFrame& rFrame; svtools::AsynchronLink* pReloader; - Window* pWindow; + vcl::Window* pWindow; SfxViewFrame* pActiveChild; - Window* pFocusWin; + vcl::Window* pFocusWin; sal_uInt16 nDocViewNo; sal_uInt16 nCurViewId; bool bResizeInToOut:1; @@ -79,12 +79,12 @@ struct SfxViewFrame_Impl } }; -class SfxFrameViewWindow_Impl : public Window +class SfxFrameViewWindow_Impl : public vcl::Window { SfxViewFrame* pFrame; public: - SfxFrameViewWindow_Impl( SfxViewFrame* p, Window& rParent, WinBits nBits=0 ) : + SfxFrameViewWindow_Impl( SfxViewFrame* p, vcl::Window& rParent, WinBits nBits=0 ) : Window( &rParent, nBits | WB_CLIPCHILDREN ), pFrame( p ) { diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 6700ec907e01..ef03157900e2 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -607,7 +607,7 @@ IMPL_LINK_NOARG(SfxInPlaceClient_Impl, TimerHdl) // SfxInPlaceClient -SfxInPlaceClient::SfxInPlaceClient( SfxViewShell* pViewShell, Window *pDraw, sal_Int64 nAspect ) : +SfxInPlaceClient::SfxInPlaceClient( SfxViewShell* pViewShell, vcl::Window *pDraw, sal_Int64 nAspect ) : m_pImp( new SfxInPlaceClient_Impl ), m_pViewSh( pViewShell ), m_pEditWin( pDraw ) @@ -1041,7 +1041,7 @@ void SfxInPlaceClient::DeactivateObject() uno::Reference< frame::XController > xController = xModel->getCurrentController(); if ( xController.is() ) { - Window* pWindow = VCLUnoHelper::GetWindow( xController->getFrame()->getContainerWindow() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xController->getFrame()->getContainerWindow() ); bHasFocus = pWindow->HasChildPathFocus( true ); } } diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx index 94bb8c49705c..7ade26dc6c68 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -202,7 +202,7 @@ void SfxPrinter::SetOptions( const SfxItemSet &rNewOptions ) -SfxPrintOptionsDialog::SfxPrintOptionsDialog(Window *pParent, +SfxPrintOptionsDialog::SfxPrintOptionsDialog(vcl::Window *pParent, SfxViewShell *pViewShell, const SfxItemSet *pSet) diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 953950afbad5..f62610a79ee0 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -1276,14 +1276,14 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) pViewFrame->GetDispatcher()->Flush(); } - Window* pEditWin = m_pData->m_pViewShell->GetWindow(); + vcl::Window* pEditWin = m_pData->m_pViewShell->GetWindow(); if ( pEditWin && m_pData->m_pViewShell->IsShowView_Impl() ) pEditWin->Show(); if ( SfxViewFrame::Current() == pViewFrame ) pViewFrame->GetDispatcher()->Update_Impl( true ); - Window* pFrameWin = &pViewFrame->GetWindow(); + vcl::Window* pFrameWin = &pViewFrame->GetWindow(); if ( pFrameWin != &pViewFrame->GetFrame().GetWindow() ) pFrameWin->Show(); diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index e7ebd7686800..e4e44d166bde 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1222,7 +1222,7 @@ bool SfxViewFrame::SetBorderPixelImpl Size aOldSize = GetWindow().GetOutputSizePixel(); GetWindow().SetOutputSizePixel( aSize ); - Window* pParent = &GetWindow(); + vcl::Window* pParent = &GetWindow(); while ( pParent->GetParent() ) pParent = pParent->GetParent(); Size aOuterSize = pParent->GetOutputSizePixel(); @@ -1709,7 +1709,7 @@ void SfxViewFrame::Enable( bool bEnable ) } else { - Window *pWindow = &GetFrame().GetTopFrame().GetWindow(); + vcl::Window *pWindow = &GetFrame().GetTopFrame().GetWindow(); if ( !bEnable ) pImp->bWindowWasEnabled = pWindow->IsInputEnabled(); if ( !bEnable || pImp->bWindowWasEnabled ) @@ -1817,7 +1817,7 @@ void SfxViewFrame::MakeActive_Impl( bool bGrabFocus ) xSupp->setActiveFrame( uno::Reference < frame::XFrame >() ); css::uno::Reference< css::awt::XWindow > xContainerWindow = xFrame->getContainerWindow(); - Window* pWindow = VCLUnoHelper::GetWindow(xContainerWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(xContainerWindow); if (pWindow && pWindow->HasChildPathFocus() && bGrabFocus) { SfxInPlaceClient *pCli = GetViewShell()->GetUIActiveClient(); @@ -2485,7 +2485,7 @@ SfxViewFrame* SfxViewFrame::GetTopViewFrame() const return GetFrame().GetTopFrame().GetCurrentViewFrame(); } -Window& SfxViewFrame::GetWindow() const +vcl::Window& SfxViewFrame::GetWindow() const { return pImp->pWindow ? *pImp->pWindow : GetFrame().GetWindow(); } diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 1463248fc425..9ae83cda38a0 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -453,7 +453,7 @@ IMPL_LINK_NOARG(SfxDialogExecutor_Impl, Execute) return 0; // Create Dialog - boost::scoped_ptr<SfxPrintOptionsDialog> pDlg(new SfxPrintOptionsDialog( static_cast<Window*>(_pSetupParent), + boost::scoped_ptr<SfxPrintOptionsDialog> pDlg(new SfxPrintOptionsDialog( static_cast<vcl::Window*>(_pSetupParent), _pViewSh, _pOptions )); if ( _bHelpDisabled ) pDlg->DisableHelp(); @@ -885,7 +885,7 @@ sal_uInt16 SfxViewShell::SetPrinter( SfxPrinter* /*pNewPrinter*/, sal_uInt16 /*n SfxTabPage* SfxViewShell::CreatePrintOptionsPage ( - Window* /*pParent*/, + vcl::Window* /*pParent*/, const SfxItemSet& /*rOptions*/ ) { diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index fc87a0a9f74b..27cc1dfc28e8 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -475,7 +475,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) if(xElement.is()) { uno::Reference< awt::XWindow > xWin( xElement->getRealInterface(), uno::UNO_QUERY_THROW ); - Window* pWin = VCLUnoHelper::GetWindow( xWin ); + vcl::Window* pWin = VCLUnoHelper::GetWindow( xWin ); ToolBox* pTextToolbox = dynamic_cast< ToolBox* >( pWin ); if( pTextToolbox ) { @@ -486,7 +486,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) const OUString& rCommand = pTextToolbox->GetItemCommand( nItemId ); if (rCommand == ".uno:StyleApply") { - Window* pItemWin = pTextToolbox->GetItemWindow( nItemId ); + vcl::Window* pItemWin = pTextToolbox->GetItemWindow( nItemId ); if( pItemWin ) pItemWin->GrabFocus(); break; @@ -930,7 +930,7 @@ void SfxViewShell::UIDeactivated( SfxInPlaceClient* /*pClient*/ ) SfxInPlaceClient* SfxViewShell::FindIPClient ( const uno::Reference < embed::XEmbeddedObject >& xObj, - Window* pObjParentWin + vcl::Window* pObjParentWin ) const { SfxInPlaceClientList *pClients = GetIPClientList_Impl(false); @@ -1185,7 +1185,7 @@ const SvBorder& SfxViewShell::GetBorderPixel() const void SfxViewShell::SetWindow ( - Window* pViewPort // For example Null pointer in the Destructor. + vcl::Window* pViewPort // For example Null pointer in the Destructor. ) /* [Description] |