diff options
Diffstat (limited to 'cui/source/tabpages')
32 files changed, 150 insertions, 150 deletions
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index c2f07521ab3f..7eac0ade3164 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -150,7 +150,7 @@ void lcl_SetJustifyMethodToItemSet(SfxItemSet& rSet, sal_uInt16 nWhichJM, const -AlignmentTabPage::AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ) : +AlignmentTabPage::AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage( pParent, "CellAlignPage","cui/ui/cellalignment.ui", &rCoreAttrs ) @@ -253,7 +253,7 @@ AlignmentTabPage::~AlignmentTabPage() delete m_pOrientHlp; } -SfxTabPage* AlignmentTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* AlignmentTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new AlignmentTabPage( pParent, *rAttrSet ); } diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 498a677b341a..7475cd1af6f9 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star; using namespace ::rtl; -OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) +OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet ) : SfxTabDialog(pParent, "AutoCorrectDialog", "cui/ui/autocorrectdialog.ui", _pSet) { get(m_pLanguageBox, "langbox"); @@ -179,7 +179,7 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox) return 0; } -OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(Window* pParent, const SfxItemSet& rSet) +OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "AutocorrectOptionsPage", "cui/ui/acoroptionspage.ui", &rSet) , m_sInput(CUI_RESSTR(RID_SVXSTR_USE_REPLACE)) , m_sDoubleCaps(CUI_RESSTR(RID_SVXSTR_CPTL_STT_WORD)) @@ -193,7 +193,7 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(Window* pParent, const SfxItemSet get(m_pCheckLB, "checklist"); } -SfxTabPage* OfaAutocorrOptionsPage::Create( Window* pParent, +SfxTabPage* OfaAutocorrOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new OfaAutocorrOptionsPage(pParent, *rSet); @@ -285,7 +285,7 @@ class OfaAutoFmtPrcntSet : public ModalDialog { MetricField* m_pPrcntMF; public: - OfaAutoFmtPrcntSet(Window* pParent) + OfaAutoFmtPrcntSet(vcl::Window* pParent) : ModalDialog(pParent, "PercentDialog","cui/ui/percentdialog.ui") { get(m_pPrcntMF, "margin"); @@ -387,7 +387,7 @@ enum OfaAutoFmtOptions MERGE_SINGLE_LINE_PARA }; -OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, +OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "ApplyAutoFmtPage", "cui/ui/applyautofmtpage.ui", &rSet) , sDeleteEmptyPara(CUI_RESSTR(RID_SVXSTR_DEL_EMPTY_PARA)) @@ -431,9 +431,9 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, }; m_pCheckLB->SvSimpleTable::SetTabs(aStaticTabs); - OUStringBuffer sHeader(get<Window>("m")->GetText()); + OUStringBuffer sHeader(get<vcl::Window>("m")->GetText()); sHeader.append('\t'); - sHeader.append(get<Window>("t")->GetText()); + sHeader.append(get<vcl::Window>("t")->GetText()); sHeader.append('\t'); m_pCheckLB->InsertHeaderEntry(sHeader.makeStringAndClear(), HEADERBAR_APPEND, HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED); @@ -477,7 +477,7 @@ OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage() delete m_pCheckLB; } -SfxTabPage* OfaSwAutoFmtOptionsPage::Create( Window* pParent, +SfxTabPage* OfaSwAutoFmtOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new OfaSwAutoFmtOptionsPage(pParent, *rAttrSet); @@ -831,7 +831,7 @@ void OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt ) SvSimpleTable::KeyInput(rKEvt); } -OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent, +OfaAutocorrReplacePage::OfaAutocorrReplacePage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "AcorReplacePage", "cui/ui/acorreplacepage.ui", &rSet) , eLang(eLastDialogLanguage) @@ -905,7 +905,7 @@ OfaAutocorrReplacePage::~OfaAutocorrReplacePage() delete pCharClass; } -SfxTabPage* OfaAutocorrReplacePage::Create( Window* pParent, const SfxItemSet* rSet) +SfxTabPage* OfaAutocorrReplacePage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new OfaAutocorrReplacePage(pParent, *rSet); } @@ -1361,7 +1361,7 @@ static bool lcl_FindInArray(std::vector<OUString>& rStrings, const OUString& rSt return false; } -OfaAutocorrExceptPage::OfaAutocorrExceptPage(Window* pParent, const SfxItemSet& rSet) +OfaAutocorrExceptPage::OfaAutocorrExceptPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "AcorExceptPage", "cui/ui/acorexceptpage.ui", &rSet) , eLang(eLastDialogLanguage) { @@ -1405,7 +1405,7 @@ OfaAutocorrExceptPage::~OfaAutocorrExceptPage() delete pCompareClass; } -SfxTabPage* OfaAutocorrExceptPage::Create( Window* pParent, +SfxTabPage* OfaAutocorrExceptPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new OfaAutocorrExceptPage(pParent, *rSet); @@ -1685,7 +1685,7 @@ IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt) return 0; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAutoCorrEdit(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeAutoCorrEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new AutoCorrEdit(pParent); @@ -1740,7 +1740,7 @@ SvTreeListEntry* OfaQuoteTabPage::CreateEntry(OUString& rTxt, sal_uInt16 nCol) return pEntry; } -OfaQuoteTabPage::OfaQuoteTabPage(Window* pParent, const SfxItemSet& rSet) +OfaQuoteTabPage::OfaQuoteTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "ApplyLocalizedPage", "cui/ui/applylocalizedpage.ui", &rSet) , sNonBrkSpace(CUI_RESSTR(RID_SVXSTR_NON_BREAK_SPACE)) , sOrdinal(CUI_RESSTR(RID_SVXSTR_ORDINAL)) @@ -1795,9 +1795,9 @@ OfaQuoteTabPage::OfaQuoteTabPage(Window* pParent, const SfxItemSet& rSet) m_pSwCheckLB->SetStyle(m_pSwCheckLB->GetStyle() | WB_HSCROLL| WB_VSCROLL); m_pSwCheckLB->SvSimpleTable::SetTabs(aStaticTabs); - OUString sHeader(get<Window>("m")->GetText()); + OUString sHeader(get<vcl::Window>("m")->GetText()); sHeader += "\t"; - sHeader += get<Window>("t")->GetText(); + sHeader += get<vcl::Window>("t")->GetText(); sHeader += "\t"; m_pSwCheckLB->InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED); @@ -1822,7 +1822,7 @@ OfaQuoteTabPage::~OfaQuoteTabPage() delete m_pSwCheckLB; } -SfxTabPage* OfaQuoteTabPage::Create( Window* pParent, +SfxTabPage* OfaQuoteTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new OfaQuoteTabPage(pParent, *rAttrSet); @@ -2085,7 +2085,7 @@ OUString OfaQuoteTabPage::ChangeStringExt_Impl( sal_UCS4 cChar ) return aOUStr; } -OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(Window* pParent, +OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "WordCompletionPage", "cui/ui/wordcompletionpage.ui", &rSet) @@ -2146,7 +2146,7 @@ OfaAutoCompleteTabPage::~OfaAutoCompleteTabPage() { } -SfxTabPage* OfaAutoCompleteTabPage::Create( Window* pParent, +SfxTabPage* OfaAutoCompleteTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new OfaAutoCompleteTabPage( pParent, *rSet ); @@ -2315,7 +2315,7 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const sData.append(aLineEnd); } pCntnr->CopyByteString( SOT_FORMAT_STRING, sData.makeStringAndClear() ); - pCntnr->CopyToClipboard( (Window*)this ); + pCntnr->CopyToClipboard( (vcl::Window*)this ); } } @@ -2346,7 +2346,7 @@ bool OfaAutoCompleteTabPage::AutoCompleteMultiListBox::PreNotify( return nHandled; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAutoCompleteMultiListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeAutoCompleteMultiListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -2359,7 +2359,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAutoCompleteMultiListBox(Wi // class OfaSmartTagOptionsTabPage --------------------------------------------- -OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( Window* pParent, +OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "SmartTagOptionsPage", "cui/ui/smarttagoptionspage.ui", &rSet) { @@ -2385,7 +2385,7 @@ OfaSmartTagOptionsTabPage::~OfaSmartTagOptionsTabPage() } -SfxTabPage* OfaSmartTagOptionsTabPage::Create( Window* pParent, const SfxItemSet* rSet) +SfxTabPage* OfaSmartTagOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new OfaSmartTagOptionsTabPage( pParent, *rSet ); } diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 3f48db5ccea3..9929334ee452 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -176,10 +176,10 @@ sal_uInt16 GetItemId_Impl( ValueSet& rValueSet, const Color& rCol ) preview window for brush or bitmap */ -class BackgroundPreviewImpl : public Window +class BackgroundPreviewImpl : public vcl::Window { public: - BackgroundPreviewImpl(Window* pParent); + BackgroundPreviewImpl(vcl::Window* pParent); void setBmp(bool bBmp); virtual ~BackgroundPreviewImpl(); @@ -203,7 +203,7 @@ private: sal_uInt8 nTransparency; }; -BackgroundPreviewImpl::BackgroundPreviewImpl(Window* pParent) +BackgroundPreviewImpl::BackgroundPreviewImpl(vcl::Window* pParent) : Window(pParent, WB_BORDER) , bIsBmp(false) , pBitmap(NULL) @@ -214,7 +214,7 @@ BackgroundPreviewImpl::BackgroundPreviewImpl(Window* pParent) Paint(aDrawRect); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeBackgroundPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBackgroundPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new BackgroundPreviewImpl(pParent); } @@ -350,7 +350,7 @@ void BackgroundPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt ) #define HDL(hdl) LINK(this,SvxBackgroundTabPage,hdl) -SvxBackgroundTabPage::SvxBackgroundTabPage(Window* pParent, const SfxItemSet& rCoreSet) +SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SvxTabPage(pParent, "BackgroundPage", "cui/ui/backgroundpage.ui", rCoreSet) , nHtmlMode(0) , bAllowShowSelector(true) @@ -456,7 +456,7 @@ const sal_uInt16* SvxBackgroundTabPage::GetRanges() -SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent, +SfxTabPage* SvxBackgroundTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) /* [Description] @@ -1068,7 +1068,7 @@ int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet ) -void SvxBackgroundTabPage::PointChanged( Window* , RECT_POINT ) +void SvxBackgroundTabPage::PointChanged( vcl::Window* , RECT_POINT ) { // has to be implemented so that position control can work } @@ -1423,7 +1423,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl) return 0; bool bHtml = 0 != ( nHtmlMode & HTMLMODE_ON ); - OUString aStrBrowse(get<Window>("findgraphicsft")->GetText()); + OUString aStrBrowse(get<vcl::Window>("findgraphicsft")->GetText()); pImportDlg = new SvxOpenGraphicDialog( aStrBrowse ); if ( bHtml || bLinkOnly ) pImportDlg->EnableLink(false); diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx index d0d7752d4fff..2116a64364be 100644 --- a/cui/source/tabpages/bbdlg.cxx +++ b/cui/source/tabpages/bbdlg.cxx @@ -24,7 +24,7 @@ #include "svx/svxids.hrc" #include "cuitabarea.hxx" -SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(Window *pParent, +SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(vcl::Window *pParent, const SfxItemSet& rCoreSet, bool bEnableSelector, bool bEnableDrawingLayerFillStyles) diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 6ccba2efba01..b514300acd1a 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -85,7 +85,7 @@ static void lcl_SetDecimalDigitsTo1(MetricField& rField) } -SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const SfxItemSet& rCoreAttrs) +SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "BorderPage", "cui/ui/borderpage.ui", &rCoreAttrs) , @@ -349,7 +349,7 @@ const sal_uInt16* SvxBorderTabPage::GetRanges() -SfxTabPage* SvxBorderTabPage::Create( Window* pParent, +SfxTabPage* SvxBorderTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SvxBorderTabPage( pParent, *rAttrSet ) ); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 05781ce7a99a..fc59a487e6b1 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -175,7 +175,7 @@ inline SvxFont& SvxCharBasePage::GetPreviewCTLFont() -SvxCharBasePage::SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset) +SvxCharBasePage::SvxCharBasePage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset) : SfxTabPage( pParent, rID, rUIXMLDescription, &rItemset ) , m_pPreviewWin(NULL) , m_bPreviewBackgroundToCharacter( false ) @@ -262,7 +262,7 @@ struct SvxCharNamePage_Impl // class SvxCharNamePage ------------------------------------------------- -SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) +SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet ) : SvxCharBasePage(pParent, "CharNamePage", "cui/ui/charnamepage.ui", rInSet) , m_pImpl(new SvxCharNamePage_Impl) { @@ -1180,7 +1180,7 @@ int SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharNamePage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxCharNamePage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxCharNamePage( pParent, *rSet ); } @@ -1313,7 +1313,7 @@ void SvxCharNamePage::PageCreated(const SfxAllItemSet& aSet) } // class SvxCharEffectsPage ---------------------------------------------- -SvxCharEffectsPage::SvxCharEffectsPage( Window* pParent, const SfxItemSet& rInSet ) +SvxCharEffectsPage::SvxCharEffectsPage( vcl::Window* pParent, const SfxItemSet& rInSet ) : SvxCharBasePage(pParent, "EffectsPage", "cui/ui/effectspage.ui", rInSet) , m_aTransparentColorName(CUI_RES(RID_SVXSTR_CHARNAME_TRANSPARENT)) { @@ -1727,7 +1727,7 @@ int SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharEffectsPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxCharEffectsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxCharEffectsPage( pParent, *rSet ); } @@ -2564,7 +2564,7 @@ void SvxCharEffectsPage::PageCreated(const SfxAllItemSet& aSet) // class SvxCharPositionPage --------------------------------------------- -SvxCharPositionPage::SvxCharPositionPage( Window* pParent, const SfxItemSet& rInSet ) +SvxCharPositionPage::SvxCharPositionPage( vcl::Window* pParent, const SfxItemSet& rInSet ) : SvxCharBasePage(pParent, "PositionPage", "cui/ui/positionpage.ui", rInSet) , m_nSuperEsc((short)DFLT_ESC_SUPER) , m_nSubEsc((short)DFLT_ESC_SUB) @@ -2901,7 +2901,7 @@ int SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharPositionPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxCharPositionPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxCharPositionPage( pParent, *rSet ); } @@ -3328,7 +3328,7 @@ void SvxCharPositionPage::PageCreated(const SfxAllItemSet& aSet) } // class SvxCharTwoLinesPage ------------------------------------------------ -SvxCharTwoLinesPage::SvxCharTwoLinesPage(Window* pParent, const SfxItemSet& rInSet) +SvxCharTwoLinesPage::SvxCharTwoLinesPage(vcl::Window* pParent, const SfxItemSet& rInSet) : SvxCharBasePage(pParent, "TwoLinesPage", "cui/ui/twolinespage.ui", rInSet) , m_nStartBracketPosition( 0 ) , m_nEndBracketPosition( 0 ) @@ -3473,7 +3473,7 @@ int SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharTwoLinesPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxCharTwoLinesPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxCharTwoLinesPage( pParent, *rSet ); } diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index 61ac6853975d..b4269d3e8145 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -50,7 +50,7 @@ static const sal_uInt16 pRanges[] = |* \************************************************************************/ -SvxConnectionDialog::SvxConnectionDialog( Window* pParent, const SfxItemSet& rInAttrs, +SvxConnectionDialog::SvxConnectionDialog( vcl::Window* pParent, const SfxItemSet& rInAttrs, const SdrView* pSdrView ) : SfxSingleTabDialog(pParent, rInAttrs) { @@ -79,7 +79,7 @@ SvxConnectionDialog::~SvxConnectionDialog() |* \************************************************************************/ -SvxConnectionPage::SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttrs ) +SvxConnectionPage::SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ) : SfxTabPage(pWindow ,"ConnectorTabPage" ,"cui/ui/connectortabpage.ui" ,&rInAttrs) , rOutAttrs(rInAttrs) @@ -388,7 +388,7 @@ void SvxConnectionPage::Construct() |* \************************************************************************/ -SfxTabPage* SvxConnectionPage::Create( Window* pWindow, +SfxTabPage* SvxConnectionPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxConnectionPage( pWindow, *rAttrs ) ); diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index edfbed3dcc9e..86d23299112b 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -30,7 +30,7 @@ |* \************************************************************************/ -SvxDistributeDialog::SvxDistributeDialog(Window* pParent, +SvxDistributeDialog::SvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer) : SfxSingleTabDialog(pParent, rInAttrs, "DistributionDialog", @@ -47,7 +47,7 @@ SvxDistributeDialog::SvxDistributeDialog(Window* pParent, |* \************************************************************************/ -SvxDistributePage::SvxDistributePage(Window* pWindow, +SvxDistributePage::SvxDistributePage(vcl::Window* pWindow, const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer) : SvxTabPage(pWindow, "DistributionPage", "cui/ui/distributionpage.ui", @@ -74,13 +74,13 @@ SvxDistributePage::SvxDistributePage(Window* pWindow, |* \************************************************************************/ -SfxTabPage* SvxDistributePage::Create(Window* pWindow, const SfxItemSet& rAttrs, +SfxTabPage* SvxDistributePage::Create(vcl::Window* pWindow, const SfxItemSet& rAttrs, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer) { return new SvxDistributePage(pWindow, rAttrs, eHor, eVer); } -void SvxDistributePage::PointChanged(Window* /*pWindow*/, RECT_POINT /*eRP*/) +void SvxDistributePage::PointChanged(vcl::Window* /*pWindow*/, RECT_POINT /*eRP*/) { } diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index dad147e7d54b..0fcd835987ab 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -48,7 +48,7 @@ static inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit ) description: crop graphic --------------------------------------------------------------------*/ -SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet ) +SvxGrfCropPage::SvxGrfCropPage ( vcl::Window *pParent, const SfxItemSet &rSet ) : SfxTabPage(pParent, "CropPage", "cui/ui/croppage.ui", &rSet) , pLastCropField(0) , nOldWidth(0) @@ -129,7 +129,7 @@ SvxGrfCropPage::~SvxGrfCropPage() aTimer.Stop(); } -SfxTabPage* SvxGrfCropPage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage* SvxGrfCropPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SvxGrfCropPage( pParent, *rSet ); } @@ -749,7 +749,7 @@ Size SvxGrfCropPage::GetGrfOrigSize( const Graphic& rGrf ) const /*****************************************************************/ -SvxCropExample::SvxCropExample( Window* pPar, WinBits nStyle ) +SvxCropExample::SvxCropExample( vcl::Window* pPar, WinBits nStyle ) : Window( pPar, nStyle) , aFrameSize( OutputDevice::LogicToLogic( Size( CM_1_TO_TWIP / 2, CM_1_TO_TWIP / 2 ), @@ -765,7 +765,7 @@ Size SvxCropExample::GetOptimalSize() const return LogicToPixel(Size(78, 78), MAP_APPFONT); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxCropExample(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxCropExample(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 37bfe3e0ff8d..e1dcee776491 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -70,7 +70,7 @@ static const sal_uInt16 pCaptionRanges[] = 0 }; -SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxCaptionTabPage::SvxCaptionTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SfxTabPage(pParent, "CalloutPage", "cui/ui/calloutpage.ui", &rInAttrs) , nCaptionType(0) , nGap(0) @@ -336,7 +336,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxCaptionTabPage::Create( Window* pWindow, +SfxTabPage* SvxCaptionTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return( new SvxCaptionTabPage( pWindow, *rOutAttrs ) ); @@ -514,7 +514,7 @@ void SvxCaptionTabPage::FillValueSet() -SvxCaptionTabDialog::SvxCaptionTabDialog(Window* pParent, const SdrView* pSdrView, +SvxCaptionTabDialog::SvxCaptionTabDialog(vcl::Window* pParent, const SdrView* pSdrView, sal_uInt16 nAnchorTypes) : SfxTabDialog( pParent, "CalloutDialog", "cui/ui/calloutdialog.ui") , pView(pSdrView) diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 52788fb317e2..3af840679e2b 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -135,7 +135,7 @@ void _SfxMacroTabPage::EnableButtons() mpImpl->pAssignPB->Enable( false ); } -_SfxMacroTabPage::_SfxMacroTabPage(Window* pParent, const SfxItemSet& rAttrSet) +_SfxMacroTabPage::_SfxMacroTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, "EventAssignPage", "cui/ui/eventassignpage.ui", &rAttrSet) { mpImpl = new _SfxMacroTabPage_Impl; @@ -433,7 +433,7 @@ void _SfxMacroTabPage::FillEvents() } } -SfxMacroTabPage::SfxMacroTabPage(Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet ) +SfxMacroTabPage::SfxMacroTabPage(vcl::Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet ) : _SfxMacroTabPage( pParent, rSet ) { mpImpl->sStrEvent = get<FixedText>("eventft")->GetText(); @@ -456,18 +456,18 @@ SfxMacroTabPage::SfxMacroTabPage(Window* pParent, const Reference< XFrame >& rxD namespace { - SfxMacroTabPage* CreateSfxMacroTabPage( Window* pParent, const SfxItemSet& rAttrSet ) + SfxMacroTabPage* CreateSfxMacroTabPage( vcl::Window* pParent, const SfxItemSet& rAttrSet ) { return new SfxMacroTabPage( pParent, NULL, rAttrSet ); } } -SfxTabPage* SfxMacroTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SfxMacroTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return CreateSfxMacroTabPage(pParent, *rAttrSet); } -SfxMacroAssignDlg::SfxMacroAssignDlg(Window* pParent, +SfxMacroAssignDlg::SfxMacroAssignDlg(vcl::Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet, "EventAssignDialog", "cui/ui/eventassigndialog.ui") diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 6104a2a5fdf3..dfeb8fef7cc0 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -60,7 +60,7 @@ static const sal_uInt16 pRanges[] = |* \************************************************************************/ -SvxMeasureDialog::SvxMeasureDialog( Window* pParent, const SfxItemSet& rInAttrs, +SvxMeasureDialog::SvxMeasureDialog( vcl::Window* pParent, const SfxItemSet& rInAttrs, const SdrView* pSdrView ) : SfxSingleTabDialog(pParent, rInAttrs) { @@ -79,7 +79,7 @@ SvxMeasureDialog::SvxMeasureDialog( Window* pParent, const SfxItemSet& rInAttrs, |* \************************************************************************/ -SvxMeasurePage::SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ) : +SvxMeasurePage::SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ) : SvxTabPage ( pWindow ,"DimensionLinesTabPage" ,"cui/ui/dimensionlinestabpage.ui" @@ -593,7 +593,7 @@ void SvxMeasurePage::Construct() |* \************************************************************************/ -SfxTabPage* SvxMeasurePage::Create( Window* pWindow, +SfxTabPage* SvxMeasurePage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxMeasurePage( pWindow, *rAttrs ) ); @@ -604,7 +604,7 @@ const sal_uInt16* SvxMeasurePage::GetRanges() return( pRanges ); } -void SvxMeasurePage::PointChanged( Window* pWindow, RECT_POINT /*eRP*/ ) +void SvxMeasurePage::PointChanged( vcl::Window* pWindow, RECT_POINT /*eRP*/ ) { ChangeAttrHdl_Impl( pWindow ); } diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 6937e0c5cd16..19d42733f858 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -76,7 +76,7 @@ static const sal_uInt16 pRanges[] = #* #************************************************************************/ -SvxNumberPreview::SvxNumberPreview(Window* pParent, WinBits nStyle) +SvxNumberPreview::SvxNumberPreview(vcl::Window* pParent, WinBits nStyle) : Window(pParent, nStyle) , mnPos(-1) , mnChar(0x0) @@ -89,7 +89,7 @@ SvxNumberPreview::SvxNumberPreview(Window* pParent, WinBits nStyle) SetBorderStyle( WINDOW_BORDER_MONO ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxNumberPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxNumberPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxNumberPreview(pParent); } @@ -235,7 +235,7 @@ void SvxNumberPreview::DataChanged( const DataChangedEvent& rDCEvt ) #define HDL(hdl) LINK( this, SvxNumberFormatTabPage, hdl ) -SvxNumberFormatTabPage::SvxNumberFormatTabPage(Window* pParent, +SvxNumberFormatTabPage::SvxNumberFormatTabPage(vcl::Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "NumberingFormatPage", "cui/ui/numberingformatpage.ui", &rCoreAttrs) @@ -375,7 +375,7 @@ const sal_uInt16* SvxNumberFormatTabPage::GetRanges() #* #************************************************************************/ -SfxTabPage* SvxNumberFormatTabPage::Create( Window* pParent, +SfxTabPage* SvxNumberFormatTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SvxNumberFormatTabPage( pParent, *rAttrSet ) ); @@ -1664,7 +1664,7 @@ bool SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt ) { if(rNEvt.GetType()==EVENT_LOSEFOCUS) { - if ( rNEvt.GetWindow() == dynamic_cast< Window* >( m_pEdComment ) && !m_pEdComment->IsVisible() ) + if ( rNEvt.GetWindow() == dynamic_cast< vcl::Window* >( m_pEdComment ) && !m_pEdComment->IsVisible() ) { pLastActivWindow = NULL; } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 2e087739a05a..558536153a8d 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -173,7 +173,7 @@ static vcl::Font& lcl_GetDefaultBulletFont() return aDefBulletFont; } -SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent, +SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickNumberingPage", "cui/ui/picknumberingpage.ui", &rSet) , pActNum(0) @@ -223,7 +223,7 @@ SvxSingleNumPickTabPage::~SvxSingleNumPickTabPage() delete pSaveNum; } -SfxTabPage* SvxSingleNumPickTabPage::Create( Window* pParent, +SfxTabPage* SvxSingleNumPickTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxSingleNumPickTabPage(pParent, *rAttrSet); @@ -361,7 +361,7 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, DoubleClickHdl_Impl) } -SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, +SvxBulletPickTabPage::SvxBulletPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickBulletPage", "cui/ui/pickbulletpage.ui", &rSet) , pActNum(0) @@ -384,7 +384,7 @@ SvxBulletPickTabPage::~SvxBulletPickTabPage() delete pSaveNum; } -SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent, +SfxTabPage* SvxBulletPickTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxBulletPickTabPage(pParent, *rAttrSet); @@ -524,7 +524,7 @@ void SvxBulletPickTabPage::PageCreated(const SfxAllItemSet& aSet) } -SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, +SvxNumPickTabPage::SvxNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickOutlinePage", "cui/ui/pickoutlinepage.ui", &rSet) , pActNum(0) @@ -581,7 +581,7 @@ SvxNumPickTabPage::~SvxNumPickTabPage() delete pSaveNum; } -SfxTabPage* SvxNumPickTabPage::Create( Window* pParent, +SfxTabPage* SvxNumPickTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxNumPickTabPage(pParent, *rAttrSet); @@ -772,7 +772,7 @@ void SvxNumPickTabPage::PageCreated(const SfxAllItemSet& aSet) SetCharFmtNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue()); } -SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, +SvxBitmapPickTabPage::SvxBitmapPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickGraphicPage", "cui/ui/pickgraphicpage.ui", &rSet) , pActNum(0) @@ -822,7 +822,7 @@ SvxBitmapPickTabPage::~SvxBitmapPickTabPage() delete pSaveNum; } -SfxTabPage* SvxBitmapPickTabPage::Create( Window* pParent, +SfxTabPage* SvxBitmapPickTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxBitmapPickTabPage(pParent, *rAttrSet); @@ -1021,7 +1021,7 @@ void SvxNumOptionsTabPage::GetI18nNumbering( ListBox& rFmtLB, sal_uInt16 nDoNotR } // tabpage numbering options -SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent, +SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "NumberingOptionsPage", "cui/ui/numberingoptionspage.ui", &rSet) , pActNum(0) @@ -1141,7 +1141,7 @@ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric) m_pHeightMF->SetUnit( eMetric ); } -SfxTabPage* SvxNumOptionsTabPage::Create( Window* pParent, +SfxTabPage* SvxNumOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxNumOptionsTabPage(pParent, *rAttrSet); @@ -2265,7 +2265,7 @@ static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev, return nRet; } -SvxNumberingPreview::SvxNumberingPreview(Window* pParent, WinBits nWinBits) +SvxNumberingPreview::SvxNumberingPreview(vcl::Window* pParent, WinBits nWinBits) : Window(pParent, nWinBits) , pActNum(0) , nPageWidth(0) @@ -2276,7 +2276,7 @@ SvxNumberingPreview::SvxNumberingPreview(Window* pParent, WinBits nWinBits) SetBorderStyle(WINDOW_BORDER_MONO); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxNumberingPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxNumberingPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxNumberingPreview(pParent, WB_BORDER); } @@ -2580,7 +2580,7 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) //dialog to this one, except with a different preview window impl. //TODO, determine if SwNumPositionTabPage and SvxNumPositionTabPage can be //merged -SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, +SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "NumberingPositionPage", "cui/ui/numberingpositionpage.ui", &rSet) , pActNum(0) @@ -3093,7 +3093,7 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() m_pIndentAtMF->Show( bLabelAlignmentPosAndSpaceModeActive ); } -SfxTabPage* SvxNumPositionTabPage::Create( Window* pParent, +SfxTabPage* SvxNumPositionTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxNumPositionTabPage(pParent, *rAttrSet); diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 56877bf9dba8..97b662be8846 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -171,12 +171,12 @@ const sal_uInt16* SvxPageDescPage::GetRanges() -SfxTabPage* SvxPageDescPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxPageDescPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxPageDescPage( pParent, *rSet ); } -SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) : +SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SfxTabPage( pParent, "PageFormatPage", "cui/ui/pageformatpage.ui", &rAttr ), diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index a205605d183a..cf984bedbb22 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -194,7 +194,7 @@ IMPL_LINK_NOARG(SvxStdParagraphTabPage, ELRLoseFocusHdl) return 0; } -SfxTabPage* SvxStdParagraphTabPage::Create( Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SvxStdParagraphTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new SvxStdParagraphTabPage( pParent, *rSet ); } @@ -618,7 +618,7 @@ int SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent, const SfxItemSet& rAttr ) : +SvxStdParagraphTabPage::SvxStdParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SfxTabPage( pParent, "ParaIndentSpacing","cui/ui/paraindentspacing.ui", &rAttr ), nAbst ( MAX_DURCH ), @@ -964,7 +964,7 @@ void SvxStdParagraphTabPage::PageCreated(const SfxAllItemSet& aSet) #define LASTLINECOUNT_OLD 3 #define LASTLINECOUNT_NEW 4 -SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet ) +SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "ParaAlignPage", "cui/ui/paragalignpage.ui",&rSet) { @@ -1046,7 +1046,7 @@ int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -SfxTabPage* SvxParaAlignTabPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxParaAlignTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxParaAlignTabPage(pParent, *rSet); } @@ -1324,7 +1324,7 @@ void SvxParaAlignTabPage::PageCreated (const SfxAllItemSet& aSet) EnableJustifyExt(); } -SfxTabPage* SvxExtParagraphTabPage::Create( Window* pParent, +SfxTabPage* SvxExtParagraphTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxExtParagraphTabPage( pParent, *rSet ); @@ -1829,7 +1829,7 @@ void SvxExtParagraphTabPage::DisablePageBreak() m_pPagenumEdit->Enable(false); } -SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rAttr ) : +SvxExtParagraphTabPage::SvxExtParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SfxTabPage( pParent, "TextFlowPage","cui/ui/textflowpage.ui", &rAttr ), bPageBreak ( true ), @@ -2119,7 +2119,7 @@ void SvxExtParagraphTabPage::PageCreated(const SfxAllItemSet& aSet) DisablePageBreak(); } -SvxAsianTabPage::SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ) : +SvxAsianTabPage::SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "AsianTypography","cui/ui/asiantypography.ui", &rSet) { @@ -2138,7 +2138,7 @@ SvxAsianTabPage::~SvxAsianTabPage() { } -SfxTabPage* SvxAsianTabPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxAsianTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxAsianTabPage(pParent, *rSet); } diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index ca0cff406751..ffd6bd3207c2 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -502,7 +502,7 @@ static sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap, return nLBRelations; } -SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SfxTabPage(pParent, "SwPosSizePage", "cui/ui/swpossizepage.ui", &rInAttrs) , m_pVMap(0) , m_pHMap(0) @@ -693,7 +693,7 @@ SvxSwPosSizeTabPage::~SvxSwPosSizeTabPage() { } -SfxTabPage* SvxSwPosSizeTabPage::Create( Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SvxSwPosSizeTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new SvxSwPosSizeTabPage(pParent, *rSet); } diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 3d3b3f82a17b..e5ab37b6f16f 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -37,7 +37,7 @@ SvxAreaTabDialog::SvxAreaTabDialog ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 01ac68b57cc3..c473966340ad 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -35,7 +35,7 @@ SvxLineTabDialog::SvxLineTabDialog ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pSdrObj, diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 0f528e4e8a17..de67049d9e11 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -36,7 +36,7 @@ // class TabWin_Impl ----------------------------------------------------- -class TabWin_Impl : public Window +class TabWin_Impl : public vcl::Window { SvxTabulatorTabPage* mpPage; private: @@ -44,7 +44,7 @@ private: public: - TabWin_Impl(Window* pParent, WinBits nBits) + TabWin_Impl(vcl::Window* pParent, WinBits nBits) : Window(pParent, nBits) , mpPage(0) , nTabStyle(0) @@ -57,7 +57,7 @@ public: void SetTabStyle(sal_uInt16 nStyle) {nTabStyle = nStyle; } }; -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTabWin_Impl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTabWin_Impl(vcl::Window *pParent, VclBuilder::stringmap &) { return new TabWin_Impl(pParent, 0); } @@ -96,7 +96,7 @@ void TabWin_Impl::Paint( const Rectangle& ) // class SvxTabulatorTabPage --------------------------------------------- -SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rAttr ): +SvxTabulatorTabPage::SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet& rAttr ): SfxTabPage( pParent, "ParagraphTabsPage","cui/ui/paratabspage.ui", &rAttr ), @@ -259,7 +259,7 @@ bool SvxTabulatorTabPage::FillItemSet( SfxItemSet* rSet ) -SfxTabPage* SvxTabulatorTabPage::Create( Window* pParent, +SfxTabPage* SvxTabulatorTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return ( new SvxTabulatorTabPage( pParent, *rSet ) ); diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 4ba2bb7c623f..4e1761d0a18d 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -41,7 +41,7 @@ static const sal_uInt16 pRanges[] = |* \************************************************************************/ -SvxTextTabDialog::SvxTextTabDialog( Window* pParent, +SvxTextTabDialog::SvxTextTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pSdrView ) : SfxTabDialog ( pParent @@ -76,7 +76,7 @@ void SvxTextTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) |* \************************************************************************/ -SvxTextAnimationPage::SvxTextAnimationPage( Window* pWindow, const SfxItemSet& rInAttrs ) : +SvxTextAnimationPage::SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ) : SfxTabPage ( pWindow ,"TextAnimation" ,"cui/ui/textanimtabpage.ui" @@ -450,7 +450,7 @@ const sal_uInt16* SvxTextAnimationPage::GetRanges() |* \************************************************************************/ -SfxTabPage* SvxTextAnimationPage::Create( Window* pWindow, +SfxTabPage* SvxTextAnimationPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxTextAnimationPage( pWindow, *rAttrs ) ); diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index d97cca54836a..3f74020f47c6 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -53,7 +53,7 @@ static const sal_uInt16 pRanges[] = |* dialog (page) for copying objects |* \************************************************************************/ -SvxTextAttrPage::SvxTextAttrPage(Window* pWindow, const SfxItemSet& rInAttrs) +SvxTextAttrPage::SvxTextAttrPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs) : SvxTabPage(pWindow,"TextAttributesPage","cui/ui/textattrtabpage.ui", rInAttrs) , rOutAttrs(rInAttrs) , pView(NULL) @@ -520,7 +520,7 @@ void SvxTextAttrPage::Construct() |* \************************************************************************/ -SfxTabPage* SvxTextAttrPage::Create( Window* pWindow, +SfxTabPage* SvxTextAttrPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxTextAttrPage( pWindow, *rAttrs ) ); @@ -533,7 +533,7 @@ const sal_uInt16* SvxTextAttrPage::GetRanges() /** Check whether we have to uncheck the "Full width" check box. */ -void SvxTextAttrPage::PointChanged( Window*, RECT_POINT eRP ) +void SvxTextAttrPage::PointChanged( vcl::Window*, RECT_POINT eRP ) { if (m_pTsbFullWidth->GetState() == TRISTATE_TRUE) { diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 698d0a5de0ab..0dfd93040826 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -224,7 +224,7 @@ void SvxTransparenceTabPage::SetControlState_Impl(XGradientStyle eXGS) } } -SvxTransparenceTabPage::SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxTransparenceTabPage::SvxTransparenceTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SvxTabPage ( pParent, "TransparencyTabPage", "cui/ui/transparencytabpage.ui", @@ -289,7 +289,7 @@ void SvxTransparenceTabPage::Construct() { } -SfxTabPage* SvxTransparenceTabPage::Create(Window* pWindow, const SfxItemSet* rAttrs) +SfxTabPage* SvxTransparenceTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rAttrs) { return(new SvxTransparenceTabPage(pWindow, *rAttrs)); } @@ -486,7 +486,7 @@ int SvxTransparenceTabPage::DeactivatePage(SfxItemSet* _pSet) return(LEAVE_PAGE); } -void SvxTransparenceTabPage::PointChanged(Window* , RECT_POINT eRcPt) +void SvxTransparenceTabPage::PointChanged(vcl::Window* , RECT_POINT eRcPt) { eRP = eRcPt; } @@ -579,7 +579,7 @@ void SvxTransparenceTabPage::PageCreated(const SfxAllItemSet& aSet) |* \************************************************************************/ -SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : +SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SvxTabPage( pParent, "AreaTabPage", @@ -1756,7 +1756,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs ) -SfxTabPage* SvxAreaTabPage::Create( Window* pWindow, +SfxTabPage* SvxAreaTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxAreaTabPage( pWindow, *rAttrs ) ); @@ -2365,7 +2365,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ClickScaleHdl_Impl) -void SvxAreaTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) +void SvxAreaTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRcPt ) { eRP = eRcPt; diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 42915cd6e848..b6b9280235dd 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -50,7 +50,7 @@ using namespace com::sun::star; -SvxBitmapTabPage::SvxBitmapTabPage( Window* pParent, const SfxItemSet& rInAttrs) : +SvxBitmapTabPage::SvxBitmapTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs) : SvxTabPage ( pParent, "BitmapTabPage", @@ -291,7 +291,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxBitmapTabPage::Create( Window* pWindow, +SfxTabPage* SvxBitmapTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) { return new SvxBitmapTabPage( pWindow, *rSet ); @@ -949,7 +949,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl) -void SvxBitmapTabPage::PointChanged( Window* pWindow, RECT_POINT ) +void SvxBitmapTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT ) { if( pWindow == m_pCtlPixel ) { @@ -967,7 +967,7 @@ void SvxBitmapTabPage::PointChanged( Window* pWindow, RECT_POINT ) -Window* SvxBitmapTabPage::GetParentLabeledBy( const Window* pLabeled ) const +vcl::Window* SvxBitmapTabPage::GetParentLabeledBy( const vcl::Window* pLabeled ) const { if (pLabeled == m_pLbBitmaps) return const_cast<FixedText*>(m_pLbBitmapsHidden); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 7d2def85d888..2fc15158a11a 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -300,7 +300,7 @@ struct SvxColorTabPageShadow -SvxColorTabPage::SvxColorTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SfxTabPage(pParent, "ColorPage", "cui/ui/colorpage.ui", &rInAttrs) , meType( XCOLOR_LIST ) , mpXPool( (XOutdevItemPool*) rInAttrs.GetPool() ) @@ -619,7 +619,7 @@ void SvxColorTabPage::Reset( const SfxItemSet* rSet ) -SfxTabPage* SvxColorTabPage::Create( Window* pWindow, +SfxTabPage* SvxColorTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return( new SvxColorTabPage( pWindow, *rOutAttrs ) ); @@ -657,7 +657,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ModifiedHdl_Impl) IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl) { - Window *pWindow = this; + vcl::Window *pWindow = this; while( pWindow ) { pWindow = pWindow->GetParent(); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index bc1050e54a37..085ba9ce144f 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -46,7 +46,7 @@ using namespace com::sun::star; SvxGradientTabPage::SvxGradientTabPage ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SfxTabPage ( pParent, "GradientPage", "cui/ui/gradientpage.ui", &rInAttrs ), @@ -366,7 +366,7 @@ void SvxGradientTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxGradientTabPage::Create( Window* pWindow, +SfxTabPage* SvxGradientTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return new SvxGradientTabPage( pWindow, *rOutAttrs ); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 85768a5cb066..ee0c8a2a666f 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -48,7 +48,7 @@ using namespace com::sun::star; SvxHatchTabPage::SvxHatchTabPage ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rInAttrs ) : @@ -339,7 +339,7 @@ void SvxHatchTabPage::Reset( const SfxItemSet* rSet ) -SfxTabPage* SvxHatchTabPage::Create( Window* pWindow, +SfxTabPage* SvxHatchTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) { return new SvxHatchTabPage( pWindow, *rSet ); @@ -799,7 +799,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl) -void SvxHatchTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) +void SvxHatchTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRcPt ) { if( pWindow == m_pCtlAngle ) { diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 20efb0e3b754..5da506f3d745 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -76,7 +76,7 @@ static const sal_uInt16 pLineRanges[] = SvxLineTabPage::SvxLineTabPage ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SvxTabPage ( pParent @@ -1483,7 +1483,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) -SfxTabPage* SvxLineTabPage::Create( Window* pWindow, +SfxTabPage* SvxLineTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxLineTabPage( pWindow, *rAttrs ) ); @@ -1673,7 +1673,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl) -void SvxLineTabPage::PointChanged( Window*, RECT_POINT eRcPt ) +void SvxLineTabPage::PointChanged( vcl::Window*, RECT_POINT eRcPt ) { eRP = eRcPt; } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 8d8583eabbce..cf945d689375 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -48,7 +48,7 @@ SvxLineDefTabPage::SvxLineDefTabPage ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rInAttrs ) : @@ -320,7 +320,7 @@ void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs ) -SfxTabPage* SvxLineDefTabPage::Create( Window* pWindow, const SfxItemSet* rOutAttrs ) +SfxTabPage* SvxLineDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return( new SvxLineDefTabPage( pWindow, *rOutAttrs ) ); } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 94cf7635bc3f..a71ce58192b1 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -50,7 +50,7 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rInAttrs ) : @@ -264,7 +264,7 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxLineEndDefTabPage::Create( Window* pWindow, const SfxItemSet* rSet ) +SfxTabPage* SvxLineEndDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) { return( new SvxLineEndDefTabPage( pWindow, *rSet ) ); } diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 97ba83597c3d..7bd6076eb6c9 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -45,7 +45,7 @@ static const sal_uInt16 pShadowRanges[] = 0 }; -SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : +SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SvxTabPage ( pParent, "ShadowTabPage", @@ -456,7 +456,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs ) -SfxTabPage* SvxShadowTabPage::Create( Window* pWindow, +SfxTabPage* SvxShadowTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxShadowTabPage( pWindow, *rAttrs ) ); @@ -533,7 +533,7 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl) -void SvxShadowTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) +void SvxShadowTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRcPt ) { eRP = eRcPt; diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 0245dcf1ba59..c6273945c7cb 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -102,7 +102,7 @@ static void lcl_ScaleRect(basegfx::B2DRange& rRange, const Fraction aUIScale) |* \************************************************************************/ -SvxTransformTabDialog::SvxTransformTabDialog( Window* pParent, const SfxItemSet* pAttr, +SvxTransformTabDialog::SvxTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pSdrView, sal_uInt16 nAnchorTypes ) : SfxTabDialog( pParent ,"PositionAndSizeDialog" @@ -197,7 +197,7 @@ void SvxTransformTabDialog::SetValidateFramePosLink(const Link& rLink) |* angle and the rotation angle of the graphic objects |* \************************************************************************/ -SvxAngleTabPage::SvxAngleTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxAngleTabPage::SvxAngleTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SvxTabPage( pParent,"Rotation","cui/ui/rotationtabpage.ui", rInAttrs) , rOutAttrs(rInAttrs) , pView(NULL) @@ -330,7 +330,7 @@ void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs) -SfxTabPage* SvxAngleTabPage::Create( Window* pWindow, const SfxItemSet* rSet) +SfxTabPage* SvxAngleTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet) { return(new SvxAngleTabPage(pWindow, *rSet)); } @@ -362,7 +362,7 @@ int SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet ) -void SvxAngleTabPage::PointChanged(Window* pWindow, RECT_POINT eRP) +void SvxAngleTabPage::PointChanged(vcl::Window* pWindow, RECT_POINT eRP) { if(pWindow == m_pCtlRect) { @@ -431,7 +431,7 @@ void SvxAngleTabPage::PointChanged(Window* pWindow, RECT_POINT eRP) |* dialog for changing slant and corner radius |* \************************************************************************/ -SvxSlantTabPage::SvxSlantTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxSlantTabPage::SvxSlantTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SvxTabPage( pParent,"SlantAndCornerRadius","cui/ui/slantcornertabpage.ui", rInAttrs) , rOutAttrs(rInAttrs) @@ -564,7 +564,7 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs) -SfxTabPage* SvxSlantTabPage::Create( Window* pWindow, const SfxItemSet* rOutAttrs ) +SfxTabPage* SvxSlantTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return( new SvxSlantTabPage( pWindow, *rOutAttrs ) ); } @@ -603,7 +603,7 @@ int SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet ) -void SvxSlantTabPage::PointChanged( Window* , RECT_POINT ) +void SvxSlantTabPage::PointChanged( vcl::Window* , RECT_POINT ) { } @@ -612,7 +612,7 @@ void SvxSlantTabPage::PointChanged( Window* , RECT_POINT ) |* Dialog for changing position and size of graphic objects |* \************************************************************************/ -SvxPositionSizeTabPage::SvxPositionSizeTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxPositionSizeTabPage::SvxPositionSizeTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SvxTabPage(pParent,"PositionAndSize","cui/ui/possizetabpage.ui", rInAttrs) , mrOutAttrs(rInAttrs) , mpView(NULL) @@ -1003,7 +1003,7 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxPositionSizeTabPage::Create( Window* pWindow, const SfxItemSet* rOutAttrs ) +SfxTabPage* SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return( new SvxPositionSizeTabPage( pWindow, *rOutAttrs ) ); } @@ -1349,7 +1349,7 @@ void SvxPositionSizeTabPage::GetTopLeftPosition(double& rfX, double& rfY, const -void SvxPositionSizeTabPage::PointChanged( Window* pWindow, RECT_POINT eRP ) +void SvxPositionSizeTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) { if( pWindow == m_pCtlPos ) { |