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 /include/svx/svxdlg.hxx | |
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 'include/svx/svxdlg.hxx')
-rw-r--r-- | include/svx/svxdlg.hxx | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index 06376c51711a..6ec31bef4251 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -42,7 +42,7 @@ namespace linguistic2{ }}}} class SvxSpellWrapper; -typedef SfxTabPage* (*CreateSvxDistributePage)(Window *pParent, const SfxItemSet &rAttrSet, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); +typedef SfxTabPage* (*CreateSvxDistributePage)(vcl::Window *pParent, const SfxItemSet &rAttrSet, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); typedef const sal_uInt16* (*DialogGetRanges)(); struct ExchangeData; @@ -86,7 +86,7 @@ class AbstractSpellDialog : public VclAbstractDialog virtual void SetLanguage( sal_uInt16 nLang ) = 0; virtual bool Close() = 0; virtual void Invalidate() = 0; - virtual Window* GetWindow() = 0; + virtual vcl::Window* GetWindow() = 0; virtual SfxBindings& GetBindings() = 0; }; @@ -215,7 +215,7 @@ public: class AbstractSvxHpLinkDlg : public VclAbstractDialog { public: - virtual Window* GetWindow() = 0; + virtual vcl::Window* GetWindow() = 0; virtual bool QueryClose() = 0; }; @@ -264,7 +264,7 @@ public: virtual void HideAuthor() = 0; virtual void SetReadonlyPostIt(bool bDisable) = 0; virtual bool IsOkEnabled() const = 0; - virtual Window * GetWindow() = 0; + virtual vcl::Window * GetWindow() = 0; }; class SvxAbstractSplittTableDialog : public VclAbstractDialog @@ -297,175 +297,175 @@ public: // define dtor as this will create typeinfo and in svx library and export vtable virtual ~SvxAbstractDialogFactory(); - virtual SfxAbstractTabDialog* CreateTextTabDialog( Window* pParent, + virtual SfxAbstractTabDialog* CreateTextTabDialog( vcl::Window* pParent, const SfxItemSet* pAttrSet, SdrView* pView, SdrModel* pModel=0 ) = 0 ; - virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent, + virtual AbstractSvxCaptionDialog* CreateCaptionDialog( vcl::Window* pParent, const SdrView* pView, sal_uInt16 nAnchorTypes = 0 ) = 0; - virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent, + virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone)= 0; - virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ) = 0; + virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( vcl::Window* pParent ) = 0; - virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent, + virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet )=0; - virtual AbstractSpellDialog * CreateSvxSpellDialog(Window* pParent, + virtual AbstractSpellDialog * CreateSvxSpellDialog(vcl::Window* pParent, SfxBindings* pBindings, svx::SpellDialogChildWindow* pSpellChildWindow )=0; - virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent, + virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( vcl::Window* pParent, GalleryTheme* pThm ) = 0; - virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent, + virtual AbstractSearchProgress * CreateSearchProgressDialog( vcl::Window* pParent, const INetURLObject& rStartURL ) = 0; - virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent ) = 0; - virtual AbstractTitleDialog * CreateTitleDialog( Window* pParent, + virtual AbstractTakeProgress * CreateTakeProgressDialog( vcl::Window* pParent ) = 0; + virtual AbstractTitleDialog * CreateTitleDialog( vcl::Window* pParent, const OUString& rOldText ) = 0; - virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( Window* pParent, + virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ) = 0; - virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( Window* pParent, + virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( vcl::Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet ) = 0; - virtual AbstractURLDlg * CreateURLDialog( Window* pParent, + virtual AbstractURLDlg * CreateURLDialog( vcl::Window* pParent, const OUString& rURL, const OUString& rAltText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, TargetList& rTargetList ) = 0; virtual AbstractSvxHlinkDlgMarkWnd* CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId ) =0; - virtual SfxAbstractTabDialog* CreateTabItemDialog(Window* pParent, + virtual SfxAbstractTabDialog* CreateTabItemDialog(vcl::Window* pParent, const SfxItemSet& rSet) = 0; - virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent, + virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( vcl::Window* pParent, SearchAttrItemList& rLst, const sal_uInt16* pWhRanges)=0; - virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent, + virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( vcl::Window* pParent, bool bRelax, sal_uInt16 nOther, sal_uInt16 nShorter, sal_uInt16 nLonger ) = 0; //UUUU add for SvxBorderBackgroundDlg virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bEnableSelector = false, bool bEnableDrawingLayerFillStyles = false) = 0; - virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, + virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pView, sal_uInt16 nAnchorTypes = 0) = 0; - virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent, + virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pSdrView, sal_uInt32 nResId, bool bSizeTabPage = false )=0; - virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent, + virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( vcl::Window* pParent, const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags )=0; - virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ) = 0; - virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent, + virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( vcl::Window* pParent ) = 0; + virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ) = 0; - virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( Window* pParent, + virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( vcl::Window* pParent, const OUString& rName, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl, sal_uInt32 nResId) = 0; - virtual AbstractSvxNameDialog * CreateSvxNameDialog( Window* pParent, + virtual AbstractSvxNameDialog * CreateSvxNameDialog( vcl::Window* pParent, const OUString& rName, const OUString& rDesc ) = 0; // #i68101# - virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const OUString& rName ) = 0; - virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const OUString& rTitle, const OUString& rDescription) = 0; + virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(vcl::Window* pParent, const OUString& rName ) = 0; + virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(vcl::Window* pParent, const OUString& rTitle, const OUString& rDescription) = 0; - virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId, + virtual AbstractSvxMessDialog * CreateSvxMessDialog( vcl::Window* pParent, sal_uInt32 nResId, const OUString& rText, const OUString& rDesc, Image* pImg = NULL ) = 0; - virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(Window* pParent) = 0 ; - virtual AbstractSvxMultiPathDialog * CreateSvxPathSelectDialog(Window* pParent) = 0 ; - virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, + virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(vcl::Window* pParent) = 0 ; + virtual AbstractSvxMultiPathDialog * CreateSvxPathSelectDialog(vcl::Window* pParent) = 0 ; + virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings, sal_uInt32 nResId)=0; - virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, + virtual AbstractFmSearchDialog* CreateFmSearchDialog(vcl::Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier)=0; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(vcl::Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource)=0; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nCount)=0; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nCount)=0; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (vcl::Window* pParent, const Graphic& rGraphic, double nRadius)=0; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt8 nGreyThreshold, bool bInvert)=0; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges)=0; - virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent, + virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow) = 0 ; - virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog + virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog SdrModel* pModel, const SdrObject* pObj = NULL, bool bHasObj = true )=0; - virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE = 0; - virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, + virtual VclAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE = 0; + virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const SdrView* pView, sal_uInt32 nResId )=0; - virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, + virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame, sal_uInt32 nResId )=0; - virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, + virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bPrevNext = false) = 0; - virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const OUString& rLanguage ) SAL_OVERRIDE = 0; + virtual VclAbstractDialog* CreateSvxScriptOrgDialog( vcl::Window* pParent, const OUString& rLanguage ) SAL_OVERRIDE = 0; virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc() = 0; virtual DialogGetRanges GetDialogGetRangesFunc() = 0; virtual AbstractScriptSelectorDialog* CreateScriptSelectorDialog( - Window* pParent, + vcl::Window* pParent, bool bShowSlots, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ) SAL_OVERRIDE = 0; virtual VclAbstractDialog* CreateScriptErrorDialog( - Window* pParent, com::sun::star::uno::Any aException) SAL_OVERRIDE = 0; + vcl::Window* pParent, com::sun::star::uno::Any aException) SAL_OVERRIDE = 0; virtual VclAbstractDialog* CreateSvxMacroAssignDlg( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent ) = 0; - virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL )=0; + virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL )=0; - virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )=0; + virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )=0; - virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) = 0; + virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( vcl::Window* pParent ) = 0; - virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ) = 0; + virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ) = 0; }; #endif |