[Libreoffice-commits] core.git: 2 commits - chart2/AllLangResTarget_chartcontroller.mk chart2/source helpcontent2
Caolán McNamara
caolanm at redhat.com
Fri Dec 27 12:59:10 PST 2013
chart2/AllLangResTarget_chartcontroller.mk | 1
chart2/source/controller/dialogs/dlg_InsertLegend.cxx | 10 -
chart2/source/controller/dialogs/res_LegendPosition.hxx | 79 ----------
chart2/source/controller/dialogs/tp_ErrorBars.cxx | 5
chart2/source/controller/dialogs/tp_ErrorBars.hxx | 1
chart2/source/controller/dialogs/tp_ErrorBars.src | 32 ----
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx | 7
chart2/source/controller/inc/HelpIds.hrc | 10 -
chart2/source/controller/inc/dlg_InsertLegend.hxx | 9 -
chart2/source/controller/inc/res_LegendPosition.hxx | 79 ++++++++++
helpcontent2 | 2
11 files changed, 89 insertions(+), 146 deletions(-)
New commits:
commit 27eb33d753eedfa4215eaf8325bc0ee9baeb7417
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 27 20:22:31 2013 +0000
remove unnecessary empty dtor, etc.
Change-Id: Ia2a1d1fe81a07d1e37437539d6d651a7c6ce1111
diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk
index f09bfb6..d742981 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_SrsTarget_add_nonlocalizable_files,chart2/res,\
chart2/source/controller/dialogs/dlg_CreationWizard.src \
chart2/source/controller/dialogs/dlg_InsertDataLabel.src \
chart2/source/controller/dialogs/dlg_InsertErrorBars.src \
- chart2/source/controller/dialogs/tp_ErrorBars.src \
chart2/source/controller/dialogs/tp_PointGeometry.src \
chart2/source/controller/menus/ShapeContextMenu.src \
chart2/source/controller/menus/ShapeEditContextMenu.src \
diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
index 5d1f0f4..8362239 100644
--- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
@@ -29,22 +29,18 @@ SchLegendDlg::SchLegendDlg(Window* pWindow, const uno::Reference< uno::XComponen
: ModalDialog(pWindow
,"dlg_InsertLegend"
,"modules/schart/ui/dlg_InsertLegend.ui")
- , m_apLegendPositionResources( new LegendPositionResources(*this,xCC) )
-{
-}
-
-SchLegendDlg::~SchLegendDlg()
+ , m_xLegendPositionResources( new LegendPositionResources(*this,xCC) )
{
}
void SchLegendDlg::init( const uno::Reference< frame::XModel >& xChartModel )
{
- m_apLegendPositionResources->writeToResources( xChartModel );
+ m_xLegendPositionResources->writeToResources( xChartModel );
}
bool SchLegendDlg::writeToModel( const uno::Reference< frame::XModel >& xChartModel ) const
{
- m_apLegendPositionResources->writeToModel( xChartModel );
+ m_xLegendPositionResources->writeToModel( xChartModel );
return true;
}
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index 995babd..7b6743d 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -38,11 +38,6 @@ ErrorBarsTabPage::ErrorBarsTabPage( Window* pParent, const SfxItemSet& rInAttrs
pParent->GetParentDialog(),
rInAttrs, /* bNoneAvailable = */ false )
{
-// FreeResource();
-}
-
-ErrorBarsTabPage::~ErrorBarsTabPage()
-{
}
SfxTabPage* ErrorBarsTabPage::Create(
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
index 81a0417..a1bb2ae 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
@@ -30,7 +30,6 @@ class ErrorBarsTabPage : public SfxTabPage
{
public:
ErrorBarsTabPage ( Window* pParent, const SfxItemSet& rInAttrs );
- virtual ~ErrorBarsTabPage ();
void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth );
void SetErrorBarType( ErrorBarResources::tErrorBarType eNewType );
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.src b/chart2/source/controller/dialogs/tp_ErrorBars.src
deleted file mode 100644
index 78e6a12..0000000
--- a/chart2/source/controller/dialogs/tp_ErrorBars.src
+++ /dev/null
@@ -1,32 +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 "HelpIds.hrc"
-#include "TabPages.hrc"
-#include "res_ErrorBar.hrc"
-
-TabPage TP_YERRORBAR
-{
- HelpID = "chart2:TabPage:TP_YERRORBAR";
- Hide = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- RESOURCE_ERRORBARS( 260 - 12, 0 )
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
index 53e1463..0cd35d6 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
@@ -30,13 +30,12 @@
#include <boost/scoped_ptr.hpp>
+#include "res_LegendPosition.hxx"
+#include "res_Titles.hxx"
+
namespace chart
{
-/**
-*/
-class TitleResources;
-class LegendPositionResources;
class TitlesAndObjectsTabPage : public svt::OWizardPage
{
public:
diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc
index d518b2c..a8d90cb 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -22,8 +22,6 @@
#define HID_SCH_WIN_DOCUMENT "CHART2_HID_SCH_WIN_DOCUMENT"
#define HID_SCH_CTL_DATA "CHART2_HID_SCH_CTL_DATA"
-#define HID_SCH_CT_INDICATE "CHART2_HID_SCH_CT_INDICATE"
-
//for chart type dialog:
#define HID_SCH_CTL_TYPE "CHART2_HID_SCH_CTL_TYPE"
#define HID_SCH_CTL_VARIANT "CHART2_HID_SCH_CTL_VARIANT"
@@ -56,15 +54,8 @@
#define HID_SCH_STATISTIK_MEANVALUE "CHART2_HID_SCH_STATISTIK_MEANVALUE"
#define HID_SCH_STATISTIK_NO_ERROR "CHART2_HID_SCH_STATISTIK_NO_ERROR"
-#define HID_SCH_STATISTIK_VARIANT "CHART2_HID_SCH_STATISTIK_VARIANT"
-#define HID_SCH_STATISTIK_SIGMA "CHART2_HID_SCH_STATISTIK_SIGMA"
#define HID_SCH_STATISTIK_PERCENT "CHART2_HID_SCH_STATISTIK_PERCENT"
-#define HID_SCH_STATISTIK_BIGERROR "CHART2_HID_SCH_STATISTIK_BIGERROR"
#define HID_SCH_STATISTIK_CONSTERROR "CHART2_HID_SCH_STATISTIK_CONSTERROR"
-#define HID_SCH_STATISTIK_PERCENT_VALUE "CHART2_HID_SCH_STATISTIK_PERCENT_VALUE"
-#define HID_SCH_STATISTIK_BIGERROR_VALUE "CHART2_HID_SCH_STATISTIK_BIGERROR_VALUE"
-#define HID_SCH_STATISTIK_PLUS_VALUE "CHART2_HID_SCH_STATISTIK_PLUS_VALUE"
-#define HID_SCH_STATISTIK_MINUS_VALUE "CHART2_HID_SCH_STATISTIK_MINUS_VALUE"
#define HID_SCH_DATALABEL_VALUE "CHART2_HID_SCH_DATALABEL_VALUE"
#define HID_SCH_DATALABEL_PERCENT "CHART2_HID_SCH_DATALABEL_PERCENT"
@@ -101,7 +92,6 @@
#define HID_INSERT_STATISTICS "CHART2_HID_INSERT_STATISTICS"
#define HID_INSERT_DESCRIPTION "CHART2_HID_INSERT_DESCRIPTION"
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/dlg_InsertLegend.hxx b/chart2/source/controller/inc/dlg_InsertLegend.hxx
index 6c07cbf..eee9c24 100644
--- a/chart2/source/controller/inc/dlg_InsertLegend.hxx
+++ b/chart2/source/controller/inc/dlg_InsertLegend.hxx
@@ -19,29 +19,26 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_INSERTLEGEND_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_INSERTLEGEND_HXX
-// header for class ModalDialog
#include <vcl/dialog.hxx>
-// header for class CheckBox
#include <sfx2/basedlgs.hxx>
#include <boost/scoped_ptr.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
+#include "res_LegendPosition.hxx"
+
namespace chart
{
-class LegendPositionResources;
-
class SchLegendDlg : public ModalDialog
{
private:
- boost::scoped_ptr < LegendPositionResources > m_apLegendPositionResources;
+ boost::scoped_ptr < LegendPositionResources > m_xLegendPositionResources;
public:
SchLegendDlg( Window* pParent, const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext>& xCC );
- virtual ~SchLegendDlg();
void init( const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xChartModel );
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.hxx b/chart2/source/controller/inc/res_LegendPosition.hxx
similarity index 100%
rename from chart2/source/controller/dialogs/res_LegendPosition.hxx
rename to chart2/source/controller/inc/res_LegendPosition.hxx
commit 36313b0fa7612bbf82e8ecfefd210139c242bfae
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 27 20:41:38 2013 +0000
Updated core
Project: help 8d6c8428de7fe8735640118179c5676c6b7f4f3e
diff --git a/helpcontent2 b/helpcontent2
index 6fb0749..8d6c842 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6fb074934c6ac847fa7a304ff61e8591ac50b0af
+Subproject commit 8d6c8428de7fe8735640118179c5676c6b7f4f3e
More information about the Libreoffice-commits
mailing list