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 /sd | |
| 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 'sd')
259 files changed, 710 insertions, 712 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index 7fbe423a7ca3..c05993d68ed2 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -155,7 +155,7 @@ public: /** Starts the text conversion (hangul/hanja or Chinese simplified/traditional) for the current viewshell */ void StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage, - const vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ); + const ::vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ); /** This is called internally when text conversion is started. The position of current view mode/page/object/caret position diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 1998e4d039be..f31f371f2319 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -71,7 +71,7 @@ class SfxMedium; class SvxSearchItem; class EditStatus; class Point; -class Window; +namespace vcl { class Window; } class SdTransferable; struct SpellCallbackInfo; struct StyleRequestData; @@ -445,7 +445,7 @@ public: static SdAnimationInfo* GetShapeUserData(SdrObject& rObject, bool bCreate = false ); SAL_DLLPRIVATE SdIMapInfo* GetIMapInfo( SdrObject* pObject ) const; - SAL_DLLPRIVATE IMapObject* GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint, const ::Window& rCmpWnd ); + SAL_DLLPRIVATE IMapObject* GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint, const ::vcl::Window& rCmpWnd ); SAL_DLLPRIVATE CharClass* GetCharClass() const { return mpCharClass; } diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index 612f27a54313..6120b20a0113 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -53,7 +53,7 @@ class SdrView; class Bitmap; class List; class SdResId; -class Window; +namespace vcl { class Window; } class SdPage; class TabPage; class ViewShell; @@ -99,7 +99,7 @@ public: virtual void HideRadioGroup() = 0; virtual void HideDeleteBtn() = 0; virtual void SetInputFields(bool bEnableX, bool bEnableY) = 0; - //from class ::Window + //from class vcl::Window virtual void SetText( const OUString& rStr ) = 0; }; @@ -107,7 +107,7 @@ class AbstractSdInsertLayerDlg : public VclAbstractDialog { public: virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0; - //from class ::Window + //from class vcl::Window virtual void SetHelpId( const OString& rHelpId ) = 0; }; @@ -120,7 +120,7 @@ public: class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog { public: - virtual ::Window* GetWindow() = 0; //this method is added for return a ::Window type pointer + virtual vcl::Window* GetWindow() = 0; //this method is added for return a vcl::Window type pointer virtual std::vector<OUString> GetList ( const sal_uInt16 nType ) = 0; virtual bool IsLink() = 0; virtual bool IsRemoveUnnessesaryMasterPages() const = 0; @@ -172,36 +172,36 @@ class SdAbstractDialogFactory public: static SdAbstractDialogFactory* Create(); - virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) = 0; - virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) = 0; - virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) = 0; - virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) = 0; - virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage = true ) = 0; - virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, bool bAutoPilot) = 0; - virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) = 0; - virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) = 0; - virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) = 0; - virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( ::Window* pWindow ) = 0; - virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( ::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) = 0; - virtual AbstractMorphDlg* CreateMorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) = 0; - virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) = 0; - virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ) = 0; - virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, + virtual VclAbstractDialog* CreateBreakDlg(vcl::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) = 0; + virtual AbstractCopyDlg* CreateCopyDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) = 0; + virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc ) = 0; + virtual SfxAbstractTabDialog* CreateSdTabCharDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) = 0; + virtual SfxAbstractTabDialog* CreateSdTabPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage = true ) = 0; + virtual AbstractAssistentDlg* CreateAssistentDlg( vcl::Window* pParent, bool bAutoPilot) = 0; + virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) = 0; + virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) = 0; + virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) = 0; + virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( vcl::Window* pWindow ) = 0; + virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( vcl::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) = 0; + virtual AbstractMorphDlg* CreateMorphDlg( vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) = 0; + virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) = 0; + virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( vcl::Window* pParent, const SfxItemSet* pAttr ) = 0; + virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) = 0; - virtual VclAbstractDialog* CreateRemoteDialog( ::Window* pWindow ) = 0; - virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0; - virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::Window* pWindow, const SfxItemSet& rInAttrs) = 0; - virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) = 0; - virtual SfxAbstractDialog* CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) = 0; - virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) = 0; - virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType) = 0; - - virtual VclAbstractDialog* CreateMasterLayoutDialog( ::Window* pParent, + virtual VclAbstractDialog* CreateRemoteDialog( vcl::Window* pWindow ) = 0; + virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0; + virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, vcl::Window* pWindow, const SfxItemSet& rInAttrs) = 0; + virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) = 0; + virtual SfxAbstractDialog* CreatSdActionDialog( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) = 0; + virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( vcl::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) = 0; + virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( vcl::Window* pWindow, DocumentType eDocType) = 0; + + virtual VclAbstractDialog* CreateMasterLayoutDialog( vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* ) = 0; virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell, - ::Window* pParent, + vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) = 0; @@ -210,7 +210,7 @@ public: virtual CreateTabPage GetSdOptionsMiscTabPageCreatorFunc() = 0; virtual CreateTabPage GetSdOptionsSnapTabPageCreatorFunc() = 0; - virtual VclAbstractDialog* CreateSdPhotoAlbumDialog( ::Window* pWindow, SdDrawDocument* pDoc) = 0; + virtual VclAbstractDialog* CreateSdPhotoAlbumDialog( vcl::Window* pWindow, SdDrawDocument* pDoc) = 0; protected: ~SdAbstractDialogFactory() {} diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index b3af2ebb7889..d182a301bf6a 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -120,7 +120,7 @@ public: // virtual methods for the option dialog virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE; virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE; protected: diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 3bff50df9716..b8d333709ff6 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -968,7 +968,7 @@ SdIMapInfo* SdDrawDocument::GetIMapInfo( SdrObject* pObject ) const IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj, const Point& rWinPoint, - const ::Window& /* rCmpWnd */ ) + const ::vcl::Window& /* rCmpWnd */ ) { SdIMapInfo* pIMapInfo = GetIMapInfo( pObj ); IMapObject* pIMapObj = NULL; diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx index ebbce887eb1a..40eef52999a3 100644 --- a/sd/source/filter/html/htmlattr.cxx +++ b/sd/source/filter/html/htmlattr.cxx @@ -22,12 +22,12 @@ #include <vcl/decoview.hxx> #include <vcl/builder.hxx> -SdHtmlAttrPreview::SdHtmlAttrPreview( Window* pParent, WinBits nStyle ) +SdHtmlAttrPreview::SdHtmlAttrPreview( vcl::Window* pParent, WinBits nStyle ) :Control( pParent, nStyle ) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSdHtmlAttrPreview(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSdHtmlAttrPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; diff --git a/sd/source/filter/html/htmlattr.hxx b/sd/source/filter/html/htmlattr.hxx index b8dc6e529ef3..6cf5491dbb62 100644 --- a/sd/source/filter/html/htmlattr.hxx +++ b/sd/source/filter/html/htmlattr.hxx @@ -31,7 +31,7 @@ protected: Color m_aVLinkColor, m_aALinkColor; public: - SdHtmlAttrPreview( Window* pParent, WinBits nStyle ); + SdHtmlAttrPreview( vcl::Window* pParent, WinBits nStyle ); virtual ~SdHtmlAttrPreview(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index ae36786ef1e5..ca11bcdbe24b 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -3245,7 +3245,7 @@ sal_uLong EasyFile::close() } // This class helps reporting errors during file i/o -HtmlErrorContext::HtmlErrorContext(Window *_pWin) +HtmlErrorContext::HtmlErrorContext(vcl::Window *_pWin) : ErrorContext(_pWin) { mnResId = 0; diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 19709dc9a955..e5e18c086dea 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -69,7 +69,7 @@ private: OUString maURL2; public: - HtmlErrorContext(Window *pWin=0); + HtmlErrorContext(vcl::Window *pWin=0); virtual ~HtmlErrorContext() {}; virtual bool GetString( sal_uLong nErrId, OUString& rCtxStr ) SAL_OVERRIDE; diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 4bcd1fb0072a..3ec6d184c174 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -351,7 +351,7 @@ private: OKButton* m_pBtnOK; public: - SdDesignNameDlg(Window* pWindow, const OUString& aName ); + SdDesignNameDlg(vcl::Window* pWindow, const OUString& aName ); OUString GetDesignName(); DECL_LINK(ModifyHdl, void *); @@ -359,7 +359,7 @@ public: // SdPublishingDlg Methods -SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType) +SdPublishingDlg::SdPublishingDlg(vcl::Window* pWindow, DocumentType eDocType) : ModalDialog(pWindow, "PublishingDialog", "modules/simpress/ui/publishingdialog.ui") , mpButtonSet( new ButtonSet() ) , aAssistentFunc(NOOFPAGES) @@ -1532,7 +1532,7 @@ bool SdPublishingDlg::Save() } // SdDesignNameDlg Methods -SdDesignNameDlg::SdDesignNameDlg(Window* pWindow, const OUString& aName) +SdDesignNameDlg::SdDesignNameDlg(vcl::Window* pWindow, const OUString& aName) : ModalDialog(pWindow, "NameDesignDialog", "modules/sdraw/ui/namedesign.ui") { get(m_pEdit, "entry"); diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 333c165793b7..6de8d0cbe3e0 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -132,7 +132,7 @@ void AccessibleDocumentViewBase::Init (void) // Register at VCL Window to be informed of activated and deactivated // OLE objects. - Window* pWindow = maShapeTreeInfo.GetWindow(); + vcl::Window* pWindow = maShapeTreeInfo.GetWindow(); if (pWindow != NULL) { maWindowLink = LINK( @@ -143,7 +143,7 @@ void AccessibleDocumentViewBase::Init (void) sal_uInt16 nCount = pWindow->GetChildCount(); for (sal_uInt16 i=0; i<nCount; i++) { - Window* pChildWindow = pWindow->GetChild (i); + vcl::Window* pChildWindow = pWindow->GetChild (i); if (pChildWindow && (AccessibleRole::EMBEDDED_OBJECT ==pChildWindow->GetAccessibleRole())) @@ -171,8 +171,8 @@ IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener, { // Window is dying. Unregister from VCL Window. // This is also attempted in the disposing() method. - Window* pWindow = maShapeTreeInfo.GetWindow(); - Window* pDyingWindow = static_cast<Window*>( + vcl::Window* pWindow = maShapeTreeInfo.GetWindow(); + vcl::Window* pDyingWindow = static_cast<vcl::Window*>( pWindowEvent->GetWindow()); if (pWindow==pDyingWindow && pWindow!=NULL && maWindowLink.IsSet()) { @@ -185,7 +185,7 @@ IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener, case VCLEVENT_WINDOW_SHOW: { // A new window has been created. Is it an OLE object? - Window* pChildWindow = static_cast<Window*>( + vcl::Window* pChildWindow = static_cast<vcl::Window*>( pWindowEvent->GetData()); if (pChildWindow!=NULL && (pChildWindow->GetAccessibleRole() @@ -200,7 +200,7 @@ IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener, { // A window has been destroyed. Has that been an OLE // object? - Window* pChildWindow = static_cast<Window*>( + vcl::Window* pChildWindow = static_cast<vcl::Window*>( pWindowEvent->GetData()); if (pChildWindow!=NULL && (pChildWindow->GetAccessibleRole() @@ -479,7 +479,7 @@ OUString SAL_CALL void AccessibleDocumentViewBase::impl_dispose() { // Unregister from VCL Window. - Window* pWindow = maShapeTreeInfo.GetWindow(); + vcl::Window* pWindow = maShapeTreeInfo.GetWindow(); if (maWindowLink.IsSet()) { if (pWindow) diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx index 03ad4311c42c..aa296df0deab 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx @@ -31,7 +31,7 @@ namespace accessibility SdrOutliner& rOutliner, SdrView& rView, OutlinerView& rOutlView, - const ::Window& rViewWindow ) + const vcl::Window& rViewWindow ) : mrView( rView ), mrWindow( rViewWindow ), mpOutliner( &rOutliner ), diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index c4f818b63657..8d04f48fe315 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -68,7 +68,7 @@ public: Implementation ( AccessibleSlideSorterView& rAccessibleSlideSorter, ::sd::slidesorter::SlideSorter& rSlideSorter, - ::Window* pWindow); + vcl::Window* pWindow); virtual ~Implementation (void); void RequestUpdateChildren (void); @@ -96,7 +96,7 @@ private: sal_Int32 mnFirstVisibleChild; sal_Int32 mnLastVisibleChild; bool mbListeningToDocument; - ::Window* mpWindow; + vcl::Window* mpWindow; sal_Int32 mnFocusedIndex; bool mbModelChangeLocked; ImplSVEvent * mnUpdateChildrenUserEventId; @@ -110,7 +110,7 @@ private: AccessibleSlideSorterView::AccessibleSlideSorterView( ::sd::slidesorter::SlideSorter& rSlideSorter, const Reference<XAccessible>& rxParent, - ::Window* pContentWindow) + vcl::Window* pContentWindow) : AccessibleSlideSorterViewBase(MutexOwner::maMutex), mrSlideSorter(rSlideSorter), mxParent(rxParent), @@ -223,7 +223,7 @@ Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent if (mpContentWindow != NULL) { - ::Window* pParent = mpContentWindow->GetAccessibleParentWindow(); + vcl::Window* pParent = mpContentWindow->GetAccessibleParentWindow(); if (pParent != NULL) xParent = pParent->GetAccessible(); } @@ -667,7 +667,7 @@ bool AccessibleSlideSorterView::IsDisposed (void) AccessibleSlideSorterView::Implementation::Implementation ( AccessibleSlideSorterView& rAccessibleSlideSorter, ::sd::slidesorter::SlideSorter& rSlideSorter, - ::Window* pWindow) + vcl::Window* pWindow) : mrAccessibleSlideSorter(rAccessibleSlideSorter), mrSlideSorter(rSlideSorter), maPageObjects(), diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx index 3f873f0056f3..929c92da253e 100644 --- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx +++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx @@ -84,7 +84,7 @@ Point AccessibleViewForwarder::LogicToPixel (const Point& rPoint) const { SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow((sal_uInt32)mnWindowId); OutputDevice& rOutDev = pPaintWindow->GetOutputDevice(); - Rectangle aBBox(static_cast<Window&>(rOutDev).GetWindowExtentsRelative(0L)); + Rectangle aBBox(static_cast<::vcl::Window&>(rOutDev).GetWindowExtentsRelative(0L)); return rOutDev.LogicToPixel (rPoint) + aBBox.TopLeft(); } else @@ -114,7 +114,7 @@ Point AccessibleViewForwarder::PixelToLogic (const Point& rPoint) const { SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow((sal_uInt32)mnWindowId); OutputDevice& rOutDev = pPaintWindow->GetOutputDevice(); - Rectangle aBBox (static_cast<Window&>(rOutDev).GetWindowExtentsRelative(0L)); + Rectangle aBBox (static_cast<::vcl::Window&>(rOutDev).GetWindowExtentsRelative(0L)); return rOutDev.PixelToLogic (rPoint - aBBox.TopLeft()); } else diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index de4b5b1c9a81..4be244827f96 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -66,7 +66,7 @@ const int MISCEFFECTS = 4; class CategoryListBox : public ListBox { public: - CategoryListBox( Window* pParent ); + CategoryListBox( vcl::Window* pParent ); virtual ~CategoryListBox(); virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -83,14 +83,14 @@ private: Link maDoubleClickHdl; }; -CategoryListBox::CategoryListBox( Window* pParent ) +CategoryListBox::CategoryListBox( vcl::Window* pParent ) : ListBox( pParent, WB_TABSTOP | WB_BORDER ) { EnableUserDraw( true ); SetDoubleClickHdl( LINK( this, CategoryListBox, implDoubleClickHdl ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCategoryListBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCategoryListBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new CategoryListBox( pParent ); } @@ -163,7 +163,7 @@ void CategoryListBox::MouseButtonUp( const MouseEvent& rMEvt ) class CustomAnimationCreateTabPage : public TabPage { public: - CustomAnimationCreateTabPage( Window* pParent, CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const PresetCategoryList& rCategoryList, bool bHasText, bool bIsMotionPath = false ); + CustomAnimationCreateTabPage( vcl::Window* pParent, CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const PresetCategoryList& rCategoryList, bool bHasText, bool bIsMotionPath = false ); virtual ~CustomAnimationCreateTabPage(); PathKind getCreatePathKind() const; @@ -224,7 +224,7 @@ bool ImplStlEffectCategorySortHelper::operator()( const CustomAnimationPresetPtr return mxCollator->compareString(p1->getLabel(), p2->getLabel()) == -1; } -CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const PresetCategoryList& rCategoryList, bool bHasText, bool bIsMotionPath ) +CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( vcl::Window* pParent, CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const PresetCategoryList& rCategoryList, bool bHasText, bool bIsMotionPath ) : TabPage( pParent, "CustomAnimationCreateTab", "modules/simpress/ui/customanimationcreatetab.ui" ) , mpParent( pDialogParent ) , mnId( nTabId ) @@ -479,7 +479,7 @@ bool CustomAnimationCreateTabPage::select( const OUString& rsPresetId ) return false; } -CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ) +CustomAnimationCreateDialog::CustomAnimationCreateDialog( vcl::Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ) : TabDialog( pParent, "CustomAnimationCreate", "modules/simpress/ui/customanimationcreatedialog.ui" ) , mpPane( pPane ) , mrTargets( rTargets ) @@ -612,10 +612,10 @@ void CustomAnimationCreateDialog::preview( const CustomAnimationPresetPtr& pPres namespace { -Window * lcl_GetTopmostParent( Window * pWindow ) +vcl::Window * lcl_GetTopmostParent( vcl::Window * pWindow ) { - Window * pResult = 0; - Window * pCurrent = pWindow ? pWindow->GetParent() : 0; + vcl::Window * pResult = 0; + vcl::Window * pCurrent = pWindow ? pWindow->GetParent() : 0; while( pCurrent ) { pResult = pCurrent; @@ -636,7 +636,7 @@ void CustomAnimationCreateDialog::setPosition() else { // default position: aligned with right edge of parent - Window * pParent = lcl_GetTopmostParent( this ); + vcl::Window * pParent = lcl_GetTopmostParent( this ); if( pParent ) { Point aPos( GetPosPixel()); diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx index f248f8fbc128..177eb8550945 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx @@ -39,7 +39,7 @@ class CustomAnimationCreateDialog : public TabDialog { friend class CustomAnimationCreateTabPage; public: - CustomAnimationCreateDialog( ::Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ); + CustomAnimationCreateDialog( vcl::Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ); virtual ~CustomAnimationCreateDialog(); PathKind getCreatePathKind() const; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index caec627bcaec..e307af2ad14b 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -98,7 +98,7 @@ namespace sd { class PresetPropertyBox : public PropertySubControl { public: - PresetPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const OUString& aPresetId, const Link& rModifyHdl ); + PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const OUString& aPresetId, const Link& rModifyHdl ); virtual ~PresetPropertyBox(); virtual Any getValue() SAL_OVERRIDE; @@ -110,7 +110,7 @@ private: ListBox* mpControl; }; -PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const OUString& aPresetId, const Link& rModifyHdl ) +PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const OUString& aPresetId, const Link& rModifyHdl ) : PropertySubControl( nControlType ) { mpControl = new ListBox( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN ); @@ -175,7 +175,7 @@ Control* PresetPropertyBox::getControl() class ColorPropertyBox : public PropertySubControl { public: - ColorPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); + ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ); virtual ~ColorPropertyBox(); virtual Any getValue() SAL_OVERRIDE; @@ -186,7 +186,7 @@ private: ColorListBox* mpControl; }; -ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) +ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) { mpControl = new ColorListBox( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN ); @@ -247,7 +247,7 @@ Control* ColorPropertyBox::getControl() class FontPropertyBox : public PropertySubControl { public: - FontPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); + FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ); virtual ~FontPropertyBox(); virtual Any getValue() SAL_OVERRIDE; @@ -259,7 +259,7 @@ private: FontNameBox* mpControl; }; -FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) +FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) { mpControl = new FontNameBox( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN ); @@ -320,7 +320,7 @@ Control* FontPropertyBox::getControl() class DropdownMenuBox : public Edit { public: - DropdownMenuBox( Window* pParent, Edit* pSubControl, PopupMenu* pMenu ); + DropdownMenuBox( vcl::Window* pParent, Edit* pSubControl, PopupMenu* pMenu ); virtual ~DropdownMenuBox(); void Resize() SAL_OVERRIDE; @@ -334,7 +334,7 @@ private: PopupMenu* mpMenu; }; -DropdownMenuBox::DropdownMenuBox( Window* pParent, Edit* pSubControl, PopupMenu* pMenu ) +DropdownMenuBox::DropdownMenuBox( vcl::Window* pParent, Edit* pSubControl, PopupMenu* pMenu ) : Edit( pParent, WB_BORDER|WB_TABSTOP| WB_DIALOGCONTROL ), mpSubControl(pSubControl),mpDropdownButton(0),mpMenu(pMenu) { @@ -394,7 +394,7 @@ bool DropdownMenuBox::PreNotify( NotifyEvent& rNEvt ) class CharHeightPropertyBox : public PropertySubControl { public: - CharHeightPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); + CharHeightPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ); virtual ~CharHeightPropertyBox(); virtual Any getValue() SAL_OVERRIDE; @@ -410,7 +410,7 @@ private: MetricField* mpMetric; }; -CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) +CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) { mpMetric = new MetricField( pParent, WB_TABSTOP|WB_IGNORETAB| WB_NOBORDER); @@ -471,7 +471,7 @@ Control* CharHeightPropertyBox::getControl() class TransparencyPropertyBox : public PropertySubControl { public: - TransparencyPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); + TransparencyPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ); virtual ~TransparencyPropertyBox(); virtual Any getValue() SAL_OVERRIDE; @@ -491,7 +491,7 @@ private: Link maModifyHdl; }; -TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) +TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) , maModifyHdl( rModifyHdl ) { @@ -575,7 +575,7 @@ Control* TransparencyPropertyBox::getControl() class RotationPropertyBox : public PropertySubControl { public: - RotationPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); + RotationPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ); virtual ~RotationPropertyBox(); virtual Any getValue() SAL_OVERRIDE; @@ -595,7 +595,7 @@ private: Link maModifyHdl; }; -RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) +RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) , maModifyHdl( rModifyHdl ) { @@ -700,7 +700,7 @@ Control* RotationPropertyBox::getControl() class ScalePropertyBox : public PropertySubControl { public: - ScalePropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); + ScalePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ); virtual ~ScalePropertyBox(); virtual Any getValue() SAL_OVERRIDE; @@ -721,7 +721,7 @@ private: int mnDirection; }; -ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) +ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) , maModifyHdl( rModifyHdl ) { @@ -863,7 +863,7 @@ Control* ScalePropertyBox::getControl() class FontStylePropertyBox : public PropertySubControl { public: - FontStylePropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); + FontStylePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ); virtual ~FontStylePropertyBox(); virtual Any getValue() SAL_OVERRIDE; @@ -886,7 +886,7 @@ private: sal_Int16 mnFontUnderline; }; -FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) +FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) , maModifyHdl( rModifyHdl ) { @@ -984,7 +984,7 @@ Control* FontStylePropertyBox::getControl() class CustomAnimationEffectTabPage : public TabPage { public: - CustomAnimationEffectTabPage( Window* pParent, const STLPropertySet* pSet ); + CustomAnimationEffectTabPage( vcl::Window* pParent, const STLPropertySet* pSet ); virtual ~CustomAnimationEffectTabPage(); void update( STLPropertySet* pSet ); @@ -1025,7 +1025,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer; }; -CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, const STLPropertySet* pSet ) +CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( vcl::Window* pParent, const STLPropertySet* pSet ) : TabPage( pParent, "EffectTab", "modules/simpress/ui/customanimationeffecttab.ui" ), mbHasText( false ), mpSet(pSet ) { get(mpSettings, "settings" ); @@ -1556,7 +1556,7 @@ void CustomAnimationEffectTabPage::onSoundPreview() class CustomAnimationDurationTabPage : public TabPage { public: - CustomAnimationDurationTabPage( Window* pParent, const STLPropertySet* pSet ); + CustomAnimationDurationTabPage( vcl::Window* pParent, const STLPropertySet* pSet ); virtual ~CustomAnimationDurationTabPage(); void update( STLPropertySet* pSet ); @@ -1580,7 +1580,7 @@ private: ListBox* mpLBTrigger; }; -CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, const STLPropertySet* pSet) +CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(vcl::Window* pParent, const STLPropertySet* pSet) : TabPage( pParent, "TimingTab", "modules/simpress/ui/customanimationtimingtab.ui" ), mpSet( pSet ) { get(mpFTStart,"start_label" ); @@ -1921,7 +1921,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) class CustomAnimationTextAnimTabPage : public TabPage { public: - CustomAnimationTextAnimTabPage( Window* pParent, const STLPropertySet* pSet ); + CustomAnimationTextAnimTabPage( vcl::Window* pParent, const STLPropertySet* pSet ); void update( STLPropertySet* pSet ); @@ -1941,7 +1941,7 @@ private: bool mbHasVisibleShapes; }; -CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent, const STLPropertySet* pSet) +CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(vcl::Window* pParent, const STLPropertySet* pSet) : TabPage( pParent, "TextAnimationTab", "modules/simpress/ui/customanimationtexttab.ui" ), mpSet( pSet ), mbHasVisibleShapes(true) @@ -2100,7 +2100,7 @@ IMPL_LINK_NOARG(CustomAnimationTextAnimTabPage, implSelectHdl) return 0; } -CustomAnimationDialog::CustomAnimationDialog(Window* pParent, STLPropertySet* pSet, const OString& sPage) +CustomAnimationDialog::CustomAnimationDialog(vcl::Window* pParent, STLPropertySet* pSet, const OString& sPage) : TabDialog( pParent, "CustomAnimationProperties", "modules/simpress/ui/customanimationproperties.ui") , mpSet( pSet ) , mpResultSet( 0 ) @@ -2208,12 +2208,12 @@ STLPropertySet* CustomAnimationDialog::createDefaultSet() return pSet; } -PropertyControl::PropertyControl( Window* pParent ) +PropertyControl::PropertyControl( vcl::Window* pParent ) : ListBox( pParent, WB_TABSTOP | WB_BORDER | WB_DROPDOWN ), mpSubControl(0) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makePropertyControl( Window *pParent ) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makePropertyControl( vcl::Window *pParent ) { return new PropertyControl( pParent ); } @@ -2258,7 +2258,7 @@ PropertySubControl::~PropertySubControl() { } -PropertySubControl* PropertySubControl::create( sal_Int32 nType, Window* pParent, const Any& rValue, const OUString& rPresetId, const Link& rModifyHdl ) +PropertySubControl* PropertySubControl::create( sal_Int32 nType, vcl::Window* pParent, const Any& rValue, const OUString& rPresetId, const Link& rModifyHdl ) { PropertySubControl* pSubControl = NULL; switch( nType ) diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index f4e922519eb4..2fcdc742073a 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -107,7 +107,7 @@ public: static PropertySubControl* create( sal_Int32 nType, - ::Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Any& rValue, const OUString& rPresetId, const Link& rModifyHdl ); @@ -121,7 +121,7 @@ protected: class PropertyControl : public ListBox { public: - PropertyControl( Window* pParent ); + PropertyControl( vcl::Window* pParent ); virtual ~PropertyControl(); void setSubControl( PropertySubControl* pSubControl ); @@ -141,7 +141,7 @@ class STLPropertySet; class CustomAnimationDialog : public TabDialog { public: - CustomAnimationDialog(Window* pParent, STLPropertySet* pSet, const OString& Page = OString()); + CustomAnimationDialog(vcl::Window* pParent, STLPropertySet* pSet, const OString& Page = OString()); virtual ~CustomAnimationDialog(); STLPropertySet* getDefaultSet() { return mpSet; } diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index e215e5b92c42..e62b84bdbbdd 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -410,7 +410,7 @@ void CustomAnimationTriggerEntryItem::Clone( SvLBoxItem* ) { } -CustomAnimationList::CustomAnimationList( ::Window* pParent ) +CustomAnimationList::CustomAnimationList( vcl::Window* pParent ) : SvTreeListBox( pParent, WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT ) , mbIgnorePaint(false) , mpController(0) @@ -424,7 +424,7 @@ CustomAnimationList::CustomAnimationList( ::Window* pParent ) SetNodeDefaultImages(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCustomAnimationList( ::Window *pParent ) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCustomAnimationList( vcl::Window *pParent ) { return new CustomAnimationList( pParent ); } diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index b8d121df9423..a8a022e15020 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -46,7 +46,7 @@ class CustomAnimationList : public SvTreeListBox, public ISequenceListener friend struct stl_append_effect_func; public: - CustomAnimationList( ::Window* pParent ); + CustomAnimationList( vcl::Window* pParent ); virtual ~CustomAnimationList(); // methods diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 4e4fc858ce5b..e457476b51d6 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -146,7 +146,7 @@ void fillRepeatComboBox( ListBox* pBox ) pBox->SetEntryData( pBox->InsertEntry( aEndOfSlide ), (void*)((sal_Int32)-2) ); } -CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBase, +CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame, const Size& rMinSize ) : PanelLayout( pParent, "CustomAnimationsPanel", "modules/simpress/ui/customanimationspanel.ui", rxFrame ), @@ -2256,9 +2256,9 @@ void CustomAnimationPane::updatePathFromMotionPathTag( const rtl::Reference< Mot } } -::Window * createCustomAnimationPanel( ::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) +::vcl::Window * createCustomAnimationPanel( ::vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) { - ::Window* pWindow = 0; + ::vcl::Window* pWindow = 0; DrawDocShell* pDocSh = rBase.GetDocShell(); if( pDocSh ) diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index c8917a9e9838..0cbd137a1441 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -62,7 +62,7 @@ class CustomAnimationPane : public PanelLayout, public ICustomAnimationListContr { friend class MotionPathTag; public: - CustomAnimationPane( ::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame, const Size& rMinSize ); + CustomAnimationPane( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame, const Size& rMinSize ); virtual ~CustomAnimationPane(); // callbacks diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 36622c71ed48..d319e9ee4bc5 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -410,7 +410,7 @@ namespace sd // SlideTransitionPane SlideTransitionPane::SlideTransitionPane( - ::Window * pParent, + Window * pParent, ViewShellBase & rBase, const Size& rMinSize, SdDrawDocument* pDoc, @@ -1069,9 +1069,9 @@ IMPL_LINK_NOARG(SlideTransitionPane, LateInitCallback) return 0; } -::Window * createSlideTransitionPanel( ::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) +::vcl::Window * createSlideTransitionPanel( ::vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) { - ::Window* pWindow = 0; + ::vcl::Window* pWindow = 0; DrawDocShell* pDocSh = rBase.GetDocShell(); if( pDocSh ) diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx index 13ca6cd2aa15..a75ca210a19c 100644 --- a/sd/source/ui/animations/SlideTransitionPane.hxx +++ b/sd/source/ui/animations/SlideTransitionPane.hxx @@ -52,7 +52,7 @@ class SlideTransitionPane : public PanelLayout { public: explicit SlideTransitionPane( - ::Window * pParent, + Window * pParent, ViewShellBase & rBase, const Size& rMinSize, SdDrawDocument* pDoc, diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 33c8cb1f0ae0..21c703e7d6a5 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -903,7 +903,7 @@ IMPL_LINK(AnnotationManagerImpl,EventMultiplexerListener, return 0; } -void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation > xAnnotation, ::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu /* = false */ ) +void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation > xAnnotation, vcl::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu /* = false */ ) { SfxDispatcher* pDispatcher( getDispatcher( mrBase ) ); if( !pDispatcher ) diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index f81c76112fcd..61f6705072fe 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -78,7 +78,7 @@ public: void DeleteAnnotationsByAuthor( const OUString& sAuthor ); void DeleteAllAnnotations(); - void ExecuteAnnotationContextMenu( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, ::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu = false ); + void ExecuteAnnotationContextMenu( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, vcl::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu = false ); Color GetColorDark(sal_uInt16 aAuthorIndex); Color GetColorLight(sal_uInt16 aAuthorIndex); diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 8c22c8a62a9c..36aefb829c6a 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -301,7 +301,7 @@ bool AnnotationTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& /*rHdl*/ if( rMEvt.IsLeft() && !rMEvt.IsRight() ) { - Window* pWindow = mrView.GetViewShell()->GetActiveWindow(); + vcl::Window* pWindow = mrView.GetViewShell()->GetActiveWindow(); if( pWindow ) { maMouseDownPos = pWindow->PixelToLogic( rMEvt.GetPosPixel() ); @@ -371,7 +371,7 @@ bool AnnotationTag::Command( const CommandEvent& rCEvt ) { if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ) { - ::Window* pWindow = mrView.GetViewShell()->GetActiveWindow(); + vcl::Window* pWindow = mrView.GetViewShell()->GetActiveWindow(); if( pWindow ) { Rectangle aContextRect(rCEvt.GetMousePosPixel(),Size(1,1)); @@ -512,7 +512,7 @@ void AnnotationTag::select() mrManager.onTagSelected( *this ); - Window* pWindow = mrView.GetViewShell()->GetActiveWindow(); + vcl::Window* pWindow = mrView.GetViewShell()->GetActiveWindow(); if( pWindow ) { RealPoint2D aPosition( mxAnnotation->getPosition() ); @@ -585,7 +585,7 @@ void AnnotationTag::OpenPopup( bool bEdit ) if( !mpAnnotationWindow.get() ) { - ::Window* pWindow = dynamic_cast< ::Window* >( getView().GetFirstOutputDevice() ); + vcl::Window* pWindow = dynamic_cast< vcl::Window* >( getView().GetFirstOutputDevice() ); if( pWindow ) { RealPoint2D aPosition( mxAnnotation->getPosition() ); @@ -631,7 +631,7 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent*, pEvent) { if( pEvent != NULL ) { - ::Window* pWindow = pEvent->GetWindow(); + vcl::Window* pWindow = pEvent->GetWindow(); if( pWindow ) { diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx index 515d7b155a07..97dda94438db 100644 --- a/sd/source/ui/annotations/annotationtag.hxx +++ b/sd/source/ui/annotations/annotationtag.hxx @@ -82,10 +82,10 @@ private: std::auto_ptr<AnnotationWindow> mpAnnotationWindow; Color maColor; int mnIndex; - const vcl::Font& mrFont; + const ::vcl::Font& mrFont; Size maSize; ImplSVEvent * mnClosePopupEvent; - ::Window* mpListenWindow; + vcl::Window* mpListenWindow; Point maMouseDownPos; }; diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 336682484d44..47063aad5fc8 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -265,7 +265,7 @@ Selection AnnotationTextWindow::GetSurroundingTextSelection() const /************** AnnotationWindow***********************************++*/ -AnnotationWindow::AnnotationWindow( AnnotationManagerImpl& rManager, DrawDocShell* pDocShell, Window* pParent ) +AnnotationWindow::AnnotationWindow( AnnotationManagerImpl& rManager, DrawDocShell* pDocShell, vcl::Window* pParent ) : FloatingWindow(pParent, WB_SYSTEMWINDOW|WB_BORDER|WB_NEEDSFOCUS) , mrManager( rManager ) , mpDocShell( pDocShell ) @@ -724,7 +724,7 @@ void AnnotationWindow::MouseButtonDown( const MouseEvent& rMEvt ) { // context menu Rectangle aRect(LogicToPixel(maRectMetaButton.BottomLeft()),LogicToPixel(maRectMetaButton.BottomLeft())); - mrManager.ExecuteAnnotationContextMenu( mxAnnotation, (::Window*)this, aRect, true ); + mrManager.ExecuteAnnotationContextMenu( mxAnnotation, (vcl::Window*)this, aRect, true ); } } diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 1a7582b5d91a..b44525c493b2 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -100,7 +100,7 @@ class AnnotationWindow : public FloatingWindow DECL_LINK(ScrollHdl, ScrollBar*); public: - AnnotationWindow( AnnotationManagerImpl& rManager, DrawDocShell* pDocShell, ::Window* pParent ); + AnnotationWindow( AnnotationManagerImpl& rManager, DrawDocShell* pDocShell, vcl::Window* pParent ); virtual ~AnnotationWindow(); void StartEdit(); diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 12b5aa7b45cb..2ad2f2b13a94 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -709,7 +709,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) pViewShell->GetViewFrame()->GetBindings().InvalidateAll( true ); } -SfxTabPage* SdModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SdModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) { SfxTabPage* pRet = NULL; SfxAllItemSet aSet(*(rSet.GetPool())); diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index a086e5061fad..e5a4621571e9 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -66,7 +66,7 @@ namespace sd class LayoutToolbarMenu : public svtools::ToolbarMenu { public: - LayoutToolbarMenu( SlideLayoutController& rController, const Reference< XFrame >& xFrame, ::Window* pParent, const bool bInsertPage ); + LayoutToolbarMenu( SlideLayoutController& rController, const Reference< XFrame >& xFrame, vcl::Window* pParent, const bool bInsertPage ); virtual ~LayoutToolbarMenu(); protected: @@ -151,7 +151,7 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pIn pValue->SetSizePixel( pValue->CalcWindowSizePixel( aLayoutItemSize ) ); } -LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const Reference< XFrame >& xFrame, ::Window* pParent, const bool bInsertPage ) +LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const Reference< XFrame >& xFrame, vcl::Window* pParent, const bool bInsertPage ) : svtools::ToolbarMenu(xFrame, pParent, WB_CLIPCHILDREN ) , mrController( rController ) , mxFrame(xFrame) @@ -355,7 +355,7 @@ void SAL_CALL SlideLayoutController::initialize( const css::uno::Sequence< css:: } } -::Window* SlideLayoutController::createPopupWindow( ::Window* pParent ) +::vcl::Window* SlideLayoutController::createPopupWindow( ::vcl::Window* pParent ) { return new sd::LayoutToolbarMenu( *this, m_xFrame, pParent, mbInsertPage ); } diff --git a/sd/source/ui/controller/slidelayoutcontroller.hxx b/sd/source/ui/controller/slidelayoutcontroller.hxx index 3c6e91be113b..0104119dc45d 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.hxx +++ b/sd/source/ui/controller/slidelayoutcontroller.hxx @@ -32,7 +32,7 @@ public: const OUString& sCommandURL, bool bInsertPage ); - virtual ::Window* createPopupWindow( ::Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* createPopupWindow( vcl::Window* pParent ) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) diff --git a/sd/source/ui/dlg/AnimationChildWindow.cxx b/sd/source/ui/dlg/AnimationChildWindow.cxx index abe028c04a1b..e10e609783d6 100644 --- a/sd/source/ui/dlg/AnimationChildWindow.cxx +++ b/sd/source/ui/dlg/AnimationChildWindow.cxx @@ -34,7 +34,7 @@ SFX_IMPL_DOCKINGWINDOW_WITHID(AnimationChildWindow, SID_ANIMATION_OBJECTS) * Derivative from SfxChildWindow as "container" for animator */ AnimationChildWindow::AnimationChildWindow( - ::Window* _pParent, + vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index c12ff2a4bed8..b0e27296ce9f 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -44,7 +44,7 @@ namespace sd { /** * default constructor */ -LayerTabBar::LayerTabBar(DrawViewShell* pViewSh, Window* pParent) +LayerTabBar::LayerTabBar(DrawViewShell* pViewSh, vcl::Window* pParent) : TabBar( pParent, WinBits( WB_BORDER | WB_3DLOOK | WB_SCROLL ) ), DropTargetHelper( this ), pDrViewSh(pViewSh) diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx index 9145f0c3436b..3dd4c0188ef0 100644 --- a/sd/source/ui/dlg/NavigatorChildWindow.cxx +++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx @@ -46,7 +46,7 @@ void RequestNavigatorUpdate (SfxBindings* pBindings) } NavigatorChildWindow::NavigatorChildWindow ( - ::Window* pParent, + vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* ) diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index e113db903c33..7d6e75fc7078 100644 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -50,7 +50,7 @@ SFX_IMPL_DOCKINGWINDOW_WITHID(LeftPaneDrawChildWindow, SID_LEFT_PANE_DRAW) //===== PaneChildWindow ======================================================= PaneChildWindow::PaneChildWindow ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo, @@ -90,7 +90,7 @@ PaneChildWindow::~PaneChildWindow (void) //===== LeftPaneImpressChildWindow ============================================ LeftPaneImpressChildWindow::LeftPaneImpressChildWindow ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) @@ -108,7 +108,7 @@ LeftPaneImpressChildWindow::LeftPaneImpressChildWindow ( //===== LeftPaneDrawChildWindow =============================================== LeftPaneDrawChildWindow::LeftPaneDrawChildWindow ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index 4c960db514eb..cc2dd553bcc4 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -38,7 +38,7 @@ using ::sfx2::TitledDockingWindow; namespace sd { PaneDockingWindow::PaneDockingWindow( - SfxBindings *_pBindings, SfxChildWindow *pChildWindow, ::Window* pParent, + SfxBindings *_pBindings, SfxChildWindow *pChildWindow, vcl::Window* pParent, const ResId& rResId, const OUString& rsTitle ) :TitledDockingWindow( _pBindings, pChildWindow, pParent, rResId ) { @@ -95,7 +95,7 @@ void PaneDockingWindow::SetValidSizeRange (const Range aValidSizeRange) SplitWindow* pSplitWindow = dynamic_cast<SplitWindow*>(GetParent()); if (pSplitWindow != NULL) { - const sal_uInt16 nId (pSplitWindow->GetItemId(static_cast< ::Window*>(this))); + const sal_uInt16 nId (pSplitWindow->GetItemId(static_cast< vcl::Window*>(this))); const sal_uInt16 nSetId (pSplitWindow->GetSet(nId)); // Because the PaneDockingWindow paints its own decoration, we have // to compensate the valid size range for that. diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index eb2ee3ba6b4c..0815c6940a43 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -37,7 +37,7 @@ namespace sd OUString SdPhotoAlbumDialog::sDirUrl; -SdPhotoAlbumDialog::SdPhotoAlbumDialog(Window* pWindow, SdDrawDocument* pActDoc) +SdPhotoAlbumDialog::SdPhotoAlbumDialog(vcl::Window* pWindow, SdDrawDocument* pActDoc) : ModalDialog(pWindow, "PhotoAlbumCreatorDialog", "modules/simpress/ui/photoalbum.ui"), pDoc(pActDoc) { diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx index f0add4d9e77a..d97ae81c9a02 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx @@ -44,7 +44,7 @@ namespace sd class SdPhotoAlbumDialog : public ModalDialog { public: - SdPhotoAlbumDialog(Window* pWindow, SdDrawDocument* pActDoc); + SdPhotoAlbumDialog(vcl::Window* pWindow, SdDrawDocument* pActDoc); virtual ~SdPhotoAlbumDialog(); virtual short Execute() SAL_OVERRIDE; diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx index 63edf448475c..f9cd67cb8dad 100644 --- a/sd/source/ui/dlg/RemoteDialog.cxx +++ b/sd/source/ui/dlg/RemoteDialog.cxx @@ -17,7 +17,7 @@ using namespace ::sd; using namespace ::std; -RemoteDialog::RemoteDialog( Window *pWindow ) +RemoteDialog::RemoteDialog( vcl::Window *pWindow ) : ModalDialog(pWindow, "RemoteDialog", "modules/simpress/ui/remotedialog.ui") { diff --git a/sd/source/ui/dlg/RemoteDialog.hxx b/sd/source/ui/dlg/RemoteDialog.hxx index 27adf2bfe83f..7334c4bea548 100644 --- a/sd/source/ui/dlg/RemoteDialog.hxx +++ b/sd/source/ui/dlg/RemoteDialog.hxx @@ -31,7 +31,7 @@ private: DECL_DLLPRIVATE_LINK( HandleConnectButton, void * ); DECL_LINK( CloseHdl, void * ); public: - RemoteDialog( Window* pWindow ); + RemoteDialog( vcl::Window* pWindow ); }; } diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index 0377b7c5e659..2585668bb4b1 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -61,7 +61,7 @@ ClientRemovedListener::~ClientRemovedListener() // ClientBox -ClientBox::ClientBox( Window* pParent, WinBits nStyle ) : +ClientBox::ClientBox( vcl::Window* pParent, WinBits nStyle ) : Control( pParent, nStyle ), m_bHasScrollBar( false ), m_bHasActive( false ), @@ -108,7 +108,7 @@ ClientBox::ClientBox( Window* pParent, WinBits nStyle ) : Show(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeClientBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeClientBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index bcbf6214673d..c11a15b29c5e 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -135,7 +135,7 @@ class ClientBox: void checkIndex(sal_Int32 pos) const; public: - ClientBox( Window* pParent, WinBits nStyle ); + ClientBox( vcl::Window* pParent, WinBits nStyle ); virtual ~ClientBox(); void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx index 010aa4bac5ac..c535d04f6c60 100644 --- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx +++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx @@ -38,7 +38,7 @@ SFX_IMPL_CHILDWINDOW_WITHID(SpellDialogChildWindow, SID_SPELL_DIALOG) namespace sd { SpellDialogChildWindow::SpellDialogChildWindow ( - ::Window* _pParent, + vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index d39ef489a6d7..cb4f70bae1f6 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -57,7 +57,7 @@ namespace sd { /** * SdDisplay - Control */ -SdDisplay::SdDisplay( Window* pWin, SdResId Id ) : +SdDisplay::SdDisplay( vcl::Window* pWin, SdResId Id ) : Control( pWin, Id ), aScale( 1, 1 ) { @@ -123,7 +123,7 @@ void SdDisplay::DataChanged( const DataChangedEvent& rDCEvt ) * AnimationWindow - FloatingWindow */ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, - SfxChildWindow *pCW, Window* pParent, const SdResId& rSdResId ) : + SfxChildWindow *pCW, vcl::Window* pParent, const SdResId& rSdResId ) : SfxDockingWindow ( pInBindings, pCW, pParent, rSdResId ), aCtlDisplay ( this, SdResId( CTL_DISPLAY ) ), aBtnFirst ( this, SdResId( BTN_FIRST ) ), @@ -972,7 +972,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) void AnimationWindow::CreateAnimObj (::sd::View& rView ) { - ::Window* pOutWin = static_cast< ::Window*>(rView.GetFirstOutputDevice()); // GetWin( 0 ); + vcl::Window* pOutWin = static_cast< vcl::Window*>(rView.GetFirstOutputDevice()); // GetWin( 0 ); DBG_ASSERT( pOutWin, "Window does not exist!" ); // find window center diff --git a/sd/source/ui/dlg/assclass.cxx b/sd/source/ui/dlg/assclass.cxx index 3c17c2099320..e77375bb10a0 100644 --- a/sd/source/ui/dlg/assclass.cxx +++ b/sd/source/ui/dlg/assclass.cxx @@ -34,7 +34,7 @@ Assistent::Assistent(int nNoOfPages) mpPageStatus[i] = true; } -bool Assistent::InsertControl(int nDestPage,Window* pUsedControl) +bool Assistent::InsertControl(int nDestPage, ::vcl::Window* pUsedControl) { DBG_ASSERT( (nDestPage > 0) && (nDestPage <= mnPages), "Page not aviable!"); @@ -86,8 +86,8 @@ bool Assistent::GotoPage(const int nPageToGo) { int nIndex=mnCurrentPage-1; - std::vector<Window*>::iterator iter = maPages[nIndex].begin(); - std::vector<Window*>::iterator iterEnd = maPages[nIndex].end(); + std::vector<vcl::Window*>::iterator iter = maPages[nIndex].begin(); + std::vector<vcl::Window*>::iterator iterEnd = maPages[nIndex].end(); for(; iter != iterEnd; ++iter) { diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx index cebc2cc185b8..b596addfbc8b 100644 --- a/sd/source/ui/dlg/brkdlg.cxx +++ b/sd/source/ui/dlg/brkdlg.cxx @@ -39,7 +39,7 @@ namespace sd { */ BreakDlg::BreakDlg( - ::Window* pWindow, + vcl::Window* pWindow, DrawView* _pDrView, DrawDocShell* pShell, sal_uLong nSumActionCount, diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 33e41a5c8b67..56e865215205 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -40,7 +40,7 @@ namespace sd { #define TOKEN ';' -CopyDlg::CopyDlg(::Window* pWindow, const SfxItemSet& rInAttrs, +CopyDlg::CopyDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs, const XColorListRef &pColList, ::sd::View* pInView) : SfxModalDialog(pWindow, "DuplicateDialog", "modules/sdraw/ui/copydlg.ui") , mrOutAttrs(rInAttrs) diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 6a64869ece07..b5b9d933dffe 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -31,7 +31,7 @@ #include "svtools/treelistentry.hxx" // SdCustomShowDlg -SdCustomShowDlg::SdCustomShowDlg( Window* pWindow, +SdCustomShowDlg::SdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc ) : ModalDialog ( pWindow, "CustomSlideShows", "modules/simpress/ui/customslideshows.ui" ), rDoc ( rDrawDoc ), @@ -261,7 +261,7 @@ bool SdCustomShowDlg::IsCustomShow() const } // SdDefineCustomShowDlg -SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow, +SdDefineCustomShowDlg::SdDefineCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ) : ModalDialog ( pWindow, "DefineCustomSlideShow", "modules/simpress/ui/definecustomslideshow.ui" ), rDoc ( rDrawDoc ), diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index 674185f0305a..999c45e6e4d8 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star; SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlDiaPages, SfxUInt16Item ) // SdPagesField -SdPagesField::SdPagesField( Window* pParent, +SdPagesField::SdPagesField( vcl::Window* pParent, const uno::Reference< frame::XFrame >& rFrame, WinBits nBits ) : SvxMetricField ( pParent, rFrame, nBits ), @@ -132,7 +132,7 @@ void SdTbxCtlDiaPages::StateChanged( sal_uInt16, } } -Window* SdTbxCtlDiaPages::CreateItemWindow( Window* pParent ) +vcl::Window* SdTbxCtlDiaPages::CreateItemWindow( vcl::Window* pParent ) { return new SdPagesField( pParent, m_xFrame ); } diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 0e7f4d39263b..dfbab91b5147 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -92,7 +92,7 @@ public: class NextButton { public: - NextButton (::Window* pParent); + NextButton (vcl::Window* pParent); void ForceFocusEventBroadcast (void); void SetClickHdl (const Link& rLink); @@ -108,7 +108,7 @@ private: class AssistentDlgImpl : public SfxListener { public: - AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, bool bAutoPilot ); + AssistentDlgImpl( vcl::Window* pWindow, const Link& rFinishLink, bool bAutoPilot ); virtual ~AssistentDlgImpl(); /// Local mutex used to serialize concurrent method calls. @@ -159,7 +159,7 @@ public: */ bool mbPreviewUpdating; - ::Window* mpWindow; + vcl::Window* mpWindow; void SavePassword( SfxObjectShellLock xDoc, const OUString& rPath ); void RestorePassword( SfxItemSet* pSet, const OUString& rPath ); @@ -318,7 +318,7 @@ public: }; -AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, bool bAutoPilot ) : +AssistentDlgImpl::AssistentDlgImpl( vcl::Window* pWindow, const Link& rFinishLink, bool bAutoPilot ) : mpTemplateRegion(NULL), mpLayoutRegion(NULL), mbUserDataDirty(false), @@ -1449,7 +1449,7 @@ void AssistentDlgImpl::UpdatePreview( bool bDocPreview ) { CloseDocShell(); - ::Window *pParent = Application::GetDefDialogParent(); + vcl::Window *pParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( mpWindow ); SfxErrorContext eEC(ERRCTX_SFX_LOADTEMPLATE,mpWindow); @@ -1495,7 +1495,7 @@ void AssistentDlgImpl::UpdatePreview( bool bDocPreview ) SfxObjectShellLock xLayoutDocShell; SfxErrorContext eEC(ERRCTX_SFX_LOADTEMPLATE,mpWindow); - ::Window *pParent = Application::GetDefDialogParent(); + vcl::Window *pParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( mpWindow ); if(IsOwnFormat(aLayoutFile)) @@ -1721,7 +1721,7 @@ Image AssistentDlgImpl::GetUiIconForCommand (const OUString& sCommandURL) return aIcon; } -AssistentDlg::AssistentDlg(Window* pParent, bool bAutoPilot) : +AssistentDlg::AssistentDlg(vcl::Window* pParent, bool bAutoPilot) : ModalDialog(pParent, "Assistent", "modules/simpress/ui/assistentdialog.ui") { Link aFinishLink = LINK(this,AssistentDlg, FinishHdl); @@ -1826,7 +1826,7 @@ uno::Sequence< beans::NamedValue > AssistentDlg::GetPassword() //===== NextButton ============================================================ -NextButton::NextButton (::Window* pParent) : +NextButton::NextButton (vcl::Window* pParent) : mbIsFirstButtonActive(true) { AssistentDlg* assDlg = static_cast<AssistentDlg*>(pParent); diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index 1c11c3d3f23c..a2fe444d0b79 100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -32,7 +32,7 @@ #include "dlgassim.hxx" SdPageListControl::SdPageListControl( - ::Window* pParent, + vcl::Window* pParent, const WinBits nStyle ) : SvTreeListBox(pParent, nStyle) { @@ -49,7 +49,7 @@ SdPageListControl::SdPageListControl( SetCheckButtonHdl( LINK(this,SdPageListControl,CheckButtonClickHdl) ); } -extern "C" SAL_DLLPUBLIC_EXPORT ::Window* SAL_CALL makeSdPageListControl(::Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSdPageListControl(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index bb9681332366..8e966f856323 100644 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx @@ -35,7 +35,7 @@ private: void InsertTitle( SvTreeListEntry* pEntry, const OUString& rTitle ); public: - SdPageListControl( Window* pParent, const WinBits nStyle ); + SdPageListControl( vcl::Window* pParent, const WinBits nStyle ); virtual ~SdPageListControl(); void Fill( SdDrawDocument* pDoc ); diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx index b51394abbfdc..5b23fe32e35c 100644 --- a/sd/source/ui/dlg/dlgchar.cxx +++ b/sd/source/ui/dlg/dlgchar.cxx @@ -31,7 +31,7 @@ /** * Constructor of tab dialog: append pages to dialog */ -SdCharDlg::SdCharDlg( Window* pParent, const SfxItemSet* pAttr, +SdCharDlg::SdCharDlg( vcl::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell ) : SfxTabDialog ( pParent ,"DrawCharDialog" diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx index e0fcd2192cb3..568254163ad3 100644 --- a/sd/source/ui/dlg/dlgctrls.cxx +++ b/sd/source/ui/dlg/dlgctrls.cxx @@ -33,7 +33,7 @@ struct FadeEffectLBImpl std::vector< TransitionPresetPtr > maPresets; }; -FadeEffectLB::FadeEffectLB(Window* pParent, WinBits nStyle) +FadeEffectLB::FadeEffectLB(vcl::Window* pParent, WinBits nStyle) : ListBox(pParent, nStyle) , mpImpl(new FadeEffectLBImpl) { @@ -67,7 +67,7 @@ void FadeEffectLB::Fill() SelectEntryPos(0); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFadeEffectLB(Window* pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFadeEffectLB(vcl::Window* pParent, VclBuilder::stringmap &rMap) { WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK; diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index d79043d75367..575dfe57b892 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -38,7 +38,7 @@ /** * dialog to edit field commands */ -SdModifyFieldDlg::SdModifyFieldDlg( Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) : +SdModifyFieldDlg::SdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) : ModalDialog ( pWindow, "EditFieldsDialog", "modules/simpress/ui/dlgfield.ui" ), maInputSet ( rSet ), pField ( pInField ) diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index 4db3a43b5ee5..ab1ea95b6cde 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -48,7 +48,7 @@ namespace sd { * Constructor of tab dialog: append pages to the dialog */ OutlineBulletDlg::OutlineBulletDlg( - ::Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) : SfxTabDialog( pParent, "BulletsAndNumberingDialog", diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index e2be23d53f10..347b572038c8 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -33,7 +33,7 @@ /** * Constructor of tab dialog: appends pages to the dialog */ -SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, bool bAreaPage ) : +SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, const SfxItemSet* pAttr, bool bAreaPage ) : SfxTabDialog ( pParent ,"DrawPageDialog" ,"modules/sdraw/ui/drawpagedialog.ui" diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index eaaf2ccf8bdb..ee8548f07c6a 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -32,7 +32,7 @@ * dialog to adjust grid (scarcely ESO!) */ SdSnapLineDlg::SdSnapLineDlg( - ::Window* pWindow, + vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) : ModalDialog(pWindow, "SnapObjectDialog", "modules/sdraw/ui/dlgsnap.ui") diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 301cc708148b..591e6322f8b9 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -61,7 +61,7 @@ void SdDocPreviewWin::SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage updateViewSettings(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSdDocPreviewWin(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSdDocPreviewWin(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; @@ -72,7 +72,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSdDocPreviewWin(Window *pPa return new SdDocPreviewWin(pParent, nWinStyle); } -SdDocPreviewWin::SdDocPreviewWin( Window* pParent, const WinBits nStyle ) +SdDocPreviewWin::SdDocPreviewWin( vcl::Window* pParent, const WinBits nStyle ) : Control(pParent, nStyle), pMetaFile( 0 ), bInEffect(false), mpObj(NULL), mnShowPage(0) { SetBorderStyle( WINDOW_BORDER_MONO ); diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index 195d5d3dce0c..7cbbb8d69400 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -59,7 +59,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlGlueEscDir, SfxUInt16Item ) /** * Constructor for glue point escape direction Listbox */ -GlueEscDirLB::GlueEscDirLB( Window* pParent, const Reference< XFrame >& rFrame ) : +GlueEscDirLB::GlueEscDirLB( vcl::Window* pParent, const Reference< XFrame >& rFrame ) : ListBox( pParent, WinBits( WB_BORDER | WB_DROPDOWN ) ), m_xFrame( rFrame ) { @@ -160,7 +160,7 @@ void SdTbxCtlGlueEscDir::StateChanged( sal_uInt16 nSId, SfxToolBoxControl::StateChanged( nSId, eState, pState ); } -Window* SdTbxCtlGlueEscDir::CreateItemWindow( Window *pParent ) +vcl::Window* SdTbxCtlGlueEscDir::CreateItemWindow( vcl::Window *pParent ) { if( GetSlotId() == SID_GLUE_ESCDIR ) { diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 6fb37a750e8e..b3c7a836fe16 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -74,7 +74,7 @@ private: void Paint( OutputDevice& aOut, SdrTextObj* pObj, bool bVisible, bool bDotted = false ); public: - PresLayoutPreview( ::Window* pParent ); + PresLayoutPreview( vcl::Window* pParent ); virtual ~PresLayoutPreview(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -153,7 +153,7 @@ private: void GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet, SdPage* pPage ); public: - HeaderFooterTabPage( ::Window* pParent, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ); + HeaderFooterTabPage( vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ); virtual ~HeaderFooterTabPage(); void init( const HeaderFooterSettings& rSettings, bool bNotOnTitle ); @@ -165,7 +165,7 @@ public: using namespace ::sd; -HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) : +HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) : TabDialog ( pParent, "HeaderFooterDialog", "modules/simpress/ui/headerfooterdialog.ui" ), mpDoc( pDoc ), mpCurrentPage( pCurrentPage ), @@ -389,7 +389,7 @@ void HeaderFooterDialog::change( SdUndoGroup* pUndoGroup, SdPage* pPage, const H pPage->setHeaderFooterSettings( rNewSettings ); } -HeaderFooterTabPage::HeaderFooterTabPage( ::Window* pWindow, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ) : +HeaderFooterTabPage::HeaderFooterTabPage( vcl::Window* pWindow, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ) : TabPage( pWindow, "HeaderFooterTab", "modules/simpress/ui/headerfootertab.ui" ), mpDoc(pDoc), mbHandoutMode( bHandoutMode ) @@ -671,13 +671,13 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo } } -PresLayoutPreview::PresLayoutPreview( ::Window* pParent ) +PresLayoutPreview::PresLayoutPreview( vcl::Window* pParent ) : Control(pParent) , mpMaster(NULL) { } -extern "C" SAL_DLLPUBLIC_EXPORT ::Window* SAL_CALL makePresLayoutPreview( ::Window *pParent, VclBuilder::stringmap & ) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makePresLayoutPreview( vcl::Window *pParent, VclBuilder::stringmap & ) { return new PresLayoutPreview( pParent ); } diff --git a/sd/source/ui/dlg/ins_paste.cxx b/sd/source/ui/dlg/ins_paste.cxx index acf843651910..a256990697e0 100644 --- a/sd/source/ui/dlg/ins_paste.cxx +++ b/sd/source/ui/dlg/ins_paste.cxx @@ -19,7 +19,7 @@ #include "ins_paste.hxx" -SdInsertPasteDlg::SdInsertPasteDlg(Window* pWindow) +SdInsertPasteDlg::SdInsertPasteDlg(vcl::Window* pWindow) : ModalDialog( pWindow, "InsertSlidesDialog", "modules/simpress/ui/insertslides.ui") { diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index afd20fdf28dd..a78812f516df 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -27,7 +27,7 @@ #include "ViewShell.hxx" SdInsertPagesObjsDlg::SdInsertPagesObjsDlg( - ::Window* pWindow, const SdDrawDocument* pInDoc, + vcl::Window* pWindow, const SdDrawDocument* pInDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) : ModalDialog(pWindow, "InsertSlidesDialog", "modules/sdraw/ui/insertslidesdialog.ui") diff --git a/sd/source/ui/dlg/layeroptionsdlg.cxx b/sd/source/ui/dlg/layeroptionsdlg.cxx index 8915aacaf0f0..fbf030fd0881 100644 --- a/sd/source/ui/dlg/layeroptionsdlg.cxx +++ b/sd/source/ui/dlg/layeroptionsdlg.cxx @@ -25,7 +25,7 @@ #include "sdresid.hxx" #include "layeroptionsdlg.hxx" -SdInsertLayerDlg::SdInsertLayerDlg( Window* pWindow, const SfxItemSet& rInAttrs, +SdInsertLayerDlg::SdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& rStr ) : ModalDialog(pWindow, "InsertLayerDialog", "modules/sdraw/ui/insertlayer.ui") , mrOutAttrs(rInAttrs) diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx index eb4e4fddef5a..d9e525f39a2f 100644 --- a/sd/source/ui/dlg/masterlayoutdlg.cxx +++ b/sd/source/ui/dlg/masterlayoutdlg.cxx @@ -28,7 +28,7 @@ using namespace ::sd; -MasterLayoutDialog::MasterLayoutDialog( Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) +MasterLayoutDialog::MasterLayoutDialog( vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) : ModalDialog(pParent, "MasterLayoutDialog", "modules/simpress/ui/masterlayoutdlg.ui") , mpDoc(pDoc) , mpCurrentPage(pCurrentPage) diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index 301ef799fcfb..53796eab4c87 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -34,7 +34,7 @@ using namespace com::sun::star; namespace sd { -MorphDlg::MorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2 ) +MorphDlg::MorphDlg( vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2 ) : ModalDialog(pParent, "CrossFadeDialog", "modules/sdraw/ui/crossfadedialog.ui") { diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 12cae5bbc49d..34d3c48c8a92 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -62,12 +62,12 @@ static const sal_uInt16 nShowAllShapesFilter=2; * SdNavigatorWin - FloatingWindow */ SdNavigatorWin::SdNavigatorWin( - ::Window* pParent, + vcl::Window* pParent, ::sd::NavigatorChildWindow* pChWinCtxt, const SdResId& rSdResId, SfxBindings* pInBindings, const UpdateRequestFunctor& rUpdateRequest) - : ::Window( pParent, rSdResId ) + : vcl::Window( pParent, rSdResId ) , maToolbox ( this, SdResId( 1 ) ) , maTlbObjects( this, SdResId( TLB_OBJECTS ) ) , maLbDocs ( this, SdResId( LB_DOCS ) ) @@ -407,7 +407,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl) if ( pCurSh ) { - Window* pShellWnd = pCurSh->GetWindow(); + vcl::Window* pShellWnd = pCurSh->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); } diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index b571cbbf83ff..d87c3d615a6e 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -37,10 +37,10 @@ class SdParagraphNumTabPage : public SfxTabPage { public: - SdParagraphNumTabPage(Window* pParent, const SfxItemSet& rSet ); + SdParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SdParagraphNumTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -55,7 +55,7 @@ private: DECL_LINK( ImplNewStartHdl, void* ); }; -SdParagraphNumTabPage::SdParagraphNumTabPage(Window* pParent, const SfxItemSet& rAttr ) +SdParagraphNumTabPage::SdParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rAttr ) : SfxTabPage(pParent, "DrawParaNumbering", "modules/sdraw/ui/paranumberingtab.ui", @@ -74,7 +74,7 @@ SdParagraphNumTabPage::~SdParagraphNumTabPage() { } -SfxTabPage* SdParagraphNumTabPage::Create(Window *pParent, const SfxItemSet * rAttrSet) +SfxTabPage* SdParagraphNumTabPage::Create(vcl::Window *pParent, const SfxItemSet * rAttrSet) { return new SdParagraphNumTabPage( pParent, *rAttrSet ); } @@ -153,7 +153,7 @@ IMPL_LINK_NOARG(SdParagraphNumTabPage, ImplNewStartHdl) return 0; } -SdParagraphDlg::SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr ) +SdParagraphDlg::SdParagraphDlg( vcl::Window* pParent, const SfxItemSet* pAttr ) : SfxTabDialog( pParent, "DrawParagraphPropertiesDialog", "modules/sdraw/ui/drawparadialog.ui", diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index 0ab868f88990..a39d7e4a9110 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; -SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, +SdStartPresentationDlg::SdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) : ModalDialog ( pWindow, "PresentationDialog", "modules/simpress/ui/presentationdialog.ui" ), diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 428a98c0e494..ceafcc5a4ea3 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -49,7 +49,7 @@ * Constructor of Tab dialog: appends pages to the dialog */ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, - Window* pParent, + vcl::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects _ePO, diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index e886dbc83996..1be0be54e5f6 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -28,7 +28,7 @@ /** * dialog to adjust print options */ -SdPrintOptions::SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs ) : +SdPrintOptions::SdPrintOptions( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SfxTabPage ( pParent, "prntopts" , "modules/simpress/ui/prntopts.ui" , &rInAttrs ), rOutAttrs ( rInAttrs ) { @@ -182,7 +182,7 @@ void SdPrintOptions::Reset( const SfxItemSet* rAttrs ) ClickBookletHdl( NULL ); } -SfxTabPage* SdPrintOptions::Create( Window* pWindow, +SfxTabPage* SdPrintOptions::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return( new SdPrintOptions( pWindow, *rOutAttrs ) ); diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 8ea43f36e032..cd9e452b61c3 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -279,9 +279,9 @@ bool AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const return pDlg->IsInsertBefore(); } -::Window* AbstractSdInsertPagesObjsDlg_Impl::GetWindow() +::vcl::Window* AbstractSdInsertPagesObjsDlg_Impl::GetWindow() { - return (::Window*)pDlg; + return (vcl::Window*)pDlg; } std::vector<OUString> AbstractSdInsertPagesObjsDlg_Impl::GetList(const sal_uInt16 nType) @@ -372,7 +372,7 @@ void AbstractHeaderFooterDialog_Impl::Cancel() //-------------- SdAbstractDialogFactory implementation-------------- VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateBreakDlg( - ::Window* pWindow, + vcl::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, @@ -382,110 +382,110 @@ VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateBreakDlg( } AbstractCopyDlg * SdAbstractDialogFactory_Impl::CreateCopyDlg( - ::Window* pWindow, const SfxItemSet& rInAttrs, + vcl::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) { return new AbstractCopyDlg_Impl( new ::sd::CopyDlg( pWindow, rInAttrs, pColTab, pView ) ); } -AbstractSdCustomShowDlg * SdAbstractDialogFactory_Impl::CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) +AbstractSdCustomShowDlg * SdAbstractDialogFactory_Impl::CreateSdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc ) { return new AbstractSdCustomShowDlg_Impl( new SdCustomShowDlg( pWindow, rDrawDoc ) ); } -SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) +SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabCharDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) { return new SdAbstractTabDialog_Impl( new SdCharDlg( pParent, pAttr, pDocShell ) ); } -SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage ) +SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage ) { return new SdAbstractTabDialog_Impl( new SdPageDlg( pDocShell, pParent, pAttr, bAreaPage ) ); } -AbstractAssistentDlg * SdAbstractDialogFactory_Impl::CreateAssistentDlg( ::Window* pParent, bool bAutoPilot) +AbstractAssistentDlg * SdAbstractDialogFactory_Impl::CreateAssistentDlg( vcl::Window* pParent, bool bAutoPilot) { return new AbstractAssistentDlg_Impl( new AssistentDlg( pParent, bAutoPilot ) ); } -AbstractSdModifyFieldDlg * SdAbstractDialogFactory_Impl::CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) +AbstractSdModifyFieldDlg * SdAbstractDialogFactory_Impl::CreateSdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) { return new AbstractSdModifyFieldDlg_Impl( new SdModifyFieldDlg( pWindow, pInField, rSet ) ); } -AbstractSdSnapLineDlg * SdAbstractDialogFactory_Impl::CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) +AbstractSdSnapLineDlg * SdAbstractDialogFactory_Impl::CreateSdSnapLineDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) { return new AbstractSdSnapLineDlg_Impl( new SdSnapLineDlg( pWindow, rInAttrs, pView ) ); } -AbstractSdInsertLayerDlg * SdAbstractDialogFactory_Impl::CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) +AbstractSdInsertLayerDlg * SdAbstractDialogFactory_Impl::CreateSdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) { return new AbstractSdInsertLayerDlg_Impl( new SdInsertLayerDlg( pWindow, rInAttrs, bDeletable, aStr ) ); } -AbstractSdInsertPasteDlg * SdAbstractDialogFactory_Impl::CreateSdInsertPasteDlg( ::Window* pWindow ) +AbstractSdInsertPasteDlg * SdAbstractDialogFactory_Impl::CreateSdInsertPasteDlg( vcl::Window* pWindow ) { return new AbstractSdInsertPasteDlg_Impl( new SdInsertPasteDlg( pWindow ) ); } -AbstractSdInsertPagesObjsDlg * SdAbstractDialogFactory_Impl::CreateSdInsertPagesObjsDlg( ::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) +AbstractSdInsertPagesObjsDlg * SdAbstractDialogFactory_Impl::CreateSdInsertPagesObjsDlg( vcl::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) { return new AbstractSdInsertPagesObjsDlg_Impl( new SdInsertPagesObjsDlg( pParent, pDoc, pSfxMedium, rFileName ) ); } -AbstractMorphDlg * SdAbstractDialogFactory_Impl::CreateMorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) +AbstractMorphDlg * SdAbstractDialogFactory_Impl::CreateMorphDlg( vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) { return new AbstractMorphDlg_Impl( new ::sd::MorphDlg( pParent, pObj1, pObj2 ) ); } -SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdOutlineBulletTabDlg( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) +SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdOutlineBulletTabDlg( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) { return new AbstractBulletDialog_Impl( new ::sd::OutlineBulletDlg( pParent, pAttr, pView ) ); } -SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdParagraphTabDlg( ::Window* pParent, const SfxItemSet* pAttr ) +SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdParagraphTabDlg( vcl::Window* pParent, const SfxItemSet* pAttr ) { return new SdAbstractTabDialog_Impl( new SdParagraphDlg( pParent, pAttr ) ); } -AbstractSdStartPresDlg * SdAbstractDialogFactory_Impl::CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, +AbstractSdStartPresDlg * SdAbstractDialogFactory_Impl::CreateSdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) { return new AbstractSdStartPresDlg_Impl( new SdStartPresentationDlg( pWindow, rInAttrs, rPageNames, pCSList ) ); } -VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateRemoteDialog( ::Window* pWindow ) +VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateRemoteDialog( vcl::Window* pWindow ) { return new SdVclAbstractDialog_Impl( new ::sd::RemoteDialog( pWindow ) ); } -SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) +SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) { return new SdPresLayoutTemplateDlg_Impl( new SdPresLayoutTemplateDlg( pDocSh, pParent, DlgId, rStyleBase, ePO, pSSPool ) ); } -AbstractSdPresLayoutDlg * SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::Window* pWindow, const SfxItemSet& rInAttrs) +AbstractSdPresLayoutDlg * SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, vcl::Window* pWindow, const SfxItemSet& rInAttrs) { return new AbstractSdPresLayoutDlg_Impl( new SdPresLayoutDlg( pDocShell, pWindow, rInAttrs ) ); } -SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) +SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabTemplateDlg( vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) { return new SdAbstractTabDialog_Impl( new SdTabTemplateDlg( pParent, pDocShell, rStyleBase, pModel, pView ) ); } -SfxAbstractDialog* SdAbstractDialogFactory_Impl::CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) +SfxAbstractDialog* SdAbstractDialogFactory_Impl::CreatSdActionDialog( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) { return new SdAbstractSfxDialog_Impl( new SdActionDlg( pParent, pAttr, pView ) ); } -AbstractSdVectorizeDlg * SdAbstractDialogFactory_Impl::CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) +AbstractSdVectorizeDlg * SdAbstractDialogFactory_Impl::CreateSdVectorizeDlg( vcl::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) { return new AbstractSdVectorizeDlg_Impl( new SdVectorizeDlg( pParent, rBmp, pDocShell ) ); } -AbstractSdPublishingDlg * SdAbstractDialogFactory_Impl::CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType) +AbstractSdPublishingDlg * SdAbstractDialogFactory_Impl::CreateSdPublishingDlg( vcl::Window* pWindow, DocumentType eDocType) { return new AbstractSdPublishingDlg_Impl( new SdPublishingDlg( pWindow, eDocType ) ); } @@ -511,19 +511,19 @@ CreateTabPage SdAbstractDialogFactory_Impl::GetSdOptionsSnapTabPageCreatorFunc() return SdTpOptionsSnap::Create; } -VclAbstractDialog* SdAbstractDialogFactory_Impl::CreateMasterLayoutDialog( ::Window* pParent, +VclAbstractDialog* SdAbstractDialogFactory_Impl::CreateMasterLayoutDialog( vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) { return new SdVclAbstractDialog_Impl( new ::sd::MasterLayoutDialog( pParent, pDoc, pCurrentPage )); } AbstractHeaderFooterDialog* SdAbstractDialogFactory_Impl::CreateHeaderFooterDialog( ViewShell* pViewShell, - ::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) + vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) { return new AbstractHeaderFooterDialog_Impl( new ::sd::HeaderFooterDialog( (::sd::ViewShell*)pViewShell, pParent, pDoc, pCurrentPage )); } -VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateSdPhotoAlbumDialog( ::Window* pWindow, SdDrawDocument* pDoc ) +VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateSdPhotoAlbumDialog( vcl::Window* pWindow, SdDrawDocument* pDoc ) { return new SdVclAbstractDialog_Impl( new ::sd::SdPhotoAlbumDialog( pWindow, pDoc ) ); } diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 15b91e11f1b0..cc146f645fcb 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -165,7 +165,7 @@ class SdInsertPagesObjsDlg; class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg { DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg) - virtual ::Window * GetWindow() SAL_OVERRIDE; + virtual vcl::Window * GetWindow() SAL_OVERRIDE; virtual std::vector<OUString> GetList ( const sal_uInt16 nType ) SAL_OVERRIDE; virtual bool IsLink() SAL_OVERRIDE; virtual bool IsRemoveUnnessesaryMasterPages() const SAL_OVERRIDE; @@ -231,38 +231,38 @@ class SdAbstractDialogFactory_Impl : public SdAbstractDialogFactory public: virtual ~SdAbstractDialogFactory_Impl() {} - virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) SAL_OVERRIDE; - virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) SAL_OVERRIDE; - virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage = true ) SAL_OVERRIDE; - virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, bool bAutoPilot) SAL_OVERRIDE; - virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) SAL_OVERRIDE; - virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) SAL_OVERRIDE; - virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( ::Window* pWindow ) SAL_OVERRIDE; - virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( ::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) SAL_OVERRIDE; - virtual AbstractMorphDlg* CreateMorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ) SAL_OVERRIDE; - virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, + virtual VclAbstractDialog* CreateBreakDlg(vcl::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) SAL_OVERRIDE; + virtual AbstractCopyDlg* CreateCopyDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) SAL_OVERRIDE; + virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc ) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSdTabCharDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSdTabPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage = true ) SAL_OVERRIDE; + virtual AbstractAssistentDlg* CreateAssistentDlg( vcl::Window* pParent, bool bAutoPilot) SAL_OVERRIDE; + virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) SAL_OVERRIDE; + virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) SAL_OVERRIDE; + virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( vcl::Window* pWindow ) SAL_OVERRIDE; + virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( vcl::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) SAL_OVERRIDE; + virtual AbstractMorphDlg* CreateMorphDlg( vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( vcl::Window* pParent, const SfxItemSet* pAttr ) SAL_OVERRIDE; + virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateRemoteDialog( ::Window* pWindow ) SAL_OVERRIDE; // ad for RemoteDialog - virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) SAL_OVERRIDE; - virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::Window* pWindow, const SfxItemSet& rInAttrs) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) SAL_OVERRIDE; - virtual SfxAbstractDialog* CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) SAL_OVERRIDE; - virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) SAL_OVERRIDE; - virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateRemoteDialog( vcl::Window* pWindow ) SAL_OVERRIDE; // ad for RemoteDialog + virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) SAL_OVERRIDE; + virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, vcl::Window* pWindow, const SfxItemSet& rInAttrs) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) SAL_OVERRIDE; + virtual SfxAbstractDialog* CreatSdActionDialog( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) SAL_OVERRIDE; + virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( vcl::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) SAL_OVERRIDE; + virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( vcl::Window* pWindow, DocumentType eDocType) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateSdPhotoAlbumDialog( ::Window* pWindow, SdDrawDocument* pDoc) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateSdPhotoAlbumDialog( vcl::Window* pWindow, SdDrawDocument* pDoc) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateMasterLayoutDialog( ::Window* pParent, + virtual VclAbstractDialog* CreateMasterLayoutDialog( vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* ) SAL_OVERRIDE; virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell, - ::Window* pParent, + vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) SAL_OVERRIDE; diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index 13c92f49f622..6f0bc81600fa 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -32,7 +32,7 @@ #include <boost/scoped_ptr.hpp> SdPresLayoutDlg::SdPresLayoutDlg(::sd::DrawDocShell* pDocShell, - ::Window* pWindow, const SfxItemSet& rInAttrs) + vcl::Window* pWindow, const SfxItemSet& rInAttrs) : ModalDialog(pWindow, "SlideDesignDialog", "modules/simpress/ui/slidedesigndialog.ui") , mpDocSh(pDocShell) diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 6836212831d0..e8dee4a407b8 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -97,7 +97,7 @@ SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable( { } -extern "C" SAL_DLLPUBLIC_EXPORT ::Window* SAL_CALL makeSdPageObjsTLB(::Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSdPageObjsTLB(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -191,7 +191,7 @@ sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::GetListBoxDropFormatId (void) return mnListBoxDropFormatId; } -SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId ) +SdPageObjsTLB::SdPageObjsTLB( vcl::Window* pParentWin, const SdResId& rSdResId ) : SvTreeListBox ( pParentWin, rSdResId ) , bisInSdNavigatorWin ( false ) , mpParent ( pParentWin ) @@ -222,7 +222,7 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId ) SV_DRAGDROP_APP_MOVE | SV_DRAGDROP_APP_COPY | SV_DRAGDROP_APP_DROP ); } -SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, WinBits nStyle ) +SdPageObjsTLB::SdPageObjsTLB( vcl::Window* pParentWin, WinBits nStyle ) : SvTreeListBox ( pParentWin, nStyle ) , bisInSdNavigatorWin ( false ) , mpParent ( pParentWin ) @@ -601,11 +601,11 @@ void SdPageObjsTLB::AddShapeList ( bool bMarked=false; if(bisInSdNavigatorWin) { - Window* pWindow=NULL; + vcl::Window* pWindow=NULL; SdNavigatorWin* pSdNavigatorWin=NULL; sd::DrawDocShell* pSdDrawDocShell = NULL; if(pEntry) - pWindow=(Window*)GetParent(pEntry); + pWindow=(vcl::Window*)GetParent(pEntry); if(pWindow) pSdNavigatorWin = (SdNavigatorWin*)pWindow; if( pSdNavigatorWin ) @@ -644,11 +644,11 @@ void SdPageObjsTLB::AddShapeList ( if(bisInSdNavigatorWin) { - Window* pWindow=NULL; + vcl::Window* pWindow=NULL; SdNavigatorWin* pSdNavigatorWin=NULL; sd::DrawDocShell* pSdDrawDocShell = NULL; if(pNewEntry) - pWindow=(Window*)GetParent(pNewEntry); + pWindow=(vcl::Window*)GetParent(pNewEntry); if(pWindow) pSdNavigatorWin = (SdNavigatorWin*)pWindow; if( pSdNavigatorWin ) @@ -678,11 +678,11 @@ void SdPageObjsTLB::AddShapeList ( if(bisInSdNavigatorWin) { - Window* pWindow=NULL; + vcl::Window* pWindow=NULL; SdNavigatorWin* pSdNavigatorWin=NULL; sd::DrawDocShell* pSdDrawDocShell = NULL; if(pNewEntry) - pWindow=(Window*)GetParent(pNewEntry); + pWindow=(vcl::Window*)GetParent(pNewEntry); if(pWindow) pSdNavigatorWin = (SdNavigatorWin*)pWindow; if( pSdNavigatorWin ) @@ -727,11 +727,11 @@ void SdPageObjsTLB::AddShapeList ( if(bisInSdNavigatorWin) { - Window* pWindow=NULL; + vcl::Window* pWindow=NULL; SdNavigatorWin* pSdNavigatorWin=NULL; sd::DrawDocShell* pSdDrawDocShell = NULL; if(pNewEntry) - pWindow=(Window*)GetParent(pNewEntry); + pWindow=(vcl::Window*)GetParent(pNewEntry); if(pWindow) pSdNavigatorWin = (SdNavigatorWin*)pWindow; if( pSdNavigatorWin ) diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index f8b5c2ea57da..4d633580d476 100644 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -45,7 +45,7 @@ /** * Constructor of the Tab dialog: appends pages to the dialog */ -SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent, +SdTabTemplateDlg::SdTabTemplateDlg( vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 38ebfe206e44..be80813b5957 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -76,7 +76,7 @@ using namespace com::sun::star::lang; * Constructor of the Tab dialog: appends the pages to the dialog */ SdActionDlg::SdActionDlg ( - ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) + vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) : SfxSingleTabDialog(pParent, *pAttr, "InteractionDialog", "modules/simpress/ui/interactiondialog.ui") , rOutAttrs(*pAttr) @@ -95,7 +95,7 @@ SdActionDlg::SdActionDlg ( /** * Action-TabPage */ -SdTPAction::SdTPAction(Window* pWindow, const SfxItemSet& rInAttrs) +SdTPAction::SdTPAction(vcl::Window* pWindow, const SfxItemSet& rInAttrs) : SfxTabPage(pWindow, "InteractionPage", "modules/simpress/ui/interactionpage.ui", &rInAttrs) , rOutAttrs(rInAttrs) @@ -358,7 +358,7 @@ int SdTPAction::DeactivatePage( SfxItemSet* pPageSet ) return( LEAVE_PAGE ); } -SfxTabPage* SdTPAction::Create( Window* pWindow, +SfxTabPage* SdTPAction::Create( vcl::Window* pWindow, const SfxItemSet& rAttrs ) { return( new SdTPAction( pWindow, rAttrs ) ); @@ -410,7 +410,7 @@ void SdTPAction::OpenFileDialog() } else if (bMacro) { - Window* pOldWin = Application::GetDefDialogParent(); + vcl::Window* pOldWin = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); // choose macro dialog diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index d80266fcef0b..82a12dc8f6c0 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -SdTpOptionsSnap::SdTpOptionsSnap( Window* pParent, const SfxItemSet& rInAttrs ) : +SdTpOptionsSnap::SdTpOptionsSnap( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SvxGridTabPage(pParent, rInAttrs) { pSnapFrames->Show(); @@ -99,7 +99,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs ) pCbxRotate->GetClickHdl().Call(0); } -SfxTabPage* SdTpOptionsSnap::Create( Window* pWindow, +SfxTabPage* SdTpOptionsSnap::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SdTpOptionsSnap( pWindow, *rAttrs ) ); @@ -111,7 +111,7 @@ SfxTabPage* SdTpOptionsSnap::Create( Window* pWindow, |* \************************************************************************/ -SdTpOptionsContents::SdTpOptionsContents( Window* pParent, const SfxItemSet& rInAttrs ) : +SdTpOptionsContents::SdTpOptionsContents( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SfxTabPage ( pParent, "SdViewPage", "modules/simpress/ui/sdviewpage.ui", &rInAttrs ) { get( m_pCbxRuler, "ruler"); @@ -165,7 +165,7 @@ void SdTpOptionsContents::Reset( const SfxItemSet* rAttrs ) m_pCbxHandlesBezier->SaveValue(); } -SfxTabPage* SdTpOptionsContents::Create( Window* pWindow, +SfxTabPage* SdTpOptionsContents::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SdTpOptionsContents( pWindow, *rAttrs ) ); @@ -179,7 +179,7 @@ SfxTabPage* SdTpOptionsContents::Create( Window* pWindow, #define TABLE_COUNT 12 #define TOKEN ':' -SdTpOptionsMisc::SdTpOptionsMisc(Window* pParent, const SfxItemSet& rInAttrs) +SdTpOptionsMisc::SdTpOptionsMisc(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SfxTabPage(pParent, "OptSavePage", "modules/simpress/ui/optimpressgeneralpage.ui", &rInAttrs) , nWidth(0) , nHeight(0) @@ -488,7 +488,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) UpdateCompatibilityControls (); } -SfxTabPage* SdTpOptionsMisc::Create( Window* pWindow, +SfxTabPage* SdTpOptionsMisc::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SdTpOptionsMisc( pWindow, *rAttrs ) ); diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 21f1a9eb114a..edd9a7f565ff 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -32,7 +32,7 @@ #define VECTORIZE_MAX_EXTENT 512 -SdVectorizeDlg::SdVectorizeDlg(Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell) +SdVectorizeDlg::SdVectorizeDlg(vcl::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell) : ModalDialog(pParent, "VectorizeDialog", "modules/sdraw/ui/vectorize.ui") , mpDocSh(pDocShell) , aBmp(rBmp) diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index f0e1518ca7d9..d4882e594b0f 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -144,7 +144,7 @@ Rectangle DrawDocShell::GetVisArea(sal_uInt16 nAspect) const if (aVisArea.IsEmpty() && mpViewShell) { - Window* pWin = mpViewShell->GetActiveWindow(); + vcl::Window* pWin = mpViewShell->GetActiveWindow(); if (pWin) { @@ -282,7 +282,7 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixe * name. * @return sal_False if the user cancels the action. */ -bool DrawDocShell::CheckPageName (::Window* pWin, OUString& rName ) +bool DrawDocShell::CheckPageName (vcl::Window* pWin, OUString& rName ) { const OUString aStrForDlg( rName ); bool bIsNameValid = IsNewPageNameValid( rName, true ); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 7190485673ec..1108721603da 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -344,7 +344,7 @@ bool DrawDocShell::LoadFrom( SfxMedium& rMedium ) WaitObject* pWait = NULL; if( mpViewShell ) - pWait = new WaitObject( (Window*) mpViewShell->GetActiveWindow() ); + pWait = new WaitObject( (vcl::Window*) mpViewShell->GetActiveWindow() ); mpDoc->NewOrLoadCompleted( NEW_DOC ); mpDoc->CreateFirstPages(); @@ -516,10 +516,10 @@ bool DrawDocShell::SaveAs( SfxMedium& rMedium ) SfxViewFrame* pFrame1 = SfxViewFrame::GetFirst( this ); if (pFrame1) { - ::Window* pWindow = &pFrame1->GetWindow(); + vcl::Window* pWindow = &pFrame1->GetWindow(); if ( pWindow ) { - ::Window* pSysWin = pWindow->GetSystemWindow(); + vcl::Window* pSysWin = pWindow->GetSystemWindow(); if ( pSysWin ) { pSysWin->SetAccessibleName(OUString()); @@ -1168,7 +1168,7 @@ void DrawDocShell::OpenBookmark( const OUString& rBookmarkURL ) ( mpViewShell ? mpViewShell->GetViewFrame() : SfxViewFrame::Current() )->GetBindings().Execute( SID_OPENHYPERLINK, ppArgs ); } -SfxDocumentInfoDialog* DrawDocShell::CreateDocumentInfoDialog( ::Window *pParent, const SfxItemSet &rSet ) +SfxDocumentInfoDialog* DrawDocShell::CreateDocumentInfoDialog( vcl::Window *pParent, const SfxItemSet &rSet ) { SfxDocumentInfoDialog* pDlg = new SfxDocumentInfoDialog( pParent, rSet ); DrawDocShell* pDocSh = PTR_CAST(DrawDocShell,SfxObjectShell::Current()); diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx index 575d3b21f297..768ec5d94a72 100644 --- a/sd/source/ui/docshell/sdclient.cxx +++ b/sd/source/ui/docshell/sdclient.cxx @@ -37,7 +37,7 @@ using namespace com::sun::star; namespace sd { -Client::Client(SdrOle2Obj* pObj, ViewShell* pViewShell, ::Window* pWindow) : +Client::Client(SdrOle2Obj* pObj, ViewShell* pViewShell, vcl::Window* pWindow) : SfxInPlaceClient(pViewShell->GetViewShell(), pWindow, pObj->GetAspect() ), mpViewShell(pViewShell), pSdrOle2Obj(pObj), diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 9bc89f120e1e..2558510e6817 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -170,7 +170,7 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource ( } // Get Window pointer for XWindow of the pane. - ::Window* pWindow = NULL; + vcl::Window* pWindow = NULL; if (xPane.is()) pWindow = VCLUnoHelper::GetWindow(xPane->getWindow()); @@ -299,7 +299,7 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) ::boost::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::CreateView ( const Reference<XResourceId>& rxViewId, SfxViewFrame& rFrame, - ::Window& rWindow, + vcl::Window& rWindow, const Reference<XPane>& rxPane, FrameView* pFrameView, const bool bIsCenterPane) @@ -344,7 +344,7 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) ::boost::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell ( const Reference<XResourceId>& rxViewId, SfxViewFrame& rFrame, - ::Window& rWindow, + vcl::Window& rWindow, FrameView* pFrameView, const bool bIsCenterPane) { diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx index 77a40a5f5461..fa62d325b17d 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.hxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx @@ -41,7 +41,7 @@ class ViewShellBase; class FrameView; } class SfxViewFrame; -class Window; +namespace vcl { class Window; } namespace { @@ -104,7 +104,7 @@ private: FrameView* mpFrameView; class ViewCache; - ::boost::shared_ptr<Window> mpWindow; + ::boost::shared_ptr<vcl::Window> mpWindow; ::boost::shared_ptr<ViewCache> mpViewCache; css::uno::Reference<css::drawing::framework::XPane> mxLocalPane; @@ -112,7 +112,7 @@ private: ::boost::shared_ptr<ViewDescriptor> CreateView ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, SfxViewFrame& rFrame, - ::Window& rWindow, + vcl::Window& rWindow, const css::uno::Reference<css::drawing::framework::XPane>& rxPane, FrameView* pFrameView, const bool bIsCenterView); @@ -120,7 +120,7 @@ private: ::boost::shared_ptr<ViewShell> CreateViewShell ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, SfxViewFrame& rFrame, - ::Window& rWindow, + vcl::Window& rWindow, FrameView* pFrameView, const bool bIsCenterView); diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index 304574f3ea53..c08c590db1ee 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -38,7 +38,7 @@ ChildWindowPane::ChildWindowPane ( sal_uInt16 nChildWindowId, ViewShellBase& rViewShellBase, ::std::auto_ptr<SfxShell> pShell) - : ChildWindowPaneInterfaceBase(rxPaneId,(::Window*)NULL), + : ChildWindowPaneInterfaceBase(rxPaneId,(vcl::Window*)NULL), mnChildWindowId(nChildWindowId), mrViewShellBase(rViewShellBase), mpShell(pShell), @@ -118,7 +118,7 @@ void SAL_CALL ChildWindowPane::disposing (void) Pane::disposing(); } -::Window* ChildWindowPane::GetWindow (void) +::vcl::Window* ChildWindowPane::GetWindow (void) { do { diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx index f244f61fcecc..72d42a51562d 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.hxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx @@ -72,7 +72,7 @@ public: Note that GetWindow() may return different Window pointers when Hide() is called in between. */ - virtual ::Window* GetWindow (void) SAL_OVERRIDE; + virtual vcl::Window* GetWindow (void) SAL_OVERRIDE; /** The local getWindow() first calls GetWindow() to provide a valid window pointer before forwarding the call to the base class. diff --git a/sd/source/ui/framework/factories/FrameWindowPane.cxx b/sd/source/ui/framework/factories/FrameWindowPane.cxx index dec2d0ee4ed2..82af2666733b 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.cxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.cxx @@ -27,7 +27,7 @@ namespace sd { namespace framework { FrameWindowPane::FrameWindowPane ( const Reference<XResourceId>& rxPaneId, - ::Window* pWindow) + vcl::Window* pWindow) : Pane(rxPaneId,pWindow) { } diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx index 7276ecc53c1b..836c2f77929f 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.hxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx @@ -36,7 +36,7 @@ public: FrameWindowPane ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId>& rxPaneId, - ::Window* pWindow); + vcl::Window* pWindow); virtual ~FrameWindowPane (void) throw(); /** A frame window typically can (and should) exists on its own without diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 105d557680d6..13a9af05759d 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -40,12 +40,12 @@ namespace sd { namespace framework { FullScreenPane::FullScreenPane ( const Reference<XComponentContext>& rxComponentContext, const Reference<XResourceId>& rxPaneId, - const ::Window* pViewShellWindow) + const vcl::Window* pViewShellWindow) : FrameWindowPane(rxPaneId,NULL), mxComponentContext(rxComponentContext), mpWorkWindow(NULL) { - ::Window* pParent = NULL; + vcl::Window* pParent = NULL; mpWorkWindow.reset(new WorkWindow( pParent, 0)); // For debugging (non-fullscreen) use WB_BORDER | WB_MOVEABLE | WB_SIZEABLE)); @@ -86,7 +86,7 @@ FullScreenPane::FullScreenPane ( // For some reason the VCL canvas can not paint into a WorkWindow. // Therefore a child window is created that covers the WorkWindow // completely. - mpWindow = new ::Window(mpWorkWindow.get()); + mpWindow = new vcl::Window(mpWorkWindow.get()); mpWindow->SetPosSizePixel(Point(0,0), mpWorkWindow->GetSizePixel()); mpWindow->SetBackground(Wallpaper()); mxWindow = VCLUnoHelper::GetInterface(mpWindow); @@ -165,7 +165,7 @@ void SAL_CALL FullScreenPane::setAccessible ( Reference<lang::XInitialization> xInitializable (rxAccessible, UNO_QUERY); if (xInitializable.is()) { - ::Window* pParentWindow = mpWindow->GetParent(); + vcl::Window* pParentWindow = mpWindow->GetParent(); Reference<css::accessibility::XAccessible> xAccessibleParent; if (pParentWindow != NULL) xAccessibleParent = pParentWindow->GetAccessible(); @@ -198,7 +198,7 @@ IMPL_LINK(FullScreenPane, WindowEventHandler, VclWindowEvent*, pEvent) Reference<rendering::XCanvas> FullScreenPane::CreateCanvas (void) throw (RuntimeException) { - ::Window* pWindow = VCLUnoHelper::GetWindow(mxWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(mxWindow); if (pWindow != NULL) { Sequence<Any> aArg (5); diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index af9a47f03ce1..1d7c3481ea98 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -51,7 +51,7 @@ public: FullScreenPane ( const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, - const ::Window* pViewShellWindow); + const vcl::Window* pViewShellWindow); virtual ~FullScreenPane (void) throw(); virtual void SAL_CALL disposing (void) SAL_OVERRIDE; diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index 5fea572a81ad..978cb870f8ec 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -34,7 +34,7 @@ namespace sd { namespace framework { Pane::Pane ( const Reference<XResourceId>& rxPaneId, - ::Window* pWindow) + vcl::Window* pWindow) throw () : PaneInterfaceBase(MutexOwner::maMutex), mxPaneId(rxPaneId), @@ -53,7 +53,7 @@ void Pane::disposing (void) mpWindow = NULL; } -::Window* Pane::GetWindow (void) +::vcl::Window* Pane::GetWindow (void) { if (mxWindow.is()) return mpWindow; @@ -90,7 +90,7 @@ sal_Bool SAL_CALL Pane::isVisible (void) { ThrowIfDisposed(); - const ::Window* pWindow = GetWindow(); + const vcl::Window* pWindow = GetWindow(); if (pWindow != NULL) return pWindow->IsVisible(); else @@ -102,7 +102,7 @@ void SAL_CALL Pane::setVisible (sal_Bool bIsVisible) { ThrowIfDisposed(); - ::Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if (pWindow != NULL) pWindow->Show(bIsVisible); } @@ -111,7 +111,7 @@ Reference<css::accessibility::XAccessible> SAL_CALL Pane::getAccessible (void) throw (RuntimeException, std::exception) { ThrowIfDisposed(); - ::Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if (pWindow != NULL) return pWindow->GetAccessible(false); else @@ -123,7 +123,7 @@ void SAL_CALL Pane::setAccessible ( throw (RuntimeException, std::exception) { ThrowIfDisposed(); - ::Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if (pWindow != NULL) pWindow->SetAccessible(rxAccessible); } diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index 867737c021f0..656bbcc703b9 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -207,7 +207,7 @@ sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor ( if (mpViewShell.get() != NULL) { - ::Window* pWindow = VCLUnoHelper::GetWindow(xPane->getWindow()); + ::vcl::Window* pWindow = VCLUnoHelper::GetWindow(xPane->getWindow()); if (pWindow != NULL && mpViewShell->RelocateToParentWindow(pWindow)) { bResult = true; diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index a54e49722033..681096330b45 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -310,7 +310,7 @@ bool FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt) E3dCompoundObject* p3DObj = NULL; - WaitObject aWait( (Window*)mpViewShell->GetActiveWindow() ); + WaitObject aWait( (vcl::Window*)mpViewShell->GetActiveWindow() ); p3DObj = ImpCreateBasic3DShape(); E3dScene* pScene = mpView->SetCurrent3DObj(p3DObj); diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 39228ef29f6e..99e63b280847 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -398,7 +398,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) pIPClient->SetSdrGrafObj(NULL); // wait-mousepointer while deleting object - WaitObject aWait( (Window*)mpViewShell->GetActiveWindow() ); + WaitObject aWait( (vcl::Window*)mpViewShell->GetActiveWindow() ); // delete object mpView->DeleteMarked(); } @@ -966,9 +966,9 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE mpWindow->OutputToScreenPixel(aLogicPix.BottomRight())); if (Help::IsBalloonHelpEnabled()) - Help::ShowBalloon( (Window*)mpWindow, rPosPixel, aScreenRect, aHelpText); + Help::ShowBalloon( (vcl::Window*)mpWindow, rPosPixel, aScreenRect, aHelpText); else if (Help::IsQuickHelpEnabled()) - Help::ShowQuickHelp( (Window*)mpWindow, aScreenRect, aHelpText); + Help::ShowQuickHelp( (vcl::Window*)mpWindow, aScreenRect, aHelpText); } return bSet; diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 7f81db01be69..a608fd74a926 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -325,7 +325,7 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) /* Maybe a QueryBox is opened ("update links?"), therefore the dialog becomes the current DefModalDialogParent */ - ::Window* pDefParent = Application::GetDefDialogParent(); + vcl::Window* pDefParent = Application::GetDefDialogParent(); Application::SetDefDialogParent(pDlg->GetWindow()); sal_uInt16 nRet = pDlg->Execute(); diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index c113f38bb7ed..f608fd117323 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -95,7 +95,7 @@ void FuMorph::DoExecute( SfxRequest& ) SdrObject* pPolyObj1 = pCloneObj1->ConvertToPolyObj(false, false); SdrObject* pPolyObj2 = pCloneObj2->ConvertToPolyObj(false, false); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); - boost::scoped_ptr<AbstractMorphDlg> pDlg(pFact ? pFact->CreateMorphDlg( static_cast< ::Window*>(mpWindow), pObj1, pObj2 ) : 0); + boost::scoped_ptr<AbstractMorphDlg> pDlg(pFact ? pFact->CreateMorphDlg( static_cast< vcl::Window*>(mpWindow), pObj1, pObj2 ) : 0); if(pPolyObj1 && pPolyObj2 && pDlg && (pDlg->Execute() == RET_OK)) { B2DPolyPolygonList_impl aPolyPolyList; diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index fe3e1f145a86..c20e90a51b1d 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -73,7 +73,7 @@ using namespace com::sun::star; namespace sd { -class Window; +namespace vcl { class Window; } // 50 cm 28350 // adapted from writer @@ -164,7 +164,7 @@ void FuPage::Deactivate() { } -const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) +const SfxItemSet* FuPage::ExecuteDialog( ::vcl::Window* pParent ) { if (!mpDrawViewShell) return NULL; diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 8f518dedae9b..669cead02abb 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -1187,11 +1187,11 @@ bool FuText::RequestHelp(const HelpEvent& rHEvt) if (Help::IsBalloonHelpEnabled()) { - bReturn = Help::ShowBalloon( (Window*)mpWindow, rHEvt.GetMousePosPixel(), aScreenRect, aHelpText); + bReturn = Help::ShowBalloon( (vcl::Window*)mpWindow, rHEvt.GetMousePosPixel(), aScreenRect, aHelpText); } else if (Help::IsQuickHelpEnabled()) { - bReturn = Help::ShowQuickHelp( (Window*)mpWindow, aScreenRect, aHelpText); + bReturn = Help::ShowQuickHelp( (vcl::Window*)mpWindow, aScreenRect, aHelpText); } } } diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx index e07d7412e599..4f46a73309f1 100644 --- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx +++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx @@ -31,7 +31,7 @@ class OutlinerView; class SdrOutliner; class SdrView; -class Window; +namespace vcl { class Window; } namespace accessibility { @@ -52,7 +52,7 @@ namespace accessibility SdrOutliner& rOutliner, SdrView& rView, OutlinerView& rOutlView, - const ::Window& rViewWindow ); + const vcl::Window& rViewWindow ); virtual ~AccessibleOutlineEditSource(); /// This method is disabled and always returns NULL @@ -81,7 +81,7 @@ namespace accessibility DECL_LINK( NotifyHdl, EENotify* ); SdrView& mrView; - const ::Window& mrWindow; + const vcl::Window& mrWindow; SdrOutliner* mpOutliner; OutlinerView* mpOutlinerView; diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index 2c32bb123130..f18101e1bc73 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -25,7 +25,7 @@ namespace sd { class OutlineViewShell; -class Window; +namespace vcl { class Window; } } namespace accessibility { diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index e8289060eff4..89f606efbe9d 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -34,7 +34,7 @@ #include <memory> -class Window; +namespace vcl { class Window; } namespace sd { namespace slidesorter { class SlideSorter; @@ -65,7 +65,7 @@ public: AccessibleSlideSorterView( ::sd::slidesorter::SlideSorter& rSlideSorter, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> & rxParent, - ::Window* pParentWindow); + vcl::Window* pParentWindow); void Init(); @@ -297,7 +297,7 @@ private: sal_uInt32 mnClientId; - ::Window* mpContentWindow; + vcl::Window* mpContentWindow; /** Check whether or not the object has been disposed (or is in the state of being disposed). If that is the case then diff --git a/sd/source/ui/inc/AnimationChildWindow.hxx b/sd/source/ui/inc/AnimationChildWindow.hxx index 0d215fdc1a2f..1c114b82e378 100644 --- a/sd/source/ui/inc/AnimationChildWindow.hxx +++ b/sd/source/ui/inc/AnimationChildWindow.hxx @@ -23,7 +23,7 @@ #include <sfx2/childwin.hxx> #include <sal/types.h> -class Window; +namespace vcl { class Window; } class SfxBindings; namespace sd { @@ -33,7 +33,7 @@ class AnimationChildWindow { public: AnimationChildWindow( - ::Window*, + vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx index 0669795e78d5..66110e08a9c3 100644 --- a/sd/source/ui/inc/BreakDlg.hxx +++ b/sd/source/ui/inc/BreakDlg.hxx @@ -46,7 +46,7 @@ class BreakDlg { public: BreakDlg ( - ::Window* pWindow, + vcl::Window* pWindow, DrawView* pDrView, DrawDocShell* pShell, sal_uLong nSumActionCount, diff --git a/sd/source/ui/inc/Client.hxx b/sd/source/ui/inc/Client.hxx index 24f09783c46c..5f2fd28422bc 100644 --- a/sd/source/ui/inc/Client.hxx +++ b/sd/source/ui/inc/Client.hxx @@ -42,7 +42,7 @@ class Client : public SfxInPlaceClient virtual void MakeVisible() SAL_OVERRIDE; public: - Client (SdrOle2Obj* pObj, ViewShell* pSdViewShell, ::Window* pWindow); + Client (SdrOle2Obj* pObj, ViewShell* pSdViewShell, vcl::Window* pWindow); virtual ~Client (void); SdrOle2Obj* GetSdrOle2Obj() const { return pSdrOle2Obj; } diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx index 2599bdf904aa..4c3320fedc0f 100644 --- a/sd/source/ui/inc/ClientView.hxx +++ b/sd/source/ui/inc/ClientView.hxx @@ -43,8 +43,8 @@ public: /* if the view should not do a Invalidate() on the windows, you have to overload the following two methods and do something different */ - virtual void InvalidateOneWin(::Window& rWin) SAL_OVERRIDE; - virtual void InvalidateOneWin(::Window& rWin, const Rectangle& rRect) SAL_OVERRIDE; + virtual void InvalidateOneWin(::vcl::Window& rWin) SAL_OVERRIDE; + virtual void InvalidateOneWin(::vcl::Window& rWin, const Rectangle& rRect) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 4583ada7f556..5cfbda93dec8 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -101,7 +101,7 @@ public: virtual Size GetFirstPageSize() SAL_OVERRIDE; virtual void FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, bool bTemplate = false ) const SAL_OVERRIDE; virtual void SetModified( bool = true ) SAL_OVERRIDE; - virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( ::Window *pParent, + virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( ::vcl::Window *pParent, const SfxItemSet &rSet ) SAL_OVERRIDE; using SotObject::GetInterface; @@ -154,7 +154,7 @@ public: a default name of a not-yet-existing slide (e.g. 'Slide 17'), sal_True is returned, but rName is set to an empty string. */ - bool CheckPageName(::Window* pWin, OUString& rName ); + bool CheckPageName(vcl::Window* pWin, OUString& rName ); void SetSlotFilter(bool bEnable = false, sal_uInt16 nCount = 0, const sal_uInt16* pSIDs = NULL) { mbFilterEnable = bEnable; mnFilterCount = nCount; mpFilterSIDs = pSIDs; } void ApplySlotFilter() const; diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 15add1df9891..967c7e3ce1e5 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -87,7 +87,7 @@ public: DrawViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, PageKind ePageKind = PK_STANDARD, FrameView* pFrameView = NULL); @@ -261,7 +261,7 @@ public: //false. void FreshNavigatrEntry(); void FreshNavigatrTree(); - void MakeVisible(const Rectangle& rRect, ::Window& rWin); + void MakeVisible(const Rectangle& rRect, ::vcl::Window& rWin); virtual void ReadFrameViewData(FrameView* pView) SAL_OVERRIDE; virtual void WriteFrameViewData() SAL_OVERRIDE; @@ -373,7 +373,7 @@ public: /** Relocation to a new parent window is not supported for DrawViewShell objects so this method always returns <FALSE/>. */ - virtual bool RelocateToParentWindow (::Window* pParentWindow) SAL_OVERRIDE; + virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow) SAL_OVERRIDE; OUString GetSidebarContextName (void) const; diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx index db095b8abfc1..0168800353ca 100644 --- a/sd/source/ui/inc/FormShellManager.hxx +++ b/sd/source/ui/inc/FormShellManager.hxx @@ -89,7 +89,7 @@ private: bool mbIsMainViewChangePending; - ::Window* mpMainViewShellWindow; + vcl::Window* mpMainViewShellWindow; /** Register at window of center pane and at the form shell that represents the form tool bar. The former informs this manager about diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx index 3f35b7843297..fc127e908534 100644 --- a/sd/source/ui/inc/GraphicViewShell.hxx +++ b/sd/source/ui/inc/GraphicViewShell.hxx @@ -22,7 +22,7 @@ #include "DrawViewShell.hxx" -class Window; +namespace vcl { class Window; } namespace sd { @@ -59,7 +59,7 @@ public: GraphicViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView = NULL); virtual ~GraphicViewShell (void); diff --git a/sd/source/ui/inc/LayerTabBar.hxx b/sd/source/ui/inc/LayerTabBar.hxx index 8c7f19e801b8..061c2a78258c 100644 --- a/sd/source/ui/inc/LayerTabBar.hxx +++ b/sd/source/ui/inc/LayerTabBar.hxx @@ -37,7 +37,7 @@ class LayerTabBar public: LayerTabBar ( DrawViewShell* pDrViewSh, - ::Window* pParent); + vcl::Window* pParent); virtual ~LayerTabBar (void); /** Inform all listeners of this control that the current layer has been diff --git a/sd/source/ui/inc/NavigatorChildWindow.hxx b/sd/source/ui/inc/NavigatorChildWindow.hxx index dbf4d079ff5b..648f8ae60834 100644 --- a/sd/source/ui/inc/NavigatorChildWindow.hxx +++ b/sd/source/ui/inc/NavigatorChildWindow.hxx @@ -22,7 +22,7 @@ #include <sfx2/childwin.hxx> -class Window; +namespace vcl { class Window; } class SfxBindings; namespace sd { @@ -35,7 +35,7 @@ class NavigatorChildWindow { public: NavigatorChildWindow ( - ::Window*, + vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); diff --git a/sd/source/ui/inc/OutlineBulletDlg.hxx b/sd/source/ui/inc/OutlineBulletDlg.hxx index b2fe9c50bc6e..19ae1f8cad0e 100644 --- a/sd/source/ui/inc/OutlineBulletDlg.hxx +++ b/sd/source/ui/inc/OutlineBulletDlg.hxx @@ -34,7 +34,7 @@ class OutlineBulletDlg { public: OutlineBulletDlg ( - ::Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ); virtual ~OutlineBulletDlg (); diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 837d1b788e4f..fb80a355f9b2 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -57,7 +57,7 @@ class OutlineView friend class OutlineViewModelChangeGuard; public: OutlineView (DrawDocShell& rDocSh, - ::Window* pWindow, + ::vcl::Window* pWindow, OutlineViewShell& rOutlineViewSh); virtual ~OutlineView (void); @@ -80,7 +80,7 @@ public: virtual void AddWindowToPaintView(OutputDevice* pWin) SAL_OVERRIDE; virtual void DeleteWindowFromPaintView(OutputDevice* pWin) SAL_OVERRIDE; - OutlinerView* GetViewByWindow(::Window* pWin) const; + OutlinerView* GetViewByWindow(::vcl::Window* pWin) const; SdrOutliner& GetOutliner() { return mrOutliner; } Paragraph* GetPrevTitle(const Paragraph* pPara); @@ -211,8 +211,8 @@ private: /** holds a model guard during drag and drop between BeginMovingHdl and EndMovingHdl */ std::auto_ptr< OutlineViewModelChangeGuard > maDragAndDropModelGuard; - vcl::Font maPageNumberFont; - vcl::Font maBulletFont; + ::vcl::Font maPageNumberFont; + ::vcl::Font maBulletFont; SvxLRSpaceItem maLRSpaceItem; Image maSlideImage; diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 7aebf2279374..ebb795c2f73d 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -56,7 +56,7 @@ public: OutlineViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, FrameView* pFrameView = NULL); virtual ~OutlineViewShell (void); diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx index 70d0feff13d5..8b76b9e2ad99 100644 --- a/sd/source/ui/inc/PaneChildWindows.hxx +++ b/sd/source/ui/inc/PaneChildWindows.hxx @@ -30,7 +30,7 @@ class PaneChildWindow { public: PaneChildWindow ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo, @@ -44,7 +44,7 @@ class LeftPaneImpressChildWindow : public PaneChildWindow { public: - LeftPaneImpressChildWindow (::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); + LeftPaneImpressChildWindow (vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); SFX_DECL_CHILDWINDOW_WITHID(LeftPaneImpressChildWindow); }; @@ -53,7 +53,7 @@ class LeftPaneDrawChildWindow : public PaneChildWindow { public: - LeftPaneDrawChildWindow (::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); + LeftPaneDrawChildWindow (vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); SFX_DECL_CHILDWINDOW_WITHID(LeftPaneDrawChildWindow); }; diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index 3e93c1bc2296..adba60aaf9af 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -50,7 +50,7 @@ public: PaneDockingWindow ( SfxBindings *pBindings, SfxChildWindow *pChildWindow, - ::Window* pParent, + vcl::Window* pParent, const ResId& rResId, const OUString& rsTitle); diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx index 8fa4fcfedf3c..53bbde6cba4b 100644 --- a/sd/source/ui/inc/PresentationViewShell.hxx +++ b/sd/source/ui/inc/PresentationViewShell.hxx @@ -40,7 +40,7 @@ private: static void InitInterface_Impl(); public: - PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView = NULL); + PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, FrameView* pFrameView = NULL); virtual ~PresentationViewShell (void); /** This method is used by a simple class that passes some diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index 69b30a5d6065..956585e3a35e 100644 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -35,7 +35,7 @@ class Ruler public: Ruler ( DrawViewShell& rViewSh, - ::Window* pParent, + ::vcl::Window* pParent, ::sd::Window* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, diff --git a/sd/source/ui/inc/ShellFactory.hxx b/sd/source/ui/inc/ShellFactory.hxx index 664a1e17dc73..5cfde74b3c8e 100644 --- a/sd/source/ui/inc/ShellFactory.hxx +++ b/sd/source/ui/inc/ShellFactory.hxx @@ -22,7 +22,7 @@ #include <sal/types.h> -class Window; +namespace vcl { class Window; } namespace sd { @@ -49,7 +49,7 @@ public: */ virtual ShellType* CreateShell ( ShellId nId, - ::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView = NULL) = 0; /** Tell the factory that a shell is no longer in use. It may destroy diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index a26a49be234f..1af5619f968d 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -32,7 +32,7 @@ class ScrollBar; class ScrollBarBox; -class Window; +namespace vcl { class Window; } namespace sd { class ViewShell; @@ -116,7 +116,7 @@ public: static ::boost::shared_ptr<SlideSorter> CreateSlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, - ::Window& rParentWindow); + ::vcl::Window& rParentWindow); /** Return the control of the vertical scroll bar. */ @@ -170,7 +170,7 @@ public: const Size& rSize); SvBorder GetBorder (void); - bool RelocateToWindow (::Window* pWindow); + bool RelocateToWindow (::vcl::Window* pWindow); /** Set the current function at the view shell or, when it is not present, set it at the content window. This method supports the use @@ -248,7 +248,7 @@ private: SlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, - ::Window& rParentWindow); + ::vcl::Window& rParentWindow); void Init (void); /** Create the controls for the slide sorter. This are the tab bar @@ -257,7 +257,7 @@ private: This method is usually called exactly one time from the constructor. */ - void SetupControls (::Window* pParentWindow); + void SetupControls (::vcl::Window* pParentWindow); /** This method is usually called exactly one time from the constructor. diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 238e1a5005fd..e35b1eb1e36e 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -52,7 +52,7 @@ public: static ::boost::shared_ptr<SlideSorterViewShell> Create( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, FrameView* pFrameView, const bool bIsCenterPane); @@ -121,7 +121,7 @@ public: virtual void StartDrag ( const Point& rDragPt, - ::Window* pWindow ); + ::vcl::Window* pWindow ); virtual void DragFinished ( sal_Int8 nDropAction); virtual sal_Int8 AcceptDrop ( @@ -182,7 +182,7 @@ public: /** Try to relocate all toplevel window elements to the given parent window. */ - virtual bool RelocateToParentWindow (::Window* pParentWindow) SAL_OVERRIDE; + virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow) SAL_OVERRIDE; protected: @@ -200,7 +200,7 @@ private: SlideSorterViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView); void Initialize (void); diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx index da48fb09917c..313a2560b880 100644 --- a/sd/source/ui/inc/SpellDialogChildWindow.hxx +++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx @@ -35,7 +35,7 @@ class SpellDialogChildWindow { public: SpellDialogChildWindow ( - ::Window* pParent, + vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx index 1700921dfee5..ece600143a64 100644 --- a/sd/source/ui/inc/TabControl.hxx +++ b/sd/source/ui/inc/TabControl.hxx @@ -39,7 +39,7 @@ class TabControl //declare bIsMarked variable sal_uInt16 RrePageID; public: - TabControl (DrawViewShell* pDrViewSh, ::Window* pParent); + TabControl (DrawViewShell* pDrViewSh, vcl::Window* pParent); virtual ~TabControl (void); /** Inform all listeners of this control that the current page has been diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 4decd690db24..63493f143865 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -99,12 +99,12 @@ public: virtual void MarkListHasChanged() SAL_OVERRIDE; virtual void ModelHasChanged() SAL_OVERRIDE; virtual void SelectAll(); - virtual void DoCut(::Window* pWindow=NULL); - virtual void DoCopy(::Window* pWindow=NULL); - virtual void DoPaste(::Window* pWindow=NULL); + virtual void DoCut(vcl::Window* pWindow=NULL); + virtual void DoCopy(vcl::Window* pWindow=NULL); + virtual void DoPaste(vcl::Window* pWindow=NULL); virtual void DoConnect(SdrOle2Obj* pOleObj) SAL_OVERRIDE; virtual bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false); - virtual void StartDrag( const Point& rStartPos, ::Window* pWindow ); + virtual void StartDrag( const Point& rStartPos, vcl::Window* pWindow ); virtual void DragFinished( sal_Int8 nDropAction ); virtual sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, @@ -121,14 +121,14 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable> - CreateClipboardDataObject (::sd::View*, ::Window& rWindow); + CreateClipboardDataObject (::sd::View*, vcl::Window& rWindow); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable> - CreateDragDataObject (::sd::View*, ::Window& rWindow, + CreateDragDataObject (::sd::View*, vcl::Window& rWindow, const Point& rDragPos); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable> - CreateSelectionDataObject (::sd::View*, ::Window& rWindow); + CreateSelectionDataObject (::sd::View*, vcl::Window& rWindow); void UpdateSelectionClipboard( bool bForceDeselect ); @@ -136,7 +136,7 @@ public: inline SdDrawDocument& GetDoc(void) const; inline ViewShell* GetViewShell(void) const { return mpViewSh; } - virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::Window* pWin = 0L, bool bIsNewObj = false, + virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::vcl::Window* pWin = 0L, bool bIsNewObj = false, SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L, bool bDontDeleteOutliner = false, bool bOnlyOneView = false, bool bGrabFocus = true) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index c3ef058c1c69..7404aa653051 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -115,7 +115,7 @@ public: ViewShell ( SfxViewFrame *pFrame, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter = true); virtual ~ViewShell (void); @@ -145,7 +145,7 @@ public: /** Return the window that is the parent of all controls of this view shell. This may or may not be the window of the frame. */ - inline ::Window* GetParentWindow (void) const { return mpParentWindow; } + inline ::vcl::Window* GetParentWindow (void) const { return mpParentWindow; } inline ::sd::View* GetView (void) const { return mpView; } inline SdrView* GetDrawView (void) const; @@ -421,7 +421,7 @@ public: all views, so the return value tells the caller if the relocation was successful. */ - virtual bool RelocateToParentWindow (::Window* pParentWindow); + virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow); /** Depending on the given request create a new page or duplicate an existing one. A new page is created behind the given slide. @@ -568,7 +568,7 @@ protected: void doShow(); private: - ::Window* mpParentWindow; + ::vcl::Window* mpParentWindow; /** This window updater is used to keep all relevant windows up to date with reference to the digit langugage used to display digits in text shapes. diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index e2c7514137cd..af33977a8e33 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -224,7 +224,7 @@ public: view and other UI elements, like scroll bars and rulers. Ownership of that window remains with the called ViewShellBase object. */ - ::Window* GetViewWindow (void); + vcl::Window* GetViewWindow (void); /** returns the ui descriptive name for the given uno slot. The result is taken from the configuration and not cached, so do not use it excessive (f.e. in status updates) */ diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index 31dab6f791e4..b259f3ffcdff 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -172,7 +172,7 @@ private: static because it must not access any of the, not yet initialized members. */ - static ::Window* GetAnchorWindow( + static vcl::Window* GetAnchorWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId>& rxViewTabBarId, const ::com::sun::star::uno::Reference< diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index a35f4fe1be5b..0a33a937b44b 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -40,11 +40,11 @@ class ViewShell; be an integer percent value. */ class Window - : public ::Window, + : public ::vcl::Window, public ::DropTargetHelper { public: - Window (::Window* pParent); + Window (vcl::Window* pParent); virtual ~Window (void); void SetViewShell (ViewShell* pViewSh); diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index aa6c95a48e7d..d768be7fb92e 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -26,7 +26,7 @@ #include <vector> -class Window; +namespace vcl { class Window; } class OutputDevice; class SdDrawDocument; @@ -62,7 +62,7 @@ public: This device is added to the device list if it is not <null/> and when it is not already a member of that list. */ - void RegisterWindow (::Window* pWindow); + void RegisterWindow (vcl::Window* pWindow); /** Remove the given device from the list of devices which will be updated when one of the monitored values changes. @@ -70,7 +70,7 @@ public: This device is removed from the device list when it is a member of that list. */ - void UnregisterWindow (::Window* pWindow); + void UnregisterWindow (vcl::Window* pWindow); /** Set the view shell whose output devices shall be kept up to date. It is used to clear the master page cache so that a redraw affects @@ -122,7 +122,7 @@ private: /** Type and data member for a list of devices that have to be kept up-to-date. */ - typedef ::std::vector< ::Window*> tWindowList; + typedef ::std::vector< vcl::Window*> tWindowList; tWindowList maWindowList; /** The central method of this class. Update the given output device. diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 9be3815bdbf9..09d94562604e 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -64,7 +64,7 @@ private: Fraction aScale; public: - SdDisplay( ::Window* pWin, SdResId Id ); + SdDisplay( vcl::Window* pWin, SdResId Id ); virtual ~SdDisplay(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -82,7 +82,7 @@ class AnimationWindow : public SfxDockingWindow public: AnimationWindow( SfxBindings* pBindings, SfxChildWindow *pCW, - ::Window* pParent, const SdResId& rSdResId ); + vcl::Window* pParent, const SdResId& rSdResId ); virtual ~AnimationWindow(); void AddObj( ::sd::View& rView ); @@ -122,7 +122,7 @@ private: HelpButton aBtnHelp; - ::Window* pWin; + vcl::Window* pWin; ::std::vector< ::std::pair<BitmapEx*, Time*> > m_FrameList; static const size_t EMPTY_FRAMELIST = ULONG_MAX; size_t m_nCurrentFrame; diff --git a/sd/source/ui/inc/assclass.hxx b/sd/source/ui/inc/assclass.hxx index 805e07409657..3e95415d7a9d 100644 --- a/sd/source/ui/inc/assclass.hxx +++ b/sd/source/ui/inc/assclass.hxx @@ -27,13 +27,13 @@ #define MAX_PAGES 10 -class Window; +namespace vcl { class Window; } class SD_DLLPUBLIC Assistent { /** contains for every page the controls, which have to be connected? correctly */ - std::vector<Window*> maPages[MAX_PAGES]; + std::vector<vcl::Window*> maPages[MAX_PAGES]; /// number of pages int mnPages; @@ -51,7 +51,7 @@ public: void DisablePage( int nPage ); /// adds a control to the specified page - bool InsertControl(int nDestPage,Window* pUsedControl); + bool InsertControl(int nDestPage, vcl::Window* pUsedControl); bool NextPage(); diff --git a/sd/source/ui/inc/celltempl.hxx b/sd/source/ui/inc/celltempl.hxx index 97a648d7e1ef..612f2f4c80e2 100644 --- a/sd/source/ui/inc/celltempl.hxx +++ b/sd/source/ui/inc/celltempl.hxx @@ -37,7 +37,7 @@ private: virtual const SfxItemSet* GetRefreshedSet(); public: - SdPresCellTemplateDlg( SdrModel* pModel, Window* pParent, SfxStyleSheetBase& rStyleBase ); + SdPresCellTemplateDlg( SdrModel* pModel, vcl::Window* pParent, SfxStyleSheetBase& rStyleBase ); ~SdPresCellTemplateDlg(); const SfxItemSet* GetOutputItemSet() const; diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx index fb9d5fe61783..7994e0c1c08b 100644 --- a/sd/source/ui/inc/copydlg.hxx +++ b/sd/source/ui/inc/copydlg.hxx @@ -38,7 +38,7 @@ class CopyDlg : public SfxModalDialog { public: - CopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, + CopyDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const XColorListRef &pColList, ::sd::View* pView ); virtual ~CopyDlg(); diff --git a/sd/source/ui/inc/createcustomanimationpanel.hxx b/sd/source/ui/inc/createcustomanimationpanel.hxx index a9f1a63dddd3..12c98d7337ca 100644 --- a/sd/source/ui/inc/createcustomanimationpanel.hxx +++ b/sd/source/ui/inc/createcustomanimationpanel.hxx @@ -24,7 +24,7 @@ namespace sd { -::Window * createCustomAnimationPanel (::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); +::vcl::Window * createCustomAnimationPanel (vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); } diff --git a/sd/source/ui/inc/createslidetransitionpanel.hxx b/sd/source/ui/inc/createslidetransitionpanel.hxx index b74a3fadd98e..6c159f9a5a38 100644 --- a/sd/source/ui/inc/createslidetransitionpanel.hxx +++ b/sd/source/ui/inc/createslidetransitionpanel.hxx @@ -24,7 +24,7 @@ namespace sd { -::Window* createSlideTransitionPanel (::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); +::vcl::Window* createSlideTransitionPanel (::vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); } diff --git a/sd/source/ui/inc/createtabledesignpanel.hxx b/sd/source/ui/inc/createtabledesignpanel.hxx index ceaa882cfda6..2d8f1c36f504 100644 --- a/sd/source/ui/inc/createtabledesignpanel.hxx +++ b/sd/source/ui/inc/createtabledesignpanel.hxx @@ -24,7 +24,7 @@ namespace sd { -::Window * createTableDesignPanel (::Window* pParent, ViewShellBase& rBase); +::vcl::Window * createTableDesignPanel (::vcl::Window* pParent, ViewShellBase& rBase); } diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 1aff1d703939..7a16bf6150ff 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -55,7 +55,7 @@ private: DECL_LINK( StartShowHdl, void* ); public: - SdCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc ); + SdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc ); virtual ~SdCustomShowDlg(); bool IsModified() const { return( bModified ); } @@ -87,7 +87,7 @@ private: public: - SdDefineCustomShowDlg( Window* pWindow, + SdDefineCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ); virtual ~SdDefineCustomShowDlg(); diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index 3b31d627b0ab..fdb61e8dca23 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -40,7 +40,7 @@ protected: virtual void Modify() SAL_OVERRIDE; public: - SdPagesField( Window* pParent, + SdPagesField( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_SPIN | WB_REPEAT ); virtual ~SdPagesField(); @@ -55,7 +55,7 @@ class SdTbxCtlDiaPages : public SfxToolBoxControl 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; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source/ui/inc/dlg_char.hxx index 2bb72ae9d734..3a416de52f4c 100644 --- a/sd/source/ui/inc/dlg_char.hxx +++ b/sd/source/ui/inc/dlg_char.hxx @@ -41,7 +41,7 @@ private: public: - SdCharDlg( Window* pParent, const SfxItemSet* pAttr, + SdCharDlg( vcl::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell ); virtual ~SdCharDlg() {}; }; diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx index 028d2c9d566b..4ee19ec4abe2 100644 --- a/sd/source/ui/inc/dlgass.hxx +++ b/sd/source/ui/inc/dlgass.hxx @@ -41,7 +41,7 @@ private: AssistentDlgImpl* mpImpl; public: - AssistentDlg(Window* pParent, bool bAutoPilot); + AssistentDlg(vcl::Window* pParent, bool bAutoPilot); virtual ~AssistentDlg(); DECL_LINK( FinishHdl, void * ); diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx index 2d73fd52ee66..093b550431b7 100644 --- a/sd/source/ui/inc/dlgctrls.hxx +++ b/sd/source/ui/inc/dlgctrls.hxx @@ -35,7 +35,7 @@ struct FadeEffectLBImpl; class SD_DLLPUBLIC FadeEffectLB : public ListBox { public: - FadeEffectLB(Window* pParent, WinBits nStyle); + FadeEffectLB(vcl::Window* pParent, WinBits nStyle); virtual ~FadeEffectLB(); virtual void Fill(); diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx index 909370fc5ffd..b458b8df84b9 100644 --- a/sd/source/ui/inc/dlgfield.hxx +++ b/sd/source/ui/inc/dlgfield.hxx @@ -48,7 +48,7 @@ private: DECL_LINK( LanguageChangeHdl, void * ); public: - SdModifyFieldDlg( Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ); + SdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ); virtual ~SdModifyFieldDlg() {} SvxFieldData* GetField(); diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx index 6fd241b34894..2cdf0c4f9bbb 100644 --- a/sd/source/ui/inc/dlgpage.hxx +++ b/sd/source/ui/inc/dlgpage.hxx @@ -43,7 +43,7 @@ private: public: - SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, bool bAreaPage = true ); + SdPageDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, const SfxItemSet* pAttr, bool bAreaPage = true ); virtual ~SdPageDlg() {}; virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx index f16156fb4498..ab431c856be3 100644 --- a/sd/source/ui/inc/dlgsnap.hxx +++ b/sd/source/ui/inc/dlgsnap.hxx @@ -58,7 +58,7 @@ private: DECL_LINK( ClickHdl, Button * ); public: - SdSnapLineDlg(Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView); + SdSnapLineDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView); void GetAttr(SfxItemSet& rOutAttrs); diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index 3155bd992aca..b4d3b28a8c73 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -63,7 +63,7 @@ protected: void updateViewSettings(); public: - SdDocPreviewWin( Window* pParent, const WinBits nStyle ); + SdDocPreviewWin( vcl::Window* pParent, const WinBits nStyle ); virtual ~SdDocPreviewWin(); void SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage = 0 ); virtual void Resize() SAL_OVERRIDE; diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index 4da87a1d97be..d3865bee27a7 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -53,7 +53,7 @@ public: bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false) SAL_OVERRIDE; virtual bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const SAL_OVERRIDE; - virtual void MakeVisible(const Rectangle& rRect, ::Window& rWin) SAL_OVERRIDE; + virtual void MakeVisible(const Rectangle& rRect, ::vcl::Window& rWin) SAL_OVERRIDE; virtual void HideSdrPage() SAL_OVERRIDE; // SdrPageView* pPV); void PresPaint(const Region& rRegion); diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index 7f0f3393fb69..51992e82cf87 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -30,7 +30,7 @@ #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> -class Window; +namespace vcl { class Window; } namespace { @@ -74,7 +74,7 @@ public: Pane ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId>& rxPaneId, - ::Window* pWindow) + vcl::Window* pWindow) throw (); virtual ~Pane (void); @@ -85,7 +85,7 @@ public: /** This method is typically used together with the XUnoTunnel to obtain a Window pointer from an XPane object. */ - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); //----- XPane ------------------------------------------------------------- @@ -135,7 +135,7 @@ public: protected: ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> mxPaneId; - ::Window* mpWindow; + vcl::Window* mpWindow; ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow> mxWindow; ::com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas> mxCanvas; diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx index 449c25ff8bdf..149fef5b48f8 100644 --- a/sd/source/ui/inc/fuconbez.hxx +++ b/sd/source/ui/inc/fuconbez.hxx @@ -27,7 +27,7 @@ class SdDrawDocument; namespace sd { -class Window; +namespace vcl { class Window; } class FuConstructBezierPolygon : public FuConstruct diff --git a/sd/source/ui/inc/fuolbull.hxx b/sd/source/ui/inc/fuolbull.hxx index 0a600cd7284d..3c952c167fc1 100644 --- a/sd/source/ui/inc/fuolbull.hxx +++ b/sd/source/ui/inc/fuolbull.hxx @@ -31,7 +31,7 @@ namespace sd { class View; class ViewShell; -class Window; +namespace vcl { class Window; } /** * bullet functions in outline mode diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx index 9579423acc65..1f99701901d0 100644 --- a/sd/source/ui/inc/fuoltext.hxx +++ b/sd/source/ui/inc/fuoltext.hxx @@ -29,7 +29,7 @@ namespace sd { class View; class ViewShell; -class Window; +namespace vcl { class Window; } /** * text functions in outline mode diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx index d53b4d2079f3..7d1339919adb 100644 --- a/sd/source/ui/inc/fuoutl.hxx +++ b/sd/source/ui/inc/fuoutl.hxx @@ -31,7 +31,7 @@ class OutlineView; class OutlineViewShell; class View; class ViewShell; -class Window; +namespace vcl { class Window; } /** * Base class of functions of outline mode diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx index ac2b947e7b6d..81b12eba87e4 100644 --- a/sd/source/ui/inc/fupage.hxx +++ b/sd/source/ui/inc/fupage.hxx @@ -41,7 +41,7 @@ class FuPage virtual void Activate() SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; - const SfxItemSet* ExecuteDialog( Window* pParent ); + const SfxItemSet* ExecuteDialog( vcl::Window* pParent ); protected: virtual ~FuPage (void); diff --git a/sd/source/ui/inc/fuprlout.hxx b/sd/source/ui/inc/fuprlout.hxx index 2990385600ed..a7debedadbb7 100644 --- a/sd/source/ui/inc/fuprlout.hxx +++ b/sd/source/ui/inc/fuprlout.hxx @@ -29,7 +29,7 @@ namespace sd { class View; class ViewShell; -class Window; +namespace vcl { class Window; } class FuPresentationLayout : public FuPoor diff --git a/sd/source/ui/inc/fuprobjs.hxx b/sd/source/ui/inc/fuprobjs.hxx index 8cecd9e5377d..905542f8151c 100644 --- a/sd/source/ui/inc/fuprobjs.hxx +++ b/sd/source/ui/inc/fuprobjs.hxx @@ -29,7 +29,7 @@ namespace sd { class View; class ViewShell; -class Window; +namespace vcl { class Window; } class FuPresentationObjects : public FuPoor diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx index fefe754006cf..d3b2e0a8055b 100644 --- a/sd/source/ui/inc/gluectrl.hxx +++ b/sd/source/ui/inc/gluectrl.hxx @@ -31,7 +31,7 @@ class GlueEscDirLB : public ListBox private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; public: - GlueEscDirLB( Window* pParent, + GlueEscDirLB( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); virtual ~GlueEscDirLB(); @@ -51,7 +51,7 @@ private: 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; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx index 4c2bb8979902..6f19a555b962 100644 --- a/sd/source/ui/inc/headerfooterdlg.hxx +++ b/sd/source/ui/inc/headerfooterdlg.hxx @@ -67,7 +67,7 @@ private: void change( SdUndoGroup* pUndoGroup, SdPage* pPage, const HeaderFooterSettings& rNewSettings ); public: - HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ); + HeaderFooterDialog( ViewShell* pViewShell, vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ); virtual ~HeaderFooterDialog(); void ApplyToAll(); diff --git a/sd/source/ui/inc/ins_paste.hxx b/sd/source/ui/inc/ins_paste.hxx index 87f6054233ad..0cd396f4c31a 100644 --- a/sd/source/ui/inc/ins_paste.hxx +++ b/sd/source/ui/inc/ins_paste.hxx @@ -35,7 +35,7 @@ private: RadioButton* m_pRbAfter; public: - SdInsertPasteDlg( Window* pWindow ); + SdInsertPasteDlg( vcl::Window* pWindow ); bool IsInsertBefore() const; }; diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx index 639ec621b35b..f7a0e12ae859 100644 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -41,7 +41,7 @@ private: DECL_LINK( SelectObjectHdl, void * ); public: - SdInsertPagesObjsDlg( Window* pParent, + SdInsertPagesObjsDlg( vcl::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ); diff --git a/sd/source/ui/inc/layeroptionsdlg.hxx b/sd/source/ui/inc/layeroptionsdlg.hxx index c7d9f92b3012..e3ad80873223 100644 --- a/sd/source/ui/inc/layeroptionsdlg.hxx +++ b/sd/source/ui/inc/layeroptionsdlg.hxx @@ -46,7 +46,7 @@ private: public: - SdInsertLayerDlg( Window* pWindow, const SfxItemSet& rInAttrs, + SdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& rStr ); void GetAttr( SfxItemSet& rOutAttrs ); }; diff --git a/sd/source/ui/inc/masterlayoutdlg.hxx b/sd/source/ui/inc/masterlayoutdlg.hxx index 4c68d66178a1..b6c216944d8b 100644 --- a/sd/source/ui/inc/masterlayoutdlg.hxx +++ b/sd/source/ui/inc/masterlayoutdlg.hxx @@ -53,7 +53,7 @@ private: void create( PresObjKind eKind ); public: - MasterLayoutDialog( Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ); + MasterLayoutDialog( vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ); virtual short Execute() SAL_OVERRIDE; }; diff --git a/sd/source/ui/inc/morphdlg.hxx b/sd/source/ui/inc/morphdlg.hxx index 3e057207136d..f23d69207d98 100644 --- a/sd/source/ui/inc/morphdlg.hxx +++ b/sd/source/ui/inc/morphdlg.hxx @@ -35,7 +35,7 @@ class MorphDlg { public: MorphDlg ( - ::Window* pParent, + vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2); virtual ~MorphDlg (void); diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index 6aec09ace31b..fa388da27ea7 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -79,7 +79,7 @@ private: }; class SdNavigatorWin - : public Window + : public vcl::Window { public: typedef ::boost::function<void(void)> UpdateRequestFunctor; @@ -92,7 +92,7 @@ public: rely on others to trigger updates. */ SdNavigatorWin( - ::Window* pParent, + vcl::Window* pParent, ::sd::NavigatorChildWindow* pChildWinContext, const SdResId& rSdResId, SfxBindings* pBindings, diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx index 6ceffa3b0844..fbf9a38e86e8 100644 --- a/sd/source/ui/inc/paragr.hxx +++ b/sd/source/ui/inc/paragr.hxx @@ -33,7 +33,7 @@ private: virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: - SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr ); + SdParagraphDlg( vcl::Window* pParent, const SfxItemSet* pAttr ); virtual ~SdParagraphDlg() {}; }; diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx index de4bd53d2093..ea2fcde3e25d 100644 --- a/sd/source/ui/inc/present.hxx +++ b/sd/source/ui/inc/present.hxx @@ -84,7 +84,7 @@ private: OUString GetDisplayName( sal_Int32 nDisplay, DisplayType eType ); public: - SdStartPresentationDlg( Window* pWindow, + SdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ); diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx index e903969e8584..71c6c3f9b8ef 100644 --- a/sd/source/ui/inc/prltempl.hxx +++ b/sd/source/ui/inc/prltempl.hxx @@ -84,7 +84,7 @@ private: using SfxTabDialog::GetOutputItemSet; public: - SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ); + SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ); virtual ~SdPresLayoutTemplateDlg(); const SfxItemSet* GetOutputItemSet() const; diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index 62c2922c5579..9ae6631f435e 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -61,10 +61,10 @@ private: using OutputDevice::SetDrawMode; public: - SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs); + SdPrintOptions( vcl::Window* pParent, const SfxItemSet& rInAttrs); virtual ~SdPrintOptions(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index 91ff008cfd38..bbb4f264d8ee 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -195,7 +195,7 @@ private: public: - SdPublishingDlg(Window* pWindow, DocumentType eDocType); + SdPublishingDlg(vcl::Window* pWindow, DocumentType eDocType); virtual ~SdPublishingDlg(); void GetParameterSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rParams ); diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx index 8c94f8f5c434..ea68e8de3214 100644 --- a/sd/source/ui/inc/sdpreslt.hxx +++ b/sd/source/ui/inc/sdpreslt.hxx @@ -39,7 +39,7 @@ class SdPresLayoutDlg public: SdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, - ::Window* pWindow, + vcl::Window* pWindow, const SfxItemSet& rInAttrs); virtual ~SdPresLayoutDlg (void); diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 8a40c6037f45..35ff0763d4e8 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -121,7 +121,7 @@ public: protected: - Window* mpParent; + vcl::Window* mpParent; const SdDrawDocument* mpDoc; SdDrawDocument* mpBookmarkDoc; SfxMedium* mpMedium; @@ -184,8 +184,8 @@ protected: public: - SdPageObjsTLB( Window* pParent, const SdResId& rSdResId ); - SdPageObjsTLB( Window* pParent, WinBits nStyle ); + SdPageObjsTLB( vcl::Window* pParent, const SdResId& rSdResId ); + SdPageObjsTLB( vcl::Window* pParent, WinBits nStyle ); virtual ~SdPageObjsTLB(); // helper function for GetEntryAltText and GetEntryLongDescription diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 425740bb3612..fda3d8a2da9b 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -48,7 +48,7 @@ class SdDrawDocument; class KeyEvent; class Size; class Rectangle; -class Window; +namespace vcl { class Window; } class SfxRequest; class WorkWindow; struct ImplSVEvent; @@ -94,7 +94,7 @@ public: static bool StartPreview( ViewShellBase& rBase, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode, - ::Window* pParent = 0 ); + ::vcl::Window* pParent = 0 ); static void Stop( ViewShellBase& rBase ); @@ -110,7 +110,7 @@ public: bool startPreview( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode, - ::Window* pParent = 0 ); + ::vcl::Window* pParent = 0 ); // uno api @@ -194,7 +194,7 @@ private: void ThrowIfDisposed() const throw (css::uno::RuntimeException); - void CreateController( ViewShell* pViewSh, ::sd::View* pView, ::Window* pParentWindow ); + void CreateController( ViewShell* pViewSh, ::sd::View* pView, ::vcl::Window* pParentWindow ); WorkWindow *GetWorkWindow(); // default: disabled copy/assignment diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx index ce2fb8e8e860..ed57b580b0b1 100644 --- a/sd/source/ui/inc/tabtempl.hxx +++ b/sd/source/ui/inc/tabtempl.hxx @@ -69,7 +69,7 @@ private: virtual const SfxItemSet* GetRefreshedSet() SAL_OVERRIDE; public: - SdTabTemplateDlg(Window* pParent, + SdTabTemplateDlg(vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, diff --git a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx index 1155dfd454e1..31d40c573bd2 100644 --- a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx +++ b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx @@ -23,7 +23,7 @@ #include <tools/gen.hxx> #include <sal/types.h> -class Window; +namespace vcl { class Window; } namespace sd { namespace toolpanel { @@ -80,7 +80,7 @@ public: Returns the window which is layouted or NULL to indicate that the object is in an invalid state. */ - virtual ::Window* GetWindow (void) = 0; + virtual vcl::Window* GetWindow (void) = 0; /** Return the minimal width of the window. */ diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx index afd9c2071a9b..a57cdfb851ea 100644 --- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx +++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx @@ -51,7 +51,7 @@ public: /** Create a new scroll panel which itself is the root of a TreeNode hierarchy parent. This will usually be a child window. */ - ScrollPanel (::Window& i_rParentWindow); + ScrollPanel (vcl::Window& i_rParentWindow); virtual ~ScrollPanel (void); /** Add a control to the sub panel. An title bar is added above the @@ -86,7 +86,7 @@ public: virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); virtual bool IsResizable (void); - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); virtual sal_Int32 GetMinimumWidth (void); virtual void ExpandControl ( @@ -98,7 +98,7 @@ public: ScrollBar& GetVerticalScrollBar (void); ScrollBar& GetHorizontalScrollBar (void); - // ::Window + // vcl::Window virtual long Notify( NotifyEvent& rNEvt ); virtual ::com::sun::star::uno::Reference< @@ -117,14 +117,14 @@ public: */ void MakeRectangleVisible ( Rectangle& aRectangle, - ::Window* pWindow); + vcl::Window* pWindow); private: ::Control maScrollWindow; ScrollBar maVerticalScrollBar; ScrollBar maHorizontalScrollBar; - ::Window maScrollBarFiller; - ::Window maScrollWindowFiller; + vcl::Window maScrollBarFiller; + vcl::Window maScrollWindowFiller; Point maScrollOffset; bool mbIsRearrangePending; bool mbIsLayoutPending; diff --git a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx index f72234577ef5..e6ae9d24572b 100644 --- a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx +++ b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx @@ -36,7 +36,7 @@ #include <map> #include <vector> -class Window; +namespace vcl { class Window; } #include "svx/svdpage.hxx" #include "drawdoc.hxx" @@ -54,7 +54,7 @@ public: SlideSorterCacheDisplay (const SdDrawDocument* pDocument); virtual ~SlideSorterCacheDisplay (void); - void SetParentWindow (::Window* pParentWindow); + void SetParentWindow (vcl::Window* pParentWindow); virtual void Paint (const Rectangle& rBoundingBox); virtual void Resize (void); @@ -76,7 +76,7 @@ public: virtual Size GetPreferredSize (void); virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeigh); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); virtual bool IsResizable (void); virtual bool IsExpandable (void) const; virtual bool IsExpanded (void) const; @@ -86,7 +86,7 @@ private: static void AddInstance (const SdDrawDocument* pDocument, SlideSorterCacheDisplay* pControl); static void RemoveInstance (SlideSorterCacheDisplay* pControl); - ::Window* mpWindow; + vcl::Window* mpWindow; sal_Int32 mnPageCount; sal_Int32 mnColumnCount; sal_Int32 mnRowCount; diff --git a/sd/source/ui/inc/taskpane/SubToolPanel.hxx b/sd/source/ui/inc/taskpane/SubToolPanel.hxx index 90fc3044b612..2970bc2d0d1f 100644 --- a/sd/source/ui/inc/taskpane/SubToolPanel.hxx +++ b/sd/source/ui/inc/taskpane/SubToolPanel.hxx @@ -26,7 +26,7 @@ #include <vcl/scrbar.hxx> #include <vector> -class Window; +namespace vcl { class Window; } namespace sd { namespace toolpanel { @@ -54,7 +54,7 @@ public: /** Create a new sub tool panel with the given window as its parent. This will usually be a child window. */ - SubToolPanel (Window& i_rParentWindow); + SubToolPanel (vcl::Window& i_rParentWindow); virtual ~SubToolPanel (void); virtual void Paint (const Rectangle& rRect); @@ -69,7 +69,7 @@ public: virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); virtual bool IsResizable (void); - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); virtual sal_Int32 GetMinimumWidth (void); virtual void ExpandControl ( @@ -83,7 +83,7 @@ public: using Window::GetWindow; private: - ::Window maWindowFiller; + vcl::Window maWindowFiller; bool mbIsRearrangePending; bool mbIsLayoutPending; sal_uInt32 mnChildrenWidth; diff --git a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx index 5ab6bc63f8ed..d80f5c49683e 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx @@ -47,10 +47,10 @@ public: Derived classes should overload InternalCreateControl. */ - ::std::auto_ptr<TreeNode> CreateControl( ::Window& i_rParent ); + ::std::auto_ptr<TreeNode> CreateControl( vcl::Window& i_rParent ); protected: - virtual TreeNode* InternalCreateControl( ::Window& i_rParent ) = 0; + virtual TreeNode* InternalCreateControl( vcl::Window& i_rParent ) = 0; }; /** A simple helper class that realizes a ControlFactory that is able to create root controls, providing @@ -66,7 +66,7 @@ public: {} protected: - virtual TreeNode* InternalCreateControl( ::Window& i_rParent ) + virtual TreeNode* InternalCreateControl( vcl::Window& i_rParent ) { return new ControlType( i_rParent, mrArgument ); } diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx index deae2e1899b3..96121085cd98 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx @@ -61,11 +61,11 @@ public: /** Return the Window pointer of a tree node. */ - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); /** Return a const pointer to the window of a tree node. */ - virtual const ::Window* GetConstWindow (void) const; + virtual const vcl::Window* GetConstWindow (void) const; /** Return the joined minimum width of all children, i.e. the largest of the minimum widths. diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx index fae55b0777fa..d6910acfbebc 100644 --- a/sd/source/ui/inc/taskpane/TitleBar.hxx +++ b/sd/source/ui/inc/taskpane/TitleBar.hxx @@ -39,7 +39,7 @@ namespace sd { namespace toolpanel { control. 2) Keyboard focus is indicated by a dotted rectangle. */ class TitleBar - : public ::Window, + : public vcl::Window, public TreeNode { public: @@ -51,7 +51,7 @@ public: will be formatted according to the given type. */ TitleBar ( - ::Window* pParent, + vcl::Window* pParent, const OUString& rsTitle, TitleBarType eType, bool bIsExpandable); @@ -61,7 +61,7 @@ public: virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); virtual bool IsResizable (void); - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); virtual sal_Int32 GetMinimumWidth (void); virtual void Paint (const Rectangle& rBoundingBox); diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx index 57f6c6998a12..6282a549a6a7 100644 --- a/sd/source/ui/inc/taskpane/TitledControl.hxx +++ b/sd/source/ui/inc/taskpane/TitledControl.hxx @@ -29,7 +29,7 @@ #include <memory> #include <boost/function.hpp> -class Window; +namespace vcl { class Window; } namespace sd { namespace toolpanel { @@ -39,7 +39,7 @@ class ControlContainer; control are child windows. */ class TitledControl - : public ::Window, + : public vcl::Window, public TreeNode { public: @@ -74,7 +74,7 @@ public: virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); virtual bool IsResizable (void); - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); virtual void Resize (void); virtual void GetFocus (void); diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index 329219eba972..894f5d5bad50 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -66,7 +66,7 @@ public: ToolPanelViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView); virtual ~ToolPanelViewShell (void); @@ -107,10 +107,10 @@ public: /** Relocate all toplevel controls to the given parent window. */ - virtual bool RelocateToParentWindow (::Window* pParentWindow) SAL_OVERRIDE; + virtual bool RelocateToParentWindow (vcl::Window* pParentWindow) SAL_OVERRIDE; /// returns <TRUE/> if and only if the given window is the panel anchor window of our ToolPanelDeck - bool IsPanelAnchorWindow( const ::Window& i_rWindow ) const; + bool IsPanelAnchorWindow( const vcl::Window& i_rWindow ) const; /** creates an XUIElement for the given standard panel */ diff --git a/sd/source/ui/inc/tools/IdleDetection.hxx b/sd/source/ui/inc/tools/IdleDetection.hxx index 305a6895354e..7bdb8401e924 100644 --- a/sd/source/ui/inc/tools/IdleDetection.hxx +++ b/sd/source/ui/inc/tools/IdleDetection.hxx @@ -22,7 +22,7 @@ #include <sal/types.h> -class Window; +namespace vcl { class Window; } namespace sd { namespace tools { @@ -64,7 +64,7 @@ public: IdleStates values or-ed together that describe what the system is currently doing so that the caller can decide what to do. */ - static sal_Int32 GetIdleState (const ::Window* pWindow = NULL); + static sal_Int32 GetIdleState (const vcl::Window* pWindow = NULL); private: /** Check whether there are input events pending. @@ -75,7 +75,7 @@ private: */ static sal_Int32 CheckSlideShowRunning (void); - static sal_Int32 CheckWindowPainting (const ::Window& rWindow); + static sal_Int32 CheckWindowPainting (const vcl::Window& rWindow); }; } } // end of namespace ::sd::tools diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 9b2f241b4970..bb5d33b0e57a 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -44,7 +44,7 @@ class SdActionDlg : public SfxSingleTabDialog private: const SfxItemSet& rOutAttrs; public: - SdActionDlg(Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView); + SdActionDlg(vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView); }; /** @@ -95,10 +95,10 @@ private: sal_uInt16 GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); public: - SdTPAction( Window* pParent, const SfxItemSet& rInAttrs ); + SdTPAction( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SdTPAction(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 632c0c9bf312..353b06eee46f 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -35,10 +35,10 @@ class SdTpOptionsSnap : public SvxGridTabPage { public: - SdTpOptionsSnap( Window* pParent, const SfxItemSet& rInAttrs ); + SdTpOptionsSnap( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SdTpOptionsSnap(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; @@ -56,10 +56,10 @@ private: CheckBox* m_pCbxMoveOutline; public: - SdTpOptionsContents( Window* pParent, const SfxItemSet& rInAttrs ); + SdTpOptionsContents( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SdTpOptionsContents(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; }; @@ -129,10 +129,10 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; public: - SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ); + SdTpOptionsMisc( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SdTpOptionsMisc(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx index 24e4872d8653..153343dae933 100644 --- a/sd/source/ui/inc/vectdlg.hxx +++ b/sd/source/ui/inc/vectdlg.hxx @@ -80,7 +80,7 @@ class SdVectorizeDlg : public ModalDialog public: - SdVectorizeDlg( Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ); + SdVectorizeDlg( vcl::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ); virtual ~SdVectorizeDlg(); const GDIMetaFile& GetGDIMetaFile() const { return aMtf; } diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index 8aec53b0b9b9..7b33475eb6ab 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -724,8 +724,8 @@ awt::Point PresenterCanvas::GetOffset (const Reference<awt::XWindow>& rxBaseWind mbOffsetUpdatePending = false; if (mxWindow.is() && rxBaseWindow.is()) { - ::Window* pWindow = VCLUnoHelper::GetWindow(mxWindow); - ::Window* pSharedWindow = VCLUnoHelper::GetWindow(rxBaseWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(mxWindow); + vcl::Window* pSharedWindow = VCLUnoHelper::GetWindow(rxBaseWindow); if (pWindow!=NULL && pSharedWindow!=NULL) { Rectangle aBox = pWindow->GetWindowExtentsRelative(pSharedWindow); @@ -745,11 +745,11 @@ awt::Point PresenterCanvas::GetOffset (const Reference<awt::XWindow>& rxBaseWind { ::basegfx::B2DRectangle aClipRectangle; - ::Window* pWindow = VCLUnoHelper::GetWindow(mxWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(mxWindow); if (pWindow == NULL) return ::basegfx::B2DRectangle(); - ::Window* pSharedWindow = VCLUnoHelper::GetWindow(mxSharedWindow); + vcl::Window* pSharedWindow = VCLUnoHelper::GetWindow(mxSharedWindow); if (pSharedWindow == NULL) return ::basegfx::B2DRectangle(); diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index bef771fa2847..7083b69207ae 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -94,17 +94,17 @@ Reference<awt::XWindow> SAL_CALL PresenterHelper::createWindow ( sal_Bool bEnableParentClip) throw (css::uno::RuntimeException, std::exception) { - ::Window* pParentWindow = VCLUnoHelper::GetWindow(rxParentWindow); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(rxParentWindow); // Create a new window. - ::Window* pWindow = NULL; + vcl::Window* pWindow = NULL; if (bCreateSystemChildWindow) { pWindow = new WorkWindow(pParentWindow, WB_SYSTEMCHILDWINDOW); } else { - pWindow = new ::Window(pParentWindow); + pWindow = new vcl::Window(pParentWindow); } Reference<awt::XWindow> xWindow (pWindow->GetComponentInterface(), UNO_QUERY); @@ -170,7 +170,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas ( // No shared window is given or an explicit canvas service name is // specified. Create a new canvas. - ::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); if (pWindow != NULL) { Sequence<Any> aArg (5); @@ -200,7 +200,7 @@ void SAL_CALL PresenterHelper::toTop ( const Reference<awt::XWindow>& rxWindow) throw (css::uno::RuntimeException, std::exception) { - ::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); if (pWindow != NULL) { pWindow->ToTop(); @@ -443,7 +443,7 @@ void SAL_CALL PresenterHelper::captureMouse ( ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); // Capture the mouse (if not already done.) - ::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); if (pWindow != NULL && ! pWindow->IsMouseCaptured()) { pWindow->CaptureMouse(); @@ -456,7 +456,7 @@ void SAL_CALL PresenterHelper::releaseMouse (const Reference<awt::XWindow>& rxWi ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); // Release the mouse (if not already done.) - ::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); if (pWindow != NULL && pWindow->IsMouseCaptured()) { pWindow->ReleaseMouse(); @@ -468,8 +468,8 @@ awt::Rectangle PresenterHelper::getWindowExtentsRelative ( const Reference<awt::XWindow>& rxParentWindow) throw (RuntimeException, std::exception) { - ::Window* pChildWindow = VCLUnoHelper::GetWindow(rxChildWindow); - ::Window* pParentWindow = VCLUnoHelper::GetWindow(rxParentWindow); + vcl::Window* pChildWindow = VCLUnoHelper::GetWindow(rxChildWindow); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(rxParentWindow); if (pChildWindow!=NULL && pParentWindow!=NULL) { Rectangle aBox (pChildWindow->GetWindowExtentsRelative(pParentWindow)); diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx index 08c9dda54c65..b0ff1af75dcd 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx @@ -78,7 +78,7 @@ public: }; MasterPagesSelector* AllMasterPagesSelector::Create ( - ::Window* pParent, + vcl::Window* pParent, ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) { @@ -102,7 +102,7 @@ MasterPagesSelector* AllMasterPagesSelector::Create ( } AllMasterPagesSelector::AllMasterPagesSelector ( - ::Window* pParent, + vcl::Window* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx index eebc8691fa8a..0ce98e24ada6 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx @@ -38,7 +38,7 @@ class AllMasterPagesSelector { public: static MasterPagesSelector* Create ( - ::Window* pParent, + vcl::Window* pParent, ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); @@ -59,7 +59,7 @@ private: ::std::auto_ptr<SortedMasterPageDescriptorList> mpSortedMasterPages; AllMasterPagesSelector ( - ::Window* pParent, + vcl::Window* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index 4525bc8c16cb..00d0f8d5eea6 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star; namespace sd { namespace sidebar { MasterPagesSelector* CurrentMasterPagesSelector::Create ( - ::Window* pParent, + vcl::Window* pParent, ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) { @@ -67,7 +67,7 @@ MasterPagesSelector* CurrentMasterPagesSelector::Create ( } CurrentMasterPagesSelector::CurrentMasterPagesSelector ( - ::Window* pParent, + vcl::Window* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx index 2a11328a88e6..e5c2932b90be 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx @@ -36,7 +36,7 @@ class CurrentMasterPagesSelector { public: static MasterPagesSelector* Create ( - ::Window* pParent, + vcl::Window* pParent, ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); @@ -62,7 +62,7 @@ private: css::uno::Reference<css::lang::XComponent> mxListener; CurrentMasterPagesSelector ( - ::Window* pParent, + vcl::Window* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.cxx b/sd/source/ui/sidebar/CustomAnimationPanel.cxx index d0bd23a5fcbe..804b6c143aa7 100644 --- a/sd/source/ui/sidebar/CustomAnimationPanel.cxx +++ b/sd/source/ui/sidebar/CustomAnimationPanel.cxx @@ -25,7 +25,7 @@ namespace sd { namespace sidebar { CustomAnimationPanel::CustomAnimationPanel ( - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) @@ -43,8 +43,8 @@ CustomAnimationPanel::~CustomAnimationPanel (void) { } -::Window* CustomAnimationPanel::CreateWrappedControl ( - ::Window* pParentWindow, +::vcl::Window* CustomAnimationPanel::CreateWrappedControl ( + ::vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) { return createCustomAnimationPanel(pParentWindow, rViewShellBase, mxFrame); diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.hxx b/sd/source/ui/sidebar/CustomAnimationPanel.hxx index cb391919564c..f9a9d708c8e3 100644 --- a/sd/source/ui/sidebar/CustomAnimationPanel.hxx +++ b/sd/source/ui/sidebar/CustomAnimationPanel.hxx @@ -29,7 +29,7 @@ class CustomAnimationPanel { public: CustomAnimationPanel ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); virtual ~CustomAnimationPanel (void); @@ -38,8 +38,8 @@ public: virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; protected: - virtual ::Window* CreateWrappedControl ( - ::Window* pParentWindow, + virtual vcl::Window* CreateWrappedControl ( + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) SAL_OVERRIDE; private: diff --git a/sd/source/ui/sidebar/IDisposable.hxx b/sd/source/ui/sidebar/IDisposable.hxx index ef68ac282788..41dc811e0f57 100644 --- a/sd/source/ui/sidebar/IDisposable.hxx +++ b/sd/source/ui/sidebar/IDisposable.hxx @@ -22,7 +22,7 @@ #include <tools/gen.hxx> #include <sal/types.h> -class Window; +namespace vcl { class Window; } namespace sd { namespace sidebar { diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index ebf319ce6ce9..4e15c5c56abd 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -121,7 +121,7 @@ static const snewfoil_value_info standard[] = }; LayoutMenu::LayoutMenu ( - ::Window* pParent, + vcl::Window* pParent, ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) : ValueSet (pParent, WB_ITEMBORDER), diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index 2e65d19f938e..45fce7f55c08 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -69,7 +69,7 @@ public: the view shell of the task pane. */ LayoutMenu ( - ::Window* pParent, + vcl::Window* pParent, ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); virtual ~LayoutMenu (void); @@ -84,7 +84,7 @@ public: // From ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; - // From ::Window + // From vcl::Window virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE; virtual void Resize (void) SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index a9602906c702..e198b0f681c9 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -61,7 +61,7 @@ using namespace ::com::sun::star::text; namespace sd { namespace sidebar { MasterPagesSelector::MasterPagesSelector ( - ::Window* pParent, + ::vcl::Window* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, @@ -500,7 +500,7 @@ bool MasterPagesSelector::IsResizable (void) return false; } -::Window* MasterPagesSelector::GetWindow (void) +::vcl::Window* MasterPagesSelector::GetWindow (void) { return this; } diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index e299b12eae8c..1d9097f9d4c3 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -57,7 +57,7 @@ class MasterPagesSelector { public: MasterPagesSelector ( - ::Window* pParent, + vcl::Window* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, @@ -83,7 +83,7 @@ public: virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); virtual bool IsResizable (void); - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); virtual sal_Int32 GetMinimumWidth (void); /** Update the selection of previews according to whatever diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx b/sd/source/ui/sidebar/NavigatorWrapper.cxx index 3df03cc05f88..3197ffcb7daa 100644 --- a/sd/source/ui/sidebar/NavigatorWrapper.cxx +++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx @@ -28,7 +28,7 @@ namespace sd { namespace sidebar { NavigatorWrapper::NavigatorWrapper ( - ::Window* pParent, + vcl::Window* pParent, sd::ViewShellBase& rViewShellBase, SfxBindings* pBindings) : Control(pParent, 0), diff --git a/sd/source/ui/sidebar/NavigatorWrapper.hxx b/sd/source/ui/sidebar/NavigatorWrapper.hxx index 61445b1b984a..edc258ffae64 100644 --- a/sd/source/ui/sidebar/NavigatorWrapper.hxx +++ b/sd/source/ui/sidebar/NavigatorWrapper.hxx @@ -41,7 +41,7 @@ class NavigatorWrapper { public: NavigatorWrapper ( - ::Window* pParent, + vcl::Window* pParent, sd::ViewShellBase& rViewShellBase, SfxBindings* pBindings); diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx index 270705054c93..a159d80e86ee 100644 --- a/sd/source/ui/sidebar/PanelBase.cxx +++ b/sd/source/ui/sidebar/PanelBase.cxx @@ -22,7 +22,7 @@ namespace sd { namespace sidebar { PanelBase::PanelBase ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) : Control(pParentWindow), mpWrappedControl(NULL), diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx index f2e54b0f1aae..797308f83187 100644 --- a/sd/source/ui/sidebar/PanelBase.hxx +++ b/sd/source/ui/sidebar/PanelBase.hxx @@ -42,7 +42,7 @@ class PanelBase { public: PanelBase ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase); virtual ~PanelBase (void); @@ -63,9 +63,9 @@ public: ::com::sun::star::accessibility::XAccessible>& rxParent); protected: - ::boost::scoped_ptr< ::Window> mpWrappedControl; - virtual ::Window* CreateWrappedControl ( - ::Window* pParentWindow, + ::boost::scoped_ptr< vcl::Window> mpWrappedControl; + virtual vcl::Window* CreateWrappedControl ( + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) = 0; private: diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx index a64b986ffbba..3bff21b0b05a 100644 --- a/sd/source/ui/sidebar/PanelFactory.cxx +++ b/sd/source/ui/sidebar/PanelFactory.cxx @@ -114,7 +114,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( Reference<ui::XSidebar> xSidebar (aArguments.getOrDefault("Sidebar", Reference<ui::XSidebar>())); // Throw exceptions when the arguments are not as expected. - ::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); if ( ! xParentWindow.is() || pParentWindow==NULL) throw RuntimeException( "PanelFactory::createUIElement called without ParentWindow"); @@ -140,7 +140,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( SfxBindings* pBindings = reinterpret_cast<SfxBindings*>(nBindingsValue); // Create a framework view. - ::Window* pControl = NULL; + vcl::Window* pControl = NULL; css::ui::LayoutSize aLayoutSize (-1,-1,-1); #define EndsWith(s,t) s.endsWithAsciiL(t,strlen(t)) diff --git a/sd/source/ui/sidebar/PreviewValueSet.cxx b/sd/source/ui/sidebar/PreviewValueSet.cxx index e532d7ace50f..59242ddbae8d 100644 --- a/sd/source/ui/sidebar/PreviewValueSet.cxx +++ b/sd/source/ui/sidebar/PreviewValueSet.cxx @@ -22,7 +22,7 @@ namespace sd { namespace sidebar { -PreviewValueSet::PreviewValueSet (::Window* pParent) +PreviewValueSet::PreviewValueSet (vcl::Window* pParent) : ValueSet (pParent, WB_TABSTOP), maPreviewSize(10,10), mnBorderWidth(3), diff --git a/sd/source/ui/sidebar/PreviewValueSet.hxx b/sd/source/ui/sidebar/PreviewValueSet.hxx index 9bd390f7c18f..8ed413de2351 100644 --- a/sd/source/ui/sidebar/PreviewValueSet.hxx +++ b/sd/source/ui/sidebar/PreviewValueSet.hxx @@ -30,7 +30,7 @@ class PreviewValueSet : public ValueSet { public: - PreviewValueSet (::Window* pParent); + PreviewValueSet (vcl::Window* pParent); virtual ~PreviewValueSet (void); void SetRightMouseClickHandler (const Link& rLink); diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx index 2705e2b31392..002f088746bf 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx @@ -33,7 +33,7 @@ namespace sd { namespace sidebar { MasterPagesSelector* RecentMasterPagesSelector::Create ( - ::Window* pParent, + vcl::Window* pParent, ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) { @@ -57,7 +57,7 @@ MasterPagesSelector* RecentMasterPagesSelector::Create ( } RecentMasterPagesSelector::RecentMasterPagesSelector ( - ::Window* pParent, + vcl::Window* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx index f5bacc780c53..0c1c53f67ccd 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx @@ -31,7 +31,7 @@ class RecentMasterPagesSelector { public: static MasterPagesSelector* Create ( - ::Window* pParent, + vcl::Window* pParent, ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); @@ -59,7 +59,7 @@ protected: private: RecentMasterPagesSelector ( - ::Window* pParent, + vcl::Window* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, diff --git a/sd/source/ui/sidebar/SidebarFocusManager.hxx b/sd/source/ui/sidebar/SidebarFocusManager.hxx index 2904dd56767c..6fde5d417695 100644 --- a/sd/source/ui/sidebar/SidebarFocusManager.hxx +++ b/sd/source/ui/sidebar/SidebarFocusManager.hxx @@ -26,7 +26,7 @@ #include <memory> class VclSimpleEvent; -class Window; +namespace vcl { class Window; } namespace sd { namespace toolpanel { @@ -54,8 +54,8 @@ public: window to the target window. */ void RegisterLink ( - ::Window* pSource, - ::Window* pTarget, + vcl::Window* pSource, + vcl::Window* pTarget, const vcl::KeyCode& rKey); /** Register a link that will move the focus from the source window to @@ -66,7 +66,7 @@ public: @param pTarget The window to which the focus will be transferred. */ - void RegisterUpLink (::Window* pSource, ::Window* pTarget); + void RegisterUpLink (vcl::Window* pSource, vcl::Window* pTarget); /** Register a link that will move the focus from the source window to the target window when the source window is focused and KEY_RETURN @@ -76,15 +76,15 @@ public: @param pTarget The window to which the focus will be transferred. */ - void RegisterDownLink (::Window* pSource, ::Window* pTarget); + void RegisterDownLink (vcl::Window* pSource, vcl::Window* pTarget); /** Remove all links from the source window to the target window. When there are links from the target window to the source window then these are not touced. */ void RemoveLinks ( - ::Window* pSource, - ::Window* pTarget); + vcl::Window* pSource, + vcl::Window* pTarget); /** Let the focus manager transfer the focus from the specified source window to a target window that is determined according the the @@ -92,7 +92,7 @@ public: When there is no rule for this combination of source window and key code then the focus stays where it is. */ - bool TransferFocus (::Window* pSource, const vcl::KeyCode& rCode); + bool TransferFocus (vcl::Window* pSource, const vcl::KeyCode& rCode); private: friend struct FocusManagerCreator; @@ -110,12 +110,12 @@ private: /** Remove all links from or to the given window. */ - void RemoveLinks (::Window* pWindow); + void RemoveLinks (vcl::Window* pWindow); /** Unregister as event listener from the given window when there are no links from this window anymore. */ - void RemoveUnusedEventListener (::Window* pWindow); + void RemoveUnusedEventListener (vcl::Window* pWindow); /** Listen for key events and on KEY_RETURN go down and on KEY_ESCAPE go up. diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.cxx b/sd/source/ui/sidebar/SlideTransitionPanel.cxx index cc9a5776cafc..7051d3a957db 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.cxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.cxx @@ -25,7 +25,7 @@ namespace sd { namespace sidebar { SlideTransitionPanel::SlideTransitionPanel ( - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) @@ -41,8 +41,8 @@ SlideTransitionPanel::~SlideTransitionPanel (void) { } -::Window* SlideTransitionPanel::CreateWrappedControl ( - ::Window* pParentWindow, +::vcl::Window* SlideTransitionPanel::CreateWrappedControl ( + ::vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) { return createSlideTransitionPanel(pParentWindow, rViewShellBase, mxFrame); @@ -50,7 +50,7 @@ SlideTransitionPanel::~SlideTransitionPanel (void) css::ui::LayoutSize SlideTransitionPanel::GetHeightForWidth (const sal_Int32 /*nWidth*/) { - Window *pControl = mpWrappedControl.get(); + vcl::Window *pControl = mpWrappedControl.get(); sal_Int32 nMinimumHeight = pControl ? pControl->get_preferred_size().Height() : 0; return css::ui::LayoutSize(nMinimumHeight,-1, nMinimumHeight); } diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.hxx b/sd/source/ui/sidebar/SlideTransitionPanel.hxx index 74ef56a4d9a9..ab36313cbea6 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.hxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.hxx @@ -29,7 +29,7 @@ class SlideTransitionPanel { public: SlideTransitionPanel ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ); virtual ~SlideTransitionPanel (void); @@ -38,8 +38,8 @@ public: virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; protected: - virtual ::Window* CreateWrappedControl ( - ::Window* pParentWindow, + virtual vcl::Window* CreateWrappedControl ( + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) SAL_OVERRIDE; private: diff --git a/sd/source/ui/sidebar/TableDesignPanel.cxx b/sd/source/ui/sidebar/TableDesignPanel.cxx index 61212dd7db17..f0008cd28a88 100644 --- a/sd/source/ui/sidebar/TableDesignPanel.cxx +++ b/sd/source/ui/sidebar/TableDesignPanel.cxx @@ -25,7 +25,7 @@ namespace sd { namespace sidebar { TableDesignPanel::TableDesignPanel ( - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) : PanelBase(pParentWindow, rViewShellBase) { @@ -38,8 +38,8 @@ TableDesignPanel::~TableDesignPanel (void) { } -::Window* TableDesignPanel::CreateWrappedControl ( - ::Window* pParentWindow, +::vcl::Window* TableDesignPanel::CreateWrappedControl ( + ::vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) { return createTableDesignPanel(pParentWindow, rViewShellBase); diff --git a/sd/source/ui/sidebar/TableDesignPanel.hxx b/sd/source/ui/sidebar/TableDesignPanel.hxx index 25d125dc510a..9d9c5d188c4b 100644 --- a/sd/source/ui/sidebar/TableDesignPanel.hxx +++ b/sd/source/ui/sidebar/TableDesignPanel.hxx @@ -28,7 +28,7 @@ class TableDesignPanel { public: TableDesignPanel ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase); virtual ~TableDesignPanel (void); @@ -36,8 +36,8 @@ public: virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; protected: - virtual ::Window* CreateWrappedControl ( - ::Window* pParentWindow, + virtual vcl::Window* CreateWrappedControl ( + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) SAL_OVERRIDE; }; diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 29038e6cf8db..019d2bb0d0c6 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -41,7 +41,7 @@ namespace sd { static const sal_uLong HIDE_MOUSE_TIMEOUT = 10000; static const sal_uLong SHOW_MOUSE_TIMEOUT = 1000; -ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, ::Window* pParent ) +ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, vcl::Window* pParent ) : ::sd::Window( pParent ) , mnPauseTimeout( SLIDE_NO_TIMEOUT ) , mnRestartPageIndex( PAGE_NO_END ) @@ -642,7 +642,7 @@ void ShowWindow::AddWindowToPaintView() else { OSL_TRACE ("::sd::Window::CreateAccessible: no view shell"); - return ::Window::CreateAccessible (); + return vcl::Window::CreateAccessible (); } } } // end of namespace sd diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index db3dc2c51ab9..3fbbcef0dd79 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -49,7 +49,7 @@ class ShowWindow { public: - ShowWindow ( const ::rtl::Reference< ::sd::SlideshowImpl >& xController, ::Window* pParent ); + ShowWindow ( const ::rtl::Reference< ::sd::SlideshowImpl >& xController, vcl::Window* pParent ); virtual ~ShowWindow (void); bool SetEndMode(); diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index eaf5b737c4fe..85ac816c667b 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -185,7 +185,7 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( ViewShellBase& rBase ) bool SlideShow::StartPreview( ViewShellBase& rBase, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode, - ::Window* pParent /* = 0 */ ) + vcl::Window* pParent /* = 0 */ ) { rtl::Reference< SlideShow > xSlideShow( GetSlideShow( rBase ) ); if( xSlideShow.is() ) @@ -213,7 +213,7 @@ bool SlideShow::IsRunning( ViewShell& rViewShell ) return xSlideShow.is() && xSlideShow->isRunning() && (xSlideShow->mxController->getViewShell() == &rViewShell); } -void SlideShow::CreateController( ViewShell* pViewSh, ::sd::View* pView, ::Window* pParentWindow ) +void SlideShow::CreateController( ViewShell* pViewSh, ::sd::View* pView, vcl::Window* pParentWindow ) { DBG_ASSERT( !mxController.is(), "sd::SlideShow::CreateController(), clean up old controller first!" ); @@ -900,7 +900,7 @@ void SAL_CALL SlideShow::disposing (void) mpDoc = 0; } -bool SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Reference< XAnimationNode >& xAnimationNode, ::Window* pParent ) +bool SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Reference< XAnimationNode >& xAnimationNode, vcl::Window* pParent ) { Sequence< PropertyValue > aArguments(4); @@ -1108,7 +1108,7 @@ void SlideShow::StartInPlacePresentation() } else { - ::Window* pParentWindow = mxCurrentSettings->mpParentWindow; + vcl::Window* pParentWindow = mxCurrentSettings->mpParentWindow; if( pParentWindow == 0 ) pParentWindow = mpCurrentViewShellBase->GetViewWindow(); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 1414e0904854..a6ccac9a5f22 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -487,7 +487,7 @@ void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow } } -SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, ::Window* pParentWindow ) +SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, vcl::Window* pParentWindow ) : SlideshowImplBase( m_aMutex ) , mxModel(pDoc->getUnoModel(),UNO_QUERY_THROW) , mpView(pView) @@ -756,7 +756,7 @@ void SAL_CALL SlideshowImpl::disposing() bool SlideshowImpl::startPreview( const Reference< XDrawPage >& xDrawPage, const Reference< XAnimationNode >& xAnimationNode, - ::Window* pParent ) + vcl::Window* pParent ) { bool bRet = false; diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index da7c56e6665b..901f09e45529 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -91,7 +91,7 @@ struct PresentationSettingsEx : public PresentationSettings { bool mbRehearseTimings; bool mbPreview; - ::Window* mpParentWindow; + vcl::Window* mpParentWindow; css::uno::Reference< css::drawing::XDrawPage > mxStartPage; css::uno::Reference< css::animations::XAnimationNode > mxAnimationNode; @@ -164,7 +164,7 @@ friend class SlideShow; friend class SlideShowView; public: - explicit SlideshowImpl( const css::uno::Reference< css::presentation::XPresentation2 >& xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, ::Window* pParentWindow); + explicit SlideshowImpl( const css::uno::Reference< css::presentation::XPresentation2 >& xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, vcl::Window* pParentWindow); // css::presentation::XSlideShowController: virtual sal_Bool SAL_CALL getAlwaysOnTop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -250,7 +250,7 @@ private: bool startPreview( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode, - ::Window* pParent ); + vcl::Window* pParent ); ShowWindow* getShowWindow() const { return mpShowWindow; } @@ -337,7 +337,7 @@ private: SdDrawDocument* mpDoc; SfxItemSet* mpNewAttr; - ::Window* mpParentWindow; + vcl::Window* mpParentWindow; ShowWindow* mpShowWindow; PushButton* mpTimeButton; diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index b3f920a4692a..20d627eaedad 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -123,7 +123,7 @@ SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter) if (pWindow) { // The whole background is painted by the view and controls. - ::Window* pParentWindow = pWindow->GetParent(); + ::vcl::Window* pParentWindow = pWindow->GetParent(); OSL_ASSERT(pParentWindow!=NULL); pParentWindow->SetBackground (Wallpaper()); @@ -267,7 +267,7 @@ ScrollBarManager& SlideSorterController::GetScrollBarManager (void) void SlideSorterController::Paint ( const Rectangle& rBBox, - ::Window* pWindow) + ::vcl::Window* pWindow) { if (mnPaintEntranceCount == 0) { @@ -542,7 +542,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent*, pEvent) { if (pEvent != NULL) { - ::Window* pWindow = pEvent->GetWindow(); + ::vcl::Window* pWindow = pEvent->GetWindow(); SharedSdWindow pActiveWindow (mrSlideSorter.GetContentWindow()); switch (pEvent->GetId()) { diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index fee1e6c96446..f633a4fe8ae5 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -217,7 +217,7 @@ void Clipboard::HandleSlotCall (SfxRequest& rRequest) } } -void Clipboard::DoCut (::Window* pWindow) +void Clipboard::DoCut (::vcl::Window* pWindow) { if (mrSlideSorter.GetModel().GetPageCount() > 1) { @@ -226,7 +226,7 @@ void Clipboard::DoCut (::Window* pWindow) } } -void Clipboard::DoDelete (::Window* ) +void Clipboard::DoDelete (::vcl::Window* ) { if (mrSlideSorter.GetModel().GetPageCount() > 1) { @@ -234,12 +234,12 @@ void Clipboard::DoDelete (::Window* ) } } -void Clipboard::DoCopy (::Window* pWindow ) +void Clipboard::DoCopy (::vcl::Window* pWindow ) { CreateSlideTransferable( pWindow, false ); } -void Clipboard::DoPaste (::Window* pWindow) +void Clipboard::DoPaste (::vcl::Window* pWindow) { SdTransferable* pClipTransferable = SD_MOD()->pTransferClip; @@ -259,7 +259,7 @@ void Clipboard::DoPaste (::Window* pWindow) } } -sal_Int32 Clipboard::GetInsertionPosition (::Window* pWindow) +sal_Int32 Clipboard::GetInsertionPosition (::vcl::Window* pWindow) { sal_Int32 nInsertPosition = -1; @@ -377,7 +377,7 @@ void Clipboard::SelectPageRange (sal_Int32 nFirstIndex, sal_Int32 nPageCount) } void Clipboard::CreateSlideTransferable ( - ::Window* pWindow, + ::vcl::Window* pWindow, bool bDrag) { std::vector<OUString> aBookmarkList; @@ -442,7 +442,7 @@ void Clipboard::CreateSlideTransferable ( aObjDesc.maDisplayName = pDocument->GetDocSh() ->GetMedium()->GetURLObject().GetURLNoPass(); - ::Window* pActionWindow = pWindow; + ::vcl::Window* pActionWindow = pWindow; if (pActionWindow == NULL) { ViewShell* pViewShell = mrSlideSorter.GetViewShell(); @@ -556,7 +556,7 @@ void Clipboard::CreateSlideTransferable ( void Clipboard::StartDrag ( const Point& rPosition, - ::Window* pWindow) + ::vcl::Window* pWindow) { maPagesToRemove.clear(); maPagesToSelect.clear(); diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 0da6c42d5874..6f66ccd60261 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -290,12 +290,12 @@ public: #else SelectionFunction& rSelectionFunction, const Point& rMousePosition, - ::Window* pWindow); + ::vcl::Window* pWindow); #endif virtual ~DragAndDropModeHandler (void); #ifndef MACOSX - void Initialize(const Point& rMousePosition, ::Window* pWindow); + void Initialize(const Point& rMousePosition, ::vcl::Window* pWindow); #endif virtual SelectionFunction::Mode GetMode (void) const SAL_OVERRIDE; @@ -390,7 +390,7 @@ bool SelectionFunction::KeyInput (const KeyEvent& rEvent) FocusManager& rFocusManager (mrController.GetFocusManager()); bool bResult = false; - const vcl::KeyCode& rCode (rEvent.GetKeyCode()); + const ::vcl::KeyCode& rCode (rEvent.GetKeyCode()); switch (rCode.GetCode()) { case KEY_RETURN: @@ -1508,14 +1508,14 @@ DragAndDropModeHandler::DragAndDropModeHandler ( #else SelectionFunction& rSelectionFunction, const Point& rMousePosition, - ::Window* pWindow) + ::vcl::Window* pWindow) #endif : ModeHandler(rSlideSorter, rSelectionFunction, false) { #ifndef MACOSX } -void DragAndDropModeHandler::Initialize(const Point& rMousePosition, ::Window* pWindow) +void DragAndDropModeHandler::Initialize(const Point& rMousePosition, ::vcl::Window* pWindow) { #endif SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag; diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index a86b5fa4f809..993a0b568638 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -122,7 +122,7 @@ public: /** This method forwards the call to the SlideSorterView and executes pending operations like moving selected pages into the visible area. */ - void Paint (const Rectangle& rRect, ::Window* pWin); + void Paint (const Rectangle& rRect, vcl::Window* pWin); void FuTemporary (SfxRequest& rRequest); void FuPermanent (SfxRequest& rRequest); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index e868070879aa..1099a2b1d8ec 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -31,15 +31,13 @@ #include <set> class SfxRequest; -class Window; - struct AcceptDropEvent; class DropTargetHelper; struct ExecuteDropEvent; struct ImplSVEvent; class Point; class SdPage; -class Window; +namespace vcl { class Window; } namespace sd { class Window; @@ -72,14 +70,14 @@ public: void HandleSlotCall (SfxRequest& rRequest); - void DoCut (::Window* pWindow = 0); - void DoCopy (::Window* pWindow = 0); - void DoPaste (::Window* pWindow = 0); - void DoDelete (::Window* pWindow = 0); + void DoCut (::vcl::Window* pWindow = 0); + void DoCopy (::vcl::Window* pWindow = 0); + void DoPaste (::vcl::Window* pWindow = 0); + void DoDelete (::vcl::Window* pWindow = 0); void StartDrag ( const Point& rDragPt, - ::Window* pWindow ); + ::vcl::Window* pWindow ); void DragFinished ( sal_Int8 nDropAction); @@ -141,7 +139,7 @@ private: ImplSVEvent * mnDragFinishedUserEventId; void CreateSlideTransferable ( - ::Window* pWindow, + ::vcl::Window* pWindow, bool bDrag); /** Determine the position of where to insert the pages in the current @@ -153,7 +151,7 @@ private: The index in the range [0,n] (both inclusive) with n the number of pages is returned. */ - sal_Int32 GetInsertionPosition (::Window* pWindow); + sal_Int32 GetInsertionPosition (::vcl::Window* pWindow); /** Paste the pages of the transferable of the sd module at the given position. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index 66d24d22a0eb..8a7fe7c93d57 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -30,10 +30,10 @@ class ScrollBar; class ScrollBarBox; -class Window; +namespace vcl { class Window; } namespace sd { -class Window; +namespace vcl { class Window; } } namespace sd { namespace slidesorter { diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx index 479602b72d43..b0543248a089 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx @@ -36,7 +36,7 @@ class FontProvider : public SdGlobalResource { public: - typedef ::boost::shared_ptr<vcl::Font> SharedFontPointer; + typedef ::boost::shared_ptr<::vcl::Font> SharedFontPointer; /** Return the single instance of this class. Throws a RuntimeException when no instance can be created. diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx index 25d9192716d2..7391e4585d65 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx @@ -133,7 +133,7 @@ private: Rectangle maCustomAnimationEffectBoundingBox; const Image maTransitionEffectIcon; const Image maCustomAnimationEffectIcon; - const ::boost::shared_ptr<vcl::Font> mpPageNumberFont; + const ::boost::shared_ptr<::vcl::Font> mpPageNumberFont; Size GetPageNumberAreaSize (const int nPageCount); Rectangle CalculatePreviewBoundingBox ( diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx index 6cbaa06b29a9..32b91b98ca64 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx @@ -73,7 +73,7 @@ private: ::boost::shared_ptr<cache::PageCache> mpCache; ::boost::shared_ptr<controller::Properties> mpProperties; ::boost::shared_ptr<view::Theme> mpTheme; - ::boost::shared_ptr<vcl::Font> mpPageNumberFont; + ::boost::shared_ptr<::vcl::Font> mpPageNumberFont; ::boost::scoped_ptr<FramePainter> mpShadowPainter; ::boost::scoped_ptr<FramePainter> mpFocusBorderPainter; Bitmap maNormalBackground; diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx index 814bf1a3561c..33b6bee1078b 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx @@ -58,7 +58,7 @@ public: Font_PageNumber, Font_PageCount }; - static ::boost::shared_ptr<vcl::Font> GetFont ( + static ::boost::shared_ptr<::vcl::Font> GetFont ( const FontType eType, const OutputDevice& rDevice); diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 50ac309006cc..04a1de11f9fa 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -50,7 +50,7 @@ namespace { class ContentWindow : public ::sd::Window { public: - ContentWindow(::Window& rParent, SlideSorter& rSlideSorter); + ContentWindow(::vcl::Window& rParent, SlideSorter& rSlideSorter); virtual ~ContentWindow (void); void SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction); virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; @@ -90,7 +90,7 @@ private: ::boost::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, - ::Window& rParentWindow) + ::vcl::Window& rParentWindow) { ::boost::shared_ptr<SlideSorter> pSlideSorter( new SlideSorter( @@ -128,7 +128,7 @@ SlideSorter::SlideSorter ( SlideSorter::SlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, - ::Window& rParentWindow) + ::vcl::Window& rParentWindow) : mbIsValid(false), mpSlideSorterController(), mpSlideSorterModel(), @@ -173,7 +173,7 @@ void SlideSorter::Init (void) SharedSdWindow pContentWindow (GetContentWindow()); if (pContentWindow) { - ::Window* pParentWindow = pContentWindow->GetParent(); + ::vcl::Window* pParentWindow = pContentWindow->GetParent(); if (pParentWindow != NULL) pParentWindow->SetBackground(Wallpaper()); pContentWindow->SetBackground(Wallpaper()); @@ -256,7 +256,7 @@ void SlideSorter::Paint (const Rectangle& rRepaintArea) GetContentWindow().get()); } -void SlideSorter::SetupControls (::Window* ) +void SlideSorter::SetupControls (::vcl::Window* ) { GetVerticalScrollBar()->Show(); mpSlideSorterController->GetScrollBarManager().LateInitialization(); @@ -267,7 +267,7 @@ void SlideSorter::SetupListeners (void) SharedSdWindow pWindow (GetContentWindow()); if (pWindow) { - ::Window* pParentWindow = pWindow->GetParent(); + ::vcl::Window* pParentWindow = pWindow->GetParent(); if (pParentWindow != NULL) pParentWindow->AddEventListener( LINK( @@ -301,7 +301,7 @@ void SlideSorter::ReleaseListeners (void) controller::SlideSorterController, WindowEventHandler)); - ::Window* pParentWindow = pWindow->GetParent(); + ::vcl::Window* pParentWindow = pWindow->GetParent(); if (pParentWindow != NULL) pParentWindow->RemoveEventListener( LINK(mpSlideSorterController.get(), @@ -400,14 +400,14 @@ SvBorder SlideSorter::GetBorder (void) return aBorder; } -bool SlideSorter::RelocateToWindow (::Window* pParentWindow) +bool SlideSorter::RelocateToWindow (::vcl::Window* pParentWindow) { // Stop all animations for they have been started for the old window. mpSlideSorterController->GetAnimator()->RemoveAllAnimations(); ReleaseListeners(); - ::Window *pNewWindow = NULL; + ::vcl::Window *pNewWindow = NULL; if (mpViewShell) { mpViewShell->ViewShell::RelocateToParentWindow(pParentWindow); @@ -465,7 +465,7 @@ void SlideSorter::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction) namespace { ContentWindow::ContentWindow( - ::Window& rParent, + ::vcl::Window& rParent, SlideSorter& rSlideSorter) : ::sd::Window(&rParent), mrSlideSorter(rSlideSorter), diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index 1d15c0935cc1..d167e1a3f533 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -123,7 +123,7 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments) // Get the parent window. mxParentWindow = Reference<awt::XWindow>(rArguments[2], UNO_QUERY_THROW); - ::Window* pParentWindow = VCLUnoHelper::GetWindow(mxParentWindow); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(mxParentWindow); mxParentWindow->addWindowListener(this); diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 1185a64a9e51..708bbb82a256 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -93,7 +93,7 @@ TYPEINIT1(SlideSorterViewShell, ViewShell); ::boost::shared_ptr<SlideSorterViewShell> SlideSorterViewShell::Create ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, FrameView* pFrameViewArgument, const bool bIsCenterPane) { @@ -118,7 +118,7 @@ TYPEINIT1(SlideSorterViewShell, ViewShell); SlideSorterViewShell::SlideSorterViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, FrameView* pFrameViewArgument) : ViewShell (pFrame, pParentWindow, rViewShellBase), mpSlideSorter(), @@ -292,7 +292,7 @@ SlideSorter& SlideSorterViewShell::GetSlideSorter (void) const return *mpSlideSorter; } -bool SlideSorterViewShell::RelocateToParentWindow (::Window* pParentWindow) +bool SlideSorterViewShell::RelocateToParentWindow (::vcl::Window* pParentWindow) { OSL_ASSERT(mpSlideSorter); if ( ! mpSlideSorter) @@ -658,7 +658,7 @@ void SlideSorterViewShell::UpdateScrollBars (void) void SlideSorterViewShell::StartDrag ( const Point& rDragPt, - ::Window* pWindow ) + ::vcl::Window* pWindow ) { OSL_ASSERT(mpSlideSorter.get()!=NULL); mpSlideSorter->GetController().GetClipboard().StartDrag ( diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index e29c86e6ca50..8f89c56397cd 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -348,7 +348,7 @@ void SlideSorterView::UpdateOrientation (void) else { // Get access to the docking window. - ::Window* pWindow = mrSlideSorter.GetContentWindow().get(); + vcl::Window* pWindow = mrSlideSorter.GetContentWindow().get(); PaneDockingWindow* pDockingWindow = NULL; while (pWindow!=NULL && pDockingWindow==NULL) { diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 4e5629b2a825..020e29ab91d2 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -124,7 +124,7 @@ void ToolTip::DoShow (void) if (aBox.Bottom() >= pWindow->GetSizePixel().Height()) return; - ::Window* pParent (pWindow.get()); + vcl::Window* pParent (pWindow.get()); while (pParent!=NULL && pParent->GetParent()!=NULL) pParent = pParent->GetParent(); const Point aOffset (pWindow->GetWindowExtentsRelative(pParent).TopLeft()); diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index ef06796497a2..4776edf2aa6d 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -365,7 +365,7 @@ void TableValueSet::updateSettings() } } -extern "C" SAL_DLLPUBLIC_EXPORT ::Window* SAL_CALL makeTableValueSet(::Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT ::vcl::Window* SAL_CALL makeTableValueSet(::vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -807,12 +807,12 @@ short TableDesignDialog::Execute() return RET_CANCEL; } -::Window * createTableDesignPanel( ::Window* pParent, ViewShellBase& rBase ) +::vcl::Window * createTableDesignPanel( ::vcl::Window* pParent, ViewShellBase& rBase ) { return new TableDesignPane( pParent, rBase ); } -void showTableDesignDialog( ::Window* pParent, ViewShellBase& rBase ) +void showTableDesignDialog( ::vcl::Window* pParent, ViewShellBase& rBase ) { boost::scoped_ptr< TableDesignDialog > xDialog( new TableDesignDialog( pParent, rBase ) ); xDialog->Execute(); diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index 34b7482d8fb5..7175a7bcf857 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -56,7 +56,7 @@ class TableValueSet : public ValueSet private: bool m_bModal; public: - TableValueSet(Window *pParent, WinBits nStyle); + TableValueSet(vcl::Window *pParent, WinBits nStyle); virtual void Resize() SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void updateSettings(); @@ -111,7 +111,7 @@ class TableDesignPane : public PanelLayout private: TableDesignWidget aImpl; public: - TableDesignPane( ::Window* pParent, ViewShellBase& rBase ) + TableDesignPane( vcl::Window* pParent, ViewShellBase& rBase ) : PanelLayout(pParent, "TableDesignPanel", "modules/simpress/ui/tabledesignpanel.ui", com::sun::star::uno::Reference<css::frame::XFrame>()) , aImpl(this, rBase, false) @@ -124,7 +124,7 @@ class TableDesignDialog : public ModalDialog private: TableDesignWidget aImpl; public: - TableDesignDialog( ::Window* pParent, ViewShellBase& rBase ) + TableDesignDialog( vcl::Window* pParent, ViewShellBase& rBase ) : ModalDialog(pParent, "TableDesignDialog", "modules/sdraw/ui/tabledesigndialog.ui") , aImpl(this, rBase, true) @@ -133,7 +133,7 @@ public: virtual short Execute() SAL_OVERRIDE; }; -void showTableDesignDialog( ::Window*, ViewShellBase& ); +void showTableDesignDialog( vcl::Window*, ViewShellBase& ); } diff --git a/sd/source/ui/tools/IdleDetection.cxx b/sd/source/ui/tools/IdleDetection.cxx index e7bafc546bc3..eae76b92d062 100644 --- a/sd/source/ui/tools/IdleDetection.cxx +++ b/sd/source/ui/tools/IdleDetection.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star; namespace sd { namespace tools { -sal_Int32 IdleDetection::GetIdleState (const ::Window* pWindow) +sal_Int32 IdleDetection::GetIdleState (const vcl::Window* pWindow) { sal_Int32 nResult (CheckInputPending() | CheckSlideShowRunning()); if (pWindow != NULL) @@ -93,7 +93,7 @@ sal_Int32 IdleDetection::CheckSlideShowRunning (void) return eResult; } -sal_Int32 IdleDetection::CheckWindowPainting (const ::Window& rWindow) +sal_Int32 IdleDetection::CheckWindowPainting (const vcl::Window& rWindow) { if (rWindow.IsInPaint()) return IDET_WINDOW_PAINTING; diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index 3d2cb47c0a3b..5a72e6691027 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -37,7 +37,7 @@ class FormShellManagerFactory { public: FormShellManagerFactory (ViewShell& rViewShell, FormShellManager& rManager); - virtual FmFormShell* CreateShell (ShellId nId, ::Window* pParentWindow, FrameView* pFrameView) SAL_OVERRIDE; + virtual FmFormShell* CreateShell (ShellId nId, vcl::Window* pParentWindow, FrameView* pFrameView) SAL_OVERRIDE; virtual void ReleaseShell (SfxShell* pShell) SAL_OVERRIDE; private: @@ -302,7 +302,7 @@ FormShellManagerFactory::FormShellManagerFactory ( FmFormShell* FormShellManagerFactory::CreateShell ( ::sd::ShellId nId, - ::Window*, + vcl::Window*, ::sd::FrameView*) { FmFormShell* pShell = NULL; diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 8b9676634119..ccca4876a8f2 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -104,7 +104,7 @@ public: void ProvideOutlinerView ( Outliner& rOutliner, const ::boost::shared_ptr<ViewShell>& rpViewShell, - ::Window* pWindow); + vcl::Window* pWindow); /** This method is called when the OutlinerView is no longer used. */ @@ -1582,7 +1582,7 @@ sal_uInt16 Outliner::ShowModalMessageBox (Dialog& rMessageBox) // while the message box is being shown. We also have to take into // account that we are called during a spell check and the search dialog // is not available. - ::Window* pSearchDialog = NULL; + vcl::Window* pSearchDialog = NULL; SfxChildWindow* pChildWindow = NULL; switch (meMode) { @@ -1643,7 +1643,7 @@ Outliner::Implementation::~Implementation (void) void Outliner::Implementation::ProvideOutlinerView ( Outliner& rOutliner, const ::boost::shared_ptr<ViewShell>& rpViewShell, - ::Window* pWindow) + vcl::Window* pWindow) { if (rpViewShell.get() != NULL) { diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index ae6832b33c6a..723a6d814ed7 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -139,7 +139,7 @@ public: the content window. It does not include the ViewTabBar. */ - ::boost::scoped_ptr< ::Window> mpViewWindow; + ::boost::scoped_ptr< vcl::Window> mpViewWindow; ::boost::shared_ptr<ToolBarManager> mpToolBarManager; ::boost::shared_ptr<ViewShellManager> mpViewShellManager; ::boost::shared_ptr<tools::EventMultiplexer> mpEventMultiplexer; @@ -199,10 +199,10 @@ namespace { window of the main view shell. With the key press it forwards the focus so that it is not called very often. */ -class FocusForwardingWindow : public ::Window +class FocusForwardingWindow : public vcl::Window { public: - FocusForwardingWindow (::Window& rParentWindow, ViewShellBase& rBase); + FocusForwardingWindow (vcl::Window& rParentWindow, ViewShellBase& rBase); virtual ~FocusForwardingWindow (void); virtual void KeyInput (const KeyEvent& rEvent) SAL_OVERRIDE; virtual void Command (const CommandEvent& rEvent) SAL_OVERRIDE; @@ -955,7 +955,7 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB mpImpl->mpViewTabBar = rViewTabBar; } -::Window* ViewShellBase::GetViewWindow (void) +::vcl::Window* ViewShellBase::GetViewWindow (void) { OSL_ASSERT(mpImpl.get()!=NULL); @@ -1375,9 +1375,9 @@ void CurrentPageSetter::operator() (bool) namespace sd { namespace { FocusForwardingWindow::FocusForwardingWindow ( - ::Window& rParentWindow, + vcl::Window& rParentWindow, ViewShellBase& rBase) - : ::Window(&rParentWindow, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)), + : vcl::Window(&rParentWindow, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)), mrBase(rBase) { OSL_TRACE("created FocusForwardingWindow at %x", this); @@ -1393,7 +1393,7 @@ void FocusForwardingWindow::KeyInput (const KeyEvent& rKEvt) ::boost::shared_ptr<ViewShell> pViewShell = mrBase.GetMainViewShell(); if (pViewShell.get() != NULL) { - ::Window* pWindow = pViewShell->GetActiveWindow(); + vcl::Window* pWindow = pViewShell->GetActiveWindow(); if (pWindow != NULL) { // Forward the focus so that the window is called directly the @@ -1410,7 +1410,7 @@ void FocusForwardingWindow::Command (const CommandEvent& rEvent) ::boost::shared_ptr<ViewShell> pViewShell = mrBase.GetMainViewShell(); if (pViewShell.get() != NULL) { - ::Window* pWindow = pViewShell->GetActiveWindow(); + vcl::Window* pWindow = pViewShell->GetActiveWindow(); if (pWindow != NULL) { pWindow->Command(rEvent); diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index f52e89bb5776..d2508afe311b 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -59,7 +59,7 @@ public: ShellDescriptor (const ShellDescriptor& rDescriptor); ShellDescriptor& operator= (const ShellDescriptor& rDescriptor); bool IsMainViewShell (void) const; - ::Window* GetWindow (void) const; + ::vcl::Window* GetWindow (void) const; }; /** This functor can be used to search for a shell in an STL container when the @@ -218,7 +218,7 @@ private: ShellDescriptor CreateSubShell ( SfxShell* pShell, ShellId nShellId, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, FrameView* pFrameView); void DestroyViewShell (ShellDescriptor& rDescriptor); void DestroySubShell ( @@ -417,7 +417,7 @@ void ViewShellManager::Implementation::ActivateViewShell (ViewShell* pViewShell) // window can be moved to the top of the shell stack. if (aResult.mpShell != NULL) { - ::Window* pWindow = aResult.GetWindow(); + ::vcl::Window* pWindow = aResult.GetWindow(); if (pWindow != NULL) { pWindow->AddEventListener( @@ -966,7 +966,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, { if (pEvent != NULL) { - ::Window* pEventWindow + ::vcl::Window* pEventWindow = static_cast<VclWindowEvent*>(pEvent)->GetWindow(); switch (pEvent->GetId()) @@ -977,7 +977,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, aI!=maActiveViewShells.end(); aI++) { - if (pEventWindow == static_cast< ::Window*>(aI->GetWindow())) + if (pEventWindow == static_cast< ::vcl::Window*>(aI->GetWindow())) { MoveToTop(*aI->mpShell); break; @@ -1013,7 +1013,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, ShellDescriptor ViewShellManager::Implementation::CreateSubShell ( SfxShell* pParentShell, ShellId nShellId, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, FrameView* pFrameView) { ::osl::MutexGuard aGuard (maMutex); @@ -1050,7 +1050,7 @@ void ViewShellManager::Implementation::DestroyViewShell ( if (rDescriptor.mbIsListenerAddedToWindow) { rDescriptor.mbIsListenerAddedToWindow = false; - ::Window* pWindow = rDescriptor.GetWindow(); + ::vcl::Window* pWindow = rDescriptor.GetWindow(); if (pWindow != NULL) { pWindow->RemoveEventListener( @@ -1237,7 +1237,7 @@ bool ShellDescriptor::IsMainViewShell (void) const return false; } -::Window* ShellDescriptor::GetWindow (void) const +vcl::Window* ShellDescriptor::GetWindow (void) const { ViewShell* pViewShell = dynamic_cast<ViewShell*>(mpShell); if (pViewShell != NULL) diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index 01058ddcb4ec..1cc8abaecd88 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -68,7 +68,7 @@ class TabBarControl : public ::TabControl { public: TabBarControl ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, const ::rtl::Reference<ViewTabBar>& rpViewTabBar); virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE; virtual void ActivatePage (void) SAL_OVERRIDE; @@ -174,11 +174,11 @@ void ViewTabBar::disposing (void) mxController = NULL; } -::Window* ViewTabBar::GetAnchorWindow( +vcl::Window* ViewTabBar::GetAnchorWindow( const Reference<XResourceId>& rxViewTabBarId, const Reference<frame::XController>& rxController) { - ::Window* pWindow = NULL; + vcl::Window* pWindow = NULL; ViewShellBase* pBase = NULL; // Tunnel through the controller and use the ViewShellBase to obtain the @@ -559,7 +559,7 @@ void ViewTabBar::UpdateTabBarButtons (void) //===== TabBarControl ========================================================= TabBarControl::TabBarControl ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, const ::rtl::Reference<ViewTabBar>& rpViewTabBar) : ::TabControl(pParentWindow), mpViewTabBar(rpViewTabBar) diff --git a/sd/source/ui/view/WindowUpdater.cxx b/sd/source/ui/view/WindowUpdater.cxx index 391e1c33be36..1c308f21652d 100644 --- a/sd/source/ui/view/WindowUpdater.cxx +++ b/sd/source/ui/view/WindowUpdater.cxx @@ -44,7 +44,7 @@ WindowUpdater::~WindowUpdater (void) throw () maCTLOptions.RemoveListener(this); } -void WindowUpdater::RegisterWindow (::Window* pWindow) +void WindowUpdater::RegisterWindow (vcl::Window* pWindow) { if (pWindow != NULL) { @@ -60,7 +60,7 @@ void WindowUpdater::RegisterWindow (::Window* pWindow) } } -void WindowUpdater::UnregisterWindow (::Window* pWindow) +void WindowUpdater::UnregisterWindow (vcl::Window* pWindow) { tWindowList::iterator aWindowIterator ( ::std::find ( diff --git a/sd/source/ui/view/clview.cxx b/sd/source/ui/view/clview.cxx index cf0b5b1f0462..f8900caba5eb 100644 --- a/sd/source/ui/view/clview.cxx +++ b/sd/source/ui/view/clview.cxx @@ -50,7 +50,7 @@ ClientView::~ClientView() * to be overloaded and properly handled. */ -void ClientView::InvalidateOneWin(::Window& rWin) +void ClientView::InvalidateOneWin(vcl::Window& rWin) { Region aRegion; CompleteRedraw(&rWin, aRegion); @@ -61,7 +61,7 @@ void ClientView::InvalidateOneWin(::Window& rWin) * to be overloaded and properly handled. */ -void ClientView::InvalidateOneWin(::Window& rWin, const Rectangle& rRect) +void ClientView::InvalidateOneWin(vcl::Window& rWin, const Rectangle& rRect) { CompleteRedraw(&rWin, Region(rRect)); } diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 69dcb5d9b0a5..043abbbcddff 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -515,7 +515,7 @@ bool DrawView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const * Make passed region visible (scrolling if necessary) */ -void DrawView::MakeVisible(const Rectangle& rRect, ::Window& rWin) +void DrawView::MakeVisible(const Rectangle& rRect, vcl::Window& rWin) { if (!rRect.IsEmpty() && mpDrawViewShell) { diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index d754afecf0fc..ad8233ac5cc2 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -290,7 +290,7 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) if( pNewObj->IsLinkedGraphic() ) { - MessageDialog aQueryBox( (Window*) GetActiveWindow(),"QueryUnlinkImageDialog","modules/sdraw/ui/queryunlinkimagedialog.ui"); + MessageDialog aQueryBox( (vcl::Window*) GetActiveWindow(),"QueryUnlinkImageDialog","modules/sdraw/ui/queryunlinkimagedialog.ui"); if (RET_YES == aQueryBox.Execute()) pNewObj->ReleaseGraphicLink(); diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index d183d947e817..53c73ed65f6e 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -107,7 +107,7 @@ void SAL_CALL ScannerEventListener::disposing( const lang::EventObject& rEventOb mpParent->ScannerEvent( rEventObject ); } -DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, PageKind ePageKind, FrameView* pFrameViewArgument ) +DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, PageKind ePageKind, FrameView* pFrameViewArgument ) : ViewShell (pFrame, pParentWindow, rViewShellBase) , maTabControl(this, pParentWindow) , mbIsLayerModeActive(false) @@ -415,7 +415,7 @@ css::uno::Reference<css::drawing::XDrawSubController> DrawViewShell::CreateSubCo return xSubController; } -bool DrawViewShell::RelocateToParentWindow (::Window* pParentWindow) +bool DrawViewShell::RelocateToParentWindow (vcl::Window* pParentWindow) { // DrawViewShells can not be relocated to a new parent window at the // moment, so return <FALSE/> except when the given parent window is the diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 373a2bcde9a3..f7999e8e0c92 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -125,7 +125,7 @@ void ImpAddPrintableCharactersToTextEdit(SfxRequest& rReq, ::sd::View* pView) for(sal_Int32 a(0); a < aInputString.getLength(); a++) { sal_Char aChar = (sal_Char)aInputString[a]; - vcl::KeyCode aKeyCode; + ::vcl::KeyCode aKeyCode; KeyEvent aKeyEvent(aChar, aKeyCode); // add actual character @@ -866,7 +866,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if (pOLV) { - vcl::KeyCode aKCode(KEY_DELETE); + ::vcl::KeyCode aKCode(KEY_DELETE); KeyEvent aKEvt( 0, aKCode); pOLV->PostKeyEvent(aKEvt); } @@ -878,7 +878,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) } else { - vcl::KeyCode aKCode(KEY_DELETE); + ::vcl::KeyCode aKCode(KEY_DELETE); KeyEvent aKEvt( 0, aKCode); bool bConsumed = mpDrawView && mpDrawView->getSmartTags().KeyInput( aKEvt ); diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index 70f5bccf379a..8c043e3c0ae7 100644 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -59,7 +59,7 @@ bool DrawViewShell::GotoBookmark(const OUString& rBookmark) |* \************************************************************************/ -void DrawViewShell::MakeVisible(const Rectangle& rRect, ::Window& rWin) +void DrawViewShell::MakeVisible(const Rectangle& rRect, vcl::Window& rWin) { // In older versions, if in X or Y the size of the object was // smaller than the visible area, the user-defined zoom was diff --git a/sd/source/ui/view/grviewsh.cxx b/sd/source/ui/view/grviewsh.cxx index fcdc1da0522a..1f94f01bd8a8 100644 --- a/sd/source/ui/view/grviewsh.cxx +++ b/sd/source/ui/view/grviewsh.cxx @@ -32,7 +32,7 @@ namespace sd { GraphicViewShell::GraphicViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView) : DrawViewShell ( pFrame, diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 802cadb880e7..0ad65d417d69 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -190,7 +190,7 @@ Reference<drawing::XDrawSubController> OutlineViewShell::CreateSubController (vo OutlineViewShell::OutlineViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, FrameView* pFrameViewArgument) : ViewShell(pFrame, pParentWindow, rViewShellBase), pOlView(NULL), @@ -541,7 +541,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) { OutlineViewPageChangesGuard aGuard2(pOlView); - vcl::KeyCode aKCode(KEY_DELETE); + ::vcl::KeyCode aKCode(KEY_DELETE); KeyEvent aKEvt( 0, aKCode ); pOutlView->PostKeyEvent(aKEvt); @@ -1445,7 +1445,7 @@ bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) Invalidate(SID_STYLE_FAMILY5); // check and distinguish cursor movements- or input-keys - vcl::KeyCode aKeyGroup( rKEvt.GetKeyCode().GetGroup() ); + ::vcl::KeyCode aKeyGroup( rKEvt.GetKeyCode().GetGroup() ); if( (aKeyGroup != KEYGROUP_CURSOR && aKeyGroup != KEYGROUP_FKEYS) || (GetActualPage() != pLastPage) ) { diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index d9855be75126..7b0384ea9524 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -86,7 +86,7 @@ struct SdParaAndPos TYPEINIT1( OutlineView, ::sd::View ); -OutlineView::OutlineView( DrawDocShell& rDocSh, ::Window* pWindow, OutlineViewShell& rOutlineViewShell) +OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineViewShell& rOutlineViewShell) : ::sd::View(*rDocSh.GetDoc(), pWindow, &rOutlineViewShell) , mrOutlineViewShell(rOutlineViewShell) , mrOutliner(*mrDoc.GetOutliner(true)) @@ -279,7 +279,7 @@ void OutlineView::DeleteWindowFromPaintView(OutputDevice* pWin) { bool bRemoved = false; sal_uInt16 nView = 0; - ::Window* pWindow; + vcl::Window* pWindow; while (nView < MAX_OUTLINERVIEWS && !bRemoved) { @@ -305,7 +305,7 @@ void OutlineView::DeleteWindowFromPaintView(OutputDevice* pWin) /** * Return a pointer to the OutlinerView corresponding to the window */ -OutlinerView* OutlineView::GetViewByWindow (::Window* pWin) const +OutlinerView* OutlineView::GetViewByWindow (vcl::Window* pWin) const { OutlinerView* pOlView = NULL; for (sal_uInt16 nView = 0; nView < MAX_OUTLINERVIEWS; nView++) @@ -1444,7 +1444,7 @@ void OutlineView::onUpdateStyleSettings( bool bForceUpdate /* = false */ ) { mpOutlinerView[nView]->SetBackgroundColor( aDocColor ); - ::Window* pWindow = mpOutlinerView[nView]->GetWindow(); + vcl::Window* pWindow = mpOutlinerView[nView]->GetWindow(); if( pWindow ) pWindow->SetBackground( Wallpaper( aDocColor ) ); diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index 6454b1436115..7ac22abfa48c 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -76,7 +76,7 @@ void PresentationViewShell::InitInterface_Impl() TYPEINIT1( PresentationViewShell, DrawViewShell ); -PresentationViewShell::PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView) +PresentationViewShell::PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, FrameView* pFrameView) : DrawViewShell( pFrame, rViewShellBase, pParentWindow, PK_STANDARD, pFrameView) { if( GetDocSh() && GetDocSh()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 2e4006a6aaaf..2df86286e921 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -68,7 +68,7 @@ void RulerCtrlItem::StateChanged( sal_uInt16 nSId, SfxItemState, const SfxPoolIt } } -Ruler::Ruler( DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) +Ruler::Ruler( DrawViewShell& rViewSh, vcl::Window* pParent, ::sd::Window* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) : SvxRuler(pParent, pWin, nRulerFlags, rBindings, nWinStyle) , pSdView(NULL) , pSdWin(pWin) diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index effd7c2f582b..2871b5baa1da 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -660,7 +660,7 @@ void OutlinerMasterViewFilter::End() } bool View::SdrBeginTextEdit( - SdrObject* pObj, SdrPageView* pPV, ::Window* pWin, + SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin, bool bIsNewObj, SdrOutliner* pOutl, OutlinerView* pGivenOutlinerView, bool bDontDeleteOutliner, bool bOnlyOneView, bool bGrabFocus ) @@ -1319,7 +1319,7 @@ void View::ChangeMarkedObjectsBulletsNumbering( const bool bSwitchOff ) { SdrModel* pSdrModel = GetModel(); - Window* pWindow = dynamic_cast< Window* >(GetFirstOutputDevice()); + vcl::Window* pWindow = dynamic_cast< vcl::Window* >(GetFirstOutputDevice()); if (!pSdrModel || !pWindow) return; diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 9d754052d58a..cb986360164e 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -94,7 +94,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent {} }; -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateClipboardDataObject( View*, ::Window& ) +::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateClipboardDataObject( View*, vcl::Window& ) { // since SdTransferable::CopyToClipboard is called, this // dynamically created object ist destroyed automatically @@ -157,7 +157,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent return xRet; } -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateDragDataObject( View* pWorkView, ::Window& rWindow, const Point& rDragPos ) +::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateDragDataObject( View* pWorkView, vcl::Window& rWindow, const Point& rDragPos ) { SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, false ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); @@ -206,7 +206,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent return xRet; } -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateSelectionDataObject( View* pWorkView, ::Window& rWindow ) +::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateSelectionDataObject( View* pWorkView, vcl::Window& rWindow ) { SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, true ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); @@ -245,7 +245,7 @@ void View::UpdateSelectionClipboard( bool bForceDeselect ) } } -void View::DoCut(::Window* ) +void View::DoCut(vcl::Window* ) { const OutlinerView* pOLV = GetTextEditOutlinerView(); @@ -262,7 +262,7 @@ void View::DoCut(::Window* ) } } -void View::DoCopy (::Window* pWindow) +void View::DoCopy (vcl::Window* pWindow) { const OutlinerView* pOLV = GetTextEditOutlinerView(); @@ -275,7 +275,7 @@ void View::DoCopy (::Window* pWindow) } } -void View::DoPaste (::Window* pWindow) +void View::DoPaste (vcl::Window* pWindow) { TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( mpViewSh->GetActiveWindow() ) ); if( !aDataHelper.GetTransferable().is() ) @@ -354,7 +354,7 @@ void View::DoPaste (::Window* pWindow) } } -void View::StartDrag( const Point& rStartPos, ::Window* pWindow ) +void View::StartDrag( const Point& rStartPos, vcl::Window* pWindow ) { if( AreObjectsMarked() && IsAction() && mpViewSh && pWindow && !mpDragSrcMarkList ) { diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 6e26ba91747e..b9af542b4354 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -50,8 +50,8 @@ namespace sd { #define MIN_ZOOM 5 ///< minimal zoom factor #define MAX_ZOOM 3000 ///< maximal zoom factor -Window::Window(::Window* pParent) - : ::Window(pParent, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)), +Window::Window(vcl::Window* pParent) + : vcl::Window(pParent, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)), DropTargetHelper( this ), mpShareWin(NULL), maWinPos(0, 0), // precautionary; but the values should be set @@ -74,7 +74,7 @@ Window::Window(::Window* pParent) aMap.SetMapUnit(MAP_100TH_MM); SetMapMode(aMap); - // whit it, the ::WindowColor is used in the slide mode + // whit it, the vcl::WindowColor is used in the slide mode SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetWindowColor() ) ); // adjust contrast mode initially @@ -192,7 +192,7 @@ long Window::GetZoom (void) const void Window::Resize() { - ::Window::Resize(); + vcl::Window::Resize(); CalcMinZoom(); if( mpViewShell && mpViewShell->GetViewFrame() ) @@ -221,7 +221,7 @@ void Window::KeyInput(const KeyEvent& rKEvt) } else { - ::Window::KeyInput(rKEvt); + vcl::Window::KeyInput(rKEvt); } } } @@ -260,7 +260,7 @@ bool Window::Notify( NotifyEvent& rNEvt ) nResult = mpViewShell->Notify(rNEvt, this); } if( !nResult ) - nResult = ::Window::Notify( rNEvt ); + nResult = vcl::Window::Notify( rNEvt ); return nResult; } @@ -270,10 +270,10 @@ void Window::RequestHelp(const HelpEvent& rEvt) if ( mpViewShell ) { if( !mpViewShell->RequestHelp( rEvt, this) ) - ::Window::RequestHelp( rEvt ); + vcl::Window::RequestHelp( rEvt ); } else - ::Window::RequestHelp( rEvt ); + vcl::Window::RequestHelp( rEvt ); } /** @@ -699,7 +699,7 @@ double Window::GetScrlPageHeight() void Window::LoseFocus() { mnTicks = 0; - ::Window::LoseFocus (); + vcl::Window::LoseFocus (); } /** @@ -708,12 +708,12 @@ void Window::LoseFocus() void Window::GrabFocus() { mnTicks = 0; - ::Window::GrabFocus (); + vcl::Window::GrabFocus (); } void Window::DataChanged( const DataChangedEvent& rDCEvt ) { - ::Window::DataChanged( rDCEvt ); + vcl::Window::DataChanged( rDCEvt ); /* Omit PRINTER by all documents which are not using a printer. Omit FONTS and FONTSUBSTITUTION if no text output is available or if the @@ -930,7 +930,7 @@ void Window::DropScroll(const Point& rMousePos) // If current viewshell is PresentationViewShell, just return empty because the correct ShowWin will be created later. if (mpViewShell && mpViewShell->ISA(PresentationViewShell)) { - return ::Window::CreateAccessible (); + return vcl::Window::CreateAccessible (); } ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible(false); if (xAcc.get()) @@ -946,7 +946,7 @@ void Window::DropScroll(const Point& rMousePos) else { OSL_TRACE ("::sd::Window::CreateAccessible: no view shell"); - return ::Window::CreateAccessible (); + return vcl::Window::CreateAccessible (); } } diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index 92896b965821..45e395d76552 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -63,7 +63,7 @@ void TabControl::TabControlTransferable::DragFinished( sal_Int8 nDropAction ) mrParent.DragFinished( nDropAction ); } -TabControl::TabControl(DrawViewShell* pViewSh, Window* pParent) : +TabControl::TabControl(DrawViewShell* pViewSh, vcl::Window* pParent) : TabBar( pParent, WinBits( WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_SIZEABLE | WB_DRAG) ), DragSourceHelper( this ), DropTargetHelper( this ), diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index ec952a8e0cfe..3cd27c9f5eab 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -201,7 +201,7 @@ void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt) OUString aHelpText( aResId ); Rectangle aScreenRect( pDev->LogicToPixel( GetPos() ), maImageSize ); - mnTip = Help::ShowTip( static_cast< ::Window* >( pHdlList->GetView()->GetFirstOutputDevice() ), aScreenRect, aHelpText, 0 ) ; + mnTip = Help::ShowTip( static_cast< vcl::Window* >( pHdlList->GetView()->GetFirstOutputDevice() ), aScreenRect, aHelpText, 0 ) ; } Touch(); } diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 9cc670bb992e..258bc88f9415 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -95,7 +95,7 @@ public: virtual ~ViewShellObjectBarFactory (void); virtual SfxShell* CreateShell ( ::sd::ShellId nId, - ::Window* pParentWindow, + vcl::Window* pParentWindow, ::sd::FrameView* pFrameView) SAL_OVERRIDE; virtual void ReleaseShell (SfxShell* pShell) SAL_OVERRIDE; private: @@ -133,7 +133,7 @@ SfxViewFrame* ViewShell::GetViewFrame (void) const /// declare SFX-Slotmap and standard interface TYPEINIT1(ViewShell, SfxShell); -ViewShell::ViewShell( SfxViewFrame*, ::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter) +ViewShell::ViewShell( SfxViewFrame*, vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter) : SfxShell(&rViewShellBase) , mbCenterAllowed(bAllowCenter) , mpParentWindow(pParentWindow) @@ -237,7 +237,7 @@ void ViewShell::construct(void) void ViewShell::doShow(void) { mpContentWindow->Show(); - static_cast< ::Window*>(mpContentWindow.get())->Resize(); + static_cast< vcl::Window*>(mpContentWindow.get())->Resize(); OSL_TRACE("content window has size %d %d", mpContentWindow->GetSizePixel().Width(), mpContentWindow->GetSizePixel().Height()); @@ -1400,7 +1400,7 @@ void ViewShell::ShowUIControls (bool bVisible) mpContentWindow->Show( bVisible ); } -bool ViewShell::RelocateToParentWindow (::Window* pParentWindow) +bool ViewShell::RelocateToParentWindow (vcl::Window* pParentWindow) { mpParentWindow = pParentWindow; @@ -1472,7 +1472,7 @@ ViewShellObjectBarFactory::~ViewShellObjectBarFactory (void) SfxShell* ViewShellObjectBarFactory::CreateShell ( ::sd::ShellId nId, - ::Window*, + vcl::Window*, ::sd::FrameView* ) { SfxShell* pShell = NULL; |