From 362635961a254f80581b31ba7d6957dc111d3515 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Mon, 1 Jul 2013 22:32:35 +0200 Subject: Remove InsertTrendlineDialog as it is not used anymore. Change-Id: I58dbdc416254e631f33784bb2a2cf124e69fc69a --- chart2/AllLangResTarget_chartcontroller.mk | 1 - chart2/Library_chartcontroller.mk | 1 - .../controller/dialogs/dlg_InsertTrendline.cxx | 106 --------------------- .../controller/dialogs/dlg_InsertTrendline.hrc | 25 ----- .../controller/dialogs/dlg_InsertTrendline.src | 40 -------- chart2/source/controller/dialogs/res_Trendline.cxx | 1 - .../source/controller/inc/dlg_InsertTrendline.hxx | 62 ------------ .../controller/main/ChartController_Insert.cxx | 1 - 8 files changed, 237 deletions(-) delete mode 100644 chart2/source/controller/dialogs/dlg_InsertTrendline.cxx delete mode 100644 chart2/source/controller/dialogs/dlg_InsertTrendline.hrc delete mode 100644 chart2/source/controller/dialogs/dlg_InsertTrendline.src delete mode 100644 chart2/source/controller/inc/dlg_InsertTrendline.hxx (limited to 'chart2') diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk index 0da17b200340..006266ab37c1 100644 --- a/chart2/AllLangResTarget_chartcontroller.mk +++ b/chart2/AllLangResTarget_chartcontroller.mk @@ -37,7 +37,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\ chart2/source/controller/dialogs/dlg_InsertErrorBars.src \ chart2/source/controller/dialogs/dlg_InsertLegend.src \ chart2/source/controller/dialogs/dlg_InsertTitle.src \ - chart2/source/controller/dialogs/dlg_InsertTrendline.src \ chart2/source/controller/dialogs/dlg_ObjectProperties.src \ chart2/source/controller/dialogs/dlg_ShapeFont.src \ chart2/source/controller/dialogs/dlg_ShapeParagraph.src \ diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index 45e42667433d..e90f716301c4 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -98,7 +98,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\ chart2/source/controller/dialogs/dlg_InsertErrorBars \ chart2/source/controller/dialogs/dlg_InsertLegend \ chart2/source/controller/dialogs/dlg_InsertTitle \ - chart2/source/controller/dialogs/dlg_InsertTrendline \ chart2/source/controller/dialogs/dlg_NumberFormat \ chart2/source/controller/dialogs/dlg_ObjectProperties \ chart2/source/controller/dialogs/dlg_ShapeFont \ diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx b/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx deleted file mode 100644 index a00e42441789..000000000000 --- a/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx +++ /dev/null @@ -1,106 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include "dlg_InsertTrendline.hxx" -#include "dlg_InsertTrendline.hrc" -#include "res_Trendline.hxx" -#include "ResourceIds.hrc" -#include "ResId.hxx" -#include "Strings.hrc" -#include "chartview/ExplicitValueProvider.hxx" -#include "ChartModelHelper.hxx" -#include "ObjectIdentifier.hxx" -#include "DiagramHelper.hxx" -#include "AxisHelper.hxx" -#include "ObjectNameProvider.hxx" -#include -#include - -#include - -using namespace ::com::sun::star; -using namespace ::com::sun::star::chart2; - -namespace -{ -void lcl_SetControlXPos( Control & rControl, long nPosPixel ) -{ - Point aPos( rControl.GetPosPixel()); - aPos.setX( nPosPixel ); - rControl.SetPosPixel( aPos ); -} -} // anonymous namespace - -//............................................................................. -namespace chart -{ -//............................................................................. - -InsertTrendlineDialog::InsertTrendlineDialog( Window* pParent, const SfxItemSet& rMyAttrs ) : - ModalDialog( pParent, SchResId( DLG_DATA_TRENDLINE )), - rInAttrs( rMyAttrs ), - aBtnOK( this, SchResId( BTN_OK )), - aBtnCancel( this, SchResId( BTN_CANCEL )), - aBtnHelp( this, SchResId( BTN_HELP )), - m_apTrendlineResources( new TrendlineResources( this, rInAttrs, true )) -{ - FreeResource(); - this->SetText( ObjectNameProvider::getName_ObjectForAllSeries( OBJECTTYPE_DATA_CURVE ) ); -} - -InsertTrendlineDialog::~InsertTrendlineDialog() -{ -} - -void InsertTrendlineDialog::adjustSize() -{ - long nControlsRightEdge = m_apTrendlineResources->adjustControlSizes(); - long nButtonXPos = nControlsRightEdge + - LogicToPixel( Size( RSC_SP_CTRL_X, 10 ), MapMode( MAP_APPFONT )).getWidth(); - lcl_SetControlXPos( aBtnOK, nButtonXPos ); - lcl_SetControlXPos( aBtnCancel, nButtonXPos ); - lcl_SetControlXPos( aBtnHelp, nButtonXPos ); - - Size aDialogSize( GetSizePixel()); - aDialogSize.setWidth( - nControlsRightEdge + - LogicToPixel( Size( RSC_SP_CTRL_X + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_DLG_INNERBORDER_RIGHT, 0 ), - MapMode( MAP_APPFONT )).getWidth()); - SetSizePixel( aDialogSize ); -} - -void InsertTrendlineDialog::FillItemSet(SfxItemSet& rOutAttrs) -{ - m_apTrendlineResources->FillItemSet(rOutAttrs); -} - -void InsertTrendlineDialog::DataChanged( const DataChangedEvent& rDCEvt ) -{ - ModalDialog::DataChanged( rDCEvt ); - - if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) - m_apTrendlineResources->FillValueSets(); -} - -//............................................................................. -} //namespace chart -//............................................................................. - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.hrc b/chart2/source/controller/dialogs/dlg_InsertTrendline.hrc deleted file mode 100644 index fd728a0f3cf0..000000000000 --- a/chart2/source/controller/dialogs/dlg_InsertTrendline.hrc +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include "ResourceIds.hrc" - -#define BTN_OK 1 -#define BTN_CANCEL 1 -#define BTN_HELP 1 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.src b/chart2/source/controller/dialogs/dlg_InsertTrendline.src deleted file mode 100644 index 2b8b621fc812..000000000000 --- a/chart2/source/controller/dialogs/dlg_InsertTrendline.src +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dlg_InsertTrendline.hrc" -#include "HelpIds.hrc" -#include "CommonResources.hrc" -#include "res_Trendline.hrc" - -// is only an initial size, will be calculated to contain all controls -#define DLG_DATA_TRENDLINE_RES_WIDTH 130 -#define DLG_DATA_TRENDLINE_ADD_TO_RES 62 - -ModalDialog DLG_DATA_TRENDLINE -{ - HelpID = HID_INSERT_STATISTICS ; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT( DLG_DATA_TRENDLINE_RES_WIDTH + DLG_DATA_TRENDLINE_ADD_TO_RES, 220 ); - Moveable = TRUE ; - BUTTONS_OK_CANCEL_HELP_STACKED( DLG_DATA_TRENDLINE_RES_WIDTH + DLG_DATA_TRENDLINE_ADD_TO_RES ) - RESOURCE_TRENDLINE( DLG_DATA_TRENDLINE_RES_WIDTH, 22 ) -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index 316282c63394..75f08dc68d67 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -18,7 +18,6 @@ */ -#include "dlg_InsertTrendline.hrc" #include "res_Trendline.hxx" #include "res_Trendline_IDs.hrc" #include "ResId.hxx" diff --git a/chart2/source/controller/inc/dlg_InsertTrendline.hxx b/chart2/source/controller/inc/dlg_InsertTrendline.hxx deleted file mode 100644 index 2b076841dead..000000000000 --- a/chart2/source/controller/inc/dlg_InsertTrendline.hxx +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef _CHART2_DLG_INSERT_TRENDLINE_HXX -#define _CHART2_DLG_INSERT_TRENDLINE_HXX - -#include -#include -#include -#include - -//............................................................................. -namespace chart -{ -//............................................................................. - -class TrendlineResources; -class InsertTrendlineDialog : public ModalDialog -{ -public: - InsertTrendlineDialog( Window* pParent, const SfxItemSet& rMyAttrs ); - virtual ~InsertTrendlineDialog(); - - void FillItemSet( SfxItemSet& rOutAttrs ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - // sets the size so that all control texts fit. Has to be done after - // complete construction of the dialog - void adjustSize(); - -private: - const SfxItemSet & rInAttrs; - - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - - ::std::auto_ptr< TrendlineResources > m_apTrendlineResources; -}; - -//............................................................................. -} //namespace chart -//............................................................................. - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 9b882dbacadd..08c46107c5e6 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -22,7 +22,6 @@ #include "dlg_InsertAxis_Grid.hxx" #include "dlg_InsertDataLabel.hxx" #include "dlg_InsertLegend.hxx" -#include "dlg_InsertTrendline.hxx" #include "dlg_InsertErrorBars.hxx" #include "dlg_InsertTitle.hxx" #include "dlg_ObjectProperties.hxx" -- cgit