diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:43 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:43 +0200 |
| commit | b4e4583b94e78d6e81ab07894cfc0e99cefa33c1 (patch) | |
| tree | 26e22c8ab20d2c38bc88dfcc041c8143e0609557 /chart2/source/controller/dialogs | |
| parent | 69bb367315288b644439dc46d34743a2575a3527 (diff) | |
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 8964ceb596c66db5e9677de1ad99f9747342b87b (tag: refs/tags/libreoffice-3.3.1.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Feb 8 18:07:42 2011 +0100
Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1)
commit 737b6a92adca9a8285370918671b93b56a028537
Author: Jan Holesovsky <kendy@suse.cz>
Date: Mon Feb 7 21:23:21 2011 +0100
Branch libreoffice-3-3-1
This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
commit d4d6a678bf169eebee2fe4d71c8ec66de6898d6e
Author: Jani Monoses <jani.monoses@canonical.com>
Date: Thu Jan 27 15:33:06 2011 +0200
Remove unused declaration
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
sc/source/core/tool/token.cxx | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
commit 96bee1507119ca0525845022019d90f0694996aa
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Thu Jan 20 23:44:52 2011 -0500
Fixed incorrect page number in page preview mode. (fdo#33155)
When the window is large enough to show several 'Page X' strings,
the page number was not properly incremented. This commit fixes
it.
sc/source/ui/view/gridwin4.cxx | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
commit ed46df1fcb5869818f5f74e0c7a5b19c65102e83
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Wed Jan 19 00:24:24 2011 -0500
Fixed incorrect import of cell attributes from Excel documents.
When a cell with non-default formatting attribute starts with non-first
row in a column, the filter would incorrectly apply the same format to
all the cells above it if they didn't have any formats. This commit
fixes it.
sc/source/filter/excel/xistyle.cxx | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
commit af63319fcdeea3f9b5018eab83ef5a9e64905446
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Thu Jan 13 11:18:07 2011 -0500
Reverting the merge commit 0fe55349b05fae496a86a3fa958d184f0453916c.
I created a patch between before and after the merge commit, and
reverse-applied it. This is because if you revert a merge commit
in git you are denying all future merges from that branch. I wasn't
sure if we really wanted that.
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sc/inc/document.hxx | 22 +------
sc/inc/drwlayer.hxx | 2 +-
sc/inc/table.hxx | 16 +-----
sc/source/core/data/document.cxx | 7 +--
sc/source/core/data/drwlayer.cxx | 6 +-
sc/source/core/data/table1.cxx | 38 ++++--------
sc/source/core/data/table2.cxx | 91 ++++++------------------------
sc/source/core/data/table3.cxx | 71 +----------------------
sc/source/filter/xml/xmlrowi.cxx | 17 +----
sc/source/ui/docshell/externalrefmgr.cxx | 7 +-
sc/source/ui/view/dbfunc.cxx | 5 +-
sc/source/ui/view/tabvwshe.cxx | 4 +-
12 files changed, 52 insertions(+), 234 deletions(-)
commit 5ada5635cff38af87830b091b36159cf80e4cf5d
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Thu Jan 13 11:04:14 2011 -0500
Revert "This is also part of the merge."
This reverts commit 0fe55349b05fae496a86a3fa958d184f0453916c.
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sc/source/core/data/table3.cxx | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit c900e3db767518b7a60eaf24bdf298c94315f685
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 23:05:56 2011 +0100
Please, ignore the previous message; it was for the libreoffice-3-3-0 branch
This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
Only safe changes, reviewed by anoter person are allowed.
If you want to build something cool, unstable, and risky, use master.
commit 15d298ba7c4e89b043b3077e17747ba027a62c43
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:39:06 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: calc_libreoffice-3.3.1.1
split repo tag: calc_libreoffice-3.3.1.2
Diffstat (limited to 'chart2/source/controller/dialogs')
170 files changed, 514 insertions, 514 deletions
diff --git a/chart2/source/controller/dialogs/Bitmaps.hrc b/chart2/source/controller/dialogs/Bitmaps.hrc index 6349a121ff28..8ccc2cf6a1fa 100644 --- a/chart2/source/controller/dialogs/Bitmaps.hrc +++ b/chart2/source/controller/dialogs/Bitmaps.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/Bitmaps.src b/chart2/source/controller/dialogs/Bitmaps.src index 3945090217e0..11f9d3879662 100644 --- a/chart2/source/controller/dialogs/Bitmaps.src +++ b/chart2/source/controller/dialogs/Bitmaps.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.hrc b/chart2/source/controller/dialogs/Bitmaps_HC.hrc index 16bffd0cf86d..232dc4a82a04 100644 --- a/chart2/source/controller/dialogs/Bitmaps_HC.hrc +++ b/chart2/source/controller/dialogs/Bitmaps_HC.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.src b/chart2/source/controller/dialogs/Bitmaps_HC.src index 738c133483e1..8c48d703b808 100644 --- a/chart2/source/controller/dialogs/Bitmaps_HC.src +++ b/chart2/source/controller/dialogs/Bitmaps_HC.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/ChangingResource.cxx b/chart2/source/controller/dialogs/ChangingResource.cxx index 0e60e798e196..adb712113d45 100644 --- a/chart2/source/controller/dialogs/ChangingResource.cxx +++ b/chart2/source/controller/dialogs/ChangingResource.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/ChangingResource.hxx b/chart2/source/controller/dialogs/ChangingResource.hxx index e9e122bf293a..c140468ee707 100644 --- a/chart2/source/controller/dialogs/ChangingResource.hxx +++ b/chart2/source/controller/dialogs/ChangingResource.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -53,7 +53,7 @@ public: virtual ~ChangingResource(); virtual void setChangeListener( ResourceChangeListener* pListener ); - + protected: ResourceChangeListener* m_pChangeListener; }; diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 60c2d87ec784..d7c99d88a536 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -180,7 +180,7 @@ ChartTypeParameter ChartTypeDialogController::getChartTypeParameterForService( //not all templates need to support CurveStyle, CurveResolution or SplineOrder ex.Context.is();//to have debug information without compilation warnings } - + try { xTemplateProps->getPropertyValue( C2U( "Geometry3D" )) >>= aRet.nGeometry3D; @@ -452,7 +452,7 @@ ColumnChartDialogController::~ColumnChartDialogController() } String ColumnChartDialogController::getName() { - return String( SchResId( STR_TYPE_COLUMN )); + return String( SchResId( STR_TYPE_COLUMN )); } Image ColumnChartDialogController::getImage( bool bIsHighContrast ) { @@ -529,7 +529,7 @@ BarChartDialogController::~BarChartDialogController() } String BarChartDialogController::getName() { - return String( SchResId( STR_TYPE_BAR )); + return String( SchResId( STR_TYPE_BAR )); } Image BarChartDialogController::getImage( bool bIsHighContrast ) { @@ -667,7 +667,7 @@ LineChartDialogController::~LineChartDialogController() } String LineChartDialogController::getName() { - return String( SchResId( STR_TYPE_LINE )); + return String( SchResId( STR_TYPE_LINE )); } Image LineChartDialogController::getImage( bool bIsHighContrast ) { @@ -735,7 +735,7 @@ void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bI rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_STACKED_SMOOTH ) ); } } - + rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) ); rSubTypeList.SetItemText( 2, String( SchResId( STR_POINTS_AND_LINES )) ); rSubTypeList.SetItemText( 3, String( SchResId( STR_LINES_ONLY )) ); @@ -779,7 +779,7 @@ void LineChartDialogController::adjustParameterToSubType( ChartTypeParameter& rP rParameter.bLines = false; break; } - + if(!rParameter.b3DLook && rParameter.eStackMode == GlobalStackMode_STACK_Z ) rParameter.eStackMode = GlobalStackMode_NONE; } @@ -800,7 +800,7 @@ XYChartDialogController::~XYChartDialogController() } String XYChartDialogController::getName() { - return String( SchResId( STR_TYPE_XY )); + return String( SchResId( STR_TYPE_XY )); } Image XYChartDialogController::getImage( bool bIsHighContrast ) { @@ -837,7 +837,7 @@ void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsH rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_XVALUES_SMOOTH ) ); rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_XVALUES_SMOOTH ) ); } - + rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) ); rSubTypeList.SetItemText( 2, String( SchResId( STR_POINTS_AND_LINES )) ); rSubTypeList.SetItemText( 3, String( SchResId( STR_LINES_ONLY )) ); @@ -887,7 +887,7 @@ AreaChartDialogController::~AreaChartDialogController() } String AreaChartDialogController::getName() { - return String( SchResId( STR_TYPE_AREA )); + return String( SchResId( STR_TYPE_AREA )); } Image AreaChartDialogController::getImage( bool bIsHighContrast ) { @@ -926,7 +926,7 @@ void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bI rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_AREAS_2D ) ); rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_AREAS_2D_3 ) ); } - + rSubTypeList.SetItemText( 1, String( SchResId( rParameter.b3DLook ? STR_DEEP : STR_NORMAL )) ); rSubTypeList.SetItemText( 2, String( SchResId( STR_STACKED )) ); rSubTypeList.SetItemText( 3, String( SchResId( STR_PERCENT )) ); @@ -970,7 +970,7 @@ NetChartDialogController::~NetChartDialogController() } String NetChartDialogController::getName() { - return String( SchResId( STR_TYPE_NET )); + return String( SchResId( STR_TYPE_NET )); } Image NetChartDialogController::getImage( bool bIsHighContrast ) { @@ -1006,7 +1006,7 @@ const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTempla void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ) { rSubTypeList.Clear(); - + if( GlobalStackMode_NONE == rParameter.eStackMode ) { rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_NET_SYMB ) ); @@ -1063,7 +1063,7 @@ StockChartDialogController::~StockChartDialogController() } String StockChartDialogController::getName() { - return String( SchResId( STR_TYPE_STOCK )); + return String( SchResId( STR_TYPE_STOCK )); } Image StockChartDialogController::getImage( bool bIsHighContrast ) { @@ -1114,7 +1114,7 @@ CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController() } String CombiColumnLineChartDialogController::getName() { - return String( SchResId( STR_TYPE_COMBI_COLUMN_LINE )); + return String( SchResId( STR_TYPE_COMBI_COLUMN_LINE )); } Image CombiColumnLineChartDialogController::getImage( bool bIsHighContrast ) { @@ -1169,7 +1169,7 @@ void CombiColumnLineChartDialogController::showExtraControls( Window* pParent, c m_pFT_NumberOfLines->SetPosPixel( Point( rPosition.X(), rPosition.Y()+aDistanceSize.Height()) ); m_pMF_NumberOfLines->SetPosPixel( Point( rPosition.X()+aFTSize.Width()+aDistanceSize.Width(), rPosition.Y()) ); - + m_pFT_NumberOfLines->Show(); m_pMF_NumberOfLines->Show(); } @@ -1254,7 +1254,7 @@ BubbleChartDialogController::~BubbleChartDialogController() } String BubbleChartDialogController::getName() { - return String( SchResId( STR_TYPE_BUBBLE )); + return String( SchResId( STR_TYPE_BUBBLE )); } Image BubbleChartDialogController::getImage( bool bIsHighContrast ) { diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index fea77c753291..64b684a8acff 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -67,7 +67,7 @@ class ChartTypeParameter public: ChartTypeParameter( sal_Int32 nSubTypeIndex, bool bXAxisWithValues=false , bool b3DLook=false, GlobalStackMode eStackMode=GlobalStackMode_NONE - , bool _bSymbols = true, bool _bLines = true + , bool _bSymbols = true, bool _bLines = true , ::com::sun::star::chart2::CurveStyle eCurveStyle = ::com::sun::star::chart2::CurveStyle_LINES ); ChartTypeParameter(); virtual ~ChartTypeParameter(); @@ -81,7 +81,7 @@ public: bool b3DLook; bool bSymbols; bool bLines; - + GlobalStackMode eStackMode; ::com::sun::star::chart2::CurveStyle eCurveStyle; @@ -101,7 +101,7 @@ class ChartTypeDialogController : public ChangingResource public: ChartTypeDialogController(); virtual ~ChartTypeDialogController(); - + virtual String getName()=0; virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const = 0; @@ -121,7 +121,7 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps=::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() ) const; virtual void setTemplateProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ) const throw (::com::sun::star::uno::RuntimeException); - + virtual bool isSubType( const rtl::OUString& rServiceName ); virtual ChartTypeParameter getChartTypeParameterForService( const rtl::OUString& rServiceName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ); @@ -145,10 +145,10 @@ class ColumnOrBarChartDialogController_Base : public ChartTypeDialogController public: ColumnOrBarChartDialogController_Base(); virtual ~ColumnOrBarChartDialogController_Base(); - + virtual bool shouldShow_3DLookControl() const; virtual bool shouldShow_GeometryControl() const; - + virtual void adjustSubTypeAndEnableControls( ChartTypeParameter& rParameter ); }; @@ -157,7 +157,7 @@ class ColumnChartDialogController : public ColumnOrBarChartDialogController_Base public: ColumnChartDialogController(); virtual ~ColumnChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; @@ -169,7 +169,7 @@ class BarChartDialogController : public ColumnOrBarChartDialogController_Base public: BarChartDialogController(); virtual ~BarChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; @@ -181,7 +181,7 @@ class PieChartDialogController : public ChartTypeDialogController public: PieChartDialogController(); virtual ~PieChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; @@ -196,14 +196,14 @@ class LineChartDialogController : public ChartTypeDialogController public: LineChartDialogController(); virtual ~LineChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); virtual void adjustParameterToMainType( ChartTypeParameter& rParameter ); - + virtual bool shouldShow_StackingControl() const; virtual bool shouldShow_DeepStackingControl() const; virtual bool shouldShow_SplineControl() const; @@ -214,13 +214,13 @@ class XYChartDialogController : public ChartTypeDialogController public: XYChartDialogController(); virtual ~XYChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); - + virtual bool shouldShow_SplineControl() const; virtual bool shouldShow_SortByXValuesResourceGroup() const; }; @@ -230,14 +230,14 @@ class AreaChartDialogController : public ChartTypeDialogController public: AreaChartDialogController(); virtual ~AreaChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); virtual void adjustParameterToMainType( ChartTypeParameter& rParameter ); - + virtual bool shouldShow_3DLookControl() const; }; @@ -246,13 +246,13 @@ class NetChartDialogController : public ChartTypeDialogController public: NetChartDialogController(); virtual ~NetChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); - + virtual bool shouldShow_StackingControl() const; }; @@ -261,7 +261,7 @@ class StockChartDialogController : public ChartTypeDialogController public: StockChartDialogController(); virtual ~StockChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; @@ -274,7 +274,7 @@ class CombiColumnLineChartDialogController : public ChartTypeDialogController public: CombiColumnLineChartDialogController(); virtual ~CombiColumnLineChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; @@ -286,10 +286,10 @@ public: virtual void fillExtraControls( const ChartTypeParameter& rParameter , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps=::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() ) const; - + virtual void setTemplateProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ) const throw (::com::sun::star::uno::RuntimeException); -private: +private: DECL_LINK( ChangeLineCountHdl, void* ); private: @@ -302,7 +302,7 @@ class BubbleChartDialogController : public ChartTypeDialogController public: BubbleChartDialogController(); virtual ~BubbleChartDialogController(); - + virtual String getName(); virtual Image getImage( bool bIsHighContrast ); virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; diff --git a/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx b/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx index 90509c3ee3f9..a37e6fb0c581 100644 --- a/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx +++ b/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/CommonResources.hrc b/chart2/source/controller/dialogs/CommonResources.hrc index 8a3ae8f9f63c..d594420464c1 100644 --- a/chart2/source/controller/dialogs/CommonResources.hrc +++ b/chart2/source/controller/dialogs/CommonResources.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 4c098c9e759e..700528473fd3 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -1222,7 +1222,7 @@ void DataBrowser::ColumnResized( USHORT nColId ) SetUpdateMode( bLastUpdateMode ); } -// virtual void MouseMove( const MouseEvent& rEvt ); +// virtual void MouseMove( const MouseEvent& rEvt ); void DataBrowser::EndScroll() { diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index 9eef4d8a7070..48f043bff00a 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -80,14 +80,14 @@ public: virtual ~DataBrowser(); /** GetCellText returns the text at the given position - @param nRow + @param nRow the number of the row - @param nColId + @param nColId the ID of the column @return the text out of the cell */ - virtual String GetCellText(long nRow, USHORT nColId) const; + virtual String GetCellText(long nRow, USHORT nColId) const; /** returns the number in the given cell. If a cell is empty or contains a string, the result will be Nan @@ -183,7 +183,7 @@ private: /// note: m_aTextEditField must precede this member! ::svt::CellControllerRef m_rTextEditController; - Link m_aCursorMovedHdlLink; + Link m_aCursorMovedHdlLink; Link m_aCellModifiedLink; void clearHeaders(); @@ -202,6 +202,6 @@ private: } // namespace chart -#endif // CHART_DATA_BROWSER_HXX +#endif // CHART_DATA_BROWSER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx index 8bfab0867de3..a96d6f2f2729 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.cxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -870,7 +870,7 @@ void DataBrowserModel::updateFromModel() } else if( aRole.equals( C2U( "values-x" ) ) ) nSequenceNumberFormatKey = nXAxisNumberFormat; - + if( ::std::find_if( aSharedSequences.begin(), aSharedSequences.end(), lcl_RepresentationsOfLSeqMatch( aLSeqs[nSeqIdx] )) == aSharedSequences.end()) { diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx index 58d64be83a80..0a424763e95f 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.hxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index f06ef9efe501..021817a960b8 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx index 3f79356e8675..863ead724bcb 100644 --- a/chart2/source/controller/dialogs/DialogModel.hxx +++ b/chart2/source/controller/dialogs/DialogModel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 1a84ec0be18a..bb517756a3c9 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -198,7 +198,7 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal , C2U("%CATEGORYVALUE") , ExplicitCategoriesProvider::getCategoryByIndex( xCooSys, xChartModel, nPointIndex ) ); - + aRet = aCategory; } else @@ -339,7 +339,7 @@ rtl::OUString ObjectNameProvider::getAxisName( const rtl::OUString& rObjectCID { rtl::OUString aRet; - + Reference< XAxis > xAxis( ObjectIdentifier::getObjectPropertySet( rObjectCID , xChartModel ), uno::UNO_QUERY ); @@ -348,7 +348,7 @@ rtl::OUString ObjectNameProvider::getAxisName( const rtl::OUString& rObjectCID sal_Int32 nDimensionIndex = 0; sal_Int32 nAxisIndex = 0; AxisHelper::getIndicesForAxis( xAxis, ChartModelHelper::findDiagram( xChartModel ), nCooSysIndex, nDimensionIndex, nAxisIndex ); - + switch(nDimensionIndex) { case 0://x-axis @@ -370,7 +370,7 @@ rtl::OUString ObjectNameProvider::getAxisName( const rtl::OUString& rObjectCID aRet=String(SchResId(STR_OBJECT_AXIS)); break; } - + return aRet; } @@ -406,7 +406,7 @@ OUString ObjectNameProvider::getTitleNameByType( TitleHelper::eTitleType eType ) DBG_ERROR("unknown title type"); break; } - + if( !aRet.getLength() ) aRet=String(SchResId(STR_OBJECT_TITLE)); @@ -438,7 +438,7 @@ rtl::OUString ObjectNameProvider::getGridName( const rtl::OUString& rObjectCID , const uno::Reference< frame::XModel >& xChartModel ) { rtl::OUString aRet; - + sal_Int32 nCooSysIndex = -1; sal_Int32 nDimensionIndex = -1; @@ -559,7 +559,7 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID, break; } } - + OUString aReplacement( OUString::valueOf(nSeriesIndex+1) ); aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), aReplacement ); } diff --git a/chart2/source/controller/dialogs/RangeEdit.cxx b/chart2/source/controller/dialogs/RangeEdit.cxx index f01456b89ee3..bffc043620ea 100644 --- a/chart2/source/controller/dialogs/RangeEdit.cxx +++ b/chart2/source/controller/dialogs/RangeEdit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/RangeSelectionButton.cxx b/chart2/source/controller/dialogs/RangeSelectionButton.cxx index 30b1a0a33fb5..0d4be5da5e23 100644 --- a/chart2/source/controller/dialogs/RangeSelectionButton.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionButton.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx index 7f41675a901c..08d1a39d604d 100644 --- a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/chart2/source/controller/dialogs/RangeSelectionListener.cxx index a6285f0970a4..75408785bf11 100644 --- a/chart2/source/controller/dialogs/RangeSelectionListener.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionListener.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc index 2ab544c77ab1..4e6f01595b61 100644 --- a/chart2/source/controller/dialogs/ResourceIds.hrc +++ b/chart2/source/controller/dialogs/ResourceIds.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -60,8 +60,8 @@ #define TP_LAYOUT 907 #define TP_OPTIONS 908 #define TP_POLAROPTIONS 909 -#define TP_AXIS_LABEL 920 -#define TP_SCALE 903 +#define TP_AXIS_LABEL 920 +#define TP_SCALE 903 #define TP_AXIS_POSITIONS 904 #define TP_CHARTTYPE 910 #define TP_RANGECHOOSER 911 diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src index 4b4cec65426e..6b684d023eed 100644 --- a/chart2/source/controller/dialogs/Strings.src +++ b/chart2/source/controller/dialogs/Strings.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -123,7 +123,7 @@ String STR_PAGE_POSITIONING // String STR_PAGE_STATISTICS // { -// Text [ en-US ] = "Statistics" ; +// Text [ en-US ] = "Statistics" ; // }; String STR_PAGE_TRENDLINE_TYPE diff --git a/chart2/source/controller/dialogs/Strings_AdditionalControls.src b/chart2/source/controller/dialogs/Strings_AdditionalControls.src index f233ddaa7c20..bc658def2a0c 100644 --- a/chart2/source/controller/dialogs/Strings_AdditionalControls.src +++ b/chart2/source/controller/dialogs/Strings_AdditionalControls.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/Strings_ChartTypes.src b/chart2/source/controller/dialogs/Strings_ChartTypes.src index 6c7fc5a752aa..d06612a5afb8 100644 --- a/chart2/source/controller/dialogs/Strings_ChartTypes.src +++ b/chart2/source/controller/dialogs/Strings_ChartTypes.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/Strings_Scale.src b/chart2/source/controller/dialogs/Strings_Scale.src index e7a3d6c2b1cf..9185552cb90a 100644 --- a/chart2/source/controller/dialogs/Strings_Scale.src +++ b/chart2/source/controller/dialogs/Strings_Scale.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/Strings_Statistic.src b/chart2/source/controller/dialogs/Strings_Statistic.src index f2dc4235f783..7fdd1642ef4e 100644 --- a/chart2/source/controller/dialogs/Strings_Statistic.src +++ b/chart2/source/controller/dialogs/Strings_Statistic.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/TabPages.hrc b/chart2/source/controller/dialogs/TabPages.hrc index 1f445083738f..342495738ce5 100644 --- a/chart2/source/controller/dialogs/TabPages.hrc +++ b/chart2/source/controller/dialogs/TabPages.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -52,13 +52,13 @@ //Seit 4/1998 koennen Texte frei gedreht werden: SCHATTR_TEXT_DEGREES // ID's for title rotation tabpage -#define CTR_DIAL 6030 -#define BTN_TXTSTACKED 6031 -#define FT_DEGREES 6032 -#define NF_ORIENT 6033 -#define CTR_DUMMY 6034 -#define FT_DUMMY 6035 -#define FL_ALIGN 6037 +#define CTR_DIAL 6030 +#define BTN_TXTSTACKED 6031 +#define FT_DEGREES 6032 +#define NF_ORIENT 6033 +#define CTR_DUMMY 6034 +#define FT_DUMMY 6035 +#define FL_ALIGN 6037 #define FT_TEXTDIR 6038 #define LB_TEXTDIR 6039 @@ -82,59 +82,59 @@ //------------ //from old chart tplabel.hrc -//#define TP_AXIS_LABEL 920 +//#define TP_AXIS_LABEL 920 -#define CB_AXIS_LABEL_SCHOW_DESCR 1 +#define CB_AXIS_LABEL_SCHOW_DESCR 1 -//#define FL_AXIS_LABEL_FORMATTING 2 +//#define FL_AXIS_LABEL_FORMATTING 2 -#define FL_AXIS_LABEL_ORIENTATION 3 -#define CT_AXIS_LABEL_DIAL 4 -#define PB_AXIS_LABEL_TEXTSTACKED 5 -#define FT_AXIS_LABEL_DEGREES 6 -#define NF_AXIS_LABEL_ORIENT 7 -#define FT_UNUSED 8 -#define CT_UNUSED 9 +#define FL_AXIS_LABEL_ORIENTATION 3 +#define CT_AXIS_LABEL_DIAL 4 +#define PB_AXIS_LABEL_TEXTSTACKED 5 +#define FT_AXIS_LABEL_DEGREES 6 +#define NF_AXIS_LABEL_ORIENT 7 +#define FT_UNUSED 8 +#define CT_UNUSED 9 -#define FL_AXIS_LABEL_TEXTFLOW 10 -#define CB_AXIS_LABEL_TEXTOVERLAP 11 -#define CB_AXIS_LABEL_TEXTBREAK 12 +#define FL_AXIS_LABEL_TEXTFLOW 10 +#define CB_AXIS_LABEL_TEXTOVERLAP 11 +#define CB_AXIS_LABEL_TEXTBREAK 12 -#define FL_AXIS_LABEL_ORDER 13 -#define RB_AXIS_LABEL_SIDEBYSIDE 14 -#define RB_AXIS_LABEL_UPDOWN 15 -#define RB_AXIS_LABEL_DOWNUP 16 -#define RB_AXIS_LABEL_AUTOORDER 17 +#define FL_AXIS_LABEL_ORDER 13 +#define RB_AXIS_LABEL_SIDEBYSIDE 14 +#define RB_AXIS_LABEL_UPDOWN 15 +#define RB_AXIS_LABEL_DOWNUP 16 +#define RB_AXIS_LABEL_AUTOORDER 17 -#define FL_SEPARATOR 18 +#define FL_SEPARATOR 18 #define FT_AXIS_TEXTDIR 19 #define LB_AXIS_TEXTDIR 20 -//#define TP_SCALE 903 +//#define TP_SCALE 903 -#define FL_SCALE 1 +#define FL_SCALE 1 -#define TXT_MIN 1 -#define TXT_MAX 2 -#define TXT_STEP_MAIN 3 -#define TXT_STEP_HELP 4 -#define TXT_ORIGIN 5 +#define TXT_MIN 1 +#define TXT_MAX 2 +#define TXT_STEP_MAIN 3 +#define TXT_STEP_HELP 4 +#define TXT_ORIGIN 5 -#define CBX_AUTO_MIN 1 -#define CBX_AUTO_MAX 2 -#define CBX_AUTO_STEP_MAIN 3 -#define CBX_AUTO_STEP_HELP 4 -#define CBX_AUTO_ORIGIN 5 -#define CBX_LOGARITHM 6 +#define CBX_AUTO_MIN 1 +#define CBX_AUTO_MAX 2 +#define CBX_AUTO_STEP_MAIN 3 +#define CBX_AUTO_STEP_HELP 4 +#define CBX_AUTO_ORIGIN 5 +#define CBX_LOGARITHM 6 #define CBX_REVERSE 7 -#define EDT_STEP_MAIN 1 -#define EDT_MAX 2 -#define EDT_MIN 3 +#define EDT_STEP_MAIN 1 +#define EDT_MAX 2 +#define EDT_MIN 3 #define EDT_ORIGIN 4 -#define MT_STEPHELP 10 +#define MT_STEPHELP 10 //#define TP_AXIS_POSITIONS 904 @@ -145,24 +145,24 @@ #define FL_GRIDS 5 #define FT_CROSSES_OTHER_AXIS_AT 1 -#define FT_AXIS_LABEL_DISTANCE 2 -#define FT_PLACE_LABELS 3 -#define FT_MAJOR 4 -#define FT_MINOR 5 +#define FT_AXIS_LABEL_DISTANCE 2 +#define FT_PLACE_LABELS 3 +#define FT_MAJOR 4 +#define FT_MINOR 5 #define FT_PLACE_TICKS 6 #define LB_CROSSES_OTHER_AXIS_AT 1 #define LB_PLACE_LABELS 2 #define EDT_CROSSES_OTHER_AXIS_AT 3 #define EDT_CROSSES_OTHER_AXIS_AT_CATEGORY 4 -#define EDT_AXIS_LABEL_DISTANCE 5 +#define EDT_AXIS_LABEL_DISTANCE 5 #define LB_PLACE_TICKS 6 #define CB_AXIS_BETWEEN_CATEGORIES 1 -#define CB_TICKS_INNER 2 -#define CB_TICKS_OUTER 3 -#define CB_MINOR_INNER 4 -#define CB_MINOR_OUTER 5 +#define CB_TICKS_INNER 2 +#define CB_TICKS_OUTER 3 +#define CB_MINOR_INNER 4 +#define CB_MINOR_OUTER 5 #define CB_MAJOR_GRID 6 #define CB_MINOR_GRID 7 diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx index cd11b6e7c3d2..9cdb089862dc 100644 --- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx +++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx index 2147a7c0033b..6f34445ac269 100644 --- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx +++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/TitleDialogData.cxx b/chart2/source/controller/dialogs/TitleDialogData.cxx index a6e4213c955f..a3ea8761e9a6 100644 --- a/chart2/source/controller/dialogs/TitleDialogData.cxx +++ b/chart2/source/controller/dialogs/TitleDialogData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index 304aa1db7baf..5c334b90ab6b 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -62,7 +62,7 @@ ChartTypeDialog::ChartTypeDialog( Window* pParent FreeResource(); this->SetText(String(SchResId(STR_PAGE_CHARTTYPE))); - + //don't create the tabpages before FreeResource, otherwise the help ids are not matched correctly m_pChartTypeTabPage = new ChartTypeTabPage(this,uno::Reference< XChartDocument >::query(m_xChartModel),m_xCC,true/*live update*/,true/*hide title description*/); m_pChartTypeTabPage->initializePage(); diff --git a/chart2/source/controller/dialogs/dlg_ChartType.hrc b/chart2/source/controller/dialogs/dlg_ChartType.hrc index 0b5c20dae05c..940290bbba8f 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.hrc +++ b/chart2/source/controller/dialogs/dlg_ChartType.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_ChartType.src b/chart2/source/controller/dialogs/dlg_ChartType.src index 5523ad8956db..07a2627be6b2 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.src +++ b/chart2/source/controller/dialogs/dlg_ChartType.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -39,19 +39,19 @@ ModalDialog DLG_DIAGRAM_TYPE { HelpID = SID_DIAGRAM_TYPE ; - + Size = MAP_APPFONT ( CHART_TYPE_DLG_WIDTH , CHART_TYPE_DLG_HEIGHT ) ; OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; Closeable = TRUE ; - + FixedLine FL_BUTTONS { Pos = MAP_APPFONT ( 0 , CHART_TYPE_DLG_HEIGHT-24 ) ; Size = MAP_APPFONT ( CHART_TYPE_DLG_WIDTH , 8 ) ; }; - + BUTTONS_OK_CANCEL_HELP( CHART_TYPE_DLG_WIDTH-161 ,CHART_TYPE_DLG_HEIGHT-17 , 53, 0 ) }; diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index 420b20a4a7e0..00b0ce53ab80 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -110,7 +110,7 @@ void ChartTypeUnoDlg::implInitialize(const uno::Any& _rValue) ChartTypeUnoDlg_BASE::implInitialize(_rValue); } //------------------------------------------------------------------------------ -Dialog* ChartTypeUnoDlg::createDialog(Window* _pParent) +Dialog* ChartTypeUnoDlg::createDialog(Window* _pParent) { return new ChartTypeDialog( _pParent, m_xChartModel, m_aContext.getUNOContext() ); } diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index 52d3eb00c108..95f8c3d8f830 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.hrc b/chart2/source/controller/dialogs/dlg_CreationWizard.hrc index 48fa33484be8..d561215e2022 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.hrc +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.src b/chart2/source/controller/dialogs/dlg_CreationWizard.src index 90fe0e2993ed..ca25f67926b6 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.src +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index cb17d564752d..9961089bed88 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 8225feba7a16..852349520035 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.hrc b/chart2/source/controller/dialogs/dlg_DataEditor.hrc index d2675c5bb29e..c8c0536ae72a 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.hrc +++ b/chart2/source/controller/dialogs/dlg_DataEditor.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.src b/chart2/source/controller/dialogs/dlg_DataEditor.src index dadd1ac3098d..002ff099fa2a 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.src +++ b/chart2/source/controller/dialogs/dlg_DataEditor.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index 8fd7133b3f4f..bb0aecb1b809 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_DataSource.hrc b/chart2/source/controller/dialogs/dlg_DataSource.hrc index b8c5ff96bb33..fa9cd515e65d 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.hrc +++ b/chart2/source/controller/dialogs/dlg_DataSource.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_DataSource.src b/chart2/source/controller/dialogs/dlg_DataSource.src index 08427a4e271b..890e0c76f1ab 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.src +++ b/chart2/source/controller/dialogs/dlg_DataSource.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx index cef864201c49..408f38df92ee 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -111,7 +111,7 @@ SchAxisDlg::SchAxisDlg( Window* pWindow //todo: remove if secondary z axis are possible somewhere { aCbSecondaryZ.Hide(); - + Size aSize( GetSizePixel() ); //aSize.Height() -= aCbSecondaryZ.GetSizePixel().Height(); aSize.Height() -= ( aCbSecondaryZ.GetPosPixel().Y() - aCbSecondaryY.GetPosPixel().Y() ); diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.hrc b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.hrc index d069e893116c..5a3d3673b84a 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.hrc +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src index 11eec47d0996..2d93de1ee567 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -56,7 +56,7 @@ ModalDialog DLG_AXIS_OR_GRID CheckBox CB_X_PRIMARY { HelpID = HID_SCH_CB_XAXIS; - + Pos = MAP_APPFONT ( 12 , 14 ); Size = MAP_APPFONT ( 80 , 10 ); TabStop = TRUE; @@ -65,7 +65,7 @@ ModalDialog DLG_AXIS_OR_GRID CheckBox CB_Y_PRIMARY { HelpID = HID_SCH_CB_YAXIS; - + Pos = MAP_APPFONT ( 12 , 28 ); Size = MAP_APPFONT ( 80 , 10 ); TabStop = TRUE; @@ -74,7 +74,7 @@ ModalDialog DLG_AXIS_OR_GRID CheckBox CB_Z_PRIMARY { HelpID = HID_SCH_CB_ZAXIS; - + Pos = MAP_APPFONT ( 12 , 42 ); Size = MAP_APPFONT ( 80 , 10 ); TabStop = TRUE; diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx index 4b5d27e40dc0..9381ba0e010c 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.hrc b/chart2/source/controller/dialogs/dlg_InsertDataLabel.hrc index 92f67309d6fc..1b78ca8ff0ef 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.hrc +++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.src b/chart2/source/controller/dialogs/dlg_InsertDataLabel.src index 8f8a64485778..a34dacde7909 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.src +++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx index e6e691e00bee..da6ef08a10c5 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.hrc b/chart2/source/controller/dialogs/dlg_InsertErrorBars.hrc index 2adeccb29d80..4284684d57bd 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.hrc +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.src b/chart2/source/controller/dialogs/dlg_InsertErrorBars.src index 08230207b007..8cf0f6b35452 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.src +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -33,7 +33,7 @@ ModalDialog DLG_DATA_YERRORBAR { -// HelpID = SID_INSERT_STATISTICS ; +// HelpID = SID_INSERT_STATISTICS ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 300 , 156 ) ; diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx index 7fdec77c4fcb..2382731e303a 100644 --- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.hrc b/chart2/source/controller/dialogs/dlg_InsertLegend.hrc index 2adeccb29d80..4284684d57bd 100644 --- a/chart2/source/controller/dialogs/dlg_InsertLegend.hrc +++ b/chart2/source/controller/dialogs/dlg_InsertLegend.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.src b/chart2/source/controller/dialogs/dlg_InsertLegend.src index 95a1d5516ab5..4ee97fb3df26 100644 --- a/chart2/source/controller/dialogs/dlg_InsertLegend.src +++ b/chart2/source/controller/dialogs/dlg_InsertLegend.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx index e292c2cd9ba9..18c234e3d4fa 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.hrc b/chart2/source/controller/dialogs/dlg_InsertTitle.hrc index fc46db129b5b..4dec735d8e2c 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTitle.hrc +++ b/chart2/source/controller/dialogs/dlg_InsertTitle.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -25,7 +25,7 @@ * ************************************************************************/ #include "ResourceIds.hrc" - + #define BTN_OK 1 #define BTN_CANCEL 1 #define BTN_HELP 1 diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.src b/chart2/source/controller/dialogs/dlg_InsertTitle.src index f84ff2c6acd7..10a1bfb696c0 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTitle.src +++ b/chart2/source/controller/dialogs/dlg_InsertTitle.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx b/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx index 05ca9b7fbf0d..bcc7d97b2bb8 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.hrc b/chart2/source/controller/dialogs/dlg_InsertTrendline.hrc index 2adeccb29d80..4284684d57bd 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTrendline.hrc +++ b/chart2/source/controller/dialogs/dlg_InsertTrendline.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.src b/chart2/source/controller/dialogs/dlg_InsertTrendline.src index 54c490d4a2d1..56b4697ddc1f 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTrendline.src +++ b/chart2/source/controller/dialogs/dlg_InsertTrendline.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx index b9086018503e..8b8df6005bee 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -71,7 +71,7 @@ NumberFormatDialog::~NumberFormatDialog() //static SfxItemSet NumberFormatDialog::CreateEmptyItemSetForNumberFormatDialog( SfxItemPool& rItemPool ) { - static const USHORT nWhichPairs[] = + static const USHORT nWhichPairs[] = { SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, SID_ATTR_NUMBERFORMAT_NOLANGUAGE, SID_ATTR_NUMBERFORMAT_NOLANGUAGE, diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx index 2df36bd4ffc8..ad2aae6b6fbf 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 88f8b43401ce..13f9c0a90ead 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -419,7 +419,7 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent, AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, String(SchResId(STR_PAGE_FONT_EFFECTS))); if( aCJKOptions.IsAsianTypographyEnabled() ) AddTabPage(RID_SVXPAGE_PARA_ASIAN, String(SchResId(STR_PAGE_ASIAN))); - + break; case OBJECTTYPE_AXIS: diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.src b/chart2/source/controller/dialogs/dlg_ObjectProperties.src index 9eae934ce6df..5b0dfa19265f 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.src +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx index 3f188aa90bfd..a428652f7251 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx +++ b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_ShapeFont.src b/chart2/source/controller/dialogs/dlg_ShapeFont.src index 2065bd940988..92466c496083 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeFont.src +++ b/chart2/source/controller/dialogs/dlg_ShapeFont.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx index ee43d301255f..9324f7fe2703 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx +++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.src b/chart2/source/controller/dialogs/dlg_ShapeParagraph.src index ff74fc1eef80..be50398dd6fe 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.src +++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index 352fb95a29fa..7948216a0f77 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_View3D.hrc b/chart2/source/controller/dialogs/dlg_View3D.hrc index 59564a97b8b8..197a4052113c 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.hrc +++ b/chart2/source/controller/dialogs/dlg_View3D.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/dlg_View3D.src b/chart2/source/controller/dialogs/dlg_View3D.src index 5b1802ecfb3d..4c7177b1d7af 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.src +++ b/chart2/source/controller/dialogs/dlg_View3D.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -42,7 +42,7 @@ TabDialog DLG_3D_VIEW OutputSize = TRUE ; Pos = MAP_APPFONT ( 3 , 3 ) ; Size = MAP_APPFONT ( VIEW3D_PAGE_WIDTH , VIEW3D_PAGE_HEIGHT ) ; - }; + }; BUTTONS_OK_CANCEL_HELP_STACKED(VIEW3D_PAGE_HEIGHT+3) }; diff --git a/chart2/source/controller/dialogs/hidother.src b/chart2/source/controller/dialogs/hidother.src index 4b006f0f1f93..657c25a8abf2 100644 --- a/chart2/source/controller/dialogs/hidother.src +++ b/chart2/source/controller/dialogs/hidother.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx index 06b8be7a3f6e..516796683a94 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.cxx +++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -64,11 +64,11 @@ Size BarGeometryResources::GetSizePixel() const long nHeight = m_aLB_Geometry.GetPosPixel().Y() - m_aFT_Geometry.GetPosPixel().Y(); nHeight += m_aLB_Geometry.GetSizePixel().Height(); - + long nWidth = m_aLB_Geometry.GetSizePixel().Width(); if( nWidth < m_aFT_Geometry.GetSizePixel().Width() ) nWidth = m_aFT_Geometry.GetSizePixel().Width(); - + return Size( nHeight, nWidth ); } BarGeometryResources::~BarGeometryResources() diff --git a/chart2/source/controller/dialogs/res_BarGeometry.hxx b/chart2/source/controller/dialogs/res_BarGeometry.hxx index cdddd9cfb4ce..6e40d493a23b 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.hxx +++ b/chart2/source/controller/dialogs/res_BarGeometry.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/res_BarGeometry.src b/chart2/source/controller/dialogs/res_BarGeometry.src index ea481070132d..bda633eddfe2 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.src +++ b/chart2/source/controller/dialogs/res_BarGeometry.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 623294542829..1468c0960ea0 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -185,14 +185,14 @@ DataLabelResources::DataLabelResources( Window* pWindow, const SfxItemSet& rInAt aCBSize.setWidth(nCBXWidth); m_aCBNumber.SetSizePixel( aCBSize ); m_aCBPercent.SetSizePixel( aCBSize ); - + //place and align separator and label placement listboxes Size aSize( m_aFT_LabelPlacement.GetSizePixel() ); aSize.setWidth( m_aFT_LabelPlacement.CalcMinimumSize().getWidth() ); m_aFT_LabelPlacement.SetSizePixel(aSize); long nWantedMinLeftBorder = m_aFT_LabelPlacement.GetPosPixel().X() + aSize.getWidth () + aControlDistance.Width(); - + m_aSeparatorResources.PositionBelowControl(m_aCBSymbol); m_aSeparatorResources.AlignListBoxWidthAndXPos( nWantedMinLeftBorder, -1, m_aLB_LabelPlacement.CalcMinimumSize().getWidth() ); m_aSeparatorResources.Show(true); diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx index 525d52b8da3b..14642fe84690 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.hxx +++ b/chart2/source/controller/dialogs/res_DataLabel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/res_DataLabel_IDs.hrc b/chart2/source/controller/dialogs/res_DataLabel_IDs.hrc index 5251841a2d9b..d70cc8bd2526 100644 --- a/chart2/source/controller/dialogs/res_DataLabel_IDs.hrc +++ b/chart2/source/controller/dialogs/res_DataLabel_IDs.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/res_DataLabel_tmpl.hrc b/chart2/source/controller/dialogs/res_DataLabel_tmpl.hrc index 9501368f537e..72349a5cad47 100644 --- a/chart2/source/controller/dialogs/res_DataLabel_tmpl.hrc +++ b/chart2/source/controller/dialogs/res_DataLabel_tmpl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -57,7 +57,7 @@ CheckBox CB_VALUE_AS_NUMBER \ Size = MAP_APPFONT ( 136 , 10 ) ; \ TabStop = TRUE ; \ Text [ en-US ] = "Show value as ~number" ; \ -}; \ +}; \ PushButton PB_NUMBERFORMAT \ { \ HelpID = HID_SCH_PB_NUMBERFORMAT; \ @@ -73,7 +73,7 @@ CheckBox CB_VALUE_AS_PERCENTAGE \ Size = MAP_APPFONT ( 136 , 10 ) ; \ TabStop = TRUE ; \ Text [ en-US ] = "Show value as ~percentage" ; \ -}; \ +}; \ PushButton PB_PERCENT_NUMBERFORMAT \ { \ HelpID = HID_SCH_PB_PERCENT_NUMBERFORMAT; \ diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 9a24eb06aa44..adca25303d0a 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/res_ErrorBar_IDs.hrc b/chart2/source/controller/dialogs/res_ErrorBar_IDs.hrc index bab1051208f4..7205f225ec5b 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar_IDs.hrc +++ b/chart2/source/controller/dialogs/res_ErrorBar_IDs.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc b/chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc index 0f4cf70e30c7..db22d24fe5fd 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc +++ b/chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -35,7 +35,7 @@ StringList [ en-US ] = \ < "Standard Deviation" ; CHART_LB_FUNCTION_STD_DEV ; >; \ < "Variance" ; CHART_LB_FUNCTION_VARIANCE ; >; \ < "Error Margin" ; CHART_LB_FUNCTION_ERROR_MARGIN ; >; \ - }; + }; #define RESOURCE_ERRORBARS(availablewidth, yoffset) \ diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index 33f02c442f1b..59244698bdd2 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -85,7 +85,7 @@ void LegendPositionResources::impl_setRadioButtonToggleHdl() m_aRbtLeft.SetToggleHdl( LINK( this, LegendPositionResources, PositionChangeHdl ) ); m_aRbtTop.SetToggleHdl( LINK( this, LegendPositionResources, PositionChangeHdl ) ); m_aRbtRight.SetToggleHdl( LINK( this, LegendPositionResources, PositionChangeHdl ) ); - m_aRbtBottom.SetToggleHdl( LINK( this, LegendPositionResources, PositionChangeHdl ) ); + m_aRbtBottom.SetToggleHdl( LINK( this, LegendPositionResources, PositionChangeHdl ) ); } LegendPositionResources::~LegendPositionResources() @@ -155,7 +155,7 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen if( m_aRbtLeft.IsChecked() ) eNewPos = chart2::LegendPosition_LINE_START; else if( m_aRbtRight.IsChecked() ) - { + { eNewPos = chart2::LegendPosition_LINE_END; } else if( m_aRbtTop.IsChecked() ) diff --git a/chart2/source/controller/dialogs/res_LegendPosition.hxx b/chart2/source/controller/dialogs/res_LegendPosition.hxx index 0fc13b3b068b..53a0b266dade 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.hxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -74,10 +74,10 @@ private: CheckBox m_aCbxShow; - RadioButton m_aRbtLeft; - RadioButton m_aRbtTop; - RadioButton m_aRbtRight; - RadioButton m_aRbtBottom; + RadioButton m_aRbtLeft; + RadioButton m_aRbtTop; + RadioButton m_aRbtRight; + RadioButton m_aRbtBottom; Link m_aChangeLink; }; diff --git a/chart2/source/controller/dialogs/res_LegendPosition_IDs.hrc b/chart2/source/controller/dialogs/res_LegendPosition_IDs.hrc index 4dd46e0c9df7..6cf0893b0736 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition_IDs.hrc +++ b/chart2/source/controller/dialogs/res_LegendPosition_IDs.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc b/chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc index 17f6518eabe4..48867d3012d2 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc +++ b/chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc b/chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc index 7e9609e20763..2eed1dc570f5 100644 --- a/chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc +++ b/chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/res_TextSeparator.cxx b/chart2/source/controller/dialogs/res_TextSeparator.cxx index cef13277d9cf..6612e297b0d6 100644 --- a/chart2/source/controller/dialogs/res_TextSeparator.cxx +++ b/chart2/source/controller/dialogs/res_TextSeparator.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/res_TextSeparator.hxx b/chart2/source/controller/dialogs/res_TextSeparator.hxx index b2701bf0aaec..47368d913369 100644 --- a/chart2/source/controller/dialogs/res_TextSeparator.hxx +++ b/chart2/source/controller/dialogs/res_TextSeparator.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/res_TextSeparator.src b/chart2/source/controller/dialogs/res_TextSeparator.src index c0b95ea23c7d..d4b1b5e0c9fa 100644 --- a/chart2/source/controller/dialogs/res_TextSeparator.src +++ b/chart2/source/controller/dialogs/res_TextSeparator.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -38,7 +38,7 @@ ListBox LB_TEXT_SEPARATOR Group = TRUE ; DropDown=TRUE; DDExtraWidth = TRUE ; - + StringList [ en-US ] = { "Space" ; diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx index 2b164216c28a..3763aa9dad7e 100644 --- a/chart2/source/controller/dialogs/res_Titles.cxx +++ b/chart2/source/controller/dialogs/res_Titles.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -70,11 +70,11 @@ TitleResources::TitleResources( Window* pWindow, bool bShowSecondaryAxesTitle ) nMaxTextWidth = ::std::max( nMaxTextWidth, m_aFT_SecondaryXAxis.CalcMinimumSize().Width() ) ; nMaxTextWidth = ::std::max( nMaxTextWidth, m_aFT_SecondaryYAxis.CalcMinimumSize().Width() ) ; } - + Size aControlDistance( m_aFT_Main.LogicToPixel( Size(RSC_SP_CTRL_DESC_X,RSC_SP_CTRL_GROUP_Y), MapMode(MAP_APPFONT) ) ); long nEditFieldXPos = m_aFT_Main.GetPosPixel().X() + nMaxTextWidth + aControlDistance.Width(); long nEditFieldWidth = m_aEd_Main.GetPosPixel().X() + m_aEd_Main.GetSizePixel().Width() - nEditFieldXPos; - + if( nEditFieldWidth > 10 ) { Size aFTSize( m_aFT_Main.GetSizePixel() ); @@ -89,7 +89,7 @@ TitleResources::TitleResources( Window* pWindow, bool bShowSecondaryAxesTitle ) m_aFT_SecondaryXAxis.SetSizePixel(aFTSize); m_aFT_SecondaryYAxis.SetSizePixel(aFTSize); } - + m_aEd_Main.SetPosPixel( Point( nEditFieldXPos, m_aEd_Main.GetPosPixel().Y() ) ); m_aEd_Sub.SetPosPixel( Point( nEditFieldXPos, m_aEd_Sub.GetPosPixel().Y() ) ); m_aEd_XAxis.SetPosPixel( Point( nEditFieldXPos, m_aEd_XAxis.GetPosPixel().Y() ) ); @@ -100,7 +100,7 @@ TitleResources::TitleResources( Window* pWindow, bool bShowSecondaryAxesTitle ) m_aEd_SecondaryXAxis.SetPosPixel( Point( nEditFieldXPos, m_aEd_SecondaryXAxis.GetPosPixel().Y() ) ); m_aEd_SecondaryYAxis.SetPosPixel( Point( nEditFieldXPos, m_aEd_SecondaryYAxis.GetPosPixel().Y() ) ); } - + Size aEditSize( m_aEd_Main.GetSizePixel() ); aEditSize.Width() = nEditFieldWidth; m_aEd_Main.SetSizePixel( aEditSize ); @@ -114,7 +114,7 @@ TitleResources::TitleResources( Window* pWindow, bool bShowSecondaryAxesTitle ) m_aEd_SecondaryYAxis.SetSizePixel( aEditSize ); } } - + m_aFT_SecondaryXAxis.Show( bShowSecondaryAxesTitle ); m_aEd_SecondaryXAxis.Show( bShowSecondaryAxesTitle ); m_aFT_SecondaryYAxis.Show( bShowSecondaryAxesTitle ); diff --git a/chart2/source/controller/dialogs/res_Titles.hrc b/chart2/source/controller/dialogs/res_Titles.hrc index c66aac02014c..b364fdbe38bd 100644 --- a/chart2/source/controller/dialogs/res_Titles.hrc +++ b/chart2/source/controller/dialogs/res_Titles.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/res_Titles.hxx b/chart2/source/controller/dialogs/res_Titles.hxx index f501d4a8e446..a39b4f449fc6 100644 --- a/chart2/source/controller/dialogs/res_Titles.hxx +++ b/chart2/source/controller/dialogs/res_Titles.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -51,18 +51,18 @@ public: void ClearModifyFlag(); private: - FixedText m_aFT_Main; - Edit m_aEd_Main; - FixedText m_aFT_Sub; - Edit m_aEd_Sub; + FixedText m_aFT_Main; + Edit m_aEd_Main; + FixedText m_aFT_Sub; + Edit m_aEd_Sub; FixedLine m_aFL_Axes; - FixedText m_aFT_XAxis; - Edit m_aEd_XAxis; - FixedText m_aFT_YAxis; - Edit m_aEd_YAxis; - FixedText m_aFT_ZAxis; - Edit m_aEd_ZAxis; + FixedText m_aFT_XAxis; + Edit m_aEd_XAxis; + FixedText m_aFT_YAxis; + Edit m_aEd_YAxis; + FixedText m_aFT_ZAxis; + Edit m_aEd_ZAxis; FixedLine m_aFL_SecondaryAxes; FixedText m_aFT_SecondaryXAxis; diff --git a/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc b/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc index c64c71d78c21..4949baa1217c 100644 --- a/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc +++ b/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index 46435152be8c..100d9102eb9f 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx index 45a054e4ae57..dae2465a3629 100644 --- a/chart2/source/controller/dialogs/res_Trendline.hxx +++ b/chart2/source/controller/dialogs/res_Trendline.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/res_Trendline_IDs.hrc b/chart2/source/controller/dialogs/res_Trendline_IDs.hrc index 0e857742af4e..f71786927156 100644 --- a/chart2/source/controller/dialogs/res_Trendline_IDs.hrc +++ b/chart2/source/controller/dialogs/res_Trendline_IDs.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/res_Trendline_tmpl.hrc b/chart2/source/controller/dialogs/res_Trendline_tmpl.hrc index 734384e200d8..311aa90a9516 100644 --- a/chart2/source/controller/dialogs/res_Trendline_tmpl.hrc +++ b/chart2/source/controller/dialogs/res_Trendline_tmpl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index b13e93a573b2..5351ef7d51b6 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -106,13 +106,13 @@ ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage( Window* pWindow , const uno::Reference< frame::XModel > & xChartModel , ControllerLockHelper & rControllerLockHelper ) - : TabPage ( pWindow, SchResId( TP_3D_SCENEAPPEARANCE ) ) + : TabPage ( pWindow, SchResId( TP_3D_SCENEAPPEARANCE ) ) , m_xChartModel ( xChartModel ) , m_aFT_Scheme ( this, SchResId( FT_SCHEME ) ) , m_aLB_Scheme ( this, SchResId( LB_SCHEME ) ) , m_aFL_Seperator ( this, SchResId( FL_SEPERATOR ) ) , m_aCB_RoundedEdge ( this, SchResId( CB_ROUNDEDEDGE ) ) - , m_aCB_Shading ( this, SchResId( CB_SHADING ) ) + , m_aCB_Shading ( this, SchResId( CB_SHADING ) ) , m_aCB_ObjectLines ( this, SchResId( CB_OBJECTLINES ) ) , m_bUpdateOtherControls( true ) , m_bCommitToModel( true ) @@ -346,14 +346,14 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines, Check if( pCheckBox == &m_aCB_ObjectLines ) { m_aCB_ObjectLines.EnableTriState( FALSE ); - m_bUpdateOtherControls = false; + m_bUpdateOtherControls = false; m_aCB_RoundedEdge.Enable( !m_aCB_ObjectLines.IsChecked() ); if(!m_aCB_RoundedEdge.IsEnabled()) m_aCB_RoundedEdge.Check(FALSE); m_bUpdateOtherControls = true; } else - m_aCB_RoundedEdge.EnableTriState( FALSE ); + m_aCB_RoundedEdge.EnableTriState( FALSE ); applyRoundedEdgeAndObjectLinesToModel(); updateScheme(); return 0; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc index e01be1c35072..47a761753581 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx index db7d91e59766..55a179dc417e 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -76,14 +76,14 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xChartModel; - FixedText m_aFT_Scheme; - ListBox m_aLB_Scheme; + FixedText m_aFT_Scheme; + ListBox m_aLB_Scheme; - FixedLine m_aFL_Seperator; + FixedLine m_aFL_Seperator; - CheckBox m_aCB_RoundedEdge; - CheckBox m_aCB_Shading; - CheckBox m_aCB_ObjectLines; + CheckBox m_aCB_RoundedEdge; + CheckBox m_aCB_Shading; + CheckBox m_aCB_ObjectLines; bool m_bUpdateOtherControls; bool m_bCommitToModel; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src index df202410109d..2f8dad3bced8 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -38,7 +38,7 @@ #define HEIGHT_FT 10 #define POS_X_0 6 -#define POS_X_1 6 +#define POS_X_1 6 #define POS_X_2 POS_X_1+WIDTH_FT+4 #define POS_Y_SCHEME 8 @@ -74,8 +74,8 @@ TabPage TP_3D_SCENEAPPEARANCE { Pos = MAP_APPFONT ( POS_X_0 , POS_Y_SEPERATOR ) ; Size = MAP_APPFONT ( WIDTH_FL , HEIGHT_FL ) ; - }; - + }; + CheckBox CB_SHADING { Pos = MAP_APPFONT ( POS_X_1 , POS_Y_SHADING ) ; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx index 35ae7ee8a1b3..9c48ba983ed5 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -74,14 +74,14 @@ void lcl_SetMetricFieldLimits( MetricField& rField, sal_Int64 nLimit ) ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow , const uno::Reference< beans::XPropertySet > & xSceneProperties , ControllerLockHelper & rControllerLockHelper ) - : TabPage ( pWindow, SchResId( TP_3D_SCENEGEOMETRY ) ) + : TabPage ( pWindow, SchResId( TP_3D_SCENEGEOMETRY ) ) , m_xSceneProperties( xSceneProperties ) , m_aCbxRightAngledAxes( this, SchResId( CBX_RIGHT_ANGLED_AXES ) ) - , m_aFtXRotation ( this, SchResId( FT_X_ROTATION ) ) - , m_aMFXRotation ( this, SchResId( MTR_FLD_X_ROTATION ) ) - , m_aFtYRotation ( this, SchResId( FT_Y_ROTATION ) ) - , m_aMFYRotation ( this, SchResId( MTR_FLD_Y_ROTATION ) ) - , m_aFtZRotation ( this, SchResId( FT_Z_ROTATION ) ) + , m_aFtXRotation ( this, SchResId( FT_X_ROTATION ) ) + , m_aMFXRotation ( this, SchResId( MTR_FLD_X_ROTATION ) ) + , m_aFtYRotation ( this, SchResId( FT_Y_ROTATION ) ) + , m_aMFYRotation ( this, SchResId( MTR_FLD_Y_ROTATION ) ) + , m_aFtZRotation ( this, SchResId( FT_Z_ROTATION ) ) , m_aMFZRotation ( this, SchResId( MTR_FLD_Z_ROTATION ) ) , m_aCbxPerspective ( this, SchResId( CBX_PERSPECTIVE ) ) , m_aMFPerspective ( this, SchResId( MTR_FLD_PERSPECTIVE ) ) @@ -152,7 +152,7 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow sal_Bool bRightAngledAxes = false; uno::Reference< chart2::XDiagram > xDiagram( m_xSceneProperties, uno::UNO_QUERY ); - if( ChartTypeHelper::isSupportingRightAngledAxes( + if( ChartTypeHelper::isSupportingRightAngledAxes( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ) ) { m_xSceneProperties->getPropertyValue( C2U("RightAngledAxes")) >>= bRightAngledAxes; @@ -252,7 +252,7 @@ IMPL_LINK( ThreeD_SceneGeometry_TabPage, PerspectiveChanged, void*, EMPTYARG ) IMPL_LINK( ThreeD_SceneGeometry_TabPage, PerspectiveToggled, void*, EMPTYARG ) { m_aMFPerspective.Enable( m_aCbxPerspective.IsChecked() ); - applyPerspectiveToModel(); + applyPerspectiveToModel(); return 0; } @@ -269,7 +269,7 @@ IMPL_LINK( ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, void*, EMPTYARG m_nXRotation = m_aMFXRotation.GetValue(); m_nYRotation = m_aMFYRotation.GetValue(); m_nZRotation = m_aMFZRotation.GetValue(); - + m_aMFXRotation.SetValue(static_cast<sal_Int64>(ThreeDHelper::getValueClippedToRange(static_cast<double>(m_nXRotation), ThreeDHelper::getXDegreeAngleLimitForRightAngledAxes()))); m_aMFYRotation.SetValue(static_cast<sal_Int64>(ThreeDHelper::getValueClippedToRange(static_cast<double>(m_nYRotation), ThreeDHelper::getYDegreeAngleLimitForRightAngledAxes()))); m_aMFZRotation.SetEmptyFieldValue(); @@ -288,7 +288,7 @@ IMPL_LINK( ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, void*, EMPTYARG } ThreeDHelper::switchRightAngledAxes( m_xSceneProperties, m_aCbxRightAngledAxes.IsChecked(), true /*bRotateLights*/ ); - + return 0; } diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hrc b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hrc index e84bc84012e9..6b46d43efd11 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hrc +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx index 57e96cd02cdc..e4265ddb80ab 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -79,19 +79,19 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSceneProperties; - CheckBox m_aCbxRightAngledAxes; - - FixedText m_aFtXRotation; - MetricField m_aMFXRotation; - - FixedText m_aFtYRotation; - MetricField m_aMFYRotation; + CheckBox m_aCbxRightAngledAxes; - FixedText m_aFtZRotation; - MetricField m_aMFZRotation; + FixedText m_aFtXRotation; + MetricField m_aMFXRotation; + + FixedText m_aFtYRotation; + MetricField m_aMFYRotation; + + FixedText m_aFtZRotation; + MetricField m_aMFZRotation; - CheckBox m_aCbxPerspective; - MetricField m_aMFPerspective; + CheckBox m_aCbxPerspective; + MetricField m_aMFPerspective; //to keep old values when switching to right angled axes sal_Int64 m_nXRotation; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src index 329eb25e0e51..54a4bcaf929c 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -42,7 +42,7 @@ #define HEIGHT_FT 10 #define POS_X_0 6 -#define POS_X_1 6 +#define POS_X_1 6 #define POS_X_2 POS_X_1+WIDTH_FT+4 #define POS_Y_0 (8) @@ -73,7 +73,7 @@ TabPage TP_3D_SCENEGEOMETRY SVLook = TRUE ; Hide = TRUE ; Size = MAP_APPFONT ( VIEW3D_PAGE_WIDTH , VIEW3D_PAGE_HEIGHT ) ; - + CheckBox CBX_RIGHT_ANGLED_AXES { Pos = MAP_APPFONT ( POS_X_1 , POS_Y_0 ) ; @@ -117,7 +117,7 @@ TabPage TP_3D_SCENEGEOMETRY Size = MAP_APPFONT ( WIDTH_MF , HEIGHT_MF ) ; CUSTOMUNITTEXT_DEGREE }; - + CheckBox CBX_PERSPECTIVE { Pos = MAP_APPFONT ( POS_X_1 , POS_Y_4 ) ; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 3ccbe844bc97..a8d2be0a8ab9 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -288,7 +288,7 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin , const uno::Reference< beans::XPropertySet > & xSceneProperties , const uno::Reference< frame::XModel >& xChartModel , XColorTable* pColorTable ) - : TabPage ( pWindow, SchResId( TP_3D_SCENEILLUMINATION ) ) + : TabPage ( pWindow, SchResId( TP_3D_SCENEILLUMINATION ) ) , m_aFT_LightSource( this, SchResId( FT_LIGHTSOURCE ) ) , m_aBtn_Light1( this, SchResId( BTN_LIGHT_1 ), 1 ) , m_aBtn_Light2( this, SchResId( BTN_LIGHT_2 ), 2 ) @@ -332,7 +332,7 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin m_pLightSourceInfoList[7].pButton = &m_aBtn_Light8; fillControlsFromModel(0); - + m_aBtn_Light1.SetClickHdl( LINK( this, ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl ) ); m_aBtn_Light2.SetClickHdl( LINK( this, ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl ) ); m_aBtn_Light3.SetClickHdl( LINK( this, ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl ) ); @@ -354,7 +354,7 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin ClickLightSourceButtonHdl(&m_aBtn_Light2); //m_aDelyedModelChangeTimer.SetTimeout( 4*EDIT_UPDATEDATA_TIMEOUT ); - + m_aModelChangeListener.startListening( uno::Reference< util::XModifyBroadcaster >(m_xSceneProperties, uno::UNO_QUERY) ); } @@ -451,7 +451,7 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, void*, EMPTYARG ) pInfo->aLightSource.aDirection = B3DVectorToDirection3D(((const Svx3DLightDirection8Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_8)).GetValue()); applyLightSourcesToModel(); - + return 0; } @@ -463,7 +463,7 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, PreviewSelectHdl, void*, EMPTYARG ) LightButton* pButton = m_pLightSourceInfoList[nLightNumber].pButton; if(!pButton->IsChecked()) ClickLightSourceButtonHdl(pButton); - + applyLightSourcesToModel(); } return 0; @@ -593,37 +593,37 @@ void ThreeD_SceneIllumination_TabPage::updatePreview() aItemSet.Put(Svx3DLightcolor1Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff1Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection1Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[1]; aItemSet.Put(Svx3DLightcolor2Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff2Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection2Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[2]; aItemSet.Put(Svx3DLightcolor3Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff3Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection3Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[3]; aItemSet.Put(Svx3DLightcolor4Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff4Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection4Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[4]; aItemSet.Put(Svx3DLightcolor5Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff5Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection5Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[5]; aItemSet.Put(Svx3DLightcolor6Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff6Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection6Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[6]; aItemSet.Put(Svx3DLightcolor7Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff7Item(pInfo->aLightSource.bIsEnabled)); aItemSet.Put(Svx3DLightDirection7Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection))); - + pInfo = &m_pLightSourceInfoList[7]; aItemSet.Put(Svx3DLightcolor8Item(pInfo->aLightSource.nDiffuseColor)); aItemSet.Put(Svx3DLightOnOff8Item(pInfo->aLightSource.bIsEnabled)); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc index e2d031955867..40faa9531281 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx index 71c16c683bdf..80369a483499 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -84,7 +84,7 @@ public: // has to be called in case the dialog was closed with OK void commitPendingChanges(); - + private: DECL_LINK( ClickLightSourceButtonHdl, LightButton* ); DECL_LINK( SelectColorHdl, ColorLB* ); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src index 57f15a1894d7..4262ad600054 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -63,7 +63,7 @@ TabPage TP_3D_SCENEILLUMINATION SVLook = TRUE ; Hide = TRUE ; Size = MAP_APPFONT ( VIEW3D_PAGE_WIDTH , VIEW3D_PAGE_HEIGHT ) ; - + FixedText FT_LIGHTSOURCE { Pos = MAP_APPFONT ( POS_X_0 , POS_Y_LIGHTSOURCE_HEAD ) ; @@ -114,7 +114,7 @@ TabPage TP_3D_SCENEILLUMINATION { Border = TRUE ; Pos = MAP_APPFONT ( POS_X_0 , POS_Y_LIGHTSOURCE ) ; - Size = MAP_APPFONT ( WIDTH_LB , HEIGHT_LB ) ; + Size = MAP_APPFONT ( WIDTH_LB , HEIGHT_LB ) ; TabStop = TRUE ; DropDown = TRUE ; }; @@ -148,9 +148,9 @@ TabPage TP_3D_SCENEILLUMINATION Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; TabStop = TRUE ; }; + - - + Control CTL_LIGHT_PREVIEW { Border = TRUE ; diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index fd21bacca0b2..343768f8fde5 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -89,7 +89,7 @@ SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rIn aCbShowDescription.SetClickHdl( LINK( this, SchAxisLabelTabPage, ToggleShowLabel ) ); - // Make the fixed line separator vertical. + // Make the fixed line separator vertical. aFlSeparator.SetStyle (aFlSeparator.GetStyle() | WB_VERT); Construct(); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx index 8e234b76af47..3ea751471428 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -48,13 +48,13 @@ namespace chart class SchAxisLabelTabPage : public SfxTabPage { private: - CheckBox aCbShowDescription; + CheckBox aCbShowDescription; - FixedLine aFlOrder; - RadioButton aRbSideBySide; - RadioButton aRbUpDown; - RadioButton aRbDownUp; - RadioButton aRbAuto; + FixedLine aFlOrder; + RadioButton aRbSideBySide; + RadioButton aRbUpDown; + RadioButton aRbDownUp; + RadioButton aRbAuto; FixedLine aFlSeparator; FixedLine aFlTextFlow; @@ -84,7 +84,7 @@ public: SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SchAxisLabelTabPage(); - void Construct(); + void Construct(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); virtual BOOL FillItemSet( SfxItemSet& rOutAttrs ); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.src b/chart2/source/controller/dialogs/tp_AxisLabel.src index bcba1926c242..a999ab7a4db4 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.src +++ b/chart2/source/controller/dialogs/tp_AxisLabel.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -29,14 +29,14 @@ TabPage TP_AXIS_LABEL { - HelpID = HID_SCH_TP_AXIS_LABEL; - Size = MAP_APPFONT ( 260 , 185 ) ; - Hide = TRUE; + HelpID = HID_SCH_TP_AXIS_LABEL; + Size = MAP_APPFONT ( 260 , 185 ) ; + Hide = TRUE; CheckBox CB_AXIS_LABEL_SCHOW_DESCR { - Pos = MAP_APPFONT ( 6 , 6 ) ; - Size = MAP_APPFONT ( 248 , 12 ) ; + Pos = MAP_APPFONT ( 6 , 6 ) ; + Size = MAP_APPFONT ( 248 , 12 ) ; Text [ en-US ] = "Sho~w labels"; }; @@ -50,7 +50,7 @@ TabPage TP_AXIS_LABEL }; Control CT_AXIS_LABEL_DIAL { - HelpId = HID_SCH_ALIGNMENT_CTR_DIAL ; + HelpId = HID_SCH_ALIGNMENT_CTR_DIAL ; Pos = MAP_APPFONT ( 12 , 105 ) ; Size = MAP_APPFONT ( 43 , 43 ) ; Text = "ABCD" ; @@ -93,9 +93,9 @@ TabPage TP_AXIS_LABEL Control CT_UNUSED { //only necessary for constructor of SvxWinOrientation - Hide = TRUE ; - Pos = MAP_APPFONT ( 204 , 133 ) ; - Size = MAP_APPFONT ( 50 , 15 ) ; + Hide = TRUE ; + Pos = MAP_APPFONT ( 204 , 133 ) ; + Size = MAP_APPFONT ( 50 , 15 ) ; }; FixedLine FL_SEPARATOR { @@ -105,8 +105,8 @@ TabPage TP_AXIS_LABEL FixedLine FL_AXIS_LABEL_TEXTFLOW { - Pos = MAP_APPFONT ( 133 , 22 ) ; - Size = MAP_APPFONT ( 121 , 8 ) ; + Pos = MAP_APPFONT ( 133 , 22 ) ; + Size = MAP_APPFONT ( 121 , 8 ) ; Text [ en-US ] = "Text flow" ; }; @@ -114,7 +114,7 @@ TabPage TP_AXIS_LABEL { Pos = MAP_APPFONT ( 139 , 33 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; - TabStop = TRUE ; + TabStop = TRUE ; Text [ en-US ] = "O~verlap" ; }; @@ -122,7 +122,7 @@ TabPage TP_AXIS_LABEL { Pos = MAP_APPFONT ( 139 , 47 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; - TabStop = TRUE ; + TabStop = TRUE ; Text [ en-US ] = "~Break" ; }; diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index c4d073e3d03d..b250483edad9 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -120,7 +120,7 @@ AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rIn , m_aPB_MajorGrid(this,SchResId(PB_MAJOR_GRID)) , m_aCB_MinorGrid(this,SchResId(CB_MINOR_GRID)) , m_aPB_MinorGrid(this,SchResId(PB_MINOR_GRID)) - + , m_pNumFormatter(NULL) , m_bCrossingAxisIsCategoryAxis(false) , m_aCategories() @@ -138,7 +138,7 @@ AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rIn m_aFT_CrossesAt.SetSizePixel(m_aFT_CrossesAt.CalcMinimumSize()); long nXPos = m_aFT_CrossesAt.GetPosPixel().X() + m_aFT_CrossesAt.GetSizePixel().Width() + nDistance; lcl_newXPos( m_aLB_CrossesAt, nXPos ); - + nXPos += m_aLB_CrossesAt.GetSizePixel().Width() + nDistance; lcl_newXPos( m_aED_CrossesAt, nXPos ); lcl_newXPos( m_aED_CrossesAtCategory, nXPos ); @@ -175,14 +175,14 @@ AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rIn { long nWidth_1 = ::std::max( m_aCB_TicksInner.CalcMinimumSize().Width(), m_aCB_MinorInner.CalcMinimumSize().Width() ); long nWidth_2 = ::std::max( m_aCB_TicksOuter.CalcMinimumSize().Width(), m_aCB_MinorOuter.CalcMinimumSize().Width() ); - + long nLeftSpace = nDialogWidth - nWidth_0 - nWidth_1 - nWidth_2 - 3*nDistance; if(nLeftSpace>=0) { m_aFT_Major.SetSizePixel(m_aFT_Major.CalcMinimumSize()); m_aFT_Minor.SetSizePixel(m_aFT_Minor.CalcMinimumSize()); - + m_aCB_TicksInner.SetSizePixel( m_aCB_TicksInner.CalcMinimumSize() ); m_aCB_MinorInner.SetSizePixel( m_aCB_MinorInner.CalcMinimumSize() ); @@ -385,7 +385,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) m_aLB_PlaceLabels.Show(false); m_aFT_LabelDistance.Show(false); m_aED_LabelDistance.Show(false); - + m_aFL_Vertical.Show(false); m_aFT_PlaceTicks.Show(false); m_aLB_PlaceTicks.Show(false); @@ -414,7 +414,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) m_aLB_PlaceLabels.Enable(false); m_aFT_LabelDistance.Enable(false); m_aED_LabelDistance.Enable(false); - + m_aFL_Vertical.Enable(false); m_aFT_PlaceTicks.Enable(false); m_aLB_PlaceTicks.Enable(false); @@ -436,7 +436,7 @@ void AxisPositionsTabPage::SetNumFormatter( SvNumberFormatter* pFormatter ) m_pNumFormatter = pFormatter; m_aED_CrossesAt.SetFormatter( m_pNumFormatter ); m_aED_CrossesAt.UseInputStringForFormatting(); - + const SfxPoolItem *pPoolItem = NULL; if( GetItemSet().GetItemState( SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT, TRUE, &pPoolItem ) == SFX_ITEM_SET ) { @@ -488,7 +488,7 @@ IMPL_LINK ( AxisPositionsTabPage, PlaceLabelsSelectHdl, void *, EMPTYARG ) } m_aFT_PlaceTicks.Enable(bEnableTickmarkPlacement); m_aLB_PlaceTicks.Enable(bEnableTickmarkPlacement); - + return 0; } diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index 987812bea7c2..fbb7aefd9464 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -70,7 +70,7 @@ private: //member: ListBox m_aLB_CrossesAt; FormattedField m_aED_CrossesAt; ComboBox m_aED_CrossesAtCategory; - CheckBox m_aCB_AxisBetweenCategories; + CheckBox m_aCB_AxisBetweenCategories; FixedLine m_aFL_Labels; FixedText m_aFT_PlaceLabels; @@ -91,14 +91,14 @@ private: //member: FixedLine m_aFL_Vertical; FixedText m_aFT_PlaceTicks; ListBox m_aLB_PlaceTicks; - + FixedLine m_aFL_Grids; CheckBox m_aCB_MajorGrid; PushButton m_aPB_MajorGrid; CheckBox m_aCB_MinorGrid; PushButton m_aPB_MinorGrid; - SvNumberFormatter* m_pNumFormatter; + SvNumberFormatter* m_pNumFormatter; bool m_bCrossingAxisIsCategoryAxis; ::com::sun::star::uno::Sequence< rtl::OUString > m_aCategories; diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.src b/chart2/source/controller/dialogs/tp_AxisPositions.src index 8ce1ba39056a..80a42f55c353 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.src +++ b/chart2/source/controller/dialogs/tp_AxisPositions.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -70,7 +70,7 @@ TabPage TP_AXIS_POSITIONS Size = MAP_APPFONT ( 248 , 8 ) ; Text [ en-US ] = "Axis line" ; }; - + FixedText FT_CROSSES_OTHER_AXIS_AT { Pos = MAP_APPFONT ( X2 , Y1 ) ; @@ -87,7 +87,7 @@ TabPage TP_AXIS_POSITIONS Group = TRUE ; DropDown=TRUE; DDExtraWidth = TRUE ; - + StringList [ en-US ] = { "Start" ; @@ -113,7 +113,7 @@ TabPage TP_AXIS_POSITIONS DropDown = TRUE ; TabStop = TRUE ; }; - + CheckBox CB_AXIS_BETWEEN_CATEGORIES { Hide = TRUE; @@ -122,7 +122,7 @@ TabPage TP_AXIS_POSITIONS TabStop = TRUE ; Text [ en-US ] = "Axis ~between categories" ; }; - + FixedLine FL_LABELS { Pos = MAP_APPFONT ( X1 , Y3 ) ; @@ -145,7 +145,7 @@ TabPage TP_AXIS_POSITIONS Group = TRUE ; DropDown=TRUE; DDExtraWidth = TRUE ; - + StringList [ en-US ] = { "Near axis" ; @@ -154,7 +154,7 @@ TabPage TP_AXIS_POSITIONS "Outside end" ; }; }; - + FixedText FT_AXIS_LABEL_DISTANCE { Hide = TRUE; @@ -171,7 +171,7 @@ TabPage TP_AXIS_POSITIONS Size = MAP_APPFONT ( 89 , 12 ) ; TabStop = TRUE ; }; - + FixedLine FL_TICKS { Pos = MAP_APPFONT ( X1 , Y6 ) ; @@ -196,7 +196,7 @@ TabPage TP_AXIS_POSITIONS Size = MAP_APPFONT ( TICKWIDTH , 10 ) ; Text [ en-US ] = "~Outer"; }; - + FixedText FT_MINOR { Pos = MAP_APPFONT ( XTICK_1 , Y8 ) ; @@ -215,7 +215,7 @@ TabPage TP_AXIS_POSITIONS Size = MAP_APPFONT ( TICKWIDTH , 10 ) ; Text [ en-US ] = "O~uter"; }; - + FixedLine FL_VERTICAL { Hide = TRUE ; @@ -223,7 +223,7 @@ TabPage TP_AXIS_POSITIONS Size = MAP_APPFONT ( 6 , 25 ) ; Vert = TRUE ; }; - + FixedText FT_PLACE_TICKS { Pos = MAP_APPFONT ( X2 , Y9 ); @@ -240,7 +240,7 @@ TabPage TP_AXIS_POSITIONS Group = TRUE ; DropDown=TRUE; DDExtraWidth = TRUE ; - + StringList [ en-US ] = { "At labels" ; @@ -248,8 +248,8 @@ TabPage TP_AXIS_POSITIONS "At axis and labels" ; }; }; - - + + FixedLine FL_GRIDS { Hide = TRUE ; diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index d82879a93080..9fac7371cc9f 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -471,9 +471,9 @@ private: MetricField m_aMF_SplineOrder; FixedLine m_aFL_DialogButtons; - OKButton m_aBP_OK; - CancelButton m_aBP_Cancel; - HelpButton m_aBP_Help; + OKButton m_aBP_OK; + CancelButton m_aBP_Cancel; + HelpButton m_aBP_Help; }; SplinePropertiesDialog::SplinePropertiesDialog( Window* pParent ) @@ -506,7 +506,7 @@ void SplinePropertiesDialog::StateChanged( StateChangedType nType ) { Dialog::StateChanged( nType ); - if( nType == STATE_CHANGE_INITSHOW ) + if( nType == STATE_CHANGE_INITSHOW ) { adjustControlPositions(); adjustSize(); diff --git a/chart2/source/controller/dialogs/tp_ChartType.hrc b/chart2/source/controller/dialogs/tp_ChartType.hrc index dc017f836dc7..badea77502c5 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hrc +++ b/chart2/source/controller/dialogs/tp_ChartType.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -32,14 +32,14 @@ #define BTN_HELP 1 #define LB_3D_SCHEME 1 -#define LB_CHARTTYPE 2 +#define LB_CHARTTYPE 2 #define CT_CHARTVARIANT 3 #define FL_SPLINE_SEPARATOR 2 #define FL_SPLINE_DIALOGBUTTONS 3 -#define FT_CHARTTYPE 1 -#define FT_SPLINE_ORDER 3 +#define FT_CHARTTYPE 1 +#define FT_SPLINE_ORDER 3 #define FT_SPLINE_RESOLUTION 4 #define CB_X_AXIS_CATEGORIES 1 diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx index ecf0a2344484..ac6d5e3d9ad5 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hxx +++ b/chart2/source/controller/dialogs/tp_ChartType.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -73,8 +73,8 @@ public: , bool bDoLiveUpdate, bool bHideDescription = false ); virtual ~ChartTypeTabPage(); - virtual void initializePage(); - virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ); + virtual void initializePage(); + virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeTemplate > getCurrentTemplate() const; @@ -84,7 +84,7 @@ protected: void showAllControls( ChartTypeDialogController& rTypeController ); void fillAllControls( const ChartTypeParameter& rParameter, bool bAlsoResetSubTypeList=true ); ChartTypeParameter getCurrentParamter() const; - + virtual void stateChanged( ChangingResource* pResource ); void commitToModel( const ChartTypeParameter& rParameter ); diff --git a/chart2/source/controller/dialogs/tp_ChartType.src b/chart2/source/controller/dialogs/tp_ChartType.src index a9bb2a039f3c..639553e53a8a 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.src +++ b/chart2/source/controller/dialogs/tp_ChartType.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -164,7 +164,7 @@ TabPage TP_CHARTTYPE Size = MAP_APPFONT ( 12 , 14 ) ; Text [ en-US ] = "Properties..." ; }; - + CheckBox CB_XVALUE_SORTING { TabStop = TRUE ; @@ -172,7 +172,7 @@ TabPage TP_CHARTTYPE Size = MAP_APPFONT ( WIDTH_XVALUE_SORTING , 10 ) ; Text [ en-US ] = "~Sort by X values" ; }; - + }; ModalDialog DLG_SPLINE_PROPERTIES diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx index a53c205d9ecc..82016662d0ea 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.cxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx index ed49bd58cab7..a05816568102 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.hxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_DataLabel.src b/chart2/source/controller/dialogs/tp_DataLabel.src index 615e81c2c550..4907b3d8a5b8 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.src +++ b/chart2/source/controller/dialogs/tp_DataLabel.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index d7a2d9ac84c8..7433e723d1e2 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -145,7 +145,7 @@ OUString lcl_GetSequenceNameForLabel( ::chart::SeriesEntry * pEntry ) } static long lcl_pRoleListBoxTabs[] = - { 3, // Number of Tabs + { 3, // Number of Tabs 0, 0, 75 }; @@ -332,7 +332,7 @@ DataSourceTabPage::DataSourceTabPage( m_aEDT_CATEGORIES.SetModifyHdl( LINK( this, DataSourceTabPage, RangeModifiedHdl )); m_aEDT_RANGE.SetUpdateDataHdl( LINK( this, DataSourceTabPage, RangeUpdateDataHdl )); m_aEDT_CATEGORIES.SetUpdateDataHdl( LINK( this, DataSourceTabPage, RangeUpdateDataHdl )); - + // #i75179# enable setting the background to a different color m_aEDT_RANGE.SetStyle( m_aEDT_RANGE.GetStyle() | WB_FORCECTRLBACKGROUND ); m_aEDT_CATEGORIES.SetStyle( m_aEDT_CATEGORIES.GetStyle() | WB_FORCECTRLBACKGROUND ); diff --git a/chart2/source/controller/dialogs/tp_DataSource.hrc b/chart2/source/controller/dialogs/tp_DataSource.hrc index cf8147d5f775..07bf3b727293 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hrc +++ b/chart2/source/controller/dialogs/tp_DataSource.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index 291e3719a9a0..cac1fd774ecb 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -93,7 +93,7 @@ protected: //TabPage virtual void DeactivatePage(); - virtual void initializePage(); + virtual void initializePage(); DECL_LINK( SeriesSelectionChangedHdl, void* ); DECL_LINK( RoleSelectionChangedHdl, void* ); diff --git a/chart2/source/controller/dialogs/tp_DataSource.src b/chart2/source/controller/dialogs/tp_DataSource.src index 3e1f8a51c68a..da0a98caf44b 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.src +++ b/chart2/source/controller/dialogs/tp_DataSource.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx index 72aa5cfb25c6..e69a1d66a99c 100644 --- a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx +++ b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx index 2e38adc262c3..28ad904812f1 100644 --- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx +++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx index 14214eb4189a..b3761531213d 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx index cc581dd7afac..e8c380c47260 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.src b/chart2/source/controller/dialogs/tp_ErrorBars.src index 03748914255f..6d8efc0414f9 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.src +++ b/chart2/source/controller/dialogs/tp_ErrorBars.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -31,7 +31,7 @@ TabPage TP_YERRORBAR { Hide = TRUE ; -// HelpID = HID_SCH_STAT ; +// 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.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx index 9b7d34b72930..dfc225a729c1 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx index 521877af30b1..fa762b25dc2d 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -45,7 +45,7 @@ class LegendPositionResources; class SchLegendPosTabPage : public SfxTabPage { private: - FixedLine aGrpLegend; + FixedLine aGrpLegend; ::std::auto_ptr< LegendPositionResources > m_apLegendPositionResources; diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.src b/chart2/source/controller/dialogs/tp_LegendPosition.src index d910a5143293..cddd3f830f87 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.src +++ b/chart2/source/controller/dialogs/tp_LegendPosition.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_Location.cxx b/chart2/source/controller/dialogs/tp_Location.cxx index e13c1c2f9779..b87c8a8d248b 100644 --- a/chart2/source/controller/dialogs/tp_Location.cxx +++ b/chart2/source/controller/dialogs/tp_Location.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_Location.hrc b/chart2/source/controller/dialogs/tp_Location.hrc index 419daa68721f..0879118708e6 100644 --- a/chart2/source/controller/dialogs/tp_Location.hrc +++ b/chart2/source/controller/dialogs/tp_Location.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_Location.hxx b/chart2/source/controller/dialogs/tp_Location.hxx index 9b4120ce60b2..4d5cfe7e111b 100644 --- a/chart2/source/controller/dialogs/tp_Location.hxx +++ b/chart2/source/controller/dialogs/tp_Location.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_Location.src b/chart2/source/controller/dialogs/tp_Location.src index 6a921103f2e4..4fbac61b42c3 100644 --- a/chart2/source/controller/dialogs/tp_Location.src +++ b/chart2/source/controller/dialogs/tp_Location.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx index 5dd8f7cb44e6..4285101a4d28 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx index aafe7856aafe..6b46eda66a54 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.src b/chart2/source/controller/dialogs/tp_PointGeometry.src index 54c591c0865d..d136673244f8 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.src +++ b/chart2/source/controller/dialogs/tp_PointGeometry.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx index 267ccf81a60e..b73dd70c278d 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hrc b/chart2/source/controller/dialogs/tp_PolarOptions.hrc index b60e50fa654e..ee0d2aeac787 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.hrc +++ b/chart2/source/controller/dialogs/tp_PolarOptions.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx index 73ade4a4cecb..2858e8a5867d 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -49,7 +49,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); virtual BOOL FillItemSet(SfxItemSet& rOutAttrs); virtual void Reset(const SfxItemSet& rInAttrs); - + private: CheckBox m_aCB_Clockwise; FixedLine m_aFL_StartingAngle; diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.src b/chart2/source/controller/dialogs/tp_PolarOptions.src index 237fa027b55f..f752f9483fd5 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.src +++ b/chart2/source/controller/dialogs/tp_PolarOptions.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -49,7 +49,7 @@ TabPage TP_POLAROPTIONS }; Control CT_ANGLE_DIAL { - HelpId = HID_SCH_STARTING_ANGLE_DIAL ; + HelpId = HID_SCH_STARTING_ANGLE_DIAL ; Pos = MAP_APPFONT ( 12 , 38 ) ; Size = MAP_APPFONT ( 43 , 43 ) ; }; diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index 4235a7bfcdc4..24bd8948917f 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hrc b/chart2/source/controller/dialogs/tp_RangeChooser.hrc index d7b593fc4f45..a7300a02202a 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hrc +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx index 32db55b345a2..ed169fbebcc0 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.src b/chart2/source/controller/dialogs/tp_RangeChooser.src index de07c9763b7d..69d6562cf6f0 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.src +++ b/chart2/source/controller/dialogs/tp_RangeChooser.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 039fcc9e599a..a26c2150958b 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -113,14 +113,14 @@ ScaleTabPage::ScaleTabPage(Window* pWindow,const SfxItemSet& rInAttrs) : aTxtHelp (this, SchResId (TXT_STEP_HELP)), aMtStepHelp (this, SchResId (MT_STEPHELP)), aCbxAutoStepHelp(this, SchResId(CBX_AUTO_STEP_HELP)), - + aTxtOrigin (this, SchResId (TXT_ORIGIN)), aFmtFldOrigin(this, SchResId(EDT_ORIGIN)), aCbxAutoOrigin(this, SchResId(CBX_AUTO_ORIGIN)), aCbxLogarithm(this, SchResId(CBX_LOGARITHM)), aCbxReverse(this, SchResId(CBX_REVERSE)), - + fMin(0.0), fMax(0.0), fStepMain(0.0), @@ -144,10 +144,10 @@ void ScaleTabPage::StateChanged( StateChangedType nType ) { TabPage::StateChanged( nType ); - if( nType == STATE_CHANGE_INITSHOW ) + if( nType == STATE_CHANGE_INITSHOW ) AdjustControlPositions(); } - + void ScaleTabPage::AdjustControlPositions() { //optimize position of the controls @@ -166,7 +166,7 @@ void ScaleTabPage::AdjustControlPositions() aCbxAutoStepMain.SetSizePixel( aCbxAutoStepMain.CalcMinimumSize() ); aCbxAutoStepHelp.SetSizePixel( aCbxAutoStepHelp.CalcMinimumSize() ); aCbxAutoOrigin.SetSizePixel( aCbxAutoOrigin.CalcMinimumSize() ); - + //ensure new pos is ok long nWidthOfOtherControls = aCbxAutoMin.GetPosPixel().X() + aCbxAutoMin.GetSizePixel().Width() - aFmtFldMin.GetPosPixel().X(); long nDialogWidth = GetSizePixel().Width(); @@ -181,7 +181,7 @@ void ScaleTabPage::AdjustControlPositions() aTxtMain.SetSizePixel(aSize); aTxtHelp.SetSizePixel(aSize); aTxtOrigin.SetSizePixel(aSize); - + lcl_shiftControls( aFmtFldMin, aCbxAutoMin, nNewXPos ); lcl_shiftControls( aFmtFldMax, aCbxAutoMax, nNewXPos ); lcl_shiftControls( aFmtFldStepMain, aCbxAutoStepMain, nNewXPos ); @@ -255,16 +255,16 @@ BOOL ScaleTabPage::FillItemSet(SfxItemSet& rOutAttrs) { DBG_ASSERT( pNumFormatter, "No NumberFormatter available" ); - rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MIN ,aCbxAutoMin.IsChecked())); - rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MAX ,aCbxAutoMax.IsChecked())); + rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MIN ,aCbxAutoMin.IsChecked())); + rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MAX ,aCbxAutoMax.IsChecked())); rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_HELP,aCbxAutoStepHelp.IsChecked())); rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_ORIGIN ,aCbxAutoOrigin.IsChecked())); rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_LOGARITHM ,aCbxLogarithm.IsChecked())); rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_REVERSE ,aCbxReverse.IsChecked())); - rOutAttrs.Put(SvxDoubleItem(fMax , SCHATTR_AXIS_MAX)); - rOutAttrs.Put(SvxDoubleItem(fMin , SCHATTR_AXIS_MIN)); + rOutAttrs.Put(SvxDoubleItem(fMax , SCHATTR_AXIS_MAX)); + rOutAttrs.Put(SvxDoubleItem(fMin , SCHATTR_AXIS_MIN)); rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_STEP_HELP, nStepHelp)); - rOutAttrs.Put(SvxDoubleItem(fOrigin , SCHATTR_AXIS_ORIGIN)); + rOutAttrs.Put(SvxDoubleItem(fOrigin , SCHATTR_AXIS_ORIGIN)); rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_MAIN,aCbxAutoStepMain.IsChecked())); rOutAttrs.Put(SvxDoubleItem(fStepMain,SCHATTR_AXIS_STEP_MAIN)); @@ -385,7 +385,7 @@ int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) pEdit = &aFmtFldStepMain; nErrStrId = STR_STEP_GT_ZERO; } - + //check wich entries need user action // check for entries that cannot be parsed for the current number format @@ -422,7 +422,7 @@ int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) pEdit = &aFmtFldStepMain; nErrStrId = STR_STEP_GT_ZERO; } - + if( ShowWarning( nErrStrId, pEdit ) ) return KEEP_PAGE; @@ -439,7 +439,7 @@ void ScaleTabPage::SetNumFormatter( SvNumberFormatter* pFormatter ) aFmtFldMin.SetFormatter( pNumFormatter ); aFmtFldStepMain.SetFormatter( pNumFormatter ); aFmtFldOrigin.SetFormatter( pNumFormatter ); - + // #101318#, #i6278# allow more decimal places than the output format. As // the numbers shown in the edit fields are used for input, it makes more // sense to display the values in the input format rather than the output @@ -448,7 +448,7 @@ void ScaleTabPage::SetNumFormatter( SvNumberFormatter* pFormatter ) aFmtFldMin.UseInputStringForFormatting(); aFmtFldStepMain.UseInputStringForFormatting(); aFmtFldOrigin.UseInputStringForFormatting(); - + SetNumFormat(); } diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index 47745657dd53..0650deeee2d2 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -63,46 +63,46 @@ public: virtual void StateChanged( StateChangedType nType ); private: - FixedLine aFlScale; + FixedLine aFlScale; - FixedText aTxtMin; - FormattedField aFmtFldMin; - CheckBox aCbxAutoMin; + FixedText aTxtMin; + FormattedField aFmtFldMin; + CheckBox aCbxAutoMin; - FixedText aTxtMax; - FormattedField aFmtFldMax; - CheckBox aCbxAutoMax; + FixedText aTxtMax; + FormattedField aFmtFldMax; + CheckBox aCbxAutoMax; FixedText aTxtMain; - FormattedField aFmtFldStepMain; - CheckBox aCbxAutoStepMain; + FormattedField aFmtFldStepMain; + CheckBox aCbxAutoStepMain; FixedText aTxtHelp; MetricField aMtStepHelp; - CheckBox aCbxAutoStepHelp; + CheckBox aCbxAutoStepHelp; FixedText aTxtOrigin; - FormattedField aFmtFldOrigin; - CheckBox aCbxAutoOrigin; - - CheckBox aCbxLogarithm; + FormattedField aFmtFldOrigin; + CheckBox aCbxAutoOrigin; + + CheckBox aCbxLogarithm; CheckBox aCbxReverse; - - double fMin; - double fMax; - double fStepMain; + + double fMin; + double fMax; + double fStepMain; sal_Int32 nStepHelp; - double fOrigin; + double fOrigin; int nAxisType; - SvNumberFormatter* pNumFormatter; + SvNumberFormatter* pNumFormatter; bool m_bShowAxisOrigin; - + void AdjustControlPositions(); void EnableControls(); - + DECL_LINK( EnableValueHdl, CheckBox* ); - + /** shows a warning window due to an invalid input. @param nResIdMessage diff --git a/chart2/source/controller/dialogs/tp_Scale.src b/chart2/source/controller/dialogs/tp_Scale.src index b53adeaa512f..7ff88bfc6158 100644 --- a/chart2/source/controller/dialogs/tp_Scale.src +++ b/chart2/source/controller/dialogs/tp_Scale.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -77,7 +77,7 @@ TabPage TP_SCALE TabStop = TRUE ; Text [ en-US ] = "~Automatic" ; }; - + FixedText TXT_MAX { Pos = MAP_APPFONT ( X2 , Y2 ) ; @@ -148,7 +148,7 @@ TabPage TP_SCALE TabStop = TRUE ; Text [ en-US ] = "Aut~omatic" ; }; - + FixedText TXT_ORIGIN { Pos = MAP_APPFONT ( X2 , Y5 ) ; @@ -170,7 +170,7 @@ TabPage TP_SCALE TabStop = TRUE ; Text [ en-US ] = "Automat~ic" ; }; - + CheckBox CBX_LOGARITHM { Pos = MAP_APPFONT ( X2 , Y6 ) ; @@ -178,7 +178,7 @@ TabPage TP_SCALE TabStop = TRUE ; Text [ en-US ] = "~Logarithmic scale" ; }; - + CheckBox CBX_REVERSE { Pos = MAP_APPFONT ( X2 , Y7 ) ; @@ -186,5 +186,5 @@ TabPage TP_SCALE TabStop = TRUE ; Text [ en-US ] = "~Reverse direction" ; }; - + }; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index b99675652084..7a21609d949e 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -64,11 +64,11 @@ SchOptionTabPage::SchOptionTabPage(Window* pWindow,const SfxItemSet& rInAttrs) : aCBConnect(this,SchResId(CB_CONNECTOR)), aCBAxisSideBySide(this,SchResId(CB_BARS_SIDE_BY_SIDE)), m_aFL_PlotOptions(this,SchResId(FL_PLOT_OPTIONS)), - m_aFT_MissingValues(this,SchResId(FT_MISSING_VALUES)), + m_aFT_MissingValues(this,SchResId(FT_MISSING_VALUES)), m_aRB_DontPaint(this,SchResId(RB_DONT_PAINT)), m_aRB_AssumeZero(this,SchResId(RB_ASSUME_ZERO)), m_aRB_ContinueLine(this,SchResId(RB_CONTINUE_LINE)), - m_aCBIncludeHiddenCells(this,SchResId(CB_INCLUDE_HIDDEN_CELLS)), + m_aCBIncludeHiddenCells(this,SchResId(CB_INCLUDE_HIDDEN_CELLS)), m_bProvidesSecondaryYAxis(true), m_bProvidesOverlapAndGapWidth(false) { @@ -159,13 +159,13 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs) nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue(); aMTOverlap.SetValue(nTmp); } - + if (rInAttrs.GetItemState(SCHATTR_BAR_CONNECT, TRUE, &pPoolItem) == SFX_ITEM_SET) { BOOL bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue(); aCBConnect.Check(bCheck); } - + if (rInAttrs.GetItemState(SCHATTR_AXIS_FOR_ALL_SERIES, TRUE, &pPoolItem) == SFX_ITEM_SET) { m_nAllSeriesAxisIndex = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue(); @@ -195,7 +195,7 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs) m_aRB_DontPaint.Enable(FALSE); m_aRB_AssumeZero.Enable(FALSE); m_aRB_ContinueLine.Enable(FALSE); - + for( sal_Int32 nN =0; nN<aMissingValueTreatments.getLength(); nN++ ) { sal_Int32 nVal = aMissingValueTreatments[nN]; @@ -268,12 +268,12 @@ void SchOptionTabPage::AdaptControlPositionsAndVisibility() aMTGap.Show(m_bProvidesOverlapAndGapWidth); aFTGap.Show(m_bProvidesOverlapAndGapWidth); - + aMTOverlap.Show(m_bProvidesOverlapAndGapWidth); aFTOverlap.Show(m_bProvidesOverlapAndGapWidth); aCBConnect.Show(m_bProvidesBarConnectors); - + if( !aMTGap.IsVisible() && !aMTOverlap.IsVisible() ) { aGrpBar.Show(FALSE); @@ -302,7 +302,7 @@ void SchOptionTabPage::AdaptControlPositionsAndVisibility() lcl_offsetControl(m_aRB_DontPaint, nXOffset, 0); lcl_offsetControl(m_aRB_AssumeZero, nXOffset, 0); lcl_offsetControl(m_aRB_ContinueLine, nXOffset, 0); - + if( !m_aFT_MissingValues.IsVisible() ) { //for example for stock charts diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hrc b/chart2/source/controller/dialogs/tp_SeriesToAxis.hrc index 814a148a2ef5..52746c452fd3 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hrc +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -27,15 +27,15 @@ #include "ResourceIds.hrc" -#define GRP_OPT_AXIS 1 -#define RBT_OPT_AXIS_1 2 -#define RBT_OPT_AXIS_2 3 -#define MT_GAP 4 -#define MT_OVERLAP 5 -#define FT_GAP 6 -#define FT_OVERLAP 7 -#define GB_BAR 8 -#define CB_CONNECTOR 9 +#define GRP_OPT_AXIS 1 +#define RBT_OPT_AXIS_1 2 +#define RBT_OPT_AXIS_2 3 +#define MT_GAP 4 +#define MT_OVERLAP 5 +#define FT_GAP 6 +#define FT_OVERLAP 7 +#define GB_BAR 8 +#define CB_CONNECTOR 9 #define CB_BARS_SIDE_BY_SIDE 10 #define FL_PLOT_OPTIONS 11 #define FT_MISSING_VALUES 12 diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx index baa8c5e8b4d1..353fa3474bf6 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -58,16 +58,16 @@ private: //methods void AdaptControlPositionsAndVisibility(); private: //member - FixedLine aGrpAxis; + FixedLine aGrpAxis; RadioButton aRbtAxis1; RadioButton aRbtAxis2; - FixedLine aGrpBar; + FixedLine aGrpBar; FixedText aFTGap; MetricField aMTGap; FixedText aFTOverlap; MetricField aMTOverlap; - CheckBox aCBConnect; + CheckBox aCBConnect; CheckBox aCBAxisSideBySide; FixedLine m_aFL_PlotOptions; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.src b/chart2/source/controller/dialogs/tp_SeriesToAxis.src index 7dab3449cb32..e30c166c8f01 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.src +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -127,7 +127,7 @@ TabPage TP_OPTIONS TabStop = TRUE ; Text [ en-US ] = "Show ~bars side by side"; }; - + FixedLine FL_PLOT_OPTIONS { Pos = MAP_APPFONT ( 6 , 113 ) ; @@ -141,31 +141,31 @@ TabPage TP_OPTIONS Size = MAP_APPFONT ( 80 , 8 ) ; Text [ en-US ] = "Plot missing values"; }; - + RadioButton RB_DONT_PAINT { Pos = MAP_APPFONT ( 82 , 127 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "~Leave gap"; + Text [ en-US ] = "~Leave gap"; }; - + RadioButton RB_ASSUME_ZERO { Pos = MAP_APPFONT ( 82 , 141 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "~Assume zero"; + Text [ en-US ] = "~Assume zero"; }; - + RadioButton RB_CONTINUE_LINE { Pos = MAP_APPFONT ( 82 , 155 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "~Continue line"; + Text [ en-US ] = "~Continue line"; }; - + CheckBox CB_INCLUDE_HIDDEN_CELLS { Pos = MAP_APPFONT ( 12 , 172 ) ; diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index 89e6545aa79a..f21fa6af87b6 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx index 190bbcaf1d42..cb89dd1b6cc9 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.src b/chart2/source/controller/dialogs/tp_TitleRotation.src index 2ac0355d39af..ec17cfdae2ac 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.src +++ b/chart2/source/controller/dialogs/tp_TitleRotation.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx index 97859daa14fc..e65b6d281909 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.cxx +++ b/chart2/source/controller/dialogs/tp_Trendline.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx index d4d3726c01a2..973ec78462ab 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.hxx +++ b/chart2/source/controller/dialogs/tp_Trendline.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_Trendline.src b/chart2/source/controller/dialogs/tp_Trendline.src index efa11d3e2d67..16c7eff17f89 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.src +++ b/chart2/source/controller/dialogs/tp_Trendline.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -31,7 +31,7 @@ TabPage TP_TRENDLINE { Hide = TRUE ; -// HelpID = HID_SCH_STAT ; +// 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.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx index 792ae2faef74..1dc3a00fc7b8 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc index 44c340139782..da7edf4aea6c 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx index 11daa6bffcf0..26cee6bffa7d 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -59,8 +59,8 @@ public: ::com::sun::star::uno::XComponentContext >& xContext ); virtual ~TitlesAndObjectsTabPage(); - virtual void initializePage(); - virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ); + virtual void initializePage(); + virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ); virtual bool canAdvance() const; protected: @@ -70,7 +70,7 @@ protected: protected: FixedText m_aFT_TitleDescription; FixedLine m_aFL_Vertical; - + ::std::auto_ptr< TitleResources > m_apTitleResources; ::std::auto_ptr< LegendPositionResources > m_apLegendPositionResources; diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src index a17f5655e751..41fa87c916a8 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src @@ -1,7 +1,7 @@ /************************************************************************* * * 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 |