diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
| commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
| tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /sw/source/uibase | |
| parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) | |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'sw/source/uibase')
180 files changed, 407 insertions, 407 deletions
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx index e7ed851b5225..8564a2d727f9 100644 --- a/sw/source/uibase/app/appenv.cxx +++ b/sw/source/uibase/app/appenv.cxx @@ -204,7 +204,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) } - Window *pParent = pOldSh ? pOldSh->GetWin() : 0; + vcl::Window *pParent = pOldSh ? pOldSh->GetWin() : 0; boost::scoped_ptr<SfxAbstractTabDialog> pDlg; short nMode = ENV_INSERT; diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx index cbf9093b5f03..cb6a1652a23c 100644 --- a/sw/source/uibase/app/appopt.cxx +++ b/sw/source/uibase/app/appopt.cxx @@ -413,7 +413,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) ApplyUsrPref( aViewOpt, pAppView, bTextDialog? VIEWOPT_DEST_TEXT : VIEWOPT_DEST_WEB); } -SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) { SfxTabPage* pRet = NULL; SfxAllItemSet aSet(*(rSet.GetPool())); diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 2a1f7e2d7ecd..deeb9d74aa06 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -251,10 +251,10 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium ) SfxViewFrame* pFrame1 = SfxViewFrame::GetFirst( this ); if (pFrame1) { - Window* pWindow = &pFrame1->GetWindow(); + vcl::Window* pWindow = &pFrame1->GetWindow(); if ( pWindow ) { - Window* pSysWin = pWindow->GetSystemWindow(); + vcl::Window* pSysWin = pWindow->GetSystemWindow(); if ( pSysWin ) { pSysWin->SetAccessibleName(OUString()); diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 4da0bb889835..f4a4e9fb87c0 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -130,7 +130,7 @@ using namespace ::sfx2; // create DocInfo (virtual) SfxDocumentInfoDialog* SwDocShell::CreateDocumentInfoDialog( - Window *pParent, const SfxItemSet &rSet) + vcl::Window *pParent, const SfxItemSet &rSet) { SfxDocumentInfoDialog* pDlg = new SfxDocumentInfoDialog(pParent, rSet); //only with statistics, when this document is being shown, not @@ -812,7 +812,7 @@ void SwDocShell::Execute(SfxRequest& rReq) pClipCntnr->CopyAnyData( FORMAT_RTF, (sal_Char*) pStrm->GetData(), pStrm->GetEndOfData() ); pClipCntnr->CopyToClipboard( - GetView()? (Window*)&GetView()->GetEditWin() : 0 ); + GetView()? (vcl::Window*)&GetView()->GetEditWin() : 0 ); delete pStrm; } } @@ -1480,7 +1480,7 @@ SfxInPlaceClient* SwDocShell::GetIPClient( const ::svt::EmbeddedObjectRef& xObjR SwWrtShell* pShell = GetWrtShell(); if ( pShell ) { - pResult = pShell->GetView().FindIPClient( xObjRef.GetObject(), (Window*)&pShell->GetView().GetEditWin() ); + pResult = pShell->GetView().FindIPClient( xObjRef.GetObject(), (vcl::Window*)&pShell->GetView().GetEditWin() ); if ( !pResult ) pResult = new SwOleClient( &pShell->GetView(), &pShell->GetView().GetEditWin(), xObjRef ); } diff --git a/sw/source/uibase/cctrl/actctrl.cxx b/sw/source/uibase/cctrl/actctrl.cxx index 05cda9e485be..5d7d156900aa 100644 --- a/sw/source/uibase/cctrl/actctrl.cxx +++ b/sw/source/uibase/cctrl/actctrl.cxx @@ -62,7 +62,7 @@ void ReturnActionEdit::KeyInput( const KeyEvent& rEvt) Edit::KeyInput(rEvt); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeReturnActionEdit(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeReturnActionEdit(vcl::Window *pParent, VclBuilder::stringmap &rMap) { VclBuilder::ensureDefaultWidthChars(rMap); return new ReturnActionEdit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); diff --git a/sw/source/uibase/cctrl/swlbox.cxx b/sw/source/uibase/cctrl/swlbox.cxx index bdd3f15869ad..b17e28a6314f 100644 --- a/sw/source/uibase/cctrl/swlbox.cxx +++ b/sw/source/uibase/cctrl/swlbox.cxx @@ -46,7 +46,7 @@ SwBoxEntry::SwBoxEntry(const SwBoxEntry& rOld) : { } -SwComboBox::SwComboBox(Window* pParent, WinBits nStyle) +SwComboBox::SwComboBox(vcl::Window* pParent, WinBits nStyle) : ComboBox(pParent, nStyle) { Init(); diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx index ea9ab8f3b286..011e0300f67d 100644 --- a/sw/source/uibase/config/viewopt.cxx +++ b/sw/source/uibase/config/viewopt.cxx @@ -295,7 +295,7 @@ SwViewOption::~SwViewOption() { } -void SwViewOption::Init( Window *pWin ) +void SwViewOption::Init( vcl::Window *pWin ) { if( !nPixelTwips && pWin ) { diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index 35cd95883a58..e3461d7f8375 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -169,7 +169,7 @@ Reference<XConnection> SwDBTreeList_Impl::GetConnection(const OUString& rSource return xRet; } -SwDBTreeList::SwDBTreeList(Window *pParent, WinBits nStyle) +SwDBTreeList::SwDBTreeList(vcl::Window *pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) , aImageList(SW_RES(ILIST_DB_DLG)) , bInitialized(false) @@ -180,7 +180,7 @@ SwDBTreeList::SwDBTreeList(Window *pParent, WinBits nStyle) InitTreeList(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwDBTreeList(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwDBTreeList(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/sw/source/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx index c242d39f60cd..677bf8836e6f 100644 --- a/sw/source/uibase/dbui/dbui.cxx +++ b/sw/source/uibase/dbui/dbui.cxx @@ -22,7 +22,7 @@ #include "dbui.hrc" #include "dbui.hxx" -PrintMonitor::PrintMonitor(Window *pParent, PrintMonitorType eType ) +PrintMonitor::PrintMonitor(vcl::Window *pParent, PrintMonitorType eType ) : CancelableModelessDialog(pParent, "PrintMonitorDialog", "modules/swriter/ui/printmonitordialog.ui") { @@ -42,7 +42,7 @@ PrintMonitor::PrintMonitor(Window *pParent, PrintMonitorType eType ) m_pPrinting->Show(); } -CancelableModelessDialog::CancelableModelessDialog( Window *pParent, +CancelableModelessDialog::CancelableModelessDialog( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription ) : ModelessDialog( pParent , rID, rUIXMLDescription ) { diff --git a/sw/source/uibase/dbui/mailmergechildwindow.cxx b/sw/source/uibase/dbui/mailmergechildwindow.cxx index f52bf6298d21..caaec215a799 100644 --- a/sw/source/uibase/dbui/mailmergechildwindow.cxx +++ b/sw/source/uibase/dbui/mailmergechildwindow.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; SFX_IMPL_FLOATINGWINDOW( SwMailMergeChildWindow, FN_MAILMERGE_CHILDWINDOW ) -SwMailMergeChildWindow::SwMailMergeChildWindow( Window* _pParent, +SwMailMergeChildWindow::SwMailMergeChildWindow( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -64,7 +64,7 @@ SwMailMergeChildWindow::SwMailMergeChildWindow( Window* _pParent, } SwMailMergeChildWin::SwMailMergeChildWin(SfxBindings* _pBindings, - SfxChildWindow* pChild, Window *pParent) + SfxChildWindow* pChild, vcl::Window *pParent) : SfxFloatingWindow(_pBindings, pChild, pParent, "FloatingMMChild", "modules/swriter/ui/floatingmmchild.ui") { diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 6f769d4d3233..076a04b6830c 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -91,7 +91,7 @@ uno::Reference< mail::XSmtpService > ConnectToSmtpServer( uno::Reference< mail::XMailService >& rxInMailService, const OUString& rInMailServerPassword, const OUString& rOutMailServerPassword, - Window* pDialogParentWindow ) + vcl::Window* pDialogParentWindow ) { uno::Reference< mail::XSmtpService > xSmtpServer; uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); @@ -185,7 +185,7 @@ struct SwAddressPreview_Impl } }; -SwAddressPreview::SwAddressPreview(Window* pParent, WinBits nStyle) +SwAddressPreview::SwAddressPreview(vcl::Window* pParent, WinBits nStyle) : Window( pParent, nStyle ) , aVScrollBar(this, WB_VSCROLL) , pImpl(new SwAddressPreview_Impl()) @@ -195,7 +195,7 @@ SwAddressPreview::SwAddressPreview(Window* pParent, WinBits nStyle) Show(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwAddressPreview(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwAddressPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_DIALOGCONTROL; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index ddf8ac56a4b8..89f25f74206e 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -149,7 +149,7 @@ static void lcl_LeaveDrawText(SwWrtShell& rSh) } SwSpellDialogChildWindow::SwSpellDialogChildWindow ( - Window* _pParent, + vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) @@ -420,7 +420,7 @@ The code below would only be part of the solution. LockFocusNotification( true ); OUString sInfo(SW_RES(STR_SPELLING_COMPLETED)); // #i84610# - Window* pTemp = GetWindow(); // temporary needed for g++ 3.3.5 + vcl::Window* pTemp = GetWindow(); // temporary needed for g++ 3.3.5 MessageDialog(pTemp, sInfo, VCL_MESSAGE_INFO).Execute(); LockFocusNotification( false ); // take care that the now valid selection is stored diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx index 72aa8c63c840..db1d54f84217 100644 --- a/sw/source/uibase/dialog/regionsw.cxx +++ b/sw/source/uibase/dialog/regionsw.cxx @@ -215,7 +215,7 @@ void SwBaseShell::EditRegionDialog(SfxRequest& rReq) { case FN_EDIT_REGION: { - Window* pParentWin = &GetView().GetViewFrame()->GetWindow(); + vcl::Window* pParentWin = &GetView().GetViewFrame()->GetWindow(); { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialog creation failed!"); diff --git a/sw/source/uibase/dialog/wordcountwrapper.cxx b/sw/source/uibase/dialog/wordcountwrapper.cxx index ea45d52169c1..0155958fde77 100644 --- a/sw/source/uibase/dialog/wordcountwrapper.cxx +++ b/sw/source/uibase/dialog/wordcountwrapper.cxx @@ -15,7 +15,7 @@ SFX_IMPL_CHILDWINDOW_WITHID(SwWordCountWrapper, FN_WORDCOUNT_DIALOG) -SwWordCountWrapper::SwWordCountWrapper( Window *pParentWindow, +SwWordCountWrapper::SwWordCountWrapper( vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 0d537acbde8c..5e72c8c877ca 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -353,10 +353,10 @@ const Graphic* SwTransferable::FindOLEReplacementGraphic() const return NULL; } -void SwTransferable::RemoveDDELinkFormat( const Window& rWin ) +void SwTransferable::RemoveDDELinkFormat( const vcl::Window& rWin ) { RemoveFormat( SOT_FORMATSTR_ID_LINK ); - CopyToClipboard( (Window*)&rWin ); + CopyToClipboard( (vcl::Window*)&rWin ); } namespace @@ -3143,7 +3143,7 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos ) } } -void SwTransferable::StartDrag( Window* pWin, const Point& rPos ) +void SwTransferable::StartDrag( vcl::Window* pWin, const Point& rPos ) { if(!pWrtShell) return; diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.hxx b/sw/source/uibase/docvw/AnnotationMenuButton.hxx index 06731b6cdb39..603dbb62c26b 100644 --- a/sw/source/uibase/docvw/AnnotationMenuButton.hxx +++ b/sw/source/uibase/docvw/AnnotationMenuButton.hxx @@ -37,7 +37,7 @@ class AnnotationMenuButton : public MenuButton // overloaded <MenuButton> methods virtual void Select() SAL_OVERRIDE; - // overloaded <Window> methods + // overloaded <vcl::Window> methods virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; diff --git a/sw/source/uibase/docvw/DashedLine.cxx b/sw/source/uibase/docvw/DashedLine.cxx index 824e7c32c2b7..f7104cbccb46 100644 --- a/sw/source/uibase/docvw/DashedLine.cxx +++ b/sw/source/uibase/docvw/DashedLine.cxx @@ -19,7 +19,7 @@ #include <vcl/settings.hxx> #include <boost/scoped_ptr.hpp> -SwDashedLine::SwDashedLine( Window* pParent, Color& ( *pColorFn )() ) : +SwDashedLine::SwDashedLine( vcl::Window* pParent, Color& ( *pColorFn )() ) : FixedLine( pParent, WB_DIALOGCONTROL | WB_HORZ ), m_pColorFn( pColorFn ) { diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index 5a1666b3a26f..8f472f48add1 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -59,7 +59,7 @@ namespace SwPageBreakWin* m_pWin; public: - SwBreakDashedLine( Window* pParent, Color& ( *pColorFn )(), SwPageBreakWin* pWin ) : + SwBreakDashedLine( vcl::Window* pParent, Color& ( *pColorFn )(), SwPageBreakWin* pWin ) : SwDashedLine( pParent, pColorFn ), m_pWin( pWin ) {}; diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index b1ce47bb70b3..a2ed8dbfa248 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -2004,10 +2004,10 @@ bool SwPostItMgr::HasFrmConnectedSidebarWins( const SwFrm& rFrm ) return bRet; } -Window* SwPostItMgr::GetSidebarWinForFrmByIndex( const SwFrm& rFrm, +vcl::Window* SwPostItMgr::GetSidebarWinForFrmByIndex( const SwFrm& rFrm, const sal_Int32 nIndex ) { - Window* pSidebarWin( 0 ); + vcl::Window* pSidebarWin( 0 ); if ( mpFrmSidebarWinContainer != 0 ) { @@ -2018,7 +2018,7 @@ Window* SwPostItMgr::GetSidebarWinForFrmByIndex( const SwFrm& rFrm, } void SwPostItMgr::GetAllSidebarWinForFrm( const SwFrm& rFrm, - std::vector< Window* >* pChildren ) + std::vector< vcl::Window* >* pChildren ) { if ( mpFrmSidebarWinContainer != 0 ) { diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 21fb6c8be67a..a5abefd20856 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -4930,7 +4930,7 @@ void SwEditWin::SetApplyTemplate(const SwApplyTemplate &rTempl) /** * Ctor */ -SwEditWin::SwEditWin(Window *pParent, SwView &rMyView): +SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView): Window(pParent, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)), DropTargetHelper( this ), DragSourceHelper( this ), @@ -5484,7 +5484,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) { ++nSize; } - Window& rWin = rSh.GetView().GetEditWin(); + vcl::Window& rWin = rSh.GetView().GetEditWin(); if ( nSize == 0 ) { // When the composition does not exist, use Caret rect instead. @@ -5852,7 +5852,7 @@ void QuickHelpData::Start( SwWrtShell& rSh, sal_uInt16 nWrdLen ) } m_bIsDisplayed = true; - Window& rWin = rSh.GetView().GetEditWin(); + vcl::Window& rWin = rSh.GetView().GetEditWin(); if( m_bIsTip ) { Point aPt( rWin.OutputToScreenPixel( rWin.LogicToPixel( diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx index 14c96d5da3a9..75ab9e95312b 100644 --- a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx +++ b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx @@ -181,7 +181,7 @@ SwSidebarWin* SwFrmSidebarWinContainer::get( const SwFrm& rFrm, } void SwFrmSidebarWinContainer::getAll( const SwFrm& rFrm, - std::vector< Window* >* pSidebarWins ) + std::vector< vcl::Window* >* pSidebarWins ) { pSidebarWins->clear(); diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.hxx b/sw/source/uibase/docvw/frmsidebarwincontainer.hxx index f0fa3faf8abf..fc7834c7e932 100644 --- a/sw/source/uibase/docvw/frmsidebarwincontainer.hxx +++ b/sw/source/uibase/docvw/frmsidebarwincontainer.hxx @@ -24,7 +24,7 @@ class SwFrm; class SwFmtFld; -class Window; +namespace vcl { class Window; } namespace sw { namespace sidebarwindows { @@ -50,7 +50,7 @@ class SwFrmSidebarWinContainer const sal_Int32 nIndex ); void getAll( const SwFrm& rFrm, - std::vector< Window* >* pSidebarWins ); + std::vector< vcl::Window* >* pSidebarWins ); private: FrmSidebarWinContainer* mpFrmSidebarWinContainer; diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx index bd9470517eaa..310a5a9054f4 100644 --- a/sw/source/uibase/docvw/romenu.cxx +++ b/sw/source/uibase/docvw/romenu.cxx @@ -228,7 +228,7 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) : RemoveDisabledEntries( true, true ); } -void SwReadOnlyPopup::Execute( Window* pWin, const Point &rPixPos ) +void SwReadOnlyPopup::Execute( vcl::Window* pWin, const Point &rPixPos ) { sal_uInt16 nId = PopupMenu::Execute( pWin, @@ -237,7 +237,7 @@ void SwReadOnlyPopup::Execute( Window* pWin, const Point &rPixPos ) } // execute the resulting ID only - necessary to support XContextMenuInterception -void SwReadOnlyPopup::Execute( Window* pWin, sal_uInt16 nId ) +void SwReadOnlyPopup::Execute( vcl::Window* pWin, sal_uInt16 nId ) { SwWrtShell &rSh = rView.GetWrtShell(); SfxDispatcher &rDis = *rView.GetViewFrame()->GetDispatcher(); diff --git a/sw/source/uibase/docvw/romenu.hxx b/sw/source/uibase/docvw/romenu.hxx index 87aa22174964..a595f6392417 100644 --- a/sw/source/uibase/docvw/romenu.hxx +++ b/sw/source/uibase/docvw/romenu.hxx @@ -53,8 +53,8 @@ public: SwReadOnlyPopup( const Point &rDPos, SwView &rV ); virtual ~SwReadOnlyPopup(); - void Execute( Window* pWin, const Point &rPPos ); - void Execute( Window* pWin, sal_uInt16 nId ); + void Execute( vcl::Window* pWin, const Point &rPPos ); + void Execute( vcl::Window* pWin, sal_uInt16 nId ); }; void GetPreferredExtension( OUString &rExt, const Graphic &rGrf ); diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index f8c3fc33e418..b2363d593415 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -232,7 +232,7 @@ private: SwSrcEditWindow & editor_; }; -SwSrcEditWindow::SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ) : +SwSrcEditWindow::SwSrcEditWindow( vcl::Window* pParent, SwSrcView* pParentView ) : Window( pParent, WB_BORDER|WB_CLIPCHILDREN ), pTextEngine(0), diff --git a/sw/source/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx index 16e07645ba86..81a59be3ec6f 100644 --- a/sw/source/uibase/envelp/syncbtn.cxx +++ b/sw/source/uibase/envelp/syncbtn.cxx @@ -31,7 +31,7 @@ SFX_IMPL_FLOATINGWINDOW( SwSyncChildWin, FN_SYNC_LABELS ) -SwSyncChildWin::SwSyncChildWin( Window* _pParent, +SwSyncChildWin::SwSyncChildWin( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -60,7 +60,7 @@ SwSyncChildWin::SwSyncChildWin( Window* _pParent, SwSyncBtnDlg::SwSyncBtnDlg( SfxBindings* _pBindings, SfxChildWindow* pChild, - Window *pParent) + vcl::Window *pParent) : SfxFloatingWindow(_pBindings, pChild, pParent, "FloatingSync", "modules/swriter/ui/floatingsync.ui") { get(m_pSyncBtn, "sync"); diff --git a/sw/source/uibase/fldui/fldwrap.cxx b/sw/source/uibase/fldui/fldwrap.cxx index 36c29ac1b46f..2acec8581b41 100644 --- a/sw/source/uibase/fldui/fldwrap.cxx +++ b/sw/source/uibase/fldui/fldwrap.cxx @@ -37,7 +37,7 @@ SFX_IMPL_CHILDWINDOW_WITHID(SwFldDlgWrapper, FN_INSERT_FIELD) -SwChildWinWrapper::SwChildWinWrapper(Window *pParentWindow, sal_uInt16 nId) : +SwChildWinWrapper::SwChildWinWrapper(vcl::Window *pParentWindow, sal_uInt16 nId) : SfxChildWindow(pParentWindow, nId), m_pDocSh(0) { @@ -76,7 +76,7 @@ SfxChildWinInfo SwFldDlgWrapper::GetInfo() const return aInfo; } -SwFldDlgWrapper::SwFldDlgWrapper( Window* _pParent, sal_uInt16 nId, +SwFldDlgWrapper::SwFldDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pB, SfxChildWinInfo* ) : SwChildWinWrapper( _pParent, nId ) @@ -120,7 +120,7 @@ SfxChildWinInfo SwFldDataOnlyDlgWrapper::GetInfo() const return aInfo; } -SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( Window* _pParent, sal_uInt16 nId, +SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pB, SfxChildWinInfo* pInfo ) : SwChildWinWrapper( _pParent, nId ) diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx index 7e68f4cb45ce..d11992e6ff82 100644 --- a/sw/source/uibase/frmdlg/colex.cxx +++ b/sw/source/uibase/frmdlg/colex.cxx @@ -314,12 +314,12 @@ void SwColExample::DrawPage( const Point& rOrg, } } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwColExample(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwColExample(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwColExample(pParent); } -SwColumnOnlyExample::SwColumnOnlyExample(Window* pParent) +SwColumnOnlyExample::SwColumnOnlyExample(vcl::Window* pParent) : Window(pParent) , m_aFrmSize(1,1) { @@ -343,7 +343,7 @@ SwColumnOnlyExample::SwColumnOnlyExample(Window* pParent) SetMapMode( aMapMode ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwColumnOnlyExample(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwColumnOnlyExample(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwColumnOnlyExample(pParent); } @@ -607,7 +607,7 @@ void SwPageGridExample::UpdateExample( const SfxItemSet& rSet ) SwPageExample::UpdateExample(rSet); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwPageGridExample(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwPageGridExample(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwPageGridExample(pParent); } diff --git a/sw/source/uibase/inc/DashedLine.hxx b/sw/source/uibase/inc/DashedLine.hxx index a16899b8698f..4ab2efaa91fa 100644 --- a/sw/source/uibase/inc/DashedLine.hxx +++ b/sw/source/uibase/inc/DashedLine.hxx @@ -19,7 +19,7 @@ class SwDashedLine : public FixedLine Color& (*m_pColorFn)(); public: - SwDashedLine( Window* pParent, Color& ( *pColorFn )() ); + SwDashedLine( vcl::Window* pParent, Color& ( *pColorFn )() ); virtual ~SwDashedLine( ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/DropDownFieldDialog.hxx b/sw/source/uibase/inc/DropDownFieldDialog.hxx index 1787726af8b1..19c42cf7dbfc 100644 --- a/sw/source/uibase/inc/DropDownFieldDialog.hxx +++ b/sw/source/uibase/inc/DropDownFieldDialog.hxx @@ -46,7 +46,7 @@ class DropDownFieldDialog : public SvxStandardDialog DECL_LINK(ButtonHdl, PushButton*); virtual void Apply() SAL_OVERRIDE; public: - DropDownFieldDialog( Window *pParent, SwWrtShell &rSh, + DropDownFieldDialog( vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false ); }; } //namespace sw diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx index efe7d13a83d9..6f151fd8ec69 100644 --- a/sw/source/uibase/inc/HeaderFooterWin.hxx +++ b/sw/source/uibase/inc/HeaderFooterWin.hxx @@ -23,7 +23,7 @@ class SwHeaderFooterWin : public MenuButton, public SwFrameControl OUString m_sLabel; bool m_bIsHeader; PopupMenu* m_pPopupMenu; - Window* m_pLine; + vcl::Window* m_pLine; bool m_bIsAppearing; int m_nFadeRate; Timer m_aFadeTimer; diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx index 321cb17c6fd3..ff28df16ca3f 100644 --- a/sw/source/uibase/inc/PageBreakWin.hxx +++ b/sw/source/uibase/inc/PageBreakWin.hxx @@ -23,7 +23,7 @@ class SwPageFrm; class SwPageBreakWin : public MenuButton, public SwFrameControl { PopupMenu* m_pPopupMenu; - Window* m_pLine; + vcl::Window* m_pLine; bool m_bIsAppearing; int m_nFadeRate; int m_nDelayAppearing; ///< Before we show the control, let it transparent for a few timer ticks to avoid appearing with every mouse over. diff --git a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx index b82d9d4c5d4d..b2b80c24a821 100644 --- a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx +++ b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx @@ -50,7 +50,7 @@ protected: public: SwSpellDialogChildWindow ( - Window*pParent, + vcl::Window*pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); diff --git a/sw/source/uibase/inc/abstract.hxx b/sw/source/uibase/inc/abstract.hxx index 1a40fd8a0e03..92443efa9d9d 100644 --- a/sw/source/uibase/inc/abstract.hxx +++ b/sw/source/uibase/inc/abstract.hxx @@ -31,7 +31,7 @@ class SwInsertAbstractDlg : public SfxModalDialog protected: public: - SwInsertAbstractDlg( Window* pParent ); + SwInsertAbstractDlg( vcl::Window* pParent ); sal_uInt8 GetLevel() const; sal_uInt8 GetPara() const; diff --git a/sw/source/uibase/inc/actctrl.hxx b/sw/source/uibase/inc/actctrl.hxx index 919a8dd16f6a..790bc0009768 100644 --- a/sw/source/uibase/inc/actctrl.hxx +++ b/sw/source/uibase/inc/actctrl.hxx @@ -31,7 +31,7 @@ protected: virtual void Action(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - NumEditAction( Window* pParent, const ResId& rResId ) : + NumEditAction( vcl::Window* pParent, const ResId& rResId ) : NumericField(pParent, rResId) {} void SetActionHdl( const Link& rLink ) { aActionLink = rLink;} @@ -43,7 +43,7 @@ class SW_DLLPUBLIC ReturnActionEdit : public Edit { Link aReturnActionLink; public: - ReturnActionEdit(Window* pParent, WinBits nStyle) + ReturnActionEdit(vcl::Window* pParent, WinBits nStyle) : Edit(pParent, nStyle) { } diff --git a/sw/source/uibase/inc/addrdlg.hxx b/sw/source/uibase/inc/addrdlg.hxx index 43e02f54dfda..4142ddadd530 100644 --- a/sw/source/uibase/inc/addrdlg.hxx +++ b/sw/source/uibase/inc/addrdlg.hxx @@ -24,7 +24,7 @@ class SwAddrDlg : public SfxSingleTabDialog { public: - SwAddrDlg(Window* pParent, const SfxItemSet& rSet); + SwAddrDlg(vcl::Window* pParent, const SfxItemSet& rSet); }; #endif diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx index b4a5d62d83a5..827d5032bcbc 100644 --- a/sw/source/uibase/inc/ascfldlg.hxx +++ b/sw/source/uibase/inc/ascfldlg.hxx @@ -50,7 +50,7 @@ class SwAsciiFilterDlg : public SfxModalDialog public: // CTOR: for import - pStream is the inputstream // for export - pStream must be 0 - SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, + SwAsciiFilterDlg( vcl::Window* pParent, SwDocShell& rDocSh, SvStream* pStream ); virtual ~SwAsciiFilterDlg(); diff --git a/sw/source/uibase/inc/autoedit.hxx b/sw/source/uibase/inc/autoedit.hxx index 53ba3123d8a6..421236967b74 100644 --- a/sw/source/uibase/inc/autoedit.hxx +++ b/sw/source/uibase/inc/autoedit.hxx @@ -24,7 +24,7 @@ class AutoEdit : public Edit { public: - AutoEdit( Window* pParent, ResId aResId ) : Edit( pParent, aResId ){} + AutoEdit( vcl::Window* pParent, ResId aResId ) : Edit( pParent, aResId ){} protected: virtual void KeyInput( const KeyEvent& rEvent ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/bmpwin.hxx b/sw/source/uibase/inc/bmpwin.hxx index 070656faf52b..e18d636052e6 100644 --- a/sw/source/uibase/inc/bmpwin.hxx +++ b/sw/source/uibase/inc/bmpwin.hxx @@ -25,7 +25,7 @@ #include <vcl/window.hxx> // extended page for graphics -class BmpWindow : public Window +class BmpWindow : public vcl::Window { private: Graphic aGraphic; @@ -41,7 +41,7 @@ private: virtual Size GetOptimalSize() const SAL_OVERRIDE; public: - BmpWindow(Window* pPar, WinBits nStyle); + BmpWindow(vcl::Window* pPar, WinBits nStyle); virtual ~BmpWindow(); void MirrorVert(bool bMirror) { bVert = bMirror; Invalidate(); } void MirrorHorz(bool bMirror) { bHorz = bMirror; Invalidate(); } diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx index 3130310eb318..d64a08e69a8f 100644 --- a/sw/source/uibase/inc/bookmark.hxx +++ b/sw/source/uibase/inc/bookmark.hxx @@ -37,7 +37,7 @@ class BookmarkCombo : public SwComboBox virtual bool PreNotify(NotifyEvent& rNEvt) SAL_OVERRIDE; public: - BookmarkCombo(Window* pWin, WinBits nStyle); + BookmarkCombo(vcl::Window* pWin, WinBits nStyle); sal_Int32 GetSelectEntryCount() const; sal_Int32 GetSelectEntryPos( sal_Int32 nSelIndex = 0 ) const; @@ -61,7 +61,7 @@ class SwInsertBookmarkDlg: public SvxStandardDialog virtual void Apply() SAL_OVERRIDE; public: - SwInsertBookmarkDlg(Window *pParent, SwWrtShell &rSh, SfxRequest& rReq); + SwInsertBookmarkDlg(vcl::Window *pParent, SwWrtShell &rSh, SfxRequest& rReq); virtual ~SwInsertBookmarkDlg(); }; diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx index 5d939e6efdae..55610b7dbe8c 100644 --- a/sw/source/uibase/inc/break.hxx +++ b/sw/source/uibase/inc/break.hxx @@ -62,7 +62,7 @@ protected: virtual void Apply() SAL_OVERRIDE; public: - SwBreakDlg( Window *pParent, SwWrtShell &rSh ); + SwBreakDlg( vcl::Window *pParent, SwWrtShell &rSh ); virtual ~SwBreakDlg(); OUString GetTemplateName() { return aTemplate; } diff --git a/sw/source/uibase/inc/chartins.hxx b/sw/source/uibase/inc/chartins.hxx index f520fe08de2d..b610bbece966 100644 --- a/sw/source/uibase/inc/chartins.hxx +++ b/sw/source/uibase/inc/chartins.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX #define INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX -Point SwGetChartDialogPos( const Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart ); -void SwInsertChart( Window *pParent, SfxBindings *pBindings ); +Point SwGetChartDialogPos( const vcl::Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart ); +void SwInsertChart( vcl::Window *pParent, SfxBindings *pBindings ); #endif // INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX diff --git a/sw/source/uibase/inc/chldwrap.hxx b/sw/source/uibase/inc/chldwrap.hxx index 142b68982bb6..d9b6574b099c 100644 --- a/sw/source/uibase/inc/chldwrap.hxx +++ b/sw/source/uibase/inc/chldwrap.hxx @@ -33,7 +33,7 @@ class SwChildWinWrapper : public SfxChildWindow // Implementation in fldtdlg.cxx protected: - SwChildWinWrapper(Window *pParentWindow, sal_uInt16 nId); + SwChildWinWrapper(vcl::Window *pParentWindow, sal_uInt16 nId); public: virtual bool ReInitDlg(SwDocShell *pDocSh); diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 5f4fbe7c7230..7c0520ade242 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -49,7 +49,7 @@ class SwCharDlg: public SfxTabDialog sal_uInt16 m_nCharBrdId; public: - SwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, + SwCharDlg(vcl::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, const OUString* pFmtStr = 0); virtual ~SwCharDlg(); @@ -78,11 +78,11 @@ class SwCharURLPage : public SfxTabPage DECL_LINK(EventHdl, void *); public: - SwCharURLPage( Window* pParent, + SwCharURLPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwCharURLPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx index 1bc29f9b39c2..ce03ddce93b2 100644 --- a/sw/source/uibase/inc/colex.hxx +++ b/sw/source/uibase/inc/colex.hxx @@ -31,7 +31,7 @@ class SfxItemSet; class SW_DLLPUBLIC SwPageExample : public SvxPageWindow { public: - SwPageExample(Window* pPar) + SwPageExample(vcl::Window* pPar) : SvxPageWindow(pPar) { SetSize(SvxPaperInfo::GetPaperSize(PAPER_A4)); @@ -51,7 +51,7 @@ protected: const bool bSecond, const bool bEnabled ) SAL_OVERRIDE; public: - SwPageGridExample(Window* pPar) : + SwPageGridExample(vcl::Window* pPar) : SwPageExample(pPar), pGridItem(0), m_bVertical(false){} @@ -72,7 +72,7 @@ protected: const bool bEnabled ) SAL_OVERRIDE; public: - SwColExample(Window* pPar) + SwColExample(vcl::Window* pPar) : SwPageExample(pPar) , pColMgr(0) { @@ -85,7 +85,7 @@ public: } }; -class SW_DLLPUBLIC SwColumnOnlyExample : public Window +class SW_DLLPUBLIC SwColumnOnlyExample : public vcl::Window { private: Size m_aWinSize; @@ -97,7 +97,7 @@ protected: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: - SwColumnOnlyExample(Window*); + SwColumnOnlyExample(vcl::Window*); void SetColumns(const SwFmtCol& rCol); diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 4f7ca8094b99..d9b2397eb2cf 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -64,7 +64,7 @@ class SwColumnDlg : public SfxModalDialog DECL_LINK(OkHdl, void *); public: - SwColumnDlg(Window* pParent, SwWrtShell& rSh); + SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh); virtual ~SwColumnDlg(); SwWrtShell& GetWrtShell() { return rWrtShell; } @@ -73,11 +73,11 @@ public: class ColumnValueSet : public ValueSet { public: - ColumnValueSet(Window* pParent, const ResId& rResId) + ColumnValueSet(vcl::Window* pParent, const ResId& rResId) : ValueSet(pParent, rResId) { } - ColumnValueSet(Window* pParent) + ColumnValueSet(vcl::Window* pParent) : ValueSet(pParent, WB_TABSTOP | WB_ITEMBORDER | WB_DOUBLEBORDER) { } @@ -163,7 +163,7 @@ class SwColumnPage : public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; - SwColumnPage(Window *pParent, const SfxItemSet &rSet); + SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet); void connectPercentField(PercentField &rWrap, const OString &rName); @@ -172,7 +172,7 @@ class SwColumnPage : public SfxTabPage public: virtual ~SwColumnPage(); - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/condedit.hxx b/sw/source/uibase/inc/condedit.hxx index d8c0a41af9c2..a188f1256856 100644 --- a/sw/source/uibase/inc/condedit.hxx +++ b/sw/source/uibase/inc/condedit.hxx @@ -31,7 +31,7 @@ class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper SAL_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; public: - ConditionEdit(Window* pParent, WinBits nStyle); + ConditionEdit(vcl::Window* pParent, WinBits nStyle); void ShowBrackets(bool bShow) { diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index c5ed17189d32..e4aa7d9f7a21 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -139,7 +139,7 @@ protected: virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; public: - SwContentTree(Window* pParent, const ResId& rResId); + SwContentTree(vcl::Window* pParent, const ResId& rResId); virtual ~SwContentTree(); OUString GetEntryAltText( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; @@ -230,7 +230,7 @@ private: SvTreeListEntry* pDDSource; // source for Drag'n Drop SwGlblDocContents* pSwGlblDocContents; // array with sorted content - Window* pDefParentWin; + vcl::Window* pDefParentWin; SwGlblDocContent* pDocContent; sfx2::DocumentInserter* pDocInserter; @@ -306,7 +306,7 @@ protected: virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; public: - SwGlobalTree(Window* pParent, const ResId& rResId); + SwGlobalTree(vcl::Window* pParent, const ResId& rResId); virtual ~SwGlobalTree(); void TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox); diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx index 0cceb155f7c4..08f31a4f2649 100644 --- a/sw/source/uibase/inc/cption.hxx +++ b/sw/source/uibase/inc/cption.hxx @@ -103,7 +103,7 @@ class SwCaptionDialog : public SvxStandardDialog static OUString our_aSepTextSave; // Save caption separator text public: - SwCaptionDialog( Window *pParent, SwView &rV ); + SwCaptionDialog( vcl::Window *pParent, SwView &rV ); virtual ~SwCaptionDialog(); }; diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx index e4ea1325aecb..e41d911bf141 100644 --- a/sw/source/uibase/inc/dbtree.hxx +++ b/sw/source/uibase/inc/dbtree.hxx @@ -52,7 +52,7 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox using SvTreeListBox::Select; public: - SwDBTreeList(Window* pParent, WinBits nStyle); + SwDBTreeList(vcl::Window* pParent, WinBits nStyle); virtual ~SwDBTreeList(); virtual Size GetOptimalSize() const SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx index 3877ac21153b..ed1e65b3bc47 100644 --- a/sw/source/uibase/inc/dbui.hxx +++ b/sw/source/uibase/inc/dbui.hxx @@ -28,7 +28,7 @@ class SW_DLLPUBLIC CancelableModelessDialog : public ModelessDialog { protected: CancelButton* m_pCancelButton; - CancelableModelessDialog( Window *pParent, const OString& rID, + CancelableModelessDialog( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); public: @@ -50,7 +50,7 @@ public: FixedText* m_pPrinter; FixedText* m_pPrintInfo; - PrintMonitor( Window *pParent, PrintMonitorType eType ); + PrintMonitor( vcl::Window *pParent, PrintMonitorType eType ); }; #endif diff --git a/sw/source/uibase/inc/docfnote.hxx b/sw/source/uibase/inc/docfnote.hxx index 6878450ec754..0649254bf2cf 100644 --- a/sw/source/uibase/inc/docfnote.hxx +++ b/sw/source/uibase/inc/docfnote.hxx @@ -36,7 +36,7 @@ class SwFootNoteOptionDlg :public SfxTabDialog DECL_LINK( OkHdl, Button * ); public: - SwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh ); + SwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rSh ); }; #endif diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx index d19edb2ed7a2..e02a80ea0369 100644 --- a/sw/source/uibase/inc/docstdlg.hxx +++ b/sw/source/uibase/inc/docstdlg.hxx @@ -30,10 +30,10 @@ class SwDocStatPage: public SfxTabPage { public: - SwDocStatPage(Window *pParent, const SfxItemSet &rSet); + SwDocStatPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwDocStatPage(); - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); protected: virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index 966346957c80..556626d744c6 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -37,7 +37,7 @@ class SwWrtShell; class SwDropCapsDlg : public SfxSingleTabDialog { public: - SwDropCapsDlg(Window *pParent, const SfxItemSet &rSet ); + SwDropCapsDlg(vcl::Window *pParent, const SfxItemSet &rSet ); }; class SwDropCapsPict; @@ -66,7 +66,7 @@ friend class SwDropCapsPict; SwWrtShell &rSh; - SwDropCapsPage(Window *pParent, const SfxItemSet &rSet); + SwDropCapsPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwDropCapsPage(); virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; @@ -82,7 +82,7 @@ friend class SwDropCapsPict; public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index ae65ed70a857..9871a5cf9ca0 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -52,7 +52,7 @@ class SdrDropMarkerOverlay; To translate the pixel positions from the buffer OutputDevice to the real pixel positions, use the PixelToLogic methods of this class. */ -class SwEditWin: public Window, +class SwEditWin: public vcl::Window, public DropTargetHelper, public DragSourceHelper { friend void ScrollMDI(SwViewShell* pVwSh, const SwRect&, @@ -288,7 +288,7 @@ public: SwFrameControlsManager& GetFrameControlsManager() { return m_aFrameControlsManager; } - SwEditWin(Window *pParent, SwView &); + SwEditWin(vcl::Window *pParent, SwView &); virtual ~SwEditWin(); virtual void SwitchView(); }; diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 7c438dd942c9..6ae6b7fb2b1e 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -40,13 +40,13 @@ class SwEnvFmtPage; class SwWrtShell; class Printer; -class SwEnvPreview : public Window +class SwEnvPreview : public vcl::Window { void Paint(const Rectangle&) SAL_OVERRIDE; public: - SwEnvPreview(Window * pParent, WinBits nStyle); + SwEnvPreview(vcl::Window * pParent, WinBits nStyle); protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -71,7 +71,7 @@ friend class SwEnvPreview; virtual short Ok() SAL_OVERRIDE; public: - SwEnvDlg(Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert); + SwEnvDlg(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert); virtual ~SwEnvDlg(); }; @@ -89,7 +89,7 @@ class SwEnvPage : public SfxTabPage SwWrtShell* pSh; OUString sActDBName; - SwEnvPage(Window* pParent, const SfxItemSet& rSet); + SwEnvPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwEnvPage(); DECL_LINK( DatabaseHdl, ListBox * ); @@ -105,7 +105,7 @@ class SwEnvPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx index 46b04379d3e6..e24f19d89303 100644 --- a/sw/source/uibase/inc/fldmgr.hxx +++ b/sw/source/uibase/inc/fldmgr.hxx @@ -41,7 +41,7 @@ class SwPaM; class SbModule; class SvxMacroItem; class SvNumberFormatter; -class Window; +namespace vcl { class Window; } // the groups of fields enum SwFldGroups @@ -75,7 +75,7 @@ struct SwInsertFld_Data ::com::sun::star::uno::Any aDBDataSource; ::com::sun::star::uno::Any aDBConnection; ::com::sun::star::uno::Any aDBColumn; - Window* pParent; // parent dialog used for SwWrtShell::StartInputFldDlg() + vcl::Window* pParent; // parent dialog used for SwWrtShell::StartInputFldDlg() SwInsertFld_Data(sal_uInt16 nType, sal_uInt16 nSub, const OUString& rPar1, const OUString& rPar2, sal_uLong nFmtId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ', bool bIsAutoLanguage = true) : diff --git a/sw/source/uibase/inc/fldtdlg.hxx b/sw/source/uibase/inc/fldtdlg.hxx index da57ade2e098..71883a0f7119 100644 --- a/sw/source/uibase/inc/fldtdlg.hxx +++ b/sw/source/uibase/inc/fldtdlg.hxx @@ -47,7 +47,7 @@ class SwFldDlg: public SfxTabDialog bool bOnlyActivate = false ); public: - SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent); + SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent); virtual ~SwFldDlg(); DECL_LINK(OKHdl, void *); diff --git a/sw/source/uibase/inc/fldwrap.hxx b/sw/source/uibase/inc/fldwrap.hxx index ecc67a06ff61..db4cdee3a440 100644 --- a/sw/source/uibase/inc/fldwrap.hxx +++ b/sw/source/uibase/inc/fldwrap.hxx @@ -26,7 +26,7 @@ class SwFldDlgWrapper : public SwChildWinWrapper { public: AbstractSwFldDlg * pDlgInterface; - SwFldDlgWrapper( Window* pParent, sal_uInt16 nId, + SwFldDlgWrapper( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW_WITHID(SwFldDlgWrapper); @@ -40,7 +40,7 @@ class SwFldDataOnlyDlgWrapper : public SwChildWinWrapper { public: AbstractSwFldDlg * pDlgInterface; - SwFldDataOnlyDlgWrapper( Window* pParent, sal_uInt16 nId, + SwFldDataOnlyDlgWrapper( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW(SwFldDataOnlyDlgWrapper); diff --git a/sw/source/uibase/inc/formedt.hxx b/sw/source/uibase/inc/formedt.hxx index 7489506e7e8e..118869e93e74 100644 --- a/sw/source/uibase/inc/formedt.hxx +++ b/sw/source/uibase/inc/formedt.hxx @@ -74,7 +74,7 @@ class SwIdxFormDlg : public SvxStandardDialog bool bLastLinkIsEnd; public: - SwIdxFormDlg( Window* pParent, SwWrtShell &rShell, const SwForm& rForm ); + SwIdxFormDlg( vcl::Window* pParent, SwWrtShell &rShell, const SwForm& rForm ); virtual ~SwIdxFormDlg(); const SwForm& GetTOXForm(); diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx index 8a1066dac7e7..3e0f2b9356cb 100644 --- a/sw/source/uibase/inc/frmdlg.hxx +++ b/sw/source/uibase/inc/frmdlg.hxx @@ -50,7 +50,7 @@ class SwFrmDlg : public SfxTabDialog virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: - SwFrmDlg( SfxViewFrame *pFrame, Window *pParent, + SwFrmDlg( SfxViewFrame *pFrame, vcl::Window *pParent, const SfxItemSet& rCoreSet, bool bNewFrm = false, const OString& sResType = OString("FrameDialog"), diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index d7d27ebb2178..2d609bd46bbe 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -175,7 +175,7 @@ class SwFrmPage: public SfxTabPage void EnableGraficMode( void ); // hides auto check boxes and re-org controls for "Real Size" button - SwFrmPage(Window *pParent, const SfxItemSet &rSet); + SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwFrmPage(); SwWrtShell *getFrmDlgParentShell(); @@ -185,7 +185,7 @@ class SwFrmPage: public SfxTabPage public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; @@ -224,7 +224,7 @@ class SwGrfExtPage: public SfxTabPage DECL_LINK(BrowseHdl, void *); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - SwGrfExtPage(Window *pParent, const SfxItemSet &rSet); + SwGrfExtPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwGrfExtPage(); using SfxTabPage::ActivatePage; @@ -232,7 +232,7 @@ class SwGrfExtPage: public SfxTabPage public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; @@ -253,7 +253,7 @@ class SwFrmURLPage : public SfxTabPage DECL_LINK(InsertFileHdl, void *); - SwFrmURLPage(Window *pParent, const SfxItemSet &rSet); + SwFrmURLPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwFrmURLPage(); using SfxTabPage::ActivatePage; @@ -261,7 +261,7 @@ class SwFrmURLPage : public SfxTabPage public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; @@ -303,12 +303,12 @@ class SwFrmAddPage : public SfxTabPage DECL_LINK(EditModifyHdl, void *); DECL_LINK(ChainModifyHdl, ListBox*); - SwFrmAddPage(Window *pParent, const SfxItemSet &rSet); + SwFrmAddPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwFrmAddPage(); public: - static SfxTabPage* Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage* Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx index fc339c174718..622b3cb20692 100644 --- a/sw/source/uibase/inc/glosbib.hxx +++ b/sw/source/uibase/inc/glosbib.hxx @@ -37,12 +37,12 @@ class SwGlossaryHdl; class FEdit : public Edit { public: - FEdit(Window* pParent, const ResId& rResId) + FEdit(vcl::Window* pParent, const ResId& rResId) : Edit(pParent, rResId) { } - FEdit(Window* pParent) + FEdit(vcl::Window* pParent) : Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK) { } @@ -60,7 +60,7 @@ struct GlosBibUserData class SwGlossaryGroupTLB : public SvTabListBox { public: - SwGlossaryGroupTLB(Window* pParent) + SwGlossaryGroupTLB(vcl::Window* pParent) : SvTabListBox(pParent, WB_BORDER|WB_HSCROLL|WB_CLIPCHILDREN|WB_SORT) { } @@ -98,7 +98,7 @@ protected: DECL_LINK(RenameHdl, void *); public: - SwGlossaryGroupDlg(Window * pParent, + SwGlossaryGroupDlg(vcl::Window * pParent, std::vector<OUString> const& rPathArr, SwGlossaryHdl *pGlosHdl); virtual ~SwGlossaryGroupDlg(); diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index b565b71fb7ad..7fad065d8bb9 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -75,7 +75,7 @@ class SwGlTreeListBox : public SvTreeListBox SvTreeListEntry* pEntry, bool bIsMove); public: - SwGlTreeListBox(Window* pParent, WinBits nBits); + SwGlTreeListBox(vcl::Window* pParent, WinBits nBits); virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -96,7 +96,7 @@ class SwGlossaryDlg : public SvxStandardDialog SwGlTreeListBox* m_pCategoryBox; CheckBox* m_pFileRelCB; CheckBox* m_pNetRelCB; - Window* m_pExampleWIN; + vcl::Window* m_pExampleWIN; PushButton* m_pInsertBtn; MenuButton* m_pEditBtn; PushButton* m_pBibBtn; diff --git a/sw/source/uibase/inc/idxmrk.hxx b/sw/source/uibase/inc/idxmrk.hxx index 0115e77a8fe1..99e5cbf8a32b 100644 --- a/sw/source/uibase/inc/idxmrk.hxx +++ b/sw/source/uibase/inc/idxmrk.hxx @@ -29,7 +29,7 @@ class SwInsertIdxMarkWrapper : public SfxChildWindow { AbstractMarkFloatDlg* pAbstDlg; protected: - SwInsertIdxMarkWrapper( Window *pParentWindow, + SwInsertIdxMarkWrapper( vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); @@ -44,7 +44,7 @@ class SwInsertAuthMarkWrapper : public SfxChildWindow { AbstractMarkFloatDlg* pAbstDlg; protected: - SwInsertAuthMarkWrapper( Window *pParentWindow, + SwInsertAuthMarkWrapper( vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); diff --git a/sw/source/uibase/inc/inpdlg.hxx b/sw/source/uibase/inc/inpdlg.hxx index 510e28c202b9..bf42fa788cf6 100644 --- a/sw/source/uibase/inc/inpdlg.hxx +++ b/sw/source/uibase/inc/inpdlg.hxx @@ -51,7 +51,7 @@ class SwFldInputDlg: public SvxStandardDialog DECL_LINK(NextHdl, void *); public: - SwFldInputDlg( Window *pParent, SwWrtShell &rSh, + SwFldInputDlg( vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false ); }; diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx index 3db10af8b6e0..291868ef5012 100644 --- a/sw/source/uibase/inc/inputwin.hxx +++ b/sw/source/uibase/inc/inputwin.hxx @@ -33,7 +33,7 @@ class SfxDispatcher; class InputEdit : public Edit { public: - InputEdit(Window* pParent, WinBits nStyle) : + InputEdit(vcl::Window* pParent, WinBits nStyle) : Edit(pParent , nStyle){} void UpdateRange(const OUString& aSel, @@ -80,7 +80,7 @@ protected: void CancelFormula(); public: - SwInputWindow( Window* pParent, SfxBindings* pBindings ); + SwInputWindow( vcl::Window* pParent, SfxBindings* pBindings ); virtual ~SwInputWindow(); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -101,7 +101,7 @@ class SwInputChild : public SfxChildWindow { SfxDispatcher* pDispatch; public: - SwInputChild( Window* , + SwInputChild( vcl::Window* , sal_uInt16 nId, SfxBindings*, SfxChildWinInfo* ); diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx index 86cb31312244..39747588a997 100644 --- a/sw/source/uibase/inc/insfnote.hxx +++ b/sw/source/uibase/inc/insfnote.hxx @@ -65,7 +65,7 @@ class SwInsFootNoteDlg: public SvxStandardDialog void Init(); public: - SwInsFootNoteDlg(Window * pParent, SwWrtShell &rSh, bool bEd = false); + SwInsFootNoteDlg(vcl::Window * pParent, SwWrtShell &rSh, bool bEd = false); virtual ~SwInsFootNoteDlg(); rtl_TextEncoding GetCharSet() { return eCharSet; } diff --git a/sw/source/uibase/inc/javaedit.hxx b/sw/source/uibase/inc/javaedit.hxx index 506b6cfdd84a..5649e5ea1e42 100644 --- a/sw/source/uibase/inc/javaedit.hxx +++ b/sw/source/uibase/inc/javaedit.hxx @@ -54,7 +54,7 @@ private: SwFldMgr* pMgr; SwWrtShell* pSh; sfx2::FileDialogHelper* pFileDlg; - Window* pOldDefDlgParent; + vcl::Window* pOldDefDlgParent; DECL_LINK(OKHdl, void *); DECL_LINK(PrevHdl, void *); @@ -69,7 +69,7 @@ private: void SetFld(); public: - SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh); + SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh); virtual ~SwJavaEditDialog(); OUString GetScriptText() const { return aText; } diff --git a/sw/source/uibase/inc/label.hxx b/sw/source/uibase/inc/label.hxx index a2f22a3ba867..838c1016c45e 100644 --- a/sw/source/uibase/inc/label.hxx +++ b/sw/source/uibase/inc/label.hxx @@ -55,7 +55,7 @@ class SwLabDlg : public SfxTabDialog virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: - SwLabDlg( Window* pParent, const SfxItemSet& rSet, + SwLabDlg( vcl::Window* pParent, const SfxItemSet& rSet, SwDBManager* pDBManager, bool bLabel); virtual ~SwLabDlg(); diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx index c9809c908b7a..0e7db9c87528 100644 --- a/sw/source/uibase/inc/linenum.hxx +++ b/sw/source/uibase/inc/linenum.hxx @@ -25,7 +25,7 @@ #include <vcl/lstbox.hxx> #include <numberingtypelistbox.hxx> -class Window; +namespace vcl { class Window; } class SwView; class SwWrtShell; @@ -34,9 +34,9 @@ class SwLineNumberingDlg : public SfxModalDialog private: SwWrtShell* pSh; VclContainer* m_pBodyContent; - Window* m_pDivIntervalFT; + vcl::Window* m_pDivIntervalFT; NumericField* m_pDivIntervalNF; - Window* m_pDivRowsFT; + vcl::Window* m_pDivRowsFT; NumericField* m_pNumIntervalNF; ListBox* m_pCharStyleLB; SwNumberingTypeListBox* m_pFormatLB; diff --git a/sw/source/uibase/inc/macassgn.hxx b/sw/source/uibase/inc/macassgn.hxx index 828203340ed9..df51ea5a046c 100644 --- a/sw/source/uibase/inc/macassgn.hxx +++ b/sw/source/uibase/inc/macassgn.hxx @@ -38,7 +38,7 @@ class SwMacroAssignDlg { public: static SfxEventNamesItem AddEvents( DlgEventType eType ); - static bool INetFmtDlg( Window* pParent, SwWrtShell& rSh, + static bool INetFmtDlg( vcl::Window* pParent, SwWrtShell& rSh, SvxMacroItem*& rpINetItem ); }; diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index 7ba52f24c7f9..a343c30bf5eb 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -55,10 +55,10 @@ class SwMailConfigPage : public SfxTabPage DECL_LINK(TestHdl, void *); public: - SwMailConfigPage( Window* pParent, const SfxItemSet& rSet ); + SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwMailConfigPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -69,7 +69,7 @@ public: class SwMailConfigDlg : public SfxSingleTabDialog { public: - SwMailConfigDlg(Window* pParent, SfxItemSet& rSet); + SwMailConfigDlg(vcl::Window* pParent, SfxItemSet& rSet); }; #endif diff --git a/sw/source/uibase/inc/mailmergechildwindow.hxx b/sw/source/uibase/inc/mailmergechildwindow.hxx index 8ee4aa9fea1c..35a76131c26f 100644 --- a/sw/source/uibase/inc/mailmergechildwindow.hxx +++ b/sw/source/uibase/inc/mailmergechildwindow.hxx @@ -29,7 +29,7 @@ class SwMailMergeChildWin : public SfxFloatingWindow DECL_LINK( BackHdl, void* ); public: - SwMailMergeChildWin(SfxBindings*, SfxChildWindow*, Window *pParent); + SwMailMergeChildWin(SfxBindings*, SfxChildWindow*, vcl::Window *pParent); virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; }; @@ -37,7 +37,7 @@ public: class SwMailMergeChildWindow : public SfxChildWindow { public: - SwMailMergeChildWindow( Window* , + SwMailMergeChildWindow( vcl::Window* , sal_uInt16 nId, SfxBindings*, SfxChildWinInfo* ); diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx index f31ebb269181..b542f9694620 100644 --- a/sw/source/uibase/inc/mailmergehelper.hxx +++ b/sw/source/uibase/inc/mailmergehelper.hxx @@ -51,14 +51,14 @@ namespace SwMailMergeHelper com::sun::star::uno::Reference< com::sun::star::mail::XMailService >& xInMailService, const OUString& rInMailServerPassword, const OUString& rOutMailServerPassword, - Window* pDialogParentWindow = 0 ); + vcl::Window* pDialogParentWindow = 0 ); } struct SwAddressPreview_Impl; // Preview window used to show the possible selection of address blocks // and also the resulting address filled with database data -class SW_DLLPUBLIC SwAddressPreview : public Window +class SW_DLLPUBLIC SwAddressPreview : public vcl::Window { ScrollBar aVScrollBar; SwAddressPreview_Impl* pImpl; @@ -76,7 +76,7 @@ class SW_DLLPUBLIC SwAddressPreview : public Window DECL_LINK(ScrollHdl, void*); public: - SwAddressPreview(Window* pParent, WinBits nStyle=WB_BORDER); + SwAddressPreview(vcl::Window* pParent, WinBits nStyle=WB_BORDER); void positionScrollBar(); @@ -140,10 +140,10 @@ class SW_DLLPUBLIC SwAuthenticator : { OUString m_aUserName; OUString m_aPassword; - Window* m_pParentWindow; + vcl::Window* m_pParentWindow; public: SwAuthenticator() : m_pParentWindow(0) {} - SwAuthenticator(const OUString& username, const OUString& password, Window* pParent) : + SwAuthenticator(const OUString& username, const OUString& password, vcl::Window* pParent) : m_aUserName(username), m_aPassword(password), m_pParentWindow( pParent ) diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index 3b2fa0011d2a..143e06b08cef 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -51,7 +51,7 @@ class SwMailMergeDlg : public SvxStandardDialog { friend class SwXSelChgLstnr_Impl; - Window* m_pBeamerWin; + vcl::Window* m_pBeamerWin; RadioButton* m_pAllRB; RadioButton* m_pMarkedRB; @@ -115,7 +115,7 @@ class SwMailMergeDlg : public SvxStandardDialog bool ExecQryShell(); public: - SwMailMergeDlg(Window* pParent, SwWrtShell& rSh, + SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rSh, const OUString& rSourceName, const OUString& rTblName, sal_Int32 nCommandType, @@ -140,7 +140,7 @@ class SwMailMergeCreateFromDlg : public ModalDialog { RadioButton* m_pThisDocRB; public: - SwMailMergeCreateFromDlg(Window* pParent); + SwMailMergeCreateFromDlg(vcl::Window* pParent); bool IsThisDocument() const { return m_pThisDocRB->IsChecked(); @@ -151,7 +151,7 @@ class SwMailMergeFieldConnectionsDlg : public ModalDialog { RadioButton* m_pUseExistingRB; public: - SwMailMergeFieldConnectionsDlg(Window* pParent); + SwMailMergeFieldConnectionsDlg(vcl::Window* pParent); bool IsUseExistingConnections() const { return m_pUseExistingRB->IsChecked(); diff --git a/sw/source/uibase/inc/mergetbl.hxx b/sw/source/uibase/inc/mergetbl.hxx index 588efaf45e75..fe9882a1429b 100644 --- a/sw/source/uibase/inc/mergetbl.hxx +++ b/sw/source/uibase/inc/mergetbl.hxx @@ -33,7 +33,7 @@ protected: virtual void Apply() SAL_OVERRIDE; public: - SwMergeTblDlg( Window *pParent, bool& rWithPrev ); + SwMergeTblDlg( vcl::Window *pParent, bool& rWithPrev ); }; #endif diff --git a/sw/source/uibase/inc/multmrk.hxx b/sw/source/uibase/inc/multmrk.hxx index b163c5591827..62ab97399cd8 100644 --- a/sw/source/uibase/inc/multmrk.hxx +++ b/sw/source/uibase/inc/multmrk.hxx @@ -40,7 +40,7 @@ class SwMultiTOXMarkDlg : public SvxStandardDialog void Apply() SAL_OVERRIDE; public: - SwMultiTOXMarkDlg( Window* pParent, SwTOXMgr &rTOXMgr ); + SwMultiTOXMarkDlg( vcl::Window* pParent, SwTOXMgr &rTOXMgr ); virtual ~SwMultiTOXMarkDlg(); }; diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index 02496e26c878..ff36a629e765 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -47,7 +47,7 @@ class SwNavHelpToolBox : public SwHelpToolBox SwNavHelpToolBox(SwNavigationPI* pParent, const ResId &rResId); }; -class SwNavigationPI : public Window, +class SwNavigationPI : public vcl::Window, public SfxControllerItem, public SfxListener { friend class SwNavigationChild; @@ -137,7 +137,7 @@ protected: public: - SwNavigationPI(SfxBindings*, SfxChildWindowContext*, Window*); + SwNavigationPI(SfxBindings*, SfxChildWindowContext*, vcl::Window*); virtual ~SwNavigationPI(); void GotoPage(); // jump to page; bindable function @@ -162,13 +162,13 @@ public: bool IsGlobalMode() const {return bGlobalMode;} SwView* GetCreateView() const; - void CreateNavigationTool(const Rectangle& rRect, bool bSetFocus, Window *pParent); + void CreateNavigationTool(const Rectangle& rRect, bool bSetFocus, vcl::Window *pParent); }; class SwNavigationChild : public SfxChildWindowContext { public: - SwNavigationChild( Window* , + SwNavigationChild( vcl::Window* , sal_uInt16 nId, SfxBindings*, SfxChildWinInfo* ); diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 6b5b251a4068..09875a9a01c6 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -115,7 +115,7 @@ class SwNumPositionTabPage : public SfxTabPage public: - SwNumPositionTabPage(Window* pParent, + SwNumPositionTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwNumPositionTabPage(); @@ -124,7 +124,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;} @@ -156,7 +156,7 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) SAL_OVERRIDE; DECL_LINK(RemoveNumberingHdl, void *); public: - SwSvxNumBulletTabDialog(Window* pParent, + SwSvxNumBulletTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &); virtual ~SwSvxNumBulletTabDialog(); diff --git a/sw/source/uibase/inc/numberingtypelistbox.hxx b/sw/source/uibase/inc/numberingtypelistbox.hxx index 20e85b819696..bedbc7225f69 100644 --- a/sw/source/uibase/inc/numberingtypelistbox.hxx +++ b/sw/source/uibase/inc/numberingtypelistbox.hxx @@ -35,7 +35,7 @@ class SW_DLLPUBLIC SwNumberingTypeListBox : public ListBox SwNumberingTypeListBox_Impl* pImpl; public: - SwNumberingTypeListBox( Window* pWin, WinBits nStyle = WB_BORDER ); + SwNumberingTypeListBox( vcl::Window* pWin, WinBits nStyle = WB_BORDER ); virtual ~SwNumberingTypeListBox(); virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index 4af285eaed1e..8dd0394575a1 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -45,7 +45,7 @@ class SW_DLLPUBLIC NumFormatListBox : public ListBox SAL_DLLPRIVATE SwView* GetView(); public: - NumFormatListBox(Window* pWin, WinBits nStyle); + NumFormatListBox(vcl::Window* pWin, WinBits nStyle); virtual ~NumFormatListBox(); diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index 3b3c69c6e275..7c88f1d3718d 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -57,13 +57,13 @@ class SwParagraphNumTabPage : public SfxTabPage DECL_LINK(LineCountHdl_Impl, void *); protected: - SwParagraphNumTabPage(Window* pParent, const SfxItemSet& rSet ); + SwParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rSet ); void aCountParaFL(); public: virtual ~SwParagraphNumTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); diff --git a/sw/source/uibase/inc/numprevw.hxx b/sw/source/uibase/inc/numprevw.hxx index cf1ef8d1e5a6..bec5210fa7ce 100644 --- a/sw/source/uibase/inc/numprevw.hxx +++ b/sw/source/uibase/inc/numprevw.hxx @@ -25,7 +25,7 @@ class SwNumRule; namespace rtl { class OUString; } -class NumberingPreview : public Window +class NumberingPreview : public vcl::Window { const SwNumRule* pActNum; vcl::Font aStdFont; @@ -38,14 +38,14 @@ class NumberingPreview : public Window virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: - NumberingPreview(Window* pParent, const ResId& rResId) + NumberingPreview(vcl::Window* pParent, const ResId& rResId) : Window(pParent, rResId), pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(false), nActLevel(USHRT_MAX) { } - NumberingPreview(Window* pParent) + NumberingPreview(vcl::Window* pParent) : Window(pParent) , pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(false), nActLevel(USHRT_MAX) diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx index 5e13ee660c96..cec3199f3beb 100644 --- a/sw/source/uibase/inc/olmenu.hxx +++ b/sw/source/uibase/inc/olmenu.hxx @@ -81,7 +81,7 @@ public: const ::com::sun::star::uno::Sequence< OUString > &rSuggestions, const OUString & rParaText ); - sal_uInt16 Execute( const Rectangle& rPopupPos, Window* pWin ); + sal_uInt16 Execute( const Rectangle& rPopupPos, vcl::Window* pWin ); void Execute( sal_uInt16 nId ); }; diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx index 935f53dc2d8d..8a1675176575 100644 --- a/sw/source/uibase/inc/optcomp.hxx +++ b/sw/source/uibase/inc/optcomp.hxx @@ -60,10 +60,10 @@ private: void WriteOptions(); public: - SwCompatibilityOptPage( Window* pParent, const SfxItemSet& rSet ); + SwCompatibilityOptPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwCompatibilityOptPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 20a8fd110cf5..451b30c6b9b5 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -63,9 +63,9 @@ private: DECL_LINK(StandardizedPageCountCheckHdl, void *); public: - SwLoadOptPage(Window* pParent, const SfxItemSet& rSet); + SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -75,7 +75,7 @@ public: class SwCaptionOptDlg : public SfxSingleTabDialog { public: - SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet); + SwCaptionOptDlg(vcl::Window* pParent, const SfxItemSet& rSet); }; class CaptionComboBox : public SwComboBox @@ -84,18 +84,18 @@ protected: virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; public: - CaptionComboBox(Window* pParent, WinBits nStyle) + CaptionComboBox(vcl::Window* pParent, WinBits nStyle) : SwComboBox(pParent, nStyle) {} }; -class SwCaptionPreview : public Window +class SwCaptionPreview : public vcl::Window { private: OUString maText; Point maDrawPos; public: - SwCaptionPreview( Window* pParent, WinBits nStyle ); + SwCaptionPreview( vcl::Window* pParent, WinBits nStyle ); void Init(); void SetPreviewText( const OUString& rText ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -162,11 +162,11 @@ private: void DrawSample(); public: - SwCaptionOptPage( Window* pParent, + SwCaptionOptPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwCaptionOptPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 5329ac4cf3ec..d623923f7c92 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -67,11 +67,11 @@ class SwContentOptPage : public SfxTabPage DECL_LINK(VertRulerHdl, CheckBox*); DECL_LINK(AnyRulerHdl, CheckBox*); public: - SwContentOptPage( Window* pParent, + SwContentOptPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwContentOptPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -115,11 +115,11 @@ class SwAddPrinterTabPage : public SfxTabPage DECL_LINK(AutoClickHdl, void *); DECL_LINK(SelectHdl, void *); - SwAddPrinterTabPage( Window* pParent, + SwAddPrinterTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -186,12 +186,12 @@ class SwStdFontTabPage : public SfxTabPage DECL_LINK( ModifyHeightHdl, FontSizeBox * ); DECL_LINK( LoseFocusHdl, ComboBox * ); - SwStdFontTabPage( Window* pParent, + SwStdFontTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwStdFontTabPage(); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -227,13 +227,13 @@ class SwTableOptionsTabPage : public SfxTabPage DECL_LINK(CheckBoxHdl, void *); - SwTableOptionsTabPage( Window* pParent, + SwTableOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwTableOptionsTabPage(); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -273,12 +273,12 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage SwWrtShell * m_pWrtShell; - SwShdwCrsrOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + SwShdwCrsrOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwShdwCrsrOptionsTabPage(); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -288,7 +288,7 @@ public: }; // mark preview -class SwMarkPreview : public Window +class SwMarkPreview : public vcl::Window { Size m_aInitialSize; @@ -317,7 +317,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SwMarkPreview(Window* pParent, WinBits nWinBits); + SwMarkPreview(vcl::Window* pParent, WinBits nWinBits); virtual ~SwMarkPreview(); inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; } @@ -347,7 +347,7 @@ class SwRedlineOptionsTabPage : public SfxTabPage OUString sAuthor; OUString sNone; - SwRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + SwRedlineOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwRedlineOptionsTabPage(); DECL_LINK( AttribHdl, ListBox *pLB ); @@ -358,7 +358,7 @@ class SwRedlineOptionsTabPage : public SfxTabPage public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -371,10 +371,10 @@ public: class SwTestTabPage : public SfxTabPage { public: - SwTestTabPage( Window* pParent, + SwTestTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -410,7 +410,7 @@ class SwCompareOptionsTabPage : public SfxTabPage CheckBox* m_pIgnoreCB; NumericField* m_pLenNF; - SwCompareOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + SwCompareOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwCompareOptionsTabPage(); DECL_LINK(ComparisonHdl, void *); @@ -418,7 +418,7 @@ class SwCompareOptionsTabPage : public SfxTabPage public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index bd1f661a4a25..1581918966bf 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -67,7 +67,7 @@ class SwOutlineTabDialog : public SfxTabDialog virtual short Ok() SAL_OVERRIDE; public: - SwOutlineTabDialog(Window* pParent, + SwOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &); virtual ~SwOutlineTabDialog(); @@ -119,7 +119,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage using SfxTabPage::DeactivatePage; public: - SwOutlineSettingsTabPage(Window* pParent, const SfxItemSet& rSet); + SwOutlineSettingsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwOutlineSettingsTabPage(); void SetWrtShell(SwWrtShell* pShell); @@ -129,7 +129,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); }; diff --git a/sw/source/uibase/inc/pattern.hxx b/sw/source/uibase/inc/pattern.hxx index 67ee99024648..68a673dff751 100644 --- a/sw/source/uibase/inc/pattern.hxx +++ b/sw/source/uibase/inc/pattern.hxx @@ -22,13 +22,13 @@ #include <sfx2/basedlgs.hxx> -class Window; +namespace vcl { class Window; } class SfxItemSet; class SwBackgroundDlg : public SfxSingleTabDialog { public: - SwBackgroundDlg(Window* pParent, const SfxItemSet& rSet); + SwBackgroundDlg(vcl::Window* pParent, const SfxItemSet& rSet); }; #endif diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index 193c09ca2b1c..251a799de656 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -32,14 +32,14 @@ class SwFootNotePage: public SfxTabPage { public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; private: - SwFootNotePage(Window *pParent, const SfxItemSet &rSet); + SwFootNotePage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwFootNotePage(); RadioButton* m_pMaxHeightPageBtn; diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index 3bf49e588877..92a5d333c55a 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -67,7 +67,7 @@ class SwTextGridPage: public SfxTabPage bool m_bHRulerChanged; bool m_bVRulerChanged; - SwTextGridPage(Window *pParent, const SfxItemSet &rSet); + SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwTextGridPage(); void UpdatePageSize(const SfxItemSet& rSet); @@ -84,7 +84,7 @@ class SwTextGridPage: public SfxTabPage using SfxTabPage::DeactivatePage; public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index b5f1d1e8f682..162ef375eb3a 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -42,7 +42,7 @@ class SvtAccessibilityOptions; class SwPagePreviewLayout; // Delete member <mnVirtPage> and its accessor -class SwPagePreviewWin : public Window +class SwPagePreviewWin : public vcl::Window { SwViewShell* mpViewShell; sal_uInt16 mnSttPage; @@ -59,7 +59,7 @@ class SwPagePreviewWin : public Window using Window::Scroll; public: - SwPagePreviewWin( Window* pParent, SwPagePreview& rView ); + SwPagePreviewWin( vcl::Window* pParent, SwPagePreview& rView ); virtual ~SwPagePreviewWin(); // calls SwViewShell::Paint @@ -170,9 +170,9 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell ImageButton *pPageUpBtn, *pPageDownBtn; // dummy window for filling the lower right edge when both scrollbars are active - Window *pScrollFill; + ::vcl::Window *pScrollFill; - sal_uInt16 mnPageCount; + sal_uInt16 mnPageCount; bool bNormalPrint; // New members to reset design mode at draw view for form shell on switching @@ -192,7 +192,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ) SAL_OVERRIDE; SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; - SAL_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, + SAL_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) SAL_OVERRIDE; SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, bool bInner ); @@ -225,7 +225,7 @@ private: static void InitInterface_Impl(); public: - inline Window& GetFrameWindow() const { return GetViewFrame()->GetWindow(); } + inline vcl::Window& GetFrameWindow() const { return GetViewFrame()->GetWindow(); } inline SwViewShell* GetViewShell() const { return pViewWin->GetViewShell(); } inline const Rectangle& GetVisArea() const { return aVisArea; } inline void GrabFocusViewWin() { pViewWin->GrabFocus(); } diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 1a84a2a895fb..b949299b14d2 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -136,7 +136,7 @@ class SwModelessRedlineAcceptDlg : public SfxModelessDialog SwChildWinWrapper* pChildWin; public: - SwModelessRedlineAcceptDlg(SfxBindings*, SwChildWinWrapper*, Window *pParent); + SwModelessRedlineAcceptDlg(SfxBindings*, SwChildWinWrapper*, vcl::Window *pParent); virtual ~SwModelessRedlineAcceptDlg(); virtual void Activate() SAL_OVERRIDE; @@ -147,7 +147,7 @@ public: class SwRedlineAcceptChild : public SwChildWinWrapper { public: - SwRedlineAcceptChild( Window* , + SwRedlineAcceptChild( vcl::Window* , sal_uInt16 nId, SfxBindings*, SfxChildWinInfo* ); diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index 1a6ad67c5509..37d3794b118e 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -95,7 +95,7 @@ class SwEditRegionDlg : public SfxModalDialog SectReprArr aSectReprArr; const SwSection* pCurrSect; sfx2::DocumentInserter* m_pDocInserter; - Window* m_pOldDefDlgParent; + vcl::Window* m_pOldDefDlgParent; bool bDontCheckPasswd :1; bool bWeb :1; @@ -129,7 +129,7 @@ class SwEditRegionDlg : public SfxModalDialog bool CheckPasswd(CheckBox* pBox = 0); public: - SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh ); + SwEditRegionDlg( vcl::Window* pParent, SwWrtShell& rWrtSh ); virtual ~SwEditRegionDlg(); void SelectSection(const OUString& rSectionName); @@ -168,7 +168,7 @@ class SwInsertSectionTabPage : public SfxTabPage ::com::sun::star::uno::Sequence <sal_Int8 > m_aNewPasswd; SwWrtShell* m_pWrtSh; sfx2::DocumentInserter* m_pDocInserter; - Window* m_pOldDefDlgParent; + vcl::Window* m_pOldDefDlgParent; DECL_LINK( ChangeHideHdl, CheckBox * ); // #114856# edit in readonly sections @@ -182,7 +182,7 @@ class SwInsertSectionTabPage : public SfxTabPage DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper* ); public: - SwInsertSectionTabPage(Window *pParent, const SfxItemSet &rAttrSet); + SwInsertSectionTabPage(vcl::Window *pParent, const SfxItemSet &rAttrSet); virtual ~SwInsertSectionTabPage(); void SetWrtShell(SwWrtShell& rSh); @@ -190,7 +190,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); }; @@ -226,13 +226,13 @@ class SwSectionFtnEndTabPage : public SfxTabPage void ResetState( bool bFtn, const SwFmtFtnEndAtTxtEnd& ); public: - SwSectionFtnEndTabPage( Window *pParent, const SfxItemSet &rAttrSet ); + SwSectionFtnEndTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionFtnEndTabPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); }; @@ -244,13 +244,13 @@ class SwSectionIndentTabPage : public SfxTabPage DECL_LINK(IndentModifyHdl, void *); public: - SwSectionIndentTabPage( Window *pParent, const SfxItemSet &rAttrSet ); + SwSectionIndentTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionIndentTabPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void SetWrtShell(SwWrtShell& rSh); @@ -271,7 +271,7 @@ protected: virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; virtual short Ok() SAL_OVERRIDE; public: - SwInsertSectionTabDialog(Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); + SwInsertSectionTabDialog(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); virtual ~SwInsertSectionTabDialog(); void SetSectionData(SwSectionData const& rSect); @@ -290,7 +290,7 @@ class SwSectionPropertyTabDialog : public SfxTabDialog protected: virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: - SwSectionPropertyTabDialog(Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); + SwSectionPropertyTabDialog(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); virtual ~SwSectionPropertyTabDialog(); }; diff --git a/sw/source/uibase/inc/rowht.hxx b/sw/source/uibase/inc/rowht.hxx index e8fd8adfb57b..25d9e7c918f3 100644 --- a/sw/source/uibase/inc/rowht.hxx +++ b/sw/source/uibase/inc/rowht.hxx @@ -36,7 +36,7 @@ protected: virtual void Apply() SAL_OVERRIDE; public: - SwTableHeightDlg( Window *pParent, SwWrtShell &rS ); + SwTableHeightDlg( vcl::Window *pParent, SwWrtShell &rS ); }; #endif diff --git a/sw/source/uibase/inc/scroll.hxx b/sw/source/uibase/inc/scroll.hxx index 424f920aba8a..cbaacccb45a1 100644 --- a/sw/source/uibase/inc/scroll.hxx +++ b/sw/source/uibase/inc/scroll.hxx @@ -50,7 +50,7 @@ public: void SetAuto(bool bSet); bool IsAuto() { return bAuto;} - SwScrollbar(Window *pParent, bool bHori = true ); + SwScrollbar(vcl::Window *pParent, bool bHori = true ); virtual ~SwScrollbar(); }; diff --git a/sw/source/uibase/inc/selglos.hxx b/sw/source/uibase/inc/selglos.hxx index f18288179edd..501af9a28200 100644 --- a/sw/source/uibase/inc/selglos.hxx +++ b/sw/source/uibase/inc/selglos.hxx @@ -33,7 +33,7 @@ protected: DECL_LINK(DoubleClickHdl, ListBox*); public: - SwSelGlossaryDlg(Window * pParent, const OUString &rShortName); + SwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName); void InsertGlos(const OUString &rRegion, const OUString &rGlosName) { const OUString aTmp = rRegion + ":" + rGlosName; diff --git a/sw/source/uibase/inc/shdwcrsr.hxx b/sw/source/uibase/inc/shdwcrsr.hxx index e5c6478f9215..631fde3d7f5b 100644 --- a/sw/source/uibase/inc/shdwcrsr.hxx +++ b/sw/source/uibase/inc/shdwcrsr.hxx @@ -23,11 +23,11 @@ #include <tools/color.hxx> #include <limits.h> -class Window; +namespace vcl { class Window; } class SwShadowCursor { - Window* pWin; + vcl::Window* pWin; Color aCol; Point aOldPt; long nOldHeight; @@ -37,7 +37,7 @@ class SwShadowCursor void DrawCrsr( const Point& rPt, long nHeight, sal_uInt16 nMode ); public: - SwShadowCursor( Window& rWin, const Color& rCol ) + SwShadowCursor( vcl::Window& rWin, const Color& rCol ) : pWin( &rWin ), aCol( rCol ), nOldHeight(0), nOldMode( USHRT_MAX ) {} ~SwShadowCursor(); diff --git a/sw/source/uibase/inc/splittbl.hxx b/sw/source/uibase/inc/splittbl.hxx index 00b099e0747f..3bcce8bb03bc 100644 --- a/sw/source/uibase/inc/splittbl.hxx +++ b/sw/source/uibase/inc/splittbl.hxx @@ -39,7 +39,7 @@ protected: virtual void Apply() SAL_OVERRIDE; public: - SwSplitTblDlg( Window *pParent, SwWrtShell &rSh ); + SwSplitTblDlg( vcl::Window *pParent, SwWrtShell &rSh ); sal_uInt16 GetSplitMode() const { return m_nSplit; } }; diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx index 2bb3c368b5db..8cb2ea611bdd 100644 --- a/sw/source/uibase/inc/srcedtw.hxx +++ b/sw/source/uibase/inc/srcedtw.hxx @@ -37,7 +37,7 @@ class TextEngine; class ExtTextView; class DataChangedEvent; -class TextViewOutWin : public Window +class TextViewOutWin : public vcl::Window { ExtTextView* pTextView; @@ -51,7 +51,7 @@ protected: virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; public: - TextViewOutWin(Window* pParent, WinBits nBits) : + TextViewOutWin(vcl::Window* pParent, WinBits nBits) : Window(pParent, nBits), pTextView(0){} void SetTextView( ExtTextView* pView ) {pTextView = pView;} @@ -60,7 +60,7 @@ public: typedef std::set<sal_uInt16> SyntaxLineSet; -class SwSrcEditWindow : public Window, public SfxListener +class SwSrcEditWindow : public vcl::Window, public SfxListener { private: class ChangesListener; @@ -115,7 +115,7 @@ protected: DECL_LINK(ScrollHdl, ScrollBar*); public: - SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ); + SwSrcEditWindow( vcl::Window* pParent, SwSrcView* pParentView ); virtual ~SwSrcEditWindow(); void SetScrollBarRanges(); diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx index 70522f871322..c42a4cc6f809 100644 --- a/sw/source/uibase/inc/srtdlg.hxx +++ b/sw/source/uibase/inc/srtdlg.hxx @@ -83,7 +83,7 @@ class SwSortDlg : public SvxStandardDialog DECL_LINK(DelimCharHdl, void *); public: - SwSortDlg(Window * pParent, SwWrtShell &rSh); + SwSortDlg(vcl::Window * pParent, SwWrtShell &rSh); virtual ~SwSortDlg(); }; diff --git a/sw/source/uibase/inc/stmenu.hxx b/sw/source/uibase/inc/stmenu.hxx index c369d12eaeaa..ec2fa7ceaf0b 100644 --- a/sw/source/uibase/inc/stmenu.hxx +++ b/sw/source/uibase/inc/stmenu.hxx @@ -64,7 +64,7 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > >& rStringKeyMaps, ::com::sun::star::uno::Reference< com::sun::star::text::XTextRange > xTextRange ); - sal_uInt16 Execute( const Rectangle& rPopupPos, Window* pWin ); + sal_uInt16 Execute( const Rectangle& rPopupPos, vcl::Window* pWin ); }; #endif diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx index de20e748dca0..d5cb2acc806b 100644 --- a/sw/source/uibase/inc/swdtflvr.hxx +++ b/sw/source/uibase/inc/swdtflvr.hxx @@ -165,7 +165,7 @@ public: int CopyGlossary( SwTextBlocks& rGlossary, const OUString& rStr ); // remove the DDE-Link format promise - void RemoveDDELinkFormat( const Window& rWin ); + void RemoveDDELinkFormat( const vcl::Window& rWin ); // paste - methods and helper methods for the paste static bool IsPaste( const SwWrtShell&, const TransferableDataHelper& ); @@ -189,7 +189,7 @@ public: SvxClipboardFmtItem & rToFill ); // Interfaces for Drag & Drop - void StartDrag( Window* pWin, const Point& rPos ); + void StartDrag( vcl::Window* pWin, const Point& rPos ); SwWrtShell* GetShell() { return pWrtShell; } void SetCleanUp( bool bFlag ) { bCleanUp = bFlag; } diff --git a/sw/source/uibase/inc/swlbox.hxx b/sw/source/uibase/inc/swlbox.hxx index 174f21206b71..f571e08e57fb 100644 --- a/sw/source/uibase/inc/swlbox.hxx +++ b/sw/source/uibase/inc/swlbox.hxx @@ -25,7 +25,7 @@ #include <boost/ptr_container/ptr_vector.hpp> class SwBoxEntry; -class Window; +namespace vcl { class Window; } typedef boost::ptr_vector<SwBoxEntry> SwEntryLst; @@ -60,7 +60,7 @@ class SW_DLLPUBLIC SwComboBox : public ComboBox public: - SwComboBox(Window* pParent, WinBits nStyle); + SwComboBox(vcl::Window* pParent, WinBits nStyle); virtual ~SwComboBox(); void InsertSwEntry(const SwBoxEntry&); diff --git a/sw/source/uibase/inc/swmessdialog.hxx b/sw/source/uibase/inc/swmessdialog.hxx index 674d347d87ec..4382f574431e 100644 --- a/sw/source/uibase/inc/swmessdialog.hxx +++ b/sw/source/uibase/inc/swmessdialog.hxx @@ -26,7 +26,7 @@ protected: VclMultiLineEdit* m_pSecondaryMessage; Edit* m_pEdit; public: - SwMessageAndEditDialog(Window* pParent, const OString& rID, + SwMessageAndEditDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription); }; diff --git a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx b/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx index 7f772c41cf8f..06ccac71cff0 100644 --- a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx +++ b/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx @@ -28,7 +28,7 @@ class SwModalRedlineAcceptDlg : public SfxModalDialog SwRedlineAcceptDlg* pImplDlg; public: - SwModalRedlineAcceptDlg(Window *pParent); + SwModalRedlineAcceptDlg(vcl::Window *pParent); virtual ~SwModalRedlineAcceptDlg(); void AcceptAll( bool bAccept ); diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx b/sw/source/uibase/inc/swrenamexnameddlg.hxx index 81d314449172..aefb1efe0e91 100644 --- a/sw/source/uibase/inc/swrenamexnameddlg.hxx +++ b/sw/source/uibase/inc/swrenamexnameddlg.hxx @@ -45,7 +45,7 @@ class SwRenameXNamedDlg : public ModalDialog DECL_LINK(ModifyHdl, Edit*); public: - SwRenameXNamedDlg( Window* pParent, + SwRenameXNamedDlg( vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess ); diff --git a/sw/source/uibase/inc/swruler.hxx b/sw/source/uibase/inc/swruler.hxx index 9cbaac7f9896..19b877f8253f 100644 --- a/sw/source/uibase/inc/swruler.hxx +++ b/sw/source/uibase/inc/swruler.hxx @@ -14,7 +14,7 @@ class SwViewShell; class View; -class Window; +namespace vcl { class Window; } class SwEditWin; /** @@ -28,7 +28,7 @@ class SwCommentRuler public: SwCommentRuler ( SwViewShell* pViewSh, - Window* pParent, + vcl::Window* pParent, SwEditWin* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index 77eff527ac48..2095dadd4abd 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -47,7 +47,7 @@ class SwCondCollPage : public SfxTabPage bool bNewTemplate; - SwCondCollPage(Window *pParent, const SfxItemSet &rSet); + SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwCondCollPage(); virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; @@ -61,7 +61,7 @@ class SwCondCollPage : public SfxTabPage public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index cee9a5384c76..12bb2111a2ce 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -61,7 +61,7 @@ struct SwIndexSections_Impl; class SwMultiTOXTabDialog : public SfxTabDialog { - Window* m_pExampleContainerWIN; + vcl::Window* m_pExampleContainerWIN; CheckBox* m_pShowExampleCB; SwTOXMgr* pMgr; SwWrtShell& rSh; @@ -97,7 +97,7 @@ class SwMultiTOXTabDialog : public SfxTabDialog DECL_LINK(ShowPreviewHdl, void*); public: - SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet, + SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, bool bGlobal = false); @@ -219,7 +219,7 @@ class SwTOXSelectTabPage : public SfxTabPage using SfxTabPage::DeactivatePage; public: - SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet); + SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXSelectTabPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -228,7 +228,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void SelectType(TOXTypes eSet); //preset TOXType, GlobalDoc @@ -247,7 +247,7 @@ class SwTokenWindow : public VclHBox, public VclBuilderContainer typedef std::vector<Control*>::const_reverse_iterator ctrl_const_reverse_iterator; Button* m_pLeftScrollWin; - Window* m_pCtrlParentWin; + vcl::Window* m_pCtrlParentWin; Button* m_pRightScrollWin; std::vector<Control*> aControlList; SwForm* pForm; @@ -281,7 +281,7 @@ class SwTokenWindow : public VclHBox, public VclBuilderContainer void MoveControls(long nOffset); public: - SwTokenWindow(Window* pParent); + SwTokenWindow(vcl::Window* pParent); virtual ~SwTokenWindow(); void SetTabPage(SwTOXEntryTabPage *pParent) { m_pParent = pParent; } @@ -329,7 +329,7 @@ class SwIdxTreeListBox : public SvTreeListBox virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; public: - SwIdxTreeListBox(Window* pPar, WinBits nStyle); + SwIdxTreeListBox(vcl::Window* pPar, WinBits nStyle); void SetTabPage(SwTOXEntryTabPage* pPar) { pParent = pPar; } }; @@ -432,7 +432,7 @@ class SwTOXEntryTabPage : public SfxTabPage using SfxTabPage::DeactivatePage; public: - SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet); + SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXEntryTabPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -440,7 +440,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void SetWrtShell(SwWrtShell& rSh); @@ -478,7 +478,7 @@ class SwTOXStylesTabPage : public SfxTabPage using SfxTabPage::DeactivatePage; public: - SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet); + SwTOXStylesTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXStylesTabPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -487,7 +487,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); }; diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx index ac85a0a52286..0f559a63eb85 100644 --- a/sw/source/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/uibase/inc/swuiidxmrk.hxx @@ -155,7 +155,7 @@ class SwIndexMarkFloatDlg : public SfxModelessDialog public: SwIndexMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo, bool bNew=true); void ReInitDlg(SwWrtShell& rWrtShell); @@ -165,7 +165,7 @@ class SwIndexMarkModalDlg : public SvxStandardDialog { SwIndexMarkPane m_aContent; public: - SwIndexMarkModalDlg(Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark); + SwIndexMarkModalDlg(vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark); virtual void Apply() SAL_OVERRIDE; void ReInitDlg(SwWrtShell& rWrtShell); @@ -231,7 +231,7 @@ class SwAuthMarkFloatDlg : public SfxModelessDialog public: SwAuthMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo, bool bNew=true); void ReInitDlg(SwWrtShell& rWrtShell); @@ -241,7 +241,7 @@ class SwAuthMarkModalDlg : public SvxStandardDialog { SwAuthorMarkPane m_aContent; public: - SwAuthMarkModalDlg(Window *pParent, SwWrtShell& rSh); + SwAuthMarkModalDlg(vcl::Window *pParent, SwWrtShell& rSh); virtual void Apply() SAL_OVERRIDE; void ReInitDlg(SwWrtShell& rWrtShell); diff --git a/sw/source/uibase/inc/swuipardlg.hxx b/sw/source/uibase/inc/swuipardlg.hxx index cf59afd6a9dd..6a9c8a6ea6af 100644 --- a/sw/source/uibase/inc/swuipardlg.hxx +++ b/sw/source/uibase/inc/swuipardlg.hxx @@ -40,7 +40,7 @@ class SwParaDlg: public SfxTabDialog void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; public: - SwParaDlg( Window *pParent, + SwParaDlg( vcl::Window *pParent, SwView& rVw, const SfxItemSet&, sal_uInt8 nDialogMode, diff --git a/sw/source/uibase/inc/swvset.hxx b/sw/source/uibase/inc/swvset.hxx index 7b9ecccf98e6..f27ecdd09f9a 100644 --- a/sw/source/uibase/inc/swvset.hxx +++ b/sw/source/uibase/inc/swvset.hxx @@ -23,7 +23,7 @@ class SwRulerValueSet : public SvxBmpNumValueSet { public: - SwRulerValueSet(Window* pParent, WinBits nWinStyle); + SwRulerValueSet(vcl::Window* pParent, WinBits nWinStyle); virtual ~SwRulerValueSet(); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/syncbtn.hxx b/sw/source/uibase/inc/syncbtn.hxx index ed0a4e9774f9..76f8be74749a 100644 --- a/sw/source/uibase/inc/syncbtn.hxx +++ b/sw/source/uibase/inc/syncbtn.hxx @@ -30,13 +30,13 @@ class SwSyncBtnDlg : public SfxFloatingWindow DECL_LINK( BtnHdl, void* ); public: - SwSyncBtnDlg(SfxBindings*, SfxChildWindow*, Window *pParent); + SwSyncBtnDlg(SfxBindings*, SfxChildWindow*, vcl::Window *pParent); }; class SwSyncChildWin : public SfxChildWindow { public: - SwSyncChildWin( Window* , + SwSyncChildWin( vcl::Window* , sal_uInt16 nId, SfxBindings*, SfxChildWinInfo* ); diff --git a/sw/source/uibase/inc/tabledlg.hxx b/sw/source/uibase/inc/tabledlg.hxx index 9abf088e34f5..d9b9988e26b7 100644 --- a/sw/source/uibase/inc/tabledlg.hxx +++ b/sw/source/uibase/inc/tabledlg.hxx @@ -38,7 +38,7 @@ class SwTableTabDlg : public SfxTabDialog virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; public: - SwTableTabDlg( Window* pParent, SfxItemPool& Pool, + SwTableTabDlg( vcl::Window* pParent, SfxItemPool& Pool, const SfxItemSet* pItemSet, SwWrtShell* pSh ); }; diff --git a/sw/source/uibase/inc/tablemgr.hxx b/sw/source/uibase/inc/tablemgr.hxx index 98ae3b1c2f17..2276631dc818 100644 --- a/sw/source/uibase/inc/tablemgr.hxx +++ b/sw/source/uibase/inc/tablemgr.hxx @@ -25,7 +25,7 @@ class SwFrmFmt; class SwWrtShell; -class Window; +namespace vcl { class Window; } class SwFlyFrmFmt; namespace com { namespace sun { namespace star { @@ -55,7 +55,7 @@ public: ~SwTableFUNC(); void InitTabCols(); - void ColWidthDlg(Window *pParent ); + void ColWidthDlg(vcl::Window *pParent ); SwTwips GetColWidth(sal_uInt16 nNum) const; SwTwips GetMaxColWidth(sal_uInt16 nNum) const; void SetColWidth(sal_uInt16 nNum, SwTwips nWidth ); diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx index b55356c669b0..603301b94ba4 100644 --- a/sw/source/uibase/inc/tautofmt.hxx +++ b/sw/source/uibase/inc/tautofmt.hxx @@ -78,7 +78,7 @@ class SwAutoFormatDlg : public SfxModalDialog DECL_LINK( SelFmtHdl, void * ); public: - SwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, + SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell, bool bSetAutoFmt = true, const SwTableAutoFmt* pSelFmt = 0 ); virtual ~SwAutoFormatDlg(); diff --git a/sw/source/uibase/inc/tblnumfm.hxx b/sw/source/uibase/inc/tblnumfm.hxx index 8fad4ff6d948..713084bea011 100644 --- a/sw/source/uibase/inc/tblnumfm.hxx +++ b/sw/source/uibase/inc/tblnumfm.hxx @@ -21,13 +21,13 @@ #include <sfx2/basedlgs.hxx> -class Window; +namespace vcl { class Window; } class SfxItemSet; class SwNumFmtDlg : public SfxSingleTabDialog { public: - SwNumFmtDlg(Window* pParent, const SfxItemSet& rSet); + SwNumFmtDlg(vcl::Window* pParent, const SfxItemSet& rSet); }; #endif diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx index efc39bd2e36c..598b5821d173 100644 --- a/sw/source/uibase/inc/titlepage.hxx +++ b/sw/source/uibase/inc/titlepage.hxx @@ -17,7 +17,7 @@ #include <vcl/lstbox.hxx> #include <numberingtypelistbox.hxx> -class Window; +namespace vcl { class Window; } class SwWrtShell; class SwPageDesc; @@ -61,7 +61,7 @@ private: DECL_LINK(DownHdl, void *); DECL_LINK(StartPageHdl, void *); public: - SwTitlePageDlg( Window *pParent ); + SwTitlePageDlg( vcl::Window *pParent ); virtual ~SwTitlePageDlg(); }; diff --git a/sw/source/uibase/inc/tmpdlg.hxx b/sw/source/uibase/inc/tmpdlg.hxx index 57abdf38e763..75cab4201d6a 100644 --- a/sw/source/uibase/inc/tmpdlg.hxx +++ b/sw/source/uibase/inc/tmpdlg.hxx @@ -71,7 +71,7 @@ class SwTemplateDlg: public SfxStyleDialog public: /// @param sPage /// Identifies name of page to open at by default - SwTemplateDlg( Window* pParent, + SwTemplateDlg( vcl::Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, const OString& sPage = OString(), diff --git a/sw/source/uibase/inc/uiborder.hxx b/sw/source/uibase/inc/uiborder.hxx index a4600d6436a0..4dc694736840 100644 --- a/sw/source/uibase/inc/uiborder.hxx +++ b/sw/source/uibase/inc/uiborder.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_UIBORDER_HXX #include <sfx2/basedlgs.hxx> -class Window; +namespace vcl { class Window; } class SfxItemSet; class SwBorderDlg : public SfxSingleTabDialog @@ -32,7 +32,7 @@ public: // SW_BORDER_MODE_TABLE // SW_BORDER_MODE_FRAME - SwBorderDlg(Window* pParent, SfxItemSet& rSet, sal_uInt16 nType); + SwBorderDlg(vcl::Window* pParent, SfxItemSet& rSet, sal_uInt16 nType); virtual ~SwBorderDlg(); }; diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index b01c859d4f13..2fd2b4384280 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -39,7 +39,7 @@ class SwFrmCtrlWindow : public VclEventBox { SwOneExampleFrame* pExampleFrame; public: - SwFrmCtrlWindow(Window* pParent, SwOneExampleFrame* pFrame); + SwFrmCtrlWindow(vcl::Window* pParent, SwOneExampleFrame* pFrame); virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -95,7 +95,7 @@ class SW_DLLPUBLIC SwOneExampleFrame SAL_DLLPRIVATE void DisposeControl(); public: - SwOneExampleFrame(Window& rWin, + SwOneExampleFrame(vcl::Window& rWin, sal_uInt32 nStyleFlags = EX_SHOW_ONLINE_LAYOUT, const Link* pInitalizedLink = 0, const OUString* pURL = 0); @@ -113,7 +113,7 @@ public: void CreatePopup(const Point& rPt); - static void CreateErrorMessage(Window* pParent); + static void CreateErrorMessage(vcl::Window* pParent); }; #endif diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx index efbbc74b606c..e624560e071f 100644 --- a/sw/source/uibase/inc/view.hxx +++ b/sw/source/uibase/inc/view.hxx @@ -199,7 +199,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell bool m_bHScrollbarEnabled; bool m_bVScrollbarEnabled; - Window *m_pScrollFill; // dummy window for filling the lower right edge + ::vcl::Window *m_pScrollFill; // dummy window for filling the lower right edge // when both scrollbars are active SvxRuler *m_pHRuler, @@ -333,7 +333,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell // methods for printing SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; - SAL_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( Window* pParent, + SAL_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet) SAL_OVERRIDE; // for readonly switching SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; @@ -510,11 +510,11 @@ public: int CreateTab(); int KillTab(); - bool StatVRuler() const { return ((Window*)m_pVRuler)->IsVisible(); } + bool StatVRuler() const { return ((vcl::Window*)m_pVRuler)->IsVisible(); } void ChangeVRulerMetric(FieldUnit eUnit); void GetVRulerMetric(FieldUnit& rToFill) const; - bool StatTab() const { return ((Window*)m_pHRuler)->IsVisible(); } + bool StatTab() const { return ((vcl::Window*)m_pHRuler)->IsVisible(); } SvxRuler& GetHRuler() { return *m_pHRuler; } SvxRuler& GetVRuler() { return *m_pVRuler; } void InvalidateRulerPos(); @@ -564,7 +564,7 @@ public: bool HasDrwObj(SdrObject *pSdrObj) const; bool HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const; bool BeginTextEdit( SdrObject* pObj, SdrPageView* pPV=NULL, - Window* pWin=NULL, bool bIsNewObj=false, bool bSetSelectionToStart=false ); + vcl::Window* pWin=NULL, bool bIsNewObj=false, bool bSetSelectionToStart=false ); void StateTabWin(SfxItemSet&); @@ -676,7 +676,7 @@ inline const SwDocShell *SwView::GetDocShell() const return ((SwView*)this)->GetDocShell(); } -SfxTabPage* CreatePrintOptionsPage( Window *pParent, +SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions, bool bPreview); diff --git a/sw/source/uibase/inc/wordcountdialog.hxx b/sw/source/uibase/inc/wordcountdialog.hxx index 50bbef849500..6048a83d86be 100644 --- a/sw/source/uibase/inc/wordcountdialog.hxx +++ b/sw/source/uibase/inc/wordcountdialog.hxx @@ -54,7 +54,7 @@ class SwWordCountFloatDlg : public SfxModelessDialog public: SwWordCountFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo); virtual ~SwWordCountFloatDlg(); void UpdateCounts(); @@ -66,7 +66,7 @@ class SwWordCountWrapper : public SfxChildWindow { AbstractSwWordCountFloatDlg* pAbstDlg; protected: - SwWordCountWrapper( Window *pParentWindow, + SwWordCountWrapper( vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx index b76334db52f7..5a56dd459d48 100644 --- a/sw/source/uibase/inc/workctrl.hxx +++ b/sw/source/uibase/inc/workctrl.hxx @@ -121,7 +121,7 @@ class SwScrollNaviToolBox : public ToolBox virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; public: - SwScrollNaviToolBox(Window* pParent, WinBits nWinStyle ) : + SwScrollNaviToolBox(vcl::Window* pParent, WinBits nWinStyle ) : ToolBox(pParent, nWinStyle ) {} }; @@ -142,7 +142,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SwScrollNaviPopup( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window *pParent ); + SwScrollNaviPopup( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window *pParent ); virtual ~SwScrollNaviPopup(); static OUString GetQuickHelpText(bool bNext); @@ -157,7 +157,7 @@ class SwHlpImageButton : public ImageButton { bool bUp; public: - SwHlpImageButton(Window* pParent, const ResId& rResId, bool bUpBtn) : + SwHlpImageButton(vcl::Window* pParent, const ResId& rResId, bool bUpBtn) : ImageButton(pParent, rResId), bUp(bUpBtn){} virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; @@ -176,7 +176,7 @@ public: SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index c6f4403a851a..2127ca0e0e97 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -25,7 +25,7 @@ #include <vcl/fixed.hxx> #include <vcl/field.hxx> -class Window; +namespace vcl { class Window; } class SfxItemSet; class SwWrtShell; @@ -34,7 +34,7 @@ class SwWrapDlg : public SfxSingleTabDialog SwWrtShell* pWrtShell; public: - SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode); + SwWrapDlg(vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode); SwWrtShell* GetWrtShell() { return pWrtShell; } }; @@ -79,7 +79,7 @@ class SwWrapTabPage: public SfxTabPage bool bDrawMode; bool bContourImage; - SwWrapTabPage(Window *pParent, const SfxItemSet &rSet); + SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwWrapTabPage(); void ApplyImageList(); @@ -97,7 +97,7 @@ class SwWrapTabPage: public SfxTabPage public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index 2ba573a4c0ca..4c03c9164cd9 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -28,7 +28,7 @@ #include "navmgr.hxx" #include <boost/optional.hpp> -class Window; +namespace vcl { class Window; } class SbxArray; class SwDoc; class SwViewOption; @@ -389,7 +389,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); void MoveCrsr( bool bWithSelect = false ); // update input fields - bool StartInputFldDlg(SwField*, bool bNextButton, Window* pParentWin = 0, OString* pWindowState = 0); + bool StartInputFldDlg(SwField*, bool bNextButton, vcl::Window* pParentWin = 0, OString* pWindowState = 0); // update DropDown fields bool StartDropDownFldDlg(SwField*, bool bNextButton, OString* pWindowState = 0); @@ -446,8 +446,8 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); DECL_STATIC_LINK( SwWrtShell, InsertRegionDialog, SwSectionData* ); // ctor, the first one is a kind of a controlled copy ctor for more views of a document - SwWrtShell( SwWrtShell&, Window *pWin, SwView &rShell); - SwWrtShell( SwDoc& rDoc, Window *pWin, SwView &rShell, + SwWrtShell( SwWrtShell&, vcl::Window *pWin, SwView &rShell); + SwWrtShell( SwDoc& rDoc, vcl::Window *pWin, SwView &rShell, const SwViewOption *pViewOpt = 0); virtual ~SwWrtShell(); diff --git a/sw/source/uibase/index/idxmrk.cxx b/sw/source/uibase/index/idxmrk.cxx index 3c2361593473..43dabb06bbdf 100644 --- a/sw/source/uibase/index/idxmrk.cxx +++ b/sw/source/uibase/index/idxmrk.cxx @@ -54,7 +54,7 @@ SFX_IMPL_CHILDWINDOW_WITHID(SwInsertIdxMarkWrapper, FN_INSERT_IDX_ENTRY_DLG) -SwInsertIdxMarkWrapper::SwInsertIdxMarkWrapper( Window *pParentWindow, +SwInsertIdxMarkWrapper::SwInsertIdxMarkWrapper( vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -84,7 +84,7 @@ void SwInsertIdxMarkWrapper::ReInitDlg(SwWrtShell& rWrtShell) SFX_IMPL_CHILDWINDOW_WITHID(SwInsertAuthMarkWrapper, FN_INSERT_AUTH_ENTRY_DLG) -SwInsertAuthMarkWrapper::SwInsertAuthMarkWrapper( Window *pParentWindow, +SwInsertAuthMarkWrapper::SwInsertAuthMarkWrapper( vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index e67752dec51b..b041797d4e81 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -629,7 +629,7 @@ void SwSpellPopup::checkRedline() } } -sal_uInt16 SwSpellPopup::Execute( const Rectangle& rWordPos, Window* pWin ) +sal_uInt16 SwSpellPopup::Execute( const Rectangle& rWordPos, vcl::Window* pWin ) { sal_uInt16 nRet = PopupMenu::Execute(pWin, pWin->LogicToPixel(rWordPos)); Execute( nRet ); diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx index ab21d35764a4..725198198fe3 100644 --- a/sw/source/uibase/misc/numberingtypelistbox.cxx +++ b/sw/source/uibase/misc/numberingtypelistbox.cxx @@ -35,7 +35,7 @@ struct SwNumberingTypeListBox_Impl uno::Reference<text::XNumberingTypeInfo> xInfo; }; -SwNumberingTypeListBox::SwNumberingTypeListBox( Window* pWin, WinBits nStyle ) : +SwNumberingTypeListBox::SwNumberingTypeListBox( vcl::Window* pWin, WinBits nStyle ) : ListBox(pWin, nStyle), pImpl(new SwNumberingTypeListBox_Impl) { @@ -54,7 +54,7 @@ bool SwNumberingTypeListBox::set_property(const OString &rKey, const OString &rV return true; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwNumberingTypeListBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwNumberingTypeListBox(vcl::Window *pParent, VclBuilder::stringmap &) { SwNumberingTypeListBox *pListBox = new SwNumberingTypeListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP); pListBox->EnableAutoSize(true); diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 10dbe3c9377f..bb55453f770b 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -61,7 +61,7 @@ SFX_IMPL_MODELESSDIALOG_WITHID( SwRedlineAcceptChild, FN_REDLINE_ACCEPT ) static sal_uInt16 nSortMode = 0xffff; static bool bSortDir = true; -SwRedlineAcceptChild::SwRedlineAcceptChild( Window* _pParent, +SwRedlineAcceptChild::SwRedlineAcceptChild( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -84,7 +84,7 @@ bool SwRedlineAcceptChild::ReInitDlg(SwDocShell *pDocSh) } SwModelessRedlineAcceptDlg::SwModelessRedlineAcceptDlg( - SfxBindings* _pBindings, SwChildWinWrapper* pChild, Window *_pParent) + SfxBindings* _pBindings, SwChildWinWrapper* pChild, vcl::Window *_pParent) : SfxModelessDialog(_pBindings, pChild, _pParent, "AcceptRejectChangesDialog", "svx/ui/acceptrejectchangesdialog.ui") , pChildWin (pChild) diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx index 1ba770fd6a42..172a0b39c483 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -35,7 +35,7 @@ #define CONTROL_TRIANGLE_PAD 3 // Constructor -SwCommentRuler::SwCommentRuler( SwViewShell* pViewSh, Window* pParent, SwEditWin* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) +SwCommentRuler::SwCommentRuler( SwViewShell* pViewSh, vcl::Window* pParent, SwEditWin* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) : SvxRuler(pParent, pWin, nRulerFlags, rBindings, nWinStyle | WB_HSCROLL) , mpViewShell(pViewSh) , mpSwWin(pWin) diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index f3e4035fd629..015e0d7231c8 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -56,7 +56,7 @@ SFX_IMPL_POS_CHILDWINDOW_WITHID( SwInputChild, FN_EDIT_FORMULA, SFX_OBJECTBAR_OBJECT ) -SwInputWindow::SwInputWindow( Window* pParent, SfxBindings* pBind ) +SwInputWindow::SwInputWindow( vcl::Window* pParent, SfxBindings* pBind ) : ToolBox( pParent , SW_RES( RID_TBX_FORMULA )), aPos( this, SW_RES(ED_POS)), aEdit( this, WB_3DLOOK|WB_TABSTOP|WB_BORDER|WB_NOHIDESELECTION), @@ -609,7 +609,7 @@ void InputEdit::UpdateRange(const OUString& rBoxes, } -SwInputChild::SwInputChild(Window* _pParent, +SwInputChild::SwInputChild(vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* ) : diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index aed90d456adf..ff70be3516b6 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -450,12 +450,12 @@ static const char* aNavigationHelpIds[ NAVI_ENTRIES ] = HID_NID_NEXT }; -SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >& rFrame, Window *pParent) +SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window *pParent) : SfxPopupWindow(nId, pParent, "FloatingNavigation", "modules/swriter/ui/floatingnavigation.ui", rFrame), aIList(SW_RES(IL_VALUES)) { - m_pToolBox = new SwScrollNaviToolBox(get<Window>("box"), 0); + m_pToolBox = new SwScrollNaviToolBox(get<vcl::Window>("box"), 0); get(m_pInfoField, "label"); sal_uInt16 i; @@ -600,7 +600,7 @@ class SwZoomBox_Impl : public ComboBox public: SwZoomBox_Impl( - Window* pParent, + vcl::Window* pParent, sal_uInt16 nSlot, const Reference< XDispatchProvider >& rDispatchProvider ); virtual ~SwZoomBox_Impl(); @@ -614,7 +614,7 @@ protected: }; SwZoomBox_Impl::SwZoomBox_Impl( - Window* pParent, + vcl::Window* pParent, sal_uInt16 nSlot, const Reference< XDispatchProvider >& rDispatchProvider ): ComboBox( pParent, SW_RES(RID_PVIEW_ZOOM_LB)), @@ -694,7 +694,7 @@ bool SwZoomBox_Impl::Notify( NotifyEvent& rNEvt ) } else if ( EVENT_LOSEFOCUS == rNEvt.GetType() ) { - Window* pFocusWin = Application::GetFocusWindow(); + vcl::Window* pFocusWin = Application::GetFocusWindow(); if ( !HasFocus() && GetSubEdit() != pFocusWin ) SetText( GetSavedValue() ); } @@ -713,7 +713,7 @@ void SwZoomBox_Impl::ReleaseFocus() if ( pCurSh ) { - Window* pShellWnd = pCurSh->GetWindow(); + vcl::Window* pShellWnd = pCurSh->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); @@ -750,7 +750,7 @@ void SwPreviewZoomControl::StateChanged( sal_uInt16 /*nSID*/, } } -Window* SwPreviewZoomControl::CreateItemWindow( Window *pParent ) +vcl::Window* SwPreviewZoomControl::CreateItemWindow( vcl::Window *pParent ) { SwZoomBox_Impl* pRet = new SwZoomBox_Impl( pParent, GetSlotId(), Reference< XDispatchProvider >( m_xFrame->getController(), UNO_QUERY )); return pRet; diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 91d9c7e9ec88..b6d0b1bfdfcb 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -2333,7 +2333,7 @@ void SwBaseShell::GetBorderState(SfxItemSet &rSet) void SwBaseShell::ExecDlg(SfxRequest &rReq) { SwWrtShell &rSh = GetShell(); - Window *pMDI = &GetView().GetViewFrame()->GetWindow(); + vcl::Window *pMDI = &GetView().GetViewFrame()->GetWindow(); // So that from the basic no dialogues for the background views are called: bool bBackground = (&GetView() != GetActiveView()); const SfxPoolItem* pItem = 0; diff --git a/sw/source/uibase/shells/grfshex.cxx b/sw/source/uibase/shells/grfshex.cxx index 0cbca7a24a99..db0694e9a12a 100644 --- a/sw/source/uibase/shells/grfshex.cxx +++ b/sw/source/uibase/shells/grfshex.cxx @@ -65,7 +65,7 @@ bool SwTextShell::InsertMediaDlg( SfxRequest& rReq ) { OUString aURL; const SfxItemSet* pReqArgs = rReq.GetArgs(); - Window* pWindow = &GetView().GetViewFrame()->GetWindow(); + vcl::Window* pWindow = &GetView().GetViewFrame()->GetWindow(); bool bAPI = false, bRet = false; if( pReqArgs ) diff --git a/sw/source/uibase/shells/langhelper.cxx b/sw/source/uibase/shells/langhelper.cxx index 52276bb85888..5b15c36bd3d8 100644 --- a/sw/source/uibase/shells/langhelper.cxx +++ b/sw/source/uibase/shells/langhelper.cxx @@ -73,7 +73,7 @@ namespace SwLangHelper OUString aKeyboardLang; LanguageType nLang = LANGUAGE_DONTKNOW; - Window* pWin = rEditView.GetWindow(); + vcl::Window* pWin = rEditView.GetWindow(); if(pWin) nLang = pWin->GetInputLanguage(); if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM) diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index 291f21696e66..4bc5c14e18d0 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -115,7 +115,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) if(pArgs) pArgs->GetItemState(GetPool().GetWhich(nSlot), false, &pItem); - Window *pMDI = &GetView().GetViewFrame()->GetWindow(); + vcl::Window *pMDI = &GetView().GetViewFrame()->GetWindow(); bool bMore = false; bool bIsText = true; sal_uInt16 nInsertType = 0; diff --git a/sw/source/uibase/shells/textidx.cxx b/sw/source/uibase/shells/textidx.cxx index 49c806a8819f..601883ed072b 100644 --- a/sw/source/uibase/shells/textidx.cxx +++ b/sw/source/uibase/shells/textidx.cxx @@ -50,7 +50,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq) pArgs->GetItemState(nSlot, false, &pItem ); SfxViewFrame* pVFrame = GetView().GetViewFrame(); - Window *pMDI = &pVFrame->GetWindow(); + vcl::Window *pMDI = &pVFrame->GetWindow(); switch( nSlot ) { diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 97f9053f01eb..e9edc6c91898 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -257,7 +257,7 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const } } -static short lcl_AskRedlineMode(Window *pWin) +static short lcl_AskRedlineMode(vcl::Window *pWin) { MessBox aQBox( pWin, 0, OUString( SW_RES( STR_REDLINE_TITLE ) ), diff --git a/sw/source/uibase/shells/txtcrsr.cxx b/sw/source/uibase/shells/txtcrsr.cxx index 6b9fb2fb69b9..991033f1a3c8 100644 --- a/sw/source/uibase/shells/txtcrsr.cxx +++ b/sw/source/uibase/shells/txtcrsr.cxx @@ -319,7 +319,7 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq) const SwView* pView = pDocShell ? pDocShell->GetView() : NULL; const FmFormShell* pFormShell = pView ? pView->GetFormShell() : NULL; SdrView* pDrawView = pView ? pView->GetDrawView() : NULL; - Window* pWindow = pView ? pView->GetWrtShell().GetWin() : NULL; + vcl::Window* pWindow = pView ? pView->GetWrtShell().GetWin() : NULL; OSL_ENSURE( pFormShell && pDrawView && pWindow, "SwXTextView::ExecMoveMisc: no chance!" ); if ( !pFormShell || !pDrawView || !pWindow ) diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx index f2a5f3857bee..2748f65f45de 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.cxx +++ b/sw/source/uibase/sidebar/PageColumnControl.cxx @@ -32,7 +32,7 @@ namespace sw { namespace sidebar { PageColumnControl::PageColumnControl( - Window* pParent, + vcl::Window* pParent, PagePropertyPanel& rPanel, const sal_uInt16 nColumnType, const bool bLandscape ) diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx index c53fdf95974c..a5ddcda8ed1b 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.hxx +++ b/sw/source/uibase/sidebar/PageColumnControl.hxx @@ -39,7 +39,7 @@ class PageColumnControl { public: PageColumnControl( - Window* pParent, + vcl::Window* pParent, PagePropertyPanel& rPanel, const sal_uInt16 nColumnType, const bool bLandscape ); diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index 52a16a24d146..e44215dbf1d9 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -39,7 +39,7 @@ namespace sw { namespace sidebar { PageMarginControl::PageMarginControl( - Window* pParent, + vcl::Window* pParent, PagePropertyPanel& rPanel, const SvxLongLRSpaceItem& aPageLRMargin, const SvxLongULSpaceItem& aPageULMargin, diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx index 041e884aa70c..253a56b18278 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.hxx +++ b/sw/source/uibase/sidebar/PageMarginControl.hxx @@ -51,7 +51,7 @@ class PageMarginControl { public: PageMarginControl( - Window* pParent, + vcl::Window* pParent, PagePropertyPanel& rPanel, const SvxLongLRSpaceItem& aPageLRMargin, const SvxLongULSpaceItem& aPageULMargin, diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx index 53236610a167..1d7e5a225cc8 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.cxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx @@ -29,7 +29,7 @@ namespace sw { namespace sidebar { PageOrientationControl::PageOrientationControl( - Window* pParent, + vcl::Window* pParent, PagePropertyPanel& rPanel, const bool bLandscape ) : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_ORIENTATION) ) diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx index 6e8d44f65d48..b829cc47e61d 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.hxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx @@ -34,7 +34,7 @@ class PageOrientationControl { public: PageOrientationControl( - Window* pParent, + vcl::Window* pParent, PagePropertyPanel& rPanel, const bool bLandscape ); virtual ~PageOrientationControl(void); diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx index 39f13a54f445..6b4f2743b01f 100644 --- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx +++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx @@ -84,7 +84,7 @@ namespace { namespace sw { namespace sidebar { PagePropertyPanel* PagePropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame, SfxBindings* pBindings) { @@ -102,7 +102,7 @@ PagePropertyPanel* PagePropertyPanel::Create ( } PagePropertyPanel::PagePropertyPanel( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame, SfxBindings* pBindings) : PanelLayout(pParent, "PagePropertyPanel", "modules/swriter/ui/sidebarpage.ui", rxFrame) diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx index 876f13e344e3..76a9a0f7cb2c 100644 --- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx +++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx @@ -56,7 +56,7 @@ namespace sw { namespace sidebar { { public: static PagePropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame, SfxBindings* pBindings ); @@ -99,7 +99,7 @@ namespace sw { namespace sidebar { private: PagePropertyPanel( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame, SfxBindings* pBindings ); virtual ~PagePropertyPanel(void); diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index 5e5cd9ddd825..31d6eaba3bb0 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -36,7 +36,7 @@ namespace sw { namespace sidebar { PageSizeControl::PageSizeControl( - Window* pParent, + vcl::Window* pParent, PagePropertyPanel& rPanel, const Paper ePaper, const bool bLandscape, diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx index a15550c160b6..2fba0461ae7b 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.hxx +++ b/sw/source/uibase/sidebar/PageSizeControl.hxx @@ -42,7 +42,7 @@ class PageSizeControl { public: PageSizeControl( - Window* pParent, + vcl::Window* pParent, PagePropertyPanel& rPanel, const Paper ePaper, const bool bLandscape, diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx index ea2491fff572..f2c085ecbf30 100644 --- a/sw/source/uibase/sidebar/SwPanelFactory.cxx +++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx @@ -88,7 +88,7 @@ Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement ( const sal_uInt64 nBindingsValue (aArguments.getOrDefault("SfxBindings", sal_uInt64(0))); SfxBindings* pBindings = reinterpret_cast<SfxBindings*>(nBindingsValue); - ::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); if ( ! xParentWindow.is() || pParentWindow==NULL) throw RuntimeException( "PanelFactory::createUIElement called without ParentWindow", @@ -123,7 +123,7 @@ Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement ( } else if (DoesResourceEndWith("/NavigatorPanel")) { - Window* pPanel = new SwNavigationPI(pBindings, NULL, pParentWindow); + vcl::Window* pPanel = new SwNavigationPI(pBindings, NULL, pParentWindow); xElement = sfx2::sidebar::SidebarPanelBase::Create( rsResourceURL, xFrame, diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx index afac9912ae1e..76b9a79dd38b 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx @@ -43,7 +43,7 @@ const char UNO_WRAPIDEAL[] = ".uno:WrapIdeal"; namespace sw { namespace sidebar { WrapPropertyPanel* WrapPropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, SfxBindings* pBindings) { @@ -61,7 +61,7 @@ WrapPropertyPanel* WrapPropertyPanel::Create ( } WrapPropertyPanel::WrapPropertyPanel( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, SfxBindings* pBindings ) : PanelLayout(pParent, "WrapPropertyPanel", "modules/swriter/ui/sidebarwrap.ui", rxFrame) diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx index 27bff8143680..d1c53394021f 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx @@ -36,7 +36,7 @@ namespace sw { namespace sidebar { { public: static WrapPropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame, SfxBindings* pBindings ); @@ -49,7 +49,7 @@ namespace sw { namespace sidebar { private: WrapPropertyPanel( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, SfxBindings* pBindings ); diff --git a/sw/source/uibase/smartmenu/stmenu.cxx b/sw/source/uibase/smartmenu/stmenu.cxx index 064ff2488020..1e059856e891 100644 --- a/sw/source/uibase/smartmenu/stmenu.cxx +++ b/sw/source/uibase/smartmenu/stmenu.cxx @@ -127,7 +127,7 @@ SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView, smarttag library. */ -sal_uInt16 SwSmartTagPopup::Execute( const Rectangle& rWordPos, Window* pWin ) +sal_uInt16 SwSmartTagPopup::Execute( const Rectangle& rWordPos, vcl::Window* pWin ) { sal_uInt16 nId = PopupMenu::Execute(pWin, pWin->LogicToPixel(rWordPos)); diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx index 7116378d4092..6370f6085490 100644 --- a/sw/source/uibase/table/chartins.cxx +++ b/sw/source/uibase/table/chartins.cxx @@ -61,7 +61,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -Point SwGetChartDialogPos( const Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart ) +Point SwGetChartDialogPos( const vcl::Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart ) { // positioning code according to spepc; similar to Calc fuins2.cxx Point aRet; @@ -132,7 +132,7 @@ Point SwGetChartDialogPos( const Window *pParentWin, const Size& rDialogSize, co return aRet; } -void SwInsertChart(Window* pParent, SfxBindings* pBindings ) +void SwInsertChart(vcl::Window* pParent, SfxBindings* pBindings ) { (void) pParent; (void) pBindings; diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx index e0eda8c281df..c20ea83d4a4a 100644 --- a/sw/source/uibase/table/tablemgr.cxx +++ b/sw/source/uibase/table/tablemgr.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star; // Adjust line height (dialogue) -void SwTableFUNC::ColWidthDlg( Window *pParent ) +void SwTableFUNC::ColWidthDlg( vcl::Window *pParent ) { InitTabCols(); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index 47d5b67660d3..bd49752dc2ab 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -80,9 +80,9 @@ class SwFormatTablePage : public SfxTabPage using TabPage::DeactivatePage; public: - SwFormatTablePage( Window* pParent, const SfxItemSet& rSet ); + SwFormatTablePage( vcl::Window* pParent, const SfxItemSet& rSet ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; @@ -129,10 +129,10 @@ class SwTableColumnPage : public SfxTabPage using TabPage::DeactivatePage; public: - SwTableColumnPage( Window* pParent, const SfxItemSet& rSet ); + SwTableColumnPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwTableColumnPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; @@ -177,11 +177,11 @@ class SwTextFlowPage : public SfxTabPage DECL_LINK( SplitRowHdl_Impl, TriStateBox* ); DECL_LINK( HeadLineCBClickHdl, void* p = 0 ); - SwTextFlowPage( Window* pParent, const SfxItemSet& rSet ); + SwTextFlowPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwTextFlowPage(); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index d54d82944d0c..a3980162cfbb 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -172,7 +172,7 @@ void SwPreviewZoomDlg::Apply() } // all for SwPagePreviewWin -SwPagePreviewWin::SwPagePreviewWin( Window *pParent, SwPagePreview& rPView ) +SwPagePreviewWin::SwPagePreviewWin( vcl::Window *pParent, SwPagePreview& rPView ) : Window(pParent, WinBits(WB_CLIPCHILDREN)) , mpViewShell(0) , mrView(rPView) @@ -1237,7 +1237,7 @@ SwDocShell* SwPagePreview::GetDocShell() int SwPagePreview::_CreateScrollbar( bool bHori ) { - Window *pMDI = &GetViewFrame()->GetWindow(); + vcl::Window *pMDI = &GetViewFrame()->GetWindow(); SwScrollbar** ppScrollbar = bHori ? &pHScrollbar : &pVScrollbar; assert(!*ppScrollbar); //check beforehand! @@ -1695,7 +1695,7 @@ bool SwPagePreview::HasPrintOptionsPage() const return true; } -SfxTabPage* SwPagePreview::CreatePrintOptionsPage( Window *pParent, +SfxTabPage* SwPagePreview::CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) { return ::CreatePrintOptionsPage( pParent, rOptions, !bNormalPrint ); diff --git a/sw/source/uibase/uiview/scroll.cxx b/sw/source/uibase/uiview/scroll.cxx index c40fbffd58ec..59812dcead71 100644 --- a/sw/source/uibase/uiview/scroll.cxx +++ b/sw/source/uibase/uiview/scroll.cxx @@ -23,7 +23,7 @@ #define SCROLL_LINE_SIZE 250 -SwScrollbar::SwScrollbar( Window *pWin, bool bHoriz ) : +SwScrollbar::SwScrollbar( vcl::Window *pWin, bool bHoriz ) : ScrollBar( pWin, WinBits( WB_3DLOOK | WB_HIDE | ( bHoriz ? WB_HSCROLL : WB_VSCROLL) ) ), bHori( bHoriz ), diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 0743753b7440..0a218517202a 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -829,7 +829,7 @@ void SwSrcView::Load(SwDocShell* pDocShell) } else { - Window *pTmpWindow = &GetViewFrame()->GetWindow(); + vcl::Window *pTmpWindow = &GetViewFrame()->GetWindow(); MessageDialog(pTmpWindow, SW_RES(STR_ERR_SRCSTREAM), VCL_MESSAGE_INFO).Execute(); } } diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 7ae27519f5af..f2f68a9eedf8 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -581,7 +581,7 @@ void SwView::Execute(SfxRequest &rReq) { OSL_ENSURE( !((const SfxBoolItem*)pItem)->GetValue(), "SwView::Execute(): password set an redlining off doesn't match!" ); // xmlsec05: new password dialog - Window* pParent; + vcl::Window* pParent; const SfxPoolItem* pParentItem; if( SfxItemState::SET == pArgs->GetItemState( SID_ATTR_XWINDOW, false, &pParentItem ) ) pParent = ( ( const XWindowItem* ) pParentItem )->GetWindowPtr(); @@ -619,7 +619,7 @@ void SwView::Execute(SfxRequest &rReq) // xmlsec05: new password dialog // message box for wrong password - Window* pParent; + vcl::Window* pParent; const SfxPoolItem* pParentItem; if( pArgs && SfxItemState::SET == pArgs->GetItemState( SID_ATTR_XWINDOW, false, &pParentItem ) ) pParent = ( ( const XWindowItem* ) pParentItem )->GetWindowPtr(); @@ -2277,7 +2277,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe if (!bCompare && !nFound) { - Window* pWin = &GetEditWin(); + vcl::Window* pWin = &GetEditWin(); MessageDialog(pWin, SW_RES(STR_NO_MERGE_ENTRY), VCL_MESSAGE_INFO).Execute(); } if( nRet==2 && xDocSh.Is() ) @@ -2432,7 +2432,7 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument) { // call documents and template dialog SfxApplication* pSfxApp = SfxGetpApp(); - Window* pTopWin = pSfxApp->GetTopWindow(); + vcl::Window* pTopWin = pSfxApp->GetTopWindow(); SfxTemplateManagerDlg aDocTemplDlg; int nRet = aDocTemplDlg.Execute(); diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx index 248c82f0da8b..2af636f2e682 100644 --- a/sw/source/uibase/uiview/viewdlg2.cxx +++ b/sw/source/uibase/uiview/viewdlg2.cxx @@ -45,7 +45,7 @@ void SwView::ExecDlgExt(SfxRequest &rReq) { - Window *pMDI = &GetViewFrame()->GetWindow(); + vcl::Window *pMDI = &GetViewFrame()->GetWindow(); switch ( rReq.GetSlot() ) { diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index 73d0106b3a5d..3169d2dc5c5a 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -165,7 +165,7 @@ void SwView::ExecDraw(SfxRequest& rReq) } else if ( nSlotId == SID_FONTWORK_GALLERY_FLOATER ) { - Window* pWin = &( m_pWrtShell->GetView().GetViewFrame()->GetWindow() ); + vcl::Window* pWin = &( m_pWrtShell->GetView().GetViewFrame()->GetWindow() ); if ( pWin ) pWin->EnterWait(); @@ -506,7 +506,7 @@ bool SwView::EnterDrawTextMode(const Point& aDocPos) // Enable DrawTextEditMode -bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin, +bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin, bool bIsNewObj, bool bSetSelectionToStart) { SwWrtShell *pSh = &GetWrtShell(); diff --git a/sw/source/uibase/uiview/viewfunc.hxx b/sw/source/uibase/uiview/viewfunc.hxx index 5c9808ade2e6..4102270a1999 100644 --- a/sw/source/uibase/uiview/viewfunc.hxx +++ b/sw/source/uibase/uiview/viewfunc.hxx @@ -29,21 +29,21 @@ class Size; class SvxRuler; class SwScrollbar; class SwViewShell; -class Window; +namespace vcl { class Window; } // The following functions are available in viewprt.cxx void SetPrinter( IDocumentDeviceAccess*, SfxPrinter*, bool bWeb ); -SfxTabPage* CreatePrintOptionsPage( Window*, const SfxItemSet& ); +SfxTabPage* CreatePrintOptionsPage( vcl::Window*, const SfxItemSet& ); void SetAppPrintOptions( SwViewShell* pSh, bool bWeb ); // The following functions are available in viewport.cxx -void ViewResizePixel( const Window &rRef, +void ViewResizePixel( const vcl::Window &rRef, const Point &rOfst, const Size &rSize, const Size &rEditSz, SwScrollbar& rVScrollbar, SwScrollbar& rHScrollbar, - Window& rScrollBarBox, + vcl::Window& rScrollBarBox, SvxRuler* pVRuler = 0, SvxRuler* pHRuler = 0, bool bVRulerRight = false ); diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index e18f89331639..bd16c2680e54 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -265,7 +265,7 @@ IMPL_LINK( SwView, WindowChildEventListener, VclSimpleEvent*, pEvent ) { VclWindowEvent *pVclEvent = static_cast< VclWindowEvent * >( pEvent ); OSL_ENSURE( pVclEvent->GetWindow(), "Window???" ); - Window* pChildWin = static_cast< Window* >( pVclEvent->GetData() ); + vcl::Window* pChildWin = static_cast< vcl::Window* >( pVclEvent->GetData() ); switch ( pVclEvent->GetId() ) { @@ -289,7 +289,7 @@ IMPL_LINK( SwView, WindowChildEventListener, VclSimpleEvent*, pEvent ) int SwView::_CreateScrollbar( bool bHori ) { - Window *pMDI = &GetViewFrame()->GetWindow(); + vcl::Window *pMDI = &GetViewFrame()->GetWindow(); SwScrollbar** ppScrollbar = bHori ? &m_pHScrollbar : &m_pVScrollbar; assert(!*ppScrollbar); //check beforehand! diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index f00be536190a..742afb0b1172 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -411,7 +411,7 @@ void SwView::Scroll( const Rectangle &rRect, sal_uInt16 nRangeX, sal_uInt16 nRan Rectangle aOldVisArea( m_aVisArea ); long nDiffY = 0; - Window* pCareWn = SwViewShell::GetCareWin(GetWrtShell()); + vcl::Window* pCareWn = SwViewShell::GetCareWin(GetWrtShell()); if ( pCareWn ) { Rectangle aDlgRect( GetEditWin().PixelToLogic( @@ -832,13 +832,13 @@ void SwView::CalcAndSetBorderPixel( SvBorder &rToFill, bool /*bInner*/ ) SetBorderPixel( rToFill ); } -void ViewResizePixel( const Window &rRef, +void ViewResizePixel( const vcl::Window &rRef, const Point &rOfst, const Size &rSize, const Size &rEditSz, SwScrollbar& rVScrollbar, SwScrollbar& rHScrollbar, - Window& rScrollBarBox, + vcl::Window& rScrollBarBox, SvxRuler* pVRuler, SvxRuler* pHRuler, bool bVRulerRight ) diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index d5e83bc2d173..4f576a0ecf14 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -147,7 +147,7 @@ bool SwView::HasPrintOptionsPage() const // TabPage for application-specific print options -SfxTabPage* SwView::CreatePrintOptionsPage(Window* pParent, +SfxTabPage* SwView::CreatePrintOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet) { return ::CreatePrintOptionsPage( pParent, rSet, false ); @@ -245,7 +245,7 @@ void SwView::ExecutePrint(SfxRequest& rReq) // Create page printer/additions for SwView and SwPagePreview -SfxTabPage* CreatePrintOptionsPage( Window *pParent, +SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions, bool bPreview ) { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx index d2ecd16bb983..9e0eca819b2c 100644 --- a/sw/source/uibase/uiview/viewsrch.cxx +++ b/sw/source/uibase/uiview/viewsrch.cxx @@ -78,7 +78,7 @@ struct SwSearchOptions SwSearchOptions( SwWrtShell* pSh, bool bBackward ); }; -static Window* GetParentWindow( SvxSearchDialog* pSrchDlg ) +static vcl::Window* GetParentWindow( SvxSearchDialog* pSrchDlg ) { return pSrchDlg && pSrchDlg->IsVisible() ? pSrchDlg : 0; } @@ -198,7 +198,7 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage) if ( pDlgWrp ) { m_pSrchDlg = (SvxSearchDialog*)(pDlgWrp->GetWindow()); - m_pSrchDlg->SetDocWin( (Window*)m_pEditWin); + m_pSrchDlg->SetDocWin( (vcl::Window*)m_pEditWin); m_pSrchDlg->SetSrchFlag(); } } @@ -225,7 +225,7 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage) if ( pDlgWrp ) { m_pSrchDlg = (SvxSearchDialog*)(pDlgWrp->GetWindow()); - m_pSrchDlg->SetDocWin( (Window*)m_pEditWin); + m_pSrchDlg->SetDocWin( (vcl::Window*)m_pEditWin); m_pSrchDlg->SetSrchFlag(); } } @@ -286,7 +286,7 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage) if ( pDlgWrp ) { m_pSrchDlg = (SvxSearchDialog*)(pDlgWrp->GetWindow()); - m_pSrchDlg->SetDocWin( (Window*)m_pEditWin); + m_pSrchDlg->SetDocWin( (vcl::Window*)m_pEditWin); m_pSrchDlg->SetSrchFlag(); } } @@ -344,7 +344,7 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage) { OUString aText( SW_RES( STR_NB_REPLACED ) ); aText = aText.replaceFirst("XX", OUString::number( nFound )); - Window* pParentWindow = GetParentWindow( m_pSrchDlg ); + vcl::Window* pParentWindow = GetParentWindow( m_pSrchDlg ); InfoBox( pParentWindow, aText ).Execute(); } } @@ -355,7 +355,7 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage) if ( pDlgWrp ) { m_pSrchDlg = (SvxSearchDialog*)(pDlgWrp->GetWindow()); - m_pSrchDlg->SetDocWin( (Window*)m_pEditWin); + m_pSrchDlg->SetDocWin( (vcl::Window*)m_pEditWin); m_pSrchDlg->SetSrchFlag(); } #endif diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index e04d4f7eda9c..ec9e9402deaf 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -443,7 +443,7 @@ SdrObject* SwXTextView::GetControl( SwView* pView2 = GetView(); FmFormShell* pFormShell = pView2 ? pView2->GetFormShell() : NULL; SdrView* pDrawView = pView2 ? pView2->GetDrawView() : NULL; - Window* pWindow = pView2 ? pView2->GetWrtShell().GetWin() : NULL; + vcl::Window* pWindow = pView2 ? pView2->GetWrtShell().GetWin() : NULL; OSL_ENSURE( pFormShell && pDrawView && pWindow, "SwXTextView::GetControl: how could I?" ); @@ -469,7 +469,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL SwXTextView::getFormCo SwView* pView2 = GetView(); FmFormShell* pFormShell = pView2 ? pView2->GetFormShell() : NULL; SdrView* pDrawView = pView2 ? pView2->GetDrawView() : NULL; - Window* pWindow = pView2 ? pView2->GetWrtShell().GetWin() : NULL; + vcl::Window* pWindow = pView2 ? pView2->GetWrtShell().GetWin() : NULL; OSL_ENSURE( pFormShell && pDrawView && pWindow, "SwXTextView::getFormController: how could I?" ); uno::Reference< form::runtime::XFormController > xController; diff --git a/sw/source/uibase/utlui/condedit.cxx b/sw/source/uibase/utlui/condedit.cxx index 5aa7ff1abb0b..b15694b02b00 100644 --- a/sw/source/uibase/utlui/condedit.cxx +++ b/sw/source/uibase/utlui/condedit.cxx @@ -26,7 +26,7 @@ using namespace ::svx; using namespace ::com::sun::star::uno; -ConditionEdit::ConditionEdit(Window* pParent, WinBits nStyle) +ConditionEdit::ConditionEdit(vcl::Window* pParent, WinBits nStyle) : Edit(pParent, nStyle) , DropTargetHelper(this) , bBrackets(true) @@ -34,7 +34,7 @@ ConditionEdit::ConditionEdit(Window* pParent, WinBits nStyle) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeConditionEdit(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeConditionEdit(vcl::Window *pParent, VclBuilder::stringmap &rMap) { VclBuilder::ensureDefaultWidthChars(rMap); return new ConditionEdit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index d67ddda9907b..80953c478715 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -784,7 +784,7 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged) // TreeListBox for content indicator -SwContentTree::SwContentTree(Window* pParent, const ResId& rResId) : +SwContentTree::SwContentTree(vcl::Window* pParent, const ResId& rResId) : SvTreeListBox( pParent, rResId ), sSpace(OUString(" ")), @@ -2730,7 +2730,7 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent) pActiveShell->GetView().GetEditWin(); vcl::KeyCode tempKeycode( KEY_ESCAPE ); KeyEvent rKEvt( 0 , tempKeycode ); - ((Window*)&pEditWindow)->KeyInput( rKEvt ); + ((vcl::Window*)&pEditWindow)->KeyInput( rKEvt ); //rView.GetEditWin().GrabFocus(); } } diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index ba20939edcb3..39ad2e55e56f 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -144,7 +144,7 @@ void SwGlobalFrameListener_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& bValid = false; } -SwGlobalTree::SwGlobalTree(Window* pParent, const ResId& rResId) : +SwGlobalTree::SwGlobalTree(vcl::Window* pParent, const ResId& rResId) : SvTreeListBox(pParent, rResId), diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx index d2af8c14b06e..00005e08aaa2 100644 --- a/sw/source/uibase/utlui/gloslst.cxx +++ b/sw/source/uibase/utlui/gloslst.cxx @@ -58,11 +58,11 @@ class SwGlossDecideDlg : public ModalDialog DECL_LINK(SelectHdl, void*); public: - SwGlossDecideDlg(Window* pParent); + SwGlossDecideDlg(vcl::Window* pParent); ListBox& GetListBox() {return *m_pListLB;} }; -SwGlossDecideDlg::SwGlossDecideDlg(Window* pParent) +SwGlossDecideDlg::SwGlossDecideDlg(vcl::Window* pParent) : ModalDialog(pParent, "SelectAutoTextDialog", "modules/swriter/ui/selectautotextdialog.ui") { diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index a28a3646b3b4..47f9dcc9bfc0 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -429,7 +429,7 @@ void SwNavHelpToolBox::MouseButtonDown(const MouseEvent &rEvt) SwHelpToolBox::MouseButtonDown(rEvt); } -void SwNavigationPI::CreateNavigationTool(const Rectangle& rRect, bool bSetFocus, Window *pParent) +void SwNavigationPI::CreateNavigationTool(const Rectangle& rRect, bool bSetFocus, vcl::Window *pParent) { Reference< XFrame > xFrame = GetCreateView()->GetViewFrame()->GetFrame().GetFrameInterface(); SwScrollNaviPopup* pPopup = new @@ -602,7 +602,7 @@ void SwNavigationPI::_ZoomIn() void SwNavigationPI::Resize() { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if( !_IsZoomedIn() ) { Size aNewSize (pParent->GetOutputSizePixel()); @@ -653,7 +653,7 @@ void SwNavigationPI::Resize() SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, SfxChildWindowContext* pCw, - Window* pParent) : + vcl::Window* pParent) : Window( pParent, SW_RES(DLG_NAVIGATION_PI)), SfxControllerItem( SID_DOCFULLNAME, *_pBindings ), @@ -1318,7 +1318,7 @@ SwView* SwNavigationPI::GetCreateView() const return pCreateView; } -SwNavigationChild::SwNavigationChild( Window* pParent, +SwNavigationChild::SwNavigationChild( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* _pBindings, SfxChildWinInfo* ) diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index abbc71a6c7aa..89630e93894c 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -54,7 +54,7 @@ using namespace ::com::sun::star::lang; * nDefFmt: Select this format and possibly insert it */ -NumFormatListBox::NumFormatListBox(Window* pWin, WinBits nStyle) : +NumFormatListBox::NumFormatListBox(vcl::Window* pWin, WinBits nStyle) : ListBox ( pWin, nStyle ), nCurrFormatType (-1), nStdEntry (0), @@ -68,7 +68,7 @@ NumFormatListBox::NumFormatListBox(Window* pWin, WinBits nStyle) : Init(NUMBERFORMAT_NUMBER, true); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeNumFormatListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeNumFormatListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK; diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index 8875d35b73a3..6d3c4baf89a0 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -62,7 +62,7 @@ const sal_Char cFactory[] = "private:factory/swriter"; bool SwOneExampleFrame::bShowServiceNotAvailableMessage = true; -SwOneExampleFrame::SwOneExampleFrame( Window& rWin, +SwOneExampleFrame::SwOneExampleFrame( vcl::Window& rWin, sal_uInt32 nFlags, const Link* pInitializedLink, const OUString* pURL ) : @@ -90,7 +90,7 @@ SwOneExampleFrame::SwOneExampleFrame( Window& rWin, aTopWindow.Show(); } -void SwOneExampleFrame::CreateErrorMessage(Window* pParent) +void SwOneExampleFrame::CreateErrorMessage(vcl::Window* pParent) { if(SwOneExampleFrame::bShowServiceNotAvailableMessage) { @@ -517,7 +517,7 @@ IMPL_LINK(SwOneExampleFrame, PopupHdl, Menu*, pMenu ) return 0; }; -SwFrmCtrlWindow::SwFrmCtrlWindow(Window* pParent, SwOneExampleFrame* pFrame) +SwFrmCtrlWindow::SwFrmCtrlWindow(vcl::Window* pParent, SwOneExampleFrame* pFrame) : VclEventBox(pParent) , pExampleFrame(pFrame) { diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 905733694300..e7f78d121334 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -1593,7 +1593,7 @@ void SwWrtShell::AutoCorrect( SvxAutoCorrect& rACorr, sal_Unicode cChar ) // Some kind of controlled copy ctor -SwWrtShell::SwWrtShell( SwWrtShell& rSh, Window *_pWin, SwView &rShell ) +SwWrtShell::SwWrtShell( SwWrtShell& rSh, vcl::Window *_pWin, SwView &rShell ) : SwFEShell( rSh, _pWin ), COMMON_INI_LIST { @@ -1610,7 +1610,7 @@ SwWrtShell::SwWrtShell( SwWrtShell& rSh, Window *_pWin, SwView &rShell ) } } -SwWrtShell::SwWrtShell( SwDoc& rDoc, Window *_pWin, SwView &rShell, +SwWrtShell::SwWrtShell( SwDoc& rDoc, vcl::Window *_pWin, SwView &rShell, const SwViewOption *pViewOpt ) : SwFEShell( rDoc, _pWin, pViewOpt), COMMON_INI_LIST @@ -1752,7 +1752,7 @@ void SwWrtShell::ChangeHeaderOrFooter( //Actions have to be closed while the dialog is showing EndAllAction(); - Window* pParent = &GetView().GetViewFrame()->GetWindow(); + vcl::Window* pParent = &GetView().GetViewFrame()->GetWindow(); short nResult; if (bHeader) nResult = DeleteHeaderDialog(pParent).Execute(); diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx index e6f000c8bf75..cf394fb00d32 100644 --- a/sw/source/uibase/wrtsh/wrtsh2.cxx +++ b/sw/source/uibase/wrtsh/wrtsh2.cxx @@ -198,7 +198,7 @@ class FieldDeletionModify : public SwModify // Start input dialog for a specific field bool SwWrtShell::StartInputFldDlg( SwField* pFld, bool bNextButton, - Window* pParentWin, OString* pWindowState ) + vcl::Window* pParentWin, OString* pWindowState ) { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); |