diff options
Diffstat (limited to 'chart2/source/controller')
44 files changed, 422 insertions, 209 deletions
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index ffc1e95ca796..1b0d8fb4889c 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -52,17 +52,6 @@ namespace chart namespace wrapper { -namespace -{ - -rtl::OUString lcl_getCIDForDiagram( const Reference< frame::XModel >& xChartModel ) -{ - uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); - return ObjectIdentifier::createClassifiedIdentifierForObject( xDiagram, xChartModel ); -} - -} //anonymous namespace - Chart2ModelContact::Chart2ModelContact( const Reference< uno::XComponentContext > & xContext ) : m_xContext( xContext ), diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index f93a0190116d..d6487d425657 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -160,7 +160,9 @@ enum PROP_DOCUMENT_BASEDIAGRAM, PROP_DOCUMENT_ADDITIONAL_SHAPES, PROP_DOCUMENT_UPDATE_ADDIN, - PROP_DOCUMENT_NULL_DATE + PROP_DOCUMENT_NULL_DATE, + PROP_DOCUMENT_DISABLE_COMPLEX_CHARTTYPES, + PROP_DOCUMENT_DISABLE_DATATABLE_DIALOG }; void lcl_AddPropertiesToVector( @@ -232,6 +234,19 @@ void lcl_AddPropertiesToVector( PROP_DOCUMENT_NULL_DATE, ::getCppuType( static_cast< const ::com::sun::star::util::DateTime * >(0)), beans::PropertyAttribute::MAYBEVOID )); + + rOutProperties.push_back( + Property( C2U( "DisableComplexChartTypes" ), + PROP_DOCUMENT_DISABLE_COMPLEX_CHARTTYPES, + ::getBooleanCppuType(), + //#i112666# no PropertyChangeEvent is fired on change so far + beans::PropertyAttribute::MAYBEDEFAULT ) ); + rOutProperties.push_back( + Property( C2U( "DisableDataTableDialog" ), + PROP_DOCUMENT_DISABLE_DATATABLE_DIALOG, + ::getBooleanCppuType(), + //#i112666# no PropertyChangeEvent is fired on change so far + beans::PropertyAttribute::MAYBEDEFAULT ) ); } const uno::Sequence< Property > & lcl_GetPropertySequence() @@ -1583,6 +1598,8 @@ const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedPropert aWrappedProperties.push_back( new WrappedAdditionalShapesProperty( *this ) ); aWrappedProperties.push_back( new WrappedRefreshAddInAllowedProperty( *this ) ); aWrappedProperties.push_back( new WrappedIgnoreProperty( C2U("NullDate"),Any() ) ); // i99104 + aWrappedProperties.push_back( new WrappedIgnoreProperty( C2U( "DisableComplexChartTypes" ), uno::makeAny( sal_False ) ) ); + aWrappedProperties.push_back( new WrappedIgnoreProperty( C2U( "DisableDataTableDialog" ), uno::makeAny( sal_False ) ) ); return aWrappedProperties; } diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index eb3c76dd2c40..c0be0ddcbf0d 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -749,20 +749,19 @@ void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition ) Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); if( xProp.is() ) { - if( aPosition.X < 0 || aPosition.Y < 0 || aPosition.X > 1 || aPosition.Y > 1 ) - { - DBG_ERROR("DiagramWrapper::setPosition called with a position out of range -> automatic values are taken instead" ); - uno::Any aEmpty; - xProp->setPropertyValue( C2U( "RelativePosition" ), aEmpty ); - return; - } - awt::Size aPageSize( m_spChart2ModelContact->GetPageSize() ); chart2::RelativePosition aRelativePosition; aRelativePosition.Anchor = drawing::Alignment_TOP_LEFT; aRelativePosition.Primary = double(aPosition.X)/double(aPageSize.Width); aRelativePosition.Secondary = double(aPosition.Y)/double(aPageSize.Height); + if( aRelativePosition.Primary < 0 || aRelativePosition.Secondary < 0 || aRelativePosition.Primary > 1 || aRelativePosition.Secondary > 1 ) + { + DBG_ERROR("DiagramWrapper::setPosition called with a position out of range -> automatic values are taken instead" ); + uno::Any aEmpty; + xProp->setPropertyValue( C2U( "RelativePosition" ), aEmpty ); + return; + } xProp->setPropertyValue( C2U( "RelativePosition" ), uno::makeAny(aRelativePosition) ); xProp->setPropertyValue( C2U( "PosSizeExcludeAxes" ), uno::makeAny(false) ); } diff --git a/chart2/source/controller/chartcontroller.component b/chart2/source/controller/chartcontroller.component new file mode 100644 index 000000000000..fc99913b5a74 --- /dev/null +++ b/chart2/source/controller/chartcontroller.component @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.chart.ElementSelectorToolbarController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.chart2.ChartController"> + <service name="com.sun.star.chart2.ChartController"/> + <service name="com.sun.star.frame.Controller"/> + </implementation> + <implementation name="com.sun.star.comp.chart2.ChartDocumentWrapper"> + <service name="com.sun.star.beans.PropertySet"/> + <service name="com.sun.star.chart.ChartDocument"/> + <service name="com.sun.star.chart2.ChartDocumentWrapper"/> + <service name="com.sun.star.xml.UserDefinedAttributeSupplier"/> + </implementation> + <implementation name="com.sun.star.comp.chart2.ChartFrameLoader"> + <service name="com.sun.star.frame.SynchronousFrameLoader"/> + </implementation> + <implementation name="com.sun.star.comp.chart2.ChartTypeDialog"> + <service name="com.sun.star.chart2.ChartTypeDialog"/> + </implementation> + <implementation name="com.sun.star.comp.chart2.ShapeToolbarController"> + <service name="com.sun.star.chart2.ShapeToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.chart2.WizardDialog"> + <service name="com.sun.star.chart2.WizardDialog"/> + </implementation> +</component> diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 67930fc6f7a7..513d49b6aad8 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -241,7 +241,7 @@ SeriesHeader::SeriesHeader( Window * pParent ) : m_spSeriesName->EnableUpdateData( 4 * EDIT_UPDATEDATA_TIMEOUT ); // define is in vcl/edit.hxx m_spSeriesName->SetUpdateDataHdl( LINK( this, SeriesHeader, SeriesNameChanged )); m_spSeriesName->SetModifyHdl( LINK( this, SeriesHeader, SeriesNameEdited )); - m_spSeriesName->SetSmartHelpId( SmartId( HID_SCH_DATA_SERIES_LABEL )); + m_spSeriesName->SetHelpId( HID_SCH_DATA_SERIES_LABEL ); Show(); } diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index f104045727bb..f32a882aa1e9 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -41,6 +41,7 @@ #include "CommonFunctors.hxx" #include "ControllerLockGuard.hxx" #include "ChartTypeHelper.hxx" +#include "ThreeDHelper.hxx" #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/chart2/AxisType.hpp> @@ -525,6 +526,9 @@ Reference< chart2::XDataSeries > DialogModel::insertSeriesAfter( try { + Reference< chart2::XDiagram > xDiagram( m_xChartDocument->getFirstDiagram() ); + ThreeDLookScheme e3DScheme = ThreeDHelper::detectScheme( xDiagram ); + sal_Int32 nSeriesInChartType = 0; const sal_Int32 nTotalSeries = countSeries(); if( xChartType.is()) @@ -540,7 +544,7 @@ Reference< chart2::XDataSeries > DialogModel::insertSeriesAfter( xChartType, nTotalSeries, // new series' index nSeriesInChartType, - m_xChartDocument->getFirstDiagram(), + xDiagram, m_xTemplate, bCreateDataCachedSequences )); @@ -561,6 +565,8 @@ Reference< chart2::XDataSeries > DialogModel::insertSeriesAfter( aSeries.insert( aIt, xNewSeries ); xSeriesCnt->setDataSeries( ContainerToSequence( aSeries )); } + + ThreeDHelper::setScheme( xDiagram, e3DScheme ); } catch( uno::Exception & ex ) { @@ -694,14 +700,19 @@ bool DialogModel::setData( m_xTemplate->getDataInterpreter()); if( xInterpreter.is()) { + Reference< chart2::XDiagram > xDiagram( m_xChartDocument->getFirstDiagram() ); + ThreeDLookScheme e3DScheme = ThreeDHelper::detectScheme( xDiagram ); + ::std::vector< Reference< XDataSeries > > aSeriesToReUse( - DiagramHelper::getDataSeriesFromDiagram( m_xChartDocument->getFirstDiagram())); + DiagramHelper::getDataSeriesFromDiagram( xDiagram )); applyInterpretedData( xInterpreter->interpretDataSource( xDataSource, rArguments, ContainerToSequence( aSeriesToReUse )), aSeriesToReUse, true /* bSetStyles */); + + ThreeDHelper::setScheme( xDiagram, e3DScheme ); } } catch( uno::Exception & ex ) diff --git a/chart2/source/controller/dialogs/dlg_ChartType.src b/chart2/source/controller/dialogs/dlg_ChartType.src index 5523ad8956db..57e1f281a613 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.src +++ b/chart2/source/controller/dialogs/dlg_ChartType.src @@ -38,7 +38,7 @@ ModalDialog DLG_DIAGRAM_TYPE { - HelpID = SID_DIAGRAM_TYPE ; + HelpID = HID_DIAGRAM_TYPE ; Size = MAP_APPFONT ( CHART_TYPE_DLG_WIDTH , CHART_TYPE_DLG_HEIGHT ) ; diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index 5b82e57f7044..e7a7a8bd43d8 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -117,7 +117,7 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM #endif , WZS_INVALID_STATE ); - this->SetRoadmapSmartHelpId( SmartId( HID_SCH_WIZARD_ROADMAP ) ); + this->SetRoadmapHelpId( HID_SCH_WIZARD_ROADMAP ); this->SetRoadmapInteractive( sal_True ); Size aAdditionalRoadmapSize( LogicToPixel( Size( 85, 0 ), MAP_APPFONT ) ); Size aSize( this->GetSizePixel() ); diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.src b/chart2/source/controller/dialogs/dlg_DataEditor.src index dadd1ac3098d..02ccc98b7a82 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.src +++ b/chart2/source/controller/dialogs/dlg_DataEditor.src @@ -38,7 +38,7 @@ ModalDialog DLG_DIAGRAM_DATA { - HelpID = SID_DIAGRAM_DATA ; + HelpID = HID_DIAGRAM_DATA ; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx index e97f15898064..0a250b5bf874 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx @@ -88,7 +88,7 @@ SchAxisDlg::SchAxisDlg( Window* pWindow FreeResource(); if(!bAxisDlg) { - SetHelpId( SID_INSERT_GRIDS ); + SetHelpId( HID_INSERT_GRIDS ); SetText( ObjectNameProvider::getName(OBJECTTYPE_GRID,true) ); aCbPrimaryX.SetHelpId( HID_SCH_CB_XGRID ); diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src index 11eec47d0996..0ee3f219c12c 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src @@ -33,7 +33,7 @@ ModalDialog DLG_AXIS_OR_GRID { - HelpID = SID_INSERT_AXIS ; + HelpID = HID_INSERT_AXIS ; OutputSize = TRUE ; SVLook = TRUE ; //Size = MAP_APPFONT ( 160 , 99 ) ; diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.src b/chart2/source/controller/dialogs/dlg_InsertDataLabel.src index 8f8a64485778..24ae2f63fce1 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.src +++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.src @@ -32,7 +32,7 @@ ModalDialog DLG_DATA_DESCR { - HelpID = SID_INSERT_DESCRIPTION ; + HelpID = HID_INSERT_DESCRIPTION ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 316 , 185 ) ; diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.src b/chart2/source/controller/dialogs/dlg_InsertErrorBars.src index 08230207b007..462c81211011 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.src +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.src @@ -33,7 +33,7 @@ ModalDialog DLG_DATA_YERRORBAR { -// HelpID = SID_INSERT_STATISTICS ; + HelpID = "chart2:ModalDialog:DLG_DATA_YERRORBAR"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 300 , 156 ) ; diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.src b/chart2/source/controller/dialogs/dlg_InsertLegend.src index 95a1d5516ab5..1f768f7c065b 100644 --- a/chart2/source/controller/dialogs/dlg_InsertLegend.src +++ b/chart2/source/controller/dialogs/dlg_InsertLegend.src @@ -36,7 +36,7 @@ ModalDialog DLG_LEGEND { - HelpID = SID_INSERT_CHART_LEGEND ; + HelpID = HID_INSERT_CHART_LEGEND ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 156 , 80 ) ; diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.src b/chart2/source/controller/dialogs/dlg_InsertTitle.src index f84ff2c6acd7..446763e93b9e 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTitle.src +++ b/chart2/source/controller/dialogs/dlg_InsertTitle.src @@ -32,7 +32,7 @@ ModalDialog DLG_TITLE { - HelpID = SID_INSERT_TITLE ; + HelpID = HID_INSERT_TITLE ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 220 , 156 ) ; diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.src b/chart2/source/controller/dialogs/dlg_InsertTrendline.src index 54c490d4a2d1..e7abd803fd87 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTrendline.src +++ b/chart2/source/controller/dialogs/dlg_InsertTrendline.src @@ -37,7 +37,7 @@ ModalDialog DLG_DATA_TRENDLINE { - HelpID = SID_INSERT_STATISTICS ; + HelpID = HID_INSERT_STATISTICS ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT( DLG_DATA_TRENDLINE_RES_WIDTH + DLG_DATA_TRENDLINE_ADD_TO_RES, 172 ); diff --git a/chart2/source/controller/dialogs/dlg_View3D.src b/chart2/source/controller/dialogs/dlg_View3D.src index 5b1802ecfb3d..7be2dd60b324 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.src +++ b/chart2/source/controller/dialogs/dlg_View3D.src @@ -28,10 +28,11 @@ #include "dlg_View3D.hrc" #include "SchSlotIds.hxx" #include "CommonResources.hrc" +#include "HelpIds.hrc" TabDialog DLG_3D_VIEW { - HelpID = SID_3D_VIEW ; + HelpID = HID_3D_VIEW ; OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; diff --git a/chart2/source/controller/dialogs/hidother.src b/chart2/source/controller/dialogs/hidother.src index 4b006f0f1f93..195115e93bd1 100644 --- a/chart2/source/controller/dialogs/hidother.src +++ b/chart2/source/controller/dialogs/hidother.src @@ -25,9 +25,6 @@ * ************************************************************************/ #include "HelpIds.hrc" -#include "SchSlotIds.hxx" - -hidspecial SID_INSERT_GRIDS {HelpId= SID_INSERT_GRIDS; }; hidspecial HID_SCH_CB_XAXIS {HelpId= HID_SCH_CB_XAXIS; }; hidspecial HID_SCH_CB_YAXIS {HelpId= HID_SCH_CB_YAXIS; }; diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 75457a5e7cad..8b649072538e 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -37,6 +37,7 @@ #include "RangeSelectionHelper.hxx" // for RANGE_SELECTION_INVALID_RANGE_BACKGROUND_COLOR #include "TabPageNotifiable.hxx" +#include "macros.hxx" #include <rtl/math.hxx> #include <vcl/dialog.hxx> @@ -147,7 +148,8 @@ ErrorBarResources::ErrorBarResources( Window* pParent, Dialog * pParentDialog, m_pParentWindow( pParent ), m_pParentDialog( pParentDialog ), m_pCurrentRangeChoosingField( 0 ), - m_bHasInternalDataProvider( true ) + m_bHasInternalDataProvider( true ), + m_bDisableDataTableDialog( false ) { if( m_bNoneAvailable ) m_aRbNone.SetClickHdl( LINK( this, ErrorBarResources, CategoryChosen )); @@ -197,7 +199,21 @@ void ErrorBarResources::SetChartDocumentForRangeChoosing( const uno::Reference< chart2::XChartDocument > & xChartDocument ) { if( xChartDocument.is()) + { m_bHasInternalDataProvider = xChartDocument->hasInternalDataProvider(); + uno::Reference< beans::XPropertySet > xProps( xChartDocument, uno::UNO_QUERY ); + if ( xProps.is() ) + { + try + { + xProps->getPropertyValue( C2U( "DisableDataTableDialog" ) ) >>= m_bDisableDataTableDialog; + } + catch( uno::Exception& e ) + { + ASSERT_EXCEPTION( e ); + } + } + } m_apRangeSelectionHelper.reset( new RangeSelectionHelper( xChartDocument )); // has internal data provider => rename "cell range" to "from data" @@ -240,6 +256,7 @@ void ErrorBarResources::UpdateControlStates() m_aLbFunction.Enable( bIsFunction ); // range buttons + m_aRbRange.Enable( !m_bHasInternalDataProvider || !m_bDisableDataTableDialog ); bool bShowRange = ( m_aRbRange.IsChecked()); bool bCanChooseRange = ( bShowRange && diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src index df202410109d..47e43e8c45b3 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src @@ -51,6 +51,7 @@ TabPage TP_3D_SCENEAPPEARANCE { + HelpID = "chart2:TabPage:TP_3D_SCENEAPPEARANCE"; OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; @@ -64,6 +65,7 @@ TabPage TP_3D_SCENEAPPEARANCE }; ListBox LB_SCHEME { + HelpID = "chart2:ListBox:TP_3D_SCENEAPPEARANCE:LB_SCHEME"; Border = TRUE; TabStop = TRUE; DropDown = TRUE; @@ -78,12 +80,14 @@ TabPage TP_3D_SCENEAPPEARANCE CheckBox CB_SHADING { + HelpID = "chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_SHADING"; Pos = MAP_APPFONT ( POS_X_1 , POS_Y_SHADING ) ; Size = MAP_APPFONT ( WIDTH_FL , HEIGHT_LB ) ; Text [ en-US ] = "~Shading" ; }; CheckBox CB_OBJECTLINES { + HelpID = "chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_OBJECTLINES"; Pos = MAP_APPFONT ( POS_X_1 , POS_Y_OBJECTLINES ) ; Size = MAP_APPFONT ( WIDTH_FL , HEIGHT_LB ) ; Text [ en-US ] = "~Object borders" ; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src index 329eb25e0e51..733212e6652a 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src @@ -28,6 +28,7 @@ #include "tp_3D_SceneGeometry.hrc" #include "dlg_View3D.hrc" #include "SchSlotIds.hxx" +#include "HelpIds.hrc" #ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> @@ -68,7 +69,7 @@ CustomUnitText [ en-US ] = " degrees" ; TabPage TP_3D_SCENEGEOMETRY { - HelpID = SID_3D_VIEW ; + HelpID = HID_3D_VIEW ; OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; @@ -76,6 +77,7 @@ TabPage TP_3D_SCENEGEOMETRY CheckBox CBX_RIGHT_ANGLED_AXES { + HelpID = "chart2:CheckBox:TP_3D_SCENEGEOMETRY:CBX_RIGHT_ANGLED_AXES"; Pos = MAP_APPFONT ( POS_X_1 , POS_Y_0 ) ; Size = MAP_APPFONT ( (WIDTH_FT+WIDTH_MF) , HEIGHT_FT ) ; TabStop = TRUE ; @@ -101,18 +103,21 @@ TabPage TP_3D_SCENEGEOMETRY }; MetricField MTR_FLD_X_ROTATION { + HelpID = "chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_X_ROTATION"; Pos = MAP_APPFONT ( POS_X_2 , POS_Y_1-2 ) ; Size = MAP_APPFONT ( WIDTH_MF , HEIGHT_MF ) ; CUSTOMUNITTEXT_DEGREE }; MetricField MTR_FLD_Y_ROTATION { + HelpID = "chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_Y_ROTATION"; Pos = MAP_APPFONT ( POS_X_2 , POS_Y_2-2 ) ; Size = MAP_APPFONT ( WIDTH_MF , HEIGHT_MF ) ; CUSTOMUNITTEXT_DEGREE }; MetricField MTR_FLD_Z_ROTATION { + HelpID = "chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_Z_ROTATION"; Pos = MAP_APPFONT ( POS_X_2 , POS_Y_3-2 ) ; Size = MAP_APPFONT ( WIDTH_MF , HEIGHT_MF ) ; CUSTOMUNITTEXT_DEGREE @@ -120,6 +125,7 @@ TabPage TP_3D_SCENEGEOMETRY CheckBox CBX_PERSPECTIVE { + HelpID = "chart2:CheckBox:TP_3D_SCENEGEOMETRY:CBX_PERSPECTIVE"; Pos = MAP_APPFONT ( POS_X_1 , POS_Y_4 ) ; Size = MAP_APPFONT ( WIDTH_FT , HEIGHT_FT ) ; TabStop = TRUE ; @@ -127,6 +133,7 @@ TabPage TP_3D_SCENEGEOMETRY }; MetricField MTR_FLD_PERSPECTIVE { + HelpID = "chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_PERSPECTIVE"; Pos = MAP_APPFONT ( POS_X_2 , POS_Y_4-2 ) ; Size = MAP_APPFONT ( WIDTH_MF , HEIGHT_MF ) ; Border = TRUE ; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src index 57f15a1894d7..0b052f4d00c6 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src @@ -59,6 +59,7 @@ TabPage TP_3D_SCENEILLUMINATION { + HelpID = "chart2:TabPage:TP_3D_SCENEILLUMINATION"; OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; @@ -72,46 +73,55 @@ TabPage TP_3D_SCENEILLUMINATION }; ImageButton BTN_LIGHT_1 { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_1"; Pos = MAP_APPFONT ( POS_X_0 , POS_Y_LIGHTSOURCE_BUTTONS ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; }; ImageButton BTN_LIGHT_2 { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_2"; Pos = MAP_APPFONT ( POS_X_0+BUTTON_DISTANCE , POS_Y_LIGHTSOURCE_BUTTONS ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; }; ImageButton BTN_LIGHT_3 { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_3"; Pos = MAP_APPFONT ( POS_X_0+2*BUTTON_DISTANCE , POS_Y_LIGHTSOURCE_BUTTONS ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; }; ImageButton BTN_LIGHT_4 { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_4"; Pos = MAP_APPFONT ( POS_X_0+3*BUTTON_DISTANCE , POS_Y_LIGHTSOURCE_BUTTONS ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; }; ImageButton BTN_LIGHT_5 { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_5"; Pos = MAP_APPFONT ( POS_X_0 , POS_Y_LIGHTSOURCE_BUTTONS_2 ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; }; ImageButton BTN_LIGHT_6 { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_6"; Pos = MAP_APPFONT ( POS_X_0+1*BUTTON_DISTANCE , POS_Y_LIGHTSOURCE_BUTTONS_2 ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; }; ImageButton BTN_LIGHT_7 { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_7"; Pos = MAP_APPFONT ( POS_X_0+2*BUTTON_DISTANCE , POS_Y_LIGHTSOURCE_BUTTONS_2 ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; }; ImageButton BTN_LIGHT_8 { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_8"; Pos = MAP_APPFONT ( POS_X_0+3*BUTTON_DISTANCE , POS_Y_LIGHTSOURCE_BUTTONS_2 ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; }; ListBox LB_LIGHTSOURCE { + HelpID = "chart2:ListBox:TP_3D_SCENEILLUMINATION:LB_LIGHTSOURCE"; Border = TRUE ; Pos = MAP_APPFONT ( POS_X_0 , POS_Y_LIGHTSOURCE ) ; Size = MAP_APPFONT ( WIDTH_LB , HEIGHT_LB ) ; @@ -120,6 +130,7 @@ TabPage TP_3D_SCENEILLUMINATION }; ImageButton BTN_LIGHTSOURCE_COLOR { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHTSOURCE_COLOR"; Pos = MAP_APPFONT ( POS_X_1 , POS_Y_LIGHTSOURCE ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; TabStop = TRUE ; @@ -136,6 +147,7 @@ TabPage TP_3D_SCENEILLUMINATION }; ListBox LB_AMBIENTLIGHT { + HelpID = "chart2:ListBox:TP_3D_SCENEILLUMINATION:LB_AMBIENTLIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( POS_X_0 , POS_Y_AMBIENT ) ; Size = MAP_APPFONT ( WIDTH_LB , HEIGHT_LB ) ; @@ -144,6 +156,7 @@ TabPage TP_3D_SCENEILLUMINATION }; ImageButton BTN_AMBIENT_COLOR { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_AMBIENT_COLOR"; Pos = MAP_APPFONT ( POS_X_1 , POS_Y_AMBIENT ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; TabStop = TRUE ; diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.src b/chart2/source/controller/dialogs/tp_AxisLabel.src index bcba1926c242..75da7dc5e653 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.src +++ b/chart2/source/controller/dialogs/tp_AxisLabel.src @@ -35,6 +35,7 @@ TabPage TP_AXIS_LABEL CheckBox CB_AXIS_LABEL_SCHOW_DESCR { + HelpID = "chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_SCHOW_DESCR"; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 248 , 12 ) ; @@ -112,6 +113,7 @@ TabPage TP_AXIS_LABEL }; CheckBox CB_AXIS_LABEL_TEXTOVERLAP { + HelpID = "chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTOVERLAP"; Pos = MAP_APPFONT ( 139 , 33 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; TabStop = TRUE ; @@ -120,6 +122,7 @@ TabPage TP_AXIS_LABEL }; CheckBox CB_AXIS_LABEL_TEXTBREAK { + HelpID = "chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTBREAK"; Pos = MAP_APPFONT ( 139 , 47 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; TabStop = TRUE ; @@ -137,6 +140,7 @@ TabPage TP_AXIS_LABEL }; RadioButton RB_AXIS_LABEL_SIDEBYSIDE { + HelpID = "chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_SIDEBYSIDE"; Pos = MAP_APPFONT ( 12 , 33 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; TabStop = TRUE ; @@ -145,6 +149,7 @@ TabPage TP_AXIS_LABEL }; RadioButton RB_AXIS_LABEL_UPDOWN { + HelpID = "chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_UPDOWN"; Pos = MAP_APPFONT ( 12 , 47 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; TabStop = TRUE ; @@ -153,6 +158,7 @@ TabPage TP_AXIS_LABEL }; RadioButton RB_AXIS_LABEL_DOWNUP { + HelpID = "chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_DOWNUP"; Pos = MAP_APPFONT ( 12 , 61 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; TabStop = TRUE ; @@ -161,6 +167,7 @@ TabPage TP_AXIS_LABEL }; RadioButton RB_AXIS_LABEL_AUTOORDER { + HelpID = "chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_AUTOORDER"; Pos = MAP_APPFONT ( 12 , 75 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; TabStop = TRUE ; @@ -176,6 +183,7 @@ TabPage TP_AXIS_LABEL }; ListBox LB_AXIS_TEXTDIR { + HelpID = "chart2:ListBox:TP_AXIS_LABEL:LB_AXIS_TEXTDIR"; Pos = MAP_APPFONT ( 78 , 154 ) ; Size = MAP_APPFONT ( 170 , 100 ) ; Border = TRUE; diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.src b/chart2/source/controller/dialogs/tp_AxisPositions.src index 8ce1ba39056a..1173b841354a 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.src +++ b/chart2/source/controller/dialogs/tp_AxisPositions.src @@ -60,6 +60,7 @@ TabPage TP_AXIS_POSITIONS { + HelpID = "chart2:TabPage:TP_AXIS_POSITIONS"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; @@ -79,6 +80,7 @@ TabPage TP_AXIS_POSITIONS }; ListBox LB_CROSSES_OTHER_AXIS_AT { + HelpID = "chart2:ListBox:TP_AXIS_POSITIONS:LB_CROSSES_OTHER_AXIS_AT"; Border = TRUE ; AutoHScroll = TRUE ; Pos = MAP_APPFONT ( X4 , Y1-2 ) ; @@ -98,6 +100,7 @@ TabPage TP_AXIS_POSITIONS }; SpinField EDT_CROSSES_OTHER_AXIS_AT { + HelpID = "chart2:SpinField:TP_AXIS_POSITIONS:EDT_CROSSES_OTHER_AXIS_AT"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( X5 , Y1-2 ) ; @@ -106,6 +109,7 @@ TabPage TP_AXIS_POSITIONS }; ComboBox EDT_CROSSES_OTHER_AXIS_AT_CATEGORY { + HelpID = "chart2:ComboBox:TP_AXIS_POSITIONS:EDT_CROSSES_OTHER_AXIS_AT_CATEGORY"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( X5 , Y1-2 ) ; @@ -116,6 +120,7 @@ TabPage TP_AXIS_POSITIONS CheckBox CB_AXIS_BETWEEN_CATEGORIES { + HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_AXIS_BETWEEN_CATEGORIES"; Hide = TRUE; Pos = MAP_APPFONT ( X2 , Y2 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; @@ -137,6 +142,7 @@ TabPage TP_AXIS_POSITIONS }; ListBox LB_PLACE_LABELS { + HelpID = "chart2:ListBox:TP_AXIS_POSITIONS:LB_PLACE_LABELS"; Border = TRUE ; AutoHScroll = TRUE ; Pos = MAP_APPFONT ( X4 , Y4-2 ) ; @@ -164,6 +170,7 @@ TabPage TP_AXIS_POSITIONS }; SpinField EDT_AXIS_LABEL_DISTANCE { + HelpID = "chart2:SpinField:TP_AXIS_POSITIONS:EDT_AXIS_LABEL_DISTANCE"; Hide = TRUE; Border = TRUE ; SVLook = TRUE ; @@ -186,12 +193,14 @@ TabPage TP_AXIS_POSITIONS }; CheckBox CB_TICKS_INNER { + HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_TICKS_INNER"; Pos = MAP_APPFONT ( XTICK_2 , Y7 ) ; Size = MAP_APPFONT ( TICKWIDTH , 10 ) ; Text [ en-US ] = "~Inner"; }; CheckBox CB_TICKS_OUTER { + HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_TICKS_OUTER"; Pos = MAP_APPFONT ( XTICK_3 , Y7 ) ; Size = MAP_APPFONT ( TICKWIDTH , 10 ) ; Text [ en-US ] = "~Outer"; @@ -205,12 +214,14 @@ TabPage TP_AXIS_POSITIONS }; CheckBox CB_MINOR_INNER { + HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_INNER"; Pos = MAP_APPFONT ( XTICK_2 , Y8 ); Size = MAP_APPFONT ( TICKWIDTH , 10 ) ; Text [ en-US ] = "I~nner"; }; CheckBox CB_MINOR_OUTER { + HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_OUTER"; Pos = MAP_APPFONT ( XTICK_3 , Y8 ) ; Size = MAP_APPFONT ( TICKWIDTH , 10 ) ; Text [ en-US ] = "O~uter"; @@ -232,6 +243,7 @@ TabPage TP_AXIS_POSITIONS }; ListBox LB_PLACE_TICKS { + HelpID = "chart2:ListBox:TP_AXIS_POSITIONS:LB_PLACE_TICKS"; Border = TRUE ; AutoHScroll = TRUE ; Pos = MAP_APPFONT ( X3 , Y9-2 ) ; @@ -259,6 +271,7 @@ TabPage TP_AXIS_POSITIONS }; CheckBox CB_MAJOR_GRID { + HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_MAJOR_GRID"; Hide = TRUE ; Pos = MAP_APPFONT ( X2 , Y11 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; @@ -267,6 +280,7 @@ TabPage TP_AXIS_POSITIONS }; PushButton PB_MAJOR_GRID { + HelpID = "chart2:PushButton:TP_AXIS_POSITIONS:PB_MAJOR_GRID"; Hide = TRUE ; TabStop = TRUE; Pos = MAP_APPFONT ( X3 , Y11-2 ); @@ -275,6 +289,7 @@ TabPage TP_AXIS_POSITIONS }; CheckBox CB_MINOR_GRID { + HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_GRID"; Hide = TRUE ; Pos = MAP_APPFONT ( X2 , Y12 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; @@ -283,6 +298,7 @@ TabPage TP_AXIS_POSITIONS }; PushButton PB_MINOR_GRID { + HelpID = "chart2:PushButton:TP_AXIS_POSITIONS:PB_MINOR_GRID"; Hide = TRUE ; TabStop = TRUE; Pos = MAP_APPFONT ( X3 , Y12-2 ); diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 1696fcdc17c2..ec6c1d2a1c10 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -853,15 +853,35 @@ ChartTypeTabPage::ChartTypeTabPage( Window* pParent bool bIsHighContrast = ( true && GetSettings().GetStyleSettings().GetHighContrastMode() ); + bool bDisableComplexChartTypes = false; + uno::Reference< beans::XPropertySet > xProps( m_xChartModel, uno::UNO_QUERY ); + if ( xProps.is() ) + { + try + { + xProps->getPropertyValue( C2U( "DisableComplexChartTypes" ) ) >>= bDisableComplexChartTypes; + } + catch( uno::Exception& e ) + { + ASSERT_EXCEPTION( e ); + } + } + m_aChartTypeDialogControllerList.push_back(new ColumnChartDialogController() ); m_aChartTypeDialogControllerList.push_back(new BarChartDialogController() ); m_aChartTypeDialogControllerList.push_back(new PieChartDialogController() ); m_aChartTypeDialogControllerList.push_back(new AreaChartDialogController() ); m_aChartTypeDialogControllerList.push_back(new LineChartDialogController() ); - m_aChartTypeDialogControllerList.push_back(new XYChartDialogController() ); - m_aChartTypeDialogControllerList.push_back(new BubbleChartDialogController() ); + if ( !bDisableComplexChartTypes ) + { + m_aChartTypeDialogControllerList.push_back(new XYChartDialogController() ); + m_aChartTypeDialogControllerList.push_back(new BubbleChartDialogController() ); + } m_aChartTypeDialogControllerList.push_back(new NetChartDialogController() ); - m_aChartTypeDialogControllerList.push_back(new StockChartDialogController() ); + if ( !bDisableComplexChartTypes ) + { + m_aChartTypeDialogControllerList.push_back(new StockChartDialogController() ); + } m_aChartTypeDialogControllerList.push_back(new CombiColumnLineChartDialogController() ); ::std::vector< ChartTypeDialogController* >::const_iterator aIter = m_aChartTypeDialogControllerList.begin(); diff --git a/chart2/source/controller/dialogs/tp_ChartType.src b/chart2/source/controller/dialogs/tp_ChartType.src index a9bb2a039f3c..69c33cd14021 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.src +++ b/chart2/source/controller/dialogs/tp_ChartType.src @@ -69,7 +69,7 @@ TabPage TP_CHARTTYPE { Hide = TRUE ; - HelpID = SID_DIAGRAM_TYPE; + HelpID = HID_DIAGRAM_TYPE; SVLook = TRUE ; Size = MAP_APPFONT ( CHART_WIZARD_PAGEWIDTH , CHART_WIZARD_PAGEHEIGHT ) ; @@ -99,18 +99,21 @@ TabPage TP_CHARTTYPE CheckBox CB_X_AXIS_CATEGORIES { + HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_X_AXIS_CATEGORIES"; Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_VALUE_X_AXIS ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text [ en-US ] = "X axis with Categories" ; }; CheckBox CB_3D_LOOK { + HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_3D_LOOK"; Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_3D_LOOK ) ; Size = MAP_APPFONT ( WIDTH_3D , 10 ) ; Text [ en-US ] = "~3D Look" ; }; ListBox LB_3D_SCHEME { + HelpID = "chart2:ListBox:TP_CHARTTYPE:LB_3D_SCHEME"; Border = TRUE; TabStop = TRUE; DropDown = TRUE; @@ -120,12 +123,14 @@ TabPage TP_CHARTTYPE CheckBox CB_STACKED { + HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_STACKED"; Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_STACKING ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text [ en-US ] = "~Stack series" ; }; RadioButton RB_STACK_Y { + HelpID = "chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Y"; Pos = MAP_APPFONT ( POS_X_IMAGELIST+RSC_SP_CHK_TEXTINDENT, POS_Y_STACKING+12 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -135,6 +140,7 @@ TabPage TP_CHARTTYPE }; RadioButton RB_STACK_Y_PERCENT { + HelpID = "chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Y_PERCENT"; Pos = MAP_APPFONT ( POS_X_IMAGELIST+RSC_SP_CHK_TEXTINDENT, POS_Y_STACKING+2*12 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -142,6 +148,7 @@ TabPage TP_CHARTTYPE }; RadioButton RB_STACK_Z { + HelpID = "chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Z"; Pos = MAP_APPFONT ( POS_X_IMAGELIST+RSC_SP_CHK_TEXTINDENT, POS_Y_STACKING+3*12 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -152,6 +159,7 @@ TabPage TP_CHARTTYPE CheckBox CB_SPLINES { + HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_SPLINES"; Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_SPLINES ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text [ en-US ] = "S~mooth lines" ; @@ -159,6 +167,7 @@ TabPage TP_CHARTTYPE PushButton PB_SPLINE_DIALOG { + HelpID = "chart2:PushButton:TP_CHARTTYPE:PB_SPLINE_DIALOG"; TabStop = TRUE ; Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_SPLINES-6 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; @@ -167,6 +176,7 @@ TabPage TP_CHARTTYPE CheckBox CB_XVALUE_SORTING { + HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_XVALUE_SORTING"; TabStop = TRUE ; Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_XVALUE_SORTING ) ; Size = MAP_APPFONT ( WIDTH_XVALUE_SORTING , 10 ) ; @@ -185,6 +195,7 @@ ModalDialog DLG_SPLINE_PROPERTIES Closeable = TRUE; RadioButton RB_SPLINES_CUBIC { + HelpID = "chart2:RadioButton:DLG_SPLINE_PROPERTIES:RB_SPLINES_CUBIC"; Pos = MAP_APPFONT ( POS_X_SPLINES_1, POS_Y_SPLINES_2 ) ; Size = MAP_APPFONT ( SPLINES_WIDTH_RADIO , 10 ) ; TabStop = TRUE ; @@ -192,6 +203,7 @@ ModalDialog DLG_SPLINE_PROPERTIES }; RadioButton RB_SPLINES_B { + HelpID = "chart2:RadioButton:DLG_SPLINE_PROPERTIES:RB_SPLINES_B"; Pos = MAP_APPFONT ( POS_X_SPLINES_1, POS_Y_SPLINES_3 ) ; Size = MAP_APPFONT ( SPLINES_WIDTH_RADIO , 10 ) ; TabStop = TRUE ; @@ -213,6 +225,7 @@ ModalDialog DLG_SPLINE_PROPERTIES }; MetricField MF_SPLINE_RESOLUTION { + HelpID = "chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_RESOLUTION"; Border = TRUE ; Pos = MAP_APPFONT ( POS_X_SPLINE_EXTRAS+SPLINES_WIDTH_METRIC_TEXT+RSC_SP_FLGR_SPACE_X , POS_Y_SPLINES_2-2 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; @@ -236,6 +249,7 @@ ModalDialog DLG_SPLINE_PROPERTIES }; MetricField MF_SPLINE_ORDER { + HelpID = "chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_ORDER"; Border = TRUE ; Pos = MAP_APPFONT ( POS_X_SPLINE_EXTRAS+SPLINES_WIDTH_METRIC_TEXT+RSC_SP_FLGR_SPACE_X , POS_Y_SPLINES_3-2 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; diff --git a/chart2/source/controller/dialogs/tp_DataSource.src b/chart2/source/controller/dialogs/tp_DataSource.src index 3e1f8a51c68a..9173a9c709ab 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.src +++ b/chart2/source/controller/dialogs/tp_DataSource.src @@ -29,6 +29,7 @@ TabPage TP_DATA_SOURCE { + HelpID = "chart2:TabPage:TP_DATA_SOURCE"; Hide = TRUE; Size = MAP_APPFONT ( 248, 140 ); SVLook = TRUE ; @@ -86,6 +87,7 @@ TabPage TP_DATA_SOURCE }; Edit EDT_RANGE { + HelpID = "chart2:Edit:TP_DATA_SOURCE:EDT_RANGE"; Border = TRUE; TabStop = TRUE; Pos = MAP_APPFONT ( 82 , 89 ); @@ -93,6 +95,7 @@ TabPage TP_DATA_SOURCE }; ImageButton IMB_RANGE_MAIN { + HelpID = "chart2:ImageButton:TP_DATA_SOURCE:IMB_RANGE_MAIN"; TabStop = TRUE; Pos = MAP_APPFONT ( 228 , 88 ); Size = MAP_APPFONT ( 14 , 14 ); @@ -118,6 +121,7 @@ TabPage TP_DATA_SOURCE Edit EDT_CATEGORIES { + HelpID = "chart2:Edit:TP_DATA_SOURCE:EDT_CATEGORIES"; Border = TRUE; TabStop = TRUE; Pos = MAP_APPFONT ( 82 , 117 ); @@ -125,6 +129,7 @@ TabPage TP_DATA_SOURCE }; ImageButton IMB_RANGE_CAT { + HelpID = "chart2:ImageButton:TP_DATA_SOURCE:IMB_RANGE_CAT"; TabStop = TRUE; Pos = MAP_APPFONT ( 228 , 116 ); Size = MAP_APPFONT ( 14 , 14 ); @@ -134,6 +139,7 @@ TabPage TP_DATA_SOURCE PushButton BTN_ADD { + HelpID = "chart2:PushButton:TP_DATA_SOURCE:BTN_ADD"; TabStop = TRUE; Disable = FALSE; Pos = MAP_APPFONT ( 6 , 105 ); @@ -143,6 +149,7 @@ TabPage TP_DATA_SOURCE }; PushButton BTN_REMOVE { + HelpID = "chart2:PushButton:TP_DATA_SOURCE:BTN_REMOVE"; TabStop = TRUE; Disable = TRUE; Pos = MAP_APPFONT ( 6 , 121 ); @@ -154,6 +161,7 @@ TabPage TP_DATA_SOURCE // Note: Text is only a black triangle symbol PushButton BTN_UP { + HelpID = "chart2:PushButton:TP_DATA_SOURCE:BTN_UP"; TabStop = TRUE; Disable = TRUE; Pos = MAP_APPFONT ( 64 , 105 ); @@ -163,6 +171,7 @@ TabPage TP_DATA_SOURCE // Note: Text is only a black triangle symbol PushButton BTN_DOWN { + HelpID = "chart2:PushButton:TP_DATA_SOURCE:BTN_DOWN"; TabStop = TRUE; Disable = TRUE; Pos = MAP_APPFONT ( 64 , 121 ); diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.src b/chart2/source/controller/dialogs/tp_ErrorBars.src index 03748914255f..b649cb4474c9 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.src +++ b/chart2/source/controller/dialogs/tp_ErrorBars.src @@ -30,8 +30,8 @@ TabPage TP_YERRORBAR { + HelpID = "chart2:TabPage:TP_YERRORBAR"; Hide = TRUE ; -// HelpID = HID_SCH_STAT ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; RESOURCE_ERRORBARS( 260 - 12, 0 ) diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.src b/chart2/source/controller/dialogs/tp_LegendPosition.src index d910a5143293..1ac64330108a 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.src +++ b/chart2/source/controller/dialogs/tp_LegendPosition.src @@ -56,6 +56,7 @@ TabPage TP_LEGEND_POS }; ListBox LB_LEGEND_TEXTDIR { + HelpID = "chart2:ListBox:TP_LEGEND_POS:LB_LEGEND_TEXTDIR"; Pos = MAP_APPFONT ( 78 , 14 + RESOURCE_LEGENDPOSITION_HEIGHT + 17 ) ; Size = MAP_APPFONT ( 170 , 100 ) ; Border = TRUE; diff --git a/chart2/source/controller/dialogs/tp_Location.src b/chart2/source/controller/dialogs/tp_Location.src index 6a921103f2e4..be0033d436dd 100644 --- a/chart2/source/controller/dialogs/tp_Location.src +++ b/chart2/source/controller/dialogs/tp_Location.src @@ -45,6 +45,7 @@ TabPage TP_LOCATION { + HelpID = "chart2:TabPage:TP_LOCATION"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( CHART_WIZARD_PAGEWIDTH , CHART_WIZARD_PAGEHEIGHT ) ; @@ -65,6 +66,7 @@ TabPage TP_LOCATION }; ListBox LB_TABLE { + HelpID = "chart2:ListBox:TP_LOCATION:LB_TABLE"; Border = TRUE ; DropDown = TRUE ; Pos = MAP_APPFONT ( WIZ_POSX3 , WIZ_POSY2 ) ; diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.src b/chart2/source/controller/dialogs/tp_PointGeometry.src index 54c591c0865d..b6862cba3b77 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.src +++ b/chart2/source/controller/dialogs/tp_PointGeometry.src @@ -29,8 +29,8 @@ TabPage TP_LAYOUT { + HelpID = "chart2:TabPage:TP_LAYOUT"; Hide = TRUE ; -// HelpID = HID_LAYOUT ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; }; diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.src b/chart2/source/controller/dialogs/tp_PolarOptions.src index 237fa027b55f..96463a97341b 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.src +++ b/chart2/source/controller/dialogs/tp_PolarOptions.src @@ -30,12 +30,14 @@ TabPage TP_POLAROPTIONS { + HelpID = "chart2:TabPage:TP_POLAROPTIONS"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; CheckBox CB_CLOCKWISE { + HelpID = "chart2:CheckBox:TP_POLAROPTIONS:CB_CLOCKWISE"; Pos = MAP_APPFONT ( 12 , 8 ); Size = MAP_APPFONT ( 248 , 10 ); TabStop = TRUE; @@ -61,6 +63,7 @@ TabPage TP_POLAROPTIONS }; NumericField NF_STARTING_ANGLE { + HelpID = "chart2:NumericField:TP_POLAROPTIONS:NF_STARTING_ANGLE"; Pos = MAP_APPFONT ( 61 , 53 ) ; Size = MAP_APPFONT ( 28 , 12 ) ; Border = TRUE ; @@ -79,6 +82,7 @@ TabPage TP_POLAROPTIONS }; CheckBox CB_INCLUDE_HIDDEN_CELLS_POLAR { + HelpID = "chart2:CheckBox:TP_POLAROPTIONS:CB_INCLUDE_HIDDEN_CELLS_POLAR"; Pos = MAP_APPFONT ( 12 , 104 ) ; Size = MAP_APPFONT ( 200 , 10 ) ; TabStop = TRUE ; diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.src b/chart2/source/controller/dialogs/tp_RangeChooser.src index de07c9763b7d..962722b41c71 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.src +++ b/chart2/source/controller/dialogs/tp_RangeChooser.src @@ -37,6 +37,7 @@ TabPage TP_RANGECHOOSER { + HelpID = "chart2:TabPage:TP_RANGECHOOSER"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 248, 140 ) ; @@ -55,18 +56,21 @@ TabPage TP_RANGECHOOSER }; Edit ED_RANGE { + HelpID = "chart2:Edit:TP_RANGECHOOSER:ED_RANGE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 32 ) ; Size = MAP_APPFONT ( 220 , 12 ) ; }; ImageButton IB_RANGE { + HelpID = "chart2:ImageButton:TP_RANGECHOOSER:IB_RANGE"; Pos = MAP_APPFONT ( 228 , 31 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = FALSE ; }; RadioButton RB_DATAROWS { + HelpID = "chart2:RadioButton:TP_RANGECHOOSER:RB_DATAROWS"; Pos = MAP_APPFONT ( 6 , 52 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; @@ -74,6 +78,7 @@ TabPage TP_RANGECHOOSER }; RadioButton RB_DATACOLS { + HelpID = "chart2:RadioButton:TP_RANGECHOOSER:RB_DATACOLS"; Pos = MAP_APPFONT ( 6 , 66 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; @@ -81,12 +86,14 @@ TabPage TP_RANGECHOOSER }; CheckBox CB_FIRST_ROW_ASLABELS { + HelpID = "chart2:CheckBox:TP_RANGECHOOSER:CB_FIRST_ROW_ASLABELS"; Pos = MAP_APPFONT ( 6 , 84 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; Text [ en-US ] = "~First row as label" ; }; CheckBox CB_FIRST_COLUMN_ASLABELS { + HelpID = "chart2:CheckBox:TP_RANGECHOOSER:CB_FIRST_COLUMN_ASLABELS"; Pos = MAP_APPFONT ( 6 , 98 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; Text [ en-US ] = "F~irst column as label" ; diff --git a/chart2/source/controller/dialogs/tp_Scale.src b/chart2/source/controller/dialogs/tp_Scale.src index b53adeaa512f..9e92e70f6f43 100644 --- a/chart2/source/controller/dialogs/tp_Scale.src +++ b/chart2/source/controller/dialogs/tp_Scale.src @@ -46,6 +46,7 @@ TabPage TP_SCALE { + HelpID = "chart2:TabPage:TP_SCALE"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; @@ -64,6 +65,7 @@ TabPage TP_SCALE }; SpinField EDT_MIN { + HelpID = "chart2:SpinField:TP_SCALE:EDT_MIN"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( X3 , Y1-2 ) ; @@ -72,6 +74,7 @@ TabPage TP_SCALE }; CheckBox CBX_AUTO_MIN { + HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_MIN"; Pos = MAP_APPFONT ( X4 , Y1-1 ) ; Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ; TabStop = TRUE ; @@ -86,6 +89,7 @@ TabPage TP_SCALE }; SpinField EDT_MAX { + HelpID = "chart2:SpinField:TP_SCALE:EDT_MAX"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( X3 , Y2-2 ) ; @@ -94,6 +98,7 @@ TabPage TP_SCALE }; CheckBox CBX_AUTO_MAX { + HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_MAX"; Pos = MAP_APPFONT ( X4 , Y2-1 ) ; Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ; TabStop = TRUE ; @@ -107,6 +112,7 @@ TabPage TP_SCALE }; SpinField EDT_STEP_MAIN { + HelpID = "chart2:SpinField:TP_SCALE:EDT_STEP_MAIN"; Border = TRUE ; Pos = MAP_APPFONT ( X3 , Y3-2 ) ; Size = MAP_APPFONT ( EDITWIDTH , 12 ) ; @@ -114,6 +120,7 @@ TabPage TP_SCALE }; CheckBox CBX_AUTO_STEP_MAIN { + HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_MAIN"; Pos = MAP_APPFONT ( X4 , Y3-1 ) ; Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ; TabStop = TRUE ; @@ -127,6 +134,7 @@ TabPage TP_SCALE }; MetricField MT_STEPHELP { + HelpID = "chart2:MetricField:TP_SCALE:MT_STEPHELP"; Border = TRUE ; Pos = MAP_APPFONT ( X3 , Y4-2 ) ; Size = MAP_APPFONT ( EDITWIDTH , 12 ) ; @@ -143,6 +151,7 @@ TabPage TP_SCALE }; CheckBox CBX_AUTO_STEP_HELP { + HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_HELP"; Pos = MAP_APPFONT ( X4 , Y4-1 ) ; Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ; TabStop = TRUE ; @@ -157,6 +166,7 @@ TabPage TP_SCALE }; SpinField EDT_ORIGIN { + HelpID = "chart2:SpinField:TP_SCALE:EDT_ORIGIN"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( X3 , Y5-2 ) ; @@ -165,6 +175,7 @@ TabPage TP_SCALE }; CheckBox CBX_AUTO_ORIGIN { + HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_ORIGIN"; Pos = MAP_APPFONT ( X4 , Y5-1 ) ; Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ; TabStop = TRUE ; @@ -173,6 +184,7 @@ TabPage TP_SCALE CheckBox CBX_LOGARITHM { + HelpID = "chart2:CheckBox:TP_SCALE:CBX_LOGARITHM"; Pos = MAP_APPFONT ( X2 , Y6 ) ; Size = MAP_APPFONT ( 244 , 10 ) ; TabStop = TRUE ; @@ -181,6 +193,7 @@ TabPage TP_SCALE CheckBox CBX_REVERSE { + HelpID = "chart2:CheckBox:TP_SCALE:CBX_REVERSE"; Pos = MAP_APPFONT ( X2 , Y7 ) ; Size = MAP_APPFONT ( 244 , 10 ) ; TabStop = TRUE ; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.src b/chart2/source/controller/dialogs/tp_SeriesToAxis.src index bc434be7ef07..844c81bd2e64 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.src +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.src @@ -29,8 +29,8 @@ TabPage TP_OPTIONS { + HelpID = "chart2:TabPage:TP_OPTIONS"; Hide = TRUE ; -// HelpID = HID_LAYOUT ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; FixedLine 1 @@ -41,6 +41,7 @@ TabPage TP_OPTIONS }; RadioButton RBT_OPT_AXIS_1 { + HelpID = "chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_1"; Pos = MAP_APPFONT ( 12 , 20 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -48,6 +49,7 @@ TabPage TP_OPTIONS }; RadioButton RBT_OPT_AXIS_2 { + HelpID = "chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_2"; Pos = MAP_APPFONT ( 12 , 34 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -69,6 +71,7 @@ TabPage TP_OPTIONS MetricField MT_OVERLAP { + HelpID = "chart2:MetricField:TP_OPTIONS:MT_OVERLAP"; Border = TRUE ; Pos = MAP_APPFONT ( 63 , 78 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -95,6 +98,7 @@ TabPage TP_OPTIONS MetricField MT_GAP { + HelpID = "chart2:MetricField:TP_OPTIONS:MT_GAP"; Border = TRUE ; Pos = MAP_APPFONT ( 63 , 62 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -114,6 +118,7 @@ TabPage TP_OPTIONS CheckBox CB_CONNECTOR { + HelpID = "chart2:CheckBox:TP_OPTIONS:CB_CONNECTOR"; Pos = MAP_APPFONT ( 12 , 97 ) ; Size = MAP_APPFONT ( 200 , 10 ) ; TabStop = TRUE ; @@ -122,6 +127,7 @@ TabPage TP_OPTIONS CheckBox CB_BARS_SIDE_BY_SIDE { + HelpID = "chart2:CheckBox:TP_OPTIONS:CB_BARS_SIDE_BY_SIDE"; Pos = MAP_APPFONT ( 12 , 97 ) ; Size = MAP_APPFONT ( 200 , 10 ) ; TabStop = TRUE ; @@ -144,6 +150,7 @@ TabPage TP_OPTIONS RadioButton RB_DONT_PAINT { + HelpID = "chart2:RadioButton:TP_OPTIONS:RB_DONT_PAINT"; Pos = MAP_APPFONT ( 82 , 127 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -152,6 +159,7 @@ TabPage TP_OPTIONS RadioButton RB_ASSUME_ZERO { + HelpID = "chart2:RadioButton:TP_OPTIONS:RB_ASSUME_ZERO"; Pos = MAP_APPFONT ( 82 , 141 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -160,6 +168,7 @@ TabPage TP_OPTIONS RadioButton RB_CONTINUE_LINE { + HelpID = "chart2:RadioButton:TP_OPTIONS:RB_CONTINUE_LINE"; Pos = MAP_APPFONT ( 82 , 155 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -168,6 +177,7 @@ TabPage TP_OPTIONS CheckBox CB_INCLUDE_HIDDEN_CELLS { + HelpID = "chart2:CheckBox:TP_OPTIONS:CB_INCLUDE_HIDDEN_CELLS"; Pos = MAP_APPFONT ( 12 , 172 ) ; Size = MAP_APPFONT ( 200 , 10 ) ; TabStop = TRUE ; diff --git a/chart2/source/controller/dialogs/tp_Trendline.src b/chart2/source/controller/dialogs/tp_Trendline.src index efa11d3e2d67..1a283844a8d1 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.src +++ b/chart2/source/controller/dialogs/tp_Trendline.src @@ -30,8 +30,8 @@ TabPage TP_TRENDLINE { + HelpID = "chart2:TabPage:TP_TRENDLINE"; Hide = TRUE ; -// HelpID = HID_SCH_STAT ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; RESOURCE_TRENDLINE( 260 - 12, 0 ) diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src index a17f5655e751..473007f1c32b 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src @@ -59,6 +59,7 @@ TabPage TP_WIZARD_TITLEANDOBJECTS { + HelpID = "chart2:TabPage:TP_WIZARD_TITLEANDOBJECTS"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( CHART_WIZARD_PAGEWIDTH , CHART_WIZARD_PAGEHEIGHT ) ; diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc index 1052b7ea962f..5e20b7980c8b 100644 --- a/chart2/source/controller/inc/HelpIds.hrc +++ b/chart2/source/controller/inc/HelpIds.hrc @@ -27,156 +27,136 @@ #ifndef CHART_HELPIDS_HRC #define CHART_HELPIDS_HRC -#include <svl/solar.hrc> -//next is 120 -//free: 20, 21, 22, 30, 31, 32, 33 +#define HID_SCH_ALIGNMENT "CHART2_HID_SCH_ALIGNMENT" +#define HID_SCH_LEGEND_POS "CHART2_HID_SCH_LEGEND_POS" +#define HID_SCH_DATA_DESCR "CHART2_HID_SCH_DATA_DESCR" -//see old chart: schhids.h +#define HID_SCH_STAT "CHART2_HID_SCH_STAT" +#define HID_SCH_WIN_DOCUMENT "CHART2_HID_SCH_WIN_DOCUMENT" +#define HID_SCH_CTL_DATA "CHART2_HID_SCH_CTL_DATA" -/* -#define HID_SCH_DATA_ROW (HID_SCH_START + 0) -#define HID_SCH_DATA_LINE (HID_SCH_START + 1) -#define HID_SCH_DATA_POINT (HID_SCH_START + 2) -#define HID_SCH_DIAGRAM_X_AXIS (HID_SCH_START + 3) -*/ -#define HID_SCH_ALIGNMENT (HID_SCH_START + 4) -#define HID_SCH_LEGEND_POS (HID_SCH_START + 5) -#define HID_SCH_DATA_DESCR (HID_SCH_START + 6) - -#define HID_SCH_STAT (HID_SCH_START + 8) -#define HID_SCH_WIN_DOCUMENT (HID_SCH_START + 9) -#define HID_SCH_CTL_DATA (HID_SCH_START + 10) - -#define HID_SCH_CT_INDICATE (HID_SCH_START + 11) -// #define HID_SCH_CT_REGRESS (HID_SCH_START + 12) +#define HID_SCH_CT_INDICATE "CHART2_HID_SCH_CT_INDICATE" //for chart type dialog: -#define HID_SCH_CTL_TYPE (HID_SCH_START + 13) -#define HID_SCH_CTL_VARIANT (HID_SCH_START + 14) -#define HID_SCH_NUM_OF_LINES (HID_SCH_START + 43) -#define HID_SCH_SERIES_LIST (HID_SCH_START + 15) -#define HID_SCH_DATA_RANGES_LIST (HID_SCH_START + 16) +#define HID_SCH_CTL_TYPE "CHART2_HID_SCH_CTL_TYPE" +#define HID_SCH_CTL_VARIANT "CHART2_HID_SCH_CTL_VARIANT" +#define HID_SCH_NUM_OF_LINES "CHART2_HID_SCH_NUM_OF_LINES" +#define HID_SCH_SERIES_LIST "CHART2_HID_SCH_SERIES_LIST" +#define HID_SCH_DATA_RANGES_LIST "CHART2_HID_SCH_DATA_RANGES_LIST" // -//#define HID_SCH_CTL_LIGHT (HID_SCH_START + 17) -//#define HID_SCH_CT_INDICATE2 (HID_SCH_START + 18) -//#define HID_SCH_CT_REGRESS2 (HID_SCH_START + 19) - -#define HID_SCH_TBI_DATA_INSERT_ROW (HID_SCH_START + 23) -#define HID_SCH_TBI_DATA_INSERT_COL (HID_SCH_START + 24) -#define HID_SCH_TBI_DATA_DELETE_ROW (HID_SCH_START + 25) -#define HID_SCH_TBI_DATA_DELETE_COL (HID_SCH_START + 26) -#define HID_SCH_TBI_DATA_SWAP_COL (HID_SCH_START + 27) -#define HID_SCH_TBI_DATA_SWAP_ROW (HID_SCH_START + 28) -#define HID_SCH_TBI_DATA_INSERT_TEXT_COL (HID_SCH_START + 29) -#define HID_SCH_TBX_DATA (HID_SCH_START + 34) - -#define HID_SCH_ALIGNMENT_CTR_DIAL (HID_SCH_START + 35) -#define HID_SCH_ALIGNMENT_STACKED (HID_SCH_START + 36) -#define HID_SCH_ALIGNMENT_DEGREES (HID_SCH_START + 37) -/* -#define HID_SCH_LAYOUT (HID_SCH_START + 38) - -#define HID_SCH_TBX_EDIT_FIELD (HID_SCH_START + 39) -#define HID_SCH_DIAGRAM_Y_AXIS (HID_SCH_START + 40)//war mal 3 - -#define HID_SCH_DEF_COLOR (HID_SCH_START + 41) -*/ -#define HID_SCH_TP_AXIS_LABEL (HID_SCH_START + 42) - -#define HID_SCH_CHART_AUTO_FORMAT (HID_SCH_START + 44) -#define HID_SCH_LB_BAR_GEOMETRY (HID_SCH_START + 45) -#define HID_SCH_DLG_SPLINE_PROPERTIES (HID_SCH_START + 46) -#define HID_SCH_DLG_RANGES (HID_SCH_START + 47) - -#define HID_SCH_CB_XAXIS (HID_SCH_START + 48) -#define HID_SCH_CB_YAXIS (HID_SCH_START + 49) -#define HID_SCH_CB_ZAXIS (HID_SCH_START + 50) -#define HID_SCH_CB_SECONDARY_XAXIS (HID_SCH_START + 51) -#define HID_SCH_CB_SECONDARY_YAXIS (HID_SCH_START + 52) -#define HID_SCH_CB_SECONDARY_ZAXIS (HID_SCH_START + 53) - -#define HID_SCH_CB_XGRID (HID_SCH_START + 54) -#define HID_SCH_CB_YGRID (HID_SCH_START + 55) -#define HID_SCH_CB_ZGRID (HID_SCH_START + 56) -#define HID_SCH_CB_SECONDARY_XGRID (HID_SCH_START + 57) -#define HID_SCH_CB_SECONDARY_YGRID (HID_SCH_START + 58) -#define HID_SCH_CB_SECONDARY_ZGRID (HID_SCH_START + 59) - -#define HID_SCH_LEGEND_POS_LEFT (HID_SCH_START + 60) -#define HID_SCH_LEGEND_POS_TOP (HID_SCH_START + 61) -#define HID_SCH_LEGEND_POS_RIGHT (HID_SCH_START + 62) -#define HID_SCH_LEGEND_POS_BOTTOM (HID_SCH_START + 63) - -#define HID_SCH_STATISTIK_MEANVALUE (HID_SCH_START + 64) -#define HID_SCH_STATISTIK_NO_ERROR (HID_SCH_START + 65) -#define HID_SCH_STATISTIK_VARIANT (HID_SCH_START + 66) -#define HID_SCH_STATISTIK_SIGMA (HID_SCH_START + 67) -#define HID_SCH_STATISTIK_PERCENT (HID_SCH_START + 68) -#define HID_SCH_STATISTIK_BIGERROR (HID_SCH_START + 69) -#define HID_SCH_STATISTIK_CONSTERROR (HID_SCH_START + 70) -#define HID_SCH_STATISTIK_PERCENT_VALUE (HID_SCH_START + 71) -#define HID_SCH_STATISTIK_BIGERROR_VALUE (HID_SCH_START + 72) -#define HID_SCH_STATISTIK_PLUS_VALUE (HID_SCH_START + 73) -#define HID_SCH_STATISTIK_MINUS_VALUE (HID_SCH_START + 74) - -#define HID_SCH_DATALABEL_VALUE (HID_SCH_START + 75) -#define HID_SCH_DATALABEL_NUMBER (HID_SCH_START + 76) -#define HID_SCH_DATALABEL_PERCENT (HID_SCH_START + 77) -#define HID_SCH_DATALABEL_TEXT (HID_SCH_START + 78) -#define HID_SCH_DATALABEL_SYMBOL (HID_SCH_START + 79) -#define HID_SCH_PB_NUMBERFORMAT (HID_SCH_START + 88) -#define HID_SCH_PB_PERCENT_NUMBERFORMAT (HID_SCH_START + 89) -#define HID_SCH_DATALABEL_SEPARATOR (HID_SCH_START + 90) -#define HID_SCH_DATALABEL_PLACEMENT (HID_SCH_START + 91) -#define HID_SCH_TEXTDIRECTION (HID_SCH_START + 115) -#define HID_SCH_TEXTDIRECTION_TITLE (HID_SCH_START + 116) -#define HID_SCH_TEXTDIRECTION_EQUATION (HID_SCH_START + 117) -#define HID_SCH_DATALABEL_ROTATION_KNOB (HID_SCH_START + 118) -#define HID_SCH_DATALABEL_ROTATION_EDIT (HID_SCH_START + 119) - -#define HID_SCH_TITLE_MAIN (HID_SCH_START + 80) -#define HID_SCH_TITLE_SUB (HID_SCH_START + 81) -#define HID_SCH_TITLE_X (HID_SCH_START + 82) -#define HID_SCH_TITLE_Y (HID_SCH_START + 83) -#define HID_SCH_TITLE_Z (HID_SCH_START + 84) -#define HID_SCH_TITLE_SECONDARY_X (HID_SCH_START + 92) -#define HID_SCH_TITLE_SECONDARY_Y (HID_SCH_START + 93) - -#define HID_SCH_WIZARD_ROADMAP (HID_SCH_START + 85) -#define HID_SCH_LEGEND_SHOW (HID_SCH_START + 86) -#define HID_SCH_DATA_SERIES_LABEL (HID_SCH_START + 87) - -#define HID_SCH_STARTING_ANGLE_DIAL (HID_SCH_START + 94) - -#define HID_SCH_TRENDLINE_RB_NONE (HID_SCH_START + 95) -#define HID_SCH_TRENDLINE_RB_LINEAR (HID_SCH_START + 96) -#define HID_SCH_TRENDLINE_RB_LOGARITHMIC (HID_SCH_START + 97) -#define HID_SCH_TRENDLINE_RB_EXPONENTIAL (HID_SCH_START + 98) -#define HID_SCH_TRENDLINE_RB_POWER (HID_SCH_START + 99) -#define HID_SCH_TRENDLINE_SHOW_EQUATION (HID_SCH_START + 100) -#define HID_SCH_TRENDLINE_SHOW_R_SQUARED (HID_SCH_START + 101) - -#define HID_SCH_STATISTIK_FUNCTION (HID_SCH_START + 102) -#define HID_SCH_STATISTIK_RANGE (HID_SCH_START + 103) -#define HID_SCH_STATISTIK_FUNCTION_LB (HID_SCH_START + 104) -#define HID_SCH_STATISTIK_POSITIVE_VALUE (HID_SCH_START + 105) -#define HID_SCH_STATISTIK_POSITIVE_RANGE (HID_SCH_START + 106) -#define HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER (HID_SCH_START + 107) -#define HID_SCH_STATISTIK_NEGATIVE_VALUE (HID_SCH_START + 108) -#define HID_SCH_STATISTIK_NEGATIVE_RANGE (HID_SCH_START + 109) -#define HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER (HID_SCH_START + 110) -#define HID_SCH_STATISTIK_SAME_FOR_BOTH (HID_SCH_START + 111) -#define HID_SCH_STATISTIK_SHOW_BOTH (HID_SCH_START + 112) -#define HID_SCH_STATISTIK_SHOW_POSITIVE (HID_SCH_START + 113) -#define HID_SCH_STATISTIK_SHOW_NEGATIVE (HID_SCH_START + 114) - - -// HID_SCH_START should be 63280 (checked 25.Nov 2002) - -// 453 == SCH_IF_CHARTVIEWSHELL, da SFX_INTERFACE_LIB kein -// Define sondern neuerdings ein Enum ist -//#define HID_SCH_VIEWSHELL_DOCUMENT (453) +#define HID_SCH_TBI_DATA_INSERT_ROW "CHART2_HID_SCH_TBI_DATA_INSERT_ROW" +#define HID_SCH_TBI_DATA_INSERT_COL "CHART2_HID_SCH_TBI_DATA_INSERT_COL" +#define HID_SCH_TBI_DATA_DELETE_ROW "CHART2_HID_SCH_TBI_DATA_DELETE_ROW" +#define HID_SCH_TBI_DATA_DELETE_COL "CHART2_HID_SCH_TBI_DATA_DELETE_COL" +#define HID_SCH_TBI_DATA_SWAP_COL "CHART2_HID_SCH_TBI_DATA_SWAP_COL" +#define HID_SCH_TBI_DATA_SWAP_ROW "CHART2_HID_SCH_TBI_DATA_SWAP_ROW" +#define HID_SCH_TBI_DATA_INSERT_TEXT_COL "CHART2_HID_SCH_TBI_DATA_INSERT_TEXT_COL" +#define HID_SCH_TBX_DATA "CHART2_HID_SCH_TBX_DATA" + +#define HID_SCH_ALIGNMENT_CTR_DIAL "CHART2_HID_SCH_ALIGNMENT_CTR_DIAL" +#define HID_SCH_ALIGNMENT_STACKED "CHART2_HID_SCH_ALIGNMENT_STACKED" +#define HID_SCH_ALIGNMENT_DEGREES "CHART2_HID_SCH_ALIGNMENT_DEGREES" + +#define HID_SCH_TP_AXIS_LABEL "CHART2_HID_SCH_TP_AXIS_LABEL" + +#define HID_SCH_CHART_AUTO_FORMAT "CHART2_HID_SCH_CHART_AUTO_FORMAT" +#define HID_SCH_LB_BAR_GEOMETRY "CHART2_HID_SCH_LB_BAR_GEOMETRY" +#define HID_SCH_DLG_SPLINE_PROPERTIES "CHART2_HID_SCH_DLG_SPLINE_PROPERTIES" +#define HID_SCH_DLG_RANGES "CHART2_HID_SCH_DLG_RANGES" + +#define HID_SCH_CB_XAXIS "CHART2_HID_SCH_CB_XAXIS" +#define HID_SCH_CB_YAXIS "CHART2_HID_SCH_CB_YAXIS" +#define HID_SCH_CB_ZAXIS "CHART2_HID_SCH_CB_ZAXIS" +#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" + +#define HID_SCH_CB_XGRID "CHART2_HID_SCH_CB_XGRID" +#define HID_SCH_CB_YGRID "CHART2_HID_SCH_CB_YGRID" +#define HID_SCH_CB_ZGRID "CHART2_HID_SCH_CB_ZGRID" +#define HID_SCH_CB_SECONDARY_XGRID "CHART2_HID_SCH_CB_SECONDARY_XGRID" +#define HID_SCH_CB_SECONDARY_YGRID "CHART2_HID_SCH_CB_SECONDARY_YGRID" +#define HID_SCH_CB_SECONDARY_ZGRID "CHART2_HID_SCH_CB_SECONDARY_ZGRID" + +#define HID_SCH_LEGEND_POS_LEFT "CHART2_HID_SCH_LEGEND_POS_LEFT" +#define HID_SCH_LEGEND_POS_TOP "CHART2_HID_SCH_LEGEND_POS_TOP" +#define HID_SCH_LEGEND_POS_RIGHT "CHART2_HID_SCH_LEGEND_POS_RIGHT" +#define HID_SCH_LEGEND_POS_BOTTOM "CHART2_HID_SCH_LEGEND_POS_BOTTOM" + +#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_NUMBER "CHART2_HID_SCH_DATALABEL_NUMBER" +#define HID_SCH_DATALABEL_PERCENT "CHART2_HID_SCH_DATALABEL_PERCENT" +#define HID_SCH_DATALABEL_TEXT "CHART2_HID_SCH_DATALABEL_TEXT" +#define HID_SCH_DATALABEL_SYMBOL "CHART2_HID_SCH_DATALABEL_SYMBOL" +#define HID_SCH_PB_NUMBERFORMAT "CHART2_HID_SCH_PB_NUMBERFORMAT" +#define HID_SCH_PB_PERCENT_NUMBERFORMAT "CHART2_HID_SCH_PB_PERCENT_NUMBERFORMAT" +#define HID_SCH_DATALABEL_SEPARATOR "CHART2_HID_SCH_DATALABEL_SEPARATOR" +#define HID_SCH_DATALABEL_PLACEMENT "CHART2_HID_SCH_DATALABEL_PLACEMENT" +#define HID_SCH_TEXTDIRECTION "CHART2_HID_SCH_TEXTDIRECTION" +#define HID_SCH_TEXTDIRECTION_TITLE "CHART2_HID_SCH_TEXTDIRECTION_TITLE" +#define HID_SCH_TEXTDIRECTION_EQUATION "CHART2_HID_SCH_TEXTDIRECTION_EQUATION" +#define HID_SCH_DATALABEL_ROTATION_KNOB "CHART2_HID_SCH_DATALABEL_ROTATION_KNOB" +#define HID_SCH_DATALABEL_ROTATION_EDIT "CHART2_HID_SCH_DATALABEL_ROTATION_EDIT" + +#define HID_SCH_TITLE_MAIN "CHART2_HID_SCH_TITLE_MAIN" +#define HID_SCH_TITLE_SUB "CHART2_HID_SCH_TITLE_SUB" +#define HID_SCH_TITLE_X "CHART2_HID_SCH_TITLE_X" +#define HID_SCH_TITLE_Y "CHART2_HID_SCH_TITLE_Y" +#define HID_SCH_TITLE_Z "CHART2_HID_SCH_TITLE_Z" +#define HID_SCH_TITLE_SECONDARY_X "CHART2_HID_SCH_TITLE_SECONDARY_X" +#define HID_SCH_TITLE_SECONDARY_Y "CHART2_HID_SCH_TITLE_SECONDARY_Y" + +#define HID_SCH_WIZARD_ROADMAP "CHART2_HID_SCH_WIZARD_ROADMAP" +#define HID_SCH_LEGEND_SHOW "CHART2_HID_SCH_LEGEND_SHOW" +#define HID_SCH_DATA_SERIES_LABEL "CHART2_HID_SCH_DATA_SERIES_LABEL" + +#define HID_SCH_STARTING_ANGLE_DIAL "CHART2_HID_SCH_STARTING_ANGLE_DIAL" + +#define HID_SCH_TRENDLINE_RB_NONE "CHART2_HID_SCH_TRENDLINE_RB_NONE" +#define HID_SCH_TRENDLINE_RB_LINEAR "CHART2_HID_SCH_TRENDLINE_RB_LINEAR" +#define HID_SCH_TRENDLINE_RB_LOGARITHMIC "CHART2_HID_SCH_TRENDLINE_RB_LOGARITHMIC" +#define HID_SCH_TRENDLINE_RB_EXPONENTIAL "CHART2_HID_SCH_TRENDLINE_RB_EXPONENTIAL" +#define HID_SCH_TRENDLINE_RB_POWER "CHART2_HID_SCH_TRENDLINE_RB_POWER" +#define HID_SCH_TRENDLINE_SHOW_EQUATION "CHART2_HID_SCH_TRENDLINE_SHOW_EQUATION" +#define HID_SCH_TRENDLINE_SHOW_R_SQUARED "CHART2_HID_SCH_TRENDLINE_SHOW_R_SQUARED" + +#define HID_SCH_STATISTIK_FUNCTION "CHART2_HID_SCH_STATISTIK_FUNCTION" +#define HID_SCH_STATISTIK_RANGE "CHART2_HID_SCH_STATISTIK_RANGE" +#define HID_SCH_STATISTIK_FUNCTION_LB "CHART2_HID_SCH_STATISTIK_FUNCTION_LB" +#define HID_SCH_STATISTIK_POSITIVE_VALUE "CHART2_HID_SCH_STATISTIK_POSITIVE_VALUE" +#define HID_SCH_STATISTIK_POSITIVE_RANGE "CHART2_HID_SCH_STATISTIK_POSITIVE_RANGE" +#define HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER "CHART2_HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER" +#define HID_SCH_STATISTIK_NEGATIVE_VALUE "CHART2_HID_SCH_STATISTIK_NEGATIVE_VALUE" +#define HID_SCH_STATISTIK_NEGATIVE_RANGE "CHART2_HID_SCH_STATISTIK_NEGATIVE_RANGE" +#define HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER "CHART2_HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER" +#define HID_SCH_STATISTIK_SAME_FOR_BOTH "CHART2_HID_SCH_STATISTIK_SAME_FOR_BOTH" +#define HID_SCH_STATISTIK_SHOW_BOTH "CHART2_HID_SCH_STATISTIK_SHOW_BOTH" +#define HID_SCH_STATISTIK_SHOW_POSITIVE "CHART2_HID_SCH_STATISTIK_SHOW_POSITIVE" +#define HID_SCH_STATISTIK_SHOW_NEGATIVE "CHART2_HID_SCH_STATISTIK_SHOW_NEGATIVE" + +#define HID_INSERT_GRIDS "CHART2_HID_INSERT_GRIDS" + +#define HID_DIAGRAM_TYPE "CHART2_HID_DIAGRAM_TYPE" +#define HID_3D_VIEW "CHART2_HID_3D_VIEW" +#define HID_DIAGRAM_DATA "CHART2_HID_DIAGRAM_DATA" +#define HID_INSERT_AXIS "CHART2_HID_INSERT_AXIS" +#define HID_INSERT_STATISTICS "CHART2_HID_INSERT_STATISTICS" +#define HID_INSERT_TITLE "CHART2_HID_INSERT_TITLE" +#define HID_INSERT_CHART_LEGEND "CHART2_HID_INSERT_CHART_LEGEND" +#define HID_INSERT_DESCRIPTION "CHART2_HID_INSERT_DESCRIPTION" #endif diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index 36bceaffce9f..0b5f33b5c128 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -135,6 +135,7 @@ private: m_apRangeSelectionHelper; Edit * m_pCurrentRangeChoosingField; bool m_bHasInternalDataProvider; + bool m_bDisableDataTableDialog; DECL_LINK( CategoryChosen, void * ); DECL_LINK( SynchronizePosAndNeg, void * ); diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index ffe752f43a7a..779e3c32f1e7 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -827,16 +827,14 @@ bool ChartController::executeDispatch_Delete() else { //remove additional shape - uno::Reference< drawing::XShape > xShape( m_aSelection.getSelectedAdditionalShape() ); - if( xShape.is() ) + impl_ClearSelection(); { - impl_ClearSelection(); + ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + if ( m_pDrawViewWrapper ) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex()); - if( m_pDrawViewWrapper ) - m_pDrawViewWrapper->UnmarkAll(); + m_pDrawViewWrapper->DeleteMarked(); + bReturn = true; } - bReturn = DrawModelWrapper::removeShape( xShape ); } } return bReturn; diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 240b615cf0f6..54add217fb76 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -59,7 +59,7 @@ ChartWindow::ChartWindow( WindowController* pWindowController, Window* pParent, , m_pWindowController( pWindowController ) , m_bInPaint(false) { - this->SetSmartHelpId( SmartId( HID_SCH_WIN_DOCUMENT ) ); + this->SetHelpId( HID_SCH_WIN_DOCUMENT ); this->SetMapMode( MapMode(MAP_100TH_MM) ); adjustHighContrastMode(); // chart does not depend on exact pixel painting => enable antialiased drawing diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index 2652aadfdb32..a01b80bfa22b 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -528,6 +528,23 @@ void ControllerCommandDispatch::updateCommandAvailability() bool bShapeContext = ( m_pChartController ? m_pChartController->isShapeContext() : false ); + bool bDisableDataTableDialog = false; + if ( m_xController.is() ) + { + Reference< beans::XPropertySet > xProps( m_xController->getModel(), uno::UNO_QUERY ); + if ( xProps.is() ) + { + try + { + xProps->getPropertyValue( C2U( "DisableDataTableDialog" ) ) >>= bDisableDataTableDialog; + } + catch( uno::Exception& e ) + { + ASSERT_EXCEPTION( e ); + } + } + } + // edit commands m_aCommandAvailability[ C2U(".uno:Cut")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bIsDeleteableObjectSelected; m_aCommandAvailability[ C2U(".uno:Copy")] = bControllerStateIsValid && m_apControllerState->bHasSelectedObject; @@ -595,7 +612,7 @@ void ControllerCommandDispatch::updateCommandAvailability() // depending on own data m_aCommandAvailability[ C2U(".uno:DataRanges")] = bIsWritable && bModelStateIsValid && (! m_apModelState->bHasOwnData); - m_aCommandAvailability[ C2U(".uno:DiagramData")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasOwnData; + m_aCommandAvailability[ C2U(".uno:DiagramData")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasOwnData && !bDisableDataTableDialog; // titles m_aCommandAvailability[ C2U(".uno:MainTitle")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainTitle; @@ -631,9 +648,9 @@ void ControllerCommandDispatch::updateCommandAvailability() // series arrangement m_aCommandAvailability[ C2U(".uno:Forward")] = ( bShapeContext ? isShapeControllerCommandAvailable( C2U( ".uno:Forward" ) ) : - ( bIsWritable && bControllerStateIsValid && m_apControllerState->bMayMoveSeriesForward ) ); + ( bIsWritable && bControllerStateIsValid && m_apControllerState->bMayMoveSeriesForward && !bDisableDataTableDialog ) ); m_aCommandAvailability[ C2U(".uno:Backward")] = ( bShapeContext ? isShapeControllerCommandAvailable( C2U( ".uno:Backward" ) ) : - ( bIsWritable && bControllerStateIsValid && m_apControllerState->bMayMoveSeriesBackward ) ); + ( bIsWritable && bControllerStateIsValid && m_apControllerState->bMayMoveSeriesBackward && !bDisableDataTableDialog ) ); m_aCommandAvailability[ C2U(".uno:InsertDataLabels")] = bIsWritable; m_aCommandAvailability[ C2U(".uno:InsertDataLabel")] = bIsWritable; diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx b/chart2/source/controller/main/_serviceregistration_controller.cxx index cf8f5525e624..0371f50f9996 100644 --- a/chart2/source/controller/main/_serviceregistration_controller.cxx +++ b/chart2/source/controller/main/_serviceregistration_controller.cxx @@ -108,13 +108,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey ) -{ - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, g_entries_chart2_controller ); -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/chart2/source/controller/makefile.mk b/chart2/source/controller/makefile.mk index b8a256181045..fbc888f38c3f 100644 --- a/chart2/source/controller/makefile.mk +++ b/chart2/source/controller/makefile.mk @@ -126,3 +126,11 @@ RESLIB1DEPN=$(RESLIB1LIST) # --- Targets ----------------------------------------------------------------- .INCLUDE: target.mk + +ALLTAR : $(MISC)/chartcontroller.component + +$(MISC)/chartcontroller.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt chartcontroller.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt chartcontroller.component |