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 /cui/source/options/optgdlg.cxx | |
parent | Disable HTML export "hspace" and "vspace" check on OSX (diff) | |
download | core-827c46e7d75000cb03b0ce21759f9d0825f0c096.tar.gz core-827c46e7d75000cb03b0ce21759f9d0825f0c096.zip |
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 'cui/source/options/optgdlg.cxx')
-rw-r--r-- | cui/source/options/optgdlg.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index e6d07105012a..f45b4a4dca44 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -183,7 +183,7 @@ namespace -OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet) +OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptGeneralPage", "cui/ui/optgeneralpage.ui", &rSet) { get(m_pToolTipsCB, "tooltips"); @@ -236,7 +236,7 @@ OfaMiscTabPage::~OfaMiscTabPage() -SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* OfaMiscTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new OfaMiscTabPage( pParent, *rAttrSet ); } @@ -535,7 +535,7 @@ void CanvasSettings::EnabledHardwareAcceleration( bool _bEnabled ) const // class OfaViewTabPage -------------------------------------------------- -OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet) +OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptViewPage", "cui/ui/optviewpage.ui", &rSet) , nSizeLB_InitialSelection(0) , nStyleLB_InitialSelection(0) @@ -647,7 +647,7 @@ IMPL_LINK( OfaViewTabPage, OnSelectionToggled, void*, NOTINTERESTEDIN ) return 0; } -SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* OfaViewTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new OfaViewTabPage(pParent, *rAttrSet); } @@ -839,7 +839,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) if(bRepaintWindows) { - Window* pAppWindow = Application::GetFirstTopLevelWindow(); + vcl::Window* pAppWindow = Application::GetFirstTopLevelWindow(); while(pAppWindow) { @@ -997,7 +997,7 @@ static OUString lcl_getDatePatternsConfigString( const LocaleDataWrapper& rLocal return aBuf.makeStringAndClear(); } -OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) : +OfaLanguagesTabPage::OfaLanguagesTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent,"OptLanguagesPage","cui/ui/optlanguagespage.ui", &rSet ), pLangConfig(new LanguageConfig_Impl) { @@ -1149,7 +1149,7 @@ OfaLanguagesTabPage::~OfaLanguagesTabPage() delete pLangConfig; } -SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* OfaLanguagesTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new OfaLanguagesTabPage(pParent, *rAttrSet); } |