[Libreoffice-commits] core.git: chart2/AllLangResTarget_chartcontroller.mk chart2/source
Caolán McNamara
caolanm at redhat.com
Wed Jul 23 02:30:53 PDT 2014
chart2/AllLangResTarget_chartcontroller.mk | 1
chart2/source/controller/dialogs/ResourceIds.hrc | 3 -
chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 15 ++++---
chart2/source/controller/dialogs/dlg_CreationWizard.hrc | 26 -------------
chart2/source/controller/dialogs/dlg_CreationWizard.src | 32 ----------------
chart2/source/controller/inc/HelpIds.hrc | 2 -
6 files changed, 8 insertions(+), 71 deletions(-)
New commits:
commit 2c5f02539d8e1ae079b2ee68838024865610b6d8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 23 10:18:48 2014 +0100
drop DLG_CHART_WIZARD via .res
Change-Id: I394a42bfb761e2f7cf8c3186f5ec412331b5950c
diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk
index 79a7aaf..764379e 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
$(eval $(call gb_SrsTarget_add_nonlocalizable_files,chart2/res,\
chart2/source/controller/dialogs/Bitmaps.src \
- chart2/source/controller/dialogs/dlg_CreationWizard.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/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc
index ebd27e0..7c6dc04 100644
--- a/chart2/source/controller/dialogs/ResourceIds.hrc
+++ b/chart2/source/controller/dialogs/ResourceIds.hrc
@@ -23,9 +23,6 @@
//for strings see Strings.hrc
//for Bimaps see Bimaps.hrc
-//Dialog Ids:
-#define DLG_CHART_WIZARD 902
-
//TabPage Ids:
#define TP_LEGEND_POS 900
#define TP_DATA_DESCR 901
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 1c2877a..35fbcfb 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -18,7 +18,6 @@
*/
#include "dlg_CreationWizard.hxx"
-#include "dlg_CreationWizard.hrc"
#include "ResId.hxx"
#include "macros.hxx"
#include "Strings.hrc"
@@ -31,6 +30,9 @@
#include "ChartTypeTemplateProvider.hxx"
#include "DialogModel.hxx"
+#define CHART_WIZARD_PAGEWIDTH 250
+#define CHART_WIZARD_PAGEHEIGHT 170
+
namespace chart
{
using namespace ::com::sun::star;
@@ -51,10 +53,10 @@ namespace
CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XModel >& xChartModel
, const uno::Reference< uno::XComponentContext >& xContext
, sal_Int32 nOnePageOnlyIndex )
- : svt::RoadmapWizard( pParent, SchResId(DLG_CHART_WIZARD)
- , ( nOnePageOnlyIndex >= 0 && nOnePageOnlyIndex < nPageCount )
+ : svt::RoadmapWizard( pParent,
+ static_cast<sal_uInt32>((nOnePageOnlyIndex >= 0 && nOnePageOnlyIndex < nPageCount)
? WZB_HELP | WZB_CANCEL | WZB_FINISH
- : WZB_HELP | WZB_CANCEL | WZB_PREVIOUS | WZB_NEXT | WZB_FINISH
+ : WZB_HELP | WZB_CANCEL | WZB_PREVIOUS | WZB_NEXT | WZB_FINISH)
)
, m_xChartModel(xChartModel,uno::UNO_QUERY)
, m_xCC( xContext )
@@ -67,8 +69,6 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM
, m_bCanTravel( true )
{
m_pDialogModel.reset( new DialogModel( m_xChartModel, m_xCC ));
- // Do not call FreeResource(), because there are no sub-elements defined in
- // the dialog resource
ShowButtonFixedLine( true );
defaultButton( WZB_FINISH );
@@ -90,7 +90,7 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM
this->SetRoadmapHelpId( HID_SCH_WIZARD_ROADMAP );
this->SetRoadmapInteractive( true );
Size aAdditionalRoadmapSize( LogicToPixel( Size( 85, 0 ), MAP_APPFONT ) );
- Size aSize( this->GetSizePixel() );
+ Size aSize(LogicToPixel(Size(CHART_WIZARD_PAGEWIDTH, CHART_WIZARD_PAGEHEIGHT), MAP_APPFONT));
aSize.Width() += aAdditionalRoadmapSize.Width();
this->SetSizePixel( aSize );
@@ -106,6 +106,7 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM
// Call ActivatePage, to create and activate the first page
ActivatePage();
}
+
CreationWizard::~CreationWizard()
{
}
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.hrc b/chart2/source/controller/dialogs/dlg_CreationWizard.hrc
deleted file mode 100644
index 5c03048..0000000
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.hrc
+++ /dev/null
@@ -1,26 +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 CHART_WIZARD_PAGEWIDTH 250
-#define CHART_WIZARD_PAGEHEIGHT 140
-//width 198 height 150
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.src b/chart2/source/controller/dialogs/dlg_CreationWizard.src
deleted file mode 100644
index 3f56898..0000000
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.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 "dlg_CreationWizard.hrc"
-#include "HelpIds.hrc"
-
-ModalDialog DLG_CHART_WIZARD
-{
- HelpID = HID_SCH_CHART_AUTO_FORMAT ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( CHART_WIZARD_PAGEWIDTH , CHART_WIZARD_PAGEHEIGHT+30 ) ;
- Moveable = TRUE ;
- Closeable = TRUE ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc
index 717d2e3..e7f074a 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -21,8 +21,6 @@
#define HID_SCH_WIN_DOCUMENT "CHART2_HID_SCH_WIN_DOCUMENT"
-#define HID_SCH_CHART_AUTO_FORMAT "CHART2_HID_SCH_CHART_AUTO_FORMAT"
-
#define HID_SCH_CB_SECONDARY_XAXIS "CHART2_HID_SCH_CB_SECONDARY_XAXIS"
#define HID_SCH_CB_SECONDARY_YAXIS "CHART2_HID_SCH_CB_SECONDARY_YAXIS"
#define HID_SCH_CB_SECONDARY_ZAXIS "CHART2_HID_SCH_CB_SECONDARY_ZAXIS"
More information about the Libreoffice-commits
mailing list