diff options
Diffstat (limited to 'basctl')
42 files changed, 146 insertions, 146 deletions
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index aaec4fba9104..75dd5f8f0129 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -178,9 +178,9 @@ void AccessibleDialogControlShape::SetBounds( const awt::Rectangle& aBounds ) -Window* AccessibleDialogControlShape::GetWindow() const +vcl::Window* AccessibleDialogControlShape::GetWindow() const { - Window* pWindow = NULL; + vcl::Window* pWindow = NULL; if ( m_pDlgEdObj ) { Reference< awt::XControl > xControl( m_pDlgEdObj->GetControl(), UNO_QUERY ); @@ -495,7 +495,7 @@ sal_Int32 AccessibleDialogControlShape::getForeground( ) throw (RuntimeExceptio OExternalLockGuard aGuard( this ); sal_Int32 nColor = 0; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { if ( pWindow->IsControlForeground() ) @@ -521,7 +521,7 @@ sal_Int32 AccessibleDialogControlShape::getBackground( ) throw (RuntimeExceptio OExternalLockGuard aGuard( this ); sal_Int32 nColor = 0; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { if ( pWindow->IsControlBackground() ) @@ -542,7 +542,7 @@ Reference< awt::XFont > AccessibleDialogControlShape::getFont( ) throw (Runtime OExternalLockGuard aGuard( this ); Reference< awt::XFont > xFont; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(), UNO_QUERY ); @@ -578,7 +578,7 @@ OUString AccessibleDialogControlShape::getToolTipText( ) throw (RuntimeExceptio OExternalLockGuard aGuard( this ); OUString sText; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) sText = pWindow->GetQuickHelpText(); diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 527da88e2dde..1d00867f3894 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -667,7 +667,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent( ) throw ( Reference< XAccessible > xParent; if ( m_pDialogWindow ) { - Window* pParent = m_pDialogWindow->GetAccessibleParentWindow(); + vcl::Window* pParent = m_pDialogWindow->GetAccessibleParentWindow(); if ( pParent ) xParent = pParent->GetAccessible(); } @@ -684,13 +684,13 @@ sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent( ) throw (RuntimeE sal_Int32 nIndexInParent = -1; if ( m_pDialogWindow ) { - Window* pParent = m_pDialogWindow->GetAccessibleParentWindow(); + vcl::Window* pParent = m_pDialogWindow->GetAccessibleParentWindow(); if ( pParent ) { for ( sal_uInt16 i = 0, nCount = pParent->GetAccessibleChildWindowCount(); i < nCount; ++i ) { - Window* pChild = pParent->GetAccessibleChildWindow( i ); - if ( pChild == static_cast< Window* >( m_pDialogWindow ) ) + vcl::Window* pChild = pParent->GetAccessibleChildWindow( i ); + if ( pChild == static_cast< vcl::Window* >( m_pDialogWindow ) ) { nIndexInParent = i; break; diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index 194004ba392b..5699f1aacd95 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.cxx @@ -78,7 +78,7 @@ void LibBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPool -Window* LibBoxControl::CreateItemWindow( Window *pParent ) +vcl::Window* LibBoxControl::CreateItemWindow( vcl::Window *pParent ) { return new LibBox( pParent, m_xFrame ); } @@ -87,7 +87,7 @@ Window* LibBoxControl::CreateItemWindow( Window *pParent ) //= DocListenerBox -DocListenerBox::DocListenerBox( Window* pParent ) +DocListenerBox::DocListenerBox( vcl::Window* pParent ) :ListBox( pParent, WinBits( WB_BORDER | WB_DROPDOWN ) ) ,m_aNotifier( *this ) { @@ -146,7 +146,7 @@ void DocListenerBox::onDocumentModeChanged( const ScriptDocument& /*_rDocument*/ //= basctl::LibBox -LibBox::LibBox( Window* pParent, const uno::Reference< frame::XFrame >& rFrame ) : +LibBox::LibBox( vcl::Window* pParent, const uno::Reference< frame::XFrame >& rFrame ) : DocListenerBox( pParent ), m_xFrame( rFrame ) { @@ -190,7 +190,7 @@ void LibBox::ReleaseFocus() if ( pCurSh ) { - Window* pShellWin = pCurSh->GetWindow(); + vcl::Window* pShellWin = pCurSh->GetWindow(); if ( !pShellWin ) pShellWin = Application::GetDefDialogParent(); @@ -367,14 +367,14 @@ void LanguageBoxControl::StateChanged( sal_uInt16 nID, SfxItemState eState, cons } } -Window* LanguageBoxControl::CreateItemWindow( Window *pParent ) +vcl::Window* LanguageBoxControl::CreateItemWindow( vcl::Window *pParent ) { return new LanguageBox( pParent ); } // class basctl::LanguageBox ----------------------------------------------- -LanguageBox::LanguageBox( Window* pParent ) : +LanguageBox::LanguageBox( vcl::Window* pParent ) : DocListenerBox( pParent ), diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx index ea71b7286ac6..572765bacbc4 100644 --- a/basctl/source/basicide/basicbox.hxx +++ b/basctl/source/basicide/basicbox.hxx @@ -38,7 +38,7 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; }; /** base class for list boxes which need to update their content according to the list @@ -48,7 +48,7 @@ class DocListenerBox :public ListBox ,public DocumentEventListener { protected: - DocListenerBox( Window* pParent ); + DocListenerBox( vcl::Window* pParent ); virtual ~DocListenerBox(); protected: @@ -94,7 +94,7 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - LibBox( Window* pParent, + LibBox( vcl::Window* pParent, const com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); virtual ~LibBox(); @@ -111,7 +111,7 @@ public: virtual ~LanguageBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; }; class LanguageBox : public DocListenerBox @@ -134,7 +134,7 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - LanguageBox( Window* pParent ); + LanguageBox( vcl::Window* pParent ); virtual ~LanguageBox(); using Window::Update; diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 57cf39d6c1f2..97a31e140aa3 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -654,7 +654,7 @@ bool ModulWindow::BasicErrorHdl( StarBASIC * pBasic ) ErrorHandler::HandleError( StarBASIC::GetErrorCode() ); // #i47002# - Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( !pWindow ) return false; @@ -1443,7 +1443,7 @@ void ModulWindow::UpdateModule () -ModulWindowLayout::ModulWindowLayout (Window* pParent, ObjectCatalog& rObjectCatalog_) : +ModulWindowLayout::ModulWindowLayout (vcl::Window* pParent, ObjectCatalog& rObjectCatalog_) : Layout(pParent), pChild(0), aWatchWindow(this), diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 02ce15c3c414..df3aae8cec4a 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -75,7 +75,7 @@ class CodeCompleteWindow; OUString getTextEngineText (ExtTextEngine&); void setTextEngineText (ExtTextEngine&, OUString const&); -class EditorWindow : public Window, public SfxListener +class EditorWindow : public vcl::Window, public SfxListener { friend class CodeCompleteListBox; private: @@ -144,7 +144,7 @@ protected: bool ImpCanModify(); public: - EditorWindow (Window* pParent, ModulWindow*); + EditorWindow (vcl::Window* pParent, ModulWindow*); virtual ~EditorWindow(); ExtTextEngine* GetEditEngine() const { return pEditEngine.get(); } @@ -169,7 +169,7 @@ public: }; -class BreakPointWindow : public Window +class BreakPointWindow : public vcl::Window { private: ModulWindow& rModulWindow; @@ -192,7 +192,7 @@ protected: bool SyncYOffset(); public: - BreakPointWindow (Window* pParent, ModulWindow*); + BreakPointWindow (vcl::Window* pParent, ModulWindow*); virtual ~BreakPointWindow(); void SetMarkerPos( sal_uInt16 nLine, bool bErrorMarker = false ); @@ -216,7 +216,7 @@ protected: SbxBase* ImplGetSBXForEntry( SvTreeListEntry* pEntry, bool& rbArrayElement ); public: - WatchTreeListBox( Window* pParent, WinBits nWinBits ); + WatchTreeListBox( vcl::Window* pParent, WinBits nWinBits ); virtual ~WatchTreeListBox(); void RequestingChildren( SvTreeListEntry * pParent ) SAL_OVERRIDE; @@ -277,7 +277,7 @@ public: }; -class ComplexEditorWindow : public Window +class ComplexEditorWindow : public vcl::Window { private: BreakPointWindow aBrkWindow; @@ -426,7 +426,7 @@ public: class ModulWindowLayout: public Layout { public: - ModulWindowLayout (Window* pParent, ObjectCatalog&); + ModulWindowLayout (vcl::Window* pParent, ObjectCatalog&); public: // Layout: virtual void Activating (BaseWindow&) SAL_OVERRIDE; @@ -507,7 +507,7 @@ protected: virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; }; -class CodeCompleteWindow: public Window +class CodeCompleteWindow: public vcl::Window { friend class CodeCompleteListBox; private: diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index d3e2bb48ab96..9b34fc328760 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -229,7 +229,7 @@ private: sal_uLong nCurState; }; -EditorWindow::EditorWindow (Window* pParent, ModulWindow* pModulWindow) : +EditorWindow::EditorWindow (vcl::Window* pParent, ModulWindow* pModulWindow) : Window(pParent, WB_BORDER), pEditView(0), pEditEngine(0), @@ -1355,7 +1355,7 @@ void EditorWindow::ForceSyntaxTimeout() -BreakPointWindow::BreakPointWindow (Window* pParent, ModulWindow* pModulWindow) +BreakPointWindow::BreakPointWindow (vcl::Window* pParent, ModulWindow* pModulWindow) : Window(pParent, WB_BORDER) , rModulWindow(*pModulWindow) , nCurYOffset(0) // memorize nCurYOffset and not take it from EditEngine @@ -2119,7 +2119,7 @@ EditorWindow::GetComponentInterface(bool bCreate) -WatchTreeListBox::WatchTreeListBox( Window* pParent, WinBits nWinBits ) +WatchTreeListBox::WatchTreeListBox( vcl::Window* pParent, WinBits nWinBits ) : SvHeaderTabListBox( pParent, nWinBits ) {} diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index c9973c4ba175..e294a3b825ff 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -903,11 +903,11 @@ std::vector< lang::Locale > implGetLanguagesOnlyContainedInFirstSeq class NameClashQueryBox : public MessBox { public: - NameClashQueryBox( Window* pParent, + NameClashQueryBox( vcl::Window* pParent, const OUString& rTitle, const OUString& rMessage ); }; -NameClashQueryBox::NameClashQueryBox( Window* pParent, +NameClashQueryBox::NameClashQueryBox( vcl::Window* pParent, const OUString& rTitle, const OUString& rMessage ) : MessBox( pParent, 0, rTitle, rMessage ) { @@ -928,11 +928,11 @@ NameClashQueryBox::NameClashQueryBox( Window* pParent, class LanguageMismatchQueryBox : public MessBox { public: - LanguageMismatchQueryBox( Window* pParent, + LanguageMismatchQueryBox( vcl::Window* pParent, const OUString& rTitle, const OUString& rMessage ); }; -LanguageMismatchQueryBox::LanguageMismatchQueryBox( Window* pParent, +LanguageMismatchQueryBox::LanguageMismatchQueryBox( vcl::Window* pParent, const OUString& rTitle, const OUString& rMessage ) : MessBox( pParent, 0, rTitle, rMessage ) { @@ -950,7 +950,7 @@ LanguageMismatchQueryBox::LanguageMismatchQueryBox( Window* pParent, } -bool implImportDialog( Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName ) +bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName ) { bool bDone = false; @@ -1406,7 +1406,7 @@ ItemType DialogWindow::GetType () const -DialogWindowLayout::DialogWindowLayout (Window* pParent, ObjectCatalog& rObjectCatalog_) : +DialogWindowLayout::DialogWindowLayout (vcl::Window* pParent, ObjectCatalog& rObjectCatalog_) : Layout(pParent), pChild(0), rObjectCatalog(rObjectCatalog_), diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index eb05257bcb71..4b2582ee66ff 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -139,7 +139,7 @@ void Shell::ExecuteCurrent( SfxRequest& rReq ) { SfxViewFrame* pViewFrame = GetViewFrame(); SfxChildWindow* pChildWin = pViewFrame ? pViewFrame->GetChildWindow( SID_SEARCH_DLG ) : NULL; - Window* pParent = pChildWin ? pChildWin->GetWindow() : NULL; + vcl::Window* pParent = pChildWin ? pChildWin->GetWindow() : NULL; QueryBox aQuery(pParent, WB_YES_NO|WB_DEF_YES, IDE_RESSTR(RID_STR_SEARCHFROMSTART)); if ( aQuery.Execute() == RET_YES ) { @@ -665,7 +665,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) TextSelection aSel( TextPaM( nLine, nCol1 ), TextPaM( nLine, nCol2 ) ); pTextView->SetSelection( aSel ); pTextView->ShowCursor(); - Window* pWindow_ = pTextView->GetWindow(); + vcl::Window* pWindow_ = pTextView->GetWindow(); if ( pWindow_ ) pWindow_->GrabFocus(); } @@ -1002,8 +1002,8 @@ void Shell::SetCurWindow( BaseWindow* pNewWin, bool bUpdateTabBar, bool bRemembe pCurWin->Init(); if (!GetExtraData()->ShellInCriticalSection()) { - Window* pFrameWindow = &GetViewFrame()->GetWindow(); - Window* pFocusWindow = Application::GetFocusWindow(); + vcl::Window* pFrameWindow = &GetViewFrame()->GetWindow(); + vcl::Window* pFocusWindow = Application::GetFocusWindow(); while ( pFocusWindow && ( pFocusWindow != pFrameWindow ) ) pFocusWindow = pFocusWindow->GetParent(); if ( pFocusWindow ) // Focus in BasicIDE diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 18be9999cbf8..aeb2acb22451 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -391,7 +391,7 @@ bool Shell::PrepareClose( bool bUI ) { if( bUI ) { - Window *pParent = &GetViewFrame()->GetWindow(); + vcl::Window *pParent = &GetViewFrame()->GetWindow(); InfoBox( pParent, IDE_RESSTR(RID_STR_CANNOTCLOSE)).Execute(); } return false; diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index eee39ba9b08e..32933e3b9bad 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -77,7 +77,7 @@ void Organize( sal_Int16 tabId ) if (BaseWindow* pCurWin = pShell->GetCurWindow()) aDesc = pCurWin->CreateEntryDescriptor(); - Window* pParent = Application::GetDefDialogParent(); + vcl::Window* pParent = Application::GetDefDialogParent(); OrganizeDialog(pParent, tabId, aDesc).Execute(); } @@ -145,7 +145,7 @@ Sequence< OUString > GetMergedLibraryNames( const Reference< script::XLibraryCon } bool RenameModule ( - Window* pErrorParent, + vcl::Window* pErrorParent, const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rOldName, diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index 97008a1107f6..288900794dba 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -155,7 +155,7 @@ SbMethod* CreateMacro( SbModule* pModule, const OUString& rMacroName ) } bool RenameDialog ( - Window* pErrorParent, + vcl::Window* pErrorParent, ScriptDocument const& rDocument, OUString const& rLibName, OUString const& rOldName, @@ -348,7 +348,7 @@ void BasicStopped( *pnWaitCount = nWait; } - Window* pDefParent = Application::GetDefDialogParent(); + vcl::Window* pDefParent = Application::GetDefDialogParent(); if ( pDefParent && !pDefParent->IsEnabled() ) { pDefParent->Enable(true); diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index 51729f9e5619..4c9f52abc237 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -183,14 +183,14 @@ bool EntryDescriptor::operator == (EntryDescriptor const& rDesc) const -TreeListBox::TreeListBox (Window* pParent, ResId const& rRes) +TreeListBox::TreeListBox (vcl::Window* pParent, ResId const& rRes) : SvTreeListBox( pParent, IDEResId( sal::static_int_cast<sal_uInt16>( rRes.GetId() ) ) ) , m_aNotifier( *this ) { Init(); } -TreeListBox::TreeListBox (Window* pParent, WinBits nStyle) +TreeListBox::TreeListBox (vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) , m_aNotifier( *this ) { @@ -204,7 +204,7 @@ void TreeListBox::Init() nMode = 0xFF; // everything } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTreeListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx index e703d2e4613b..0eac7b8875a9 100644 --- a/basctl/source/basicide/bastype2.hxx +++ b/basctl/source/basicide/bastype2.hxx @@ -206,8 +206,8 @@ protected: virtual void onDocumentModeChanged( const ScriptDocument& _rDocument ) SAL_OVERRIDE; public: - TreeListBox(Window* pParent, const ResId& rRes); - TreeListBox(Window* pParent, WinBits nStyle); + TreeListBox(vcl::Window* pParent, const ResId& rRes); + TreeListBox(vcl::Window* pParent, WinBits nStyle); virtual ~TreeListBox(); void ScanEntry( const ScriptDocument& rDocument, LibraryLocation eLocation ); diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx index cf732b132676..43ad48511504 100644 --- a/basctl/source/basicide/bastype3.hxx +++ b/basctl/source/basicide/bastype3.hxx @@ -40,7 +40,7 @@ protected: DECL_LINK(ImplLoseFocusHdl, void *); public: - ExtendedEdit( Window* pParent, IDEResId nRes ); + ExtendedEdit( vcl::Window* pParent, IDEResId nRes ); void SetAccHdl( const Link& rLink ) { aAccHdl = rLink; } void SetLoseFocusHdl( const Link& rLink ) { aLoseFocusHdl = rLink; } diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 5fbdd63c2004..994ad6eafdd3 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star; TYPEINIT0( BaseWindow ) TYPEINIT1( SbxItem, SfxPoolItem ); -BaseWindow::BaseWindow( Window* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName ) +BaseWindow::BaseWindow( vcl::Window* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName ) :Window( pParent, WinBits( WB_3DLOOK ) ) ,m_aDocument( rDocument ) ,m_aLibName( aLibName ) @@ -266,7 +266,7 @@ WinBits const DockingWindow::StyleBits = WB_BORDER | WB_3DLOOK | WB_CLIPCHILDREN | WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_DOCKABLE; -DockingWindow::DockingWindow (Window* pParent) : +DockingWindow::DockingWindow (vcl::Window* pParent) : ::DockingWindow(pParent, StyleBits), pLayout(0), nShowCount(0) @@ -418,7 +418,7 @@ void DockingWindow::DockThis () -ExtendedEdit::ExtendedEdit( Window* pParent, IDEResId nRes ) : +ExtendedEdit::ExtendedEdit( vcl::Window* pParent, IDEResId nRes ) : Edit( pParent, nRes ) { aAcc.SetSelectHdl( LINK( this, ExtendedEdit, EditAccHdl ) ); @@ -454,7 +454,7 @@ IMPL_LINK_INLINE_END( ExtendedEdit, EditAccHdl, Accelerator *, pAcc ) -TabBar::TabBar( Window* pParent ) : +TabBar::TabBar( vcl::Window* pParent ) : ::TabBar( pParent, WinBits( WB_3DLOOK | WB_SCROLL | WB_BORDER | WB_SIZEABLE | WB_DRAG ) ) { EnableEditMode(true); @@ -782,7 +782,7 @@ LibInfos::Item::Item ( LibInfos::Item::~Item () { } -bool QueryDel( const OUString& rName, const ResId& rId, Window* pParent ) +bool QueryDel( const OUString& rName, const ResId& rId, vcl::Window* pParent ) { OUString aQuery(rId.toString()); OUStringBuffer aNameBuf( rName ); @@ -793,27 +793,27 @@ bool QueryDel( const OUString& rName, const ResId& rId, Window* pParent ) return ( aQueryBox.Execute() == RET_YES ); } -bool QueryDelMacro( const OUString& rName, Window* pParent ) +bool QueryDelMacro( const OUString& rName, vcl::Window* pParent ) { return QueryDel( rName, IDEResId( RID_STR_QUERYDELMACRO ), pParent ); } -bool QueryReplaceMacro( const OUString& rName, Window* pParent ) +bool QueryReplaceMacro( const OUString& rName, vcl::Window* pParent ) { return QueryDel( rName, IDEResId( RID_STR_QUERYREPLACEMACRO ), pParent ); } -bool QueryDelDialog( const OUString& rName, Window* pParent ) +bool QueryDelDialog( const OUString& rName, vcl::Window* pParent ) { return QueryDel( rName, IDEResId( RID_STR_QUERYDELDIALOG ), pParent ); } -bool QueryDelLib( const OUString& rName, bool bRef, Window* pParent ) +bool QueryDelLib( const OUString& rName, bool bRef, vcl::Window* pParent ) { return QueryDel( rName, IDEResId( bRef ? RID_STR_QUERYDELLIBREF : RID_STR_QUERYDELLIB ), pParent ); } -bool QueryDelModule( const OUString& rName, Window* pParent ) +bool QueryDelModule( const OUString& rName, vcl::Window* pParent ) { return QueryDel( rName, IDEResId( RID_STR_QUERYDELMODULE ), pParent ); } diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx index 77c4c77accc3..30d94cc08873 100644 --- a/basctl/source/basicide/brkdlg.cxx +++ b/basctl/source/basicide/brkdlg.cxx @@ -63,7 +63,7 @@ bool lcl_ParseText(OUString const &rText, size_t& rLineNr ) } // namespace -BreakPointDialog::BreakPointDialog( Window* pParent, BreakPointList& rBrkPntList ) +BreakPointDialog::BreakPointDialog( vcl::Window* pParent, BreakPointList& rBrkPntList ) : ModalDialog(pParent, "ManageBreakpointsDialog", "modules/BasicIDE/ui/managebreakpoints.ui") , m_rOriginalBreakPointList(rBrkPntList) diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx index da61756fecea..2ae1ff77546a 100644 --- a/basctl/source/basicide/brkdlg.hxx +++ b/basctl/source/basicide/brkdlg.hxx @@ -54,7 +54,7 @@ protected: public: - BreakPointDialog( Window* pParent, BreakPointList& rBrkList ); + BreakPointDialog( vcl::Window* pParent, BreakPointList& rBrkList ); void SetCurrentBreakPoint( BreakPoint* pBrk ); }; diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx index 02fb50f5c373..50c9d5e41dc4 100644 --- a/basctl/source/basicide/layout.cxx +++ b/basctl/source/basicide/layout.cxx @@ -35,7 +35,7 @@ static long const nSplitThickness = 3; // ctor for derived classes // pParent: the parent window (Shell) -Layout::Layout (Window* pParent) : +Layout::Layout (vcl::Window* pParent) : Window(pParent, WB_CLIPCHILDREN), pChild(0), bFirstSize(true), diff --git a/basctl/source/basicide/layout.hxx b/basctl/source/basicide/layout.hxx index 3db298349cd5..9a6ab12fc3ca 100644 --- a/basctl/source/basicide/layout.hxx +++ b/basctl/source/basicide/layout.hxx @@ -41,7 +41,7 @@ class BaseWindow; // Layout -- the common base of ModulLayout and DialogLayout. // Handles the splitting lines and the dockable windows. -class Layout: public Window +class Layout: public vcl::Window { public: void DockaWindow (DockingWindow*); @@ -54,7 +54,7 @@ public: virtual void UpdateDebug (bool bBasicStopped ) = 0; protected: - Layout (Window* pParent); + Layout (vcl::Window* pParent); virtual ~Layout (); void AddToLeft (DockingWindow* pWin, Size const& rSize) { aLeftSide.Add(pWin, rSize); } diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx index d7064e9d2485..57dde92c3cc0 100644 --- a/basctl/source/basicide/linenumberwindow.cxx +++ b/basctl/source/basicide/linenumberwindow.cxx @@ -17,7 +17,7 @@ namespace basctl { -LineNumberWindow::LineNumberWindow (Window* pParent, ModulWindow* pModulWindow) : +LineNumberWindow::LineNumberWindow (vcl::Window* pParent, ModulWindow* pModulWindow) : Window(pParent, WB_BORDER), m_pModulWindow(pModulWindow), m_nCurYOffset(0) diff --git a/basctl/source/basicide/linenumberwindow.hxx b/basctl/source/basicide/linenumberwindow.hxx index e01c078a378f..5c539d6a767e 100644 --- a/basctl/source/basicide/linenumberwindow.hxx +++ b/basctl/source/basicide/linenumberwindow.hxx @@ -17,7 +17,7 @@ namespace basctl class ModulWindow; -class LineNumberWindow : public Window +class LineNumberWindow : public vcl::Window { private: ModulWindow* m_pModulWindow; @@ -30,7 +30,7 @@ protected: virtual void Paint( const Rectangle& ) SAL_OVERRIDE; public: - LineNumberWindow (Window* pParent, ModulWindow* pModulWin); + LineNumberWindow (vcl::Window* pParent, ModulWindow* pModulWin); virtual ~LineNumberWindow(); void DoScroll( long nHorzScroll, long nVertScroll ); diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index fb8621255a31..a88cca451cc2 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -59,7 +59,7 @@ using ::std::pair; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -MacroChooser::MacroChooser( Window* pParnt, bool bCreateEntries ) +MacroChooser::MacroChooser( vcl::Window* pParnt, bool bCreateEntries ) : SfxModalDialog(pParnt, "BasicMacroDialog", "modules/BasicIDE/ui/basicmacrodialog.ui") , bNewDelIsDel(true) // the Sfx doesn't aske the BasicManger whether modified or not @@ -232,7 +232,7 @@ short MacroChooser::Execute() if ( StarBASIC::IsRunning() ) m_pCloseButton->GrabFocus(); - Window* pPrevDlgParent = Application::GetDefDialogParent(); + vcl::Window* pPrevDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); short nRet = ModalDialog::Execute(); // #57314# If the BasicIDE has been activated, don't reset the DefModalDialogParent to the inactive document. @@ -365,7 +365,7 @@ SbMethod* MacroChooser::CreateMacro() if ( !pModule ) { - pModule = createModImpl( static_cast<Window*>( this ), + pModule = createModImpl( static_cast<vcl::Window*>( this ), aDocument, *m_pBasicBox, aLibName, aModName ); } @@ -749,7 +749,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) SvTreeListEntry* pCurEntry = m_pBasicBox->GetCurEntry(); EntryDescriptor aDesc = m_pBasicBox->GetEntryDescriptor(pCurEntry); ScriptDocument aDocument( aDesc.GetDocument() ); - createLibImpl( static_cast<Window*>( this ), aDocument, NULL, m_pBasicBox ); + createLibImpl( static_cast<vcl::Window*>( this ), aDocument, NULL, m_pBasicBox ); } else if (pButton == m_pNewModButton) { @@ -758,7 +758,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) ScriptDocument aDocument( aDesc.GetDocument() ); OUString aLibName( aDesc.GetLibName() ); OUString aModName; - createModImpl( static_cast<Window*>( this ), aDocument, + createModImpl( static_cast<vcl::Window*>( this ), aDocument, *m_pBasicBox, aLibName, aModName, true ); } else if (pButton == m_pOrganizeButton) diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx index 7efa94d20979..68dcd8c4c0ac 100644 --- a/basctl/source/basicide/macrodlg.hxx +++ b/basctl/source/basicide/macrodlg.hxx @@ -87,7 +87,7 @@ private: void RestoreMacroDescription(); public: - MacroChooser( Window* pParent, bool bCreateEntries = true ); + MacroChooser( vcl::Window* pParent, bool bCreateEntries = true ); virtual ~MacroChooser(); SbMethod* GetMacro(); diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index e727ccf6ebe1..a889ca2d7adb 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -150,7 +150,7 @@ void LibLBoxString::Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDa } // namespace // basctl::CheckBox -CheckBox::CheckBox(Window* pParent, WinBits nStyle) +CheckBox::CheckBox(vcl::Window* pParent, WinBits nStyle) : SvTabListBox(pParent, nStyle) , eMode(ObjectMode::Module) , m_aDocument(ScriptDocument::getApplicationScriptDocument()) @@ -161,7 +161,7 @@ CheckBox::CheckBox(Window* pParent, WinBits nStyle) Init(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCheckBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCheckBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -364,7 +364,7 @@ IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler) return 0; } -NewObjectDialog::NewObjectDialog(Window * pParent, ObjectMode::Mode eMode, +NewObjectDialog::NewObjectDialog(vcl::Window * pParent, ObjectMode::Mode eMode, bool bCheckName) : ModalDialog(pParent, "NewLibDialog", "modules/BasicIDE/ui/newlibdialog.ui") { @@ -396,7 +396,7 @@ NewObjectDialog::NewObjectDialog(Window * pParent, ObjectMode::Mode eMode, } // GotoLineDialog -GotoLineDialog::GotoLineDialog(Window * pParent ) +GotoLineDialog::GotoLineDialog(vcl::Window * pParent ) : ModalDialog(pParent, "GotoLineDialog", "modules/BasicIDE/ui/gotolinedialog.ui") { @@ -428,7 +428,7 @@ IMPL_LINK_NOARG(ExportDialog, OkButtonHandler) return 0; } -ExportDialog::ExportDialog(Window * pParent) +ExportDialog::ExportDialog(vcl::Window * pParent) : ModalDialog(pParent, "ExportDialog", "modules/BasicIDE/ui/exportdialog.ui") , mbExportAsPackage(false) @@ -441,7 +441,7 @@ ExportDialog::ExportDialog(Window * pParent) } // LibPage -LibPage::LibPage(Window * pParent) +LibPage::LibPage(vcl::Window * pParent) : TabPage(pParent, "LibPage", "modules/BasicIDE/ui/libpage.ui") , m_aCurDocument(ScriptDocument::getApplicationScriptDocument()) @@ -689,7 +689,7 @@ IMPL_LINK_INLINE_END( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg ) void LibPage::NewLib() { - createLibImpl( static_cast<Window*>( this ), m_aCurDocument, m_pLibBox, NULL); + createLibImpl( static_cast<vcl::Window*>( this ), m_aCurDocument, m_pLibBox, NULL); } void LibPage::InsertLib() @@ -1428,7 +1428,7 @@ SvTreeListEntry* LibPage::ImpInsertLibEntry( const OUString& rLibName, sal_uLong } // Helper function -void createLibImpl( Window* pWin, const ScriptDocument& rDocument, +void createLibImpl( vcl::Window* pWin, const ScriptDocument& rDocument, CheckBox* pLibBox, TreeListBox* pBasicBox ) { OSL_ENSURE( rDocument.isAlive(), "createLibImpl: invalid document!" ); diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 9586a4ff88d4..7f6359212a51 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -52,12 +52,12 @@ using namespace ::com::sun::star::resource; -ExtTreeListBox::ExtTreeListBox(Window* pParent, WinBits nStyle) +ExtTreeListBox::ExtTreeListBox(vcl::Window* pParent, WinBits nStyle) : TreeListBox(pParent, nStyle) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeExtTreeListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeExtTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -462,7 +462,7 @@ TriState ExtTreeListBox::NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeLi } // OrganizeDialog -OrganizeDialog::OrganizeDialog(Window* pParent, sal_Int16 tabId, +OrganizeDialog::OrganizeDialog(vcl::Window* pParent, sal_Int16 tabId, EntryDescriptor& rDesc ) : TabDialog( pParent, "OrganizeDialog", "modules/BasicIDE/ui/organizedialog.ui" ) @@ -499,7 +499,7 @@ OrganizeDialog::~OrganizeDialog() short OrganizeDialog::Execute() { - Window* pPrevDlgParent = Application::GetDefDialogParent(); + vcl::Window* pPrevDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); short nRet = TabDialog::Execute(); Application::SetDefDialogParent( pPrevDlgParent ); @@ -550,7 +550,7 @@ IMPL_LINK( OrganizeDialog, ActivatePageHdl, TabControl *, pTabCtrl ) -ObjectPage::ObjectPage(Window *pParent, const OString &rName, sal_uInt16 nMode) +ObjectPage::ObjectPage(vcl::Window *pParent, const OString &rName, sal_uInt16 nMode) : TabPage(pParent, rName, OUString("modules/BasicIDE/ui/") + OStringToOUString(rName, RTL_TEXTENCODING_UTF8).toAsciiLowerCase() + OUString(".ui")) @@ -791,7 +791,7 @@ void ObjectPage::NewModule() if ( GetSelection( aDocument, aLibName ) ) { OUString aModName; - createModImpl( static_cast<Window*>( this ), aDocument, + createModImpl( static_cast<vcl::Window*>( this ), aDocument, *m_pBasicBox, aLibName, aModName, true ); } } @@ -912,7 +912,7 @@ void ObjectPage::EndTabDialog( sal_uInt16 nRet ) pTabDlg->EndDialog( nRet ); } -LibDialog::LibDialog( Window* pParent ) +LibDialog::LibDialog( vcl::Window* pParent ) : ModalDialog(pParent, "ImportLibDialog", "modules/BasicIDE/ui/importlibdialog.ui") { get(m_pStorageFrame, "storageframe"); @@ -931,7 +931,7 @@ void LibDialog::SetStorageName( const OUString& rName ) } // Helper function -SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument, +SbModule* createModImpl( vcl::Window* pWin, const ScriptDocument& rDocument, TreeListBox& rBasicBox, const OUString& rLibName, const OUString& _aModName, bool bMain ) { OSL_ENSURE( rDocument.isAlive(), "createModImpl: invalid document!" ); diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index e57f6e870651..9ba3e894deab 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -56,7 +56,7 @@ private: DECL_LINK(OkButtonHandler, void *); public: - NewObjectDialog (Window* pParent, ObjectMode::Mode, bool bCheckName = false); + NewObjectDialog (vcl::Window* pParent, ObjectMode::Mode, bool bCheckName = false); OUString GetObjectName() const { return m_pEdit->GetText(); } void SetObjectName( const OUString& rName ) { @@ -71,7 +71,7 @@ class GotoLineDialog : public ModalDialog OKButton* m_pOKButton; DECL_LINK(OkButtonHandler, void *); public: - GotoLineDialog(Window * pParent); + GotoLineDialog(vcl::Window * pParent); sal_Int32 GetLineNumber() const; }; @@ -86,7 +86,7 @@ private: DECL_LINK(OkButtonHandler, void *); public: - ExportDialog( Window * pParent ); + ExportDialog( vcl::Window * pParent ); bool isExportAsPackage () const { return mbExportAsPackage; } }; @@ -109,7 +109,7 @@ protected: SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos, bool bMove ); public: - ExtTreeListBox(Window* pParent, WinBits nStyle); + ExtTreeListBox(vcl::Window* pParent, WinBits nStyle); virtual ~ExtTreeListBox(); }; @@ -122,7 +122,7 @@ private: void Init(); public: - CheckBox(Window* pParent, WinBits nStyle); + CheckBox(vcl::Window* pParent, WinBits nStyle); virtual ~CheckBox(); SvTreeListEntry* DoInsertEntry( const OUString& rStr, sal_uLong nPos = LISTBOX_APPEND ); @@ -150,7 +150,7 @@ private: ::CheckBox* m_pReplaceBox; public: - LibDialog( Window* pParent ); + LibDialog( vcl::Window* pParent ); void SetStorageName( const OUString& rName ); @@ -169,7 +169,7 @@ private: EntryDescriptor m_aCurEntry; public: - OrganizeDialog( Window* pParent, sal_Int16 tabId, EntryDescriptor& rDesc ); + OrganizeDialog( vcl::Window* pParent, sal_Int16 tabId, EntryDescriptor& rDesc ); virtual ~OrganizeDialog(); virtual short Execute() SAL_OVERRIDE; @@ -201,7 +201,7 @@ protected: virtual void DeactivatePage() SAL_OVERRIDE; public: - ObjectPage(Window* pParent, const OString& rName, sal_uInt16 nMode); + ObjectPage(vcl::Window* pParent, const OString& rName, sal_uInt16 nMode); void SetCurrentEntry( EntryDescriptor& rDesc ); void SetTabDlg( TabDialog* p ) { pTabDlg = p;} @@ -247,16 +247,16 @@ protected: TabDialog* pTabDlg; public: - LibPage( Window* pParent ); + LibPage( vcl::Window* pParent ); virtual ~LibPage(); void SetTabDlg( TabDialog* p ) { pTabDlg = p;} }; // Helper functions -SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument, +SbModule* createModImpl( vcl::Window* pWin, const ScriptDocument& rDocument, TreeListBox& rBasicBox, const OUString& rLibName, const OUString& aModName, bool bMain = false ); -void createLibImpl( Window* pWin, const ScriptDocument& rDocument, +void createLibImpl( vcl::Window* pWin, const ScriptDocument& rDocument, CheckBox* pLibBox, TreeListBox* pBasicBox ); } // namespace basctl diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx index 3244507fc9ab..82b49f6659f9 100644 --- a/basctl/source/basicide/objdlg.cxx +++ b/basctl/source/basicide/objdlg.cxx @@ -37,7 +37,7 @@ namespace basctl { -ObjectCatalog::ObjectCatalog (Window* pParent) : +ObjectCatalog::ObjectCatalog (vcl::Window* pParent) : DockingWindow(pParent), aTitle(this), aTree(this, IDEResId(RID_TLB_MACROS)) diff --git a/basctl/source/basicide/objdlg.hxx b/basctl/source/basicide/objdlg.hxx index f91eaa4e0245..43a0953b2584 100644 --- a/basctl/source/basicide/objdlg.hxx +++ b/basctl/source/basicide/objdlg.hxx @@ -38,7 +38,7 @@ namespace basctl class ObjectCatalog : public DockingWindow { public: - ObjectCatalog (Window* pParent); + ObjectCatalog (vcl::Window* pParent); virtual ~ObjectCatalog (); public: void UpdateEntries () { aTree.UpdateEntries(); } diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index bd1edb03633d..b6c7f7f11782 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -174,7 +174,7 @@ bool DlgEditor::RemarkDialog() DlgEditor::DlgEditor ( - Window& rWindow_, DialogWindowLayout& rLayout_, + vcl::Window& rWindow_, DialogWindowLayout& rLayout_, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const& xModel, com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> xDialogModel ) diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx index 76c43de874b4..7beccb6ce29f 100644 --- a/basctl/source/dlged/dlgedfunc.cxx +++ b/basctl/source/dlged/dlgedfunc.cxx @@ -30,7 +30,7 @@ namespace basctl IMPL_LINK_INLINE_START( DlgEdFunc, ScrollTimeout, Timer *, pTimer ) { (void)pTimer; - Window& rWindow = rParent.GetWindow(); + vcl::Window& rWindow = rParent.GetWindow(); Point aPos = rWindow.ScreenToOutputPixel( rWindow.GetPointerPosPixel() ); aPos = rWindow.PixelToLogic( aPos ); ForceScroll( aPos ); @@ -42,7 +42,7 @@ void DlgEdFunc::ForceScroll( const Point& rPos ) { aScrollTimer.Stop(); - Window& rWindow = rParent.GetWindow(); + vcl::Window& rWindow = rParent.GetWindow(); static Point aDefPoint; Rectangle aOutRect( aDefPoint, rWindow.GetOutputSizePixel() ); @@ -111,7 +111,7 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt ) bool bReturn = false; SdrView& rView = rParent.GetView(); - Window& rWindow = rParent.GetWindow(); + vcl::Window& rWindow = rParent.GetWindow(); vcl::KeyCode aCode = rKEvt.GetKeyCode(); sal_uInt16 nCode = aCode.GetCode(); @@ -350,7 +350,7 @@ bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt ) return true; SdrView& rView = rParent.GetView(); - Window& rWindow = rParent.GetWindow(); + vcl::Window& rWindow = rParent.GetWindow(); rView.SetActualWin(&rWindow); Point aPos = rWindow.PixelToLogic( rMEvt.GetPosPixel() ); @@ -388,7 +388,7 @@ bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) DlgEdFunc::MouseButtonUp( rMEvt ); SdrView& rView = rParent.GetView(); - Window& rWindow = rParent.GetWindow(); + vcl::Window& rWindow = rParent.GetWindow(); rView.SetActualWin(&rWindow); rWindow.ReleaseMouse(); @@ -418,7 +418,7 @@ bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) { SdrView& rView = rParent.GetView(); - Window& rWindow = rParent.GetWindow(); + vcl::Window& rWindow = rParent.GetWindow(); rView.SetActualWin(&rWindow); Point aPos = rWindow.PixelToLogic(rMEvt.GetPosPixel()); @@ -449,7 +449,7 @@ bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) { // get view from parent SdrView& rView = rParent.GetView(); - Window& rWindow = rParent.GetWindow(); + vcl::Window& rWindow = rParent.GetWindow(); rView.SetActualWin(&rWindow); sal_uInt16 nDrgLog = static_cast<sal_uInt16>(rWindow.PixelToLogic(Size(3, 0)).Width()); @@ -513,7 +513,7 @@ bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) // get view from parent SdrView& rView = rParent.GetView(); - Window& rWindow = rParent.GetWindow(); + vcl::Window& rWindow = rParent.GetWindow(); rView.SetActualWin(&rWindow); Point aPnt = rWindow.PixelToLogic(rMEvt.GetPosPixel()); @@ -544,7 +544,7 @@ bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) { SdrView& rView = rParent.GetView(); - Window& rWindow = rParent.GetWindow(); + vcl::Window& rWindow = rParent.GetWindow(); rView.SetActualWin(&rWindow); Point aPnt = rWindow.PixelToLogic(rMEvt.GetPosPixel()); diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index c91c80029c11..4d52b5f1b5ad 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -1636,7 +1636,7 @@ awt::DeviceInfo DlgEdForm::getDeviceInfo() const awt::DeviceInfo aDeviceInfo; DlgEditor& rEditor = GetDlgEditor(); - Window& rWindow = rEditor.GetWindow(); + vcl::Window& rWindow = rEditor.GetWindow(); // obtain an XControl ::utl::SharedUNOComponent< awt::XControl > xDialogControl; // ensures auto-disposal, if needed diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx index c75fd1915a22..8f07c70edad7 100644 --- a/basctl/source/dlged/dlgedview.cxx +++ b/basctl/source/dlged/dlgedview.cxx @@ -55,7 +55,7 @@ void DlgEdView::MarkListHasChanged() rDlgEditor.UpdatePropertyBrowserDelayed(); } -void DlgEdView::MakeVisible( const Rectangle& rRect, Window& rWin ) +void DlgEdView::MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) { // visible area MapMode aMap( rWin.GetMapMode() ); diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index 5751fe4c24ba..55d1527fc0e7 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -55,7 +55,7 @@ bool localesAreEqual( const Locale& rLocaleLeft, const Locale& rLocaleRight ) return bRet; } -ManageLanguageDialog::ManageLanguageDialog(Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr) +ManageLanguageDialog::ManageLanguageDialog(vcl::Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr) : ModalDialog(pParent, "ManageLanguagesDialog", "modules/BasicIDE/ui/managelanguages.ui") , m_xLocalizationMgr(xLMgr) , m_sDefLangStr(IDE_RESSTR(RID_STR_DEF_LANG)) @@ -217,7 +217,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl) // class SetDefaultLanguageDialog ----------------------------------------------- -SetDefaultLanguageDialog::SetDefaultLanguageDialog(Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr) +SetDefaultLanguageDialog::SetDefaultLanguageDialog(vcl::Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr) : ModalDialog(pParent, "DefaultLanguageDialog", "modules/BasicIDE/ui/defaultlanguage.ui") , m_pCheckLangLB(NULL) , m_xLocalizationMgr(xLMgr) diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index ecbc219a1266..bd0fa268c427 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -25,7 +25,7 @@ #include <comphelper/accessiblecomponenthelper.hxx> #include <cppuhelper/implbase3.hxx> -class Window; +namespace vcl { class Window; } class VCLExternalSolarLock; namespace utl { @@ -74,7 +74,7 @@ protected: ::com::sun::star::awt::Rectangle GetBounds(); void SetBounds( const ::com::sun::star::awt::Rectangle& aBounds ); - Window* GetWindow() const; + vcl::Window* GetWindow() const; OUString GetModelStringProperty( const sal_Char* pPropertyName ); diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index e5fb443c08ce..b73b9e571b6e 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -50,7 +50,7 @@ class DlgEdView; class DialogWindowLayout; class ObjectCatalog; -bool implImportDialog( Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName ); +bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName ); class DialogWindow: public BaseWindow { @@ -127,7 +127,7 @@ public: class DialogWindowLayout : public Layout { public: - DialogWindowLayout (Window* pParent, ObjectCatalog&); + DialogWindowLayout (vcl::Window* pParent, ObjectCatalog&); virtual ~DialogWindowLayout(); public: void ShowPropertyBrowser (); diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 27011d27bc82..8ded0fcda3bd 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -62,7 +62,7 @@ public: private: friend class JavaDebuggingListenerImpl; friend class LocalizationMgr; - friend bool implImportDialog( Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName ); // defined in baside3.cxx + friend bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName ); // defined in baside3.cxx WindowTable aWindowTable; sal_uInt16 nCurKey; diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx index 0c6af6cf536a..ef996125840a 100644 --- a/basctl/source/inc/basobj.hxx +++ b/basctl/source/inc/basobj.hxx @@ -30,7 +30,7 @@ class StarBASIC; class SfxUInt16Item; class SfxBindings; class SfxDispatcher; -class Window; +namespace vcl { class Window; } namespace basctl { @@ -68,7 +68,7 @@ namespace basctl Will show an error message when renaming fails because the new name is already used. */ bool RenameModule( - Window* pErrorParent, const ScriptDocument& rDocument, + vcl::Window* pErrorParent, const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rOldName, const OUString& rNewName ); // new methods for macros @@ -91,7 +91,7 @@ namespace basctl Will show an error message when renaming fails because the new name is already used. */ bool RenameDialog( - Window* pErrorParent, const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rOldName, const OUString& rNewName ) + vcl::Window* pErrorParent, const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rOldName, const OUString& rNewName ) throw (css::container::ElementExistException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); bool RemoveDialog( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rDlgName ); diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index 0d0db7e94072..7ccf51130579 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -78,7 +78,7 @@ struct BasicStatus class DockingWindow : public ::DockingWindow { public: - DockingWindow (Window* pParent); + DockingWindow (vcl::Window* pParent); DockingWindow (Layout* pParent); public: void ResizeIfDocking (Point const&, Size const&); @@ -126,7 +126,7 @@ protected: virtual void EndRenaming() SAL_OVERRIDE; public: - TabBar (Window* pParent); + TabBar (vcl::Window* pParent); void Sort(); }; @@ -145,7 +145,7 @@ class EntryDescriptor; // BaseWindow -- the base of both ModulWindow and DialogWindow. -class BaseWindow : public Window +class BaseWindow : public vcl::Window { private: ScrollBar* pShellHScrollBar; @@ -166,7 +166,7 @@ protected: public: TYPEINFO(); - BaseWindow( Window* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName ); + BaseWindow( vcl::Window* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName ); virtual ~BaseWindow(); void Init(); @@ -295,11 +295,11 @@ void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines OUString CreateMgrAndLibStr( const OUString& rMgrName, const OUString& rLibName ); sal_uLong CalcLineCount( SvStream& rStream ); -bool QueryReplaceMacro( const OUString& rName, Window* pParent = 0 ); -bool QueryDelMacro( const OUString& rName, Window* pParent = 0 ); -bool QueryDelDialog( const OUString& rName, Window* pParent = 0 ); -bool QueryDelModule( const OUString& rName, Window* pParent = 0 ); -bool QueryDelLib( const OUString& rName, bool bRef = false, Window* pParent = 0 ); +bool QueryReplaceMacro( const OUString& rName, vcl::Window* pParent = 0 ); +bool QueryDelMacro( const OUString& rName, vcl::Window* pParent = 0 ); +bool QueryDelDialog( const OUString& rName, vcl::Window* pParent = 0 ); +bool QueryDelModule( const OUString& rName, vcl::Window* pParent = 0 ); +bool QueryDelLib( const OUString& rName, bool bRef = false, vcl::Window* pParent = 0 ); bool QueryPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer, const OUString& rLibName, OUString& rPassword, bool bRepeat = false, bool bNewTitle = false ); class ModuleInfoHelper diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index c0e5c95ecc47..981bc08300d1 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -37,7 +37,7 @@ class Printer; class KeyEvent; class MouseEvent; class Timer; -class Window; +namespace vcl { class Window; } namespace basctl { @@ -118,7 +118,7 @@ private: ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > m_ClipboardDataFlavorsResource; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xSupplier; boost::scoped_ptr<DlgEdFactory> pObjFac; // never nullptr - Window& rWindow; // DialogWindow + vcl::Window& rWindow; // DialogWindow boost::scoped_ptr<DlgEdFunc> pFunc; DialogWindowLayout& rLayout; Mode eMode; @@ -137,13 +137,13 @@ private: public: DlgEditor ( - Window&, DialogWindowLayout&, + vcl::Window&, DialogWindowLayout&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const& xModel, com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> xDialogModel ); virtual ~DlgEditor(); - Window& GetWindow() const { return rWindow; } + vcl::Window& GetWindow() const { return rWindow; } /** returns the control container associated with our window @see GetWindow diff --git a/basctl/source/inc/dlgedview.hxx b/basctl/source/inc/dlgedview.hxx index 9b094888ba7c..7ba534d24bac 100644 --- a/basctl/source/inc/dlgedview.hxx +++ b/basctl/source/inc/dlgedview.hxx @@ -44,7 +44,7 @@ public: virtual ~DlgEdView(); virtual void MarkListHasChanged() SAL_OVERRIDE; - virtual void MakeVisible( const Rectangle& rRect, Window& rWin ) SAL_OVERRIDE; + virtual void MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) SAL_OVERRIDE; protected: // overloaded to handle HitTest for some objects special diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx index de364c316c6a..1cc2db170bd2 100644 --- a/basctl/source/inc/managelang.hxx +++ b/basctl/source/inc/managelang.hxx @@ -73,7 +73,7 @@ private: DECL_LINK(SelectHdl, void *); public: - ManageLanguageDialog( Window* pParent, boost::shared_ptr<LocalizationMgr> _pLMgr ); + ManageLanguageDialog( vcl::Window* pParent, boost::shared_ptr<LocalizationMgr> _pLMgr ); virtual ~ManageLanguageDialog(); }; @@ -92,7 +92,7 @@ private: void FillLanguageBox(); public: - SetDefaultLanguageDialog(Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr); + SetDefaultLanguageDialog(vcl::Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr); ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > GetLocales() const; }; |