diff options
Diffstat (limited to 'chart2/source/controller')
88 files changed, 163 insertions, 163 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index 95992f425c5c..c03c0b16ad92 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -697,7 +697,7 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds() ExplicitValueProvider::getExplicitValueProvider( m_aAccInfo.m_xView )); if( pExplicitValueProvider ) { - Window* pWindow( VCLUnoHelper::GetWindow( m_aAccInfo.m_xWindow )); + vcl::Window* pWindow( VCLUnoHelper::GetWindow( m_aAccInfo.m_xWindow )); awt::Rectangle aLogicRect( pExplicitValueProvider->getRectangleOfObject( m_aAccInfo.m_aOID.getObjectCID() )); if( pWindow ) { diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 83bec76014c8..4b742f17a54c 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -76,7 +76,7 @@ awt::Rectangle AccessibleChartView::GetWindowPosSize() const awt::Rectangle aBBox( xWindow->getPosSize() ); - Window* pWindow( VCLUnoHelper::GetWindow( GetInfo().m_xWindow )); + vcl::Window* pWindow( VCLUnoHelper::GetWindow( GetInfo().m_xWindow )); if( pWindow ) { SolarMutexGuard aSolarGuard; @@ -324,7 +324,7 @@ void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments aAccInfo.m_pParent = 0; aAccInfo.m_spObjectHierarchy = m_spObjectHierarchy; aAccInfo.m_pSdrView = m_pSdrView; - Window* pWindow = VCLUnoHelper::GetWindow( m_xWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( m_xWindow ); if ( m_pViewForwarder ) { delete m_pViewForwarder; diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx index 6fcf15d9dacc..9c3f3c15dbbf 100644 --- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx +++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx @@ -78,7 +78,7 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg if( m_pTextHelper ) delete m_pTextHelper; - Window* pWindow( VCLUnoHelper::GetWindow( xWindow )); + vcl::Window* pWindow( VCLUnoHelper::GetWindow( xWindow )); if( pWindow ) { SdrView * pView = m_pDrawViewWrapper; diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx index ff0b68354b4a..28fe99fa7b73 100644 --- a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx +++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star; namespace chart { -AccessibleViewForwarder::AccessibleViewForwarder( AccessibleChartView* pAccChartView, Window* pWindow ) +AccessibleViewForwarder::AccessibleViewForwarder( AccessibleChartView* pAccChartView, vcl::Window* pWindow ) :m_pAccChartView( pAccChartView ) ,m_pWindow( pWindow ) ,m_aMapMode( MAP_100TH_MM ) diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx index 715fa61d51f0..577a02970763 100644 --- a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx +++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx @@ -22,7 +22,7 @@ #include <vcl/mapmod.hxx> #include <svx/IAccessibleViewForwarder.hxx> -class Window; +namespace vcl { class Window; } namespace chart { @@ -32,7 +32,7 @@ class AccessibleChartView; class AccessibleViewForwarder : public ::accessibility::IAccessibleViewForwarder { public: - AccessibleViewForwarder( AccessibleChartView* pAccChartView, Window* pWindow ); + AccessibleViewForwarder( AccessibleChartView* pAccChartView, vcl::Window* pWindow ); virtual ~AccessibleViewForwarder(); // ________ IAccessibleViewforwarder ________ @@ -48,7 +48,7 @@ private: AccessibleViewForwarder& operator=( AccessibleViewForwarder& ); AccessibleChartView* m_pAccChartView; - Window* m_pWindow; + vcl::Window* m_pWindow; MapMode m_aMapMode; }; diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 5d6f1dd6db63..a58043df97c0 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -101,7 +101,7 @@ namespace impl class SeriesHeaderEdit : public Edit { public: - SeriesHeaderEdit( Window * pParent ); + SeriesHeaderEdit( vcl::Window * pParent ); virtual ~SeriesHeaderEdit(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -114,7 +114,7 @@ private: bool m_bShowWarningBox; }; -SeriesHeaderEdit::SeriesHeaderEdit( Window * pParent ) : +SeriesHeaderEdit::SeriesHeaderEdit( vcl::Window * pParent ) : Edit( pParent ), m_nStartColumn( 0 ), m_bShowWarningBox( false ) @@ -147,7 +147,7 @@ void SeriesHeaderEdit::MouseButtonDown( const MouseEvent& rMEvt ) class SeriesHeader { public: - explicit SeriesHeader(Window * pParent, Window *pColorParent); + explicit SeriesHeader(vcl::Window * pParent, vcl::Window *pColorParent); void SetColor( const Color & rCol ); void SetPos( const Point & rPos ); @@ -200,7 +200,7 @@ private: bool m_bSeriesNameChangePending; }; -SeriesHeader::SeriesHeader( Window * pParent, Window *pColorParent ) : +SeriesHeader::SeriesHeader( vcl::Window * pParent, vcl::Window *pColorParent ) : m_spSymbol( new FixedImage( pParent, WB_NOBORDER )), m_spSeriesName( new SeriesHeaderEdit( pParent )), m_spColorBar( new FixedText( pColorParent, WB_NOBORDER )), @@ -455,7 +455,7 @@ sal_Int32 lcl_getColumnInDataOrHeader( } // anonymous namespace -DataBrowser::DataBrowser( Window* pParent, WinBits nStyle, bool bLiveUpdate ) : +DataBrowser::DataBrowser( vcl::Window* pParent, WinBits nStyle, bool bLiveUpdate ) : ::svt::EditBrowseBox( pParent, nStyle, EBBF_SMART_TAB_TRAVEL | EBBF_HANDLE_COLUMN_TEXT, BROWSER_STANDARD_FLAGS ), m_nSeekRow( 0 ), m_bIsReadOnly( false ), @@ -580,8 +580,8 @@ void DataBrowser::RenewTable() GoToColumnId( ::std::min( nOldColId, static_cast< sal_uInt16 >( ColCount() - 1 ))); Dialog* pDialog = GetParentDialog(); - Window* pWin = pDialog->get<VclContainer>("columns"); - Window* pColorWin = pDialog->get<VclContainer>("colorcolumns"); + vcl::Window* pWin = pDialog->get<VclContainer>("columns"); + vcl::Window* pColorWin = pDialog->get<VclContainer>("colorcolumns"); // fill series headers clearHeaders(); @@ -1216,8 +1216,8 @@ void DataBrowser::EndScroll() void DataBrowser::RenewSeriesHeaders() { Dialog* pDialog = GetParentDialog(); - Window* pWin = pDialog->get<VclContainer>("columns"); - Window* pColorWin = pDialog->get<VclContainer>("colorcolumns"); + vcl::Window* pWin = pDialog->get<VclContainer>("columns"); + vcl::Window* pColorWin = pDialog->get<VclContainer>("colorcolumns"); clearHeaders(); DataBrowserModel::tDataHeaderVector aHeaders( m_apDataBrowserModel->getDataHeaders()); @@ -1260,8 +1260,8 @@ void DataBrowser::ImplAdjustHeaderControls() nCurrentPos += this->GetColumnWidth( 0 ); Dialog* pDialog = GetParentDialog(); - Window* pWin = pDialog->get<VclContainer>("columns"); - Window* pColorWin = pDialog->get<VclContainer>("colorcolumns"); + vcl::Window* pWin = pDialog->get<VclContainer>("columns"); + vcl::Window* pColorWin = pDialog->get<VclContainer>("colorcolumns"); pWin->set_margin_left(nCurrentPos); pColorWin->set_margin_left(nCurrentPos); diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index 3d908aa4517c..f4c82b3dd012 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -67,7 +67,7 @@ protected: void SetDirty(); public: - DataBrowser( Window* pParent, WinBits nStyle, bool bLiveUpdate ); + DataBrowser( vcl::Window* pParent, WinBits nStyle, bool bLiveUpdate ); virtual ~DataBrowser(); /** GetCellText returns the text at the given position diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx index 46149a6befc5..85c1def2c08d 100644 --- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx +++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx @@ -27,7 +27,7 @@ namespace chart { -TextDirectionListBox::TextDirectionListBox( Window* pParent, Window* pWindow1, Window* pWindow2 ) : +TextDirectionListBox::TextDirectionListBox( vcl::Window* pParent, vcl::Window* pWindow1, vcl::Window* pWindow2 ) : svx::FrameDirectionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_DROPDOWN) { InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_LTR ), FRMDIR_HORI_LEFT_TOP ); @@ -42,7 +42,7 @@ TextDirectionListBox::TextDirectionListBox( Window* pParent, Window* pWindow1, W } } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTextDirectionListBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTextDirectionListBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new TextDirectionListBox(pParent); } diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index 4acb3382866e..30d03d140def 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -33,7 +33,7 @@ namespace chart using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -ChartTypeDialog::ChartTypeDialog( Window* pParent +ChartTypeDialog::ChartTypeDialog( vcl::Window* pParent , const uno::Reference< frame::XModel >& xChartModel , const uno::Reference< uno::XComponentContext >& xContext ) : ModalDialog( pParent, "ChartTypeDialog", diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index 3ca294af9a3b..9cd0f7c863f1 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -84,7 +84,7 @@ void ChartTypeUnoDlg::implInitialize(const uno::Any& _rValue) else ChartTypeUnoDlg_BASE::implInitialize(_rValue); } -Dialog* ChartTypeUnoDlg::createDialog(Window* _pParent) +Dialog* ChartTypeUnoDlg::createDialog(vcl::Window* _pParent) { return new ChartTypeDialog( _pParent, m_xChartModel, m_aContext ); } diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index a1cf29d3d9ea..d7faca0c4571 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -50,7 +50,7 @@ namespace const sal_Int32 nPageCount = 4; } -CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XModel >& xChartModel +CreationWizard::CreationWizard( vcl::Window* pParent, const uno::Reference< frame::XModel >& xChartModel , const uno::Reference< uno::XComponentContext >& xContext , sal_Int32 nOnePageOnlyIndex ) : svt::RoadmapWizard( pParent, diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index 8bc46fd193bd..edf8d85cf4f8 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -173,7 +173,7 @@ void CreationWizardUnoDlg::createDialogOnDemand() SolarMutexGuard aSolarGuard; if( !m_pDialog ) { - Window* pParent = NULL; + vcl::Window* pParent = NULL; if( !m_xParentWindow.is() && m_xChartModel.is() ) { uno::Reference< frame::XController > xController( diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index a1ebedc7bafc..4183aaf6b503 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -39,7 +39,7 @@ using ::com::sun::star::uno::Reference; namespace chart { -DataEditor::DataEditor(Window* pParent, +DataEditor::DataEditor(vcl::Window* pParent, const Reference< chart2::XChartDocument > & xChartDoc, const Reference< uno::XComponentContext > & xContext) : ModalDialog(pParent, "ChartDataDialog", @@ -48,7 +48,7 @@ DataEditor::DataEditor(Window* pParent, , m_xChartDoc(xChartDoc) , m_xContext(xContext) { - m_xBrwData.reset(new DataBrowser(get<Window>("datawindow"), WB_BORDER | WB_TABSTOP, true /* bLiveUpdate */)); + m_xBrwData.reset(new DataBrowser(get<vcl::Window>("datawindow"), WB_BORDER | WB_TABSTOP, true /* bLiveUpdate */)); m_xBrwData->set_hexpand(true); m_xBrwData->set_vexpand(true); m_xBrwData->set_expand(true); @@ -201,13 +201,13 @@ bool DataEditor::ApplyChangesToModel() // travels/no longer travels over this window. _rMemFunc may be // TaskPaneList::AddWindow or TaskPaneList::RemoveWindow void DataEditor::notifySystemWindow( - Window* pWindow, Window* pToRegister, - ::comphelper::mem_fun1_t< TaskPaneList, Window* > rMemFunc ) + vcl::Window* pWindow, vcl::Window* pToRegister, + ::comphelper::mem_fun1_t< TaskPaneList, vcl::Window* > rMemFunc ) { OSL_ENSURE( pWindow, "Window must not be null!" ); if( !pWindow ) return; - Window* pParent = pWindow->GetParent(); + vcl::Window* pParent = pWindow->GetParent(); while( pParent && ! pParent->IsSystemWindow() ) { pParent = pParent->GetParent(); diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index a0e810df8e05..bfa90c7647be 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -84,7 +84,7 @@ Reference< chart2::XChartTypeTemplate > DocumentChartTypeTemplateProvider::getCu class DataSourceTabControl : public TabControl { public: - DataSourceTabControl(Window* pParent); + DataSourceTabControl(vcl::Window* pParent); virtual bool DeactivatePage() SAL_OVERRIDE; @@ -95,7 +95,7 @@ private: bool m_bTogglingEnabled; }; -DataSourceTabControl::DataSourceTabControl(Window* pParent) +DataSourceTabControl::DataSourceTabControl(vcl::Window* pParent) : TabControl(pParent) , m_bTogglingEnabled(true) { @@ -124,7 +124,7 @@ enum DataSourceDialogPages TP_DATA_SOURCE = 2 }; -DataSourceDialog::DataSourceDialog(Window * pParent, +DataSourceDialog::DataSourceDialog(vcl::Window * pParent, const Reference< XChartDocument > & xChartDocument, const Reference< uno::XComponentContext > & xContext) : TabDialog(pParent, "DataRangeDialog", diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx index 92699fee0fd9..50fbc2f57daa 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx @@ -42,7 +42,7 @@ InsertAxisOrGridDialogData::InsertAxisOrGridDialogData() // SchAxisDlg -SchAxisDlg::SchAxisDlg(Window* pWindow, +SchAxisDlg::SchAxisDlg(vcl::Window* pWindow, const InsertAxisOrGridDialogData& rInput, bool bAxisDlg) : ModalDialog(pWindow, bAxisDlg ? @@ -95,7 +95,7 @@ void SchAxisDlg::getResult( InsertAxisOrGridDialogData& rOutput ) rOutput.aExistenceList[5]=m_pCbSecondaryZ->IsChecked(); } -SchGridDlg::SchGridDlg( Window* pParent, const InsertAxisOrGridDialogData& rInput ) +SchGridDlg::SchGridDlg( vcl::Window* pParent, const InsertAxisOrGridDialogData& rInput ) : SchAxisDlg( pParent, rInput, false )//rInAttrs, b3D, bNet, bSecondaryX, bSecondaryY, false ) { } diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx index f68e4ae955f4..83c13095025f 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx @@ -23,7 +23,7 @@ namespace chart { -DataLabelsDialog::DataLabelsDialog(Window* pWindow, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter) : +DataLabelsDialog::DataLabelsDialog(vcl::Window* pWindow, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter) : ModalDialog(pWindow ,"dlg_DataLabels" ,"modules/schart/ui/dlg_DataLabel.ui"), diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx index b392b717a2df..fd7f0a0e03bb 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx @@ -39,7 +39,7 @@ namespace chart { InsertErrorBarsDialog::InsertErrorBarsDialog( - Window* pParent, const SfxItemSet& rMyAttrs, + vcl::Window* pParent, const SfxItemSet& rMyAttrs, const uno::Reference< chart2::XChartDocument > & xChartDocument, ErrorBarResources::tErrorBarType eType /* = ErrorBarResources::ERROR_BAR_Y */ ) : ModalDialog( pParent diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx index 836223934ac1..9e113052eadb 100644 --- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx @@ -25,7 +25,7 @@ namespace chart using namespace ::com::sun::star; -SchLegendDlg::SchLegendDlg(Window* pWindow, const uno::Reference< uno::XComponentContext>& xCC ) +SchLegendDlg::SchLegendDlg(vcl::Window* pWindow, const uno::Reference< uno::XComponentContext>& xCC ) : ModalDialog(pWindow ,"dlg_InsertLegend" ,"modules/schart/ui/dlg_InsertLegend.ui") diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx index 5e5c83ded6ca..742d6a5ae1d6 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx @@ -25,7 +25,7 @@ namespace chart { -SchTitleDlg::SchTitleDlg(Window* pWindow, const TitleDialogData& rInput ) +SchTitleDlg::SchTitleDlg(vcl::Window* pWindow, const TitleDialogData& rInput ) : ModalDialog(pWindow, "InsertTitleDialog", "modules/schart/ui/inserttitledlg.ui") , m_xTitleResources(new TitleResources(*this, true)) { diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx index 100af2798467..a2ba7f3c0ca0 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx @@ -30,7 +30,7 @@ namespace chart { using namespace ::com::sun::star; -NumberFormatDialog::NumberFormatDialog(Window* pParent, SfxItemSet& rSet) +NumberFormatDialog::NumberFormatDialog(vcl::Window* pParent, SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet, "FormatNumberDialog", "cui/ui/formatnumberdialog.ui") { diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx index 0faabc29e93f..a27ff0caf7f0 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx @@ -21,7 +21,7 @@ #include <sfx2/basedlgs.hxx> -class Window; +namespace vcl { class Window; } class SfxItemSet; namespace chart @@ -30,7 +30,7 @@ namespace chart class NumberFormatDialog : public SfxSingleTabDialog { public: - NumberFormatDialog(Window* pParent, SfxItemSet& rSet); + NumberFormatDialog(vcl::Window* pParent, SfxItemSet& rSet); virtual ~NumberFormatDialog(); static SfxItemSet CreateEmptyItemSetForNumberFormatDialog( SfxItemPool& rItemPool ); diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 0bc20aea2d37..ac3157760999 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -319,7 +319,7 @@ void SchAttribTabDlg::SetAxisMinorStepWidthForErrorBarDecimals( double fMinorSte m_fAxisMinorStepWidthForErrorBarDecimals = fMinorStepWidth; } -SchAttribTabDlg::SchAttribTabDlg(Window* pParent, +SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent, const SfxItemSet* pAttr, const ObjectPropertiesDialogParameter* pDialogParameter, const ViewElementListProvider* pViewElementListProvider, diff --git a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx index 929c9cd846fb..95a19805471b 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx +++ b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star; namespace chart { -ShapeFontDialog::ShapeFontDialog( Window* pParent, const SfxItemSet* pAttr, +ShapeFontDialog::ShapeFontDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const ViewElementListProvider* pViewElementListProvider ) : SfxTabDialog(pParent, "CharDialog", "modules/schart/ui/chardialog.ui", pAttr) diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx index 44b343719d08..4ce313050cbe 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx +++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star; namespace chart { -ShapeParagraphDialog::ShapeParagraphDialog(Window* pParent, +ShapeParagraphDialog::ShapeParagraphDialog(vcl::Window* pParent, const SfxItemSet* pAttr) : SfxTabDialog(pParent, "ParagraphDialog", "modules/schart/ui/paradialog.ui", pAttr) diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index b393c17c388d..c346fdd23aaa 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star::chart2; sal_uInt16 View3DDialog::m_nLastPageId = 0; -View3DDialog::View3DDialog(Window* pParent, const uno::Reference< frame::XModel > & xChartModel, const XColorListRef &pColorTable ) +View3DDialog::View3DDialog(vcl::Window* pParent, const uno::Reference< frame::XModel > & xChartModel, const XColorListRef &pColorTable ) : TabDialog(pParent, "3DViewDialog", "modules/schart/ui/3dviewdialog.ui") , m_pGeometry(0) , m_pAppearance(0) diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 0057bbe99ac6..24315a3de371 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -84,7 +84,7 @@ void lcl_setBoolItemToCheckBox( const SfxItemSet& rInAttrs, sal_uInt16 nWhichId, }//end anonymous namespace -DataLabelResources::DataLabelResources(VclBuilderContainer* pWindow, Window* pParent, const SfxItemSet& rInAttrs ) +DataLabelResources::DataLabelResources(VclBuilderContainer* pWindow, vcl::Window* pParent, const SfxItemSet& rInAttrs ) : m_pNumberFormatter(0), m_bNumberFormatMixedState(true), diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx index b6d278969b92..0044e4a9d26e 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.hxx +++ b/chart2/source/controller/dialogs/res_DataLabel.hxx @@ -37,7 +37,7 @@ namespace chart class DataLabelResources { public: - DataLabelResources( VclBuilderContainer* pWindow, Window* pParent, const SfxItemSet& rInAttrs ); + DataLabelResources( VclBuilderContainer* pWindow, vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~DataLabelResources(); bool FillItemSet(SfxItemSet* rOutAttrs) const; @@ -83,7 +83,7 @@ private: bool m_bSourceFormatForValue; bool m_bSourceFormatForPercent; - Window* m_pWindow; + vcl::Window* m_pWindow; SfxItemPool* m_pPool; DECL_LINK(NumberFormatDialogHdl, PushButton * ); diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index 911f3931ac01..9dd896f32362 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -39,7 +39,7 @@ void lcl_setValue( FormattedField& rFmtField, double fValue ) rFmtField.SetDefaultValue( fValue ); } -TrendlineResources::TrendlineResources( Window * pParent, const SfxItemSet& rInAttrs ) : +TrendlineResources::TrendlineResources( vcl::Window * pParent, const SfxItemSet& rInAttrs ) : m_eTrendLineType( CHREGRESS_LINEAR ), m_bTrendLineUnique( true ), m_pNumFormatter( NULL ), diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx index 128d436ab863..0d4be04cdf4d 100644 --- a/chart2/source/controller/dialogs/res_Trendline.hxx +++ b/chart2/source/controller/dialogs/res_Trendline.hxx @@ -34,7 +34,7 @@ namespace chart class TrendlineResources { public: - TrendlineResources( Window* pParent, const SfxItemSet& rInAttrs ); + TrendlineResources( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~TrendlineResources(); void Reset(const SfxItemSet& rInAttrs); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index ea1c355e6f4e..6a15742ff548 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -86,7 +86,7 @@ namespace chart #define POS_3DSCHEME_CUSTOM 2 ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage( - Window* pWindow + vcl::Window* pWindow , const uno::Reference< frame::XModel > & xChartModel , ControllerLockHelper & rControllerLockHelper ) : TabPage ( pWindow diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx index c08cea186df6..b00718c76e9c 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx @@ -35,7 +35,7 @@ class ThreeD_SceneAppearance_TabPage : public TabPage { public: ThreeD_SceneAppearance_TabPage( - Window* pWindow, + vcl::Window* pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel, ControllerLockHelper & rControllerLockHelper ); virtual ~ThreeD_SceneAppearance_TabPage(); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx index 164f930c164c..a4930b38f0f4 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx @@ -54,7 +54,7 @@ void lcl_SetMetricFieldLimits( MetricField& rField, sal_Int64 nLimit ) } } -ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow +ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( vcl::Window* pWindow , const uno::Reference< beans::XPropertySet > & xSceneProperties , ControllerLockHelper & rControllerLockHelper ) : TabPage ( pWindow diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx index decc521e87fa..21bc08a7ccc1 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx @@ -35,7 +35,7 @@ namespace chart class ThreeD_SceneGeometry_TabPage : public TabPage { public: - ThreeD_SceneGeometry_TabPage( Window* pWindow, + ThreeD_SceneGeometry_TabPage( vcl::Window* pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xSceneProperties, ControllerLockHelper & rControllerLockHelper ); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 27fb132dd420..81ccc2bbfa60 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -36,14 +36,14 @@ namespace chart using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -LightButton::LightButton( Window* pParent) +LightButton::LightButton( vcl::Window* pParent) : ImageButton( pParent) , m_bLightOn(false) { SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLightButton(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLightButton(vcl::Window *pParent, VclBuilder::stringmap &) { return new LightButton(pParent); } @@ -225,7 +225,7 @@ namespace } } -ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWindow +ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( vcl::Window* pWindow , const uno::Reference< beans::XPropertySet > & xSceneProperties , const uno::Reference< frame::XModel >& xChartModel , const XColorListRef & pColorTable ) diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx index 7bfe1ab59602..3f7af791d290 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx @@ -36,7 +36,7 @@ namespace chart class LightButton : public ImageButton { public: - LightButton( Window* pParent); + LightButton( vcl::Window* pParent); virtual ~LightButton(); void switchLightOn(bool bOn); @@ -52,7 +52,7 @@ class ThreeD_SceneIllumination_TabPage : public TabPage { public: ThreeD_SceneIllumination_TabPage( - Window* pWindow, + vcl::Window* pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xSceneProperties, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel, diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index 5181402a9c3c..f80402c093a2 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -31,7 +31,7 @@ namespace chart { -SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : +SchAxisLabelTabPage::SchAxisLabelTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SfxTabPage( pParent, "AxisLabelTabPage","modules/schart/ui/tp_axisLabel.ui", &rInAttrs ), m_bShowStaggeringControls( true ), @@ -79,7 +79,7 @@ void SchAxisLabelTabPage::Construct() { } -SfxTabPage* SchAxisLabelTabPage::Create( Window* pParent, const SfxItemSet* rAttrs ) +SfxTabPage* SchAxisLabelTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrs ) { return new SchAxisLabelTabPage( pParent, *rAttrs ); } diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx index be28343340c9..059215b911b8 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx @@ -69,12 +69,12 @@ private: DECL_LINK ( ToggleShowLabel, void* ); public: - SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SchAxisLabelTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SchAxisLabelTabPage(); void Construct(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 71b5221e859d..8fda04263f47 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star; namespace chart { -AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rInAttrs) +AxisPositionsTabPage::AxisPositionsTabPage(vcl::Window* pWindow,const SfxItemSet& rInAttrs) : SfxTabPage(pWindow ,"tp_AxisPositions" ,"modules/schart/ui/tp_AxisPositions.ui" @@ -84,7 +84,7 @@ AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rIn m_pLB_PlaceTicks->SetDropDownLineCount( m_pLB_PlaceTicks->GetEntryCount() ); } -SfxTabPage* AxisPositionsTabPage::Create(Window* pWindow,const SfxItemSet* rOutAttrs) +SfxTabPage* AxisPositionsTabPage::Create(vcl::Window* pWindow,const SfxItemSet* rOutAttrs) { return new AxisPositionsTabPage(pWindow, *rOutAttrs); } diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index 78ce532c13fc..3dfeecd8f3ff 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -32,9 +32,9 @@ namespace chart class AxisPositionsTabPage : public SfxTabPage { public: - AxisPositionsTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + AxisPositionsTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; using TabPage::DeactivatePage; diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 00defcfeeec0..0703e1d7a979 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -312,7 +312,7 @@ IMPL_LINK_NOARG( GL3DResourceGroup, SettingChangedHdl ) class SplinePropertiesDialog : public ModalDialog { public: - SplinePropertiesDialog( Window* pParent ); + SplinePropertiesDialog( vcl::Window* pParent ); virtual ~SplinePropertiesDialog(); void fillControls( const ChartTypeParameter& rParameter ); @@ -334,7 +334,7 @@ private: const sal_uInt16 CUBIC_SPLINE_POS = 0; const sal_uInt16 B_SPLINE_POS = 1; -SplinePropertiesDialog::SplinePropertiesDialog( Window* pParent ) +SplinePropertiesDialog::SplinePropertiesDialog( vcl::Window* pParent ) : ModalDialog( pParent, "SmoothLinesDialog", "modules/schart/ui/smoothlinesdlg.ui") { get(m_pLB_Spline_Type, "SplineTypeComboBox"); @@ -399,7 +399,7 @@ IMPL_LINK_NOARG(SplinePropertiesDialog, SplineTypeListBoxHdl) class SteppedPropertiesDialog : public ModalDialog { public: - SteppedPropertiesDialog( Window* pParent ); + SteppedPropertiesDialog( vcl::Window* pParent ); virtual ~SteppedPropertiesDialog(); void fillControls( const ChartTypeParameter& rParameter ); @@ -416,7 +416,7 @@ private: RadioButton* m_pRB_CenterY; }; -SteppedPropertiesDialog::SteppedPropertiesDialog( Window* pParent ) +SteppedPropertiesDialog::SteppedPropertiesDialog( vcl::Window* pParent ) : ModalDialog( pParent, "SteppedLinesDialog", "modules/schart/ui/steppedlinesdlg.ui") { get(m_pRB_Start, "step_start_rb"); @@ -675,7 +675,7 @@ IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl) return 0; } -ChartTypeTabPage::ChartTypeTabPage(Window* pParent +ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent , const uno::Reference< XChartDocument >& xChartModel , const uno::Reference< uno::XComponentContext >& xContext , bool bDoLiveUpdate, bool bShowDescription) diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx index 81557a421db8..486ae1540805 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hxx +++ b/chart2/source/controller/dialogs/tp_ChartType.hxx @@ -48,7 +48,7 @@ class GL3DResourceGroup; class ChartTypeTabPage : public ResourceChangeListener, public svt::OWizardPage, public ChartTypeTemplateProvider { public: - ChartTypeTabPage( Window* pParent + ChartTypeTabPage( vcl::Window* pParent , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel , const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx index c5e9cce2e2c5..ef795fa2e2ca 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.cxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx @@ -25,7 +25,7 @@ namespace chart { -DataLabelsTabPage::DataLabelsTabPage(Window* pWindow, const SfxItemSet& rInAttrs) +DataLabelsTabPage::DataLabelsTabPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs) : SfxTabPage(pWindow , "tp_DataLabel" , "modules/schart/ui/tp_DataLabel.ui" @@ -38,7 +38,7 @@ DataLabelsTabPage::~DataLabelsTabPage() { } -SfxTabPage* DataLabelsTabPage::Create(Window* pWindow, const SfxItemSet* rOutAttrs) +SfxTabPage* DataLabelsTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rOutAttrs) { return new DataLabelsTabPage(pWindow, *rOutAttrs); } diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx index 5e14a412fb67..1bad928af04d 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.hxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx @@ -33,10 +33,10 @@ namespace chart class DataLabelsTabPage : public SfxTabPage { public: - DataLabelsTabPage(Window* pWindow, const SfxItemSet& rInAttrs); + DataLabelsTabPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs); virtual ~DataLabelsTabPage(); - static SfxTabPage* Create(Window* pWindow, const SfxItemSet* rInAttrs); + static SfxTabPage* Create(vcl::Window* pWindow, const SfxItemSet* rInAttrs); void SetNumberFormatter( SvNumberFormatter* pFormatter ); diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index a92298b229ba..14da20cbaaf6 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -181,7 +181,7 @@ namespace chart { DataSourceTabPage::DataSourceTabPage( - Window * pParent, + vcl::Window * pParent, DialogModel & rDialogModel, ChartTypeTemplateProvider* pTemplateProvider, Dialog * pParentDialog, diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index 496333e31cdc..1cc0439a1065 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -53,7 +53,7 @@ class DataSourceTabPage : { public: explicit DataSourceTabPage( - Window * pParent, + vcl::Window * pParent, DialogModel & rDialogModel, ChartTypeTemplateProvider* pTemplateProvider, Dialog * pParentDialog, diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx index 11ebbcf9df75..54ecfe64ea79 100644 --- a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx +++ b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx @@ -31,11 +31,11 @@ namespace chart SeriesEntry::~SeriesEntry() {} -SeriesListBox::SeriesListBox(Window* pParent, WinBits nStyle) +SeriesListBox::SeriesListBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) {} -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSeriesListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSeriesListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx index 82ae7addf888..e5a5ec54e333 100644 --- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx +++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx @@ -45,7 +45,7 @@ public: class SeriesListBox : public ::SvTreeListBox { public: - explicit SeriesListBox(Window* pParent, WinBits nStyle); + explicit SeriesListBox(vcl::Window* pParent, WinBits nStyle); virtual SvTreeListEntry* CreateEntry() const SAL_OVERRIDE; }; diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx index c240e7652db8..28280253b48f 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; namespace chart { -ErrorBarsTabPage::ErrorBarsTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : +ErrorBarsTabPage::ErrorBarsTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SfxTabPage( pParent ,"tp_ErrorBars" ,"modules/schart/ui/tp_ErrorBars.ui" @@ -42,7 +42,7 @@ ErrorBarsTabPage::ErrorBarsTabPage( Window* pParent, const SfxItemSet& rInAttrs } SfxTabPage* ErrorBarsTabPage::Create( - Window* pParent, const SfxItemSet* rOutAttrs ) + vcl::Window* pParent, const SfxItemSet* rOutAttrs ) { return new ErrorBarsTabPage( pParent, *rOutAttrs ); } diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx index 05f2e59607d8..6da7692d8c9f 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx @@ -29,7 +29,7 @@ namespace chart class ErrorBarsTabPage : public SfxTabPage { public: - ErrorBarsTabPage ( Window* pParent, const SfxItemSet& rInAttrs ); + ErrorBarsTabPage ( vcl::Window* pParent, const SfxItemSet& rInAttrs ); void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth ); void SetErrorBarType( ErrorBarResources::tErrorBarType eNewType ); @@ -37,7 +37,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDocument ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx index 1381159d24e7..c275c25660d8 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx @@ -29,7 +29,7 @@ namespace chart { -SchLegendPosTabPage::SchLegendPosTabPage(Window* pWindow, const SfxItemSet& rInAttrs) +SchLegendPosTabPage::SchLegendPosTabPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs) : SfxTabPage( pWindow ,"tp_LegendPosition" ,"modules/schart/ui/tp_LegendPosition.ui" @@ -41,7 +41,7 @@ SchLegendPosTabPage::SchLegendPosTabPage(Window* pWindow, const SfxItemSet& rInA m_pLbTextDirection->SetDropDownLineCount(3); } -SfxTabPage* SchLegendPosTabPage::Create(Window* pWindow, const SfxItemSet* rOutAttrs) +SfxTabPage* SchLegendPosTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rOutAttrs) { return new SchLegendPosTabPage(pWindow, *rOutAttrs); } diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx index 0c767d81f44b..0d4f4acf0d07 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx @@ -36,9 +36,9 @@ private: TextDirectionListBox* m_pLbTextDirection; public: - SchLegendPosTabPage(Window* pParent, const SfxItemSet& rInAttrs); + SchLegendPosTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE; }; diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx index da008a1a964a..5e32432af83d 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx @@ -30,7 +30,7 @@ namespace chart { -SchLayoutTabPage::SchLayoutTabPage(Window* pWindow,const SfxItemSet& rInAttrs) +SchLayoutTabPage::SchLayoutTabPage(vcl::Window* pWindow,const SfxItemSet& rInAttrs) : SfxTabPage(pWindow, "tp_ChartType", "modules/schart/ui/tp_ChartType.ui", &rInAttrs) , m_pGeometryResources(0) { @@ -42,7 +42,7 @@ SchLayoutTabPage::~SchLayoutTabPage() delete m_pGeometryResources; } -SfxTabPage* SchLayoutTabPage::Create(Window* pWindow, +SfxTabPage* SchLayoutTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rOutAttrs) { return new SchLayoutTabPage(pWindow, *rOutAttrs); diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx index f0424bc57133..635768fe1178 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx @@ -28,10 +28,10 @@ class BarGeometryResources; class SchLayoutTabPage : public SfxTabPage { public: - SchLayoutTabPage(Window* pParent, const SfxItemSet& rInAttrs); + SchLayoutTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs); virtual ~SchLayoutTabPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx index 73a9d41439f2..32b09b5398ff 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx @@ -28,7 +28,7 @@ namespace chart { -PolarOptionsTabPage::PolarOptionsTabPage( Window* pWindow,const SfxItemSet& rInAttrs ) : +PolarOptionsTabPage::PolarOptionsTabPage( vcl::Window* pWindow,const SfxItemSet& rInAttrs ) : SfxTabPage( pWindow ,"tp_PolarOptions" ,"modules/schart/ui/tp_PolarOptions.ui" @@ -48,7 +48,7 @@ PolarOptionsTabPage::~PolarOptionsTabPage() { } -SfxTabPage* PolarOptionsTabPage::Create( Window* pWindow,const SfxItemSet* rOutAttrs ) +SfxTabPage* PolarOptionsTabPage::Create( vcl::Window* pWindow,const SfxItemSet* rOutAttrs ) { return new PolarOptionsTabPage( pWindow, *rOutAttrs ); } diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx index d0cbe2e0e98b..7d0ea5034122 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx @@ -32,10 +32,10 @@ class PolarOptionsTabPage : public SfxTabPage { public: - PolarOptionsTabPage(Window* pParent, const SfxItemSet& rInAttrs ); + PolarOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~PolarOptionsTabPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index a9e854f9e58b..451945e89ab9 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -61,7 +61,7 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -RangeChooserTabPage::RangeChooserTabPage( Window* pParent +RangeChooserTabPage::RangeChooserTabPage( vcl::Window* pParent , DialogModel & rDialogModel , ChartTypeTemplateProvider* pTemplateProvider , Dialog * pParentDialog diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx index 8c2111928d13..3b88a46dd845 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx @@ -43,7 +43,7 @@ class RangeChooserTabPage : public svt::OWizardPage, public RangeSelectionListen { public: - RangeChooserTabPage( Window* pParent + RangeChooserTabPage( vcl::Window* pParent , DialogModel & rDialogModel , ChartTypeTemplateProvider* pTemplateProvider , Dialog * pParentDialog diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index e0cefa06cf01..363de5376a87 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -51,7 +51,7 @@ void lcl_setValue( FormattedField& rFmtField, double fValue ) } -ScaleTabPage::ScaleTabPage(Window* pWindow,const SfxItemSet& rInAttrs) : +ScaleTabPage::ScaleTabPage(vcl::Window* pWindow,const SfxItemSet& rInAttrs) : SfxTabPage(pWindow , "tp_Scale" , "modules/schart/ui/tp_Scale.ui" @@ -236,7 +236,7 @@ IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl) return 0; } -SfxTabPage* ScaleTabPage::Create(Window* pWindow,const SfxItemSet* rOutAttrs) +SfxTabPage* ScaleTabPage::Create(vcl::Window* pWindow,const SfxItemSet* rOutAttrs) { return new ScaleTabPage(pWindow, *rOutAttrs); } diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index 3c65b604845f..ff8bbe7e9d1b 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -32,9 +32,9 @@ namespace chart class ScaleTabPage : public SfxTabPage { public: - ScaleTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + ScaleTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; using TabPage::DeactivatePage; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index a04d2efb0d42..26c158406f6d 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -32,7 +32,7 @@ namespace chart { -SchOptionTabPage::SchOptionTabPage(Window* pWindow,const SfxItemSet& rInAttrs) +SchOptionTabPage::SchOptionTabPage(vcl::Window* pWindow,const SfxItemSet& rInAttrs) : SfxTabPage(pWindow, "TP_OPTIONS", "modules/schart/ui/tp_SeriesToAxis.ui", @@ -76,7 +76,7 @@ IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl) return 0; } -SfxTabPage* SchOptionTabPage::Create(Window* pWindow,const SfxItemSet* rOutAttrs) +SfxTabPage* SchOptionTabPage::Create(vcl::Window* pWindow,const SfxItemSet* rOutAttrs) { return new SchOptionTabPage(pWindow, *rOutAttrs); } diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx index 56de1da3d449..db4afb60e9fb 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx @@ -30,10 +30,10 @@ namespace chart class SchOptionTabPage : public SfxTabPage { public: - SchOptionTabPage(Window* pParent, const SfxItemSet& rInAttrs); + SchOptionTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs); virtual ~SchOptionTabPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index 89f78a95d534..6fc90a273926 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -31,7 +31,7 @@ namespace chart { -SchAlignmentTabPage::SchAlignmentTabPage(Window* pWindow, +SchAlignmentTabPage::SchAlignmentTabPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs, bool bWithRotation) : SfxTabPage(pWindow, "TitleRotationTabPage","modules/schart/ui/titlerotationtabpage.ui", &rInAttrs) { @@ -60,13 +60,13 @@ SchAlignmentTabPage::~SchAlignmentTabPage() delete m_pOrientHlp; } -SfxTabPage* SchAlignmentTabPage::Create(Window* pParent, +SfxTabPage* SchAlignmentTabPage::Create(vcl::Window* pParent, const SfxItemSet* rInAttrs) { return new SchAlignmentTabPage(pParent, *rInAttrs); } -SfxTabPage* SchAlignmentTabPage::CreateWithoutRotation(Window* pParent, +SfxTabPage* SchAlignmentTabPage::CreateWithoutRotation(vcl::Window* pParent, const SfxItemSet* rInAttrs) { return new SchAlignmentTabPage(pParent, *rInAttrs, false); diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx index 86f49e9402de..dd3ceb0902d6 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx @@ -42,11 +42,11 @@ private: FixedText* m_pFtABCD; public: - SchAlignmentTabPage(Window* pParent, const SfxItemSet& rInAttrs, bool bWithRotation = true); + SchAlignmentTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs, bool bWithRotation = true); virtual ~SchAlignmentTabPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs); - static SfxTabPage* CreateWithoutRotation(Window* pParent, const SfxItemSet* rInAttrs); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); + static SfxTabPage* CreateWithoutRotation(vcl::Window* pParent, const SfxItemSet* rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE; }; diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx index fe7c81f044e6..d95a213dafa9 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.cxx +++ b/chart2/source/controller/dialogs/tp_Trendline.cxx @@ -25,7 +25,7 @@ namespace chart { -TrendlineTabPage::TrendlineTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : +TrendlineTabPage::TrendlineTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SfxTabPage( pParent, "TP_TRENDLINE", "modules/schart/ui/tp_Trendline.ui", &rInAttrs ), m_aTrendlineResources( this, rInAttrs ) { @@ -36,7 +36,7 @@ TrendlineTabPage::~TrendlineTabPage() } SfxTabPage* TrendlineTabPage::Create( - Window* pParent, const SfxItemSet* rOutAttrs ) + vcl::Window* pParent, const SfxItemSet* rOutAttrs ) { return new TrendlineTabPage( pParent, *rOutAttrs ); } diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx index c18ceb74922c..a88c858c7b9a 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.hxx +++ b/chart2/source/controller/dialogs/tp_Trendline.hxx @@ -29,10 +29,10 @@ namespace chart class TrendlineTabPage : public SfxTabPage { public: - TrendlineTabPage ( Window* pParent, const SfxItemSet& rInAttrs ); + TrendlineTabPage ( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~TrendlineTabPage (); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; diff --git a/chart2/source/controller/inc/TextDirectionListBox.hxx b/chart2/source/controller/inc/TextDirectionListBox.hxx index 40144e31d728..bee03f2fb247 100644 --- a/chart2/source/controller/inc/TextDirectionListBox.hxx +++ b/chart2/source/controller/inc/TextDirectionListBox.hxx @@ -22,7 +22,7 @@ #include <svx/frmdirlbox.hxx> -class Window; +namespace vcl { class Window; } namespace chart { @@ -30,8 +30,8 @@ namespace chart class TextDirectionListBox : public svx::FrameDirectionListBox { public: - explicit TextDirectionListBox( Window* pParent, - Window* pWindow1 = 0, Window* pWindow2 = 0 ); + explicit TextDirectionListBox( vcl::Window* pParent, + vcl::Window* pWindow1 = 0, vcl::Window* pWindow2 = 0 ); virtual ~TextDirectionListBox(); }; diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx index 227bf968aea2..b67a06fd729b 100644 --- a/chart2/source/controller/inc/dlg_ChartType.hxx +++ b/chart2/source/controller/inc/dlg_ChartType.hxx @@ -32,7 +32,7 @@ class ChartTypeTabPage; class ChartTypeDialog : public ModalDialog { public: - ChartTypeDialog( Window* pWindow + ChartTypeDialog( vcl::Window* pWindow , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel , const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index 7098e9f6f9af..98bb3d160ca3 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -46,7 +46,7 @@ private: // OGenericUnoDialog overridables virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE; - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; // XTypeProvider virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx index b81ae23dd37c..cc3b5d51a29a 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx @@ -42,7 +42,7 @@ class DialogModel; class CreationWizard : public svt::RoadmapWizard, public TabPageNotifiable { public: - CreationWizard( Window* pParent, + CreationWizard( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel , const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index c1caf7950d03..997cdad006b3 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -42,7 +42,7 @@ class DataBrowser; class DataEditor : public ModalDialog { public: - DataEditor( Window* pParent, + DataEditor( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDoc, const ::com::sun::star::uno::Reference< @@ -102,9 +102,9 @@ private: @note this code is taken from dbaccess/source/ui/inc/UITools.hxx */ - void notifySystemWindow( Window* pWindow, - Window* pToRegister, - ::comphelper::mem_fun1_t< TaskPaneList, Window* > rMemFunc ); + void notifySystemWindow( vcl::Window* pWindow, + vcl::Window* pToRegister, + ::comphelper::mem_fun1_t< TaskPaneList, vcl::Window* > rMemFunc ); }; } // namespace chart diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx index 6341fe050094..8f4dd54c84cc 100644 --- a/chart2/source/controller/inc/dlg_DataSource.hxx +++ b/chart2/source/controller/inc/dlg_DataSource.hxx @@ -44,7 +44,7 @@ class DataSourceDialog : { public: explicit DataSourceDialog( - Window * pParent, + vcl::Window * pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDocument, const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx index 82636bc2090e..bf3bf85750e7 100644 --- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx +++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx @@ -51,7 +51,7 @@ protected: CheckBox* m_pCbSecondaryZ; public: - SchAxisDlg(Window* pParent, const InsertAxisOrGridDialogData& rInput, bool bAxisDlg=true); + SchAxisDlg(vcl::Window* pParent, const InsertAxisOrGridDialogData& rInput, bool bAxisDlg=true); virtual ~SchAxisDlg(); void getResult( InsertAxisOrGridDialogData& rOutput ); @@ -65,7 +65,7 @@ public: class SchGridDlg : public SchAxisDlg { public: - SchGridDlg( Window* pParent, const InsertAxisOrGridDialogData& rInput ); + SchGridDlg( vcl::Window* pParent, const InsertAxisOrGridDialogData& rInput ); virtual ~SchGridDlg(); }; diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx index a5cd5e2be4ce..1cbed9f9a9c0 100644 --- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx +++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx @@ -43,7 +43,7 @@ private: void Reset(); public: - DataLabelsDialog(Window* pParent, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter); + DataLabelsDialog(vcl::Window* pParent, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter); virtual ~DataLabelsDialog(); void FillItemSet(SfxItemSet& rOutAttrs); diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx index 39ff9750ad41..e981b718ec63 100644 --- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx +++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx @@ -32,7 +32,7 @@ namespace chart class InsertErrorBarsDialog : public ModalDialog { public: - InsertErrorBarsDialog( Window* pParent, const SfxItemSet& rMyAttrs, + InsertErrorBarsDialog( vcl::Window* pParent, const SfxItemSet& rMyAttrs, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDocument, ErrorBarResources::tErrorBarType eType ); diff --git a/chart2/source/controller/inc/dlg_InsertLegend.hxx b/chart2/source/controller/inc/dlg_InsertLegend.hxx index eee9c243e249..acfc45344e68 100644 --- a/chart2/source/controller/inc/dlg_InsertLegend.hxx +++ b/chart2/source/controller/inc/dlg_InsertLegend.hxx @@ -37,7 +37,7 @@ private: boost::scoped_ptr < LegendPositionResources > m_xLegendPositionResources; public: - SchLegendDlg( Window* pParent, const ::com::sun::star::uno::Reference< + SchLegendDlg( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& xCC ); void init( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/inc/dlg_InsertTitle.hxx b/chart2/source/controller/inc/dlg_InsertTitle.hxx index b992606512d6..510b35563676 100644 --- a/chart2/source/controller/inc/dlg_InsertTitle.hxx +++ b/chart2/source/controller/inc/dlg_InsertTitle.hxx @@ -32,7 +32,7 @@ private: boost::scoped_ptr< TitleResources > m_xTitleResources; public: - SchTitleDlg( Window* pParent, const TitleDialogData& rInput ); + SchTitleDlg( vcl::Window* pParent, const TitleDialogData& rInput ); void getResult( TitleDialogData& rOutput ); }; diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index 33013c3004f0..19b1bf2539c2 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -126,7 +126,7 @@ private: DECL_LINK( OKPressed, void * ); public: - SchAttribTabDlg(Window* pParent, const SfxItemSet* pAttr, + SchAttribTabDlg(vcl::Window* pParent, const SfxItemSet* pAttr, const ObjectPropertiesDialogParameter* pDialogParameter, const ViewElementListProvider* pViewElementListProvider, const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/inc/dlg_ShapeFont.hxx b/chart2/source/controller/inc/dlg_ShapeFont.hxx index 7a6aefbf7fc9..d9d082eb5399 100644 --- a/chart2/source/controller/inc/dlg_ShapeFont.hxx +++ b/chart2/source/controller/inc/dlg_ShapeFont.hxx @@ -31,7 +31,7 @@ class ViewElementListProvider; class ShapeFontDialog : public SfxTabDialog { public: - ShapeFontDialog(Window* pParent, const SfxItemSet* pAttr, + ShapeFontDialog(vcl::Window* pParent, const SfxItemSet* pAttr, const ViewElementListProvider* pViewElementListProvider); private: virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; diff --git a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx index e3b4bab64c16..8976daad1ec3 100644 --- a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx +++ b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx @@ -29,7 +29,7 @@ namespace chart class ShapeParagraphDialog : public SfxTabDialog { public: - ShapeParagraphDialog(Window* pParent, const SfxItemSet* pAttr); + ShapeParagraphDialog(vcl::Window* pParent, const SfxItemSet* pAttr); private: virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; sal_uInt16 m_nTabPageId; diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx index 6cc64087df78..fdfb35463625 100644 --- a/chart2/source/controller/inc/dlg_View3D.hxx +++ b/chart2/source/controller/inc/dlg_View3D.hxx @@ -37,7 +37,7 @@ class ThreeD_SceneIllumination_TabPage; class View3DDialog : public TabDialog { public: - View3DDialog( Window* pWindow, + View3DDialog( vcl::Window* pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel, const XColorListRef &pColorTable ); virtual ~View3DDialog(); diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index f1679922a07e..717c98b1920a 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -344,7 +344,7 @@ void SAL_CALL ChartController::attachFrame( //create view @todo is this the correct place here?? - Window* pParent = NULL; + vcl::Window* pParent = NULL; //get the window parent from the frame to use as parent for our new window if(xFrame.is()) { @@ -1427,7 +1427,7 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn SolarMutexGuard aGuard; if( m_pChartWindow ) { - Window* pParentWin( m_pChartWindow->GetAccessibleParentWindow()); + vcl::Window* pParentWin( m_pChartWindow->GetAccessibleParentWindow()); if( pParentWin ) xParent.set( pParentWin->GetAccessible()); } diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx index 726ba03266fc..aebf313603cc 100644 --- a/chart2/source/controller/main/ChartController_EditData.cxx +++ b/chart2/source/controller/main/ChartController_EditData.cxx @@ -46,7 +46,7 @@ void ChartController::executeDispatch_EditData() Reference< chart2::XChartDocument > xChartDoc( getModel(), uno::UNO_QUERY ); if( xChartDoc.is()) { - Window* pParent( NULL ); + vcl::Window* pParent( NULL ); Reference< ::com::sun::star::chart2::data::XDataProvider > xDataProvider( xChartDoc->getDataProvider()); diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index d4f60ea97a81..71a233a79527 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -545,7 +545,7 @@ IMPL_LINK_NOARG(ChartController, DoubleClickWaitingHdl) SolarMutexGuard aGuard; if( m_pChartWindow ) { - Window::PointerState aPointerState( m_pChartWindow->GetPointerState() ); + vcl::Window::PointerState aPointerState( m_pChartWindow->GetPointerState() ); MouseEvent aMouseEvent( aPointerState.maPos, 1/*nClicks*/, diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 4b7ea3a43a5f..93712142427c 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -45,7 +45,7 @@ namespace namespace chart { -ChartWindow::ChartWindow( ChartController* pController, Window* pParent, WinBits nStyle ) +ChartWindow::ChartWindow( ChartController* pController, vcl::Window* pParent, WinBits nStyle ) : Window(pParent, nStyle) , m_pWindowController( pController ) , m_bInPaint(false) @@ -215,7 +215,7 @@ uno::Reference< css::accessibility::XAccessible > ChartWindow::CreateAccessible( void ChartWindow::DataChanged( const DataChangedEvent& rDCEvt ) { - ::Window::DataChanged( rDCEvt ); + vcl::Window::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) @@ -249,7 +249,7 @@ void ChartWindow::RequestHelp( const HelpEvent& rHEvt ) } if( !bHelpHandled ) - ::Window::RequestHelp( rHEvt ); + vcl::Window::RequestHelp( rHEvt ); } void ChartWindow::adjustHighContrastMode() @@ -264,7 +264,7 @@ void ChartWindow::adjustHighContrastMode() void ChartWindow::ForceInvalidate() { - ::Window::Invalidate(); + vcl::Window::Invalidate(); if(m_pOpenGLWindow) { m_pOpenGLWindow->Invalidate(); @@ -274,7 +274,7 @@ void ChartWindow::Invalidate( sal_uInt16 nFlags ) { if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts" return; - ::Window::Invalidate( nFlags ); + vcl::Window::Invalidate( nFlags ); if(m_pOpenGLWindow) { m_pOpenGLWindow->Invalidate( nFlags ); @@ -284,7 +284,7 @@ void ChartWindow::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags ) { if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts" return; - ::Window::Invalidate( rRect, nFlags ); + vcl::Window::Invalidate( rRect, nFlags ); if(m_pOpenGLWindow) { m_pOpenGLWindow->Invalidate( rRect, nFlags ); @@ -294,7 +294,7 @@ void ChartWindow::Invalidate( const Region& rRegion, sal_uInt16 nFlags ) { if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts" return; - ::Window::Invalidate( rRegion, nFlags ); + vcl::Window::Invalidate( rRegion, nFlags ); if(m_pOpenGLWindow) { m_pOpenGLWindow->Invalidate( rRegion, nFlags ); diff --git a/chart2/source/controller/main/ChartWindow.hxx b/chart2/source/controller/main/ChartWindow.hxx index ee5884f013e5..9dee31b22219 100644 --- a/chart2/source/controller/main/ChartWindow.hxx +++ b/chart2/source/controller/main/ChartWindow.hxx @@ -32,10 +32,10 @@ class ChartController; thus the controller can perform appropriate actions */ -class ChartWindow : public Window +class ChartWindow : public vcl::Window { public: - ChartWindow( ChartController* pController, Window* pParent, WinBits nStyle ); + ChartWindow( ChartController* pController, vcl::Window* pParent, WinBits nStyle ); virtual ~ChartWindow(); void clear(); diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index dbfecd47f887..76657d5b05a8 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -50,7 +50,7 @@ namespace static const OUString lcl_aServiceName( "com.sun.star.comp.chart.ElementSelectorToolbarController" ); } -SelectorListBox::SelectorListBox( Window* pParent, WinBits nStyle ) +SelectorListBox::SelectorListBox( vcl::Window* pParent, WinBits nStyle ) : ListBox( pParent, nStyle ) , m_bReleaseFocus( true ) { @@ -301,7 +301,7 @@ uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::create uno::Reference< awt::XWindow > xItemWindow; if( !m_apSelectorListBox.get() ) { - Window* pParent = VCLUnoHelper::GetWindow( xParent ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( xParent ); if( pParent ) { m_apSelectorListBox.reset( new SelectorListBox( pParent, WB_DROPDOWN|WB_AUTOHSCROLL|WB_BORDER ) ); diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index 26d842880528..0b0d2b0409a1 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -47,7 +47,7 @@ struct ListBoxEntryData class SelectorListBox : public ListBox { public: - SelectorListBox( Window* pParent, WinBits nStyle ); + SelectorListBox( vcl::Window* pParent, WinBits nStyle ); virtual ~SelectorListBox(); virtual void Select() SAL_OVERRIDE; diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index dea277159f20..52b5f1f6d4e4 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -252,7 +252,7 @@ void ShapeController::executeDispatch_FormatLine() SolarMutexGuard aGuard; if ( m_pChartController ) { - Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow ); + vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow ); DrawModelWrapper* pDrawModelWrapper = m_pChartController->GetDrawModelWrapper(); DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper(); if ( pParent && pDrawModelWrapper && pDrawViewWrapper ) @@ -292,7 +292,7 @@ void ShapeController::executeDispatch_FormatArea() SolarMutexGuard aGuard; if ( m_pChartController ) { - Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow ); + vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow ); DrawModelWrapper* pDrawModelWrapper = m_pChartController->GetDrawModelWrapper(); DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper(); if ( pParent && pDrawModelWrapper && pDrawViewWrapper ) @@ -335,7 +335,7 @@ void ShapeController::executeDispatch_TextAttributes() SolarMutexGuard aGuard; if ( m_pChartController ) { - Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow ); + vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow ); DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper(); if ( pParent && pDrawViewWrapper ) { @@ -372,7 +372,7 @@ void ShapeController::executeDispatch_TransformDialog() SolarMutexGuard aGuard; if ( m_pChartController ) { - Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow ); + vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow ); DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper(); if ( pParent && pDrawViewWrapper ) { @@ -541,7 +541,7 @@ void ShapeController::executeDispatch_FontDialog() SolarMutexGuard aGuard; if ( m_pChartController ) { - Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow ); + vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow ); DrawModelWrapper* pDrawModelWrapper = m_pChartController->GetDrawModelWrapper(); DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper(); if ( pParent && pDrawModelWrapper && pDrawViewWrapper ) @@ -564,7 +564,7 @@ void ShapeController::executeDispatch_ParagraphDialog() SolarMutexGuard aGuard; if ( m_pChartController ) { - Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow ); + vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow ); DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper(); if ( pParent && pDrawViewWrapper ) { |