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 /sfx2/source/dialog | |
| 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 'sfx2/source/dialog')
33 files changed, 149 insertions, 149 deletions
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx index ab6a923a13cd..d1dc6ea1c136 100644 --- a/sfx2/source/dialog/alienwarn.cxx +++ b/sfx2/source/dialog/alienwarn.cxx @@ -25,7 +25,7 @@ #include <vcl/msgbox.hxx> #include "alienwarn.hxx" -SfxAlienWarningDialog::SfxAlienWarningDialog(Window* pParent, const OUString& _rFormatName) +SfxAlienWarningDialog::SfxAlienWarningDialog(vcl::Window* pParent, const OUString& _rFormatName) : MessageDialog(pParent, "AlienWarnDialog", "sfx/ui/alienwarndialog.ui") { get(m_pWarningOnBox, "ask"); diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index 4a3d45ff90c0..8f5f7d712c7c 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -403,7 +403,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f // initialize the component and its parent window css::uno::Reference< css::awt::XWindow > xParentWindow = xFrame->getContainerWindow(); WorkWindow* pParent = (WorkWindow*)VCLUnoHelper::GetWindow(xParentWindow); - Window* pWindow = VCLUnoHelper::GetWindow(m_xWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(m_xWindow); // disable full screen mode of the frame! if (pParent && pParent->IsFullScreenMode()) @@ -438,7 +438,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f if( pParent && pBack ) { long nMenuHeight = 0; - Window* pMenu = pParent->GetWindow(WINDOW_NEXT); + vcl::Window* pMenu = pParent->GetWindow(WINDOW_NEXT); if( pMenu ) nMenuHeight = pMenu->GetSizePixel().Height(); @@ -717,8 +717,8 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno } // create the component window - Window* pParent = VCLUnoHelper::GetWindow(xParentWindow); - Window* pWindow = new BackingWindow(pParent); + vcl::Window* pParent = VCLUnoHelper::GetWindow(xParentWindow); + vcl::Window* pWindow = new BackingWindow(pParent); m_xWindow = VCLUnoHelper::GetInterface(pWindow); if (!m_xWindow.is()) @@ -791,7 +791,7 @@ void SAL_CALL BackingComp::dispatch( const css::util::URL& aURL, const css::uno: // vnd.org.libreoffice.recentdocs:ClearRecentFileList - clear recent files if ( aURL.Path == "ClearRecentFileList" ) { - Window* pWindow = VCLUnoHelper::GetWindow(m_xWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(m_xWindow); BackingWindow* pBack = dynamic_cast<BackingWindow*>(pWindow ); if( pBack ) { diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 584b1b387ea2..39061f5bc384 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -87,7 +87,7 @@ static bool cmpSelectionItems (const ThumbnailViewItem *pItem1, const ThumbnailV } -BackingWindow::BackingWindow( Window* i_pParent ) : +BackingWindow::BackingWindow( vcl::Window* i_pParent ) : Window( i_pParent ), mxDesktop( Desktop::create(comphelper::getProcessComponentContext()) ), mbInitControls( false ), @@ -193,10 +193,10 @@ BackingWindow::~BackingWindow() // deregister drag&drop helper if (mxDropTargetListener.is()) { - for (std::vector<Window*>::iterator aI = maDndWindows.begin(), + for (std::vector<vcl::Window*>::iterator aI = maDndWindows.begin(), aEnd = maDndWindows.end(); aI != aEnd; ++aI) { - Window *pDndWin = *aI; + vcl::Window *pDndWin = *aI; css::uno::Reference< css::datatransfer::dnd::XDropTarget > xDropTarget = pDndWin->GetDropTarget(); if (xDropTarget.is()) @@ -453,10 +453,10 @@ void BackingWindow::setOwningFrame( const com::sun::star::uno::Reference< com::s // establish drag&drop mode mxDropTargetListener.set(new OpenFileDropTargetListener(mxContext, mxFrame)); - for (std::vector<Window*>::iterator aI = maDndWindows.begin(), + for (std::vector<vcl::Window*>::iterator aI = maDndWindows.begin(), aEnd = maDndWindows.end(); aI != aEnd; ++aI) { - Window *pDndWin = *aI; + vcl::Window *pDndWin = *aI; css::uno::Reference< css::datatransfer::dnd::XDropTarget > xDropTarget = pDndWin->GetDropTarget(); if (xDropTarget.is()) diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index e4f7a39479b6..15df736c9fb9 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -49,7 +49,7 @@ class ToolBox; class BackingWindow - : public Window + : public vcl::Window , public VclBuilderContainer { typedef bool (*selection_cmp_fn)(const ThumbnailViewItem*,const ThumbnailViewItem*); @@ -88,7 +88,7 @@ class BackingWindow TemplateLocalView* mpLocalView; TemplateAbstractView* mpCurrentView; - std::vector<Window*> maDndWindows; + std::vector<vcl::Window*> maDndWindows; Rectangle maStartCentButtons; @@ -120,7 +120,7 @@ class BackingWindow void initControls(); public: - BackingWindow( Window* pParent ); + BackingWindow( vcl::Window* pParent ); virtual ~BackingWindow(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 9bb8497cb81d..f3d4a3d5a86e 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -153,7 +153,7 @@ void SfxModalDialog::init() GetDialogData_Impl(); } -SfxModalDialog::SfxModalDialog(Window *pParent, const OString& rID, const OUString& rUIXMLDescription ) +SfxModalDialog::SfxModalDialog(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription ) : ModalDialog(pParent, rID, rUIXMLDescription), nUniqId(0), //todo: remove this member when the ResId using ctor is removed pInputSet(0), @@ -303,7 +303,7 @@ IMPL_LINK_NOARG(SfxModelessDialog, TimerHdl) } SfxModelessDialog::SfxModelessDialog(SfxBindings* pBindinx, - SfxChildWindow *pCW, Window *pParent, const OString& rID, + SfxChildWindow *pCW, vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription) : ModelessDialog(pParent, rID, rUIXMLDescription) { @@ -447,7 +447,7 @@ bool SfxFloatingWindow::Notify( NotifyEvent& rEvt ) SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* pParent, WinBits nWinBits) : + vcl::Window* pParent, WinBits nWinBits) : FloatingWindow (pParent, nWinBits), pBindings(pBindinx), pImp( new SfxFloatingWindow_Impl ) @@ -464,7 +464,7 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) : FloatingWindow(pParent, rID, rUIXMLDescription, rFrame), pBindings(pBindinx), @@ -674,7 +674,7 @@ IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl) -SfxSingleTabDialog::SfxSingleTabDialog(Window *pParent, const SfxItemSet& rSet, +SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet& rSet, const OString& rID, const OUString& rUIXMLDescription) : SfxModalDialog(pParent, rID, rUIXMLDescription) , fnGetRanges(NULL) @@ -687,7 +687,7 @@ SfxSingleTabDialog::SfxSingleTabDialog(Window *pParent, const SfxItemSet& rSet, SetInputSet( &rSet ); } -SfxSingleTabDialog::SfxSingleTabDialog(Window* pParent, const SfxItemSet* pInSet, +SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window* pParent, const SfxItemSet* pInSet, const OString& rID, const OUString& rUIXMLDescription) : SfxModalDialog(pParent, rID, rUIXMLDescription) , fnGetRanges(NULL) diff --git a/sfx2/source/dialog/checkin.cxx b/sfx2/source/dialog/checkin.cxx index cbe1c620eaec..61d963ef8a5e 100644 --- a/sfx2/source/dialog/checkin.cxx +++ b/sfx2/source/dialog/checkin.cxx @@ -10,7 +10,7 @@ #include <sfx2/checkin.hxx> #include <vcl/msgbox.hxx> -SfxCheckinDialog::SfxCheckinDialog( Window* pParent ) : +SfxCheckinDialog::SfxCheckinDialog( vcl::Window* pParent ) : ModalDialog( pParent, "CheckinDialog", "sfx/ui/checkin.ui" ) { get( m_pCommentED, "VersionComment" ); diff --git a/sfx2/source/dialog/dialoghelper.cxx b/sfx2/source/dialog/dialoghelper.cxx index 3ee59daac68e..8221d3af3866 100644 --- a/sfx2/source/dialog/dialoghelper.cxx +++ b/sfx2/source/dialog/dialoghelper.cxx @@ -18,23 +18,23 @@ //right, get both of their non-preview areas to request the same size //so that the preview appears in the same place in each one so //flipping between tabs isn't distracting as it jumps around -void setPreviewsToSamePlace(Window *pParent, VclBuilderContainer *pPage) +void setPreviewsToSamePlace(vcl::Window *pParent, VclBuilderContainer *pPage) { - Window *pOurGrid = pPage->get<Window>("maingrid"); + vcl::Window *pOurGrid = pPage->get<vcl::Window>("maingrid"); if (!pOurGrid) return; - std::vector<Window*> aGrids; + std::vector<vcl::Window*> aGrids; aGrids.push_back(pOurGrid); - for (Window* pChild = pParent->GetWindow(WINDOW_FIRSTCHILD); pChild; + for (vcl::Window* pChild = pParent->GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) { VclBuilderContainer *pPeer = dynamic_cast<VclBuilderContainer*>(pChild); if (!pPeer || pPeer == pPage || !pPeer->hasBuilder()) continue; - Window *pOtherGrid = pPeer->get<Window>("maingrid"); + vcl::Window *pOtherGrid = pPeer->get<vcl::Window>("maingrid"); if (!pOtherGrid) continue; @@ -44,36 +44,36 @@ void setPreviewsToSamePlace(Window *pParent, VclBuilderContainer *pPage) if (aGrids.size() > 1) { boost::shared_ptr< VclSizeGroup > xGroup(new VclSizeGroup); - for (std::vector<Window*>::iterator aI = aGrids.begin(); aI != aGrids.end(); ++aI) + for (std::vector<vcl::Window*>::iterator aI = aGrids.begin(); aI != aGrids.end(); ++aI) { - Window *pWindow = *aI; + vcl::Window *pWindow = *aI; pWindow->remove_from_all_size_groups(); pWindow->add_to_size_group(xGroup); } } } -Size getParagraphPreviewOptimalSize(const Window *pReference) +Size getParagraphPreviewOptimalSize(const vcl::Window *pReference) { return pReference->LogicToPixel(Size(68 , 112), MAP_APPFONT); } -Size getDrawPreviewOptimalSize(const Window *pReference) +Size getDrawPreviewOptimalSize(const vcl::Window *pReference) { return pReference->LogicToPixel(Size(88, 42), MAP_APPFONT); } -Size getDrawListBoxOptimalSize(const Window *pReference) +Size getDrawListBoxOptimalSize(const vcl::Window *pReference) { return pReference->LogicToPixel(Size(88, 110), MAP_APPFONT); } -Size SFX2_DLLPUBLIC getPreviewStripSize(const Window *pReference) +Size SFX2_DLLPUBLIC getPreviewStripSize(const vcl::Window *pReference) { return pReference->LogicToPixel(Size(70 , 40), MapMode(MAP_APPFONT)); } -Size SFX2_DLLPUBLIC getPreviewOptionsSize(const Window *pReference) +Size SFX2_DLLPUBLIC getPreviewOptionsSize(const vcl::Window *pReference) { return pReference->LogicToPixel(Size(70 , 27), MapMode(MAP_APPFONT)); } diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 561f5ce1bd0c..c1d220eb7a4b 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -615,7 +615,7 @@ bool SfxDocumentInfoItem::PutValue( const Any& rVal, sal_uInt8 nMemberId ) return bRet; } -SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet& rItemSet ) +SfxDocumentDescPage::SfxDocumentDescPage( vcl::Window * pParent, const SfxItemSet& rItemSet ) : SfxTabPage(pParent, "DescriptionInfoPage", "sfx/ui/descriptioninfopage.ui", &rItemSet) , m_pInfoItem ( NULL ) @@ -628,7 +628,7 @@ SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet& rI m_pCommentEd->set_height_request(m_pCommentEd->GetTextHeight() * 16); } -SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet *rItemSet) +SfxTabPage *SfxDocumentDescPage::Create(vcl::Window *pParent, const SfxItemSet *rItemSet) { return new SfxDocumentDescPage(pParent, *rItemSet); } @@ -746,7 +746,7 @@ namespace } } -SfxDocumentPage::SfxDocumentPage(Window* pParent, const SfxItemSet& rItemSet) +SfxDocumentPage::SfxDocumentPage(vcl::Window* pParent, const SfxItemSet& rItemSet) : SfxTabPage(pParent, "DocumentInfoPage", "sfx/ui/documentinfopage.ui", &rItemSet) , bEnableUseUserData( false ) , bHandleDelete( false ) @@ -909,7 +909,7 @@ void SfxDocumentPage::ImplCheckPasswordState() -SfxTabPage* SfxDocumentPage::Create( Window* pParent, const SfxItemSet* rItemSet ) +SfxTabPage* SfxDocumentPage::Create( vcl::Window* pParent, const SfxItemSet* rItemSet ) { return new SfxDocumentPage( pParent, *rItemSet ); } @@ -1156,7 +1156,7 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet ) } -SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent, +SfxDocumentInfoDialog::SfxDocumentInfoDialog( vcl::Window* pParent, const SfxItemSet& rItemSet ) : SfxTabDialog(0, pParent, "DocumentPropertiesDialog", "sfx/ui/documentpropertiesdialog.ui", &rItemSet) @@ -1224,7 +1224,7 @@ void SfxDocumentInfoDialog::AddFontTabPage() // class CustomPropertiesYesNoButton ------------------------------------- -CustomPropertiesYesNoButton::CustomPropertiesYesNoButton( Window* pParent, const ResId& rResId ) : +CustomPropertiesYesNoButton::CustomPropertiesYesNoButton( vcl::Window* pParent, const ResId& rResId ) : Control( pParent, rResId ), m_aYesButton( this, ResId( RB_PROPERTY_YES, *rResId.GetResMgr() ) ), m_aNoButton ( this, ResId( RB_PROPERTY_NO, *rResId.GetResMgr() ) ) @@ -1251,12 +1251,12 @@ class DurationDialog_Impl : public ModalDialog public: - DurationDialog_Impl( Window* pParent, const util::Duration& rDuration ); + DurationDialog_Impl( vcl::Window* pParent, const util::Duration& rDuration ); util::Duration GetDuration() const; }; -DurationDialog_Impl::DurationDialog_Impl(Window* pParent, +DurationDialog_Impl::DurationDialog_Impl(vcl::Window* pParent, const util::Duration& rDuration) : ModalDialog(pParent, "EditDurationDialog", "sfx/ui/editdurationdialog.ui") @@ -1294,7 +1294,7 @@ util::Duration DurationDialog_Impl::GetDuration() const return aRet; } -CustomPropertiesDurationField::CustomPropertiesDurationField( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : +CustomPropertiesDurationField::CustomPropertiesDurationField( vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : Edit( pParent, rResId ), m_pLine( pLine ) { @@ -1333,7 +1333,7 @@ void CustomPropertiesDurationField::SetDuration( const util::Duration& rDuration SetText( sText ); } -CustomPropertiesEditButton::CustomPropertiesEditButton( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : +CustomPropertiesEditButton::CustomPropertiesEditButton( vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : PushButton( pParent, rResId ), m_pLine( pLine ) { SetClickHdl( LINK( this, CustomPropertiesEditButton, ClickHdl )); @@ -1366,7 +1366,7 @@ void CustomPropertiesYesNoButton::Resize() } // struct CustomPropertyLine --------------------------------------------- -CustomPropertyLine::CustomPropertyLine( Window* pParent ) : +CustomPropertyLine::CustomPropertyLine( vcl::Window* pParent ) : m_aNameBox ( pParent, SfxResId( SFX_CB_PROPERTY_NAME ) ), m_aTypeBox ( pParent, SfxResId( SFX_LB_PROPERTY_TYPE ), this ), m_aValueEdit ( pParent, SfxResId( SFX_ED_PROPERTY_VALUE ), this ), @@ -1403,7 +1403,7 @@ void CustomPropertyLine::SetRemoved() m_aRemoveButton.Hide(); } -CustomPropertiesWindow::CustomPropertiesWindow(Window* pParent, +CustomPropertiesWindow::CustomPropertiesWindow(vcl::Window* pParent, FixedText *pHeaderAccName, FixedText *pHeaderAccType, FixedText *pHeaderAccValue) : @@ -1504,11 +1504,11 @@ IMPL_LINK( CustomPropertiesWindow, RemoveHdl, CustomPropertiesRemoveButton*, pBu if ( pLine->m_bIsRemoved ) continue; - Window* pWindows[] = { &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit, + vcl::Window* pWindows[] = { &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit, &pLine->m_aDateField, &pLine->m_aTimeField, &pLine->m_aDurationField, &pLine->m_aEditButton, &pLine->m_aYesNoButton, &pLine->m_aRemoveButton, NULL }; - Window** pCurrent = pWindows; + vcl::Window** pCurrent = pWindows; while ( *pCurrent ) { Point aPos = (*pCurrent)->GetPosPixel(); @@ -1600,7 +1600,7 @@ void CustomPropertiesWindow::ValidateLine( CustomPropertyLine* pLine, bool bIsFr { if ( bIsFromTypeBox ) // LoseFocus of TypeBox pLine->m_bTypeLostFocus = true; - Window* pParent = GetParent()->GetParent(); + vcl::Window* pParent = GetParent()->GetParent(); if (MessageDialog(pParent, SfxResId(STR_SFX_QUERY_WRONG_TYPE), VCL_MESSAGE_QUESTION, VCL_BUTTONS_OK_CANCEL).Execute() == RET_OK) pLine->m_aTypeBox.SelectEntryPos( m_aTypeBox.GetEntryPos( (void*)CUSTOM_TYPE_TEXT ) ); else @@ -1626,8 +1626,8 @@ bool CustomPropertiesWindow::InitControls( HeaderBar* pHeaderBar, const ScrollBa pHeaderBar->SetItemSize( HI_VALUE, nItemWidth ); pHeaderBar->SetItemSize( HI_ACTION, nButtonWidth ); - Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, &m_aRemoveButton, NULL }; - Window** pCurrent = pWindows; + vcl::Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, &m_aRemoveButton, NULL }; + vcl::Window** pCurrent = pWindows; sal_uInt16 nPos = 0; while ( *pCurrent ) { @@ -1688,7 +1688,7 @@ sal_uInt16 CustomPropertiesWindow::GetVisibleLineCount() const void CustomPropertiesWindow::updateLineWidth() { - Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, + vcl::Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, &m_aDateField, &m_aTimeField, &m_aDurationField, &m_aEditButton, &m_aYesNoButton, &m_aRemoveButton, NULL }; @@ -1699,14 +1699,14 @@ void CustomPropertiesWindow::updateLineWidth() { CustomPropertyLine* pNewLine = *aI; - Window* pNewWindows[] = + vcl::Window* pNewWindows[] = { &pNewLine->m_aNameBox, &pNewLine->m_aTypeBox, &pNewLine->m_aValueEdit, &pNewLine->m_aDateField, &pNewLine->m_aTimeField, &pNewLine->m_aDurationField, &pNewLine->m_aEditButton, &pNewLine->m_aYesNoButton, &pNewLine->m_aRemoveButton, NULL }; - Window** pCurrent = pWindows; - Window** pNewCurrent = pNewWindows; + vcl::Window** pCurrent = pWindows; + vcl::Window** pNewCurrent = pNewWindows; while ( *pCurrent ) { Size aSize = (*pCurrent)->GetSizePixel(); @@ -1742,17 +1742,17 @@ void CustomPropertiesWindow::AddLine( const OUString& sName, Any& rAny ) sal_Int32 nPos = GetVisibleLineCount() * GetLineHeight(); m_aCustomPropertiesLines.push_back( pNewLine ); - Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, + vcl::Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, &m_aDateField, &m_aTimeField, &m_aDurationField, &m_aEditButton, &m_aYesNoButton, &m_aRemoveButton, NULL }; - Window* pNewWindows[] = + vcl::Window* pNewWindows[] = { &pNewLine->m_aNameBox, &pNewLine->m_aTypeBox, &pNewLine->m_aValueEdit, &pNewLine->m_aDateField, &pNewLine->m_aTimeField, &pNewLine->m_aDurationField, &pNewLine->m_aEditButton, &pNewLine->m_aYesNoButton, &pNewLine->m_aRemoveButton, NULL }; - Window** pCurrent = pWindows; - Window** pNewCurrent = pNewWindows; + vcl::Window** pCurrent = pWindows; + vcl::Window** pNewCurrent = pNewWindows; while ( *pCurrent ) { Size aSize = (*pCurrent)->GetSizePixel(); @@ -1890,9 +1890,9 @@ void CustomPropertiesWindow::DoScroll( sal_Int32 nNewPos ) if ( pLine->m_bIsRemoved ) continue; - Window* pWindows[] = { &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit, &pLine->m_aDateField, &pLine->m_aTimeField, + vcl::Window* pWindows[] = { &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit, &pLine->m_aDateField, &pLine->m_aTimeField, &pLine->m_aDurationField, &pLine->m_aEditButton, &pLine->m_aYesNoButton, &pLine->m_aRemoveButton, NULL }; - Window** pCurrent = pWindows; + vcl::Window** pCurrent = pWindows; while ( *pCurrent ) { Point aPos = (*pCurrent)->GetPosPixel(); @@ -1984,7 +1984,7 @@ Sequence< beans::PropertyValue > CustomPropertiesWindow::GetCustomProperties() c return aPropertiesSeq; } -CustomPropertiesControl::CustomPropertiesControl(Window* pParent) +CustomPropertiesControl::CustomPropertiesControl(vcl::Window* pParent) : VclVBox(pParent) , m_pHeaderBar(NULL) , m_pBody(NULL) @@ -2063,7 +2063,7 @@ void CustomPropertiesControl::setAllocation(const Size &rAllocation) } } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCustomPropertiesControl(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCustomPropertiesControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new CustomPropertiesControl(pParent); @@ -2105,7 +2105,7 @@ void CustomPropertiesControl::AddLine( const OUString& sName, Any& rAny, bool bI } // class SfxCustomPropertiesPage ----------------------------------------- -SfxCustomPropertiesPage::SfxCustomPropertiesPage( Window* pParent, const SfxItemSet& rItemSet ) +SfxCustomPropertiesPage::SfxCustomPropertiesPage( vcl::Window* pParent, const SfxItemSet& rItemSet ) : SfxTabPage(pParent, "CustomInfoPage", "sfx/ui/custominfopage.ui", &rItemSet) { get(m_pPropertiesCtrl, "properties"); @@ -2190,12 +2190,12 @@ int SfxCustomPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) return nRet; } -SfxTabPage* SfxCustomPropertiesPage::Create( Window* pParent, const SfxItemSet* rItemSet ) +SfxTabPage* SfxCustomPropertiesPage::Create( vcl::Window* pParent, const SfxItemSet* rItemSet ) { return new SfxCustomPropertiesPage( pParent, *rItemSet ); } -CmisValue::CmisValue( Window* pParent, const OUString& aStr ) +CmisValue::CmisValue( vcl::Window* pParent, const OUString& aStr ) { m_pUIBuilder = new VclBuilder( pParent, getUIRootDir(), "sfx/ui/cmisline.ui"); get( m_aValueEdit, "value"); @@ -2203,7 +2203,7 @@ CmisValue::CmisValue( Window* pParent, const OUString& aStr ) m_aValueEdit->SetText( aStr ); } -CmisDateTime::CmisDateTime( Window* pParent, const util::DateTime& aDateTime ) +CmisDateTime::CmisDateTime( vcl::Window* pParent, const util::DateTime& aDateTime ) { m_pUIBuilder = new VclBuilder( pParent, getUIRootDir(), "sfx/ui/cmisline.ui"); get( m_aDateField, "date"); @@ -2215,7 +2215,7 @@ CmisDateTime::CmisDateTime( Window* pParent, const util::DateTime& aDateTime ) aDateTime.Seconds, aDateTime.NanoSeconds ) ); } -CmisYesNo::CmisYesNo( Window* pParent, bool bValue ) +CmisYesNo::CmisYesNo( vcl::Window* pParent, bool bValue ) { m_pUIBuilder = new VclBuilder( pParent, getUIRootDir(), "sfx/ui/cmisline.ui"); get( m_aYesButton, "yes"); @@ -2229,7 +2229,7 @@ CmisYesNo::CmisYesNo( Window* pParent, bool bValue ) } // struct CmisPropertyLine --------------------------------------------- -CmisPropertyLine::CmisPropertyLine(Window* pParent) +CmisPropertyLine::CmisPropertyLine(vcl::Window* pParent) : m_sType(CMIS_TYPE_STRING) , m_bUpdatable(false) , m_bRequired(false) @@ -2587,7 +2587,7 @@ void CmisPropertiesControl::AddLine( const OUString& sId, const OUString& sName, } // class SfxCmisPropertiesPage ----------------------------------------- -SfxCmisPropertiesPage::SfxCmisPropertiesPage( Window* pParent, const SfxItemSet& rItemSet ) +SfxCmisPropertiesPage::SfxCmisPropertiesPage( vcl::Window* pParent, const SfxItemSet& rItemSet ) : SfxTabPage(pParent, "CmisInfoPage", "sfx/ui/cmisinfopage.ui", &rItemSet) , m_pPropertiesCtrl( this ) { @@ -2687,7 +2687,7 @@ int SfxCmisPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) return LEAVE_PAGE; } -SfxTabPage* SfxCmisPropertiesPage::Create( Window* pParent, const SfxItemSet* rItemSet ) +SfxTabPage* SfxCmisPropertiesPage::Create( vcl::Window* pParent, const SfxItemSet* rItemSet ) { return new SfxCmisPropertiesPage( pParent, *rItemSet ); } diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 529096832518..f4a1293164a2 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -61,18 +61,18 @@ static const int NUM_OF_DOCKINGWINDOWS = 10; class SfxTitleDockingWindow : public SfxDockingWindow { - Window* m_pWrappedWindow; + vcl::Window* m_pWrappedWindow; public: SfxTitleDockingWindow( SfxBindings* pBindings , SfxChildWindow* pChildWin , - Window* pParent , + vcl::Window* pParent , WinBits nBits); virtual ~SfxTitleDockingWindow(); - Window* GetWrappedWindow() const { return m_pWrappedWindow; } - void SetWrappedWindow(Window* const pWindow); + vcl::Window* GetWrappedWindow() const { return m_pWrappedWindow; } + void SetWrappedWindow(vcl::Window* const pWindow); virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -119,7 +119,7 @@ static bool lcl_getWindowState( const uno::Reference< container::XNameAccess >& return bResult; } -SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , +SfxDockingWrapper::SfxDockingWrapper( vcl::Window* pParentWnd , sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ) @@ -199,7 +199,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , { } - Window* pContentWindow = VCLUnoHelper::GetWindow(xWindow); + vcl::Window* pContentWindow = VCLUnoHelper::GetWindow(xWindow); if ( pContentWindow ) pContentWindow->SetStyle( pContentWindow->GetStyle() | WB_DIALOGCONTROL | WB_CHILDDLGCTRL ); pTitleDockWindow->SetWrappedWindow(pContentWindow); @@ -211,7 +211,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , } SfxChildWindow* SfxDockingWrapper::CreateImpl( -Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo ) +vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo ) { SfxChildWindow *pWin = new SfxDockingWrapper(pParent, nId, pBindings, pInfo); return pWin; @@ -239,7 +239,7 @@ SfxChildWinInfo SfxDockingWrapper::GetInfo() const SfxTitleDockingWindow::SfxTitleDockingWindow( SfxBindings* pBind , SfxChildWindow* pChildWin , - Window* pParent , + vcl::Window* pParent , WinBits nBits ) : SfxDockingWindow( pBind , pChildWin , @@ -254,7 +254,7 @@ SfxTitleDockingWindow::~SfxTitleDockingWindow() delete m_pWrappedWindow; } -void SfxTitleDockingWindow::SetWrappedWindow( Window* const pWindow ) +void SfxTitleDockingWindow::SetWrappedWindow( vcl::Window* const pWindow ) { m_pWrappedWindow = pWindow; if (m_pWrappedWindow) @@ -274,7 +274,7 @@ void SfxTitleDockingWindow::StateChanged( StateChangedType nType ) { if ( nType == STATE_CHANGE_INITSHOW ) { - Window* pWindow = GetWrappedWindow(); + vcl::Window* pWindow = GetWrappedWindow(); if ( pWindow ) { pWindow->SetSizePixel( GetOutputSizePixel() ); @@ -844,7 +844,7 @@ void SfxDockingWindow::Resizing( Size& /*rSize*/ ) SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* pParent, WinBits nWinBits) : + vcl::Window* pParent, WinBits nWinBits) : DockingWindow (pParent, nWinBits), pBindings(pBindinx), pMgr(pCW), @@ -895,7 +895,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* pParent, const ResId& rResId) : + vcl::Window* pParent, const ResId& rResId) : DockingWindow(pParent, rResId), pBindings(pBindinx), pMgr(pCW), @@ -1147,7 +1147,7 @@ void SfxDockingWindow::Initialize_Impl() if ( !bSet) { SfxViewFrame *pFrame = pBindings->GetDispatcher_Impl()->GetFrame(); - Window* pEditWin = pFrame->GetViewShell()->GetWindow(); + vcl::Window* pEditWin = pFrame->GetViewShell()->GetWindow(); Point aPos = pEditWin->OutputToScreenPixel( pEditWin->GetPosPixel() ); aPos = GetParent()->ScreenToOutputPixel( aPos ); SetFloatingPos( aPos ); diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx index 69b4fd4d9ec6..c942fd25c059 100644 --- a/sfx2/source/dialog/documentfontsdialog.cxx +++ b/sfx2/source/dialog/documentfontsdialog.cxx @@ -23,12 +23,12 @@ using namespace ::com::sun::star; -SfxTabPage* SfxDocumentFontsPage::Create( Window* parent, const SfxItemSet* set ) +SfxTabPage* SfxDocumentFontsPage::Create( vcl::Window* parent, const SfxItemSet* set ) { return new SfxDocumentFontsPage( parent, *set ); } -SfxDocumentFontsPage::SfxDocumentFontsPage( Window* parent, const SfxItemSet& set ) +SfxDocumentFontsPage::SfxDocumentFontsPage( vcl::Window* parent, const SfxItemSet& set ) : SfxTabPage( parent, "DocumentFontsPage", "sfx/ui/documentfontspage.ui", &set ) { get( embedFontsCheckbox, "embedFonts" ); diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 4051b1527228..f3793a1f5322 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -853,7 +853,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( sal_Int16 nDialogType, sal_Int64 nFlags, sal_Int16 nDialog, - Window* _pPreferredParentWindow, + vcl::Window* _pPreferredParentWindow, const OUString& sStandardDir, const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) @@ -2246,7 +2246,7 @@ FileDialogHelper::FileDialogHelper( FileDialogHelper::FileDialogHelper( sal_Int16 nDialogType, sal_Int64 nFlags, - Window* _pPreferredParent ) + vcl::Window* _pPreferredParent ) : m_nError(0) { mpImp = new FileDialogHelper_Impl( this, nDialogType, nFlags, SFX2_IMPL_DIALOG_CONFIG, _pPreferredParent ); @@ -2260,7 +2260,7 @@ FileDialogHelper::FileDialogHelper( const OUString& aExtName, const OUString& rStandardDir, const ::com::sun::star::uno::Sequence< OUString >& rBlackList, - Window* _pPreferredParent ) + vcl::Window* _pPreferredParent ) : m_nError(0) { mpImp = new FileDialogHelper_Impl( this, nDialogType, nFlags, SFX2_IMPL_DIALOG_CONFIG, _pPreferredParent,rStandardDir, rBlackList ); diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 21e3a30912f9..4d663d2e15d2 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -54,7 +54,7 @@ namespace sfx2 SfxFilterMatcher* mpMatcher; GraphicFilter* mpGraphicFilter; FileDialogHelper* mpAntiImpl; - Window* mpPreferredParentWindow; + vcl::Window* mpPreferredParentWindow; ::comphelper::SequenceAsVector< OUString > mlLastURLs; @@ -180,7 +180,7 @@ namespace sfx2 const short nDialogType, sal_Int64 nFlags, sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG, - Window* _pPreferredParentWindow = NULL, + vcl::Window* _pPreferredParentWindow = NULL, const OUString& sStandardDir = OUString(), const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >() ); diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index 928ee164dcd0..b6baf00e0452 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -28,7 +28,7 @@ namespace class SfxCloseButton : public PushButton { public: - SfxCloseButton( Window* pParent ) : PushButton( pParent, 0 ) + SfxCloseButton( vcl::Window* pParent ) : PushButton( pParent, 0 ) { } @@ -95,7 +95,7 @@ namespace } } -SfxInfoBarWindow::SfxInfoBarWindow( Window* pParent, const OUString& sId, +SfxInfoBarWindow::SfxInfoBarWindow( vcl::Window* pParent, const OUString& sId, const OUString& sMessage, vector< PushButton* > aButtons ) : Window( pParent, 0 ), m_sId( sId ), @@ -317,7 +317,7 @@ void SfxInfoBarContainerWindow::Resize( ) SFX_IMPL_POS_CHILDWINDOW_WITHID( SfxInfoBarContainerChild, SID_INFOBARCONTAINER, SFX_OBJECTBAR_OBJECT ); -SfxInfoBarContainerChild::SfxInfoBarContainerChild( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* ) : +SfxInfoBarContainerChild::SfxInfoBarContainerChild( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* ) : SfxChildWindow( _pParent, nId ), m_pBindings( pBindings ) { diff --git a/sfx2/source/dialog/inputdlg.cxx b/sfx2/source/dialog/inputdlg.cxx index d46c9ae5265b..6f1ab9288205 100644 --- a/sfx2/source/dialog/inputdlg.cxx +++ b/sfx2/source/dialog/inputdlg.cxx @@ -14,7 +14,7 @@ #include <vcl/edit.hxx> #include <vcl/fixed.hxx> -InputDialog::InputDialog(const OUString &rLabelText, Window *pParent) +InputDialog::InputDialog(const OUString &rLabelText, vcl::Window *pParent) : ModalDialog(pParent, "InputDialog", "sfx/ui/inputdialog.ui") { get(m_pEntry, "entry"); diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx index de97fa5246dc..595e1b481277 100644 --- a/sfx2/source/dialog/itemconnect.cxx +++ b/sfx2/source/dialog/itemconnect.cxx @@ -82,7 +82,7 @@ ControlWrapperBase::~ControlWrapperBase() // Single control wrappers -DummyWindowWrapper::DummyWindowWrapper( Window& rWindow ) : +DummyWindowWrapper::DummyWindowWrapper( vcl::Window& rWindow ) : SingleControlWrapperType( rWindow ) { } @@ -258,7 +258,7 @@ TriState ItemConnectionBase::GetShowState( bool bKnown ) const // Standard connections -DummyItemConnection::DummyItemConnection( sal_uInt16 nSlot, Window& rWindow, ItemConnFlags nFlags ) : +DummyItemConnection::DummyItemConnection( sal_uInt16 nSlot, vcl::Window& rWindow, ItemConnFlags nFlags ) : ItemConnectionBase( nFlags ), DummyWindowWrapper( rWindow ), mnSlot( nSlot ) diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index ea30e59c557e..6a4b9397d0f5 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -858,7 +858,7 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css: css::uno::Reference< css::awt::XWindow > xParentWindow = xFrame->getContainerWindow(); SolarMutexGuard aGuard; - Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow ); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow ); MessageDialog aBox(pParentWindow, "ErrorFindEmailDialog", "sfx/ui/errorfindemaildialog.ui"); aBox.Execute(); diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index a563b553e769..d09b7cd3227b 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -43,7 +43,7 @@ * * initializes the list box with the templates */ -SfxManageStyleSheetPage::SfxManageStyleSheetPage(Window* pParent, const SfxItemSet& rAttrSet) +SfxManageStyleSheetPage::SfxManageStyleSheetPage(vcl::Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, "ManageStylePage", "sfx/ui/managestylepage.ui", &rAttrSet) , pStyle(&((SfxStyleDialog*)GetParentDialog())->GetStyleSheet()) , pItem(0) @@ -463,7 +463,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet* /*rAttrSet*/ ) -SfxTabPage* SfxManageStyleSheetPage::Create( Window* pParent, +SfxTabPage* SfxManageStyleSheetPage::Create( vcl::Window* pParent, const SfxItemSet *rAttrSet ) /* [Description] diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index 4c3f972bb15c..334e7771a786 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -28,7 +28,7 @@ SFX_IMPL_DOCKINGWINDOW( SfxNavigatorWrapper , SID_NAVIGATOR ); -SfxNavigatorWrapper::SfxNavigatorWrapper( Window* pParentWnd , +SfxNavigatorWrapper::SfxNavigatorWrapper( vcl::Window* pParentWnd , sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ) @@ -47,7 +47,7 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( Window* pParentWnd , SfxNavigator::SfxNavigator( SfxBindings* pBind , SfxChildWindow* pChildWin , - Window* pParent , + vcl::Window* pParent , WinBits nBits ) : SfxDockingWindow( pBind , pChildWin , diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index 56ae0e9c1aca..a2f43fb10ab3 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -57,7 +57,7 @@ IMPL_LINK_INLINE_START( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox ) } IMPL_LINK_INLINE_END( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox ) -SfxNewStyleDlg::SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool& rInPool ) +SfxNewStyleDlg::SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& rInPool ) : ModalDialog(pParent, "CreateStyleDialog", "sfx/ui/newstyle.ui") , aQueryOverwriteBox(this, SfxResId(STR_QUERY_OVERWRITE), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO) diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index 9dd7b9ca5a33..8e34b5cb4919 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -51,7 +51,7 @@ SFX_IMPL_DOCKINGWINDOW( SfxPartChildWnd_Impl, SID_BROWSER ); SfxPartChildWnd_Impl::SfxPartChildWnd_Impl ( - Window* pParentWnd, + vcl::Window* pParentWnd, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo @@ -101,7 +101,7 @@ SfxPartDockWnd_Impl::SfxPartDockWnd_Impl ( SfxBindings* pBind, SfxChildWindow* pChildWin, - Window* pParent, + vcl::Window* pParent, WinBits nBits ) : SfxDockingWindow( pBind, pChildWin, pParent, nBits ) diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 1b746fb44872..ca6764967282 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -83,7 +83,7 @@ IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl) // CTOR / DTOR ----------------------------------------------------------- -SfxPasswordDialog::SfxPasswordDialog(Window* pParent, const OUString* pGroupText) +SfxPasswordDialog::SfxPasswordDialog(vcl::Window* pParent, const OUString* pGroupText) : ModalDialog(pParent, "PasswordDialog", "sfx/ui/password.ui") , maMinLenPwdStr(SFX2_RESSTR(STR_PASSWD_MIN_LEN)) , maMinLenPwdStr1(SFX2_RESSTR(STR_PASSWD_MIN_LEN1)) diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index f13d70d0601f..86eb2c65e6c4 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -36,7 +36,7 @@ static bool bOutputForPrinter = true; #define DPI_COUNT (sizeof(aDPIArray)/sizeof(aDPIArray[0 ])) -SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) +SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptPrintPage", "sfx/ui/optprintpage.ui", &rSet) { get(m_pPrinterOutputRB, "printer"); @@ -89,26 +89,26 @@ SfxCommonPrintOptionsTabPage::~SfxCommonPrintOptionsTabPage() { } -SfxTabPage* SfxCommonPrintOptionsTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SfxCommonPrintOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return( new SfxCommonPrintOptionsTabPage( pParent, *rAttrSet ) ); } -Window* SfxCommonPrintOptionsTabPage::GetParentLabeledBy( const Window* pWindow ) const +vcl::Window* SfxCommonPrintOptionsTabPage::GetParentLabeledBy( const vcl::Window* pWindow ) const { - if ( pWindow == (Window *)m_pReduceGradientsStepCountNF ) + if ( pWindow == (vcl::Window *)m_pReduceGradientsStepCountNF ) return m_pReduceGradientsStripesRB; - else if ( pWindow == (Window *)m_pReduceBitmapsResolutionLB ) + else if ( pWindow == (vcl::Window *)m_pReduceBitmapsResolutionLB ) return m_pReduceBitmapsResolutionRB; else return SfxTabPage::GetParentLabeledBy( pWindow ); } -Window* SfxCommonPrintOptionsTabPage::GetParentLabelFor( const Window* pWindow ) const +vcl::Window* SfxCommonPrintOptionsTabPage::GetParentLabelFor( const vcl::Window* pWindow ) const { - if ( pWindow == (Window *)m_pReduceGradientsStripesRB ) + if ( pWindow == (vcl::Window *)m_pReduceGradientsStripesRB ) return m_pReduceGradientsStepCountNF; - else if ( pWindow == (Window *)m_pReduceBitmapsResolutionRB ) + else if ( pWindow == (vcl::Window *)m_pReduceBitmapsResolutionRB ) return m_pReduceBitmapsResolutionLB; else return SfxTabPage::GetParentLabelFor( pWindow ); diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index 2b0b42944553..12f3540ad0a1 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -124,7 +124,7 @@ static OUString GetLabelFromCommandURL( const OUString& rCommandURL, const uno:: SFX_IMPL_FLOATINGWINDOW( SfxRecordingFloatWrapper_Impl, SID_RECORDING_FLOATWINDOW ); -SfxRecordingFloatWrapper_Impl::SfxRecordingFloatWrapper_Impl( Window* pParentWnd , +SfxRecordingFloatWrapper_Impl::SfxRecordingFloatWrapper_Impl( vcl::Window* pParentWnd , sal_uInt16 nId , SfxBindings* pBind , SfxChildWinInfo* pInfo ) @@ -163,7 +163,7 @@ bool SfxRecordingFloatWrapper_Impl::QueryClose() SfxRecordingFloat_Impl::SfxRecordingFloat_Impl( SfxBindings* pBind , SfxChildWindow* pChildWin , - Window* pParent ) + vcl::Window* pParent ) : SfxFloatingWindow( pBind, pChildWin, pParent, @@ -230,7 +230,7 @@ void SfxRecordingFloat_Impl::StateChanged( StateChangedType nStateChange ) if ( nStateChange == STATE_CHANGE_INITSHOW ) { SfxViewFrame *pFrame = GetBindings().GetDispatcher_Impl()->GetFrame(); - Window* pEditWin = pFrame->GetViewShell()->GetWindow(); + vcl::Window* pEditWin = pFrame->GetViewShell()->GetWindow(); Point aPoint = pEditWin->OutputToScreenPixel( pEditWin->GetPosPixel() ); aPoint = GetParent()->ScreenToOutputPixel( aPoint ); diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index c8bce8afa3d2..1cedc62247a8 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -94,7 +94,7 @@ namespace static bool lcl_GetPassword( - Window *pParent, + vcl::Window *pParent, bool bProtect, /*out*/OUString &rPassword ) { @@ -421,13 +421,13 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl) } -SfxTabPage* SfxSecurityPage::Create( Window * pParent, const SfxItemSet * rItemSet ) +SfxTabPage* SfxSecurityPage::Create( vcl::Window * pParent, const SfxItemSet * rItemSet ) { return new SfxSecurityPage( pParent, *rItemSet ); } -SfxSecurityPage::SfxSecurityPage( Window* pParent, const SfxItemSet& rItemSet ) +SfxSecurityPage::SfxSecurityPage( vcl::Window* pParent, const SfxItemSet& rItemSet ) : SfxTabPage(pParent, "SecurityInfoPage", "sfx/ui/securityinfopage.ui", &rItemSet) { m_pImpl.reset(new SfxSecurityPage_Impl( *this, rItemSet )); diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index e3b7046d4fbb..664cf0fa2f5d 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -205,7 +205,7 @@ void SfxEmptySplitWin_Impl::MouseMove( const MouseEvent& rMEvt ) -SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, +SfxSplitWindow::SfxSplitWindow( vcl::Window* pParent, SfxChildAlignment eAl, SfxWorkWindow *pW, bool bWithButtons, WinBits nBits ) /* [Description] @@ -1086,7 +1086,7 @@ bool SfxSplitWindow::CursorIsOverRect( bool bForceAdding ) const aRect = aRect.GetUnion( aVisRect ); } - if ( aRect.IsInside( OutputToScreenPixel( ((Window*)this)->GetPointerPosPixel() ) ) ) + if ( aRect.IsInside( OutputToScreenPixel( ((vcl::Window*)this)->GetPointerPosPixel() ) ) ) return true; return false; } diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index f88bdd69104a..6e08e6f02c9f 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -39,7 +39,7 @@ namespace sfx2 { // SearchDialog -SearchDialog::SearchDialog(Window* pWindow, const OUString& rConfigName) +SearchDialog::SearchDialog(vcl::Window* pWindow, const OUString& rConfigName) : ModelessDialog(pWindow, "SearchDialog", "sfx/ui/searchdialog.ui") , m_sConfigName(rConfigName) , m_bIsConstructed(false) diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 52669b69e170..1854b4176302 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -32,7 +32,7 @@ SfxStyleDialog::SfxStyleDialog ( - Window* pParent, // Parent + vcl::Window* pParent, // Parent const OString& rID, const OUString& rUIXMLDescription, SfxStyleSheetBase& rStyle // stylesheet to be processed ) diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index d71879ef83cb..c5b964e64cdd 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -163,7 +163,7 @@ void SfxTabPage::SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::st return ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >(); } -SfxTabPage::SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet) +SfxTabPage::SfxTabPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet) : TabPage(pParent, rID, rUIXMLDescription) , pSet ( rAttrSet ) , bHasExchangeSupport ( false ) @@ -311,7 +311,7 @@ SfxTabDialog* SfxTabPage::GetTabDialog() const SfxTabDialog::SfxTabDialog ( SfxViewFrame* pViewFrame, // Frame, to which the Dialog belongs - Window* pParent, // Parent Window + vcl::Window* pParent, // Parent Window const OString& rID, const OUString& rUIXMLDescription, //Dialog Name, Dialog .ui path const SfxItemSet* pItemSet, // Itemset with the data; // can be NULL, when Pages are onDemand @@ -340,7 +340,7 @@ SfxTabDialog::SfxTabDialog */ ( - Window* pParent, // Parent Window + vcl::Window* pParent, // Parent Window const OString& rID, const OUString& rUIXMLDescription, //Dialog Name, Dialog .ui path const SfxItemSet* pItemSet, // Itemset with the data; // can be NULL, when Pages are onDemand diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index 7107fc052f82..1032a68c2db9 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -200,7 +200,7 @@ namespace sfx2 //= TaskPaneDockingWindow - TaskPaneDockingWindow::TaskPaneDockingWindow( SfxBindings* i_pBindings, TaskPaneWrapper& i_rWrapper, Window* i_pParent, WinBits i_nBits ) + TaskPaneDockingWindow::TaskPaneDockingWindow( SfxBindings* i_pBindings, TaskPaneWrapper& i_rWrapper, vcl::Window* i_pParent, WinBits i_nBits ) :TitledDockingWindow( i_pBindings, &i_rWrapper, i_pParent, i_nBits ) ,m_aTaskPane( GetContentWindow(), lcl_getFrame( i_pBindings ) ) ,m_aPaneController( m_aTaskPane, *this ) @@ -235,7 +235,7 @@ namespace sfx2 SFX_IMPL_DOCKINGWINDOW( TaskPaneWrapper, SID_TASKPANE ); - TaskPaneWrapper::TaskPaneWrapper( Window* i_pParent, sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pInfo ) + TaskPaneWrapper::TaskPaneWrapper( vcl::Window* i_pParent, sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pInfo ) :SfxChildWindow( i_pParent, i_nId ) { pWindow = new TaskPaneDockingWindow( i_pBindings, *this, i_pParent, @@ -302,7 +302,7 @@ namespace sfx2 virtual OUString GetDisplayName() const SAL_OVERRIDE; virtual Image GetImage() const SAL_OVERRIDE; virtual OString GetHelpID() const SAL_OVERRIDE; - virtual void Activate( Window& i_rParentWindow ) SAL_OVERRIDE; + virtual void Activate( vcl::Window& i_rParentWindow ) SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; virtual void SetSizePixel( const Size& i_rPanelWindowSize ) SAL_OVERRIDE; virtual void GrabFocus() SAL_OVERRIDE; @@ -317,7 +317,7 @@ namespace sfx2 virtual ~CustomToolPanel(); private: - bool impl_ensureToolPanelWindow( Window& i_rPanelParentWindow ); + bool impl_ensureToolPanelWindow( vcl::Window& i_rPanelParentWindow ); void impl_updatePanelConfig( const bool i_bVisible ) const; private: @@ -350,7 +350,7 @@ namespace sfx2 } - bool CustomToolPanel::impl_ensureToolPanelWindow( Window& i_rPanelParentWindow ) + bool CustomToolPanel::impl_ensureToolPanelWindow( vcl::Window& i_rPanelParentWindow ) { if ( m_bAttemptedCreation ) return m_aCustomPanel.is(); @@ -414,7 +414,7 @@ namespace sfx2 } - void CustomToolPanel::Activate( Window& i_rParentWindow ) + void CustomToolPanel::Activate( vcl::Window& i_rParentWindow ) { ENSURE_OR_RETURN_VOID( impl_ensureToolPanelWindow( i_rParentWindow ), "no panel to activate!" ); @@ -722,7 +722,7 @@ namespace sfx2 //= ModuleTaskPane - ModuleTaskPane::ModuleTaskPane( Window& i_rParentWindow, const Reference< XFrame >& i_rDocumentFrame ) + ModuleTaskPane::ModuleTaskPane( vcl::Window& i_rParentWindow, const Reference< XFrame >& i_rDocumentFrame ) :Window( &i_rParentWindow, WB_DIALOGCONTROL ) ,m_pImpl( new ModuleTaskPane_Impl( *this, i_rDocumentFrame, NULL ) ) { diff --git a/sfx2/source/dialog/templateinfodlg.cxx b/sfx2/source/dialog/templateinfodlg.cxx index 45dcd7837a74..a2514ea23a11 100644 --- a/sfx2/source/dialog/templateinfodlg.cxx +++ b/sfx2/source/dialog/templateinfodlg.cxx @@ -32,13 +32,13 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::task; using namespace ::com::sun::star::util; -SfxTemplateInfoDlg::SfxTemplateInfoDlg (Window *pParent) +SfxTemplateInfoDlg::SfxTemplateInfoDlg (vcl::Window *pParent) : ModalDialog(pParent, "TemplateInfo", "sfx/ui/templateinfodialog.ui") { get(mpBtnClose, "close"); get(mpBox, "box"); get(mpInfoView, "infoDrawingArea"); - mpPreviewView = new Window(mpBox); + mpPreviewView = new vcl::Window(mpBox); Size aSize(LogicToPixel(Size(250, 160), MAP_APPFONT)); mpBox->set_width_request(aSize.Width()); diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index bf134ec4e543..7aac28c40446 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -136,7 +136,7 @@ SfxTemplateDialog::SfxTemplateDialog ( SfxBindings *pBind, SfxChildWindow *pCW, - Window *pParent + vcl::Window *pParent ) /* [Description] @@ -349,7 +349,7 @@ PopupMenu* SfxActionListBox::CreateContextMenu( void ) -SfxTemplateDialogWrapper::SfxTemplateDialogWrapper(Window *pParentWnd, +SfxTemplateDialogWrapper::SfxTemplateDialogWrapper(vcl::Window *pParentWnd, sal_uInt16 nId, SfxBindings *p, SfxChildWinInfo *pInfo) : SfxChildWindow(pParentWnd, nId) { @@ -364,7 +364,7 @@ SfxTemplateDialogWrapper::SfxTemplateDialogWrapper(Window *pParentWnd, //===== SfxTemplatePanelControl =============================================== SfxTemplatePanelControl::SfxTemplatePanelControl ( SfxBindings* pBindings, - Window* pParentWindow) + vcl::Window* pParentWindow) : DockingWindow(pParentWindow, SfxResId(DLG_STYLE_DESIGNER) ), pImpl(new SfxTemplateDialog_Impl(pBindings, this)), mpBindings(pBindings) @@ -455,7 +455,7 @@ void SfxTemplatePanelControl::StateChanged( StateChangedType nStateChange ) if ( nStateChange == STATE_CHANGE_INITSHOW ) { SfxViewFrame *pFrame = mpBindings->GetDispatcher_Impl()->GetFrame(); - Window* pEditWin = pFrame->GetViewShell()->GetWindow(); + vcl::Window* pEditWin = pFrame->GetViewShell()->GetWindow(); Size aSize = pEditWin->GetSizePixel(); Point aPoint = pEditWin->OutputToScreenPixel( pEditWin->GetPosPixel() ); @@ -750,7 +750,7 @@ SvTreeListEntry* FillBox_Impl(SvTreeListBox *pBox, // Constructor -SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Window* pW, bool ) : +SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl::Window* pW, bool ) : mbIgnoreSelect( false ), pBindings ( pB ), pWindow ( pW ), @@ -1984,7 +1984,7 @@ void SfxCommonTemplateDialog_Impl::NewHdl(void *) OUString aEmpty; if ( nActFamily != 0xffff && (pTreeBox || aFmtLb.GetSelectionCount() <= 1)) { - Window* pTmp; + vcl::Window* pTmp; pTmp = Application::GetDefDialogParent(); if ( ISA(SfxTemplateDialog_Impl) ) Application::SetDefDialogParent( pWindow->GetParent() ); @@ -2024,7 +2024,7 @@ void SfxCommonTemplateDialog_Impl::EditHdl(void *) sal_uInt16 nFilter = nActFilter; OUString aTemplName(GetSelectedEntry()); GetSelectedStyle(); // -Wall required?? - Window* pTmp; + vcl::Window* pTmp; //DefModalDialogParent set for modality of the following dialogs pTmp = Application::GetDefDialogParent(); if ( ISA(SfxTemplateDialog_Impl) ) @@ -2193,7 +2193,7 @@ void SfxCommonTemplateDialog_Impl::ResetFocus() { SfxViewFrame *pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame(); SfxViewShell *pVu = pViewFrame->GetViewShell(); - Window *pAppWin = pVu ? pVu->GetWindow(): 0; + vcl::Window *pAppWin = pVu ? pVu->GetWindow(): 0; if(pAppWin) pAppWin->GrabFocus(); } @@ -2293,7 +2293,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu ) -void SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl( const Point& rPos, Window* pWin ) +void SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl( const Point& rPos, vcl::Window* pWin ) { // Bug# 94152: This part should never be called, because before this happens, the TreeListBox should captured this! OSL_FAIL( "+SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl(): How could this happen? Please infirm developer ASAP!" ); @@ -2811,7 +2811,7 @@ void SfxTemplateDialog::StateChanged( StateChangedType nStateChange ) if ( nStateChange == STATE_CHANGE_INITSHOW ) { SfxViewFrame *pFrame = GetBindings().GetDispatcher_Impl()->GetFrame(); - Window* pEditWin = pFrame->GetViewShell()->GetWindow(); + vcl::Window* pEditWin = pFrame->GetViewShell()->GetWindow(); Size aSize = pEditWin->GetSizePixel(); Point aPoint = pEditWin->OutputToScreenPixel( pEditWin->GetPosPixel() ); @@ -2825,7 +2825,7 @@ void SfxTemplateDialog::StateChanged( StateChangedType nStateChange ) SfxDockingWindow::StateChanged( nStateChange ); } -DropToolBox_Impl::DropToolBox_Impl(Window* pParent, SfxTemplateDialog_Impl* pTemplateDialog) : +DropToolBox_Impl::DropToolBox_Impl(vcl::Window* pParent, SfxTemplateDialog_Impl* pTemplateDialog) : ToolBox(pParent), DropTargetHelper(this), rParent(*pTemplateDialog) diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 71eee2c27545..65882136b12b 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -36,7 +36,7 @@ namespace sfx2 //= TitledDockingWindow - TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, Window* i_pParent, + TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, vcl::Window* i_pParent, WinBits i_nStyle ) :SfxDockingWindow( i_pBindings, i_pChildWindow, i_pParent, i_nStyle ) ,m_sTitle() @@ -50,7 +50,7 @@ namespace sfx2 } - TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, Window* i_pParent, + TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, vcl::Window* i_pParent, const ResId& i_rResId ) :SfxDockingWindow( i_pBindings, i_pChildWindow, i_pParent, i_rResId ) ,m_sTitle() diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index eceacca0e6bf..16788ee79baf 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -462,7 +462,7 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton ) return 0L; } -SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl(Window *pParent, SfxVersionInfo& rInfo, bool bEdit) +SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl(vcl::Window *pParent, SfxVersionInfo& rInfo, bool bEdit) : SfxModalDialog(pParent, "VersionCommentDialog", "sfx/ui/versioncommentdialog.ui") , m_rInfo(rInfo) { |