From 827c46e7d75000cb03b0ce21759f9d0825f0c096 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 23 Sep 2014 11:20:40 +0200 Subject: fdo#82577: Handle Window Put the VCL Window class in the vcl namespace. Avoids clash with the X11 Window typedef. Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a --- starmath/inc/ElementsDockingWindow.hxx | 6 ++--- starmath/inc/dialog.hxx | 30 ++++++++++++------------ starmath/inc/edit.hxx | 2 +- starmath/inc/smmod.hxx | 2 +- starmath/inc/toolbox.hxx | 2 +- starmath/inc/utility.hxx | 2 +- starmath/inc/view.hxx | 6 ++--- starmath/source/ElementsDockingWindow.cxx | 6 ++--- starmath/source/accessibility.cxx | 14 ++++++------ starmath/source/dialog.cxx | 38 +++++++++++++++---------------- starmath/source/document.cxx | 2 +- starmath/source/smmod.cxx | 2 +- starmath/source/tmpdevice.cxx | 2 +- starmath/source/toolbox.cxx | 6 ++--- starmath/source/utility.cxx | 4 ++-- starmath/source/view.cxx | 6 ++--- 16 files changed, 65 insertions(+), 65 deletions(-) (limited to 'starmath') diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx index e2ab95c9ab0f..73534ef15cff 100644 --- a/starmath/inc/ElementsDockingWindow.hxx +++ b/starmath/inc/ElementsDockingWindow.hxx @@ -108,7 +108,7 @@ class SmElementsControl : public Control void build(); public: - SmElementsControl(Window *pParent, const ResId& rResId); + SmElementsControl(vcl::Window *pParent, const ResId& rResId); virtual ~SmElementsControl(); void setElementSetId(sal_uInt16 aSetId); @@ -138,7 +138,7 @@ public: SmElementsDockingWindow( SfxBindings* pBindings, SfxChildWindow* pChildWindow, - Window* pParent ); + vcl::Window* pParent ); virtual ~SmElementsDockingWindow(); virtual void EndDocking( const Rectangle& rReactangle, bool bFloatMode) SAL_OVERRIDE; @@ -150,7 +150,7 @@ class SmElementsDockingWindowWrapper : public SfxChildWindow SFX_DECL_CHILDWINDOW_WITHID(SmElementsDockingWindowWrapper); protected: - SmElementsDockingWindowWrapper( Window* pParentWindow, + SmElementsDockingWindowWrapper( vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 3f4b317a8b9f..9e12d97dd320 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -67,19 +67,19 @@ class SmPrintOptionsTabPage : public SfxTabPage virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; public: - static SfxTabPage* Create(Window *pWindow, const SfxItemSet &rSet); + static SfxTabPage* Create(vcl::Window *pWindow, const SfxItemSet &rSet); - SmPrintOptionsTabPage(Window *pParent, const SfxItemSet &rOptions); + SmPrintOptionsTabPage(vcl::Window *pParent, const SfxItemSet &rOptions); }; /**************************************************************************/ -class SmShowFont : public Window +class SmShowFont : public vcl::Window { virtual void Paint(const Rectangle&) SAL_OVERRIDE; public: - SmShowFont(Window *pParent, WinBits nStyle) + SmShowFont(vcl::Window *pParent, WinBits nStyle) : Window(pParent, nStyle) { } @@ -106,7 +106,7 @@ class SmFontDialog : public ModalDialog virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes); + SmFontDialog(vcl::Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes); const vcl::Font& GetFont() const { return Face; } void SetFont(const vcl::Font &rFont); @@ -127,7 +127,7 @@ class SmFontSizeDialog : public ModalDialog DECL_LINK(DefaultButtonClickHdl, Button *); public: - SmFontSizeDialog(Window *pParent); + SmFontSizeDialog(vcl::Window *pParent); void ReadFrom(const SmFormat &rFormat); void WriteTo (SmFormat &rFormat) const; @@ -154,7 +154,7 @@ class SmFontTypeDialog : public ModalDialog DECL_LINK(HelpButtonClickHdl, Button *); public: - SmFontTypeDialog(Window *pParent, OutputDevice *pFntListDevice); + SmFontTypeDialog(vcl::Window *pParent, OutputDevice *pFntListDevice); void ReadFrom(const SmFormat &rFormat); void WriteTo (SmFormat &rFormat) const; @@ -221,7 +221,7 @@ class SmDistanceDialog : public ModalDialog void SetCategory(sal_uInt16 Category); public: - SmDistanceDialog(Window *pParent); + SmDistanceDialog(vcl::Window *pParent); virtual ~SmDistanceDialog(); void ReadFrom(const SmFormat &rFormat); @@ -245,7 +245,7 @@ class SmAlignDialog : public ModalDialog DECL_LINK(DefaultButtonClickHdl, Button *); public: - SmAlignDialog(Window *pParent); + SmAlignDialog(vcl::Window *pParent); void ReadFrom(const SmFormat &rFormat); void WriteTo (SmFormat &rFormat) const; @@ -275,7 +275,7 @@ class SmShowSymbolSetWindow : public Control DECL_LINK( ScrollHdl, ScrollBar* ); public: - SmShowSymbolSetWindow(Window *pParent, WinBits nStyle); + SmShowSymbolSetWindow(vcl::Window *pParent, WinBits nStyle); void setScrollbar(ScrollBar *pVScrollBar); void calccols(); void SelectSymbol(sal_uInt16 nSymbol); @@ -292,7 +292,7 @@ class SmShowSymbolSet : public VclHBox Size aOutputSize; public: - SmShowSymbolSet(Window *pParent); + SmShowSymbolSet(vcl::Window *pParent); void SetSymbolSet(const SymbolPtrVec_t& rSymbolSet) { aSymbolWindow.SetSymbolSet(rSymbolSet); } @@ -316,7 +316,7 @@ class SmShowSymbol : public Control void setFontSize(vcl::Font &rFont) const; public: - SmShowSymbol(Window *pParent, WinBits nStyle) + SmShowSymbol(vcl::Window *pParent, WinBits nStyle) : Control(pParent, nStyle) { } @@ -360,7 +360,7 @@ class SmSymbolDialog : public ModalDialog virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SmSymbolDialog(Window * pParent, OutputDevice *pFntListDevice, + SmSymbolDialog(vcl::Window * pParent, OutputDevice *pFntListDevice, SmSymbolManager &rSymbolMgr, SmViewShell &rViewShell); bool SelectSymbolSet(const OUString &rSymbolSetName); @@ -376,7 +376,7 @@ class SmShowChar : public Control virtual void Resize() SAL_OVERRIDE; public: - SmShowChar(Window *pParent, WinBits nStyle) + SmShowChar(vcl::Window *pParent, WinBits nStyle) : Control(pParent, nStyle) { } @@ -453,7 +453,7 @@ class SmSymDefineDialog : public ModalDialog virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SmSymDefineDialog(Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr); + SmSymDefineDialog(vcl::Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr); virtual ~SmSymDefineDialog(); using OutputDevice::SetFont; diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index 8f7a665bc036..7c66fa6fafb2 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -45,7 +45,7 @@ class CommandEvent; /**************************************************************************/ -class SmEditWindow : public Window, public DropTargetHelper +class SmEditWindow : public vcl::Window, public DropTargetHelper { ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccessible; diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index b3af03d781e0..a49d8cad0f89 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -137,7 +137,7 @@ public: //virtual methods for options 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; }; #define SM_MOD() ( *(SmModule**) GetAppData(SHL_SM) ) diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx index 8f50a055bb1f..472fe602c1a2 100644 --- a/starmath/inc/toolbox.hxx +++ b/starmath/inc/toolbox.hxx @@ -81,7 +81,7 @@ class SmToolBoxWrapper : public SfxChildWindow SFX_DECL_CHILDWINDOW_WITHID(SmToolBoxWrapper); protected: - SmToolBoxWrapper(Window *pParentWindow, + SmToolBoxWrapper(vcl::Window *pParentWindow, sal_uInt16, SfxBindings*, SfxChildWinInfo*); }; diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index f4a48e5d8d55..304c10c7e841 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -157,7 +157,7 @@ protected: DECL_LINK(SelectHdl, ListBox *); public: - SmFontPickListBox(Window* pParent, WinBits nBits); + SmFontPickListBox(vcl::Window* pParent, WinBits nBits); SmFontPickListBox& operator = (const SmFontPickList& rList); diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 38ad81456c4c..6b7939e99076 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -196,8 +196,8 @@ class SmCmdBoxWrapper : public SfxChildWindow SFX_DECL_CHILDWINDOW_WITHID(SmCmdBoxWrapper); protected: - SmCmdBoxWrapper(Window *pParentWindow, - sal_uInt16 nId, + SmCmdBoxWrapper(::vcl::Window *pParentWindow, + sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo); @@ -264,7 +264,7 @@ protected: void InsertFrom(SfxMedium &rMedium); virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; - virtual SfxTabPage *CreatePrintOptionsPage(Window *pParent, + virtual SfxTabPage *CreatePrintOptionsPage(::vcl::Window *pParent, const SfxItemSet &rOptions) SAL_OVERRIDE; virtual void Deactivate(bool IsMDIActivate) SAL_OVERRIDE; virtual void Activate(bool IsMDIActivate) SAL_OVERRIDE; diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index 6c99406f8cd5..4668e93a5905 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -212,7 +212,7 @@ const sal_uInt16 SmElementsControl::aOthers[][2] = {RID_DOTSUP, RID_DOTSUP_HELP}, {RID_DOTSDOWN, RID_DOTSDOWN_HELP} }; -SmElementsControl::SmElementsControl(Window *pParent, const ResId& rResId) +SmElementsControl::SmElementsControl(vcl::Window *pParent, const ResId& rResId) : Control(pParent, rResId) , mpDocShell(new SmDocShell(SFXOBJECTSHELL_STD_NORMAL)) , maCurrentSetId(0) @@ -615,7 +615,7 @@ const sal_uInt16 SmElementsDockingWindow::aCategories[] = { RID_CATEGORY_EXAMPLES }; -SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, SfxChildWindow* pChildWindow, Window* pParent) : +SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, SfxChildWindow* pChildWindow, vcl::Window* pParent) : SfxDockingWindow(pInputBindings, pChildWindow, pParent, SmResId(RID_ELEMENTSDOCKINGWINDOW)), maElementsControl (this, SmResId(1)), maElementListBox (this, SmResId(1)) @@ -722,7 +722,7 @@ void SmElementsDockingWindow::Resize() SFX_IMPL_DOCKINGWINDOW_WITHID(SmElementsDockingWindowWrapper, SID_ELEMENTSDOCKINGWINDOW); SmElementsDockingWindowWrapper::SmElementsDockingWindowWrapper( - Window *pParentWindow, sal_uInt16 nId, + vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo) : SfxChildWindow(pParentWindow, nId) { diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index f7e3d0d3a1a0..6388cc604dd1 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -62,7 +62,7 @@ using namespace com::sun::star::accessibility; -static awt::Rectangle lcl_GetBounds( Window *pWin ) +static awt::Rectangle lcl_GetBounds( vcl::Window *pWin ) { // !! see VCLXAccessibleComponent::implGetBounds() @@ -77,7 +77,7 @@ static awt::Rectangle lcl_GetBounds( Window *pWin ) aBounds.Y = aRect.Top(); aBounds.Width = aRect.GetWidth(); aBounds.Height = aRect.GetHeight(); - Window* pParent = pWin->GetAccessibleParentWindow(); + vcl::Window* pParent = pWin->GetAccessibleParentWindow(); if (pParent) { Rectangle aParentRect = pParent->GetWindowExtentsRelative( NULL ); @@ -89,7 +89,7 @@ static awt::Rectangle lcl_GetBounds( Window *pWin ) return aBounds; } -static awt::Point lcl_GetLocationOnScreen( Window *pWin ) +static awt::Point lcl_GetLocationOnScreen( vcl::Window *pWin ) { // !! see VCLXAccessibleComponent::getLocationOnScreen() @@ -314,7 +314,7 @@ Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleParent() if (!pWin) throw RuntimeException(); - Window *pAccParent = pWin->GetAccessibleParentWindow(); + vcl::Window *pAccParent = pWin->GetAccessibleParentWindow(); OSL_ENSURE( pAccParent, "accessible parent missing" ); return pAccParent ? pAccParent->GetAccessible() : Reference< XAccessible >(); } @@ -324,7 +324,7 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getAccessibleIndexInParent() { SolarMutexGuard aGuard; sal_Int32 nIdx = -1; - Window *pAccParent = pWin ? pWin->GetAccessibleParentWindow() : 0; + vcl::Window *pAccParent = pWin ? pWin->GetAccessibleParentWindow() : 0; if (pAccParent) { sal_uInt16 nCnt = pAccParent->GetAccessibleChildWindowCount(); @@ -1822,7 +1822,7 @@ uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleParent( ) if (!pWin) throw RuntimeException(); - Window *pAccParent = pWin->GetAccessibleParentWindow(); + vcl::Window *pAccParent = pWin->GetAccessibleParentWindow(); OSL_ENSURE( pAccParent, "accessible parent missing" ); return pAccParent ? pAccParent->GetAccessible() : Reference< XAccessible >(); } @@ -1832,7 +1832,7 @@ sal_Int32 SAL_CALL SmEditAccessible::getAccessibleIndexInParent( ) { SolarMutexGuard aGuard; sal_Int32 nIdx = -1; - Window *pAccParent = pWin ? pWin->GetAccessibleParentWindow() : 0; + vcl::Window *pAccParent = pWin ? pWin->GetAccessibleParentWindow() : 0; if (pAccParent) { sal_uInt16 nCnt = pAccParent->GetAccessibleChildWindowCount(); diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 218248562c31..e731fb6bc6d0 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -157,7 +157,7 @@ IMPL_LINK_INLINE_START( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, EMP IMPL_LINK_INLINE_END( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, pButton ) -SmPrintOptionsTabPage::SmPrintOptionsTabPage(Window *pParent, const SfxItemSet &rOptions) +SmPrintOptionsTabPage::SmPrintOptionsTabPage(vcl::Window *pParent, const SfxItemSet &rOptions) : SfxTabPage(pParent, "SmathSettings", "modules/smath/ui/smathsettings.ui", &rOptions) { get( m_pTitle, "title"); @@ -220,7 +220,7 @@ void SmPrintOptionsTabPage::Reset(const SfxItemSet* rSet) } -SfxTabPage* SmPrintOptionsTabPage::Create(Window* pWindow, const SfxItemSet& rSet) +SfxTabPage* SmPrintOptionsTabPage::Create(vcl::Window* pWindow, const SfxItemSet& rSet) { return (new SmPrintOptionsTabPage(pWindow, rSet)); } @@ -239,7 +239,7 @@ void SmShowFont::Paint(const Rectangle& rRect ) (GetOutputSize().Height() - TextSize.Height()) / 2), Text); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSmShowFont(Window* pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSmShowFont(vcl::Window* pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; @@ -318,7 +318,7 @@ void SmFontDialog::SetFont(const vcl::Font &rFont) m_pShowFont->SetFont(Face); } -SmFontDialog::SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes) +SmFontDialog::SmFontDialog(vcl::Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes) : ModalDialog(pParent, "FontDialog", "modules/smath/ui/fontdialog.ui") { get(m_pFontBox, "font"); @@ -368,7 +368,7 @@ SmFontDialog::SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, bool namespace { - void getColors(Window &rRef, ColorData &rBgCol, ColorData &rTxtCol) + void getColors(vcl::Window &rRef, ColorData &rBgCol, ColorData &rTxtCol) { const StyleSettings &rS = rRef.GetSettings().GetStyleSettings(); if (rS.GetHighContrastMode()) @@ -408,7 +408,7 @@ void SmFontDialog::DataChanged( const DataChangedEvent& rDCEvt ) class SaveDefaultsQuery : public MessageDialog { public: - SaveDefaultsQuery(Window *pParent) + SaveDefaultsQuery(vcl::Window *pParent) : MessageDialog(pParent, "SaveDefaultsDialog", "modules/smath/ui/savedefaultsdialog.ui") { @@ -427,7 +427,7 @@ IMPL_LINK( SmFontSizeDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton return 0; } -SmFontSizeDialog::SmFontSizeDialog(Window * pParent) +SmFontSizeDialog::SmFontSizeDialog(vcl::Window * pParent) : ModalDialog(pParent, "FontSizeDialog", "modules/smath/ui/fontsizedialog.ui") { get(m_pTextSize, "spinB_text"); @@ -520,7 +520,7 @@ IMPL_LINK_INLINE_START( SmFontTypeDialog, DefaultButtonClickHdl, Button *, EMPTY } IMPL_LINK_INLINE_END( SmFontTypeDialog, DefaultButtonClickHdl, Button *, pButton ) -SmFontTypeDialog::SmFontTypeDialog(Window * pParent, OutputDevice *pFntListDevice) +SmFontTypeDialog::SmFontTypeDialog(vcl::Window * pParent, OutputDevice *pFntListDevice) : ModalDialog(pParent, "FontsDialog", "modules/smath/ui/fonttypedialog.ui"), pFontListDev (pFntListDevice) { @@ -758,7 +758,7 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory) }; // array to help iterate over the controls - Window * const aWin[4][2] = + vcl::Window * const aWin[4][2] = { { m_pFixedText1, m_pMetricField1 }, { m_pFixedText2, m_pMetricField2 }, @@ -852,7 +852,7 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory) } -SmDistanceDialog::SmDistanceDialog(Window *pParent) +SmDistanceDialog::SmDistanceDialog(vcl::Window *pParent) : ModalDialog(pParent, "SpacingDialog", "modules/smath/ui/spacingdialog.ui") { @@ -985,7 +985,7 @@ IMPL_LINK( SmAlignDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton*/ return 0; } -SmAlignDialog::SmAlignDialog(Window * pParent) +SmAlignDialog::SmAlignDialog(vcl::Window * pParent) : ModalDialog(pParent, "AlignmentDialog", "modules/smath/ui/alignmentdialog.ui") { @@ -1035,7 +1035,7 @@ void SmAlignDialog::WriteTo(SmFormat &rFormat) const } -SmShowSymbolSetWindow::SmShowSymbolSetWindow(Window *pParent, WinBits nStyle) +SmShowSymbolSetWindow::SmShowSymbolSetWindow(vcl::Window *pParent, WinBits nStyle) : Control(pParent, nStyle) , m_pVScrollBar(0) , nLen(0) @@ -1180,7 +1180,7 @@ void SmShowSymbolSetWindow::setScrollbar(ScrollBar *pVScrollBar) m_pVScrollBar->SetScrollHdl(LINK(this, SmShowSymbolSetWindow, ScrollHdl)); } -SmShowSymbolSet::SmShowSymbolSet(Window *pParent) +SmShowSymbolSet::SmShowSymbolSet(vcl::Window *pParent) : VclHBox(pParent, false, 6) , aSymbolWindow(this, WB_TABSTOP) , aVScrollBar(this, WinBits(WB_VSCROLL)) @@ -1192,7 +1192,7 @@ SmShowSymbolSet::SmShowSymbolSet(Window *pParent) aSymbolWindow.Show(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSmShowSymbolSet(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSmShowSymbolSet(vcl::Window *pParent, VclBuilder::stringmap &) { return new SmShowSymbolSet(pParent); } @@ -1219,7 +1219,7 @@ void SmShowSymbolSetWindow::calccols() Size SmShowSymbolSetWindow::GetOptimalSize() const { - Window *pParent = GetParent(); + vcl::Window *pParent = GetParent(); return Size(pParent->approximate_char_width() * 24, pParent->GetTextHeight() * 8); } @@ -1281,7 +1281,7 @@ IMPL_LINK( SmShowSymbolSetWindow, ScrollHdl, ScrollBar*, EMPTYARG /*pScrollBar*/ return 0; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSmShowSymbol(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSmShowSymbol(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; @@ -1447,7 +1447,7 @@ IMPL_LINK_NOARG( SmSymbolDialog, GetClickHdl ) } -SmSymbolDialog::SmSymbolDialog(Window *pParent, OutputDevice *pFntListDevice, +SmSymbolDialog::SmSymbolDialog(vcl::Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr, SmViewShell &rViewShell) : ModalDialog(pParent, "CatalogDialog", "modules/smath/ui/catalogdialog.ui") @@ -1562,7 +1562,7 @@ const SmSym * SmSymbolDialog::GetSymbol() const -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSmShowChar(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSmShowChar(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; @@ -1970,7 +1970,7 @@ void SmSymDefineDialog::UpdateButtons() pDeleteBtn->Enable(bDelete); } -SmSymDefineDialog::SmSymDefineDialog(Window * pParent, +SmSymDefineDialog::SmSymDefineDialog(vcl::Window * pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr) : ModalDialog (pParent, "EditSymbols", "modules/smath/ui/symdefinedialog.ui"), rSymbolMgr (rMgr), diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index f16a821f4fe6..fbc9a1b27cfa 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -431,7 +431,7 @@ void SmDocShell::DrawFormula(OutputDevice &rDev, Point &rPosition, bool bDrawSel sal_uLong nOldDrawMode = DRAWMODE_DEFAULT; bool bRestoreDrawMode = false; if (OUTDEV_WINDOW == rDev.GetOutDevType() && - ((Window &) rDev).GetSettings().GetStyleSettings().GetHighContrastMode()) + ((vcl::Window &) rDev).GetSettings().GetStyleSettings().GetHighContrastMode()) { nOldDrawMode = rDev.GetDrawMode(); rDev.SetDrawMode( DRAWMODE_DEFAULT ); diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 7a746f44e738..a214af390cb3 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -293,7 +293,7 @@ void SmModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) GetConfig()->ItemSetToConfig(rSet); } } -SfxTabPage* SmModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SmModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) { SfxTabPage* pRet = 0; if(nId == SID_SM_TP_PRINTOPTIONS) diff --git a/starmath/source/tmpdevice.cxx b/starmath/source/tmpdevice.cxx index c867e33475ea..2a6c3babce57 100644 --- a/starmath/source/tmpdevice.cxx +++ b/starmath/source/tmpdevice.cxx @@ -54,7 +54,7 @@ Color SmTmpDevice::Impl_GetColor( const Color& rColor ) { Color aBgCol( rOutDev.GetBackground().GetColor() ); if (OUTDEV_WINDOW == rOutDev.GetOutDevType()) - aBgCol = ((Window &) rOutDev).GetDisplayBackground().GetColor(); + aBgCol = ((vcl::Window &) rOutDev).GetDisplayBackground().GetColor(); nNewCol = SM_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor; diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx index f9357c0ad225..455441f4ab61 100644 --- a/starmath/source/toolbox.cxx +++ b/starmath/source/toolbox.cxx @@ -99,7 +99,7 @@ static sal_uInt16 GetCategoryRID( sal_uInt16 nResId ) SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings, SfxChildWindow *pChildWindow, - Window *pParent) + vcl::Window *pParent) : SfxFloatingWindow(pTmpBindings, pChildWindow, pParent, "FloatingElements", "modules/smath/ui/floatingelements.ui") { @@ -127,7 +127,7 @@ SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings, sal_uInt16 i; for (i = 0; i < NUM_TBX_CATEGORIES; ++i) { - ToolBox *pBox = new ToolBox(get("box"), SmResId( TOOLBOX_CAT_A + i )); + ToolBox *pBox = new ToolBox(get("box"), SmResId( TOOLBOX_CAT_A + i )); vToolBoxCategories[i] = pBox; pBox->SetSelectHdl(LINK(this, SmToolBoxWindow, CmdSelectHdl)); } @@ -344,7 +344,7 @@ IMPL_LINK( SmToolBoxWindow, CmdSelectHdl, ToolBox*, pToolBox) SFX_IMPL_FLOATINGWINDOW_WITHID(SmToolBoxWrapper, SID_TOOLBOXWINDOW); -SmToolBoxWrapper::SmToolBoxWrapper(Window *pParentWindow, +SmToolBoxWrapper::SmToolBoxWrapper(vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo *pInfo) : SfxChildWindow(pParentWindow, nId) diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx index 5c15ffa89b9b..47fad4ebb097 100644 --- a/starmath/source/utility.cxx +++ b/starmath/source/utility.cxx @@ -147,12 +147,12 @@ void SmFontPickList::WriteTo(SmFontDialog& rDialog) const /**************************************************************************/ -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSmFontPickListBox(Window* pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSmFontPickListBox(vcl::Window* pParent, VclBuilder::stringmap &) { return new SmFontPickListBox(pParent, WB_DROPDOWN); } -SmFontPickListBox::SmFontPickListBox (Window* pParent, WinBits nBits) : +SmFontPickListBox::SmFontPickListBox (vcl::Window* pParent, WinBits nBits) : SmFontPickList(4), ListBox(pParent, nBits) { diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index f59f9bc24f44..33ae98f870d4 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -706,7 +706,7 @@ void SmEditController::StateChanged(sal_uInt16 nSID, SfxItemState eState, const /**************************************************************************/ SmCmdBoxWindow::SmCmdBoxWindow(SfxBindings *pBindings_, SfxChildWindow *pChildWindow, - Window *pParent) : + vcl::Window *pParent) : SfxDockingWindow(pBindings_, pChildWindow, pParent, SmResId(RID_CMDBOXWINDOW)), aEdit (*this), aController (aEdit, SID_TEXT, *pBindings_), @@ -887,7 +887,7 @@ void SmCmdBoxWindow::GetFocus() SFX_IMPL_DOCKINGWINDOW_WITHID(SmCmdBoxWrapper, SID_CMDBOXWINDOW); -SmCmdBoxWrapper::SmCmdBoxWrapper(Window *pParentWindow, sal_uInt16 nId, +SmCmdBoxWrapper::SmCmdBoxWrapper(vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo) : SfxChildWindow(pParentWindow, nId) @@ -1360,7 +1360,7 @@ bool SmViewShell::HasPrintOptionsPage() const return true; } -SfxTabPage* SmViewShell::CreatePrintOptionsPage(Window *pParent, +SfxTabPage* SmViewShell::CreatePrintOptionsPage(vcl::Window *pParent, const SfxItemSet &rOptions) { return SmPrintOptionsTabPage::Create(pParent, rOptions); -- cgit