diff options
| author | Björn Milcke <bm@openoffice.org> | 2004-01-26 08:13:31 +0000 |
|---|---|---|
| committer | Björn Milcke <bm@openoffice.org> | 2004-01-26 08:13:31 +0000 |
| commit | 3fe1d17a07180c843fd376763e27c72a529b75b2 (patch) | |
| tree | 585d2722e8c23653efed23273d6ca7aae2e20e48 | |
| parent | ae900510614be862923fdc70e47dc7ccccb894d4 (diff) | |
drafts namespace of API removed
public API moved to offapi
Calc as DataEditor - first integration
206 files changed, 2357 insertions, 1895 deletions
diff --git a/chart2/MANIFEST b/chart2/MANIFEST index 44d50050fb3c..39d3198c9860 100644 --- a/chart2/MANIFEST +++ b/chart2/MANIFEST @@ -55,7 +55,7 @@ Directory Structure ------------------- -+--drafts ++--com +--genjava +--inc +--prj @@ -146,10 +146,12 @@ source Axes, charttypes and diagram implement the respective view-objects. -drafts ------- +com +--- -Contains idl files for chart specific idl interface and type definitions. +Contains idl files for chart specific idl interface and type definitions. This +is the so-called "private" API. The public part of the API (used from outside, +esp. other applications) is in the offapi project. util ---- @@ -188,8 +190,8 @@ Contains a makefile for creating java-files out of the idl-files. The java-files are generated out of the chart.rdb, which therefore must be ready before this makefile is called. -Its subdirectories reflect the directory-structure of the drafts/com directories -and contain a makefile in each leave of the tree. These makefiles compile +Its subdirectories reflect the directory-structure of the com directories and +contain a makefile in each leave of the tree. These makefiles compile class-files out of the java-files. qa diff --git a/chart2/NOTES b/chart2/NOTES index 69a49fe9e4df..471bc617a352 100644 --- a/chart2/NOTES +++ b/chart2/NOTES @@ -2,9 +2,9 @@ # # $RCSfile: NOTES,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: bm $ $Date: 2004-01-19 11:05:20 $ +# last change: $Author: bm $ $Date: 2004-01-26 09:11:43 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -142,12 +142,3 @@ Testing * You can also create a chart from spreadsheet data. * To run a test for the old API run "dmake" in the qa subdirectory. - -ToDo ----- - -* Remove "drafts" from *every* UNO-IDL object. - -* Split API into public part (used by other applications) and a private part - that remains in the chart2 project. The public part has to go to the offapi - project. diff --git a/chart2/prj/build.lst b/chart2/prj/build.lst index ded81c435c67..09ef18eae268 100644 --- a/chart2/prj/build.lst +++ b/chart2/prj/build.lst @@ -1,7 +1,7 @@ ch chart2 : apphelper comphelper cppu cppuhelper sal sv svl svtool svx tk tools vcl NULL ch chart2 usr1 - all ch_mkout NULL -ch chart2\drafts\com\sun\star\chart2 nmake - all ch_uno_chart2 NULL -ch chart2\drafts\com\sun\star\layout nmake - all ch_uno_layout NULL +ch chart2\com\sun\star\chart2 nmake - all ch_uno_chart2 NULL +ch chart2\com\sun\star\layout nmake - all ch_uno_layout NULL ch chart2\util nmake - all ch_uno ch_uno_chart2 ch_uno_layout NULL ch chart2\source\inc get - all ch_source_inc NULL ch chart2\source\inc\chartview get - all ch_source_inc_chartview NULL @@ -27,5 +27,5 @@ ch chart2\source\controller\chartapiwrapper nmake - all ch_source_controlle ch chart2\source\controller\main nmake - all ch_source_controller_main ch_uno NULL ch chart2\prj get - all ch_prj NULL ch chart2\genjava nmake - all ch_java ch_uno NULL -ch chart2\genjava\drafts\com\sun\star\layout nmake - all ch_class_layout ch_java NULL -ch chart2\genjava\drafts\com\sun\star\chart2 nmake - all ch_class_chart2 ch_class_layout ch_java NULL +ch chart2\genjava\com\sun\star\layout nmake - all ch_class_layout ch_java NULL +ch chart2\genjava\com\sun\star\chart2 nmake - all ch_class_chart2 ch_class_layout ch_java NULL diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index d561dbf98b49..3e5c548806ec 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AxisWrapper.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-18 13:49:18 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,7 +86,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; using ::property::OPropertySet; @@ -348,7 +347,7 @@ namespace wrapper AxisWrapper::AxisWrapper( eAxisType eType, const uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > & xDia, + ::com::sun::star::chart2::XDiagram > & xDia, const uno::Reference< uno::XComponentContext > & xContext, ::osl::Mutex & _rMutex ) : OPropertySet( _rMutex ), diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx index c4f9da1bcb9a..931bf257c926 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: AxisWrapper.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-18 13:49:35 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,21 +84,19 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ -#include <drafts/com/sun/star/chart2/XDiagram.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ +#include <com/sun/star/chart2/XDiagram.hpp> #endif #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> #endif -namespace drafts { namespace com { namespace sun { namespace star { namespace chart2 { class XAxis; } }}} -} namespace chart { @@ -129,7 +127,7 @@ public: AxisWrapper( eAxisType eType, const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > & xDia, + ::com::sun::star::chart2::XDiagram > & xDia, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, ::osl::Mutex & _rMutex ); @@ -197,11 +195,11 @@ private: m_aEventListenerContainer; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > + ::com::sun::star::chart2::XDiagram > m_xDiagram; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XAxis > + ::com::sun::star::chart2::XAxis > m_xAxis; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index b9a73f676997..cbe6cb03fbd0 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartDataWrapper.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-18 13:49:35 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,11 +65,14 @@ #ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTITLED_HPP_ -#include <drafts/com/sun/star/chart2/XTitled.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTITLED_HPP_ +#include <com/sun/star/chart2/XTitled.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XNUMERICALDATASEQUENCE_HPP_ -#include <drafts/com/sun/star/chart2/XNumericalDataSequence.hpp> +#ifndef _COM_SUN_STAR_CHART2_XNUMERICALDATASEQUENCE_HPP_ +#include <com/sun/star/chart2/XNumericalDataSequence.hpp> +#endif +#ifndef _COM_SUN_STAR_CHART2_XDATASOURCE_HPP_ +#include <com/sun/star/chart2/XDataSource.hpp> #endif #include "CharacterProperties.hxx" @@ -83,7 +86,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::osl::MutexGuard; namespace @@ -112,7 +114,7 @@ void lcl_addValueSequence( uno::Reference< chart2::XDataSeriesTreeParent > xPare { ::rtl::OUString aRole; if( ( xProp->getPropertyValue( C2U( "Role" )) >>= aRole ) && - aRole.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "values" )) ) + aRole.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "y-values" )) ) { rOutSeqVector.push_back( aSequences[ j ] ); } @@ -167,7 +169,7 @@ namespace wrapper { ChartDataWrapper::ChartDataWrapper( const uno::Reference< - ::drafts::com::sun::star::chart2::XChartDocument > & xModel, + ::com::sun::star::chart2::XChartDocument > & xModel, const uno::Reference< uno::XComponentContext > & xContext, ::osl::Mutex & rMutex ) : m_rMutex( rMutex ), diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx index 9604a6b1afb5..6b12b889f40f 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartDataWrapper.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-18 13:49:35 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,8 +80,8 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ -#include <drafts/com/sun/star/chart2/XChartDocument.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ +#include <com/sun/star/chart2/XChartDocument.hpp> #endif #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> @@ -100,7 +100,7 @@ class ChartDataWrapper : public { public: ChartDataWrapper( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartDocument > & xModel, + ::com::sun::star::chart2::XChartDocument > & xModel, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, ::osl::Mutex & rMutex ); @@ -161,7 +161,7 @@ private: m_xContext; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartDocument > + ::com::sun::star::chart2::XChartDocument > m_xChartDoc; ::cppu::OInterfaceContainerHelper diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index a4788c6c8f03..96406ab3fabf 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartDocumentWrapper.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-18 13:49:36 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,8 +72,8 @@ #ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ #include <com/sun/star/lang/DisposedException.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTITLED_HPP_ -#include <drafts/com/sun/star/chart2/XTitled.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTITLED_HPP_ +#include <com/sun/star/chart2/XTitled.hpp> #endif #include <vector> @@ -81,7 +81,6 @@ #include <functional> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using namespace ::com::sun::star::chart; using ::com::sun::star::uno::Reference; @@ -755,7 +754,7 @@ uno::Sequence< ::rtl::OUString > ChartDocumentWrapper::getSupportedServiceNames_ { uno::Sequence< ::rtl::OUString > aServices( 4 ); aServices[ 0 ] = C2U( "com.sun.star.chart.ChartDocument" ); - aServices[ 1 ] = C2U( "drafts.com.sun.star.chart2.ChartDocumentWrapper" ); + aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartDocumentWrapper" ); aServices[ 2 ] = C2U( "com.sun.star.xml.UserDefinedAttributeSupplier" ); aServices[ 3 ] = C2U( "com.sun.star.beans.PropertySet" ); return aServices; diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index 4d38cf09e799..1053547893a6 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DataSeriesPointWrapper.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: bm $ $Date: 2003-12-19 15:07:03 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,11 +73,11 @@ #ifndef _COM_SUN_STAR_CHART_CHARTDATACAPTION_HPP_ #include <com/sun/star/chart/ChartDataCaption.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_DATAPOINTLABEL_HPP_ -#include <drafts/com/sun/star/chart2/DataPointLabel.hpp> +#ifndef _COM_SUN_STAR_CHART2_DATAPOINTLABEL_HPP_ +#include <com/sun/star/chart2/DataPointLabel.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ -#include <drafts/com/sun/star/chart2/TransparencyStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ +#include <com/sun/star/chart2/TransparencyStyle.hpp> #endif #ifndef _COM_SUN_STAR_CHART_CHARTERRORCATEGORY_HPP_ @@ -102,7 +102,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; using ::property::OPropertySet; diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index 35f77f8a81b9..87f12eb1eb05 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: DataSeriesPointWrapper.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: bm $ $Date: 2003-12-19 15:06:43 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,8 +88,8 @@ #include <com/sun/star/uno/XComponentContext.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASERIES_HPP_ -#include <drafts/com/sun/star/chart2/XDataSeries.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASERIES_HPP_ +#include <com/sun/star/chart2/XDataSeries.hpp> #endif namespace chart diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 4b10cfe9d28b..c43014db931f 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DiagramWrapper.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-18 13:49:37 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,11 +70,11 @@ #ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTITLED_HPP_ -#include <drafts/com/sun/star/chart2/XTitled.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTITLED_HPP_ +#include <com/sun/star/chart2/XTitled.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPEGROUP_HPP_ -#include <drafts/com/sun/star/chart2/XChartTypeGroup.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPEGROUP_HPP_ +#include <com/sun/star/chart2/XChartTypeGroup.hpp> #endif #include "LineProperties.hxx" @@ -88,7 +88,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; using ::property::OPropertySet; diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index 390c4db05a70..742ca0e17499 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: DiagramWrapper.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-18 13:49:37 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -102,27 +102,25 @@ #include <com/sun/star/lang/XEventListener.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ -#include <drafts/com/sun/star/chart2/XDiagram.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ +#include <com/sun/star/chart2/XDiagram.hpp> #endif #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDIAGRAMPROVIDER_HPP_ -#include <drafts/com/sun/star/chart2/XDiagramProvider.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDIAGRAMPROVIDER_HPP_ +#include <com/sun/star/chart2/XDiagramProvider.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPETEMPLATE_HPP_ -#include <drafts/com/sun/star/chart2/XChartTypeTemplate.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPETEMPLATE_HPP_ +#include <com/sun/star/chart2/XChartTypeTemplate.hpp> #endif -namespace drafts { namespace com { namespace sun { namespace star { namespace chart2 { class XTitle; } }}} -} namespace chart { @@ -141,7 +139,7 @@ typedef ::cppu::WeakImplHelper10< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XComponent, ::com::sun::star::lang::XEventListener, - ::drafts::com::sun::star::chart2::XDiagramProvider > + ::com::sun::star::chart2::XDiagramProvider > DiagramWrapper_Base; } @@ -152,7 +150,7 @@ class DiagramWrapper : public: DiagramWrapper( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > & xDia, + ::com::sun::star::chart2::XDiagram > & xDia, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, ::osl::Mutex & _rMutex ); @@ -311,10 +309,10 @@ protected: // ____ XDiagramProvider ____ virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > SAL_CALL getDiagram() + ::com::sun::star::chart2::XDiagram > SAL_CALL getDiagram() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDiagram( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram >& xDiagram ) + ::com::sun::star::chart2::XDiagram >& xDiagram ) throw (::com::sun::star::uno::RuntimeException); private: @@ -328,7 +326,7 @@ private: m_aEventListenerContainer; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > + ::com::sun::star::chart2::XDiagram > m_xDiagram; ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index c6c0e916755a..1057d988c762 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: LegendWrapper.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-18 13:49:37 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,17 +66,17 @@ #ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTITLED_HPP_ -#include <drafts/com/sun/star/chart2/XTitled.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTITLED_HPP_ +#include <com/sun/star/chart2/XTitled.hpp> #endif #ifndef _COM_SUN_STAR_CHART_CHARTLEGENDPOSITION_HPP_ #include <com/sun/star/chart/ChartLegendPosition.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_LEGENDPOSITION_HPP_ -#include <drafts/com/sun/star/chart2/LegendPosition.hpp> +#ifndef _COM_SUN_STAR_CHART2_LEGENDPOSITION_HPP_ +#include <com/sun/star/chart2/LegendPosition.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_LEGENDEXPANSION_HPP_ -#include <drafts/com/sun/star/chart2/LegendExpansion.hpp> +#ifndef _COM_SUN_STAR_CHART2_LEGENDEXPANSION_HPP_ +#include <com/sun/star/chart2/LegendExpansion.hpp> #endif #include "CharacterProperties.hxx" @@ -91,7 +91,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; @@ -189,7 +188,7 @@ namespace wrapper LegendWrapper::LegendWrapper( const uno::Reference< - ::drafts::com::sun::star::chart2::XChartDocument > & xModel, + ::com::sun::star::chart2::XChartDocument > & xModel, const uno::Reference< uno::XComponentContext > & xContext, ::osl::Mutex & _rMutex ) : OPropertySet( _rMutex ), diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx index 505320a65df8..625d7a3a23f2 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: LegendWrapper.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-18 13:49:38 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,24 +84,22 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ -#include <drafts/com/sun/star/chart2/XChartDocument.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ +#include <com/sun/star/chart2/XChartDocument.hpp> #endif #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XLEGEND_HPP_ -#include <drafts/com/sun/star/chart2/XLegend.hpp> +#ifndef _COM_SUN_STAR_CHART2_XLEGEND_HPP_ +#include <com/sun/star/chart2/XLegend.hpp> #endif -namespace drafts { namespace com { namespace sun { namespace star { namespace chart2 { class XTitle; } }}} -} namespace chart { @@ -123,7 +121,7 @@ class LegendWrapper : { public: LegendWrapper( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartDocument > & xModel, + ::com::sun::star::chart2::XChartDocument > & xModel, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, ::osl::Mutex & _rMutex ); @@ -204,11 +202,11 @@ private: m_aEventListenerContainer; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartDocument > + ::com::sun::star::chart2::XChartDocument > m_xChartDoc; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XLegend > + ::com::sun::star::chart2::XLegend > m_xLegend; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 1a5e60a82b44..b40b502f6ddb 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: TitleWrapper.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-18 13:49:38 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -194,7 +194,7 @@ namespace wrapper TitleWrapper::TitleWrapper( const uno::Reference< - ::drafts::com::sun::star::chart2::XTitle > & xTitle, + ::com::sun::star::chart2::XTitle > & xTitle, const uno::Reference< uno::XComponentContext > & xContext, ::osl::Mutex & _rMutex ) : OPropertySet( _rMutex ), @@ -347,12 +347,12 @@ void SAL_CALL TitleWrapper::setFastPropertyValue_NoBroadcast { uno::Sequence< uno::Reference< - ::drafts::com::sun::star::chart2::XFormattedString > > + ::com::sun::star::chart2::XFormattedString > > aStrings( 1 ); aStrings[ 0 ].set( m_xContext->getServiceManager()->createInstanceWithContext( - C2U( "drafts.com.sun.star.chart2.FormattedString" ), + C2U( "com.sun.star.chart2.FormattedString" ), m_xContext ), uno::UNO_QUERY ); @@ -410,7 +410,7 @@ void SAL_CALL TitleWrapper::getFastPropertyValue { uno::Sequence< uno::Reference< - ::drafts::com::sun::star::chart2::XFormattedString > > + ::com::sun::star::chart2::XFormattedString > > aStrings( m_xTitle->getText()); ::rtl::OUStringBuffer aBuf; @@ -450,7 +450,7 @@ void TitleWrapper::getFastCharacterPropertyValue( { uno::Sequence< uno::Reference< - ::drafts::com::sun::star::chart2::XFormattedString > > + ::com::sun::star::chart2::XFormattedString > > aStrings( m_xTitle->getText()); if( aStrings.getLength() > 0 ) @@ -477,7 +477,7 @@ void TitleWrapper::setFastCharacterPropertyValue( { uno::Sequence< uno::Reference< - ::drafts::com::sun::star::chart2::XFormattedString > > + ::com::sun::star::chart2::XFormattedString > > aStrings( m_xTitle->getText()); for( sal_Int32 i = 0; i < aStrings.getLength(); ++i ) diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index f66a534aed37..9e427e2d0ed8 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: TitleWrapper.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-18 13:49:39 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,21 +84,19 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTITLE_HPP_ -#include <drafts/com/sun/star/chart2/XTitle.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTITLE_HPP_ +#include <com/sun/star/chart2/XTitle.hpp> #endif #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> #endif -namespace drafts { namespace com { namespace sun { namespace star { namespace chart2 { class XTitle; } }}} -} namespace chart { @@ -120,7 +118,7 @@ class TitleWrapper : { public: TitleWrapper( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTitle > & xTitle, + ::com::sun::star::chart2::XTitle > & xTitle, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, ::osl::Mutex & _rMutex ); @@ -209,7 +207,7 @@ private: m_aEventListenerContainer; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTitle > + ::com::sun::star::chart2::XTitle > m_xTitle; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index 5a78bcf825fd..80b4a9f5ee3a 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dlg_ChartType.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: bm $ $Date: 2003-11-20 18:12:22 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,6 @@ #include "chmod3d.hxx" #include "schattr.hxx" -// TVM: CHTYPE wurde ins Model verschoben */ #include "dlg_ChartType.hxx" @@ -141,7 +140,6 @@ //#define CHTYPE_ADDIN 11 using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; //............................................................................. namespace diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx index 8bf57eaea466..f121d8078e8a 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dlg_InsertDataLabel.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:25 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,7 +96,7 @@ SchDataDescrDlg::SchDataDescrDlg(Window* pWindow, const SfxItemSet& rInAttrs) : aBtnOK(this, ResId(BTN_OK)), aBtnCancel(this, ResId(BTN_CANCEL)), aBtnHelp(this, ResId(BTN_HELP)), - rOutAttrs(rInAttrs) + m_rInAttrs(rInAttrs) { FreeResource(); @@ -149,7 +149,7 @@ void SchDataDescrDlg::Reset() aRbPercent.Enable( FALSE ); aCbSymbol.Enable( FALSE ); - SfxItemState aState = rOutAttrs.GetItemState(SCHATTR_DATADESCR_SHOW_SYM, TRUE, &pPoolItem); + SfxItemState aState = m_rInAttrs.GetItemState(SCHATTR_DATADESCR_SHOW_SYM, TRUE, &pPoolItem); if( aState == SFX_ITEM_SET ) aCbSymbol.Check( ((const SfxBoolItem*)pPoolItem)->GetValue() ); else @@ -158,7 +158,7 @@ void SchDataDescrDlg::Reset() aCbSymbol.SetState( STATE_DONTKNOW ); } - aState = rOutAttrs.GetItemState(SCHATTR_DATADESCR_DESCR, TRUE, &pPoolItem); + aState = m_rInAttrs.GetItemState(SCHATTR_DATADESCR_DESCR, TRUE, &pPoolItem); if( aState == SFX_ITEM_SET ) { switch( ((const SvxChartDataDescrItem*)pPoolItem)->GetValue() ) @@ -235,7 +235,7 @@ void SchDataDescrDlg::GetAttr(SfxItemSet& rOutAttrs) rOutAttrs.Put(SvxChartDataDescrItem(eDescr)); rOutAttrs.Put(SfxBoolItem( SCHATTR_DATADESCR_SHOW_SYM, - aCbSymbol.IsChecked()) ); + aCbSymbol.IsChecked()) ); } //............................................................................. diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx index aa6d38f721ba..118765a13ba7 100644 --- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dlg_InsertLegend.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:25 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,12 +79,6 @@ namespace chart { //............................................................................. -/************************************************************************* -|* -|* Dialog zur Ausrichtung der Legende -|* -\************************************************************************/ - SchLegendDlg::SchLegendDlg(Window* pWindow, const SfxItemSet& rInAttrs) : ModalDialog(pWindow, SchResId(DLG_LEGEND)), aCbxShow(this, ResId(CBX_SHOW)), @@ -96,7 +90,7 @@ SchLegendDlg::SchLegendDlg(Window* pWindow, const SfxItemSet& rInAttrs) : aBtnOK(this, ResId(BTN_OK)), aBtnCancel(this, ResId(BTN_CANCEL)), aBtnHelp(this, ResId(BTN_HELP)), - rOutAttrs(rInAttrs) + m_rInAttrs(rInAttrs) { FreeResource(); @@ -105,30 +99,18 @@ SchLegendDlg::SchLegendDlg(Window* pWindow, const SfxItemSet& rInAttrs) : Reset(); } -/************************************************************************* -|* -|* Dtor -|* -/************************************************************************/ - SchLegendDlg::~SchLegendDlg() { } -/************************************************************************* -|* -|* Initialisierung -|* -\*************************************************************************/ - void SchLegendDlg::Reset() { SvxChartLegendPos ePos = CHLEGEND_NONE; const SfxPoolItem* pPoolItem = NULL; - if( rOutAttrs.GetItemState( SCHATTR_LEGEND_POS, + if( m_rInAttrs.GetItemState( SCHATTR_LEGEND_POS, TRUE, &pPoolItem ) != SFX_ITEM_SET ) - pPoolItem = &(rOutAttrs.GetPool()->GetDefaultItem( SCHATTR_LEGEND_POS )); + pPoolItem = &(m_rInAttrs.GetPool()->GetDefaultItem( SCHATTR_LEGEND_POS )); if( pPoolItem ) ePos = ((const SvxChartLegendPosItem*)pPoolItem)->GetValue(); @@ -148,6 +130,8 @@ void SchLegendDlg::Reset() case CHLEGEND_BOTTOM: aRbtBottom.Check(TRUE); break; + default: + break; } aCbxShow.Check (ePos != CHLEGEND_NONE); @@ -157,13 +141,7 @@ void SchLegendDlg::Reset() aRbtBottom.Enable (ePos != CHLEGEND_NONE); } -/************************************************************************* -|* -|* Fuellt uebergebenen Item-Set mit Dialogbox-Attributen -|* -\*************************************************************************/ - -void SchLegendDlg::GetAttr(SfxItemSet& rOutAttrs) +void SchLegendDlg::GetAttr(SfxItemSet& _rOutAttrs) { SvxChartLegendPos ePos; @@ -180,7 +158,7 @@ void SchLegendDlg::GetAttr(SfxItemSet& rOutAttrs) else ePos = CHLEGEND_NONE; - rOutAttrs.Put(SvxChartLegendPosItem(ePos)); + _rOutAttrs.Put(SvxChartLegendPosItem(ePos)); } diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index b5412dbb492f..1c3695f0b4c2 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dlg_ObjectProperties.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:45 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,11 +83,11 @@ #include "ChartModelHelper.hxx" #include "ChartTypeHelper.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPE_HPP_ -#include <drafts/com/sun/star/chart2/XChartType.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPE_HPP_ +#include <com/sun/star/chart2/XChartType.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASERIES_HPP_ -#include <drafts/com/sun/star/chart2/XDataSeries.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASERIES_HPP_ +#include <com/sun/star/chart2/XDataSeries.hpp> #endif @@ -120,7 +120,7 @@ namespace chart //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; namespace { diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index 3c5ee1d52841..57250213fb6f 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tp_AxisLabel.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:26 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -133,7 +133,7 @@ SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rIn aFlSeparator( this, SchResId( FL_SEPARATOR ) ), - bShowStaggeringControls( true ), + m_bShowStaggeringControls( true ), //// bAllowTextOverlap( TRUE ), m_nInitialDegrees( 0 ), @@ -197,7 +197,7 @@ BOOL SchAxisLabelTabPage::FillItemSet( SfxItemSet& rOutAttrs ) // rOutAttrs.Put( SvxChartTextOrientItem( eOrient ) ); rOutAttrs.Put( SfxBoolItem( SCHATTR_TEXT_STACKED, bIsStacked ) ); - if( bShowStaggeringControls ) + if( m_bShowStaggeringControls ) { SvxChartTextOrder eOrder; bool bRadioButtonChecked = true; @@ -345,7 +345,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs ) } // text order ---------- - if( bShowStaggeringControls ) + if( m_bShowStaggeringControls ) { aState = rInAttrs.GetItemState( SCHATTR_TEXT_ORDER, FALSE, &pPoolItem ); if( aState == SFX_ITEM_SET ) @@ -373,11 +373,11 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs ) ToggleShowLabel( (void*)0 ); } -void SchAxisLabelTabPage::ShowStaggeringControls( BOOL ShowStaggeringControls ) +void SchAxisLabelTabPage::ShowStaggeringControls( BOOL bShowStaggeringControls ) { - bShowStaggeringControls = ShowStaggeringControls; + m_bShowStaggeringControls = bShowStaggeringControls; - if( !bShowStaggeringControls ) + if( !m_bShowStaggeringControls ) { aRbSideBySide.Hide(); aRbUpDown.Hide(); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx index 49a6743b48bc..fbd64d4b84b2 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tp_AxisLabel.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:26 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -103,7 +103,7 @@ private: FixedLine aFlSeparator; - BOOL bShowStaggeringControls; + BOOL m_bShowStaggeringControls; //// BOOL bAllowTextOverlap; short m_nInitialDegrees; @@ -121,7 +121,7 @@ public: virtual BOOL FillItemSet( SfxItemSet& rOutAttrs ); virtual void Reset( const SfxItemSet& rInAttrs ); - void ShowStaggeringControls( BOOL ShowStaggeringControls ); + void ShowStaggeringControls( BOOL bShowStaggeringControls ); //// void AllowTextOverlap( BOOL bOverLap ) { bAllowTextOverlap = bOverLap; } }; //............................................................................. diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx index 3d06c3d9688b..41939b0accac 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.cxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tp_DataLabel.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:26 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,8 +83,7 @@ SchDataDescrTabPage::SchDataDescrTabPage(Window* pWindow, aRbNumber(this, ResId(RB_NUMBER)), aRbPercent(this, ResId(RB_PERCENT)), aCbText(this, ResId(CB_TEXT)), - aCbSymbol(this, ResId(CB_SYMBOL)), - rOutAttrs(rInAttrs) + aCbSymbol(this, ResId(CB_SYMBOL)) { FreeResource(); @@ -176,12 +175,12 @@ void SchDataDescrTabPage::Reset(const SfxItemSet& rInAttrs) aRbPercent.Enable( FALSE ); aCbSymbol.Enable( FALSE ); - if( rOutAttrs.GetItemState(SCHATTR_DATADESCR_SHOW_SYM, - TRUE, &pPoolItem) == SFX_ITEM_SET ) + if( rInAttrs.GetItemState(SCHATTR_DATADESCR_SHOW_SYM, + TRUE, &pPoolItem) == SFX_ITEM_SET ) aCbSymbol.Check( ((const SfxBoolItem*)pPoolItem)->GetValue() ); - if( rOutAttrs.GetItemState(SCHATTR_DATADESCR_DESCR, - TRUE, &pPoolItem) == SFX_ITEM_SET ) + if( rInAttrs.GetItemState(SCHATTR_DATADESCR_DESCR, + TRUE, &pPoolItem) == SFX_ITEM_SET ) { switch( ((const SvxChartDataDescrItem*)pPoolItem)->GetValue() ) { diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx index ad8f2d2d6187..ee619cdaf601 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.hxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tp_DataLabel.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:26 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,8 +83,6 @@ private: CheckBox aCbText; CheckBox aCbSymbol; - const SfxItemSet& rOutAttrs; - DECL_LINK(EnableHdl, CheckBox * ); public: diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx index f46217889540..07995bbe67fc 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tp_LegendPosition.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:26 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,53 +80,28 @@ namespace chart { //............................................................................. -/************************************************************************* -|* -|* Dialog zur Ausrichtung der Legende -|* -\************************************************************************/ - SchLegendPosTabPage::SchLegendPosTabPage(Window* pWindow, const SfxItemSet& rInAttrs) : SfxTabPage(pWindow, SchResId(TP_LEGEND_POS), rInAttrs), + aGrpLegend(this, ResId(GRP_LEGEND)), aRbtLeft(this, ResId(RBT_LEFT)), aRbtTop(this, ResId(RBT_TOP)), - aRbtRight(this, ResId(RBT_RIGHT)), aRbtBottom(this, ResId(RBT_BOTTOM)), - aGrpLegend(this, ResId(GRP_LEGEND)), - rOutAttrs(rInAttrs) + aRbtRight(this, ResId(RBT_RIGHT)) { FreeResource(); } -/************************************************************************* -|* -|* Dtor -|* -/************************************************************************/ - SchLegendPosTabPage::~SchLegendPosTabPage() { } -/************************************************************************* -|* -|* Erzeugung -|* -\*************************************************************************/ - SfxTabPage* SchLegendPosTabPage::Create(Window* pWindow, const SfxItemSet& rOutAttrs) { return new SchLegendPosTabPage(pWindow, rOutAttrs); } -/************************************************************************* -|* -|* Fuellt uebergebenen Item-Set mit Dialogbox-Attributen -|* -\*************************************************************************/ - BOOL SchLegendPosTabPage::FillItemSet(SfxItemSet& rOutAttrs) { SvxChartLegendPos ePos; @@ -147,12 +122,6 @@ BOOL SchLegendPosTabPage::FillItemSet(SfxItemSet& rOutAttrs) return TRUE; } -/************************************************************************* -|* -|* Initialisierung -|* -\*************************************************************************/ - void SchLegendPosTabPage::Reset(const SfxItemSet& rInAttrs) { SvxChartLegendPos ePos = CHLEGEND_NONE; @@ -179,6 +148,8 @@ void SchLegendPosTabPage::Reset(const SfxItemSet& rInAttrs) case CHLEGEND_BOTTOM: aRbtBottom.Check(TRUE); break; + default: + break; } } diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx index a75c8c7790bf..43027223502a 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tp_LegendPosition.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:26 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,8 +89,6 @@ private: RadioButton aRbtBottom; RadioButton aRbtRight; - const SfxItemSet& rOutAttrs; - public: SchLegendPosTabPage(Window* pParent, const SfxItemSet& rInAttrs); virtual ~SchLegendPosTabPage(); diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx index 3666d9e22e7a..d50f6c1f5ea4 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tp_PointGeometry.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:26 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,39 +98,22 @@ SchLayoutTabPage::SchLayoutTabPage(Window* pWindow,const SfxItemSet& rInAttrs) : aPyramid(this, ResId(RBT_LY_PYRAMID)), aHanoi(this,ResId(RBT_LY_HANOI)), */ - aListShapes(this,ResId(LB_LY_SHAPE)), aFtLayout(this, ResId(FT_LY_SHAPE)), - rOutAttrs(rInAttrs) + aListShapes(this,ResId(LB_LY_SHAPE)) { FreeResource(); } -/************************************************************************* -|* -|* Dtor -|* -\************************************************************************/ SchLayoutTabPage::~SchLayoutTabPage() { } -/************************************************************************* -|* -|* Erzeugung -|* -\*************************************************************************/ - SfxTabPage* SchLayoutTabPage::Create(Window* pWindow, const SfxItemSet& rOutAttrs) { return new SchLayoutTabPage(pWindow, rOutAttrs); } -/************************************************************************* -|* -|* Fuellt uebergebenen Item-Set mit Dialogbox-Attributen -|* -\*************************************************************************/ BOOL SchLayoutTabPage::FillItemSet(SfxItemSet& rOutAttrs) { @@ -144,16 +127,10 @@ BOOL SchLayoutTabPage::FillItemSet(SfxItemSet& rOutAttrs) nSegs=4; rOutAttrs.Put(SfxInt32Item(SCHATTR_STYLE_SHAPE,nShape)); -//-/ rOutAttrs.Put(SfxUInt32Item(SID_ATTR_3D_HORZ_SEGS,nSegs)); rOutAttrs.Put(Svx3DHorizontalSegmentsItem(nSegs)); } return TRUE; } -/************************************************************************* -|* -|* Initialisierung -|* -\*************************************************************************/ void SchLayoutTabPage::Reset(const SfxItemSet& rInAttrs) { diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx index ae824369db64..1f88cb7e20da 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tp_PointGeometry.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:26 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,8 +85,6 @@ private: FixedText aFtLayout; ListBox aListShapes; - const SfxItemSet& rOutAttrs; - public: SchLayoutTabPage(Window* pParent, const SfxItemSet& rInAttrs); virtual ~SchLayoutTabPage(); diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index d75ddf8058a5..f28943819317 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tp_Scale.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:27 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -168,7 +168,6 @@ SchScaleYAxisTabPage::SchScaleYAxisTabPage(Window* pWindow,const SfxItemSet& rIn nStepHelp(0), fOrigin(0.0), nAxisType(0), - rOutAttrs(rInAttrs), pNumFormatter(NULL) //, // bLastStepMain(FALSE) { @@ -823,7 +822,7 @@ void SchScaleYAxisTabPage::SetNumFormat() { const SfxPoolItem *pPoolItem = NULL; - if( rOutAttrs.GetItemState( SCHATTR_AXIS_NUMFMT, TRUE, &pPoolItem ) == SFX_ITEM_SET ) + if( GetItemSet().GetItemState( SCHATTR_AXIS_NUMFMT, TRUE, &pPoolItem ) == SFX_ITEM_SET ) { ULONG nFmt = (ULONG)((const SfxInt32Item*)pPoolItem)->GetValue(); short eType = pNumFormatter->GetType( nFmt ); diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index d0004a9695e7..9172f8eda88d 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tp_Scale.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:27 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -130,7 +130,6 @@ private: sal_Int32 nStepHelp; double fOrigin; int nAxisType; - const SfxItemSet& rOutAttrs; SvNumberFormatter* pNumFormatter; // BOOL bLastStepMain; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index ab74231b2afa..5ac66ec23382 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tp_SeriesToAxis.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:27 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,15 +94,15 @@ namespace chart SchOptionTabPage::SchOptionTabPage(Window* pWindow,const SfxItemSet& rInAttrs) : SfxTabPage(pWindow, SchResId(TP_OPTIONS), rInAttrs), aGrpAxis(this, ResId(GRP_OPT_AXIS)), - aGrpBar(this, ResId(GB_BAR)), aRbtAxis1(this,ResId(RBT_OPT_AXIS_1)), aRbtAxis2(this,ResId(RBT_OPT_AXIS_2)), - aMTOverlap(this,ResId(MT_OVERLAP)), + + aGrpBar(this, ResId(GB_BAR)), + aFTGap(this,ResId(FT_GAP)), aMTGap(this,ResId(MT_GAP)), aFTOverlap(this,ResId(FT_OVERLAP)), - aFTGap(this,ResId(FT_GAP)), - aCBConnect(this,ResId(CB_CONNECTOR)), - rOutAttrs(rInAttrs) + aMTOverlap(this,ResId(MT_OVERLAP)), + aCBConnect(this,ResId(CB_CONNECTOR)) { FreeResource(); diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx index c8224299166f..016908321c21 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tp_SeriesToAxis.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:27 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,7 +97,6 @@ private: MetricField aMTOverlap; CheckBox aCBConnect; - const SfxItemSet& rOutAttrs; public: SchOptionTabPage(Window* pParent, const SfxItemSet& rInAttrs); virtual ~SchOptionTabPage(); diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index 455b528f3912..0b73ee8a9f70 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tp_TitleRotation.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:27 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -111,7 +111,6 @@ SchAlignmentTabPage::SchAlignmentTabPage(Window* pWindow, // aRbtAutoOrder(this, ResId(RBT_AUTOORDER)), // aFlOrder(this, ResId(FL_ORDER)), // eOrderMode(CHORDMODE_X_AXIS), - rOutAttrs(rInAttrs), //Seit 4/1998 koennen Texte frei gedreht werden: SCHATTR_TEXT_DEGREES aWinOrient ( this,ResId(CTR_DIAL),ResId(BTN_TXTSTACKED), diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx index 7cab021cd116..5ddab5691976 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tp_TitleRotation.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2003-11-08 23:04:12 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -121,8 +121,6 @@ private: // FixedLine aFlOrder; // OrderMode eOrderMode; - const SfxItemSet& rOutAttrs; - // DECL_LINK(CheckButtonHdl, Button*); // BOOL bTextCanOverlap; public: diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx index bd7e1ba2dcea..1a99236fb6ef 100644 --- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx +++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ViewElementListProvider.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: iha $ $Date: 2003-12-04 16:31:17 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:11:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -128,7 +128,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -//using namespace ::drafts::com::sun::star::chart2; +//using namespace ::com::sun::star::chart2; ViewElementListProvider::ViewElementListProvider( DrawModelWrapper* pDrawModelWrapper , NumberFormatterWrapper* pNumberFormatterWrapper ) diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx b/chart2/source/controller/inc/AxisItemConverter.hxx index a9fd5e113f15..685a6546a9db 100644 --- a/chart2/source/controller/inc/AxisItemConverter.hxx +++ b/chart2/source/controller/inc/AxisItemConverter.hxx @@ -2,9 +2,9 @@ * * $RCSfile: AxisItemConverter.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: bm $ $Date: 2003-11-25 13:07:19 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,14 +61,14 @@ #ifndef CHART_AXISITEMCONVERTER_HXX #define CHART_AXISITEMCONVERTER_HXX -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XAXIS_HPP_ -#include <drafts/com/sun/star/chart2/XAxis.hpp> +#ifndef _COM_SUN_STAR_CHART2_XAXIS_HPP_ +#include <com/sun/star/chart2/XAxis.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_EXPLICITSCALEDATA_HPP_ -#include <drafts/com/sun/star/chart2/ExplicitScaleData.hpp> +#ifndef _COM_SUN_STAR_CHART2_EXPLICITSCALEDATA_HPP_ +#include <com/sun/star/chart2/ExplicitScaleData.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_EXPLICITINCREMENTDATA_HPP_ -#include <drafts/com/sun/star/chart2/ExplicitIncrementData.hpp> +#ifndef _COM_SUN_STAR_CHART2_EXPLICITINCREMENTDATA_HPP_ +#include <com/sun/star/chart2/ExplicitIncrementData.hpp> #endif #ifndef _COM_SUN_STAR_AWT_SIZE_HPP_ #include <com/sun/star/awt/Size.hpp> @@ -96,8 +96,8 @@ public: SfxItemPool& rItemPool, SdrModel& rDrawModel, NumberFormatterWrapper * pNumFormatter, - ::drafts::com::sun::star::chart2::ExplicitScaleData * pScale = NULL, - ::drafts::com::sun::star::chart2::ExplicitIncrementData * pIncrement = NULL, + ::com::sun::star::chart2::ExplicitScaleData * pScale = NULL, + ::com::sun::star::chart2::ExplicitIncrementData * pIncrement = NULL, double * pExplicitOrigin = NULL, ::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize = ::std::auto_ptr< ::com::sun::star::awt::Size >() ); @@ -118,15 +118,15 @@ protected: private: ::std::vector< ItemConverter * > m_aConverters; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XAxis > m_xAxis; + ::com::sun::star::chart2::XAxis > m_xAxis; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > + ::com::sun::star::chart2::XBoundedCoordinateSystem > m_xCoordinateSystem; sal_Int32 m_nDimension; NumberFormatterWrapper * m_pNumberFormatterWrapper; - ::drafts::com::sun::star::chart2::ExplicitScaleData * m_pExplicitScale; - ::drafts::com::sun::star::chart2::ExplicitIncrementData * m_pExplicitIncrement; + ::com::sun::star::chart2::ExplicitScaleData * m_pExplicitScale; + ::com::sun::star::chart2::ExplicitIncrementData * m_pExplicitIncrement; double * m_pExplicitOrigin; }; diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index c7f2d1adb132..27a64077eace 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartDocumentWrapper.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-18 13:50:56 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,14 +97,12 @@ #include <unotools/eventlisteneradapter.hxx> #endif -namespace drafts { namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } }}} -} namespace com { namespace sun { namespace star { namespace drawing @@ -276,7 +274,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDelegator; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartDocument > + ::com::sun::star::chart2::XChartDocument > m_xChartDoc; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx index ec854a397818..e41a5278b0b1 100644 --- a/chart2/source/controller/inc/dlg_ChartType.hxx +++ b/chart2/source/controller/inc/dlg_ChartType.hxx @@ -2,9 +2,9 @@ * * $RCSfile: dlg_ChartType.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: bm $ $Date: 2003-11-20 18:12:23 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -114,11 +114,11 @@ #include <svx/chrtitem.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ -#include <drafts/com/sun/star/chart2/XDiagram.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ +#include <com/sun/star/chart2/XDiagram.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPETEMPLATE_HPP_ -#include <drafts/com/sun/star/chart2/XChartTypeTemplate.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPETEMPLATE_HPP_ +#include <com/sun/star/chart2/XChartTypeTemplate.hpp> #endif #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -165,10 +165,8 @@ private: HelpButton aBtnHelp; ChartDimension eDimension; -// const SfxItemSet& rOutAttrs; - ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > m_xDiagram; + ::com::sun::star::chart2::XDiagram > m_xDiagram; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xTemplateManager; @@ -195,13 +193,11 @@ public: SchDiagramTypeDlg( Window* pWindow, const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > & xDiagram, + ::com::sun::star::chart2::XDiagram > & xDiagram, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xTemplateManager ); virtual ~SchDiagramTypeDlg(); -//BM void GetAttr(SfxItemSet& rOutAttrs); - sal_Int32 GetDepth() const; void SetDepth( sal_Int32 nDeep ); @@ -225,7 +221,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartTypeTemplate > + ::com::sun::star::chart2::XChartTypeTemplate > getTemplate() const; bool HasChanged() const; diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx index 6de5f95e6677..5374616ab593 100644 --- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx +++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx @@ -2,9 +2,9 @@ * * $RCSfile: dlg_InsertDataLabel.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:27 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -101,7 +101,7 @@ private: CancelButton aBtnCancel; HelpButton aBtnHelp; - const SfxItemSet& rOutAttrs; + const SfxItemSet& m_rInAttrs; DECL_LINK( EnableHdl, CheckBox * ); diff --git a/chart2/source/controller/inc/dlg_InsertLegend.hxx b/chart2/source/controller/inc/dlg_InsertLegend.hxx index dcf7fca9f0a7..42b553b9e33d 100644 --- a/chart2/source/controller/inc/dlg_InsertLegend.hxx +++ b/chart2/source/controller/inc/dlg_InsertLegend.hxx @@ -2,9 +2,9 @@ * * $RCSfile: dlg_InsertLegend.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:27 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -102,7 +102,7 @@ private: CancelButton aBtnCancel; HelpButton aBtnHelp; - const SfxItemSet& rOutAttrs; + const SfxItemSet& m_rInAttrs; void Reset(); DECL_LINK (CbxClick, CheckBox *); diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index ed331b7286bb..c655eadd3749 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AxisItemConverter.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: bm $ $Date: 2003-11-25 13:07:33 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,11 +70,11 @@ #ifndef _COM_SUN_STAR_LANG_XSERVICENAME_HPP_ #include <com/sun/star/lang/XServiceName.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XAXIS_HPP_ -#include <drafts/com/sun/star/chart2/XAxis.hpp> +#ifndef _COM_SUN_STAR_CHART2_XAXIS_HPP_ +#include <com/sun/star/chart2/XAxis.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XBOUNDEDCOORDINATESYSTEM_HPP_ -#include <drafts/com/sun/star/chart2/XBoundedCoordinateSystem.hpp> +#ifndef _COM_SUN_STAR_CHART2_XBOUNDEDCOORDINATESYSTEM_HPP_ +#include <com/sun/star/chart2/XBoundedCoordinateSystem.hpp> #endif // #ifndef _COMPHELPER_PROCESSFACTORY_HXX_ @@ -100,7 +100,6 @@ #include <algorithm> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; namespace { diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index dd090ca2c076..3857428cf4fe 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DataPointItemConverter.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: bm $ $Date: 2003-12-17 16:43:10 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,11 +71,11 @@ #define ITEMID_CHARTDATADESCR SCHATTR_DATADESCR_DESCR #include <svx/chrtitem.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_DATAPOINTLABEL_HPP_ -#include <drafts/com/sun/star/chart2/DataPointLabel.hpp> +#ifndef _COM_SUN_STAR_CHART2_DATAPOINTLABEL_HPP_ +#include <com/sun/star/chart2/DataPointLabel.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SYMBOL_HPP_ -#include <drafts/com/sun/star/chart2/Symbol.hpp> +#ifndef _COM_SUN_STAR_CHART2_SYMBOL_HPP_ +#include <com/sun/star/chart2/Symbol.hpp> #endif #ifndef _SFXINTITEM_HXX @@ -95,7 +95,6 @@ #include <algorithm> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; namespace { diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx index 6d5c970f0899..5617970b6d26 100644 --- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx @@ -2,9 +2,9 @@ * * $RCSfile: GraphicPropertyItemConverter.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: bm $ $Date: 2003-11-11 12:17:33 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,18 +116,17 @@ #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSTATE_HPP_ #include <com/sun/star/beans/XPropertyState.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_FILLBITMAP_HPP_ -#include <drafts/com/sun/star/chart2/FillBitmap.hpp> +#ifndef _COM_SUN_STAR_CHART2_FILLBITMAP_HPP_ +#include <com/sun/star/chart2/FillBitmap.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ -#include <drafts/com/sun/star/chart2/TransparencyStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ +#include <com/sun/star/chart2/TransparencyStyle.hpp> #endif #ifndef _COM_SUN_STAR_AWT_GRADIENT_HPP_ #include <com/sun/star/awt/Gradient.hpp> #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; namespace { diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx index f5a1a16625cc..76473dfe1325 100644 --- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx @@ -2,9 +2,9 @@ * * $RCSfile: LegendItemConverter.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: bm $ $Date: 2003-12-11 14:07:23 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,21 +70,20 @@ #include <svx/chrtitem.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XLEGEND_HPP_ -#include <drafts/com/sun/star/chart2/XLegend.hpp> +#ifndef _COM_SUN_STAR_CHART2_XLEGEND_HPP_ +#include <com/sun/star/chart2/XLegend.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_LEGENDPOSITION_HPP_ -#include <drafts/com/sun/star/chart2/LegendPosition.hpp> +#ifndef _COM_SUN_STAR_CHART2_LEGENDPOSITION_HPP_ +#include <com/sun/star/chart2/LegendPosition.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_LEGENDEXPANSION_HPP_ -#include <drafts/com/sun/star/chart2/LegendExpansion.hpp> +#ifndef _COM_SUN_STAR_CHART2_LEGENDEXPANSION_HPP_ +#include <com/sun/star/chart2/LegendExpansion.hpp> #endif #include <functional> #include <algorithm> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; namespace { diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx index db6366a479f6..f60510635d2f 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx @@ -2,9 +2,9 @@ * * $RCSfile: MultipleChartConverters.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: iha $ $Date: 2003-12-18 12:38:44 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,18 +70,17 @@ #include "TitleHelper.hxx" #include "TitleItemConverter.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XAXISCONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XAxisContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XAXISCONTAINER_HPP_ +#include <com/sun/star/chart2/XAxisContainer.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XGRIDCONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XGridContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XGRIDCONTAINER_HPP_ +#include <com/sun/star/chart2/XGridContainer.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ -#include <drafts/com/sun/star/chart2/XChartDocument.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ +#include <com/sun/star/chart2/XChartDocument.hpp> #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; namespace chart { diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx index b32b4427e7e5..fe8e7470f659 100644 --- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx @@ -2,9 +2,9 @@ * * $RCSfile: StatisticsItemConverter.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: bm $ $Date: 2003-12-19 15:04:43 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,14 +82,14 @@ #include <rtl/math.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_DATAPOINTLABEL_HPP_ -#include <drafts/com/sun/star/chart2/DataPointLabel.hpp> +#ifndef _COM_SUN_STAR_CHART2_DATAPOINTLABEL_HPP_ +#include <com/sun/star/chart2/DataPointLabel.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVECONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XRegressionCurveContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVECONTAINER_HPP_ +#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_ERRORBARSTYLE_HPP_ -#include <drafts/com/sun/star/chart2/ErrorBarStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_ERRORBARSTYLE_HPP_ +#include <com/sun/star/chart2/ErrorBarStyle.hpp> #endif #ifndef _COM_SUN_STAR_LANG_XSERVICENAME_HPP_ #include <com/sun/star/lang/XServiceName.hpp> @@ -100,7 +100,6 @@ #include <vector> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; namespace { diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx index 4190a9bcb4c6..8674412ba96e 100644 --- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx @@ -2,9 +2,9 @@ * * $RCSfile: TitleItemConverter.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: bm $ $Date: 2003-11-25 13:07:43 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,13 +73,12 @@ #include <rtl/math.hxx> #endif -#include <drafts/com/sun/star/chart2/XTitled.hpp> +#include <com/sun/star/chart2/XTitled.hpp> #include <functional> #include <algorithm> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; namespace { diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index ac6ed1ae9d0c..2663cc2adb50 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartController.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: iha $ $Date: 2003-12-10 18:32:17 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,14 +85,17 @@ #include <svx/svxids.hrc> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ -#include <drafts/com/sun/star/chart2/XChartDocument.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ +#include <com/sun/star/chart2/XChartDocument.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XSTACKABLESCALEGROUP_HPP_ -#include <drafts/com/sun/star/chart2/XStackableScaleGroup.hpp> +#ifndef _COM_SUN_STAR_CHART2_XSTACKABLESCALEGROUP_HPP_ +#include <com/sun/star/chart2/XStackableScaleGroup.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPETEMPLATE_HPP_ -#include <drafts/com/sun/star/chart2/XChartTypeTemplate.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPETEMPLATE_HPP_ +#include <com/sun/star/chart2/XChartTypeTemplate.hpp> +#endif +#ifndef _COM_SUN_STAR_FRAME_XLOADABLE_HPP_ +#include <com/sun/star/frame/XLoadable.hpp> #endif //------- @@ -126,7 +129,7 @@ namespace chart //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; //----------------------------------------------------------------- // ChartController Constructor and Destructor @@ -813,31 +816,34 @@ void SAL_CALL ChartController bool isFormatObjectSID( sal_Int32 nSlotID ) { - if((sal_Int32)SID_DIAGRAM_TITLE_MAIN == nSlotID - || (sal_Int32)SID_DIAGRAM_TITLE_SUB == nSlotID - || (sal_Int32)SID_DIAGRAM_TITLE_X == nSlotID - || (sal_Int32)SID_DIAGRAM_TITLE_Y == nSlotID - || (sal_Int32)SID_DIAGRAM_TITLE_Z == nSlotID - || (sal_Int32)SID_DIAGRAM_TITLE_ALL == nSlotID - || (sal_Int32)SID_LEGEND == nSlotID - || (sal_Int32)SID_DIAGRAM_AXIS_X == nSlotID - || (sal_Int32)SID_DIAGRAM_AXIS_Y == nSlotID - || (sal_Int32)SID_DIAGRAM_AXIS_Z == nSlotID - || (sal_Int32)SID_DIAGRAM_AXIS_A == nSlotID //secondary x axis - || (sal_Int32)SID_DIAGRAM_AXIS_B == nSlotID - || (sal_Int32)SID_DIAGRAM_AXIS_ALL == nSlotID - || (sal_Int32)SID_DIAGRAM_GRID_X_MAIN == nSlotID - || (sal_Int32)SID_DIAGRAM_GRID_Y_MAIN == nSlotID - || (sal_Int32)SID_DIAGRAM_GRID_Z_MAIN == nSlotID - || (sal_Int32)SID_DIAGRAM_GRID_X_HELP == nSlotID - || (sal_Int32)SID_DIAGRAM_GRID_Y_HELP == nSlotID - || (sal_Int32)SID_DIAGRAM_GRID_Z_HELP == nSlotID - || (sal_Int32)SID_DIAGRAM_GRID_ALL == nSlotID - || (sal_Int32)SID_DIAGRAM_WALL == nSlotID - || (sal_Int32)SID_DIAGRAM_FLOOR == nSlotID - || (sal_Int32)SID_DIAGRAM_AREA == nSlotID - ) - return true; + switch( nSlotID ) + { + case SID_DIAGRAM_TITLE_MAIN: + case SID_DIAGRAM_TITLE_SUB: + case SID_DIAGRAM_TITLE_X: + case SID_DIAGRAM_TITLE_Y: + case SID_DIAGRAM_TITLE_Z: + case SID_DIAGRAM_TITLE_ALL: + case SID_LEGEND: + case SID_DIAGRAM_AXIS_X: + case SID_DIAGRAM_AXIS_Y: + case SID_DIAGRAM_AXIS_Z: + case SID_DIAGRAM_AXIS_A: // secondary x-axis + case SID_DIAGRAM_AXIS_B: // secondary y-axis + case SID_DIAGRAM_AXIS_ALL: + case SID_DIAGRAM_GRID_X_MAIN: + case SID_DIAGRAM_GRID_Y_MAIN: + case SID_DIAGRAM_GRID_Z_MAIN: + case SID_DIAGRAM_GRID_X_HELP: + case SID_DIAGRAM_GRID_Y_HELP: + case SID_DIAGRAM_GRID_Z_HELP: + case SID_DIAGRAM_GRID_ALL: + case SID_DIAGRAM_WALL: + case SID_DIAGRAM_FLOOR: + case SID_DIAGRAM_AREA: + return true; + } + return false; } @@ -877,19 +883,20 @@ bool isFormatObjectSID( sal_Int32 nSlotID ) else if(rURL.Protocol.equalsIgnoreAsciiCase( C2U("slot:") ) ) { sal_Int32 nSlotID = rURL.Path.toInt32(); - if( (sal_Int32)SID_DIAGRAM_OBJECTS == nSlotID - || (sal_Int32)SID_DIAGRAM_TYPE == nSlotID - || (sal_Int32)SID_INSERT_TITLE == nSlotID - || (sal_Int32)SID_INSERT_CHART_LEGEND == nSlotID - || (sal_Int32)SID_INSERT_DESCRIPTION == nSlotID - || (sal_Int32)SID_INSERT_AXIS == nSlotID - || (sal_Int32)SID_INSERT_GRIDS == nSlotID - || (sal_Int32)SID_INSERT_STATISTICS == nSlotID - || (sal_Int32)SID_CHARMAP == nSlotID - || (sal_Int32)SID_TEXTEDIT == nSlotID + if( SID_DIAGRAM_OBJECTS == nSlotID + || SID_DIAGRAM_TYPE == nSlotID + || SID_INSERT_TITLE == nSlotID + || SID_INSERT_CHART_LEGEND == nSlotID + || SID_INSERT_DESCRIPTION == nSlotID + || SID_INSERT_AXIS == nSlotID + || SID_INSERT_GRIDS == nSlotID + || SID_INSERT_STATISTICS == nSlotID + || SID_CHARMAP == nSlotID + || SID_TEXTEDIT == nSlotID || isFormatObjectSID(nSlotID) - || (sal_Int32)SID_3D_VIEW == nSlotID - || (sal_Int32)SID_ATTR_TRANSFORM == nSlotID + || SID_3D_VIEW == nSlotID + || SID_ATTR_TRANSFORM == nSlotID + || SID_DIAGRAM_DATA == nSlotID ) { return static_cast< frame::XDispatch* >( this ); @@ -973,83 +980,71 @@ tMakeSlotIdCommandMap m_aSlotIdCommandMap = else if(rURL.Protocol.equalsIgnoreAsciiCase( C2U("slot:") ) ) { sal_Int32 nSlotID = rURL.Path.toInt32(); - if((sal_Int32)SID_DIAGRAM_OBJECTS == nSlotID) - { - this->executeDispatch_ObjectProperties(); - } - else if((sal_Int32)SID_DIAGRAM_TYPE == nSlotID) - { - this->executeDispatch_ChartType(); - } - else if((sal_Int32)SID_INSERT_TITLE == nSlotID) - { - this->executeDispatch_InsertTitle(); - } - else if((sal_Int32)SID_INSERT_CHART_LEGEND == nSlotID) - { - this->executeDispatch_InsertLegend(); - } - else if((sal_Int32)SID_INSERT_DESCRIPTION == nSlotID) - { - this->executeDispatch_InsertDataLabel(); - } - else if((sal_Int32)SID_INSERT_AXIS == nSlotID) - { - this->executeDispatch_InsertAxis(); - } - else if((sal_Int32)SID_INSERT_GRIDS == nSlotID) + switch( nSlotID ) { - this->executeDispatch_InsertGrid(); - } - else if((sal_Int32)SID_INSERT_STATISTICS == nSlotID) - { - this->executeDispatch_InsertStatistic(); - } - else if((sal_Int32)SID_CHARMAP == nSlotID) - { - this->executeDispatch_InsertSpecialCharacter(); - } - else if((sal_Int32)SID_TEXTEDIT == nSlotID) - { - this->executeDispatch_EditText(); - } - else if( isFormatObjectSID(nSlotID) ) - { - this->executeDispatch_FormatObject(nSlotID); - } - else if((sal_Int32)SID_3D_VIEW == nSlotID) - { - this->executeDispatch_RotateDiagram(); - } - else if((sal_Int32)SID_ATTR_TRANSFORM == nSlotID) - { - this->executeDispatch_PositionAndSize( m_aSelectedObjectCID ); + case SID_DIAGRAM_OBJECTS: + this->executeDispatch_ObjectProperties(); + break; + case SID_DIAGRAM_TYPE: + this->executeDispatch_ChartType(); + break; + case SID_INSERT_TITLE: + this->executeDispatch_InsertTitle(); + break; + case SID_INSERT_CHART_LEGEND: + this->executeDispatch_InsertLegend(); + break; + case SID_INSERT_DESCRIPTION: + this->executeDispatch_InsertDataLabel(); + break; + case SID_INSERT_AXIS: + this->executeDispatch_InsertAxis(); + break; + case SID_INSERT_GRIDS: + this->executeDispatch_InsertGrid(); + break; + case SID_INSERT_STATISTICS: + this->executeDispatch_InsertStatistic(); + break; + case SID_CHARMAP: + this->executeDispatch_InsertSpecialCharacter(); + break; + case SID_TEXTEDIT: + this->executeDispatch_EditText(); + break; + case SID_3D_VIEW: + this->executeDispatch_RotateDiagram(); + break; + case SID_ATTR_TRANSFORM: + this->executeDispatch_PositionAndSize( m_aSelectedObjectCID ); + break; + case SID_DIAGRAM_DATA: + this->executeDispatch_EditData(); + break; + + default: + if( isFormatObjectSID(nSlotID) ) + { + this->executeDispatch_FormatObject(nSlotID); + } + break; } } else if(aCommand.equals("SaveAll")) { if( m_aModel.is()) { - uno::Reference< ::drafts::com::sun::star::chart2::XChartDocument > xDoc( + // initialize doc with default data (file-data provider) + uno::Reference< frame::XLoadable > xLoadable( m_aModel->getModel(), uno::UNO_QUERY ); - OSL_ASSERT( xDoc.is()); - - uno::Reference< ::drafts::com::sun::star::chart2::XDataProvider > xDataProvider( - m_xCC->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.comp.chart.FileDataProvider" ), - m_xCC ), uno::UNO_QUERY ); - OSL_ASSERT( xDataProvider.is()); - - ::rtl::OUString aFileName( -#if defined WNT - RTL_CONSTASCII_USTRINGPARAM( "file:///D:/files/data.chd" ) -#else - RTL_CONSTASCII_USTRINGPARAM( "file:///work/data/data.chd" ) -#endif - ); + OSL_ASSERT( xLoadable.is()); + xLoadable->initNew(); + + // switch to internal calc-data + uno::Reference< XChartDocument > xChartDoc( xLoadable, uno::UNO_QUERY ); + if( xChartDoc.is()) + xChartDoc->createInternalDataProvider( sal_True ); - xDoc->attachDataProvider( xDataProvider ); - xDoc->setRangeRepresentation( aFileName ); impl_rebuildView(); } } @@ -1088,6 +1083,9 @@ tMakeSlotIdCommandMap m_aSlotIdCommandMap = //@todo } +// ____ XEmbeddedClient ____ +// implementation see: ChartController_EditData.cxx + //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index a5abe83c7870..9ba33c8f4264 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartController.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: iha $ $Date: 2003-12-10 18:30:43 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,7 +94,8 @@ #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> #endif -#ifndef _CPPUHELPER_IMPLBASE6_HXX_ + +#ifndef _CPPUHELPER_IMPLBASE8_HXX_ #include <cppuhelper/implbase8.hxx> #endif @@ -266,6 +267,8 @@ private: void SAL_CALL executeDispatch_RotateDiagram(); void SAL_CALL executeDispatch_PositionAndSize( const ::rtl::OUString& rObjectCID ); + void executeDispatch_EditData(); + // void execute_DoubleClick(); diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index bd3af72c2642..39175e8a7bba 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartController_Insert.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: bm $ $Date: 2003-12-10 16:51:51 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,20 +75,20 @@ #include "MultipleChartConverters.hxx" #include "LegendItemConverter.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XAXISCONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XAxisContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XAXISCONTAINER_HPP_ +#include <com/sun/star/chart2/XAxisContainer.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XBOUNDEDCOORDINATESYSTEMCONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XBoundedCoordinateSystemContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XBOUNDEDCOORDINATESYSTEMCONTAINER_HPP_ +#include <com/sun/star/chart2/XBoundedCoordinateSystemContainer.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ -#include <drafts/com/sun/star/chart2/XDiagram.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ +#include <com/sun/star/chart2/XDiagram.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XGRIDCONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XGridContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XGRIDCONTAINER_HPP_ +#include <com/sun/star/chart2/XGridContainer.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTITLED_HPP_ -#include <drafts/com/sun/star/chart2/XTitled.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTITLED_HPP_ +#include <com/sun/star/chart2/XTitled.hpp> #endif //-------------------------------------- @@ -113,7 +113,7 @@ namespace chart //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; namespace { @@ -204,7 +204,7 @@ void createGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGr C2U( "Identifier" ), uno::makeAny( aId.makeStringAndClear()) )); xGrid.set( xContext->getServiceManager()->createInstanceWithContext( - C2U( "drafts.com.sun.star.chart2.Grid" ), + C2U( "com.sun.star.chart2.Grid" ), ContextHelper::createContext( aContextValues, xContext ) ) , uno::UNO_QUERY ); OSL_ASSERT( xGrid.is()); diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index 73c24613c165..000b9eaa1dd7 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -1,3 +1,63 @@ +/************************************************************************* + * + * $RCSfile: ChartController_Position.cxx,v $ + * + * $Revision: 1.3 $ + * + * last change: $Author: bm $ $Date: 2004-01-26 09:12:07 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2003 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ #include "ChartController.hxx" #include "dlg_PositionAndSize.hxx" @@ -9,8 +69,8 @@ #include "DrawViewWrapper.hxx" #include "PositionAndSizeHelper.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SCENEDESCRIPTOR_HPP_ -#include <drafts/com/sun/star/chart2/SceneDescriptor.hpp> +#ifndef _COM_SUN_STAR_CHART2_SCENEDESCRIPTOR_HPP_ +#include <com/sun/star/chart2/SceneDescriptor.hpp> #endif // header for define RET_OK @@ -27,7 +87,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 631a65e658e3..50f74b462030 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartController_Properties.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: iha $ $Date: 2003-12-18 12:39:57 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,20 +81,20 @@ #include "LegendHelper.hxx" #include "ChartTypeHelper.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XAXISCONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XAxisContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XAXISCONTAINER_HPP_ +#include <com/sun/star/chart2/XAxisContainer.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ -#include <drafts/com/sun/star/chart2/XChartDocument.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ +#include <com/sun/star/chart2/XChartDocument.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XGRIDCONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XGridContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XGRIDCONTAINER_HPP_ +#include <com/sun/star/chart2/XGridContainer.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ -#include <drafts/com/sun/star/chart2/XIdentifiable.hpp> +#ifndef _COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ +#include <com/sun/star/chart2/XIdentifiable.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTITLED_HPP_ -#include <drafts/com/sun/star/chart2/XTitled.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTITLED_HPP_ +#include <com/sun/star/chart2/XTitled.hpp> #endif //for auto_ptr @@ -114,7 +114,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; namespace { diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index be2cb68951d5..fdc989e0c417 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -1,3 +1,63 @@ +/************************************************************************* + * + * $RCSfile: ChartController_TextEdit.cxx,v $ + * + * $Revision: 1.5 $ + * + * last change: $Author: bm $ $Date: 2004-01-26 09:12:08 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2003 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ #include "ChartController.hxx" #include "DrawViewWrapper.hxx" @@ -30,7 +90,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -//using namespace ::drafts::com::sun::star::chart2; +//using namespace ::com::sun::star::chart2; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -102,7 +162,7 @@ bool ChartController::EndTextEdit() //Paragraph* pPara = TitleHelper::setCompleteString( aString, uno::Reference< - ::drafts::com::sun::star::chart2::XTitle >::query( xPropSet ), m_xCC ); + ::com::sun::star::chart2::XTitle >::query( xPropSet ), m_xCC ); try { //need to rebuild to react on changed size of title diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 8eda2565a06b..825e53fb2949 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartController_Window.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: iha $ $Date: 2004-01-22 19:21:37 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,17 +71,17 @@ #include "ChartModelHelper.hxx" #include "ChartTypeHelper.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SCENEDESCRIPTOR_HPP_ -#include <drafts/com/sun/star/chart2/SceneDescriptor.hpp> +#ifndef _COM_SUN_STAR_CHART2_SCENEDESCRIPTOR_HPP_ +#include <com/sun/star/chart2/SceneDescriptor.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_RELATIVEPOSITION_HPP_ -#include <drafts/com/sun/star/layout/RelativePosition.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_RELATIVEPOSITION_HPP_ +#include <com/sun/star/layout/RelativePosition.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_RELATIVESIZE_HPP_ -#include <drafts/com/sun/star/layout/RelativeSize.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_RELATIVESIZE_HPP_ +#include <com/sun/star/layout/RelativeSize.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_LEGENDPOSITION_HPP_ -#include <drafts/com/sun/star/chart2/LegendPosition.hpp> +#ifndef _COM_SUN_STAR_CHART2_LEGENDPOSITION_HPP_ +#include <com/sun/star/chart2/LegendPosition.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_DIRECTION3D_HPP_ @@ -140,7 +140,7 @@ namespace chart //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; //----------------------------------------------------------------- // awt::XWindow diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx index 24e6e3bc47f8..6e5b421f2f53 100644 --- a/chart2/source/controller/main/PositionAndSizeHelper.cxx +++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: PositionAndSizeHelper.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: iha $ $Date: 2003-12-10 18:13:57 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,15 +64,15 @@ #include "macros.hxx" #include "ChartModelHelper.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_LEGENDPOSITION_HPP_ -#include <drafts/com/sun/star/chart2/LegendPosition.hpp> +#ifndef _COM_SUN_STAR_CHART2_LEGENDPOSITION_HPP_ +#include <com/sun/star/chart2/LegendPosition.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_RELATIVEPOSITION_HPP_ -#include <drafts/com/sun/star/layout/RelativePosition.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_RELATIVEPOSITION_HPP_ +#include <com/sun/star/layout/RelativePosition.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_RELATIVESIZE_HPP_ -#include <drafts/com/sun/star/layout/RelativeSize.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_RELATIVESIZE_HPP_ +#include <com/sun/star/layout/RelativeSize.hpp> #endif // header for class Rectangle @@ -89,7 +89,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; bool PositionAndSizeHelper::moveObject( const rtl::OUString& rObjectCID , const uno::Reference< frame::XModel >& xChartModel @@ -106,7 +106,7 @@ bool PositionAndSizeHelper::moveObject( const rtl::OUString& rObjectCID if(rObjectCID.indexOf(C2U("Title"))!=-1) { //@todo decide wether x is primary or secondary - ::drafts::com::sun::star::layout::RelativePosition aRelativePosition; + ::com::sun::star::layout::RelativePosition aRelativePosition; //the anchor point at the title object is top/middle Point aPos = aObjectRect.TopLeft(); aRelativePosition.Primary = (double(aPos.X())+double(aObjectRect.getWidth())/2.0)/double(aPageRect.getWidth()); @@ -119,7 +119,7 @@ bool PositionAndSizeHelper::moveObject( const rtl::OUString& rObjectCID xProp->getPropertyValue( C2U( "AnchorPosition" )) >>= ePos; Point aLegendAnchor(0,0);//point at legend Point aPageAnchor(0,0);//point at page - ::drafts::com::sun::star::layout::RelativePosition aRelativePosition; + ::com::sun::star::layout::RelativePosition aRelativePosition; switch( ePos ) { case LegendPosition_LINE_START: @@ -173,7 +173,7 @@ bool PositionAndSizeHelper::moveObject( const rtl::OUString& rObjectCID //set position: Point aPos = aObjectRect.TopLeft(); - ::drafts::com::sun::star::layout::RelativePosition aRelativePosition; + ::com::sun::star::layout::RelativePosition aRelativePosition; //the anchor points for the diagram are in the middle of the diagram //and in the middle of the page aRelativePosition.Primary = (double(aPos.X())+double(aObjectRect.getWidth())/2.0-double(aPageRect.getWidth())/2.0)/double(aPageRect.getWidth()); @@ -181,7 +181,7 @@ bool PositionAndSizeHelper::moveObject( const rtl::OUString& rObjectCID xProp->setPropertyValue( C2U( "RelativePosition" ), uno::makeAny(aRelativePosition) ); //set size: - ::drafts::com::sun::star::layout::RelativeSize aRelativeSize; + ::com::sun::star::layout::RelativeSize aRelativeSize; //the anchor points for the diagram are in the middle of the diagram //and in the middle of the page aRelativeSize.Primary = double(aObjectRect.getWidth())/double(aPageRect.getWidth()); diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index f3eac3495e4c..31fb3ab3683d 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: SelectionHelper.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: iha $ $Date: 2003-12-04 16:39:15 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,7 +88,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -//using namespace ::drafts::com::sun::star::chart2; +//using namespace ::com::sun::star::chart2; //static rtl::OUString SelectionHelper::getObjectName( SdrObject* pObj ) diff --git a/chart2/source/controller/main/makefile.mk b/chart2/source/controller/main/makefile.mk index 09e10a889c5d..ee9a101487fa 100644 --- a/chart2/source/controller/main/makefile.mk +++ b/chart2/source/controller/main/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: iha $ $Date: 2003-12-10 18:21:43 $ +# last change: $Author: bm $ $Date: 2004-01-26 09:12:09 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -82,6 +82,7 @@ SLOFILES = \ $(SLO)$/PositionAndSizeHelper.obj \ $(SLO)$/ChartWindow.obj \ $(SLO)$/ChartController.obj \ + $(SLO)$/ChartController_EditData.obj \ $(SLO)$/ChartController_Window.obj \ $(SLO)$/ChartController_Properties.obj \ $(SLO)$/ChartController_Insert.obj \ diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 160a782cbb77..790a82a54401 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -2,9 +2,9 @@ * * $RCSfile: CachedDataSequence.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:29 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,11 +91,11 @@ #endif // -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XNUMERICALDATASEQUENCE_HPP_ -#include <drafts/com/sun/star/chart2/XNumericalDataSequence.hpp> +#ifndef _COM_SUN_STAR_CHART2_XNUMERICALDATASEQUENCE_HPP_ +#include <com/sun/star/chart2/XNumericalDataSequence.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTEXTUALDATASEQUENCE_HPP_ -#include <drafts/com/sun/star/chart2/XTextualDataSequence.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTEXTUALDATASEQUENCE_HPP_ +#include <com/sun/star/chart2/XTextualDataSequence.hpp> #endif #include <vector> @@ -107,8 +107,8 @@ namespace chart namespace impl { typedef ::cppu::WeakComponentImplHelper3< - ::drafts::com::sun::star::chart2::XNumericalDataSequence, - ::drafts::com::sun::star::chart2::XTextualDataSequence, + ::com::sun::star::chart2::XNumericalDataSequence, + ::com::sun::star::chart2::XTextualDataSequence, ::com::sun::star::lang::XServiceInfo > CachedDataSequence_Base; } @@ -173,21 +173,21 @@ protected: virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; // ____ XNumericalDataSequence ____ - /// @see ::drafts::com::sun::star::chart::XNumericalDataSequence + /// @see ::com::sun::star::chart::XNumericalDataSequence virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException); - /// @see ::drafts::com::sun::star::chart::XNumericalDataSequence + /// @see ::com::sun::star::chart::XNumericalDataSequence // virtual void SAL_CALL setNumericalData( const ::com::sun::star::uno::Sequence< double >& aData ) throw (::com::sun::star::uno::RuntimeException); // ____ XTextualDataSequence ____ - /// @see ::drafts::com::sun::star::chart::XTextualDataSequence + /// @see ::com::sun::star::chart::XTextualDataSequence virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException); - /// @see ::drafts::com::sun::star::chart::XNumericalDataSequence + /// @see ::com::sun::star::chart::XNumericalDataSequence // virtual void SAL_CALL setTextualData( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aData ) throw (::com::sun::star::uno::RuntimeException); // ____ XDataSequence ____ - /// @see ::drafts::com::sun::star::chart::XDataSequence + /// @see ::com::sun::star::chart::XDataSequence virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData() throw (::com::sun::star::uno::RuntimeException); - /// @see ::drafts::com::sun::star::chart::XDataSequence + /// @see ::com::sun::star::chart::XDataSequence virtual ::rtl::OUString SAL_CALL getSourceIdentifier() throw (::com::sun::star::uno::RuntimeException); mutable ::osl::Mutex m_aMutex; diff --git a/chart2/source/inc/ChartModelHelper.hxx b/chart2/source/inc/ChartModelHelper.hxx index 2f08b76108fc..1c85e7dc4160 100644 --- a/chart2/source/inc/ChartModelHelper.hxx +++ b/chart2/source/inc/ChartModelHelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartModelHelper.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:47 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,14 +61,14 @@ #ifndef _CHART2_CONTROLLER_CHARTMODELHELPER_HXX #define _CHART2_CONTROLLER_CHARTMODELHELPER_HXX -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPEGROUP_HPP_ -#include <drafts/com/sun/star/chart2/XChartTypeGroup.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPEGROUP_HPP_ +#include <com/sun/star/chart2/XChartTypeGroup.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASERIES_HPP_ -#include <drafts/com/sun/star/chart2/XDataSeries.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASERIES_HPP_ +#include <com/sun/star/chart2/XDataSeries.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ -#include <drafts/com/sun/star/chart2/XDiagram.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ +#include <com/sun/star/chart2/XDiagram.hpp> #endif #ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ @@ -90,33 +90,33 @@ class ChartModelHelper { public: static ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > + ::com::sun::star::chart2::XDiagram > findDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); static ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType > + ::com::sun::star::chart2::XChartType > getFirstChartType( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram >& xDiagram ); + ::com::sun::star::chart2::XDiagram >& xDiagram ); static ::std::vector< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeries > > getDataSeries( + ::com::sun::star::chart2::XDataSeries > > getDataSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel ); static ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeries > + ::com::sun::star::chart2::XDataSeries > getSeriesByIdentifier( const rtl::OUString& rIdentifier , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel ); static ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType > + ::com::sun::star::chart2::XChartType > getChartTypeOfSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel , const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeries >& xGivenDataSeries ); + ::com::sun::star::chart2::XDataSeries >& xGivenDataSeries ); }; //............................................................................. diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx index 429ca12e60c0..2fca4fdaa485 100644 --- a/chart2/source/inc/ChartTypeHelper.hxx +++ b/chart2/source/inc/ChartTypeHelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartTypeHelper.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:47 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,12 +62,12 @@ #ifndef _CHART2_CHARTTYPEHELPER_HXX #define _CHART2_CHARTTYPEHELPER_HXX -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPE_HPP_ -#include <drafts/com/sun/star/chart2/XChartType.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPE_HPP_ +#include <com/sun/star/chart2/XChartType.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_AXISTYPE_HPP_ -#include <drafts/com/sun/star/chart2/AxisType.hpp> +#ifndef _COM_SUN_STAR_CHART2_AXISTYPE_HPP_ +#include <com/sun/star/chart2/AxisType.hpp> #endif //............................................................................. @@ -82,19 +82,19 @@ namespace chart class ChartTypeHelper { public: - static sal_Bool isSupportingGeometryProperties( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartType >& xChartType ); - static sal_Bool isSupportingStatisticProperties( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartType >& xChartType ); - static sal_Bool isSupportingRegressionProperties(const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartType >& xChartType ); - static sal_Bool isSupportingMainAxis( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionIndex ); - static sal_Bool isSupportingSecondaryAxis( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionIndex ); - static sal_Bool isSupportingAreaProperties( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartType >& xChartType ); - static sal_Bool isSupportingSymbolProperties( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartType >& xChartType ); + static sal_Bool isSupportingGeometryProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); + static sal_Bool isSupportingStatisticProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); + static sal_Bool isSupportingRegressionProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); + static sal_Bool isSupportingMainAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionIndex ); + static sal_Bool isSupportingSecondaryAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionIndex ); + static sal_Bool isSupportingAreaProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); + static sal_Bool isSupportingSymbolProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); - static ::drafts::com::sun::star::chart2::AxisType - getAxisType( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartType >& xChartType + static ::com::sun::star::chart2::AxisType + getAxisType( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType , sal_Int32 nDimensionIndex ); - static sal_Int32 getDimensionCount( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartType >& xChartType ); + static sal_Int32 getDimensionCount( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); }; //............................................................................. diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx index a68e7b024b61..6daeca140b87 100644 --- a/chart2/source/inc/CommonConverters.hxx +++ b/chart2/source/inc/CommonConverters.hxx @@ -2,9 +2,9 @@ * * $RCSfile: CommonConverters.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:48 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,8 +96,8 @@ #include <com/sun/star/text/WritingMode.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASEQUENCE_HPP_ -#include <drafts/com/sun/star/chart2/XDataSequence.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASEQUENCE_HPP_ +#include <com/sun/star/chart2/XDataSequence.hpp> #endif //............................................................................. @@ -289,7 +289,7 @@ com::sun::star::text::WritingMode WritingMode2ToWritingMode1( sal_Int16 nWriting ::com::sun::star::uno::Sequence< double > DataSequenceToDoubleSequence( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSequence > & xDataSequence ); + ::com::sun::star::chart2::XDataSequence > & xDataSequence ); //............................................................................. } //namespace chart diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx index 1bc6180c3345..fbaad1a49ac3 100644 --- a/chart2/source/inc/DiagramHelper.hxx +++ b/chart2/source/inc/DiagramHelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: DiagramHelper.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-11-04 15:35:06 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,8 +61,8 @@ #ifndef CHART2_DIAGRAMHELPER_HXX #define CHART2_DIAGRAMHELPER_HXX -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ -#include <drafts/com/sun/star/chart2/XDiagram.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ +#include <com/sun/star/chart2/XDiagram.hpp> #endif namespace chart @@ -75,9 +75,9 @@ class DiagramHelper public: static void changeDiagram( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > & xSource, + ::com::sun::star::chart2::XDiagram > & xSource, ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > & xDestination + ::com::sun::star::chart2::XDiagram > & xDestination ); private: diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index 52f2a1781199..ec5ab5a2c3c3 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ErrorBar.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-11 13:52:55 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,11 +72,11 @@ #include <comphelper/uno3.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVE_HPP_ -#include <drafts/com/sun/star/chart2/XRegressionCurve.hpp> +#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVE_HPP_ +#include <com/sun/star/chart2/XRegressionCurve.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ -#include <drafts/com/sun/star/chart2/XIdentifiable.hpp> +#ifndef _COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ +#include <com/sun/star/chart2/XIdentifiable.hpp> #endif #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ diff --git a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx index ff92011252a9..af840d802a49 100644 --- a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ExponentialRegressionCurveCalculator.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-17 14:53:01 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,15 +65,15 @@ #include <cppuhelper/implbase1.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_ -#include <drafts/com/sun/star/chart2/XRegressionCurveCalculator.hpp> +#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_ +#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp> #endif namespace chart { class ExponentialRegressionCurveCalculator : public - ::cppu::WeakImplHelper1< ::drafts::com::sun::star::chart2::XRegressionCurveCalculator > + ::cppu::WeakImplHelper1< ::com::sun::star::chart2::XRegressionCurveCalculator > { public: ExponentialRegressionCurveCalculator(); diff --git a/chart2/source/inc/LegendHelper.hxx b/chart2/source/inc/LegendHelper.hxx index eba03b0bac19..a7a33293174b 100644 --- a/chart2/source/inc/LegendHelper.hxx +++ b/chart2/source/inc/LegendHelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: LegendHelper.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: bm $ $Date: 2003-11-04 17:18:21 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,11 +69,11 @@ #ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ #include <com/sun/star/frame/XModel.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XLEGEND_HPP_ -#include <drafts/com/sun/star/chart2/XLegend.hpp> +#ifndef _COM_SUN_STAR_CHART2_XLEGEND_HPP_ +#include <com/sun/star/chart2/XLegend.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ -#include <drafts/com/sun/star/chart2/XDiagram.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ +#include <com/sun/star/chart2/XDiagram.hpp> #endif //............................................................................. @@ -91,7 +91,7 @@ public: static rtl::OUString getIdentifierForLegend(); static ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XLegend > + ::com::sun::star::chart2::XLegend > getLegend( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); @@ -104,15 +104,15 @@ public: */ static void defaultFillEmptyLegend( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XLegend > & xLegend, + ::com::sun::star::chart2::XLegend > & xLegend, const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > & xDiagram ); + ::com::sun::star::chart2::XDiagram > & xDiagram ); /** removes all legend entries */ static void flushLegend( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XLegend > & xLegend ); + ::com::sun::star::chart2::XLegend > & xLegend ); }; //............................................................................. diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx b/chart2/source/inc/LinearRegressionCurveCalculator.hxx index 7f4f57b268cc..ed9f53168dda 100644 --- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx @@ -2,9 +2,9 @@ * * $RCSfile: LinearRegressionCurveCalculator.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: bm $ $Date: 2003-12-17 14:33:19 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,15 +65,15 @@ #include <cppuhelper/implbase1.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_ -#include <drafts/com/sun/star/chart2/XRegressionCurveCalculator.hpp> +#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_ +#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp> #endif namespace chart { class LinearRegressionCurveCalculator : public - ::cppu::WeakImplHelper1< ::drafts::com::sun::star::chart2::XRegressionCurveCalculator > + ::cppu::WeakImplHelper1< ::com::sun::star::chart2::XRegressionCurveCalculator > { public: LinearRegressionCurveCalculator(); diff --git a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx index affe2feb6e1a..ca486e7f664f 100644 --- a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx @@ -2,9 +2,9 @@ * * $RCSfile: LogarithmicRegressionCurveCalculator.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-17 14:36:36 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,15 +65,15 @@ #include <cppuhelper/implbase1.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_ -#include <drafts/com/sun/star/chart2/XRegressionCurveCalculator.hpp> +#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_ +#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp> #endif namespace chart { class LogarithmicRegressionCurveCalculator : public - ::cppu::WeakImplHelper1< ::drafts::com::sun::star::chart2::XRegressionCurveCalculator > + ::cppu::WeakImplHelper1< ::com::sun::star::chart2::XRegressionCurveCalculator > { public: LogarithmicRegressionCurveCalculator(); diff --git a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx index 3cf160407dac..f0acda9c3ecd 100644 --- a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx +++ b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx @@ -2,9 +2,9 @@ * * $RCSfile: MeanValueRegressionCurveCalculator.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-17 14:19:34 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,15 +65,15 @@ #include <cppuhelper/implbase1.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_ -#include <drafts/com/sun/star/chart2/XRegressionCurveCalculator.hpp> +#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_ +#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp> #endif namespace chart { class MeanValueRegressionCurveCalculator : public - ::cppu::WeakImplHelper1< ::drafts::com::sun::star::chart2::XRegressionCurveCalculator > + ::cppu::WeakImplHelper1< ::com::sun::star::chart2::XRegressionCurveCalculator > { public: MeanValueRegressionCurveCalculator(); diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index ce271c2edb9b..459326e0b513 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -2,9 +2,9 @@ * * $RCSfile: OPropertySet.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:29 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,11 +89,11 @@ #include <com/sun/star/beans/Property.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_STYLE_XSTYLESUPPLIER_HPP_ -#include <drafts/com/sun/star/style/XStyleSupplier.hpp> +#ifndef _COM_SUN_STAR_STYLE_XSTYLESUPPLIER_HPP_ +#include <com/sun/star/style/XStyleSupplier.hpp> #endif -// #ifndef _DRAFTS_COM_SUN_STAR_BEANS_XFASTPROPERTYSTATE_HPP_ -// #include <drafts/com/sun/star/beans/XFastPropertyState.hpp> +// #ifndef _COM_SUN_STAR_BEANS_XFASTPROPERTYSTATE_HPP_ +// #include <com/sun/star/beans/XFastPropertyState.hpp> // #endif #ifndef _OSL_MUTEX_HXX_ @@ -120,8 +120,8 @@ class OPropertySet : public ::com::sun::star::lang::XTypeProvider, public ::com::sun::star::beans::XPropertyState, public ::com::sun::star::beans::XMultiPropertyStates, - public ::drafts::com::sun::star::style::XStyleSupplier -// public ::drafts::com::sun::star::beans::XFastPropertyState + public ::com::sun::star::style::XStyleSupplier +// public ::com::sun::star::beans::XFastPropertyState { public: OPropertySet( ::osl::Mutex & rMutex ); diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx index 888cf3e90dd4..6c792a87a79c 100644 --- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx @@ -2,9 +2,9 @@ * * $RCSfile: PotentialRegressionCurveCalculator.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-17 14:29:31 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,8 +65,8 @@ #include <cppuhelper/implbase1.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_ -#include <drafts/com/sun/star/chart2/XRegressionCurveCalculator.hpp> +#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_ +#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp> #endif namespace chart @@ -74,7 +74,7 @@ namespace chart class PotentialRegressionCurveCalculator : public - ::cppu::WeakImplHelper1< ::drafts::com::sun::star::chart2::XRegressionCurveCalculator > + ::cppu::WeakImplHelper1< ::com::sun::star::chart2::XRegressionCurveCalculator > { public: PotentialRegressionCurveCalculator(); diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx index fc9e90c3f9cc..6ec9629058fa 100644 --- a/chart2/source/inc/RegressionCurveHelper.hxx +++ b/chart2/source/inc/RegressionCurveHelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: RegressionCurveHelper.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: bm $ $Date: 2003-12-19 15:05:24 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,20 +61,20 @@ #ifndef CHART2_REGRESSIONCURVEHELPER_HXX #define CHART2_REGRESSIONCURVEHELPER_HXX -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVE_HPP_ -#include <drafts/com/sun/star/chart2/XRegressionCurve.hpp> +#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVE_HPP_ +#include <com/sun/star/chart2/XRegressionCurve.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_ -#include <drafts/com/sun/star/chart2/XRegressionCurveCalculator.hpp> +#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_ +#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVECONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XRegressionCurveContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVECONTAINER_HPP_ +#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASOURCE_HPP_ -#include <drafts/com/sun/star/chart2/XDataSource.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASOURCE_HPP_ +#include <com/sun/star/chart2/XDataSource.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASERIES_HPP_ -#include <drafts/com/sun/star/chart2/XDataSeries.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASERIES_HPP_ +#include <com/sun/star/chart2/XDataSeries.hpp> #endif #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> @@ -91,14 +91,14 @@ class RegressionCurveHelper public: /// returns a model mean-value line static ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XRegressionCurve > + ::com::sun::star::chart2::XRegressionCurve > createMeanValueLine( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext ); /// returns a model regression curve static ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XRegressionCurve > + ::com::sun::star::chart2::XRegressionCurve > createRegressionCurveByServiceName( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, @@ -108,7 +108,7 @@ public: static bool hasMeanValueLine( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt ); + ::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt ); /** creates a mean-value line and adds it to the container. @@ -117,7 +117,7 @@ public: */ static void RegressionCurveHelper::addMeanValueLine( ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt, + ::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const ::com::sun::star::uno::Reference< @@ -125,7 +125,7 @@ public: static void removeMeanValueLine( ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt ); + ::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt ); enum tRegressionType { @@ -141,18 +141,18 @@ public: */ static tRegressionType getRegressType( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt ); + ::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt ); // ------------------------------------------------------------ /// returns a calculator object for mean-value lines (used by the view) static ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XRegressionCurveCalculator > + ::com::sun::star::chart2::XRegressionCurveCalculator > createMeanValueLineCalculator(); /// returns a calculator object for regression curves (used by the view) static ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XRegressionCurveCalculator > + ::com::sun::star::chart2::XRegressionCurveCalculator > createRegressionCurveCalculatorByServiceName( ::rtl::OUString aServiceName ); @@ -164,8 +164,8 @@ public: indexes will be used for the recalculateRegression() method of the regression curve. - The first sequence having the role "values" will be used as y-values for - the recalculateRegression() method of the regression curve. + The first sequence having the role "y-values" will be used as y-values + for the recalculateRegression() method of the regression curve. @param bUseXValuesIfAvailable If false, the sequence (1, 2, 3, ...) will always be used, even if @@ -173,9 +173,9 @@ public: */ static void initializeCurveCalculator( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XRegressionCurveCalculator > & xOutCurveCalculator, + ::com::sun::star::chart2::XRegressionCurveCalculator > & xOutCurveCalculator, const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSource > & xSource, + ::com::sun::star::chart2::XDataSource > & xSource, bool bUseXValuesIfAvailable = true ); /** Same method as above, but uses the given XModel to determine the @@ -185,9 +185,9 @@ public: */ static void initializeCurveCalculator( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XRegressionCurveCalculator > & xOutCurveCalculator, + ::com::sun::star::chart2::XRegressionCurveCalculator > & xOutCurveCalculator, const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeries > & xSeries, + ::com::sun::star::chart2::XDataSeries > & xSeries, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel ); diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index 4993bdfe3bd6..ef3ae03ef1aa 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -2,9 +2,9 @@ * * $RCSfile: Scaling.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:29 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,8 +61,8 @@ #ifndef _CHART2_SCALING_HXX #define _CHART2_SCALING_HXX -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XSCALING_HPP_ -#include <drafts/com/sun/star/chart2/XScaling.hpp> +#ifndef _COM_SUN_STAR_CHART2_XSCALING_HPP_ +#include <com/sun/star/chart2/XScaling.hpp> #endif #ifndef _COM_SUN_STAR_LANG_XSERVICENAME_HPP_ #include <com/sun/star/lang/XServiceName.hpp> @@ -82,7 +82,7 @@ namespace chart */ class LogarithmicScaling : public ::cppu::WeakImplHelper2 < - ::drafts::com::sun::star::chart2::XScaling, + ::com::sun::star::chart2::XScaling, ::com::sun::star::lang::XServiceName > { @@ -97,7 +97,7 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XScaling > SAL_CALL + ::com::sun::star::chart2::XScaling > SAL_CALL getInverseScaling() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ @@ -112,7 +112,7 @@ private: // ---------------------------------------- class ExponentialScaling : public ::cppu::WeakImplHelper2 < - ::drafts::com::sun::star::chart2::XScaling, + ::com::sun::star::chart2::XScaling, ::com::sun::star::lang::XServiceName > { @@ -127,7 +127,7 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XScaling > SAL_CALL + ::com::sun::star::chart2::XScaling > SAL_CALL getInverseScaling() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ @@ -141,7 +141,7 @@ private: // ---------------------------------------- class LinearScaling : public ::cppu::WeakImplHelper2 < - ::drafts::com::sun::star::chart2::XScaling, + ::com::sun::star::chart2::XScaling, ::com::sun::star::lang::XServiceName > { @@ -156,7 +156,7 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XScaling > SAL_CALL + ::com::sun::star::chart2::XScaling > SAL_CALL getInverseScaling() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ @@ -171,7 +171,7 @@ private: // ---------------------------------------- class PowerScaling : public ::cppu::WeakImplHelper2 < - ::drafts::com::sun::star::chart2::XScaling, + ::com::sun::star::chart2::XScaling, ::com::sun::star::lang::XServiceName > { @@ -185,7 +185,7 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XScaling > SAL_CALL + ::com::sun::star::chart2::XScaling > SAL_CALL getInverseScaling() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx index 506c95f5c829..5351d02a8851 100644 --- a/chart2/source/inc/TitleHelper.hxx +++ b/chart2/source/inc/TitleHelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: TitleHelper.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: bm $ $Date: 2003-10-06 12:54:11 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,8 +61,8 @@ #ifndef _CHART2_TOOLS_TITLEHELPER_HXX #define _CHART2_TOOLS_TITLEHELPER_HXX -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTITLED_HPP_ -#include <drafts/com/sun/star/chart2/XTitled.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTITLED_HPP_ +#include <com/sun/star/chart2/XTitled.hpp> #endif #ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ @@ -96,13 +96,13 @@ public: static rtl::OUString getIdentifierForTitle( eTitleType nTitleIndex ); static ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTitle > + ::com::sun::star::chart2::XTitle > getTitle( eTitleType nTitleIndex , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); static ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTitle > + ::com::sun::star::chart2::XTitle > createTitle( eTitleType nTitleIndex , const rtl::OUString& rTitleText , const ::com::sun::star::uno::Reference< @@ -115,10 +115,10 @@ public: ::com::sun::star::frame::XModel >& xModel ); static rtl::OUString getCompleteString( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTitle >& xTitle ); + ::com::sun::star::chart2::XTitle >& xTitle ); static void setCompleteString( const rtl::OUString& rNewText , const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTitle >& xTitle + ::com::sun::star::chart2::XTitle >& xTitle , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext ); }; diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx index 35339c6eb114..df45144aa02c 100644 --- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx +++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ExplicitValueProvider.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:29 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,14 +61,14 @@ #ifndef _CHART2_EXPLICITVALUEPROVIDER_HXX #define _CHART2_EXPLICITVALUEPROVIDER_HXX -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_EXPLICITINCREMENTDATA_HPP_ -#include <drafts/com/sun/star/chart2/ExplicitIncrementData.hpp> +#ifndef _COM_SUN_STAR_CHART2_EXPLICITINCREMENTDATA_HPP_ +#include <com/sun/star/chart2/ExplicitIncrementData.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_EXPLICITSCALEDATA_HPP_ -#include <drafts/com/sun/star/chart2/ExplicitScaleData.hpp> +#ifndef _COM_SUN_STAR_CHART2_EXPLICITSCALEDATA_HPP_ +#include <com/sun/star/chart2/ExplicitScaleData.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XMETER_HPP_ -#include <drafts/com/sun/star/chart2/XMeter.hpp> +#ifndef _COM_SUN_STAR_CHART2_XMETER_HPP_ +#include <com/sun/star/chart2/XMeter.hpp> #endif //............................................................................. @@ -84,9 +84,9 @@ class ExplicitValueProvider { public: virtual void getExplicitValuesForMeter( - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XMeter > xMeter - , ::drafts::com::sun::star::chart2::ExplicitScaleData& rExplicitScale - , ::drafts::com::sun::star::chart2::ExplicitIncrementData& rExplicitIncrement + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XMeter > xMeter + , ::com::sun::star::chart2::ExplicitScaleData& rExplicitScale + , ::com::sun::star::chart2::ExplicitIncrementData& rExplicitIncrement , double& rfExplicitOrigin )=0; }; diff --git a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx index 9bff634e1d67..b483999c154b 100644 --- a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx +++ b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: NumberFormatterWrapper.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:29 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,8 +61,8 @@ #ifndef _CHART2_VIEW_NUMBERFORMATTERWRAPPER_HXX #define _CHART2_VIEW_NUMBERFORMATTERWRAPPER_HXX -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_NUMBERFORMAT_HPP_ -#include <drafts/com/sun/star/chart2/NumberFormat.hpp> +#ifndef _COM_SUN_STAR_CHART2_NUMBERFORMAT_HPP_ +#include <com/sun/star/chart2/NumberFormat.hpp> #endif //only needed for temp numberformatter @@ -86,8 +86,8 @@ public: NumberFormatterWrapper(); virtual ~NumberFormatterWrapper(); - ::drafts::com::sun::star::chart2::NumberFormat getNumberFormatForKey( sal_Int32 nIndex ) const; - sal_Int32 getKeyForNumberFormat( const ::drafts::com::sun::star::chart2::NumberFormat& rNumberFormat ) const; + ::com::sun::star::chart2::NumberFormat getNumberFormatForKey( sal_Int32 nIndex ) const; + sal_Int32 getKeyForNumberFormat( const ::com::sun::star::chart2::NumberFormat& rNumberFormat ) const; //this method should only be used by the ViewElementListProvider SvNumberFormatter* getSvNumberFormatter() const; @@ -103,7 +103,7 @@ class FixedNumberFormatter { public: FixedNumberFormatter( NumberFormatterWrapper* pNumberFormatterWrapper - , const ::drafts::com::sun::star::chart2::NumberFormat& rNumberFormat ); + , const ::com::sun::star::chart2::NumberFormat& rNumberFormat ); virtual ~FixedNumberFormatter(); rtl::OUString getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const; diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx index 6fcfcbda575f..8942c054260b 100644 --- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx +++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx @@ -2,9 +2,9 @@ * * $RCSfile: CartesianCoordinateSystem.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:50 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,8 +70,8 @@ #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCOORDINATESYSTEM_HPP_ -#include <drafts/com/sun/star/chart2/XCoordinateSystem.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCOORDINATESYSTEM_HPP_ +#include <com/sun/star/chart2/XCoordinateSystem.hpp> #endif namespace chart @@ -79,7 +79,7 @@ namespace chart class CartesianCoordinateSystem : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo, - ::drafts::com::sun::star::chart2::XCoordinateSystem + ::com::sun::star::chart2::XCoordinateSystem > { public: @@ -88,13 +88,13 @@ public: // ____ XCoordinateSystem ____ // ___________________________ - /// @see ::drafts::com::sun::star::chart2::XCoordinateSystem - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation > SAL_CALL getTransformationToCartesian() + /// @see ::com::sun::star::chart2::XCoordinateSystem + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > SAL_CALL getTransformationToCartesian() throw (::com::sun::star::uno::RuntimeException); - /// @see ::drafts::com::sun::star::chart2::XCoordinateSystem - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation > SAL_CALL getTransformationFromCartesian() + /// @see ::com::sun::star::chart2::XCoordinateSystem + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > SAL_CALL getTransformationFromCartesian() throw (::com::sun::star::uno::RuntimeException); - /// @see ::drafts::com::sun::star::chart2::XCoordinateSystem + /// @see ::com::sun::star::chart2::XCoordinateSystem virtual sal_Int32 SAL_CALL getDimension() throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getCoordinateSystemType() throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getViewServiceName() throw (::com::sun::star::uno::RuntimeException); @@ -102,9 +102,9 @@ public: APPHELPER_XSERVICEINFO_DECL() private: - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation > + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > m_aTransformationToCartesian; - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation > + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > m_aTransformationFromCartesian; sal_Int32 m_nDim; }; diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx index ef59d5d53c16..762e4b6ae337 100644 --- a/chart2/source/model/inc/ChartTypeManager.hxx +++ b/chart2/source/model/inc/ChartTypeManager.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartTypeManager.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:29 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,7 +86,7 @@ // #include <com/sun/star/lang/XMultiComponentFactory.hpp> // #endif -#include <drafts/com/sun/star/chart2/XChartTypeManager.hpp> +#include <com/sun/star/chart2/XChartTypeManager.hpp> // #include <map> @@ -98,7 +98,7 @@ namespace impl typedef ::cppu::WeakImplHelper2< ::com::sun::star::lang::XMultiServiceFactory, // ::com::sun::star::lang::XMultiComponentFactory, - ::drafts::com::sun::star::chart2::XChartTypeManager > + ::com::sun::star::chart2::XChartTypeManager > ChartTypeManager_Base; } diff --git a/chart2/source/model/inc/DataSeriesTree.hxx b/chart2/source/model/inc/DataSeriesTree.hxx index cc560325a4a8..72918789ccf1 100644 --- a/chart2/source/model/inc/DataSeriesTree.hxx +++ b/chart2/source/model/inc/DataSeriesTree.hxx @@ -2,9 +2,9 @@ * * $RCSfile: DataSeriesTree.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:30 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,8 +73,8 @@ #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASERIESTREEPARENT_HPP_ -#include <drafts/com/sun/star/chart2/XDataSeriesTreeParent.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASERIESTREEPARENT_HPP_ +#include <com/sun/star/chart2/XDataSeriesTreeParent.hpp> #endif #include <vector> @@ -85,7 +85,7 @@ namespace chart class DataSeriesTree : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo, - ::drafts::com::sun::star::chart2::XDataSeriesTreeParent > + ::com::sun::star::chart2::XDataSeriesTreeParent > { public: DataSeriesTree( const ::com::sun::star::uno::Reference< @@ -100,15 +100,15 @@ public: protected: // ____ XDataSeriesTreeParent ____ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XDataSeriesTreeNode > > + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeriesTreeNode > > SAL_CALL getChildren() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addChild( - const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XDataSeriesTreeNode >& aNode ) + const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeriesTreeNode >& aNode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeChild( - const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XDataSeriesTreeNode >& aNode ) + const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeriesTreeNode >& aNode ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); @@ -116,7 +116,7 @@ protected: private: typedef ::std::vector< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeriesTreeNode > > + ::com::sun::star::chart2::XDataSeriesTreeNode > > m_tChildType; m_tChildType m_aChildren; diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index 506d730ddcf2..19027b7d36f6 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -2,9 +2,9 @@ * * $RCSfile: Diagram.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: bm $ $Date: 2003-12-09 16:27:52 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,26 +78,23 @@ #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ -#include <drafts/com/sun/star/chart2/XDiagram.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ +#include <com/sun/star/chart2/XDiagram.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTELEMENT_HPP_ -#include <drafts/com/sun/star/chart2/XChartElement.hpp> +#ifndef _COM_SUN_STAR_CHART2_XAXISCONTAINER_HPP_ +#include <com/sun/star/chart2/XAxisContainer.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XAXISCONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XAxisContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XBOUNDEDCOORDINATESYSTEMCONTAINER_HPP_ +#include <com/sun/star/chart2/XBoundedCoordinateSystemContainer.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XBOUNDEDCOORDINATESYSTEMCONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XBoundedCoordinateSystemContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XGRIDCONTAINER_HPP_ +#include <com/sun/star/chart2/XGridContainer.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XGRIDCONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XGridContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTITLED_HPP_ +#include <com/sun/star/chart2/XTitled.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTITLED_HPP_ -#include <drafts/com/sun/star/chart2/XTitled.hpp> -#endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ -#include <drafts/com/sun/star/chart2/XIdentifiable.hpp> +#ifndef _COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ +#include <com/sun/star/chart2/XIdentifiable.hpp> #endif #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> @@ -115,13 +112,13 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper7< - ::drafts::com::sun::star::chart2::XDiagram, + ::com::sun::star::chart2::XDiagram, ::com::sun::star::lang::XServiceInfo, - ::drafts::com::sun::star::chart2::XAxisContainer, - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystemContainer, - ::drafts::com::sun::star::chart2::XGridContainer, - ::drafts::com::sun::star::chart2::XTitled, - ::drafts::com::sun::star::chart2::XIdentifiable > + ::com::sun::star::chart2::XAxisContainer, + ::com::sun::star::chart2::XBoundedCoordinateSystemContainer, + ::com::sun::star::chart2::XGridContainer, + ::com::sun::star::chart2::XTitled, + ::com::sun::star::chart2::XIdentifiable > Diagram_Base; } @@ -167,11 +164,11 @@ protected: // throw (::com::sun::star::lang::IllegalArgumentException); // ____ XDiagram ____ - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XDataSeriesTreeParent > + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeriesTreeParent > SAL_CALL getTree() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTree( - const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XDataSeriesTreeParent >& xTree ) + const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeriesTreeParent >& xTree ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // virtual ::rtl::OUString SAL_CALL getChartTypeTemplateServiceName() @@ -183,74 +180,74 @@ protected: ::com::sun::star::beans::XPropertySet > SAL_CALL getFloor() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XLegend > SAL_CALL getLegend() + ::com::sun::star::chart2::XLegend > SAL_CALL getLegend() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setLegend( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XLegend >& xLegend ) + ::com::sun::star::chart2::XLegend >& xLegend ) throw (::com::sun::star::uno::RuntimeException); // ____ XAxisContainer ____ virtual void SAL_CALL addAxis( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XAxis >& aAxis ) + ::com::sun::star::chart2::XAxis >& aAxis ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeAxis( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XAxis >& aAxis ) + ::com::sun::star::chart2::XAxis >& aAxis ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XAxis > > SAL_CALL getAxes() + ::com::sun::star::chart2::XAxis > > SAL_CALL getAxes() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XAxis > SAL_CALL getAxisByIdentifier( + ::com::sun::star::chart2::XAxis > SAL_CALL getAxisByIdentifier( const ::rtl::OUString& aIdentifier ) throw (::com::sun::star::uno::RuntimeException); // ____ XBoundedCoordinateSystemContainer ____ virtual void SAL_CALL addCoordinateSystem( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem >& aCoordSys ) + ::com::sun::star::chart2::XBoundedCoordinateSystem >& aCoordSys ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeCoordinateSystem( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem >& aCoordSys ) + ::com::sun::star::chart2::XBoundedCoordinateSystem >& aCoordSys ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > > SAL_CALL getCoordinateSystems() + ::com::sun::star::chart2::XBoundedCoordinateSystem > > SAL_CALL getCoordinateSystems() throw (::com::sun::star::uno::RuntimeException); // ____ XGridContainer ____ virtual void SAL_CALL addGrid( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XGrid >& aGrid ) + ::com::sun::star::chart2::XGrid >& aGrid ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeGrid( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XGrid >& aGrid ) + ::com::sun::star::chart2::XGrid >& aGrid ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XGrid > > SAL_CALL getGrids() + ::com::sun::star::chart2::XGrid > > SAL_CALL getGrids() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XGrid > SAL_CALL getGridByIdentifier( + ::com::sun::star::chart2::XGrid > SAL_CALL getGridByIdentifier( const ::rtl::OUString& aIdentifier ) throw (::com::sun::star::uno::RuntimeException); // ____ XTitled ____ virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTitle > SAL_CALL getTitle() + ::com::sun::star::chart2::XTitle > SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTitle( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTitle >& Title ) + ::com::sun::star::chart2::XTitle >& Title ) throw (::com::sun::star::uno::RuntimeException); // ____ XIdentifiable ____ @@ -262,27 +259,27 @@ private: ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeriesTreeParent > m_xSeriesTree; + ::com::sun::star::chart2::XDataSeriesTreeParent > m_xSeriesTree; typedef ::std::map< ::rtl::OUString, - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XAxis > > + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > > tAxisContainerType; typedef ::std::map< ::rtl::OUString, - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XGrid > > + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XGrid > > tGridContainerType; tAxisContainerType m_aAxes; tGridContainerType m_aGrids; // ::std::set< ::com::sun::star::uno::Reference< -// ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > > +// ::com::sun::star::chart2::XBoundedCoordinateSystem > > // m_aCoordSystems; ::std::vector< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > > + ::com::sun::star::chart2::XBoundedCoordinateSystem > > m_aCoordSystems; ::com::sun::star::uno::Reference< @@ -294,16 +291,14 @@ private: m_xFloor; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTitle > + ::com::sun::star::chart2::XTitle > m_xTitle; ::rtl::OUString m_aIdentifier; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XLegend > + ::com::sun::star::chart2::XLegend > m_xLegend; - - ::rtl::OUString m_aTemplateServiceName; }; } // namespace chart diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx index 49f634e83cb5..0a8119b40948 100644 --- a/chart2/source/model/inc/PolarCoordinateSystem.hxx +++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx @@ -2,9 +2,9 @@ * * $RCSfile: PolarCoordinateSystem.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:50 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,8 +70,8 @@ #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCOORDINATESYSTEM_HPP_ -#include <drafts/com/sun/star/chart2/XCoordinateSystem.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCOORDINATESYSTEM_HPP_ +#include <com/sun/star/chart2/XCoordinateSystem.hpp> #endif namespace chart @@ -79,7 +79,7 @@ namespace chart class PolarCoordinateSystem : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo, - ::drafts::com::sun::star::chart2::XCoordinateSystem + ::com::sun::star::chart2::XCoordinateSystem > { public: @@ -88,13 +88,13 @@ public: // ____ XCoordinateSystem ____ // ___________________________ - /// @see ::drafts::com::sun::star::chart2::XCoordinateSystem - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation > SAL_CALL getTransformationToCartesian() + /// @see ::com::sun::star::chart2::XCoordinateSystem + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > SAL_CALL getTransformationToCartesian() throw (::com::sun::star::uno::RuntimeException); - /// @see ::drafts::com::sun::star::chart2::XCoordinateSystem - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation > SAL_CALL getTransformationFromCartesian() + /// @see ::com::sun::star::chart2::XCoordinateSystem + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > SAL_CALL getTransformationFromCartesian() throw (::com::sun::star::uno::RuntimeException); - /// @see ::drafts::com::sun::star::chart2::XCoordinateSystem + /// @see ::com::sun::star::chart2::XCoordinateSystem virtual sal_Int32 SAL_CALL getDimension() throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getCoordinateSystemType() throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getViewServiceName() throw (::com::sun::star::uno::RuntimeException); @@ -102,9 +102,9 @@ public: APPHELPER_XSERVICEINFO_DECL() private: - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation > + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > m_aTransformationToCartesian; - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation > + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > m_aTransformationFromCartesian; sal_Int32 m_nDim; }; diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index e4b416415f42..6173213c5146 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -2,9 +2,9 @@ * * $RCSfile: Axis.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: bm $ $Date: 2003-12-09 09:25:10 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,14 +74,14 @@ #include <com/sun/star/lang/Locale.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_ALIGNMENT_HPP_ -#include <drafts/com/sun/star/layout/Alignment.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_ALIGNMENT_HPP_ +#include <com/sun/star/layout/Alignment.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_STRETCHMODE_HPP_ -#include <drafts/com/sun/star/layout/StretchMode.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_STRETCHMODE_HPP_ +#include <com/sun/star/layout/StretchMode.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_NUMBERFORMAT_HPP_ -#include <drafts/com/sun/star/chart2/NumberFormat.hpp> +#ifndef _COM_SUN_STAR_CHART2_NUMBERFORMAT_HPP_ +#include <com/sun/star/chart2/NumberFormat.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_LINESTYLE_HPP_ @@ -112,7 +112,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; -using namespace ::drafts::com::sun::star; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; @@ -476,10 +475,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL uno::Sequence< ::rtl::OUString > Axis::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 3 ); - aServices[ 0 ] = C2U( "drafts.com.sun.star.chart2.Axis" ); - aServices[ 1 ] = C2U( "drafts.com.sun.star.chart2.ChartElement" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + uno::Sequence< ::rtl::OUString > aServices( 2 ); + aServices[ 0 ] = C2U( "com.sun.star.chart2.Axis" ); + aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" ); return aServices; } diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index c81a9f953820..7f4897924654 100644 --- a/chart2/source/model/main/Axis.hxx +++ b/chart2/source/model/main/Axis.hxx @@ -2,9 +2,9 @@ * * $RCSfile: Axis.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: bm $ $Date: 2003-12-09 09:26:02 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,14 +84,14 @@ #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XAXIS_HPP_ -#include <drafts/com/sun/star/chart2/XAxis.hpp> +#ifndef _COM_SUN_STAR_CHART2_XAXIS_HPP_ +#include <com/sun/star/chart2/XAxis.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ -#include <drafts/com/sun/star/chart2/XIdentifiable.hpp> +#ifndef _COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ +#include <com/sun/star/chart2/XIdentifiable.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTITLED_HPP_ -#include <drafts/com/sun/star/chart2/XTitled.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTITLED_HPP_ +#include <com/sun/star/chart2/XTitled.hpp> #endif namespace chart @@ -100,9 +100,9 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper4< - ::drafts::com::sun::star::chart2::XAxis, - ::drafts::com::sun::star::chart2::XIdentifiable, - ::drafts::com::sun::star::chart2::XTitled, + ::com::sun::star::chart2::XAxis, + ::com::sun::star::chart2::XIdentifiable, + ::com::sun::star::chart2::XTitled, ::com::sun::star::lang::XServiceInfo > Axis_Base; } @@ -156,21 +156,21 @@ protected: // ____ XMeter ____ virtual void SAL_CALL attachCoordinateSystem( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem >& xCoordSys, + ::com::sun::star::chart2::XBoundedCoordinateSystem >& xCoordSys, sal_Int32 nRepresentedDimension ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > SAL_CALL getCoordinateSystem() + ::com::sun::star::chart2::XBoundedCoordinateSystem > SAL_CALL getCoordinateSystem() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getRepresentedDimension() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setIncrement( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XIncrement >& aIncrement ) + ::com::sun::star::chart2::XIncrement >& aIncrement ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XIncrement > SAL_CALL getIncrement() + ::com::sun::star::chart2::XIncrement > SAL_CALL getIncrement() throw (::com::sun::star::uno::RuntimeException); // ____ XIdentifiable ____ @@ -179,26 +179,26 @@ protected: // ____ XTitled ____ virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTitle > SAL_CALL getTitle() + ::com::sun::star::chart2::XTitle > SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTitle( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTitle >& Title ) + ::com::sun::star::chart2::XTitle >& Title ) throw (::com::sun::star::uno::RuntimeException); private: ::rtl::OUString m_aIdentifier; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > + ::com::sun::star::chart2::XBoundedCoordinateSystem > m_xCoordinateSystem; sal_Int32 m_nRepresentedDimension; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XIncrement > + ::com::sun::star::chart2::XIncrement > m_xIncrement; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTitle > + ::com::sun::star::chart2::XTitle > m_xTitle; }; diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx index ce8853987139..52c650719ff4 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: CartesianCoordinateSystem.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:51 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,14 +81,14 @@ CartesianCoordinateSystem::~CartesianCoordinateSystem() {} // ____ XCoordinateSystem ____ -::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation > SAL_CALL +::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > SAL_CALL CartesianCoordinateSystem::getTransformationToCartesian() throw (RuntimeException) { return m_aTransformationToCartesian; } -::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation > SAL_CALL +::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > SAL_CALL CartesianCoordinateSystem::getTransformationFromCartesian() throw (RuntimeException) { @@ -116,7 +116,7 @@ Sequence< OUString > CartesianCoordinateSystem::getSupportedServiceNames_Static( { Sequence< OUString > aServices; // Sequence< OUString > aServices( 1 ); -// aServices[ 0 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.chart2.CoordinateSystem" )); +// aServices[ 0 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CoordinateSystem" )); return aServices; } diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 6b081cc70d9d..945d88287d21 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartModel.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: bm $ $Date: 2003-12-18 13:55:01 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,13 +75,38 @@ #ifndef _COM_SUN_STAR_VIEW_XSELECTIONSUPPLIER_HPP_ #include <com/sun/star/view/XSelectionSupplier.hpp> #endif +#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HPP_ +#include <com/sun/star/io/XInputStream.hpp> +#endif + +#ifndef _COM_SUN_STAR_EMBED_XEMBEDOBJECTCREATOR_HPP_ +#include <com/sun/star/embed/XEmbedObjectCreator.hpp> +#endif +#ifndef _COM_SUN_STAR_EMBED_XEMBEDPERSIST_HPP_ +#include <com/sun/star/embed/XEmbedPersist.hpp> +#endif +#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ +#include <com/sun/star/lang/XSingleServiceFactory.hpp> +#endif +#ifndef _COM_SUN_STAR_EMBED_EMBEDSTATES_HPP_ +#include <com/sun/star/embed/EmbedStates.hpp> +#endif +#ifndef _COM_SUN_STAR_EMBED_XCOMPONENTSUPPLIER_HPP_ +#include <com/sun/star/embed/XComponentSupplier.hpp> +#endif +#ifndef _SOT_CLSIDS_HXX +#include <sot/clsids.hxx> +#endif + +#ifndef _COM_SUN_STAR_SHEET_XSPREADSHEETDOCUMENT_HPP_ +#include <com/sun/star/sheet/XSpreadsheetDocument.hpp> +#endif using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::rtl::OUString; using ::osl::MutexGuard; -using namespace ::drafts::com::sun::star; using namespace ::com::sun::star; using namespace ::apphelper; @@ -89,6 +114,59 @@ using namespace ::apphelper; // ChartModel Constructor and Destructor //----------------------------------------------------------------- +namespace +{ +/** convert a class-id macro into a byte-sequence + call e.g. lcl_GetSequenceClassID( SO3_SC_CLASSID_60 ) + */ +Sequence< sal_Int8 > lcl_GetSequenceClassID( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3, + sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11, + sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15 ) +{ + Sequence< sal_Int8 > aResult( 16 ); + aResult[0] = static_cast<sal_Int8>(n1 >> 24); + aResult[1] = static_cast<sal_Int8>(( n1 << 8 ) >> 24); + aResult[2] = static_cast<sal_Int8>(( n1 << 16 ) >> 24); + aResult[3] = static_cast<sal_Int8>(( n1 << 24 ) >> 24); + aResult[4] = n2 >> 8; + aResult[5] = ( n2 << 8 ) >> 8; + aResult[6] = n3 >> 8; + aResult[7] = ( n3 << 8 ) >> 8; + aResult[8] = b8; + aResult[9] = b9; + aResult[10] = b10; + aResult[11] = b11; + aResult[12] = b12; + aResult[13] = b13; + aResult[14] = b14; + aResult[15] = b15; + + return aResult; +} + +Reference< embed::XStorage > lcl_CreateTempStorage( + const Reference< lang::XMultiServiceFactory > & rFactory ) +{ + Reference< embed::XStorage > xResult; + + try + { + Reference< lang::XSingleServiceFactory > xStorageFact( + rFactory->createInstance( C2U( "com.sun.star.embed.StorageFactory" )), + uno::UNO_QUERY_THROW ); + xResult.set( xStorageFact->createInstance(), uno::UNO_QUERY_THROW ); + } + catch( uno::Exception & ex ) + { + ASSERT_EXCEPTION( ex ); + } + + return xResult; +} + +} // anonymous namespace + + namespace chart { @@ -114,6 +192,16 @@ ChartModel::~ChartModel() if ( m_pControllers ) delete m_pControllers; + + try + { + impl_killInternalData(); + } + catch( const uno::Exception & ex ) + { + ASSERT_EXCEPTION( ex ); + OSL_ENSURE( false, "~ChartModel: close() caused a veto-exception" ); + } } //----------------------------------------------------------------- @@ -197,6 +285,36 @@ ChartModel::~ChartModel() } } +void ChartModel::impl_killInternalData() + throw(util::CloseVetoException) +{ + if( ! m_xInternalData.is()) + return; + + try + { + uno::Reference< util::XCloseable > xCloseable( m_xInternalData, uno::UNO_QUERY ); + OSL_ASSERT( xCloseable.is()); + if( xCloseable.is()) + xCloseable->close( /* DeliverOwnership */ sal_False ); + + uno::Reference< lang::XComponent > xComp( xCloseable, uno::UNO_QUERY ); + OSL_ASSERT( xComp.is()); + if( xComp.is()) + xComp->dispose(); + + m_xInternalData = 0; + } + catch( const util::CloseVetoException & ) + { + throw; + } + catch( const uno::Exception & ex ) + { + ASSERT_EXCEPTION( ex ); + } +} + //----------------------------------------------------------------- // lang::XServiceInfo //----------------------------------------------------------------- @@ -475,7 +593,8 @@ APPHELPER_XSERVICEINFO_IMPL(ChartModel,CHART_MODEL_SERVICE_IMPLEMENTATION_NAME) //----------------------------------------------------------------- void SAL_CALL ChartModel ::close( sal_Bool bDeliverOwnership ) - throw( util::CloseVetoException ) + throw( util::CloseVetoException, + uno::RuntimeException ) { //hold no mutex @@ -799,12 +918,88 @@ APPHELPER_XSERVICEINFO_IMPL(ChartModel,CHART_MODEL_SERVICE_IMPLEMENTATION_NAME) } void SAL_CALL ChartModel +::createInternalDataProvider( sal_Bool bCloneExistingData ) + throw (util::CloseVetoException, + uno::RuntimeException) +{ + // /-- + MutexGuard aGuard( m_aModelMutex ); + try + { + if( m_xInternalData.is()) + { + if( ! bCloneExistingData ) + { + impl_killInternalData(); + } + // else reuse existing data provider + } + + if( ! m_xInternalData.is()) + { + Reference< lang::XMultiServiceFactory > xFact( m_xContext->getServiceManager(), uno::UNO_QUERY_THROW ); + Reference< embed::XEmbedObjectCreator> xEmbedCreator( + xFact->createInstance( + C2U( "com.sun.star.embed.EmbeddedObjectCreator")), uno::UNO_QUERY_THROW ); + + m_xInternalData.set( + xEmbedCreator->createInstanceInitNew( + lcl_GetSequenceClassID( SO3_SC_CLASSID_60 ), + C2U( "ChartDataEditor" ), + lcl_CreateTempStorage( xFact ), + C2U( "ChartData" ), + Sequence< beans::PropertyValue >() ), uno::UNO_QUERY_THROW ); + + Reference< embed::XComponentSupplier > xCompSupp( m_xInternalData, uno::UNO_QUERY ); + if( xCompSupp.is()) + { + Reference< lang::XMultiServiceFactory > xSheetFact( xCompSupp->getComponent(), uno::UNO_QUERY ); + if( xSheetFact.is()) + { + Reference< chart2::XDataProvider > xDataProv( + xSheetFact->createInstance( C2U( "com.sun.star.chart2.DataProvider" )), uno::UNO_QUERY ); + if( xDataProv.is()) + { + OSL_ASSERT( m_pImplChartModel.get() != 0 ); + m_pImplChartModel->SetDataProvider( xDataProv ); + + if( bCloneExistingData ) + { + Reference< sheet::XSpreadsheetDocument > xCalcDoc( xSheetFact, uno::UNO_QUERY ); + if( xCalcDoc.is() ) + m_pImplChartModel->CloneData( xCalcDoc ); + } + } + } + } + + m_xInternalData->setClientSite( this ); + } + } + catch( const uno::Exception & ex ) + { + ASSERT_EXCEPTION( ex ); + } + // \-- +} + + uno::Reference< embed::XEmbeddedObject > SAL_CALL ChartModel +::getDataEditorForInternalData() + throw (::com::sun::star::uno::RuntimeException) +{ + return m_xInternalData; +} + +// ____ XDataReceiver ____ + + void SAL_CALL ChartModel ::attachDataProvider( const uno::Reference< chart2::XDataProvider >& xProvider ) throw (uno::RuntimeException) { OSL_ASSERT( m_pImplChartModel.get() != 0 ); // /-- MutexGuard aGuard( m_aModelMutex ); + impl_killInternalData(); m_pImplChartModel->SetDataProvider( xProvider ); // \-- } @@ -914,7 +1109,7 @@ uno::Any SAL_CALL ChartModel::queryInterface( const uno::Type& aType ) { m_xOldModelAgg.set( m_xContext->getServiceManager()->createInstanceWithContext( - C2U( "drafts.com.sun.star.chart2.ChartDocumentWrapper" ), + C2U( "com.sun.star.chart2.ChartDocumentWrapper" ), m_xContext ), uno::UNO_QUERY_THROW ); m_xOldModelAgg->setDelegator( static_cast< ::cppu::OWeakObject* >( this )); @@ -931,5 +1126,87 @@ uno::Any SAL_CALL ChartModel::queryInterface( const uno::Type& aType ) return aResult; } +// ____ XLoadable ____ +void SAL_CALL ChartModel::initNew() + throw (frame::DoubleInitializationException, + io::IOException, + uno::Exception, + uno::RuntimeException) +{ + uno::Reference< ::com::sun::star::chart2::XDataProvider > xDataProvider( + m_xContext->getServiceManager()->createInstanceWithContext( + C2U( "com.sun.star.comp.chart.FileDataProvider" ), + m_xContext ), uno::UNO_QUERY ); + OSL_ASSERT( xDataProvider.is()); + + ::rtl::OUString aFileName( +#if defined WNT + RTL_CONSTASCII_USTRINGPARAM( "file:///D:/files/data.chd" ) +#else + RTL_CONSTASCII_USTRINGPARAM( "file:///work/data/data.chd" ) +#endif + ); + + this->attachDataProvider( xDataProvider ); + this->setRangeRepresentation( aFileName ); +} + +void SAL_CALL ChartModel::load( + const Sequence< beans::PropertyValue >& lArguments ) + throw (frame::DoubleInitializationException, + io::IOException, + uno::Exception, + uno::RuntimeException) +{ + OSL_ENSURE( false, "Not implemented yet!" ); + + for( sal_Int32 i=0; i<lArguments.getLength(); ++i ) + { + if( lArguments[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterName" ))) + { + OUString aFilterName; + lArguments[i].Value >>= aFilterName; + } + else if( lArguments[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterOptions" ))) + { + } + else if( lArguments[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InputStream" ))) + { + uno::Reference< io::XInputStream > xStream( lArguments[i].Value, uno::UNO_QUERY ); + // convert xStream to XStorage (new Embedding API, >= SRC680m20) + } + } +} + +// ____ XEmbeddedClient ____ +void SAL_CALL ChartModel::saveObject() + throw (embed::ObjectSaveVetoException, + uno::Exception, + uno::RuntimeException) +{ + if( m_xInternalData.is()) + { + try + { + Reference< embed::XEmbedPersist > xPersist( m_xInternalData, uno::UNO_QUERY_THROW ); + xPersist->storeOwn(); + // todo: notify changes, so that the view can be updated + } + catch( uno::Exception & ex ) + { + ASSERT_EXCEPTION( ex ); + } + } +} + +void SAL_CALL ChartModel::onShowWindow( sal_Bool bVisible ) + throw (embed::WrongStateException, + uno::RuntimeException) +{ + if( ! bVisible ) + { + // todo: notify changes, so that the view can be updated + } +} } // namespace chart diff --git a/chart2/source/model/main/ChartModel.hxx b/chart2/source/model/main/ChartModel.hxx index 553f0cb16c05..a2278ec2b702 100644 --- a/chart2/source/model/main/ChartModel.hxx +++ b/chart2/source/model/main/ChartModel.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartModel.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: bm $ $Date: 2003-11-04 12:37:22 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,11 +73,9 @@ #ifndef _COM_SUN_STAR_UTIL_XMODIFIABLE_HPP_ #include <com/sun/star/util/XModifiable.hpp> #endif -/* #ifndef _COM_SUN_STAR_SDBC_XCLOSEABLE_HPP_ #include <com/sun/star/util/XCloseable.hpp> #endif -*/ #ifndef _COM_SUN_STAR_VIEW_XPRINTABLE_HPP_ #include <com/sun/star/view/XPrintable.hpp> #endif @@ -103,14 +101,22 @@ #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #endif -// #ifndef _DRAFTS_COM_SUN_STAR_CHART2_XMODELDATAPROVIDER_HPP_ -// #include <drafts/com/sun/star/chart2/XModelDataProvider.hpp> +// public API +#ifndef _COM_SUN_STAR_CHART2_XDATAPROVIDER_HPP_ +#include <com/sun/star/chart2/XDataProvider.hpp> +#endif +#ifndef _COM_SUN_STAR_CHART2_XDATARECEIVER_HPP_ +#include <com/sun/star/chart2/XDataReceiver.hpp> +#endif + +// #ifndef _COM_SUN_STAR_CHART2_XMODELDATAPROVIDER_HPP_ +// #include <com/sun/star/chart2/XModelDataProvider.hpp> // #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ -#include <drafts/com/sun/star/chart2/XChartDocument.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ +#include <com/sun/star/chart2/XChartDocument.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTITLED_HPP_ -#include <drafts/com/sun/star/chart2/XTitled.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTITLED_HPP_ +#include <com/sun/star/chart2/XTitled.hpp> #endif /* @@ -141,12 +147,19 @@ #ifndef _COM_SUN_STAR_FRAME_XDISPATCH_HPP_ #include <com/sun/star/frame/XDispatch.hpp> #endif -#ifndef _COM_SUN_STAR_FORM_XLOADABLE_HPP_ -#include <com/sun/star/form/XLoadable.hpp> -#endif */ -#ifndef _CPPUHELPER_IMPLBASE7_HXX_ -#include <cppuhelper/implbase7.hxx> +#ifndef _COM_SUN_STAR_FRAME_XLOADABLE_HPP_ +#include <com/sun/star/frame/XLoadable.hpp> +#endif +#ifndef _COM_SUN_STAR_EMBED_XEMBEDDEDOBJECT_HPP_ +#include <com/sun/star/embed/XEmbeddedObject.hpp> +#endif +#ifndef _COM_SUN_STAR_EMBED_XEMBEDDEDCLIENT_HPP_ +#include <com/sun/star/embed/XEmbeddedClient.hpp> +#endif + +#ifndef _CPPUHELPER_IMPLBASE10_HXX_ +#include <cppuhelper/implbase10.hxx> #endif // for auto_ptr @@ -164,7 +177,7 @@ namespace impl class ImplChartModel; // Note: needed for queryInterface (if it calls the base-class implementation) -typedef ::cppu::WeakImplHelper7 < +typedef ::cppu::WeakImplHelper10 < // ::com::sun::star::frame::XModel //comprehends XComponent (required interface), base of XChartDocument ::com::sun::star::util::XCloseable //comprehends XCloseBroadcaster ,::com::sun::star::frame::XStorable //(required interface) @@ -179,10 +192,13 @@ typedef ::cppu::WeakImplHelper7 < // ,::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) // ,::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper ,::com::sun::star::lang::XServiceInfo -// ,::drafts::com::sun::star::chart2::XModelDataProvider - ,::drafts::com::sun::star::chart2::XChartDocument // derived from XModel +// ,::com::sun::star::chart2::XModelDataProvider + ,::com::sun::star::chart2::XChartDocument // derived from XModel + ,::com::sun::star::chart2::XDataReceiver // public API ,::com::sun::star::style::XStyleFamiliesSupplier - ,::drafts::com::sun::star::chart2::XTitled + ,::com::sun::star::chart2::XTitled + ,::com::sun::star::frame::XLoadable + ,::com::sun::star::embed::XEmbeddedClient > ChartModel_Base; } @@ -209,7 +225,9 @@ private: ::std::auto_ptr< impl::ImplChartModel > m_pImplChartModel; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xOldModelAgg; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xOldModelAgg; + + ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > m_xInternalData; private: //private methods @@ -232,6 +250,8 @@ private: impl_notifyModifiedListeners() throw( com::sun::star::uno::RuntimeException); + void impl_killInternalData() throw( com::sun::star::util::CloseVetoException ); + public: //no default constructor ChartModel(::com::sun::star::uno::Reference< @@ -317,7 +337,8 @@ public: //----------------------------------------------------------------- virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) - throw( ::com::sun::star::util::CloseVetoException ); + throw(::com::sun::star::util::CloseVetoException, + ::com::sun::star::uno::RuntimeException); //----------------------------------------------------------------- // ::com::sun::star::util::XCloseBroadcaster (base of XCloseable) @@ -453,61 +474,92 @@ public: getStyleFamilies() throw (::com::sun::star::uno::RuntimeException); //----------------------------------------------------------------- - // ::drafts::com::sun::star::chart2::XModelDataProvider + // ::com::sun::star::chart2::XModelDataProvider //----------------------------------------------------------------- // virtual ::com::sun::star::uno::Sequence< // ::com::sun::star::uno::Reference< -// ::drafts::com::sun::star::chart2::XDataSeries > > SAL_CALL +// ::com::sun::star::chart2::XDataSeries > > SAL_CALL // getDataSeries() throw (::com::sun::star::uno::RuntimeException); //----------------------------------------------------------------- - // ::drafts::com::sun::star::chart2::XChartDocument + // ::com::sun::star::chart2::XChartDocument //----------------------------------------------------------------- virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > SAL_CALL + ::com::sun::star::chart2::XDiagram > SAL_CALL getDiagram() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDiagram( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram >& xDiagram ) + ::com::sun::star::chart2::XDiagram >& xDiagram ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - attachDataProvider( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataProvider >& xProvider ) - throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL - setRangeRepresentation( const ::rtl::OUString& aRangeRepresentation ) - throw (::com::sun::star::lang::IllegalArgumentException, + createInternalDataProvider( sal_Bool bCloneExistingData ) + throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > SAL_CALL + getDataEditorForInternalData() + throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setChartTypeManager( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartTypeManager >& xNewManager ) + ::com::sun::star::chart2::XChartTypeManager >& xNewManager ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartTypeManager > SAL_CALL + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeManager > SAL_CALL getChartTypeManager() throw (::com::sun::star::uno::RuntimeException); // virtual void SAL_CALL setSplitLayoutContainer( // const ::com::sun::star::uno::Reference< -// ::drafts::com::sun::star::layout::XSplitLayoutContainer >& xLayoutCnt ) +// ::com::sun::star::layout::XSplitLayoutContainer >& xLayoutCnt ) // throw (::com::sun::star::uno::RuntimeException); // virtual ::com::sun::star::uno::Reference< -// ::drafts::com::sun::star::layout::XSplitLayoutContainer > SAL_CALL getSplitLayoutContainer() +// ::com::sun::star::layout::XSplitLayoutContainer > SAL_CALL getSplitLayoutContainer() // throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getPageBackground() throw (::com::sun::star::uno::RuntimeException); + // ____ XDataReceiver (public API) ____ + virtual void SAL_CALL + attachDataProvider( const ::com::sun::star::uno::Reference< + ::com::sun::star::chart2::XDataProvider >& xProvider ) + throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL + setRangeRepresentation( const ::rtl::OUString& aRangeRepresentation ) + throw (::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::uno::RuntimeException); + // ____ XTitled ____ virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTitle > SAL_CALL getTitle() + ::com::sun::star::chart2::XTitle > SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTitle( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTitle >& Title ) + ::com::sun::star::chart2::XTitle >& Title ) throw (::com::sun::star::uno::RuntimeException); // ____ XInterface (for old API wrapper) ____ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); + + // ____ XLoadable ____ + virtual void SAL_CALL initNew() + throw (::com::sun::star::frame::DoubleInitializationException, + ::com::sun::star::io::IOException, + ::com::sun::star::uno::Exception, + ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL load( const ::com::sun::star::uno::Sequence< + ::com::sun::star::beans::PropertyValue >& lArguments ) + throw (::com::sun::star::frame::DoubleInitializationException, + ::com::sun::star::io::IOException, + ::com::sun::star::uno::Exception, + ::com::sun::star::uno::RuntimeException); + + // ____ XEmbeddedClient ____ + virtual void SAL_CALL saveObject() + throw (::com::sun::star::embed::ObjectSaveVetoException, + ::com::sun::star::uno::Exception, + ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL onShowWindow( sal_Bool bVisible ) + throw (::com::sun::star::embed::WrongStateException, + ::com::sun::star::uno::RuntimeException); }; } // namespace chart diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index 784e5078d009..874798942fc4 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DataPoint.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:30 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,7 +83,6 @@ #include <algorithm> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::beans::Property; diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx index 5a29bcab32af..0dd38fcc10e2 100644 --- a/chart2/source/model/main/DataPointProperties.cxx +++ b/chart2/source/model/main/DataPointProperties.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DataPointProperties.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: bm $ $Date: 2003-12-11 13:54:06 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,24 +86,23 @@ #include <com/sun/star/style/XStyle.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_FILLBITMAP_HPP_ -#include <drafts/com/sun/star/chart2/FillBitmap.hpp> +#ifndef _COM_SUN_STAR_CHART2_FILLBITMAP_HPP_ +#include <com/sun/star/chart2/FillBitmap.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ -#include <drafts/com/sun/star/chart2/TransparencyStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ +#include <com/sun/star/chart2/TransparencyStyle.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_DATAPOINTLABEL_HPP_ -#include <drafts/com/sun/star/chart2/DataPointLabel.hpp> +#ifndef _COM_SUN_STAR_CHART2_DATAPOINTLABEL_HPP_ +#include <com/sun/star/chart2/DataPointLabel.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_NUMBERFORMAT_HPP_ -#include <drafts/com/sun/star/chart2/NumberFormat.hpp> +#ifndef _COM_SUN_STAR_CHART2_NUMBERFORMAT_HPP_ +#include <com/sun/star/chart2/NumberFormat.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SYMBOL_HPP_ -#include <drafts/com/sun/star/chart2/Symbol.hpp> +#ifndef _COM_SUN_STAR_CHART2_SYMBOL_HPP_ +#include <com/sun/star/chart2/Symbol.hpp> #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::beans::Property; diff --git a/chart2/source/model/main/DataPointStyle.cxx b/chart2/source/model/main/DataPointStyle.cxx index 64533c303b55..2e30ff8ea401 100644 --- a/chart2/source/model/main/DataPointStyle.cxx +++ b/chart2/source/model/main/DataPointStyle.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DataPointStyle.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:30 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,7 +81,6 @@ #include <algorithm> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::beans::Property; diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index ee771c568d84..839a660f0762 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DataSeries.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: bm $ $Date: 2003-12-09 16:31:03 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,14 +66,13 @@ #include "macros.hxx" #include "algohelper.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ -#include <drafts/com/sun/star/chart2/XIdentifiable.hpp> +#ifndef _COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ +#include <com/sun/star/chart2/XIdentifiable.hpp> #endif #include <algorithm> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; @@ -130,8 +129,8 @@ DataSeries::~DataSeries() Sequence< OUString > DataSeries::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = C2U( "drafts.com.sun.star.chart2.DataSeries" ); - aServices[ 1 ] = C2U( "drafts.com.sun.star.chart2.DataPointProperties" ); + aServices[ 0 ] = C2U( "com.sun.star.chart2.DataSeries" ); + aServices[ 1 ] = C2U( "com.sun.star.chart2.DataPointProperties" ); aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); return aServices; } diff --git a/chart2/source/model/main/DataSeriesStyle.cxx b/chart2/source/model/main/DataSeriesStyle.cxx index 57bdf106de70..6724d9ac00a9 100644 --- a/chart2/source/model/main/DataSeriesStyle.cxx +++ b/chart2/source/model/main/DataSeriesStyle.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DataSeriesStyle.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:30 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,7 +82,6 @@ #include <algorithm> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::beans::Property; diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index 5b8b25047cb0..88d95a41c8a9 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -2,9 +2,9 @@ * * $RCSfile: Diagram.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: bm $ $Date: 2003-12-09 16:27:00 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,17 +69,17 @@ #ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_RELATIVEPOSITION_HPP_ -#include <drafts/com/sun/star/layout/RelativePosition.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_RELATIVEPOSITION_HPP_ +#include <com/sun/star/layout/RelativePosition.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_RELATIVESIZE_HPP_ -#include <drafts/com/sun/star/layout/RelativeSize.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_RELATIVESIZE_HPP_ +#include <com/sun/star/layout/RelativeSize.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_HOMOGENMATRIX_HPP_ #include <com/sun/star/drawing/HomogenMatrix.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SCENEDESCRIPTOR_HPP_ -#include <drafts/com/sun/star/chart2/SceneDescriptor.hpp> +#ifndef _COM_SUN_STAR_CHART2_SCENEDESCRIPTOR_HPP_ +#include <com/sun/star/chart2/SceneDescriptor.hpp> #endif #include <algorithm> @@ -88,7 +88,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::com::sun::star::beans::Property; @@ -195,11 +194,6 @@ Diagram::Diagram( uno::Reference< uno::XComponentContext > const & xContext ) : m_xTitle( NULL ), m_aIdentifier( C2U( "@diagram" )) { - if( ! m_xContext.is() || - ! ( xContext->getValueByName( C2U( "TemplateServiceName" )) >>= m_aTemplateServiceName )) - { - OSL_ENSURE( false, "Missing argument TemplateServiceName" ); - } } Diagram::~Diagram() @@ -222,7 +216,7 @@ void SAL_CALL Diagram::setTree( { uno::Reference< lang::XServiceInfo > xInfo( xTree, uno::UNO_QUERY ); if( xInfo.is() && - xInfo->supportsService( C2U( "drafts.com.sun.star.chart2.DataSeriesTree" )) ) + xInfo->supportsService( C2U( "com.sun.star.chart2.DataSeriesTree" )) ) { // /-- MutexGuard aGuard( GetMutex() ); @@ -235,12 +229,6 @@ void SAL_CALL Diagram::setTree( } } -// ::rtl::OUString SAL_CALL Diagram::getChartTypeTemplateServiceName() -// throw (uno::RuntimeException) -// { -// return m_aTemplateServiceName; -// } - uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getWall() throw (uno::RuntimeException) { @@ -466,8 +454,8 @@ Sequence< OUString > Diagram::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = C2U( "drafts.com.sun.star.chart2.Diagram" ); - aServices[ 1 ] = C2U( "drafts.com.sun.star.layout.LayoutElement" ); + aServices[ 0 ] = C2U( "com.sun.star.chart2.Diagram" ); + aServices[ 1 ] = C2U( "com.sun.star.layout.LayoutElement" ); aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); return aServices; } diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index 42ec1cc45e58..f41302c8ab7f 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -2,9 +2,9 @@ * * $RCSfile: FormattedString.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: bm $ $Date: 2003-11-25 13:07:56 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,7 +73,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::com::sun::star::beans::Property; @@ -179,7 +178,7 @@ Sequence< OUString > FormattedString::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "drafts.com.sun.star.chart2.FormattedString" ); + aServices[ 0 ] = C2U( "com.sun.star.chart2.FormattedString" ); aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" ); return aServices; } diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index ebbfb2316099..73dd109e4689 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -2,9 +2,9 @@ * * $RCSfile: FormattedString.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:31 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,8 +79,8 @@ #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XFORMATTEDSTRING_HPP_ -#include <drafts/com/sun/star/chart2/XFormattedString.hpp> +#ifndef _COM_SUN_STAR_CHART2_XFORMATTEDSTRING_HPP_ +#include <com/sun/star/chart2/XFormattedString.hpp> #endif #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ @@ -93,7 +93,7 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper2< - ::drafts::com::sun::star::chart2::XFormattedString, + ::com::sun::star::chart2::XFormattedString, ::com::sun::star::lang::XServiceInfo > FormattedString_Base; diff --git a/chart2/source/model/main/ImplChartModel.cxx b/chart2/source/model/main/ImplChartModel.cxx index 176f2ba9642d..b24b42878c97 100644 --- a/chart2/source/model/main/ImplChartModel.cxx +++ b/chart2/source/model/main/ImplChartModel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ImplChartModel.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: bm $ $Date: 2003-12-11 14:18:50 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,22 +71,23 @@ // #include "SplitLayoutContainer.hxx" #include "LayoutDefaults.hxx" #include "PageBackground.hxx" +#include "DataSeriesTreeHelper.hxx" #ifndef _CPPUHELPER_COMPONENT_CONTEXT_HXX_ #include <cppuhelper/component_context.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASINK_HPP_ -#include <drafts/com/sun/star/chart2/XDataSink.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASINK_HPP_ +#include <com/sun/star/chart2/XDataSink.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASEQUENCE_HPP_ -#include <drafts/com/sun/star/chart2/XDataSequence.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASEQUENCE_HPP_ +#include <com/sun/star/chart2/XDataSequence.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASERIES_HPP_ -#include <drafts/com/sun/star/chart2/XDataSeries.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASERIES_HPP_ +#include <com/sun/star/chart2/XDataSeries.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XAXIS_HPP_ -#include <drafts/com/sun/star/chart2/XAxis.hpp> +#ifndef _COM_SUN_STAR_CHART2_XAXIS_HPP_ +#include <com/sun/star/chart2/XAxis.hpp> #endif #ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ @@ -99,11 +100,23 @@ #include <com/sun/star/lang/DisposedException.hpp> #endif +#ifndef _COM_SUN_STAR_SHEET_XSPREADSHEETDOCUMENT_HPP_ +#include <com/sun/star/sheet/XSpreadsheetDocument.hpp> +#endif +#ifndef _COM_SUN_STAR_SHEET_XSPREADSHEETS_HPP_ +#include <com/sun/star/sheet/XSpreadsheets.hpp> +#endif +#ifndef _COM_SUN_STAR_SHEET_XSPREADSHEET_HPP_ +#include <com/sun/star/sheet/XSpreadsheet.hpp> +#endif +#ifndef _COM_SUN_STAR_SHEET_XSHEETCELLRANGECONTAINER_HPP_ +#include <com/sun/star/sheet/XSheetCellRangeContainer.hpp> +#endif + #include <vector> #include <algorithm> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -122,7 +135,7 @@ ImplChartModel::ImplChartModel( Reference< uno::XComponentContext > const & xCon m_xContext( xContext ), m_xChartTypeManager( xContext->getServiceManager()->createInstanceWithContext( - C2U( "drafts.com.sun.star.chart2.ChartTypeManager" ), + C2U( "com.sun.star.chart2.ChartTypeManager" ), xContext ), uno::UNO_QUERY ), m_bIsDisposed( false ) // m_xLayoutContainer( new SplitLayoutContainer() ) @@ -173,7 +186,7 @@ ImplChartModel::ImplChartModel( Reference< uno::XComponentContext > const & xCon // uno::makeAny( nDefaultColors[ sal_Int32( nI % nMaxDefaultColors ) ])); // // set style -// Reference< ::drafts::com::sun::star::style::XStyleSupplier > +// Reference< ::com::sun::star::style::XStyleSupplier > // xStyleSupp( xSeriesProp->getPropertyValue( C2U( "FirstGraphicsFormat" )), // uno::UNO_QUERY ); @@ -213,12 +226,7 @@ void ImplChartModel::ReadData( const ::rtl::OUString & rRangeRepresentation ) { m_xChartData = m_xDataProvider->getDataByRangeRepresentation( rRangeRepresentation ); - // create DataSeries objects using the standard data interpreter -#ifdef USE_XY_DATA - m_aInterpretedData = XYDataInterpreter::InterpretData( m_xChartData ); -#else - m_aInterpretedData = DataInterpreter::InterpretData( m_xChartData ); -#endif + InterpretData(); const size_t nMaxSeries = m_aInterpretedData.size(); const OUString aStyleNameStub( RTL_CONSTASCII_USTRINGPARAM( "Series " )); @@ -245,6 +253,18 @@ void ImplChartModel::ReadData( const ::rtl::OUString & rRangeRepresentation ) } } +void ImplChartModel::InterpretData() +{ + // create DataSeries objects using the standard data interpreter + // todo: interpret data depending on selected chart type + +#ifdef USE_XY_DATA + m_aInterpretedData = XYDataInterpreter::InterpretData( m_xChartData ); +#else + m_aInterpretedData = DataInterpreter::InterpretData( m_xChartData ); +#endif +} + Reference< container::XNameAccess > ImplChartModel::GetStyleFamilies() { if( ! m_xFamilies.is()) @@ -395,38 +415,6 @@ void ImplChartModel::dispose() return; m_bIsDisposed = true; - - // It is a problem to put the weak ref into a strong one (machine hangs - // memory consumption increases, but the debugger does not yield why and - // where - -// try -// { -// // put weak reference into a strong one -// uno::Reference< ::com::sun::star::chart::XChartDocument > xRef( m_xOldModel ); -// uno::Reference< lang::XComponent > xComp( xRef, uno::UNO_QUERY ); - -// if( xComp.is()) -// { -// try -// { -// xComp->dispose(); -// } -// catch( lang::DisposedException ) -// { -// // this may be ok, if the wrapper was disposed before the new chart -// // model -// } -// catch( uno::Exception & ex ) -// { -// ASSERT_EXCEPTION( ex ); -// } -// } -// } -// catch( uno::Exception & ex ) -// { -// ASSERT_EXCEPTION( ex ); -// } } uno::Reference< beans::XPropertySet > ImplChartModel::GetPageBackground() @@ -434,5 +422,102 @@ uno::Reference< beans::XPropertySet > ImplChartModel::GetPageBackground() return m_xPageBackground; } +void ImplChartModel::CloneData( + const uno::Reference< sheet::XSpreadsheetDocument > & xCalcDoc ) +{ + if( ! xCalcDoc.is()) + return; + Reference< chart2::XDiagram > xDia( GetDiagram(0)); + if( ! xDia.is()) + return; + + Sequence< Reference< chart2::XDataSeries > > aSeq( + helper::DataSeriesTreeHelper::getDataSeriesFromDiagram( xDia )); + + try + { + // insert new sheet + Reference< sheet::XSpreadsheets > xSheets( xCalcDoc->getSheets() ); + xSheets->insertNewByName( C2U( "Chart Data" ), 0 ); + Reference< sheet::XSpreadsheet > xDataSheet( xSheets->getByName( C2U( "Chart Data" ) ), uno::UNO_QUERY ); + OSL_ASSERT( xDataSheet.is()); + + // delete all except one of the existing sheets + Reference< container::XNameAccess > xNameAccess( xSheets, uno::UNO_QUERY_THROW ); + OSL_ASSERT( xNameAccess.is()); + Reference< container::XNameContainer > xNameContainer( xNameAccess, uno::UNO_QUERY_THROW ); + OSL_ASSERT( xNameContainer.is()); + Sequence< ::rtl::OUString > aNames( xNameAccess->getElementNames()); + for( sal_Int32 nNameIdx = 1; nNameIdx < aNames.getLength(); ++nNameIdx ) + { + OSL_TRACE( "Removing %s", U2C( aNames[nNameIdx] )); + xNameContainer->removeByName( aNames[nNameIdx] ); + } + + // fill data sheet + static const uno::Type aDoubleType = ::getCppuType( reinterpret_cast< const double * >(0)); + double fVal = 0.0; + ::rtl::OUString aStrVal; + + sal_Int32 nCol = 0; + sal_Int32 nMaxRow = 0; + for( sal_Int32 nSeries = 0; nSeries < aSeq.getLength(); ++nSeries ) + { + Reference< chart2::XDataSource > xSource( aSeq[nSeries], uno::UNO_QUERY ); + OSL_ASSERT( xSource.is()); + Sequence< Reference< chart2::XDataSequence > > aDataSeq( xSource->getDataSequences()); + for( sal_Int32 nSeqIdx = 0; nSeqIdx < aDataSeq.getLength(); ++nSeqIdx ) + { + Reference< beans::XPropertySet > xProp( aDataSeq[nSeqIdx],uno::UNO_QUERY ); + ::rtl::OUString aRole; + if( xProp.is() && + (xProp->getPropertyValue( C2U( "Role" )) >>= aRole ) && + aRole.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "y-values" )) ) + { + Sequence< uno::Any > aData( aDataSeq[nSeqIdx]->getData()); + sal_Int32 nMaxData = aData.getLength(); + nMaxRow = ::std::max( nMaxRow, nMaxData ); + for( sal_Int32 nRow = 0; nRow < nMaxData; ++nRow ) + { + Reference< table::XCell > xCell( xDataSheet->getCellByPosition( nCol, nRow )); + OSL_ASSERT( xCell.is()); + if( aData[nRow].isExtractableTo( aDoubleType )) + { + bool bCouldExtract = (aData[nRow] >>= fVal); + OSL_ASSERT( bCouldExtract ); + xCell->setValue( fVal ); + } + else + { + bool bCouldExtract = (aData[nRow] >>= aStrVal); + OSL_ASSERT( bCouldExtract ); + xCell->setFormula( aStrVal ); + } + } + ++nCol; + } + } + } + + // set new data + if( nCol > 0 ) + { + Reference< lang::XMultiServiceFactory > xCalcFact( xCalcDoc, uno::UNO_QUERY_THROW ); + Reference< sheet::XSheetCellRangeContainer > xRangeCnt( + xCalcFact->createInstance( C2U( "com.sun.star.sheet.SheetCellRanges" )), uno::UNO_QUERY_THROW ); + xRangeCnt->addRangeAddress( + table::CellRangeAddress( 0, 0, 0, nCol, nMaxRow ), sal_Bool( sal_False ) ); + ::rtl::OUString aRangeStr( xRangeCnt->getRangeAddressesAsString()); + + SetRangeRepresentation( aRangeStr ); + } + } + catch( uno::Exception & ex ) + { + ASSERT_EXCEPTION( ex ); + } +} + + } // namespace impl } // namespace chart diff --git a/chart2/source/model/main/ImplChartModel.hxx b/chart2/source/model/main/ImplChartModel.hxx index 20eb9d3bd7a6..cab406ceda4d 100644 --- a/chart2/source/model/main/ImplChartModel.hxx +++ b/chart2/source/model/main/ImplChartModel.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ImplChartModel.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: bm $ $Date: 2003-11-04 12:37:23 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,32 +61,32 @@ #ifndef CHART_IMPLCHARTMODEL_HXX #define CHART_IMPLCHARTMODEL_HXX -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASOURCE_HPP_ -#include <drafts/com/sun/star/chart2/XDataSource.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASOURCE_HPP_ +#include <com/sun/star/chart2/XDataSource.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASERIES_HPP_ -#include <drafts/com/sun/star/chart2/XDataSeries.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASERIES_HPP_ +#include <com/sun/star/chart2/XDataSeries.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ -#include <drafts/com/sun/star/chart2/XDiagram.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ +#include <com/sun/star/chart2/XDiagram.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATAPROVIDER_HPP_ -#include <drafts/com/sun/star/chart2/XDataProvider.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATAPROVIDER_HPP_ +#include <com/sun/star/chart2/XDataProvider.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPEMANAGER_HPP_ -#include <drafts/com/sun/star/chart2/XChartTypeManager.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPEMANAGER_HPP_ +#include <com/sun/star/chart2/XChartTypeManager.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPETEMPLATE_HPP_ -#include <drafts/com/sun/star/chart2/XChartTypeTemplate.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPETEMPLATE_HPP_ +#include <com/sun/star/chart2/XChartTypeTemplate.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTITLE_HPP_ -#include <drafts/com/sun/star/chart2/XTitle.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTITLE_HPP_ +#include <com/sun/star/chart2/XTitle.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ -#include <drafts/com/sun/star/chart2/XChartDocument.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ +#include <com/sun/star/chart2/XChartDocument.hpp> #endif -// #ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_XSPLITLAYOUTCONTAINER_HPP_ -// #include <drafts/com/sun/star/layout/XSplitLayoutContainer.hpp> +// #ifndef _COM_SUN_STAR_LAYOUT_XSPLITLAYOUTCONTAINER_HPP_ +// #include <com/sun/star/layout/XSplitLayoutContainer.hpp> // #endif #ifndef _COM_SUN_STAR_CONTAINER_NOSUCHELEMENTEXCEPTION_HPP_ @@ -106,6 +106,9 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } + namespace sheet { + class XSpreadsheetDocument; + } }}} namespace chart @@ -121,7 +124,7 @@ public: // ::com::sun::star::uno::Sequence< // ::com::sun::star::uno::Reference< -// ::drafts::com::sun::star::chart2::XDataSeries > > +// ::com::sun::star::chart2::XDataSeries > > // GetDataSeries() const; ::com::sun::star::uno::Reference< @@ -133,48 +136,48 @@ public: /** @return true, if the chart was found and removed, false otherwise. */ bool RemoveDiagram( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > & xDiagram ); + ::com::sun::star::chart2::XDiagram > & xDiagram ); void AppendDiagram( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > & xDiagram ); + ::com::sun::star::chart2::XDiagram > & xDiagram ); ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > + ::com::sun::star::chart2::XDiagram > GetDiagram( size_t nIndex ) const throw( ::com::sun::star::container::NoSuchElementException ); void SetDataProvider( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataProvider > & xProvider ); + ::com::sun::star::chart2::XDataProvider > & xProvider ); void SAL_CALL SetRangeRepresentation( const ::rtl::OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException); void SetChartTypeManager( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartTypeManager > & xManager ); + ::com::sun::star::chart2::XChartTypeManager > & xManager ); ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartTypeManager > + ::com::sun::star::chart2::XChartTypeManager > GetChartTypeManager(); void SetChartTypeTemplate( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartTypeTemplate > & xTemplate ); + ::com::sun::star::chart2::XChartTypeTemplate > & xTemplate ); ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartTypeTemplate > + ::com::sun::star::chart2::XChartTypeTemplate > GetChartTypeTemplate(); // void SetSplitLayoutContainer( // const ::com::sun::star::uno::Reference< -// ::drafts::com::sun::star::layout::XSplitLayoutContainer > & xLayoutCnt ); +// ::com::sun::star::layout::XSplitLayoutContainer > & xLayoutCnt ); // ::com::sun::star::uno::Reference< -// ::drafts::com::sun::star::layout::XSplitLayoutContainer > GetSplitLayoutContainer(); +// ::com::sun::star::layout::XSplitLayoutContainer > GetSplitLayoutContainer(); - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTitle > + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > GetTitle(); void SetTitle( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTitle >& rTitle ); + ::com::sun::star::chart2::XTitle >& rTitle ); /** Is called by the ChartModel's XComponent::dispose() to notify the impl-class to release resources @@ -184,37 +187,41 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetPageBackground(); + void CloneData( const ::com::sun::star::uno::Reference< + ::com::sun::star::sheet::XSpreadsheetDocument > & xCalcDoc ); + private: void ReadData( const ::rtl::OUString & rRangeRepresentation ); void CreateDefaultChart(); + void InterpretData(); // void CreateDefaultLayout(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xFamilies; // Data Access (deprecated, temporary solution) - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XDataSource > m_xChartData; - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XDataProvider > m_xDataProvider; + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSource > m_xChartData; + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataProvider > m_xDataProvider; ::std::vector< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeries > > m_aInterpretedData; + ::com::sun::star::chart2::XDataSeries > > m_aInterpretedData; - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartTypeManager > + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeManager > m_xChartTypeManager; - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartTypeTemplate > + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeTemplate > m_xChartTypeTemplate; // Diagram Access typedef ::std::vector< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > > + ::com::sun::star::chart2::XDiagram > > tDiagramContainer; tDiagramContainer m_aDiagrams; -// ::com::sun::star::uno::Reference< ::drafts::com::sun::star::layout::XSplitLayoutContainer > +// ::com::sun::star::uno::Reference< ::com::sun::star::layout::XSplitLayoutContainer > // m_xLayoutContainer; - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTitle > + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > m_xTitle; bool m_bIsDisposed; diff --git a/chart2/source/model/main/LayoutContainer.cxx b/chart2/source/model/main/LayoutContainer.cxx index d4ad05762c68..ef76bfad5140 100644 --- a/chart2/source/model/main/LayoutContainer.cxx +++ b/chart2/source/model/main/LayoutContainer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: LayoutContainer.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:31 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,7 +65,6 @@ #include <algorithm> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; namespace { @@ -158,7 +157,7 @@ uno::Sequence< ::rtl::OUString > LayoutContainer::getSupportedServiceNames_Stati { uno::Sequence< ::rtl::OUString > aServices( 1 ); - aServices[ 0 ] = C2U( "drafts.com.sun.star.layout.LayoutContainer" ); + aServices[ 0 ] = C2U( "com.sun.star.layout.LayoutContainer" ); return aServices; } diff --git a/chart2/source/model/main/LayoutContainer.hxx b/chart2/source/model/main/LayoutContainer.hxx index 0f6255cedb10..d8a5c16a4593 100644 --- a/chart2/source/model/main/LayoutContainer.hxx +++ b/chart2/source/model/main/LayoutContainer.hxx @@ -2,9 +2,9 @@ * * $RCSfile: LayoutContainer.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:31 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,8 +68,8 @@ #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_XLAYOUTCONTAINER_HPP_ -#include <drafts/com/sun/star/layout/XLayoutContainer.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_XLAYOUTCONTAINER_HPP_ +#include <com/sun/star/layout/XLayoutContainer.hpp> #endif #include "ServiceMacros.hxx" @@ -83,7 +83,7 @@ namespace chart class LayoutContainer : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo, - ::drafts::com::sun::star::layout::XLayoutContainer > + ::com::sun::star::layout::XLayoutContainer > { public: LayoutContainer(); @@ -94,8 +94,8 @@ public: protected: // ____ XLayoutContainer ____ - virtual void SAL_CALL addConstrainedElementByIdentifier( const ::rtl::OUString& aIdentifier, const ::drafts::com::sun::star::layout::Constraint& Constraint ) - throw (::drafts::com::sun::star::layout::IllegalConstraintException, + virtual void SAL_CALL addConstrainedElementByIdentifier( const ::rtl::OUString& aIdentifier, const ::com::sun::star::layout::Constraint& Constraint ) + throw (::com::sun::star::layout::IllegalConstraintException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addElementByIdentifier( const ::rtl::OUString& aIdentifier ) @@ -104,10 +104,10 @@ protected: virtual void SAL_CALL removeElementByIdentifier( const ::rtl::OUString& aIdentifier ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setConstraintByIdentifier( const ::rtl::OUString& aIdentifier, const ::drafts::com::sun::star::layout::Constraint& Constraint ) + virtual void SAL_CALL setConstraintByIdentifier( const ::rtl::OUString& aIdentifier, const ::com::sun::star::layout::Constraint& Constraint ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual ::drafts::com::sun::star::layout::Constraint SAL_CALL getConstraintByIdentifier( const ::rtl::OUString& aIdentifier ) + virtual ::com::sun::star::layout::Constraint SAL_CALL getConstraintByIdentifier( const ::rtl::OUString& aIdentifier ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< @@ -119,7 +119,7 @@ private: typedef ::std::map< ::rtl::OUString, - ::drafts::com::sun::star::layout::Constraint > tConstraintsMap; + ::com::sun::star::layout::Constraint > tConstraintsMap; tLayoutElements m_aLayoutElements; tConstraintsMap m_aConstraints; diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index 63d542307125..e6a959f7fd48 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -2,9 +2,9 @@ * * $RCSfile: Legend.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: bm $ $Date: 2003-12-04 14:07:33 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,27 +78,26 @@ #include <com/sun/star/awt/Size.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_ALIGNMENT_HPP_ -#include <drafts/com/sun/star/layout/Alignment.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_ALIGNMENT_HPP_ +#include <com/sun/star/layout/Alignment.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_STRETCHMODE_HPP_ -#include <drafts/com/sun/star/layout/StretchMode.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_STRETCHMODE_HPP_ +#include <com/sun/star/layout/StretchMode.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_LEGENDPOSITION_HPP_ -#include <drafts/com/sun/star/chart2/LegendPosition.hpp> +#ifndef _COM_SUN_STAR_CHART2_LEGENDPOSITION_HPP_ +#include <com/sun/star/chart2/LegendPosition.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_LEGENDEXPANSION_HPP_ -#include <drafts/com/sun/star/chart2/LegendExpansion.hpp> +#ifndef _COM_SUN_STAR_CHART2_LEGENDEXPANSION_HPP_ +#include <com/sun/star/chart2/LegendExpansion.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_RELATIVEPOSITION_HPP_ -#include <drafts/com/sun/star/layout/RelativePosition.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_RELATIVEPOSITION_HPP_ +#include <com/sun/star/layout/RelativePosition.hpp> #endif #include <algorithm> using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; -using namespace ::drafts::com::sun::star; using ::com::sun::star::beans::Property; @@ -271,11 +270,11 @@ uno::Sequence< uno::Reference< chart2::XLegendEntry > > SAL_CALL Legend::getEntr uno::Sequence< ::rtl::OUString > Legend::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 5 ); - aServices[ 0 ] = C2U( "drafts.com.sun.star.chart2.Legend" ); + aServices[ 0 ] = C2U( "com.sun.star.chart2.Legend" ); aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" ); aServices[ 2 ] = C2U( "com.sun.star.drawing.FillProperties" ); aServices[ 3 ] = C2U( "com.sun.star.drawing.LineProperties" ); - aServices[ 4 ] = C2U( "drafts.com.sun.star.layout.LayoutElement" ); + aServices[ 4 ] = C2U( "com.sun.star.layout.LayoutElement" ); return aServices; } diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx index 41b26c5aec77..53924da07856 100644 --- a/chart2/source/model/main/Legend.hxx +++ b/chart2/source/model/main/Legend.hxx @@ -2,9 +2,9 @@ * * $RCSfile: Legend.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: bm $ $Date: 2003-11-26 16:32:17 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,14 +76,14 @@ #include <comphelper/uno3.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XLEGEND_HPP_ -#include <drafts/com/sun/star/chart2/XLegend.hpp> +#ifndef _COM_SUN_STAR_CHART2_XLEGEND_HPP_ +#include <com/sun/star/chart2/XLegend.hpp> #endif #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ -#include <drafts/com/sun/star/chart2/XIdentifiable.hpp> +#ifndef _COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ +#include <com/sun/star/chart2/XIdentifiable.hpp> #endif #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> @@ -95,9 +95,9 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper3< - ::drafts::com::sun::star::chart2::XLegend, + ::com::sun::star::chart2::XLegend, ::com::sun::star::lang::XServiceInfo, - ::drafts::com::sun::star::chart2::XIdentifiable > + ::com::sun::star::chart2::XIdentifiable > Legend_Base; } @@ -144,16 +144,16 @@ protected: // ____ XLegend ____ virtual void SAL_CALL registerEntry( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XLegendEntry >& xEntry ) + ::com::sun::star::chart2::XLegendEntry >& xEntry ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL revokeEntry( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XLegendEntry >& xEntry ) + ::com::sun::star::chart2::XLegendEntry >& xEntry ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XLegendEntry > > SAL_CALL getEntries() + ::com::sun::star::chart2::XLegendEntry > > SAL_CALL getEntries() throw (::com::sun::star::uno::RuntimeException); // ____ XIdentifiable ____ @@ -163,7 +163,7 @@ protected: private: typedef ::std::vector< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XLegendEntry > > tLegendEntries; + ::com::sun::star::chart2::XLegendEntry > > tLegendEntries; tLegendEntries m_aLegendEntries; ::rtl::OUString m_aIdentifier; diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index b6808b77faa4..b5da72b3a6ae 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -2,9 +2,9 @@ * * $RCSfile: PageBackground.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2003-12-17 19:04:46 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,6 @@ #include <algorithm> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; @@ -233,7 +232,7 @@ void SAL_CALL PageBackground::release() throw () uno::Sequence< ::rtl::OUString > PageBackground::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "drafts.com.sun.star.chart2.PageBackground" ); + aServices[ 0 ] = C2U( "com.sun.star.chart2.PageBackground" ); aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" ); return aServices; } diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index 53a2e90e4d6c..c821c2a0018d 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: PolarCoordinateSystem.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:51 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,14 +83,14 @@ PolarCoordinateSystem::~PolarCoordinateSystem() {} // ____ XCoordinateSystem ____ -::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation > SAL_CALL +::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > SAL_CALL PolarCoordinateSystem::getTransformationToCartesian() throw (RuntimeException) { return m_aTransformationToCartesian; } -::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation > SAL_CALL +::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > SAL_CALL PolarCoordinateSystem::getTransformationFromCartesian() throw (RuntimeException) { @@ -118,7 +118,7 @@ Sequence< OUString > PolarCoordinateSystem::getSupportedServiceNames_Static() { Sequence< OUString > aServices; // Sequence< OUString > aServices( 1 ); -// aServices[ 0 ] = C2U( "drafts.com.sun.star.chart2.CoordinateSystem" ); +// aServices[ 0 ] = C2U( "com.sun.star.chart2.CoordinateSystem" ); return aServices; } diff --git a/chart2/source/model/main/RectangularDataSource.cxx b/chart2/source/model/main/RectangularDataSource.cxx index a40f134e9147..78870089f15a 100644 --- a/chart2/source/model/main/RectangularDataSource.cxx +++ b/chart2/source/model/main/RectangularDataSource.cxx @@ -2,9 +2,9 @@ * * $RCSfile: RectangularDataSource.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:31 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,11 +62,11 @@ #include "CachedDataSequence.hxx" #include "StandardNaNHelper.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XNUMERICALDATASEQUENCE_HPP_ -#include <drafts/com/sun/star/chart2/XNumericalDataSequence.hpp> +#ifndef _COM_SUN_STAR_CHART2_XNUMERICALDATASEQUENCE_HPP_ +#include <com/sun/star/chart2/XNumericalDataSequence.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTEXTUALDATASEQUENCE_HPP_ -#include <drafts/com/sun/star/chart2/XTextualDataSequence.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTEXTUALDATASEQUENCE_HPP_ +#include <com/sun/star/chart2/XTextualDataSequence.hpp> #endif #ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATSSUPPLIER_HPP_ #include <com/sun/star/util/XNumberFormatsSupplier.hpp> @@ -76,7 +76,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::osl::MutexGuard; @@ -139,10 +138,10 @@ RectangularDataSource::~RectangularDataSource() Sequence< OUString > RectangularDataSource::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 4 ); - aServices[ 0 ] = C2U( "drafts.com.sun.star.chart2.RectangularDataSource" ); - aServices[ 1 ] = C2U( "drafts.com.sun.star.chart2.DataFilter" ); - aServices[ 2 ] = C2U( "drafts.com.sun.star.chart2.DataSource" ); - aServices[ 3 ] = C2U( "drafts.com.sun.star.chart2.DataSink" ); + aServices[ 0 ] = C2U( "com.sun.star.chart2.RectangularDataSource" ); + aServices[ 1 ] = C2U( "com.sun.star.chart2.DataFilter" ); + aServices[ 2 ] = C2U( "com.sun.star.chart2.DataSource" ); + aServices[ 3 ] = C2U( "com.sun.star.chart2.DataSink" ); return aServices; } diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 62721be30b70..bc8d47699d73 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -2,9 +2,9 @@ * * $RCSfile: Title.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: bm $ $Date: 2003-12-04 14:07:10 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,8 +81,8 @@ #ifndef _COM_SUN_STAR_DRAWING_LINESTYLE_HPP_ #include <com/sun/star/drawing/LineStyle.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_RELATIVEPOSITION_HPP_ -#include <drafts/com/sun/star/layout/RelativePosition.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_RELATIVEPOSITION_HPP_ +#include <com/sun/star/layout/RelativePosition.hpp> #endif #ifndef _RTL_UUID_H_ @@ -97,7 +97,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; -using namespace ::drafts::com::sun::star; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; @@ -385,10 +384,10 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL uno::Sequence< ::rtl::OUString > Title::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 4 ); - aServices[ 0 ] = C2U( "drafts.com.sun.star.chart2.Title" ); + aServices[ 0 ] = C2U( "com.sun.star.chart2.Title" ); aServices[ 1 ] = C2U( "com.sun.star.style.ParagraphProperties" ); aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); - aServices[ 3 ] = C2U( "drafts.com.sun.star.layout.LayoutElement" ); + aServices[ 3 ] = C2U( "com.sun.star.layout.LayoutElement" ); return aServices; } diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx index bc5b8d1032dd..90c99db00627 100644 --- a/chart2/source/model/main/Title.hxx +++ b/chart2/source/model/main/Title.hxx @@ -2,9 +2,9 @@ * * $RCSfile: Title.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: bm $ $Date: 2003-11-26 16:32:19 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,14 +76,14 @@ #include <comphelper/uno3.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTITLE_HPP_ -#include <drafts/com/sun/star/chart2/XTitle.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTITLE_HPP_ +#include <com/sun/star/chart2/XTitle.hpp> #endif #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ -#include <drafts/com/sun/star/chart2/XIdentifiable.hpp> +#ifndef _COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ +#include <com/sun/star/chart2/XIdentifiable.hpp> #endif #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> @@ -95,9 +95,9 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper3< - ::drafts::com::sun::star::chart2::XTitle, + ::com::sun::star::chart2::XTitle, ::com::sun::star::lang::XServiceInfo, - ::drafts::com::sun::star::chart2::XIdentifiable > + ::com::sun::star::chart2::XIdentifiable > Title_Base; } @@ -145,11 +145,11 @@ protected: // ____ XTitle ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XFormattedString > > SAL_CALL getText() + ::com::sun::star::chart2::XFormattedString > > SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setText( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XFormattedString > >& Strings ) + ::com::sun::star::chart2::XFormattedString > >& Strings ) throw (::com::sun::star::uno::RuntimeException); // ____ XIdentifiable ____ @@ -161,7 +161,7 @@ private: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XFormattedString > > m_aStrings; + ::com::sun::star::chart2::XFormattedString > > m_aStrings; }; } // namespace chart diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index e1e69203b89c..890eac1689b2 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -2,9 +2,9 @@ * * $RCSfile: Wall.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: bm $ $Date: 2003-12-15 15:50:38 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,8 +81,8 @@ #ifndef _COM_SUN_STAR_DRAWING_HATCH_HPP_ #include <com/sun/star/drawing/Hatch.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ -#include <drafts/com/sun/star/chart2/TransparencyStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ +#include <com/sun/star/chart2/TransparencyStyle.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_LINESTYLE_HPP_ #include <com/sun/star/drawing/LineStyle.hpp> @@ -106,7 +106,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; -using namespace ::drafts::com::sun::star; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; @@ -258,7 +257,7 @@ void SAL_CALL Wall::release() throw () uno::Sequence< ::rtl::OUString > Wall::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "drafts.com.sun.star.chart2.Wall" ); + aServices[ 0 ] = C2U( "com.sun.star.chart2.Wall" ); aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" ); return aServices; } diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx index b8f5b9c96328..bad7299db99f 100644 --- a/chart2/source/model/template/AreaChartType.cxx +++ b/chart2/source/model/template/AreaChartType.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AreaChartType.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:31 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,7 +61,6 @@ #include "AreaChartType.hxx" using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; namespace chart { diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index e442ee392d8f..9f4201f33b49 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AreaChartTypeTemplate.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: bm $ $Date: 2003-11-21 14:20:10 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,7 +73,6 @@ #include <algorithm> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::com::sun::star::beans::Property; @@ -248,7 +247,7 @@ uno::Sequence< ::rtl::OUString > AreaChartTypeTemplate::getSupportedServiceNames { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "drafts.com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); return aServices; } diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx b/chart2/source/model/template/AreaChartTypeTemplate.hxx index 6cfce5c6e346..00f4b7eaa38e 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.hxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx @@ -2,9 +2,9 @@ * * $RCSfile: AreaChartTypeTemplate.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: bm $ $Date: 2003-11-21 14:20:10 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,8 +70,8 @@ #include <comphelper/uno3.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_STACKMODE_HPP_ -#include <drafts/com/sun/star/chart2/StackMode.hpp> +#ifndef _COM_SUN_STAR_CHART2_STACKMODE_HPP_ +#include <com/sun/star/chart2/StackMode.hpp> #endif namespace chart @@ -87,7 +87,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, const ::rtl::OUString & rServiceName, - ::drafts::com::sun::star::chart2::StackMode eStackMode, + ::com::sun::star::chart2::StackMode eStackMode, sal_Int32 nDim = 2 ); virtual ~AreaChartTypeTemplate(); @@ -112,13 +112,13 @@ protected: // ____ ChartTypeTemplate ____ virtual sal_Int32 getDimension() const; - virtual ::drafts::com::sun::star::chart2::StackMode getYStackMode() const; + virtual ::com::sun::star::chart2::StackMode getYStackMode() const; virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType > getDefaultChartType() + ::com::sun::star::chart2::XChartType > getDefaultChartType() throw (::com::sun::star::uno::RuntimeException); private: - ::drafts::com::sun::star::chart2::StackMode + ::com::sun::star::chart2::StackMode m_eStackMode; sal_Int32 m_nDim; }; diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx index cd4b4f5ee019..2f823e603139 100644 --- a/chart2/source/model/template/BarChartType.cxx +++ b/chart2/source/model/template/BarChartType.cxx @@ -2,9 +2,9 @@ * * $RCSfile: BarChartType.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:31 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,7 +61,6 @@ #include "BarChartType.hxx" using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; namespace chart { diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 9ebb8a90c6fc..0e383d01ede2 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -2,9 +2,9 @@ * * $RCSfile: BarChartTypeTemplate.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: bm $ $Date: 2003-11-21 14:20:10 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,7 +77,6 @@ #include <algorithm> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; @@ -260,7 +259,7 @@ uno::Sequence< ::rtl::OUString > BarChartTypeTemplate::getSupportedServiceNames_ { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "drafts.com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); return aServices; } diff --git a/chart2/source/model/template/BarChartTypeTemplate.hxx b/chart2/source/model/template/BarChartTypeTemplate.hxx index 07a367daee89..01edd508fee0 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.hxx +++ b/chart2/source/model/template/BarChartTypeTemplate.hxx @@ -2,9 +2,9 @@ * * $RCSfile: BarChartTypeTemplate.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: bm $ $Date: 2003-11-21 14:20:11 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,8 +70,8 @@ #include "ChartTypeTemplate.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_STACKMODE_HPP_ -#include <drafts/com/sun/star/chart2/StackMode.hpp> +#ifndef _COM_SUN_STAR_CHART2_STACKMODE_HPP_ +#include <com/sun/star/chart2/StackMode.hpp> #endif namespace chart @@ -99,7 +99,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, const ::rtl::OUString & rServiceName, - ::drafts::com::sun::star::chart2::StackMode eStackMode, + ::com::sun::star::chart2::StackMode eStackMode, BarDirection eDirection, sal_Int32 nDim = 2, ThreeDMode eThreeDMode = THREE_D_FLAT ); @@ -126,14 +126,14 @@ protected: // ____ ChartTypeTemplate ____ virtual sal_Int32 getDimension() const; - virtual ::drafts::com::sun::star::chart2::StackMode getYStackMode() const; - virtual ::drafts::com::sun::star::chart2::StackMode getXStackMode() const; + virtual ::com::sun::star::chart2::StackMode getYStackMode() const; + virtual ::com::sun::star::chart2::StackMode getXStackMode() const; virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType > getDefaultChartType() + ::com::sun::star::chart2::XChartType > getDefaultChartType() throw (::com::sun::star::uno::RuntimeException); private: - ::drafts::com::sun::star::chart2::StackMode + ::com::sun::star::chart2::StackMode m_eStackMode; BarDirection m_eBarDirection; sal_Int32 m_nDim; diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index 6462db1a8379..a211b6397761 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartType.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:31 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,7 +68,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::com::sun::star::beans::Property; @@ -147,7 +146,7 @@ Sequence< OUString > ChartType::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "drafts.com.sun.star.chart2.ChartType" ); + aServices[ 0 ] = C2U( "com.sun.star.chart2.ChartType" ); aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" ); return aServices; } diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx index 060991366b50..27fb39bb26fb 100644 --- a/chart2/source/model/template/ChartType.hxx +++ b/chart2/source/model/template/ChartType.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartType.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:31 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,8 +79,8 @@ #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPE_HPP_ -#include <drafts/com/sun/star/chart2/XChartType.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPE_HPP_ +#include <com/sun/star/chart2/XChartType.hpp> #endif namespace chart @@ -89,7 +89,7 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper1< - ::drafts::com::sun::star::chart2::XChartType > + ::com::sun::star::chart2::XChartType > ChartType_Base; } diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index 0d15c7f16023..6a6dfea37421 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartTypeManager.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: bm $ $Date: 2004-01-19 13:02:19 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,16 +93,16 @@ #ifndef _COM_SUN_STAR_CHART_CHARTSOLIDTYPE_HPP_ #include <com/sun/star/chart/ChartSolidType.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPEGROUP_HPP_ -#include <drafts/com/sun/star/chart2/XChartTypeGroup.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPEGROUP_HPP_ +#include <com/sun/star/chart2/XChartTypeGroup.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XSTACKABLESCALEGROUP_HPP_ -#include <drafts/com/sun/star/chart2/XStackableScaleGroup.hpp> +#ifndef _COM_SUN_STAR_CHART2_XSTACKABLESCALEGROUP_HPP_ +#include <com/sun/star/chart2/XStackableScaleGroup.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_STACKMODE_HPP_ -#include <drafts/com/sun/star/chart2/StackMode.hpp> +#ifndef _COM_SUN_STAR_CHART2_STACKMODE_HPP_ +#include <com/sun/star/chart2/StackMode.hpp> #endif -#include <drafts/com/sun/star/chart2/CurveStyle.hpp> +#include <com/sun/star/chart2/CurveStyle.hpp> #include <algorithm> #include <iterator> @@ -110,7 +110,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::com::sun::star::beans::Property; @@ -697,7 +696,7 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames() if( xEnumAcc.is()) { uno::Reference< container::XEnumeration > xEnum( - xEnumAcc->createContentEnumeration( C2U( "drafts.com.sun.star.chart2.ChartTypeTemplate" ) )); + xEnumAcc->createContentEnumeration( C2U( "com.sun.star.chart2.ChartTypeTemplate" ) )); if( xEnum.is()) { uno::Reference< uno::XInterface > xFactIntf; @@ -721,8 +720,8 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames() Sequence< OUString > ChartTypeManager::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = C2U( "drafts.com.sun.star.chart2.ChartTypeManager" ); - aServices[ 1 ] = C2U( "drafts.com.sun.star.lang.MultiServiceFactory" ); + aServices[ 0 ] = C2U( "com.sun.star.chart2.ChartTypeManager" ); + aServices[ 1 ] = C2U( "com.sun.star.lang.MultiServiceFactory" ); aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); return aServices; } diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 04ddb64afb19..f9897f0a6c95 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartTypeTemplate.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: bm $ $Date: 2003-11-25 09:01:34 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,11 +82,11 @@ #ifndef _COM_SUN_STAR_CHART_CHARTSOLIDTYPE_HPP_ #include <com/sun/star/chart/ChartSolidType.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPEGROUP_HPP_ -#include <drafts/com/sun/star/chart2/XChartTypeGroup.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPEGROUP_HPP_ +#include <com/sun/star/chart2/XChartTypeGroup.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XSTACKABLESCALEGROUP_HPP_ -#include <drafts/com/sun/star/chart2/XStackableScaleGroup.hpp> +#ifndef _COM_SUN_STAR_CHART2_XSTACKABLESCALEGROUP_HPP_ +#include <com/sun/star/chart2/XStackableScaleGroup.hpp> #endif #include <algorithm> @@ -94,7 +94,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::com::sun::star::beans::Property; @@ -108,8 +107,8 @@ namespace { #if OSL_DEBUG_LEVEL > 1 -#include <drafts/com/sun/star/chart2/XChartTypeGroup.hpp> -#include <drafts/com/sun/star/chart2/XScaleGroup.hpp> +#include <com/sun/star/chart2/XChartTypeGroup.hpp> +#include <com/sun/star/chart2/XScaleGroup.hpp> // forward declatation void lcl_ShowTree( const Reference< chart2::XDataSeriesTreeParent > & xParent, sal_Int32 nLevel = 0 ); @@ -143,16 +142,10 @@ Reference< chart2::XDiagram > SAL_CALL ChartTypeTemplate::createDiagram( try { // create diagram - ContextHelper::tContextEntryMapType aContextValues( - ContextHelper::MakeContextEntryMap - ( C2U( "TemplateServiceName" ), - uno::makeAny( getServiceName() )) - ); - xDia.set( m_xContext->getServiceManager()->createInstanceWithContext( - C2U( "drafts.com.sun.star.chart2.Diagram" ), - ContextHelper::createContext( aContextValues, m_xContext ) ), + C2U( "com.sun.star.chart2.Diagram" ), + m_xContext ), uno::UNO_QUERY_THROW ); // modify diagram @@ -161,7 +154,7 @@ Reference< chart2::XDiagram > SAL_CALL ChartTypeTemplate::createDiagram( // create and attach legend Reference< chart2::XLegend > xLegend( m_xContext->getServiceManager()->createInstanceWithContext( - C2U( "drafts.com.sun.star.chart2.Legend" ), + C2U( "com.sun.star.chart2.Legend" ), m_xContext ), uno::UNO_QUERY_THROW ); @@ -333,7 +326,7 @@ void ChartTypeTemplate::createAndAddGrids( Reference< chart2::XGrid > xGrid( m_xContext->getServiceManager()->createInstanceWithContext( - C2U( "drafts.com.sun.star.chart2.Grid" ), + C2U( "com.sun.star.chart2.Grid" ), ContextHelper::createContext( aContextValues, m_xContext ) ), uno::UNO_QUERY ); @@ -420,7 +413,7 @@ Reference< chart2::XDataSeriesTreeParent > ChartTypeTemplate::createRootNode() { Reference< chart2::XDataSeriesTreeParent > aRoot( m_xContext->getServiceManager()->createInstanceWithContext( - C2U( "drafts.com.sun.star.chart2.DataSeriesTree" ), m_xContext ), + C2U( "com.sun.star.chart2.DataSeriesTree" ), m_xContext ), uno::UNO_QUERY ); OSL_ASSERT( aRoot.is()); @@ -432,7 +425,7 @@ Reference< chart2::XDataSeriesTreeNode > ChartTypeTemplate::createChartTypeGroup { Reference< chart2::XDataSeriesTreeNode > aChartTypeNode( m_xContext->getServiceManager()->createInstanceWithContext( - C2U( "drafts.com.sun.star.chart2.ChartTypeGroup" ), m_xContext ), + C2U( "com.sun.star.chart2.ChartTypeGroup" ), m_xContext ), uno::UNO_QUERY ); OSL_ASSERT( aChartTypeNode.is()); Reference< chart2::XChartTypeGroup > aChartTypeGroup( aChartTypeNode, uno::UNO_QUERY ); @@ -480,16 +473,16 @@ Reference< chart2::XDataSeriesTreeNode > ChartTypeTemplate::createScaleGroup( if( bIsDiscrete ) { if( bIsStackable ) - aServiceName = C2U( "drafts.com.sun.star.chart2.DiscreteStackableScaleGroup" ); + aServiceName = C2U( "com.sun.star.chart2.DiscreteStackableScaleGroup" ); else - aServiceName = C2U( "drafts.com.sun.star.chart2.DiscreteScaleGroup" ); + aServiceName = C2U( "com.sun.star.chart2.DiscreteScaleGroup" ); } else { if( bIsStackable ) - aServiceName = C2U( "drafts.com.sun.star.chart2.ContinuousStackableScaleGroup" ); + aServiceName = C2U( "com.sun.star.chart2.ContinuousStackableScaleGroup" ); else - aServiceName = C2U( "drafts.com.sun.star.chart2.ContinuousScaleGroup" ); + aServiceName = C2U( "com.sun.star.chart2.ContinuousScaleGroup" ); } aNode.set( @@ -578,8 +571,8 @@ void ChartTypeTemplate::setStackModeAtTree( Sequence< OUString > ChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = C2U( "drafts.com.sun.star.chart2.ChartTypeTemplate" ); - aServices[ 1 ] = C2U( "drafts.com.sun.star.layout.LayoutElement" ); + aServices[ 0 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = C2U( "com.sun.star.layout.LayoutElement" ); aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); return aServices; } @@ -629,9 +622,9 @@ void lcl_ShowTree( const Reference< chart2::XDataSeriesTreeParent > & xParent, s Reference< chart2::XStackableScaleGroup > xStackableGroup( xInfo, uno::UNO_QUERY ); Reference< chart2::XScaleGroup > xScaleGroup( xInfo, uno::UNO_QUERY ); bool bIsDiscrete = ( xInfo->supportsService( - C2U( "drafts.com.sun.star.chart2.DiscreteScaleGroup" )) || + C2U( "com.sun.star.chart2.DiscreteScaleGroup" )) || xInfo->supportsService( - C2U( "drafts.com.sun.star.chart2.DiscreteStackableScaleGroup" ))); + C2U( "com.sun.star.chart2.DiscreteStackableScaleGroup" ))); if( xStackableGroup.is()) { @@ -666,7 +659,7 @@ void lcl_ShowTree( const Reference< chart2::XDataSeriesTreeParent > & xParent, s OSL_TRACE( "%s<scale group>", aIndent ); } } - else if( xInfo->supportsService( C2U( "drafts.com.sun.star.chart2.ChartTypeGroup" ))) + else if( xInfo->supportsService( C2U( "com.sun.star.chart2.ChartTypeGroup" ))) { Reference< chart2::XChartTypeGroup > xGroup( xInfo, uno::UNO_QUERY ); if( xGroup.is() ) @@ -678,7 +671,7 @@ void lcl_ShowTree( const Reference< chart2::XDataSeriesTreeParent > & xParent, s OSL_TRACE( "%s<chart type group>", aIndent ); } } - else if( xInfo->supportsService( C2U( "drafts.com.sun.star.chart2.DataSeries" ))) + else if( xInfo->supportsService( C2U( "com.sun.star.chart2.DataSeries" ))) { Reference< beans::XPropertySet > xProp( xInfo, uno::UNO_QUERY ); ::rtl::OUString aId; diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index b8bdf8a7fc66..e511b9603c85 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartTypeTemplate.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: bm $ $Date: 2003-11-21 14:20:12 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,36 +69,36 @@ #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPETEMPLATE_HPP_ -#include <drafts/com/sun/star/chart2/XChartTypeTemplate.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPETEMPLATE_HPP_ +#include <com/sun/star/chart2/XChartTypeTemplate.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XAXISCONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XAxisContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XAXISCONTAINER_HPP_ +#include <com/sun/star/chart2/XAxisContainer.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_STACKMODE_HPP_ -#include <drafts/com/sun/star/chart2/StackMode.hpp> +#ifndef _COM_SUN_STAR_CHART2_STACKMODE_HPP_ +#include <com/sun/star/chart2/StackMode.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XGRIDCONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XGridContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XGRIDCONTAINER_HPP_ +#include <com/sun/star/chart2/XGridContainer.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XBOUNDEDCOORDINATESYSTEMCONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XBoundedCoordinateSystemContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XBOUNDEDCOORDINATESYSTEMCONTAINER_HPP_ +#include <com/sun/star/chart2/XBoundedCoordinateSystemContainer.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XLEGEND_HPP_ -#include <drafts/com/sun/star/chart2/XLegend.hpp> +#ifndef _COM_SUN_STAR_CHART2_XLEGEND_HPP_ +#include <com/sun/star/chart2/XLegend.hpp> #endif #ifndef _COM_SUN_STAR_LANG_XSERVICENAME_HPP_ #include <com/sun/star/lang/XServiceName.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPE_HPP_ -#include <drafts/com/sun/star/chart2/XChartType.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPE_HPP_ +#include <com/sun/star/chart2/XChartType.hpp> #endif namespace chart { class ChartTypeTemplate : public ::cppu::WeakImplHelper2< - ::drafts::com::sun::star::chart2::XChartTypeTemplate, + ::com::sun::star::chart2::XChartTypeTemplate, ::com::sun::star::lang::XServiceName > { public: @@ -114,14 +114,14 @@ public: protected: // ____ XChartTypeTemplate ____ - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XDiagram > SAL_CALL + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > SAL_CALL createDiagram( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeries > >& aSeriesSeq ) + ::com::sun::star::chart2::XDataSeries > >& aSeriesSeq ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram >& xDiagram ) + ::com::sun::star::chart2::XDiagram >& xDiagram ) throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ @@ -137,20 +137,20 @@ protected: /** returns StackMode_NONE by default. For a column/bar chart you would want to return StackMode_STACKED here. */ - virtual ::drafts::com::sun::star::chart2::StackMode getXStackMode() const; + virtual ::com::sun::star::chart2::StackMode getXStackMode() const; /** returns StackMode_NONE by default. This is a global flag used for all series if createDataSeriesTree() is not overloaded */ - virtual ::drafts::com::sun::star::chart2::StackMode getYStackMode() const; + virtual ::com::sun::star::chart2::StackMode getYStackMode() const; /** returns StackMode_NONE by default. For a column/bar chart you would want to return StackMode_STACKED here. */ - virtual ::drafts::com::sun::star::chart2::StackMode getZStackMode() const; + virtual ::com::sun::star::chart2::StackMode getZStackMode() const; virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType > getDefaultChartType() + ::com::sun::star::chart2::XChartType > getDefaultChartType() throw (::com::sun::star::uno::RuntimeException); // Methods for creating the diagram piecewise @@ -165,10 +165,10 @@ protected: If this container is valid, the coordinate system is added to it. */ virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > + ::com::sun::star::chart2::XBoundedCoordinateSystem > createCoordinateSystem( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystemContainer > & xCoordSysCnt ); + ::com::sun::star::chart2::XBoundedCoordinateSystemContainer > & xCoordSysCnt ); /** create axes and add them to the given container. @@ -178,9 +178,9 @@ protected: */ virtual void createAndAddAxes( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > & rCoordSys, + ::com::sun::star::chart2::XBoundedCoordinateSystem > & rCoordSys, const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XAxisContainer > & rOutAxisCnt ); + ::com::sun::star::chart2::XAxisContainer > & rOutAxisCnt ); /** create grids and add them to the given container. @@ -189,9 +189,9 @@ protected: */ virtual void createAndAddGrids( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > & rCoordSys, + ::com::sun::star::chart2::XBoundedCoordinateSystem > & rCoordSys, const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XGridContainer > & rOutGridCnt ); + ::com::sun::star::chart2::XGridContainer > & rOutGridCnt ); /** create a data series tree, that fits the requirements of the chart type. @@ -219,55 +219,55 @@ protected: empty.</p> */ virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeriesTreeParent > createDataSeriesTree( + ::com::sun::star::chart2::XDataSeriesTreeParent > createDataSeriesTree( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeries > >& aSeriesSeq, + ::com::sun::star::chart2::XDataSeries > >& aSeriesSeq, const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > & rCoordSys + ::com::sun::star::chart2::XBoundedCoordinateSystem > & rCoordSys ); // helper methods // -------------- ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeriesTreeParent > createRootNode(); + ::com::sun::star::chart2::XDataSeriesTreeParent > createRootNode(); ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeriesTreeNode > + ::com::sun::star::chart2::XDataSeriesTreeNode > createChartTypeGroup( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType > & xChartType ); + ::com::sun::star::chart2::XChartType > & xChartType ); ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeriesTreeNode > + ::com::sun::star::chart2::XDataSeriesTreeNode > createScaleGroup( bool bIsDiscrete, bool bIsStackable, ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > xCoordSys, + ::com::sun::star::chart2::XBoundedCoordinateSystem > xCoordSys, sal_Int32 nRepresentedDimension, - ::drafts::com::sun::star::chart2::StackMode eStackMode = - ::drafts::com::sun::star::chart2::StackMode_NONE ); + ::com::sun::star::chart2::StackMode eStackMode = + ::com::sun::star::chart2::StackMode_NONE ); void addDataSeriesToGroup( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeriesTreeNode > & rParent, + ::com::sun::star::chart2::XDataSeriesTreeNode > & rParent, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeries > > & rDataSeries ); + ::com::sun::star::chart2::XDataSeries > > & rDataSeries ); /** Finds the first ContinuousScaleGroup in the tree and sets the stacking mode there if it is a stackable group */ void setStackModeAtTree( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeriesTreeParent > & rTree, - ::drafts::com::sun::star::chart2::StackMode eMode ); + ::com::sun::star::chart2::XDataSeriesTreeParent > & rTree, + ::com::sun::star::chart2::StackMode eMode ); void attachNodeToNode( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeriesTreeNode > & rParent, + ::com::sun::star::chart2::XDataSeriesTreeNode > & rParent, const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeriesTreeNode > & rChild ); + ::com::sun::star::chart2::XDataSeriesTreeNode > & rChild ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > GetComponentContext() const; @@ -280,10 +280,10 @@ private: /** modifies the given diagram */ void FillDiagram( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > & xDiagram, + ::com::sun::star::chart2::XDiagram > & xDiagram, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeries > >& aSeriesSeq ); + ::com::sun::star::chart2::XDataSeries > >& aSeriesSeq ); }; } // namespace chart diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index dfb3c98f579f..810001235bf8 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ColumnChartType.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-11-04 12:37:33 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,7 +61,6 @@ #include "ColumnChartType.hxx" using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; namespace chart { diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 60d9554407d9..975bef1a9f24 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ColumnLineChartTypeTemplate.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: bm $ $Date: 2003-11-21 14:20:12 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,6 @@ #include <algorithm> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -354,7 +353,7 @@ uno::Sequence< ::rtl::OUString > ColumnLineChartTypeTemplate::getSupportedServic { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "drafts.com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); return aServices; } diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx index 085ec51c22e1..b24b3e02a7a2 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ColumnLineChartTypeTemplate.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: bm $ $Date: 2003-11-21 14:20:12 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,8 +70,8 @@ #include <comphelper/uno3.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_STACKMODE_HPP_ -#include <drafts/com/sun/star/chart2/StackMode.hpp> +#ifndef _COM_SUN_STAR_CHART2_STACKMODE_HPP_ +#include <com/sun/star/chart2/StackMode.hpp> #endif namespace chart @@ -87,7 +87,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, const ::rtl::OUString & rServiceName, - ::drafts::com::sun::star::chart2::StackMode eStackMode, + ::com::sun::star::chart2::StackMode eStackMode, sal_Int32 nNumberOfLines ); virtual ~ColumnLineChartTypeTemplate(); @@ -113,27 +113,27 @@ protected: // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram >& xDiagram ) + ::com::sun::star::chart2::XDiagram >& xDiagram ) throw (::com::sun::star::uno::RuntimeException); // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeriesTreeParent > createDataSeriesTree( + ::com::sun::star::chart2::XDataSeriesTreeParent > createDataSeriesTree( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeries > >& aSeriesSeq, + ::com::sun::star::chart2::XDataSeries > >& aSeriesSeq, const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > & rCoordSys + ::com::sun::star::chart2::XBoundedCoordinateSystem > & rCoordSys ); - virtual ::drafts::com::sun::star::chart2::StackMode getYStackMode() const; + virtual ::com::sun::star::chart2::StackMode getYStackMode() const; virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType > getDefaultChartType() + ::com::sun::star::chart2::XChartType > getDefaultChartType() throw (::com::sun::star::uno::RuntimeException); private: - ::drafts::com::sun::star::chart2::StackMode + ::com::sun::star::chart2::StackMode m_eStackMode; }; diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index bbe92de44e28..b52de3185be9 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -2,9 +2,9 @@ * * $RCSfile: LineChartType.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: bm $ $Date: 2003-11-20 18:12:23 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,12 +66,11 @@ #ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_CURVESTYLE_HPP_ -#include <drafts/com/sun/star/chart2/CurveStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_CURVESTYLE_HPP_ +#include <com/sun/star/chart2/CurveStyle.hpp> #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::com::sun::star::beans::Property; @@ -80,9 +79,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; -using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; - namespace { diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index dc2fda9f9d85..859700db8202 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -2,9 +2,9 @@ * * $RCSfile: LineChartType.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: bm $ $Date: 2003-11-20 18:12:24 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,8 +63,8 @@ #include "ChartType.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_CURVESTYLE_HPP_ -#include <drafts/com/sun/star/chart2/CurveStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_CURVESTYLE_HPP_ +#include <com/sun/star/chart2/CurveStyle.hpp> #endif namespace chart @@ -74,8 +74,8 @@ class LineChartType : public ChartType { public: LineChartType( sal_Int32 nDim = 2, - ::drafts::com::sun::star::chart2::CurveStyle eCurveStyle = - ::drafts::com::sun::star::chart2::CurveStyle_LINES, + ::com::sun::star::chart2::CurveStyle eCurveStyle = + ::com::sun::star::chart2::CurveStyle_LINES, sal_Int32 nResolution = 20, sal_Int32 nOrder = 3 ); virtual ~LineChartType(); diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index 54e0dda9f739..fa5db8f4a309 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -2,9 +2,9 @@ * * $RCSfile: LineChartTypeTemplate.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: iha $ $Date: 2003-12-17 18:06:55 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,11 +64,11 @@ #include "algohelper.hxx" #include "DataSeriesTreeHelper.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SYMBOLSTYLE_HPP_ -#include <drafts/com/sun/star/chart2/SymbolStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_SYMBOLSTYLE_HPP_ +#include <com/sun/star/chart2/SymbolStyle.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SYMBOL_HPP_ -#include <drafts/com/sun/star/chart2/Symbol.hpp> +#ifndef _COM_SUN_STAR_CHART2_SYMBOL_HPP_ +#include <com/sun/star/chart2/Symbol.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_LINESTYLE_HPP_ #include <com/sun/star/drawing/LineStyle.hpp> @@ -84,7 +84,6 @@ #include <algorithm> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -397,7 +396,7 @@ Sequence< OUString > LineChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "drafts.com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); return aServices; } diff --git a/chart2/source/model/template/LineChartTypeTemplate.hxx b/chart2/source/model/template/LineChartTypeTemplate.hxx index d0ba2da160f6..7abdda6ec985 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.hxx +++ b/chart2/source/model/template/LineChartTypeTemplate.hxx @@ -2,9 +2,9 @@ * * $RCSfile: LineChartTypeTemplate.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: iha $ $Date: 2003-12-17 18:04:43 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,11 +69,11 @@ #include <comphelper/uno3.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_STACKMODE_HPP_ -#include <drafts/com/sun/star/chart2/StackMode.hpp> +#ifndef _COM_SUN_STAR_CHART2_STACKMODE_HPP_ +#include <com/sun/star/chart2/StackMode.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_CURVESTYLE_HPP_ -#include <drafts/com/sun/star/chart2/CurveStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_CURVESTYLE_HPP_ +#include <com/sun/star/chart2/CurveStyle.hpp> #endif namespace chart @@ -89,11 +89,11 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, const ::rtl::OUString & rServiceName, - ::drafts::com::sun::star::chart2::StackMode eYStackMode, - ::drafts::com::sun::star::chart2::CurveStyle eCurveStyle, + ::com::sun::star::chart2::StackMode eYStackMode, + ::com::sun::star::chart2::CurveStyle eCurveStyle, bool bSymbols, sal_Int32 nDim = 2, - ::drafts::com::sun::star::chart2::StackMode eZStackMode = - ::drafts::com::sun::star::chart2::StackMode_NONE ); + ::com::sun::star::chart2::StackMode eZStackMode = + ::com::sun::star::chart2::StackMode_NONE ); virtual ~LineChartTypeTemplate(); /// XServiceInfo declarations @@ -116,35 +116,35 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ____ XChartTypeTemplate ____ - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XDiagram > SAL_CALL + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > SAL_CALL createDiagram( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeries > >& aSeriesSeq ) + ::com::sun::star::chart2::XDataSeries > >& aSeriesSeq ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram >& xDiagram ) + ::com::sun::star::chart2::XDiagram >& xDiagram ) throw (::com::sun::star::uno::RuntimeException); // ____ ChartTypeTemplate ____ virtual sal_Int32 getDimension() const; - virtual ::drafts::com::sun::star::chart2::StackMode getZStackMode() const; - virtual ::drafts::com::sun::star::chart2::StackMode getYStackMode() const; + virtual ::com::sun::star::chart2::StackMode getZStackMode() const; + virtual ::com::sun::star::chart2::StackMode getYStackMode() const; virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType > getDefaultChartType() + ::com::sun::star::chart2::XChartType > getDefaultChartType() throw (::com::sun::star::uno::RuntimeException); private: - ::drafts::com::sun::star::chart2::StackMode + ::com::sun::star::chart2::StackMode m_eYStackMode; - ::drafts::com::sun::star::chart2::CurveStyle + ::com::sun::star::chart2::CurveStyle m_eCurveStyle; bool m_bHasSymbols; bool m_bHasLines; sal_Int32 m_nDim; // only used if m_nDim == 3 - ::drafts::com::sun::star::chart2::StackMode + ::com::sun::star::chart2::StackMode m_eZStackMode; }; diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index 5059de1c5575..aeb32699b267 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -2,9 +2,9 @@ * * $RCSfile: NetChartType.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2004-01-12 14:28:53 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,7 +61,6 @@ #include "NetChartType.hxx" using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; namespace chart { diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx index 67dabeeeb105..e4aedb0c7afa 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.cxx +++ b/chart2/source/model/template/NetChartTypeTemplate.cxx @@ -2,9 +2,9 @@ * * $RCSfile: NetChartTypeTemplate.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:52 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,18 +68,17 @@ #include "Scaling.hxx" #include "Scale.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SYMBOLSTYLE_HPP_ -#include <drafts/com/sun/star/chart2/SymbolStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_SYMBOLSTYLE_HPP_ +#include <com/sun/star/chart2/SymbolStyle.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SYMBOL_HPP_ -#include <drafts/com/sun/star/chart2/Symbol.hpp> +#ifndef _COM_SUN_STAR_CHART2_SYMBOL_HPP_ +#include <com/sun/star/chart2/Symbol.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_LINESTYLE_HPP_ #include <com/sun/star/drawing/LineStyle.hpp> #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -235,7 +234,7 @@ Sequence< OUString > NetChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "drafts.com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); return aServices; } diff --git a/chart2/source/model/template/NetChartTypeTemplate.hxx b/chart2/source/model/template/NetChartTypeTemplate.hxx index 092740cbdd27..2f6dba992fa7 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.hxx +++ b/chart2/source/model/template/NetChartTypeTemplate.hxx @@ -2,9 +2,9 @@ * * $RCSfile: NetChartTypeTemplate.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2004-01-12 14:28:12 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,8 +63,8 @@ #include "ChartTypeTemplate.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_STACKMODE_HPP_ -#include <drafts/com/sun/star/chart2/StackMode.hpp> +#ifndef _COM_SUN_STAR_CHART2_STACKMODE_HPP_ +#include <com/sun/star/chart2/StackMode.hpp> #endif namespace chart @@ -77,7 +77,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, const ::rtl::OUString & rServiceName, - ::drafts::com::sun::star::chart2::StackMode eStackMode, + ::com::sun::star::chart2::StackMode eStackMode, bool bSymbols ); virtual ~NetChartTypeTemplate(); @@ -85,29 +85,29 @@ public: protected: // ____ XChartTypeTemplate ____ - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XDiagram > SAL_CALL + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > SAL_CALL createDiagram( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeries > >& aSeriesSeq ) + ::com::sun::star::chart2::XDataSeries > >& aSeriesSeq ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram >& xDiagram ) + ::com::sun::star::chart2::XDiagram >& xDiagram ) throw (::com::sun::star::uno::RuntimeException); // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType > getDefaultChartType() + ::com::sun::star::chart2::XChartType > getDefaultChartType() throw (::com::sun::star::uno::RuntimeException); - virtual ::drafts::com::sun::star::chart2::StackMode getYStackMode() const; + virtual ::com::sun::star::chart2::StackMode getYStackMode() const; virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > + ::com::sun::star::chart2::XBoundedCoordinateSystem > createCoordinateSystem( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystemContainer > & xCoordSysCnt ); + ::com::sun::star::chart2::XBoundedCoordinateSystemContainer > & xCoordSysCnt ); private: - ::drafts::com::sun::star::chart2::StackMode m_eStackMode; + ::com::sun::star::chart2::StackMode m_eStackMode; bool m_bHasSymbols; }; diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index 72efdac9d5b1..b2358e9df124 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -2,9 +2,9 @@ * * $RCSfile: PieChartType.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: bm $ $Date: 2003-11-12 10:46:59 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,7 +68,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::com::sun::star::beans::Property; diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index ea01077f7c1b..699fff730fe1 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -2,9 +2,9 @@ * * $RCSfile: PieChartTypeTemplate.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:52 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,7 +77,6 @@ #include <algorithm> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::com::sun::star::beans::Property; @@ -311,6 +310,13 @@ void PieChartTypeTemplate::createAndAddAxes( // do nothing -- there are no axes in a pie chart } +void PieChartTypeTemplate::createAndAddGrids( + const Reference< chart2::XBoundedCoordinateSystem > & rCoordSys, + const Reference< chart2::XGridContainer > & rOutGridCnt ) +{ + // do nothing -- there are no grids in a pie chart +} + Reference< chart2::XDataSeriesTreeParent > PieChartTypeTemplate::createDataSeriesTree( const Sequence< Reference< chart2::XDataSeries > > & aSeriesSeq, const Reference< chart2::XBoundedCoordinateSystem > & rCoordSys ) @@ -418,7 +424,7 @@ uno::Sequence< ::rtl::OUString > PieChartTypeTemplate::getSupportedServiceNames_ { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "drafts.com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); return aServices; } diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx b/chart2/source/model/template/PieChartTypeTemplate.hxx index 010616b02fe7..ef2fe1b06679 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.hxx +++ b/chart2/source/model/template/PieChartTypeTemplate.hxx @@ -2,9 +2,9 @@ * * $RCSfile: PieChartTypeTemplate.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: bm $ $Date: 2003-11-04 12:37:36 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,8 +70,8 @@ #include "ChartTypeTemplate.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_PIECHARTOFFSETMODE_HPP_ -#include <drafts/com/sun/star/chart2/PieChartOffsetMode.hpp> +#ifndef _COM_SUN_STAR_CHART2_PIECHARTOFFSETMODE_HPP_ +#include <com/sun/star/chart2/PieChartOffsetMode.hpp> #endif namespace chart @@ -87,7 +87,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, const ::rtl::OUString & rServiceName, - ::drafts::com::sun::star::chart2::PieChartOffsetMode eMode, + ::com::sun::star::chart2::PieChartOffsetMode eMode, bool bRings = false, sal_Int32 nDim = 2 ); virtual ~PieChartTypeTemplate(); @@ -116,31 +116,37 @@ protected: virtual void createAndAddAxes( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > & rCoordSys, + ::com::sun::star::chart2::XBoundedCoordinateSystem > & rCoordSys, const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XAxisContainer > & rOutAxisCnt ); + ::com::sun::star::chart2::XAxisContainer > & rOutAxisCnt ); + + virtual void createAndAddGrids( + const ::com::sun::star::uno::Reference< + ::com::sun::star::chart2::XBoundedCoordinateSystem > & rCoordSys, + const ::com::sun::star::uno::Reference< + ::com::sun::star::chart2::XGridContainer > & rOutGridCnt ); virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > + ::com::sun::star::chart2::XBoundedCoordinateSystem > createCoordinateSystem( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystemContainer > & xCoordSysCnt ); + ::com::sun::star::chart2::XBoundedCoordinateSystemContainer > & xCoordSysCnt ); virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeriesTreeParent > createDataSeriesTree( + ::com::sun::star::chart2::XDataSeriesTreeParent > createDataSeriesTree( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeries > >& aSeriesSeq, + ::com::sun::star::chart2::XDataSeries > >& aSeriesSeq, const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > & rCoordSys + ::com::sun::star::chart2::XBoundedCoordinateSystem > & rCoordSys ); virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType > getDefaultChartType() + ::com::sun::star::chart2::XChartType > getDefaultChartType() throw (::com::sun::star::uno::RuntimeException); private: - ::drafts::com::sun::star::chart2::PieChartOffsetMode + ::com::sun::star::chart2::PieChartOffsetMode m_ePieOffsetMode; bool m_bIsRingChart; }; diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index b2de9af06233..ad09e4a493c8 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ScatterChartType.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: bm $ $Date: 2003-11-20 18:12:25 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,12 +66,11 @@ #ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_CURVESTYLE_HPP_ -#include <drafts/com/sun/star/chart2/CurveStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_CURVESTYLE_HPP_ +#include <com/sun/star/chart2/CurveStyle.hpp> #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::com::sun::star::beans::Property; @@ -80,9 +79,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; -using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; - namespace { diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index 4b5430e58a16..19dc93745160 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ScatterChartType.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: bm $ $Date: 2003-11-20 18:12:25 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,8 +63,8 @@ #include "ChartType.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_CURVESTYLE_HPP_ -#include <drafts/com/sun/star/chart2/CurveStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_CURVESTYLE_HPP_ +#include <com/sun/star/chart2/CurveStyle.hpp> #endif namespace chart @@ -74,8 +74,8 @@ class ScatterChartType : public ChartType { public: ScatterChartType( sal_Int32 nDim = 2, - ::drafts::com::sun::star::chart2::CurveStyle eCurveStyle = - ::drafts::com::sun::star::chart2::CurveStyle_LINES, + ::com::sun::star::chart2::CurveStyle eCurveStyle = + ::com::sun::star::chart2::CurveStyle_LINES, sal_Int32 nResolution = 20, sal_Int32 nOrder = 3 ); virtual ~ScatterChartType(); diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index d59429677cfd..306e1ddf67a8 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ScatterChartTypeTemplate.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: bm $ $Date: 2003-12-15 15:00:36 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,11 +64,11 @@ #include "algohelper.hxx" #include "DataSeriesTreeHelper.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SYMBOLSTYLE_HPP_ -#include <drafts/com/sun/star/chart2/SymbolStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_SYMBOLSTYLE_HPP_ +#include <com/sun/star/chart2/SymbolStyle.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SYMBOL_HPP_ -#include <drafts/com/sun/star/chart2/Symbol.hpp> +#ifndef _COM_SUN_STAR_CHART2_SYMBOL_HPP_ +#include <com/sun/star/chart2/Symbol.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_LINESTYLE_HPP_ #include <com/sun/star/drawing/LineStyle.hpp> @@ -84,7 +84,6 @@ #include <algorithm> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -383,7 +382,7 @@ Sequence< OUString > ScatterChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "drafts.com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); return aServices; } diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.hxx b/chart2/source/model/template/ScatterChartTypeTemplate.hxx index 76c1d0e5a997..1eef4ef190c1 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.hxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ScatterChartTypeTemplate.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: bm $ $Date: 2003-12-15 15:00:36 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,11 +69,11 @@ #include <comphelper/uno3.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_STACKMODE_HPP_ -#include <drafts/com/sun/star/chart2/StackMode.hpp> +#ifndef _COM_SUN_STAR_CHART2_STACKMODE_HPP_ +#include <com/sun/star/chart2/StackMode.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_CURVESTYLE_HPP_ -#include <drafts/com/sun/star/chart2/CurveStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_CURVESTYLE_HPP_ +#include <com/sun/star/chart2/CurveStyle.hpp> #endif namespace chart @@ -89,7 +89,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, const ::rtl::OUString & rServiceName, - ::drafts::com::sun::star::chart2::CurveStyle eCurveStyle, + ::com::sun::star::chart2::CurveStyle eCurveStyle, bool bSymbols, bool bHasLines = true, sal_Int32 nDim = 2 ); @@ -115,24 +115,24 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ____ XChartTypeTemplate ____ - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XDiagram > SAL_CALL + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > SAL_CALL createDiagram( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeries > >& aSeriesSeq ) + ::com::sun::star::chart2::XDataSeries > >& aSeriesSeq ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram >& xDiagram ) + ::com::sun::star::chart2::XDiagram >& xDiagram ) throw (::com::sun::star::uno::RuntimeException); // ____ ChartTypeTemplate ____ virtual sal_Int32 getDimension() const; virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType > getDefaultChartType() + ::com::sun::star::chart2::XChartType > getDefaultChartType() throw (::com::sun::star::uno::RuntimeException); private: - ::drafts::com::sun::star::chart2::CurveStyle + ::com::sun::star::chart2::CurveStyle m_eCurveStyle; bool m_bHasSymbols; bool m_bHasLines; diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index 275674ece4f9..e4f2a5f33ade 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -2,9 +2,9 @@ * * $RCSfile: StockChartTypeTemplate.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: bm $ $Date: 2003-12-08 15:46:11 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,9 +63,17 @@ #include "macros.hxx" #include "algohelper.hxx" #include "DataSeriesTreeHelper.hxx" +#include "DataSeriesHelper.hxx" +#include "BarChartType.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SYMBOLSTYLE_HPP_ -#include <drafts/com/sun/star/chart2/SymbolStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_SYMBOLSTYLE_HPP_ +#include <com/sun/star/chart2/SymbolStyle.hpp> +#endif +#ifndef _COM_SUN_STAR_CHART2_XDATASEQUENCE_HPP_ +#include <com/sun/star/chart2/XDataSequence.hpp> +#endif +#ifndef _COM_SUN_STAR_CHART2_XDATASOURCE_HPP_ +#include <com/sun/star/chart2/XDataSource.hpp> #endif #ifndef CHART_PROPERTYHELPER_HXX @@ -78,7 +86,6 @@ #include <algorithm> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -88,6 +95,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; +// ---------------------------------------- namespace { @@ -171,6 +179,7 @@ const Sequence< Property > & lcl_GetPropertySequence() } } // anonymous namespace +// ---------------------------------------- namespace chart { @@ -250,16 +259,104 @@ uno::Reference< chart2::XChartType > StockChartTypeTemplate::getDefaultChartType return new LineChartType( 2, chart2::CurveStyle_LINES ); } -// ____ XChartTypeTemplate ____ -uno::Reference< chart2::XDiagram > SAL_CALL - StockChartTypeTemplate::createDiagram( - const uno::Sequence< uno::Reference< chart2::XDataSeries > >& aSeriesSeq ) - throw (uno::RuntimeException) +Reference< chart2::XDataSeriesTreeParent > StockChartTypeTemplate::createDataSeriesTree( + const Sequence< Reference< chart2::XDataSeries > > & aSeriesSeq, + const Reference< chart2::XBoundedCoordinateSystem > & rCoordSys ) { - // todo: create a stock chart! - return ChartTypeTemplate::createDiagram( aSeriesSeq ); + // create series tree nodes + // root + Reference< chart2::XDataSeriesTreeParent > aRoot( createRootNode()); + + bool bHasVolume, bHasOpenValue, bHasLowHighValues; + + getFastPropertyValue( PROP_STOCKCHARTTYPE_TEMPLATE_VOLUME ) >>= bHasVolume; + getFastPropertyValue( PROP_STOCKCHARTTYPE_TEMPLATE_OPEN ) >>= bHasOpenValue; + getFastPropertyValue( PROP_STOCKCHARTTYPE_TEMPLATE_LOW_HIGH ) >>= bHasLowHighValues; + + // Bars (Volume) + // ------------- + // chart type group + if( bHasVolume ) + { + Reference< chart2::XDataSeries > xVolumeSeries; + for( sal_Int32 i = 0; i < aSeriesSeq.getLength(); ++i ) + { + Reference< chart2::XDataSequence > xMatch( + DataSeriesHelper::getDataSequenceByRole( + uno::Reference< chart2::XDataSource >( aSeriesSeq[i], uno::UNO_QUERY ), + C2U( "volume" ))); + if( xMatch.is() ) + { + xVolumeSeries = aSeriesSeq[i]; + break; + } + } + Reference< chart2::XDataSeriesTreeNode > aBarNode( + createChartTypeGroup( new BarChartType() )); + + // 'x-axis' group + Reference< chart2::XDataSeriesTreeNode > aBarCategoryNode( + createScaleGroup( true /* bIsDiscrete */, + true /* bIsStackable */, + rCoordSys, 0, chart2::StackMode_STACKED )); + + // 'y-axis' group + Reference< chart2::XDataSeriesTreeNode > aBarValueNode( + createScaleGroup( false /* bIsDiscrete */, + true /* bIsStackable */, + rCoordSys, 1, chart2::StackMode_NONE )); + + Sequence< Reference< chart2::XDataSeries > > aBarSeq( 1 ); + aBarSeq[0] = xVolumeSeries; + addDataSeriesToGroup( aBarValueNode, aBarSeq ); + + // add value nodes to category nodes + attachNodeToNode( aBarCategoryNode, aBarValueNode ); + + // add category node to chart type node + attachNodeToNode( aBarNode, aBarCategoryNode ); + + // add chart type nodes to root of tree + aRoot->addChild( aBarNode ); + } + + // Lines + // ----- + // chart type group + Reference< chart2::XDataSeriesTreeNode > aLineNode( + createChartTypeGroup( new LineChartType() )); + + // 'x-axis' group + Reference< chart2::XDataSeriesTreeNode > aLineCategoryNode( + createScaleGroup( true, false, rCoordSys, 0, chart2::StackMode_STACKED )); + + // 'y-axis' group + Reference< chart2::XDataSeriesTreeNode > aLineValueNode( + createScaleGroup( false, false, rCoordSys, 1, chart2::StackMode_NONE )); + + // Build Tree + // ---------- + + // add series node to value nodes +// Sequence< Reference< chart2::XDataSeries > > aLineSeq( nNumberOfLines ); +// ::std::copy( aSeriesSeq.getConstArray() + nNumberOfBars, +// aSeriesSeq.getConstArray() + aSeriesSeq.getLength(), +// aLineSeq.getArray()); +// addDataSeriesToGroup( aLineValueNode, aLineSeq ); + + // add value nodes to category nodes +// attachNodeToNode( aLineCategoryNode, aLineValueNode ); + + // add category node to chart type node +// attachNodeToNode( aLineNode, aLineCategoryNode ); + + // add chart type nodes to root of tree +// aRoot->addChild( aLineNode ); + + return aRoot; } +// ____ XChartTypeTemplate ____ sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate( const uno::Reference< chart2::XDiagram >& xDiagram ) throw (uno::RuntimeException) @@ -276,7 +373,7 @@ Sequence< OUString > StockChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "drafts.com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); return aServices; } diff --git a/chart2/source/model/template/StockChartTypeTemplate.hxx b/chart2/source/model/template/StockChartTypeTemplate.hxx index 522254c9c16f..2f5213202796 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.hxx +++ b/chart2/source/model/template/StockChartTypeTemplate.hxx @@ -2,9 +2,9 @@ * * $RCSfile: StockChartTypeTemplate.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-11-21 14:18:05 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,20 +113,23 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ____ XChartTypeTemplate ____ - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XDiagram > SAL_CALL - createDiagram( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeries > >& aSeriesSeq ) - throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram >& xDiagram ) + ::com::sun::star::chart2::XDiagram >& xDiagram ) throw (::com::sun::star::uno::RuntimeException); // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType > getDefaultChartType() + ::com::sun::star::chart2::XChartType > getDefaultChartType() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::chart2::XDataSeriesTreeParent > createDataSeriesTree( + const ::com::sun::star::uno::Sequence< + ::com::sun::star::uno::Reference< + ::com::sun::star::chart2::XDataSeries > >& aSeriesSeq, + const ::com::sun::star::uno::Reference< + ::com::sun::star::chart2::XBoundedCoordinateSystem > & rCoordSys + ); private: }; diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx index 4ffc806c2f22..2e5eb574ef4c 100644 --- a/chart2/source/tools/ChartModelHelper.cxx +++ b/chart2/source/tools/ChartModelHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartModelHelper.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:53 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,11 +61,11 @@ #include "ChartModelHelper.hxx" #include "macros.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ -#include <drafts/com/sun/star/chart2/XChartDocument.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ +#include <com/sun/star/chart2/XChartDocument.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPEGROUP_HPP_ -#include <drafts/com/sun/star/chart2/XChartTypeGroup.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPEGROUP_HPP_ +#include <com/sun/star/chart2/XChartTypeGroup.hpp> #endif // header for define DBG_ASSERT @@ -78,7 +78,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; //static uno::Reference< XDiagram > ChartModelHelper::findDiagram( const uno::Reference< frame::XModel >& xModel ) diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index 0e1bc1c778d0..a87316a82ee8 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartTypeHelper.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: iha $ $Date: 2004-01-23 10:29:25 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,7 +76,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; sal_Bool ChartTypeHelper::isSupportingGeometryProperties( const uno::Reference< XChartType >& xChartType ) { diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx index f887a282b0c6..351b0d38fb69 100644 --- a/chart2/source/tools/CommonConverters.cxx +++ b/chart2/source/tools/CommonConverters.cxx @@ -2,9 +2,9 @@ * * $RCSfile: CommonConverters.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:53 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,8 +69,8 @@ #include <com/sun/star/text/WritingMode2.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XNUMERICALDATASEQUENCE_HPP_ -#include <drafts/com/sun/star/chart2/XNumericalDataSequence.hpp> +#ifndef _COM_SUN_STAR_CHART2_XNUMERICALDATASEQUENCE_HPP_ +#include <com/sun/star/chart2/XNumericalDataSequence.hpp> #endif #ifndef INCLUDED_RTL_MATH_HXX @@ -688,7 +688,7 @@ text::WritingMode WritingMode2ToWritingMode1( sal_Int16 nWritingMode2 ) } } -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; uno::Sequence< double > DataSequenceToDoubleSequence( const uno::Reference< XDataSequence > & xDataSequence ) diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 5f934aea8008..aa75f6779867 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DiagramHelper.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: bm $ $Date: 2004-01-19 14:41:36 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,12 +62,11 @@ #include "LegendHelper.hxx" #include "PropertyHelper.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTITLED_HPP_ -#include <drafts/com/sun/star/chart2/XTitled.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTITLED_HPP_ +#include <com/sun/star/chart2/XTitled.hpp> #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; namespace chart { diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index 46c146425df2..dc9f8a584612 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ErrorBar.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: bm $ $Date: 2003-12-15 15:52:18 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,8 +69,8 @@ #ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_ERRORBARSTYLE_HPP_ -#include <drafts/com/sun/star/chart2/ErrorBarStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_ERRORBARSTYLE_HPP_ +#include <com/sun/star/chart2/ErrorBarStyle.hpp> #endif #ifndef INCLUDED_RTL_MATH_HXX @@ -81,7 +81,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::rtl::OUStringBuffer; @@ -278,7 +277,7 @@ uno::Sequence< ::rtl::OUString > ErrorBar::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "drafts.com.sun.star.chart2.ErrorBar" ); + aServices[ 1 ] = C2U( "com.sun.star.chart2.ErrorBar" ); return aServices; } diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx index 104458bd839e..d7bff099002b 100644 --- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ExponentialRegressionCurveCalculator.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-17 14:52:08 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx index 6fd6a04b0f2d..2b58072c66aa 100644 --- a/chart2/source/tools/FillProperties.cxx +++ b/chart2/source/tools/FillProperties.cxx @@ -2,9 +2,9 @@ * * $RCSfile: FillProperties.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-11 09:15:20 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,22 +73,21 @@ #ifndef _COM_SUN_STAR_DRAWING_HATCH_HPP_ #include <com/sun/star/drawing/Hatch.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ -#include <drafts/com/sun/star/chart2/TransparencyStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ +#include <com/sun/star/chart2/TransparencyStyle.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_FILLBITMAP_HPP_ -#include <drafts/com/sun/star/chart2/FillBitmap.hpp> +#ifndef _COM_SUN_STAR_CHART2_FILLBITMAP_HPP_ +#include <com/sun/star/chart2/FillBitmap.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ -#include <drafts/com/sun/star/chart2/TransparencyStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ +#include <com/sun/star/chart2/TransparencyStyle.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_NUMBERFORMAT_HPP_ -#include <drafts/com/sun/star/chart2/NumberFormat.hpp> +#ifndef _COM_SUN_STAR_CHART2_NUMBERFORMAT_HPP_ +#include <com/sun/star/chart2/NumberFormat.hpp> #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::beans::Property; diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx index f1b57d41b524..59e7710502ad 100644 --- a/chart2/source/tools/LegendHelper.cxx +++ b/chart2/source/tools/LegendHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: LegendHelper.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: bm $ $Date: 2003-11-04 17:18:23 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,11 +61,11 @@ #include "LegendHelper.hxx" #include "macros.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ -#include <drafts/com/sun/star/chart2/XChartDocument.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ +#include <com/sun/star/chart2/XChartDocument.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XLEGEND_HPP_ -#include <drafts/com/sun/star/chart2/XLegend.hpp> +#ifndef _COM_SUN_STAR_CHART2_XLEGEND_HPP_ +#include <com/sun/star/chart2/XLegend.hpp> #endif #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ @@ -73,7 +73,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; //............................................................................. namespace chart @@ -129,7 +128,7 @@ void LegendHelper::defaultFillEmptyLegend( { uno::Reference< lang::XServiceInfo > xInfo( aChildren[ i ], uno::UNO_QUERY ); if( xInfo.is() && - xInfo->supportsService( C2U( "drafts.com.sun.star.chart2.ChartTypeGroup" ))) + xInfo->supportsService( C2U( "com.sun.star.chart2.ChartTypeGroup" ))) { uno::Reference< chart2::XLegendEntry > xEntry( xInfo, uno::UNO_QUERY ); if( xEntry.is()) diff --git a/chart2/source/tools/LineProperties.cxx b/chart2/source/tools/LineProperties.cxx index 6fceec531dd7..8ab4dee76895 100644 --- a/chart2/source/tools/LineProperties.cxx +++ b/chart2/source/tools/LineProperties.cxx @@ -2,9 +2,9 @@ * * $RCSfile: LineProperties.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-11 09:15:37 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,18 +77,17 @@ #include <com/sun/star/style/XStyle.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_FILLBITMAP_HPP_ -#include <drafts/com/sun/star/chart2/FillBitmap.hpp> +#ifndef _COM_SUN_STAR_CHART2_FILLBITMAP_HPP_ +#include <com/sun/star/chart2/FillBitmap.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ -#include <drafts/com/sun/star/chart2/TransparencyStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ +#include <com/sun/star/chart2/TransparencyStyle.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_NUMBERFORMAT_HPP_ -#include <drafts/com/sun/star/chart2/NumberFormat.hpp> +#ifndef _COM_SUN_STAR_CHART2_NUMBERFORMAT_HPP_ +#include <com/sun/star/chart2/NumberFormat.hpp> #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::beans::Property; diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx index 96affb11e4f0..6cf0178a934d 100644 --- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx @@ -2,9 +2,9 @@ * * $RCSfile: LinearRegressionCurveCalculator.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: bm $ $Date: 2003-12-17 16:43:14 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx index bd729b963573..5c68781fab3d 100644 --- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx @@ -2,9 +2,9 @@ * * $RCSfile: LogarithmicRegressionCurveCalculator.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: bm $ $Date: 2003-12-19 15:06:05 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx index fef9b7e45054..22ddafb60962 100644 --- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx @@ -2,9 +2,9 @@ * * $RCSfile: MeanValueRegressionCurveCalculator.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-17 14:21:01 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index 6501d9637dfc..349bc29f325d 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -2,9 +2,9 @@ * * $RCSfile: OPropertySet.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:32 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,8 +74,8 @@ using namespace ::com::sun::star; -using ::drafts::com::sun::star::style::XStyleSupplier; -// using ::drafts::com::sun::star::beans::XFastPropertyState; +using ::com::sun::star::style::XStyleSupplier; +// using ::com::sun::star::beans::XFastPropertyState; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx index 63235540bcd5..6c21fbc5a9b8 100644 --- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx @@ -2,9 +2,9 @@ * * $RCSfile: PotentialRegressionCurveCalculator.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-17 14:28:35 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,7 +67,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index d47717478ee8..529ab5277592 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: RegressionCurveHelper.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: bm $ $Date: 2003-12-19 15:05:06 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,8 +71,8 @@ #include "ChartModelHelper.hxx" #include "macros.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ -#include <drafts/com/sun/star/chart2/XChartDocument.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ +#include <com/sun/star/chart2/XChartDocument.hpp> #endif //............................................................................. @@ -81,7 +81,7 @@ namespace chart //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -241,7 +241,7 @@ void RegressionCurveHelper::initializeCurveCalculator( bXValuesFound = true; } else if( ! bYValuesFound && - aRole.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "values" ))) + aRole.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "y-values" ))) { aYValues = DataSequenceToDoubleSequence( aDataSeqs[i] ); bYValuesFound = true; diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index bed2692e029e..b555e27b7dde 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: RegressionCurveModel.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-17 16:38:18 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,7 +80,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::rtl::OUStringBuffer; @@ -240,7 +239,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL uno::Sequence< ::rtl::OUString > RegressionCurveModel::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 1 ); - aServices[ 0 ] = C2U( "drafts.com.sun.star.chart2.RegressionCurve" ); + aServices[ 0 ] = C2U( "com.sun.star.chart2.RegressionCurve" ); return aServices; } diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx index 805f28d146c2..264069581fc0 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -2,9 +2,9 @@ * * $RCSfile: RegressionCurveModel.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-17 16:37:58 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,11 +72,11 @@ #include <comphelper/uno3.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ -#include <drafts/com/sun/star/chart2/XIdentifiable.hpp> +#ifndef _COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ +#include <com/sun/star/chart2/XIdentifiable.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVE_HPP_ -#include <drafts/com/sun/star/chart2/XRegressionCurve.hpp> +#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVE_HPP_ +#include <com/sun/star/chart2/XRegressionCurve.hpp> #endif #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ @@ -97,8 +97,8 @@ namespace impl typedef ::cppu::WeakImplHelper4< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XServiceName, - ::drafts::com::sun::star::chart2::XRegressionCurve, - ::drafts::com::sun::star::chart2::XIdentifiable > + ::com::sun::star::chart2::XRegressionCurve, + ::com::sun::star::chart2::XIdentifiable > RegressionCurveModel_Base; } @@ -145,7 +145,7 @@ protected: // ____ XRegressionCurve ____ virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator() + ::com::sun::star::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index 517f57369051..ccb37aecb2af 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -2,9 +2,9 @@ * * $RCSfile: Scaling.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2003-12-15 19:39:46 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; LogarithmicScaling::LogarithmicScaling() : m_fBase( 10.0 ), diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index 282a25caa3c4..97669501a887 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: TitleHelper.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: bm $ $Date: 2003-12-09 09:52:23 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,8 +64,8 @@ #include "ContextHelper.hxx" #include "MeterHelper.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ -#include <drafts/com/sun/star/chart2/XChartDocument.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ +#include <com/sun/star/chart2/XChartDocument.hpp> #endif //............................................................................. @@ -74,7 +74,7 @@ namespace chart //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; rtl::OUString TitleHelper::getIdentifierForTitle( TitleHelper::eTitleType nTitleIndex ) { @@ -179,7 +179,7 @@ uno::Reference< XTitle > TitleHelper::createTitle( if(xNewContext.is() && xTitled.is()) { xTitle.set( xContext->getServiceManager()->createInstanceWithContext( - C2U( "drafts.com.sun.star.chart2.Title" ), + C2U( "com.sun.star.chart2.Title" ), xNewContext ), uno::UNO_QUERY ); if(xTitle.is()) @@ -222,7 +222,7 @@ void TitleHelper::setCompleteString( const rtl::OUString& rNewText { uno::Reference< uno::XInterface > xI( xContext->getServiceManager()->createInstanceWithContext( - C2U( "drafts.com.sun.star.chart2.FormattedString" ), xContext ) ); + C2U( "com.sun.star.chart2.FormattedString" ), xContext ) ); uno::Reference< XFormattedString > xFormattedString( xI, uno::UNO_QUERY ); if(xFormattedString.is()) diff --git a/chart2/source/tools/makefile.mk b/chart2/source/tools/makefile.mk index b52ec316f49e..ce4cf39e7942 100644 --- a/chart2/source/tools/makefile.mk +++ b/chart2/source/tools/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.17 $ # -# last change: $Author: iha $ $Date: 2004-01-23 10:29:25 $ +# last change: $Author: bm $ $Date: 2004-01-26 09:13:07 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -86,6 +86,7 @@ SLOFILES= \ $(SLO)$/MediaDescriptorHelper.obj \ $(SLO)$/CommonConverters.obj \ $(SLO)$/ContextHelper.obj \ + $(SLO)$/DataSeriesHelper.obj \ $(SLO)$/DataSeriesTreeHelper.obj \ $(SLO)$/DiagramHelper.obj \ $(SLO)$/ExponentialRegressionCurveCalculator.obj \ diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx index d47fa6d8a568..02b50039cafa 100644 --- a/chart2/source/view/axes/ScaleAutomatism.cxx +++ b/chart2/source/view/axes/ScaleAutomatism.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ScaleAutomatism.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2003-11-26 12:42:32 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,7 +79,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; ScaleAutomatism::ScaleAutomatism( const ScaleData& rSourceScale ) : m_fValueMinimum( 0.0 ) diff --git a/chart2/source/view/axes/TickmarkHelper.cxx b/chart2/source/view/axes/TickmarkHelper.cxx index ff01d39e53c2..536f0d61f06c 100644 --- a/chart2/source/view/axes/TickmarkHelper.cxx +++ b/chart2/source/view/axes/TickmarkHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: TickmarkHelper.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: iha $ $Date: 2004-01-22 19:20:32 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,7 +73,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; using namespace ::rtl::math; TickInfo::TickInfo() diff --git a/chart2/source/view/axes/TickmarkHelper.hxx b/chart2/source/view/axes/TickmarkHelper.hxx index 6cecd1610e36..5ca94b6387d1 100644 --- a/chart2/source/view/axes/TickmarkHelper.hxx +++ b/chart2/source/view/axes/TickmarkHelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: TickmarkHelper.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2004-01-22 19:20:33 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,11 +64,11 @@ #include "TickmarkProperties.hxx" #include "VAxisProperties.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_EXPLICITINCREMENTDATA_HPP_ -#include <drafts/com/sun/star/chart2/ExplicitIncrementData.hpp> +#ifndef _COM_SUN_STAR_CHART2_EXPLICITINCREMENTDATA_HPP_ +#include <com/sun/star/chart2/ExplicitIncrementData.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_EXPLICITSCALEDATA_HPP_ -#include <drafts/com/sun/star/chart2/ExplicitScaleData.hpp> +#ifndef _COM_SUN_STAR_CHART2_EXPLICITSCALEDATA_HPP_ +#include <com/sun/star/chart2/ExplicitScaleData.hpp> #endif @@ -112,7 +112,7 @@ struct TickInfo //methods: TickInfo(); void updateUnscaledValue( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XScaling >& xInverseScaling ); + ::com::sun::star::chart2::XScaling >& xInverseScaling ); }; class TickIter @@ -120,10 +120,10 @@ class TickIter public: TickIter( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& rTicks - , const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement + , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement , sal_Int32 nMinDepth=0, sal_Int32 nMaxDepth=-1 ); TickIter( ::std::vector< ::std::vector< TickInfo > >& rTickInfos - , const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement + , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement , sal_Int32 nMinDepth=0, sal_Int32 nMaxDepth=-1 ); virtual ~TickIter(); @@ -172,7 +172,7 @@ private: //member const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >* m_pSimpleTicks; ::std::vector< ::std::vector< TickInfo > >* m_pInfoTicks; - const ::drafts::com::sun::star::chart2::ExplicitIncrementData& m_rIncrement; + const ::com::sun::star::chart2::ExplicitIncrementData& m_rIncrement; //iteration from m_nMinDepth to m_nMaxDepth sal_Int32 m_nMinDepth; sal_Int32 m_nMaxDepth; @@ -190,16 +190,16 @@ class TickmarkHelper { public: TickmarkHelper( - const ::drafts::com::sun::star::chart2::ExplicitScaleData& rScale - , const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement ); + const ::com::sun::star::chart2::ExplicitScaleData& rScale + , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement ); virtual ~TickmarkHelper(); void getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const; bool isPostEquidistant( sal_Int32 nDepth ) const; // - static double getMinimumAtIncrement( double fMin, const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement ); - static double getMaximumAtIncrement( double fMax, const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement ); + static double getMinimumAtIncrement( double fMin, const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement ); + static double getMaximumAtIncrement( double fMax, const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement ); double getScaledWidth() const; @@ -219,10 +219,10 @@ protected: //methods virtual void hideIdenticalScreenValues( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const {} protected: //member - const ::drafts::com::sun::star::chart2::ExplicitScaleData& m_rScale; - const ::drafts::com::sun::star::chart2::ExplicitIncrementData& m_rIncrement; + const ::com::sun::star::chart2::ExplicitScaleData& m_rScale; + const ::com::sun::star::chart2::ExplicitIncrementData& m_rIncrement; - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XScaling > + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > m_xInverseScaling; double* m_pfCurrentValues; //major-tick positions that may lay outside the visible range but complete partly visible intervals at the borders @@ -240,8 +240,8 @@ class TickmarkHelper_2D : public TickmarkHelper { public: TickmarkHelper_2D( - const ::drafts::com::sun::star::chart2::ExplicitScaleData& rScale - , const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement + const ::com::sun::star::chart2::ExplicitScaleData& rScale + , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement , const Vector2D& rStartScreenPos, const Vector2D& rEndScreenPos ); //, double fStrech_SceneToScreen, double fOffset_SceneToScreen ); virtual ~TickmarkHelper_2D(); @@ -273,8 +273,8 @@ class TickmarkHelper_3D : public TickmarkHelper { public: TickmarkHelper_3D( - const ::drafts::com::sun::star::chart2::ExplicitScaleData& rScale - , const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement ); + const ::com::sun::star::chart2::ExplicitScaleData& rScale + , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement ); virtual ~TickmarkHelper_3D(); }; diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index f1a354d71bc6..3f6a9159fedf 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VAxisProperties.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: iha $ $Date: 2004-01-23 10:06:56 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,7 +85,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; sal_Int32 lcl_calcTickLengthForDepth(sal_Int32 nDepth,sal_Int32 nTickmarkStyle) { diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx index f9242a1491c3..ce14379ca212 100644 --- a/chart2/source/view/axes/VAxisProperties.hxx +++ b/chart2/source/view/axes/VAxisProperties.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VAxisProperties.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: iha $ $Date: 2004-01-23 10:06:57 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,11 +65,11 @@ #include "PlottingPositionHelper.hxx" #include "LabelAlignment.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_NUMBERFORMAT_HPP_ -#include <drafts/com/sun/star/chart2/NumberFormat.hpp> +#ifndef _COM_SUN_STAR_CHART2_NUMBERFORMAT_HPP_ +#include <com/sun/star/chart2/NumberFormat.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XAXIS_HPP_ -#include <drafts/com/sun/star/chart2/XAxis.hpp> +#ifndef _COM_SUN_STAR_CHART2_XAXIS_HPP_ +#include <com/sun/star/chart2/XAxis.hpp> #endif #ifndef _COM_SUN_STAR_AWT_SIZE_HPP_ @@ -112,7 +112,7 @@ struct AxisLabelProperties { AxisLabelProperties(); - drafts::com::sun::star::chart2::NumberFormat aNumberFormat; + ::com::sun::star::chart2::NumberFormat aNumberFormat; AxisLabelStaggering eStaggering; @@ -127,14 +127,14 @@ struct AxisLabelProperties //methods: void init( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XAxis >& xAxisModel ); + ::com::sun::star::chart2::XAxis >& xAxisModel ); sal_Bool getIsStaggered() const; }; struct AxisProperties { - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XAxis > m_xAxisModel; + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > m_xAxisModel; ::com::sun::star::awt::Size m_aReferenceSize; bool m_bIsMainAxis;//not secondary axis @@ -164,7 +164,7 @@ struct AxisProperties //methods: - AxisProperties( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XAxis >& xAxisModel + AxisProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxisModel , const ::com::sun::star::awt::Size& rReferenceSize ); AxisProperties( const AxisProperties& rAxisProperties ); virtual ~AxisProperties(); diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 5bc0060777e1..239c38373e04 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VCartesianAxis.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: iha $ $Date: 2004-01-23 10:06:57 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,8 +70,8 @@ #include "LabelPositionHelper.hxx" #include "DoubleRectangle.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ -#include <drafts/com/sun/star/chart2/XIdentifiable.hpp> +#ifndef _COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ +#include <com/sun/star/chart2/XIdentifiable.hpp> #endif #ifndef INCLUDED_RTL_MATH_HXX @@ -102,7 +102,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; using namespace ::rtl::math; void lcl_correctRotation_Left( double& rfXCorrection, double& rfYCorrection @@ -403,7 +403,7 @@ class LabelIterator : private TickIter public: LabelIterator( ::std::vector< ::std::vector< TickInfo > >& rTickInfos - , const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement + , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement , const AxisLabelStaggering eAxisLabelStaggering , bool bInnerLine , sal_Int32 nMinDepth=0, sal_Int32 nMaxDepth=-1 ); @@ -420,7 +420,7 @@ private: //member }; LabelIterator::LabelIterator( ::std::vector< ::std::vector< TickInfo > >& rTickInfos - , const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement + , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement , const AxisLabelStaggering eAxisLabelStaggering , bool bInnerLine , sal_Int32 nMinDepth, sal_Int32 nMaxDepth ) @@ -795,7 +795,6 @@ void SAL_CALL VCartesianAxis::createShapes() double fExtraLineCrossesOtherAxis; if( getLogicValueWhereExtraLineCrossesOtherAxis(fExtraLineCrossesOtherAxis) ) { - Vector2D aStart, aEnd; this->get2DAxisMainLine( aStart, aEnd, fExtraLineCrossesOtherAxis ); drawing::PointSequenceSequence aPoints( lcl_makePointSequence(aStart,aEnd) ); uno::Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx index 0f9b4c79ec3c..984ab8e835e6 100644 --- a/chart2/source/view/axes/VCartesianAxis.hxx +++ b/chart2/source/view/axes/VCartesianAxis.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VCartesianAxis.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2004-01-22 19:20:34 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -101,7 +101,7 @@ public: /* virtual ::rtl::OUString SAL_CALL getCoordinateSystemTypeID( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); */ virtual void SAL_CALL createShapes(); diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index 135d1a8be602..11c6f5939923 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VCartesianCoordinateSystem.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2004-01-22 19:20:34 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; VCartesianCoordinateSystem::VCartesianCoordinateSystem( const uno::Reference< XBoundedCoordinateSystem >& xCooSys ) : VCoordinateSystem(xCooSys) diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx index 7f073a94971b..e180777f0aaa 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VCartesianCoordinateSystem.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:56 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,7 @@ class VCartesianCoordinateSystem : public VCoordinateSystem { public: VCartesianCoordinateSystem( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem >& xCooSys ); + ::com::sun::star::chart2::XBoundedCoordinateSystem >& xCooSys ); virtual ~VCartesianCoordinateSystem(); virtual void createGridShapes(); diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx index 4b238c13f4d3..2da94f7da7e9 100644 --- a/chart2/source/view/axes/VCartesianGrid.cxx +++ b/chart2/source/view/axes/VCartesianGrid.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VCartesianGrid.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2004-01-22 19:20:35 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,8 +66,8 @@ #include "macros.hxx" #include "CommonConverters.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ -#include <drafts/com/sun/star/chart2/XIdentifiable.hpp> +#ifndef _COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ +#include <com/sun/star/chart2/XIdentifiable.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_POINTSEQUENCESEQUENCE_HPP_ #include <com/sun/star/drawing/PointSequenceSequence.hpp> @@ -84,7 +84,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; struct GridLinePoints { diff --git a/chart2/source/view/axes/VCartesianGrid.hxx b/chart2/source/view/axes/VCartesianGrid.hxx index 010a30a4f2c0..66c2db5065c5 100644 --- a/chart2/source/view/axes/VCartesianGrid.hxx +++ b/chart2/source/view/axes/VCartesianGrid.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VCartesianGrid.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:57 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,8 +64,8 @@ #include "VMeterBase.hxx" #include "VLineProperties.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XGRID_HPP_ -#include <drafts/com/sun/star/chart2/XGrid.hpp> +#ifndef _COM_SUN_STAR_CHART2_XGRID_HPP_ +#include <com/sun/star/chart2/XGrid.hpp> #endif //............................................................................. @@ -84,7 +84,7 @@ class VCartesianGrid : public VMeterBase //------------------------------------------------------------------------- public: VCartesianGrid( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XGrid >& xGrid + ::com::sun::star::chart2::XGrid >& xGrid , sal_Int32 nDimensionCount ); virtual ~VCartesianGrid(); diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 6b48d8397c28..0a06f51a6a76 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VCoordinateSystem.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:57 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,7 +76,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; //static VCoordinateSystem* VCoordinateSystem::createCoordinateSystem( const uno::Reference< diff --git a/chart2/source/view/axes/VPolarAxis.cxx b/chart2/source/view/axes/VPolarAxis.cxx index be9e6d9edab0..e1abeb8eddcc 100644 --- a/chart2/source/view/axes/VPolarAxis.cxx +++ b/chart2/source/view/axes/VPolarAxis.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VPolarAxis.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: iha $ $Date: 2004-01-23 10:06:59 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,8 +87,8 @@ #ifndef _COM_SUN_STAR_TEXT_XTEXT_HPP_ #include <com/sun/star/text/XText.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ -#include <drafts/com/sun/star/chart2/XIdentifiable.hpp> +#ifndef _COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ +#include <com/sun/star/chart2/XIdentifiable.hpp> #endif #ifndef _SVX_UNOPRNMS_HXX @@ -103,7 +103,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; using namespace ::rtl::math; VPolarAxis::VPolarAxis( const AxisProperties& rAxisProperties diff --git a/chart2/source/view/axes/VPolarAxis.hxx b/chart2/source/view/axes/VPolarAxis.hxx index b4620415094f..e058a4a6d252 100644 --- a/chart2/source/view/axes/VPolarAxis.hxx +++ b/chart2/source/view/axes/VPolarAxis.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VPolarAxis.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2004-01-22 19:20:35 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,7 +88,7 @@ public: virtual void SAL_CALL createShapes(); void setIncrements( const ::com::sun::star::uno::Sequence< - ::drafts::com::sun::star::chart2::ExplicitIncrementData >& rIncrements ); + ::com::sun::star::chart2::ExplicitIncrementData >& rIncrements ); private: //methods void create2DAngleAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget, ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ); @@ -99,7 +99,7 @@ private: //member NumberFormatterWrapper* m_pNumberFormatterWrapper; PolarPlottingPositionHelper* m_pPosHelper; ::com::sun::star::uno::Sequence< - ::drafts::com::sun::star::chart2::ExplicitIncrementData > m_aIncrements; + ::com::sun::star::chart2::ExplicitIncrementData > m_aIncrements; }; //............................................................................. diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/chart2/source/view/axes/VPolarCoordinateSystem.cxx index 30f478e740a7..3f0d57348fd0 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VPolarCoordinateSystem.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: iha $ $Date: 2004-01-22 19:20:35 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,7 +67,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; VPolarCoordinateSystem::VPolarCoordinateSystem( const uno::Reference< XBoundedCoordinateSystem >& xCooSys ) : VCoordinateSystem(xCooSys) diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.hxx b/chart2/source/view/axes/VPolarCoordinateSystem.hxx index 61ba559fad76..92ae04e70c17 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.hxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VPolarCoordinateSystem.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:59 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,7 @@ class VPolarCoordinateSystem : public VCoordinateSystem { public: VPolarCoordinateSystem( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem >& xCooSys ); + ::com::sun::star::chart2::XBoundedCoordinateSystem >& xCooSys ); virtual ~VPolarCoordinateSystem(); virtual void createGridShapes(); diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index e434629294c8..8482bc9b4b6e 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VPolarGrid.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: iha $ $Date: 2004-01-23 16:35:28 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,8 +67,8 @@ #include "macros.hxx" #include "CommonConverters.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ -#include <drafts/com/sun/star/chart2/XIdentifiable.hpp> +#ifndef _COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ +#include <com/sun/star/chart2/XIdentifiable.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_LINESTYLE_HPP_ #include <com/sun/star/drawing/LineStyle.hpp> @@ -82,7 +82,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; VPolarGrid::VPolarGrid( const uno::Reference< XGrid >& xGrid, sal_Int32 nDimensionCount ) : VMeterBase( uno::Reference<XMeter>::query(xGrid), nDimensionCount ) diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx index 92f463f78dbf..707bba14fc24 100644 --- a/chart2/source/view/axes/VPolarGrid.hxx +++ b/chart2/source/view/axes/VPolarGrid.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VPolarGrid.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:10:00 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,8 +65,8 @@ #include "TickmarkHelper.hxx" #include "VLineProperties.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XGRID_HPP_ -#include <drafts/com/sun/star/chart2/XGrid.hpp> +#ifndef _COM_SUN_STAR_CHART2_XGRID_HPP_ +#include <com/sun/star/chart2/XGrid.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_POINTSEQUENCESEQUENCE_HPP_ @@ -90,27 +90,27 @@ class VPolarGrid : public VMeterBase //------------------------------------------------------------------------- public: VPolarGrid( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XGrid >& xGrid + ::com::sun::star::chart2::XGrid >& xGrid , sal_Int32 nDimensionCount ); virtual ~VPolarGrid(); virtual void SAL_CALL createShapes(); void setIncrements( const ::com::sun::star::uno::Sequence< - ::drafts::com::sun::star::chart2::ExplicitIncrementData >& rIncrements ); + ::com::sun::star::chart2::ExplicitIncrementData >& rIncrements ); static void createLinePointSequence_ForAngleAxis( ::com::sun::star::drawing::PointSequenceSequence& rPoints , ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos - , const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement - , const ::drafts::com::sun::star::chart2::ExplicitScaleData& rScale + , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement + , const ::com::sun::star::chart2::ExplicitScaleData& rScale , PolarPlottingPositionHelper* pPosHelper , double fLogicRadius, double fLogicZ ); private: //member PolarPlottingPositionHelper* m_pPosHelper; ::com::sun::star::uno::Sequence< - ::drafts::com::sun::star::chart2::ExplicitIncrementData > m_aIncrements; + ::com::sun::star::chart2::ExplicitIncrementData > m_aIncrements; void getAllTickInfos( sal_Int32 nDimensionIndex, ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const; diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 4790069a0115..aa3677d632d7 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -12,8 +12,8 @@ #include "LabelPositionHelper.hxx" #include "Clipping.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SYMBOL_HPP_ -#include <drafts/com/sun/star/chart2/Symbol.hpp> +#ifndef _COM_SUN_STAR_CHART2_SYMBOL_HPP_ +#include <com/sun/star/chart2/Symbol.hpp> #endif #ifndef _TOOLS_DEBUG_HXX @@ -46,7 +46,7 @@ namespace chart //............................................................................. using namespace ::com::sun::star; using namespace ::rtl::math; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx index 111923895d9d..58ee79e5be4c 100644 --- a/chart2/source/view/charttypes/AreaChart.hxx +++ b/chart2/source/view/charttypes/AreaChart.hxx @@ -3,8 +3,8 @@ #include "VSeriesPlotter.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_CURVESTYLE_HPP_ -#include <drafts/com/sun/star/chart2/CurveStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_CURVESTYLE_HPP_ +#include <com/sun/star/chart2/CurveStyle.hpp> #endif //............................................................................. @@ -20,7 +20,7 @@ class AreaChart : public VSeriesPlotter //------------------------------------------------------------------------- public: AreaChart( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType >& xChartTypeModel + ::com::sun::star::chart2::XChartType >& xChartTypeModel , bool bCategoryXAxis, bool bNoArea=false , PlottingPositionHelper* pPlottingPositionHelper=NULL //takes owner ship ); @@ -33,8 +33,8 @@ public: virtual void SAL_CALL createShapes(); /* virtual ::rtl::OUString SAL_CALL getCoordinateSystemTypeID( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< ::drafts::com::sun::star::chart2::ExplicitScaleData >& rScales ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData >& rScales ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); */ virtual void addSeries( VDataSeries* pSeries, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); @@ -67,7 +67,7 @@ private: //member bool m_bSymbol; //Properties for splines: - ::drafts::com::sun::star::chart2::CurveStyle m_eCurveStyle; + ::com::sun::star::chart2::CurveStyle m_eCurveStyle; sal_Int32 m_nCurveResolution; sal_Int32 m_nSplineOrder; diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 9a665c6e51be..74c880bcd8a0 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -21,8 +21,8 @@ // #define TRANSP_GRADIENT_HACK 1 #ifdef TRANSP_GRADIENT_HACK -# ifndef _DRAFTS_COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ -# include <drafts/com/sun/star/chart2/TransparencyStyle.hpp> +# ifndef _COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ +# include <com/sun/star/chart2/TransparencyStyle.hpp> # endif # ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ # include <com/sun/star/container/XNameContainer.hpp> @@ -35,7 +35,7 @@ namespace chart //............................................................................. using namespace ::com::sun::star; using namespace ::rtl::math; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; class BarPositionHelper : public CategoryPositionHelper, public PlottingPositionHelper { @@ -43,7 +43,7 @@ public: BarPositionHelper( double fSeriesCount=0 ); //@todo virtual ~BarPositionHelper(); - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation > + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > getTransformationLogicToScene() const; void updateSeriesCount( double fSeriesCount ); /*only enter the size of x stacked series*/ @@ -232,9 +232,9 @@ uno::Reference< drawing::XShape > BarChart::createDataPoint2D_Bar( // FillTransparenceGradientName to an empty string // Note: TransparencyStyle should become a new property in FillProperties // (FillTransparenceStyle) - ::drafts::com::sun::star::chart2::TransparencyStyle aTransStyle; + ::com::sun::star::chart2::TransparencyStyle aTransStyle; xObjectProperties->getPropertyValue( C2U( "TransparencyStyle" )) >>= aTransStyle; - if( aTransStyle != ::drafts::com::sun::star::chart2::TransparencyStyle_GRADIENT ) + if( aTransStyle != ::com::sun::star::chart2::TransparencyStyle_GRADIENT ) { xProp->setPropertyValue( C2U( "FillTransparenceGradientName" ), uno::makeAny( ::rtl::OUString())); diff --git a/chart2/source/view/charttypes/BarChart.hxx b/chart2/source/view/charttypes/BarChart.hxx index f0ab7008a7e3..6d337919b278 100644 --- a/chart2/source/view/charttypes/BarChart.hxx +++ b/chart2/source/view/charttypes/BarChart.hxx @@ -23,7 +23,7 @@ class BarChart : public VSeriesPlotter //------------------------------------------------------------------------- public: BarChart( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType >& xChartTypeModel ); + ::com::sun::star::chart2::XChartType >& xChartTypeModel ); virtual ~BarChart(); //------------------------------------------------------------------------- @@ -33,8 +33,8 @@ public: virtual void SAL_CALL createShapes(); /* virtual ::rtl::OUString SAL_CALL getCoordinateSystemTypeID( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< ::drafts::com::sun::star::chart2::ExplicitScaleData >& rScales ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData >& rScales ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); */ //------------------------------------------------------------------------- diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.cxx b/chart2/source/view/charttypes/CategoryPositionHelper.cxx index bb6001be36f8..42ce0df69276 100644 --- a/chart2/source/view/charttypes/CategoryPositionHelper.cxx +++ b/chart2/source/view/charttypes/CategoryPositionHelper.cxx @@ -7,7 +7,7 @@ namespace chart { //............................................................................. //using namespace ::com::sun::star; -//using namespace ::drafts::com::sun::star::chart2; +//using namespace ::com::sun::star::chart2; CategoryPositionHelper::CategoryPositionHelper( double fSeriesCount, double fCategoryWidth ) : m_fSeriesCount(fSeriesCount) diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index 41dd3b097598..486f8f26b706 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -21,7 +21,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; class PiePositionHelper : public PolarPlottingPositionHelper { diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx index d6aa084d957e..e0d002e01cc1 100644 --- a/chart2/source/view/charttypes/PieChart.hxx +++ b/chart2/source/view/charttypes/PieChart.hxx @@ -16,7 +16,7 @@ class PieChart : public VSeriesPlotter //------------------------------------------------------------------------- public: PieChart( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType >& xChartTypeModel + ::com::sun::star::chart2::XChartType >& xChartTypeModel , double fRadiusOffset=0.0, double fRingDistance=0.0 ); virtual ~PieChart(); @@ -27,8 +27,8 @@ public: virtual void SAL_CALL createShapes(); /* virtual ::rtl::OUString SAL_CALL getCoordinateSystemTypeID( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< ::drafts::com::sun::star::chart2::ExplicitScaleData >& rScales ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData >& rScales ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); */ virtual void addSeries( VDataSeries* pSeries, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index df68f1357455..70a76eceaa08 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -16,11 +16,11 @@ #include "AreaChart.hxx" // -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_ERRORBARSTYLE_HPP_ -#include <drafts/com/sun/star/chart2/ErrorBarStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_ERRORBARSTYLE_HPP_ +#include <com/sun/star/chart2/ErrorBarStyle.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVECONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XRegressionCurveContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVECONTAINER_HPP_ +#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #endif #ifndef _SVX_UNOPRNMS_HXX @@ -48,7 +48,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index b4c29ce9ef61..3831db937938 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VDiagram.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: iha $ $Date: 2003-12-04 16:00:23 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,8 +85,8 @@ #ifndef _COM_SUN_STAR_DRAWING_SHADEMODE_HPP_ #include <com/sun/star/drawing/ShadeMode.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SCENEDESCRIPTOR_HPP_ -#include <drafts/com/sun/star/chart2/SceneDescriptor.hpp> +#ifndef _COM_SUN_STAR_CHART2_SCENEDESCRIPTOR_HPP_ +#include <com/sun/star/chart2/SceneDescriptor.hpp> #endif @@ -113,7 +113,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; VDiagram::VDiagram( const uno::Reference< XDiagram > & xDiagram, @@ -466,7 +466,7 @@ void VDiagram::createShapes_3d( const awt::Point& rPos, const awt::Size& rReserv //------------------------------------------------------------------------- //create additional group to manipulate the aspect ratio of the whole diagram: { - uno::Reference< beans::XPropertySet > xProp( xOuterGroup_Shapes, uno::UNO_QUERY ); + xProp.set( xOuterGroup_Shapes, uno::UNO_QUERY ); DBG_ASSERT(xProp.is(), "created shape offers no XPropertySet"); if( xProp.is()) { diff --git a/chart2/source/view/inc/Linear3DTransformation.hxx b/chart2/source/view/inc/Linear3DTransformation.hxx index 7fe7bb652cf9..6d2cab88fd86 100644 --- a/chart2/source/view/inc/Linear3DTransformation.hxx +++ b/chart2/source/view/inc/Linear3DTransformation.hxx @@ -2,9 +2,9 @@ * * $RCSfile: Linear3DTransformation.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:33 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,8 +65,8 @@ #include <cppuhelper/implbase1.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTRANSFORMATION_HPP_ -#include <drafts/com/sun/star/chart2/XTransformation.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTRANSFORMATION_HPP_ +#include <com/sun/star/chart2/XTransformation.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_HOMOGENMATRIX_HPP_ @@ -77,7 +77,7 @@ namespace chart { class Linear3DTransformation : public ::cppu::WeakImplHelper1< - ::drafts::com::sun::star::chart2::XTransformation + ::com::sun::star::chart2::XTransformation > { public: @@ -85,15 +85,15 @@ public: virtual ~Linear3DTransformation(); // ____ XTransformation ____ - /// @see ::drafts::com::sun::star::chart2::XTransformation + /// @see ::com::sun::star::chart2::XTransformation virtual ::com::sun::star::uno::Sequence< double > SAL_CALL transform( const ::com::sun::star::uno::Sequence< double >& rSourceValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - /// @see ::drafts::com::sun::star::chart2::XTransformation + /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getSourceDimension() throw (::com::sun::star::uno::RuntimeException); - /// @see ::drafts::com::sun::star::chart2::XTransformation + /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getTargetDimension() throw (::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx index c81e70c6406a..bc95fd1a04cb 100644 --- a/chart2/source/view/inc/PlotterBase.hxx +++ b/chart2/source/view/inc/PlotterBase.hxx @@ -2,9 +2,9 @@ * * $RCSfile: PlotterBase.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: iha $ $Date: 2004-01-23 14:48:23 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,15 +89,15 @@ #include <vector> //---- chart2 -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_EXPLICITSCALEDATA_HPP_ -#include <drafts/com/sun/star/chart2/ExplicitScaleData.hpp> +#ifndef _COM_SUN_STAR_CHART2_EXPLICITSCALEDATA_HPP_ +#include <com/sun/star/chart2/ExplicitScaleData.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTRANSFORMATION_HPP_ -#include <drafts/com/sun/star/chart2/XTransformation.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTRANSFORMATION_HPP_ +#include <com/sun/star/chart2/XTransformation.hpp> #endif /* #ifndef _COM_SUN_STAR_CHART2_XPLOTTER_HPP_ -#include <drafts/com/sun/star/chart2/XPlotter.hpp> +#include <com/sun/star/chart2/XPlotter.hpp> #endif */ @@ -136,7 +136,7 @@ public: virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< - ::drafts::com::sun::star::chart2::ExplicitScaleData >& rScales ) + ::com::sun::star::chart2::ExplicitScaleData >& rScales ) throw (::com::sun::star::uno::RuntimeException); void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); @@ -145,7 +145,7 @@ public: /* virtual ::rtl::OUString SAL_CALL getCoordinateSystemTypeID( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); */ //------------------------------------------------------------------------- diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index 1092d54798b6..37ac7a791041 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: PlottingPositionHelper.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: iha $ $Date: 2004-01-23 14:48:23 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,11 +63,11 @@ #include "DoubleRectangle.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_EXPLICITSCALEDATA_HPP_ -#include <drafts/com/sun/star/chart2/ExplicitScaleData.hpp> +#ifndef _COM_SUN_STAR_CHART2_EXPLICITSCALEDATA_HPP_ +#include <com/sun/star/chart2/ExplicitScaleData.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTRANSFORMATION_HPP_ -#include <drafts/com/sun/star/chart2/XTransformation.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTRANSFORMATION_HPP_ +#include <com/sun/star/chart2/XTransformation.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_HOMOGENMATRIX_HPP_ @@ -107,15 +107,15 @@ public: void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix); void setScales( const ::com::sun::star::uno::Sequence< - ::drafts::com::sun::star::chart2::ExplicitScaleData >& rScales ); + ::com::sun::star::chart2::ExplicitScaleData >& rScales ); const ::com::sun::star::uno::Sequence< - ::drafts::com::sun::star::chart2::ExplicitScaleData >& getScales() const; + ::com::sun::star::chart2::ExplicitScaleData >& getScales() const; inline bool isLogicVisible( double fX, double fY, double fZ ) const; inline void doLogicScaling( double* pX, double* pY, double* pZ ) const; inline void clipLogicValues( double* pX, double* pY, double* pZ ) const; - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation > + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > getTransformationLogicToScene() const; virtual ::com::sun::star::drawing::Position3D @@ -138,25 +138,25 @@ public: protected: //member ::com::sun::star::uno::Sequence< - ::drafts::com::sun::star::chart2::ExplicitScaleData > m_aScales; + ::com::sun::star::chart2::ExplicitScaleData > m_aScales; Matrix4D m_aMatrixScreenToScene; //this is calculated based on m_aScales and m_aMatrixScreenToScene mutable ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTransformation > m_xTransformationLogicToScene; + ::com::sun::star::chart2::XTransformation > m_xTransformationLogicToScene; }; class PolarPlottingPositionHelper : public PlottingPositionHelper /* , public ::cppu::WeakImplHelper1< - ::drafts::com::sun::star::chart2::XTransformation > + ::com::sun::star::chart2::XTransformation > */ { public: PolarPlottingPositionHelper( bool bRadiusAxisMapsToFirstDimension ); virtual ~PolarPlottingPositionHelper(); - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation > + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > getTransformationLogicToScene() const; //the resulting values should be used for input to the transformation @@ -176,15 +176,15 @@ public: /* // ____ XTransformation ____ - /// @see ::drafts::com::sun::star::chart2::XTransformation + /// @see ::com::sun::star::chart2::XTransformation virtual ::com::sun::star::uno::Sequence< double > SAL_CALL transform( const ::com::sun::star::uno::Sequence< double >& rSourceValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - /// @see ::drafts::com::sun::star::chart2::XTransformation + /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getSourceDimension() throw (::com::sun::star::uno::RuntimeException); - /// @see ::drafts::com::sun::star::chart2::XTransformation + /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getTargetDimension() throw (::com::sun::star::uno::RuntimeException); */ @@ -269,15 +269,15 @@ inline double PlottingPositionHelper::getLogicMaxZ() const } inline bool PlottingPositionHelper::isMathematicalOrientationX() const { - return ::drafts::com::sun::star::chart2::AxisOrientation_MATHEMATICAL == m_aScales[0].Orientation; + return ::com::sun::star::chart2::AxisOrientation_MATHEMATICAL == m_aScales[0].Orientation; } inline bool PlottingPositionHelper::isMathematicalOrientationY() const { - return ::drafts::com::sun::star::chart2::AxisOrientation_MATHEMATICAL == m_aScales[1].Orientation; + return ::com::sun::star::chart2::AxisOrientation_MATHEMATICAL == m_aScales[1].Orientation; } inline bool PlottingPositionHelper::isMathematicalOrientationZ() const { - return ::drafts::com::sun::star::chart2::AxisOrientation_MATHEMATICAL == m_aScales[2].Orientation; + return ::com::sun::star::chart2::AxisOrientation_MATHEMATICAL == m_aScales[2].Orientation; } //............................................................................. diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index 2d395124726a..bddd4e09a0a1 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VCoordinateSystem.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:10:04 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,17 +61,17 @@ #ifndef _CHART2_VCOORDINATESYSTEM_HXX #define _CHART2_VCOORDINATESYSTEM_HXX -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_EXPLICITINCREMENTDATA_HPP_ -#include <drafts/com/sun/star/chart2/ExplicitIncrementData.hpp> +#ifndef _COM_SUN_STAR_CHART2_EXPLICITINCREMENTDATA_HPP_ +#include <com/sun/star/chart2/ExplicitIncrementData.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_EXPLICITSCALEDATA_HPP_ -#include <drafts/com/sun/star/chart2/ExplicitScaleData.hpp> +#ifndef _COM_SUN_STAR_CHART2_EXPLICITSCALEDATA_HPP_ +#include <com/sun/star/chart2/ExplicitScaleData.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XAXIS_HPP_ -#include <drafts/com/sun/star/chart2/XAxis.hpp> +#ifndef _COM_SUN_STAR_CHART2_XAXIS_HPP_ +#include <com/sun/star/chart2/XAxis.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XGRID_HPP_ -#include <drafts/com/sun/star/chart2/XGrid.hpp> +#ifndef _COM_SUN_STAR_CHART2_XGRID_HPP_ +#include <com/sun/star/chart2/XGrid.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_HOMOGENMATRIX_HPP_ @@ -83,8 +83,8 @@ #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #endif -// #ifndef _DRAFTS_COM_SUN_STAR_CHART2_XBOUNDEDCOORDINATESYSTEMCONTAINER_HPP_ -// #include <drafts/com/sun/star/chart2/XBoundedCoordinateSystemContainer.hpp> +// #ifndef _COM_SUN_STAR_CHART2_XBOUNDEDCOORDINATESYSTEMCONTAINER_HPP_ +// #include <com/sun/star/chart2/XBoundedCoordinateSystemContainer.hpp> // #endif //............................................................................. @@ -104,7 +104,7 @@ public: virtual ~VCoordinateSystem(); static VCoordinateSystem* createCoordinateSystem( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem >& xCooSysModel ); + ::com::sun::star::chart2::XBoundedCoordinateSystem >& xCooSysModel ); virtual void SAL_CALL initPlottingTargets( const ::com::sun::star::uno::Reference< @@ -115,18 +115,18 @@ public: ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) throw (::com::sun::star::uno::RuntimeException); void setOrigin( double* fCoordinateOrigin ); - void addAxis( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XAxis >& xAxis ); - void addGrid( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XGrid >& xGrid ); + void addAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis ); + void addGrid( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XGrid >& xGrid ); void doAutoScale( MinimumAndMaximumSupplier* pMinMaxSupplier ); void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); - const ::com::sun::star::uno::Sequence< ::drafts::com::sun::star::chart2::ExplicitScaleData >& getExplicitScales() const {return m_aExplicitScales;} - const ::com::sun::star::uno::Sequence< ::drafts::com::sun::star::chart2::ExplicitIncrementData >& getExplicitIncrements() const {return m_aExplicitIncrements;} + const ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData >& getExplicitScales() const {return m_aExplicitScales;} + const ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitIncrementData >& getExplicitIncrements() const {return m_aExplicitIncrements;} double getOriginByDimension( sal_Int32 nDim ) const { return m_fCoordinateOrigin[nDim]; } ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > + ::com::sun::star::chart2::XBoundedCoordinateSystem > getModel() const; virtual void createGridShapes(); @@ -134,35 +134,35 @@ public: protected: //methods VCoordinateSystem( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem >& xCooSys ); + ::com::sun::star::chart2::XBoundedCoordinateSystem >& xCooSys ); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XGrid > >& + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XGrid > >& getGridListByDimension( sal_Int32 nDim ); - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XAxis > + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > getAxisByDimension( sal_Int32 nDim ) const; protected: //member ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > m_xCooSysModel; + ::com::sun::star::chart2::XBoundedCoordinateSystem > m_xCooSysModel; - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XAxis > m_xAxis0; - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XAxis > m_xAxis1; - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XAxis > m_xAxis2; + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > m_xAxis0; + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > m_xAxis1; + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > m_xAxis2; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XGrid > > m_xGridList0; + ::com::sun::star::chart2::XGrid > > m_xGridList0; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XGrid > > m_xGridList1; + ::com::sun::star::chart2::XGrid > > m_xGridList1; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XGrid > > m_xGridList2; + ::com::sun::star::chart2::XGrid > > m_xGridList2; double m_fCoordinateOrigin[3]; - ::com::sun::star::uno::Sequence< ::drafts::com::sun::star::chart2::ExplicitScaleData > m_aExplicitScales; - ::com::sun::star::uno::Sequence< ::drafts::com::sun::star::chart2::ExplicitIncrementData > m_aExplicitIncrements; + ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData > m_aExplicitScales; + ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitIncrementData > m_aExplicitIncrements; // ::com::sun::star::uno::Reference< diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx index 20d895eab9c9..464e6b8074e9 100644 --- a/chart2/source/view/inc/VDataSeries.hxx +++ b/chart2/source/view/inc/VDataSeries.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VDataSeries.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: iha $ $Date: 2004-01-06 19:39:20 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,20 +67,20 @@ //for auto_ptr #include <memory> -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_DATAPOINTLABEL_HPP_ -#include <drafts/com/sun/star/chart2/DataPointLabel.hpp> +#ifndef _COM_SUN_STAR_CHART2_DATAPOINTLABEL_HPP_ +#include <com/sun/star/chart2/DataPointLabel.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SYMBOL_HPP_ -#include <drafts/com/sun/star/chart2/Symbol.hpp> +#ifndef _COM_SUN_STAR_CHART2_SYMBOL_HPP_ +#include <com/sun/star/chart2/Symbol.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASEQUENCE_HPP_ -#include <drafts/com/sun/star/chart2/XDataSequence.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASEQUENCE_HPP_ +#include <com/sun/star/chart2/XDataSequence.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASERIES_HPP_ -#include <drafts/com/sun/star/chart2/XDataSeries.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASERIES_HPP_ +#include <com/sun/star/chart2/XDataSeries.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASOURCE_HPP_ -#include <drafts/com/sun/star/chart2/XDataSource.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASOURCE_HPP_ +#include <com/sun/star/chart2/XDataSource.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_HOMOGENMATRIX_HPP_ #include <com/sun/star/drawing/HomogenMatrix.hpp> @@ -109,10 +109,10 @@ class VDataSeries { public: VDataSeries( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeries >& xDataSeries ); + ::com::sun::star::chart2::XDataSeries >& xDataSeries ); virtual ~VDataSeries(); - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XDataSeries > + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > getModel() const; void setCategoryXAxis(); @@ -132,7 +132,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getPropertiesOfSeries() const; - ::drafts::com::sun::star::chart2::Symbol* + ::com::sun::star::chart2::Symbol* getSymbolProperties( sal_Int32 index ) const; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xShape; @@ -160,33 +160,33 @@ public: rtl::OUString getLabelCID_Stub() const; rtl::OUString getDataCurveCID( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xDataCurveModelProp ) const; - ::drafts::com::sun::star::chart2::DataPointLabel* + ::com::sun::star::chart2::DataPointLabel* getDataPointLabelIfLabel( sal_Int32 index ) const; bool getTextLabelMultiPropertyLists( sal_Int32 index, tNameSequence*& pPropNames, tAnySequence*& pPropValues ) const; private: //methods VDataSeries(); bool isAttributedDataPoint( sal_Int32 index ) const; - ::drafts::com::sun::star::chart2::DataPointLabel* + ::com::sun::star::chart2::DataPointLabel* getDataPointLabel( sal_Int32 index ) const; private: //member ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeries > m_xDataSeries; + ::com::sun::star::chart2::XDataSeries > m_xDataSeries; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSequence > > m_aDataSequences; + ::com::sun::star::chart2::XDataSequence > > m_aDataSequences; //all points given by the model data (here are not only the visible points meant) sal_Int32 m_nPointCount; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSequence > m_xData_XValues; + ::com::sun::star::chart2::XDataSequence > m_xData_XValues; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSequence > m_xData_YValues; + ::com::sun::star::chart2::XDataSequence > m_xData_YValues; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSequence > m_xData_ZValues; + ::com::sun::star::chart2::XDataSequence > m_xData_ZValues; mutable ::com::sun::star::uno::Sequence< double > m_XValues_Double; ::com::sun::star::uno::Sequence< double > m_YValues_Double; @@ -199,20 +199,20 @@ private: //member rtl::OUString m_aLabelCID_Stub; //some cached values for data labels as they are very expensive - mutable ::std::auto_ptr< ::drafts::com::sun::star::chart2::DataPointLabel > + mutable ::std::auto_ptr< ::com::sun::star::chart2::DataPointLabel > m_apLabel_Series; mutable ::std::auto_ptr< tNameSequence > m_apLabelPropNames_Series; mutable ::std::auto_ptr< tAnySequence > m_apLabelPropValues_Series; - mutable ::std::auto_ptr< ::drafts::com::sun::star::chart2::DataPointLabel > + mutable ::std::auto_ptr< ::com::sun::star::chart2::DataPointLabel > m_apLabel_AttributedPoint; mutable ::std::auto_ptr< tNameSequence > m_apLabelPropNames_AttributedPoint; mutable ::std::auto_ptr< tAnySequence > m_apLabelPropValues_AttributedPoint; mutable sal_Int32 m_nCurrentAttributedPoint; - mutable ::std::auto_ptr< ::drafts::com::sun::star::chart2::Symbol > + mutable ::std::auto_ptr< ::com::sun::star::chart2::Symbol > m_apSymbolProperties_Series; - mutable ::std::auto_ptr< ::drafts::com::sun::star::chart2::Symbol > + mutable ::std::auto_ptr< ::com::sun::star::chart2::Symbol > m_apSymbolProperties_AttributedPoint; // }; diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx index c3d27bd711a5..54eaef7f3592 100644 --- a/chart2/source/view/inc/VDiagram.hxx +++ b/chart2/source/view/inc/VDiagram.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VDiagram.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2003-12-04 15:59:18 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,8 +68,8 @@ #include <com/sun/star/drawing/XShapes.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ -#include <drafts/com/sun/star/chart2/XDiagram.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ +#include <com/sun/star/chart2/XDiagram.hpp> #endif #ifndef _CHART2_VIEW_SHAPEFACTORY_HXX @@ -94,7 +94,7 @@ class VDiagram { public: //methods VDiagram( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > & xDiagram, + ::com::sun::star::chart2::XDiagram > & xDiagram, sal_Int32 nDimension=3, sal_Bool bPolar=sal_False); virtual ~VDiagram(); @@ -138,7 +138,7 @@ private: //members sal_Int32 m_nDimension; sal_Bool m_bPolar; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > m_xDiagram; + ::com::sun::star::chart2::XDiagram > m_xDiagram; }; //............................................................................. diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 8df204eff32e..416704898b77 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VSeriesPlotter.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:10:05 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,8 +66,8 @@ #include "PropertyMapper.hxx" #include "LabelAlignment.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPE_HPP_ -#include <drafts/com/sun/star/chart2/XChartType.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPE_HPP_ +#include <com/sun/star/chart2/XChartType.hpp> #endif //............................................................................. @@ -182,7 +182,7 @@ public: static sal_Int32 getPointCount( const ::std::vector< VDataSeriesGroup >& rSlots ); static VSeriesPlotter* createSeriesPlotter( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType >& xChartTypeModel ); + ::com::sun::star::chart2::XChartType >& xChartTypeModel ); //------------------------------------------------------------------------- //------------------------------------------------------------------------- @@ -194,7 +194,7 @@ private: //methods protected: //methods VSeriesPlotter( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType >& xChartTypeModel + ::com::sun::star::chart2::XChartType >& xChartTypeModel , bool bCategoryXAxis=true ); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > @@ -279,7 +279,7 @@ protected: //methods protected: //member ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType > m_xChartTypeModel; + ::com::sun::star::chart2::XChartType > m_xChartTypeModel; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xChartTypeModelProps; diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 29368d198ee4..4e1d758ad9a5 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartView.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:10:06 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,39 +74,39 @@ #include "ChartModelHelper.hxx" #include "ChartTypeHelper.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_EXPLICITSUBINCREMENT_HPP_ -#include <drafts/com/sun/star/chart2/ExplicitSubIncrement.hpp> +#ifndef _COM_SUN_STAR_CHART2_EXPLICITSUBINCREMENT_HPP_ +#include <com/sun/star/chart2/ExplicitSubIncrement.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XAXISCONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XAxisContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XAXISCONTAINER_HPP_ +#include <com/sun/star/chart2/XAxisContainer.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ -#include <drafts/com/sun/star/chart2/XChartDocument.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ +#include <com/sun/star/chart2/XChartDocument.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPEGROUP_HPP_ -#include <drafts/com/sun/star/chart2/XChartTypeGroup.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPEGROUP_HPP_ +#include <com/sun/star/chart2/XChartTypeGroup.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASERIES_HPP_ -#include <drafts/com/sun/star/chart2/XDataSeries.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASERIES_HPP_ +#include <com/sun/star/chart2/XDataSeries.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ -#include <drafts/com/sun/star/chart2/XDiagram.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDIAGRAM_HPP_ +#include <com/sun/star/chart2/XDiagram.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XGRIDCONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XGridContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XGRIDCONTAINER_HPP_ +#include <com/sun/star/chart2/XGridContainer.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XSTACKABLESCALEGROUP_HPP_ -#include <drafts/com/sun/star/chart2/XStackableScaleGroup.hpp> +#ifndef _COM_SUN_STAR_CHART2_XSTACKABLESCALEGROUP_HPP_ +#include <com/sun/star/chart2/XStackableScaleGroup.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTITLED_HPP_ -#include <drafts/com/sun/star/chart2/XTitled.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTITLED_HPP_ +#include <com/sun/star/chart2/XTitled.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_RELATIVEPOSITION_HPP_ -#include <drafts/com/sun/star/layout/RelativePosition.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_RELATIVEPOSITION_HPP_ +#include <com/sun/star/layout/RelativePosition.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_RELATIVESIZE_HPP_ -#include <drafts/com/sun/star/layout/RelativeSize.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_RELATIVESIZE_HPP_ +#include <com/sun/star/layout/RelativeSize.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_LINESTYLE_HPP_ @@ -119,8 +119,7 @@ namespace chart //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; ChartView::~ChartView() { @@ -538,7 +537,7 @@ bool getPosAndSizeForDiagram( uno::Reference< beans::XPropertySet > xProp(xDiagram, uno::UNO_QUERY); //size: - ::drafts::com::sun::star::layout::RelativeSize aRelativeSize; + ::com::sun::star::layout::RelativeSize aRelativeSize; if( xProp.is() && (xProp->getPropertyValue( C2U( "RelativeSize" ) )>>=aRelativeSize) ) { rOutSize.Height = static_cast<sal_Int32>(aRelativeSize.Secondary*rPageSize.Height); @@ -548,7 +547,7 @@ bool getPosAndSizeForDiagram( rOutSize = awt::Size(nWidth,nHeight); //position: - ::drafts::com::sun::star::layout::RelativePosition aRelativePosition; + ::com::sun::star::layout::RelativePosition aRelativePosition; if( xProp.is() && (xProp->getPropertyValue( C2U( "RelativePosition" ) )>>=aRelativePosition) ) { //@todo decide wether x is primary or secondary @@ -629,7 +628,7 @@ std::auto_ptr<VTitle> createTitle( const uno::Reference< XTitle >& xTitle awt::Point aNewPosition(0,0); sal_Int32 nYDistance = static_cast<sal_Int32>(rPageSize.Height*lcl_getPageLayoutDistancePercentage()); sal_Int32 nXDistance = static_cast<sal_Int32>(rPageSize.Width*lcl_getPageLayoutDistancePercentage()); - ::drafts::com::sun::star::layout::RelativePosition aRelativePosition; + ::com::sun::star::layout::RelativePosition aRelativePosition; uno::Reference< beans::XPropertySet > xProp(xTitle, uno::UNO_QUERY); if( xProp.is() && (xProp->getPropertyValue( C2U( "RelativePosition" ) )>>=aRelativePosition) ) { diff --git a/chart2/source/view/main/DataPointSymbolSupplier.cxx b/chart2/source/view/main/DataPointSymbolSupplier.cxx index bcfa62704dd3..a3c6936f57ef 100644 --- a/chart2/source/view/main/DataPointSymbolSupplier.cxx +++ b/chart2/source/view/main/DataPointSymbolSupplier.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DataPointSymbolSupplier.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2003-11-13 12:04:40 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,7 +68,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -//using namespace ::drafts::com::sun::star::chart2; +//using namespace ::com::sun::star::chart2; uno::Reference< drawing::XShapes > DataPointSymbolSupplier::create2DSymbolList( uno::Reference< lang::XMultiServiceFactory > xShapeFactory diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx index d548e855b197..333a2ab980b1 100644 --- a/chart2/source/view/main/LabelPositionHelper.cxx +++ b/chart2/source/view/main/LabelPositionHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: LabelPositionHelper.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:10:06 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; LabelPositionHelper::LabelPositionHelper( PlottingPositionHelper* pPosHelper diff --git a/chart2/source/view/main/NumberFormatterWrapper.cxx b/chart2/source/view/main/NumberFormatterWrapper.cxx index 2e4cfc9e1236..fdb2c5aa7694 100644 --- a/chart2/source/view/main/NumberFormatterWrapper.cxx +++ b/chart2/source/view/main/NumberFormatterWrapper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: NumberFormatterWrapper.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:34 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,11 +80,11 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; FixedNumberFormatter::FixedNumberFormatter( NumberFormatterWrapper* pNumberFormatterWrapper - , const ::drafts::com::sun::star::chart2::NumberFormat& rNumberFormat ) + , const ::com::sun::star::chart2::NumberFormat& rNumberFormat ) : m_pNumberFormatterWrapper(pNumberFormatterWrapper) , m_nFormatIndex(0) { diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx index b17adc6b620f..f348e377c8f8 100644 --- a/chart2/source/view/main/PlotterBase.cxx +++ b/chart2/source/view/main/PlotterBase.cxx @@ -2,9 +2,9 @@ * * $RCSfile: PlotterBase.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:10:07 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,8 +66,8 @@ #include <rtl/math.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_DATAPOINTLABEL_HPP_ -#include <drafts/com/sun/star/chart2/DataPointLabel.hpp> +#ifndef _COM_SUN_STAR_CHART2_DATAPOINTLABEL_HPP_ +#include <com/sun/star/chart2/DataPointLabel.hpp> #endif #ifndef _TOOLS_DEBUG_HXX @@ -79,7 +79,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx index de63e9bf72f4..6c7920482375 100644 --- a/chart2/source/view/main/PlottingPositionHelper.cxx +++ b/chart2/source/view/main/PlottingPositionHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: PlottingPositionHelper.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: iha $ $Date: 2004-01-23 15:21:37 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; PlottingPositionHelper::PlottingPositionHelper() : m_aScales() diff --git a/chart2/source/view/main/PolarLabelPositionHelper.cxx b/chart2/source/view/main/PolarLabelPositionHelper.cxx index 478a081fed30..a3d903a3e7a7 100644 --- a/chart2/source/view/main/PolarLabelPositionHelper.cxx +++ b/chart2/source/view/main/PolarLabelPositionHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: PolarLabelPositionHelper.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:10:07 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,7 +73,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; PolarLabelPositionHelper::PolarLabelPositionHelper( PolarPlottingPositionHelper* pPosHelper diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index a0853c523cac..62f7e1f9a9ae 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VDataSeries.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:10:08 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,11 +63,11 @@ #include "macros.hxx" #include "CommonConverters.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SYMBOL_HPP_ -#include <drafts/com/sun/star/chart2/Symbol.hpp> +#ifndef _COM_SUN_STAR_CHART2_SYMBOL_HPP_ +#include <com/sun/star/chart2/Symbol.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ -#include <drafts/com/sun/star/chart2/XIdentifiable.hpp> +#ifndef _COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ +#include <com/sun/star/chart2/XIdentifiable.hpp> #endif //#include "CommonConverters.hxx" @@ -80,8 +80,8 @@ #include <tools/debug.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XNUMERICALDATASEQUENCE_HPP_ -#include <drafts/com/sun/star/chart2/XNumericalDataSequence.hpp> +#ifndef _COM_SUN_STAR_CHART2_XNUMERICALDATASEQUENCE_HPP_ +#include <com/sun/star/chart2/XNumericalDataSequence.hpp> #endif #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> @@ -104,7 +104,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; VDataSeries::VDataSeries() { @@ -157,7 +157,7 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries ) m_xData_XValues = xDataSequence; m_XValues_Double = DataSequenceToDoubleSequence( m_xData_XValues ); } - else if( aRole.equals(C2U("values")) ) + else if( aRole.equals(C2U("y-values")) ) { m_xData_YValues = xDataSequence; m_YValues_Double = DataSequenceToDoubleSequence( m_xData_YValues ); diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index 6fc5453392a9..7a5ec180a6d2 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VLegend.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: bm $ $Date: 2004-01-19 14:15:49 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,38 +75,38 @@ #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASERIESTREEPARENT_HPP_ -#include <drafts/com/sun/star/chart2/XDataSeriesTreeParent.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASERIESTREEPARENT_HPP_ +#include <com/sun/star/chart2/XDataSeriesTreeParent.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_TEXTHORIZONTALADJUST_HPP_ #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASOURCE_HPP_ -#include <drafts/com/sun/star/chart2/XDataSource.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASOURCE_HPP_ +#include <com/sun/star/chart2/XDataSource.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPEGROUP_HPP_ -#include <drafts/com/sun/star/chart2/XChartTypeGroup.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPEGROUP_HPP_ +#include <com/sun/star/chart2/XChartTypeGroup.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ -#include <drafts/com/sun/star/chart2/XIdentifiable.hpp> +#ifndef _COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ +#include <com/sun/star/chart2/XIdentifiable.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_LINEJOINT_HPP_ #include <com/sun/star/drawing/LineJoint.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_LEGENDEXPANSION_HPP_ -#include <drafts/com/sun/star/chart2/LegendExpansion.hpp> +#ifndef _COM_SUN_STAR_CHART2_LEGENDEXPANSION_HPP_ +#include <com/sun/star/chart2/LegendExpansion.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_LEGENDPOSITION_HPP_ -#include <drafts/com/sun/star/chart2/LegendPosition.hpp> +#ifndef _COM_SUN_STAR_CHART2_LEGENDPOSITION_HPP_ +#include <com/sun/star/chart2/LegendPosition.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_ANCHORPOINT_HPP_ -#include <drafts/com/sun/star/layout/AnchorPoint.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_ANCHORPOINT_HPP_ +#include <com/sun/star/layout/AnchorPoint.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_RELATIVEPOSITION_HPP_ -#include <drafts/com/sun/star/layout/RelativePosition.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_RELATIVEPOSITION_HPP_ +#include <com/sun/star/layout/RelativePosition.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVECONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XRegressionCurveContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVECONTAINER_HPP_ +#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #endif // header for class Matrix3D @@ -123,7 +123,6 @@ #include <vector> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; //............................................................................. namespace chart @@ -931,7 +930,7 @@ void VLegend::changePosition( bool bAutoPosition = true; double fPrimaryOffset=0.02;// shift legend about 2% into the primary direction by default double fSecondaryOffset=0.0; - ::drafts::com::sun::star::layout::RelativePosition aRelativePosition; + ::com::sun::star::layout::RelativePosition aRelativePosition; if( (xLegendProp->getPropertyValue( C2U( "RelativePosition" ) )>>=aRelativePosition) ) { fPrimaryOffset = aRelativePosition.Primary; diff --git a/chart2/source/view/main/VLegend.hxx b/chart2/source/view/main/VLegend.hxx index 7d005175d034..ef2117c9fa2d 100644 --- a/chart2/source/view/main/VLegend.hxx +++ b/chart2/source/view/main/VLegend.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VLegend.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: bm $ $Date: 2003-12-17 16:43:21 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,8 +61,8 @@ #ifndef _VLEGEND_HXX #define _VLEGEND_HXX -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XLEGEND_HPP_ -#include <drafts/com/sun/star/chart2/XLegend.hpp> +#ifndef _COM_SUN_STAR_CHART2_XLEGEND_HPP_ +#include <com/sun/star/chart2/XLegend.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_XSHAPES_HPP_ #include <com/sun/star/drawing/XShapes.hpp> @@ -73,11 +73,11 @@ #ifndef _COM_SUN_STAR_AWT_RECTANGLE_HPP_ #include <com/sun/star/awt/Rectangle.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASERIESTREEPARENT_HPP_ -#include <drafts/com/sun/star/chart2/XDataSeriesTreeParent.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASERIESTREEPARENT_HPP_ +#include <com/sun/star/chart2/XDataSeriesTreeParent.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_ALIGNMENT_HPP_ -#include <drafts/com/sun/star/layout/Alignment.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_ALIGNMENT_HPP_ +#include <com/sun/star/layout/Alignment.hpp> #endif #ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ #include <com/sun/star/frame/XModel.hpp> @@ -96,7 +96,7 @@ class VLegend { public: VLegend( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XLegend > & xLegend ); + ::com::sun::star::chart2::XLegend > & xLegend ); void SAL_CALL init( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTargetPage, @@ -123,7 +123,7 @@ public: static bool isVisible( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XLegend > & xLegend ); + ::com::sun::star::chart2::XLegend > & xLegend ); private: ::com::sun::star::uno::Reference< @@ -131,7 +131,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XLegend > m_xLegend; + ::com::sun::star::chart2::XLegend > m_xLegend; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xShape; ::com::sun::star::uno::Reference< diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx index efeb70bfa3ad..c372e946bd43 100644 --- a/chart2/source/view/main/VLegendSymbolFactory.cxx +++ b/chart2/source/view/main/VLegendSymbolFactory.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VLegendSymbolFactory.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: bm $ $Date: 2003-12-17 16:43:22 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,7 +73,6 @@ // #define DISABLE_DASHES_AT_BORDER using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; namespace { diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx index 9caee5556ebd..0e7e24810bfa 100644 --- a/chart2/source/view/main/VTitle.cxx +++ b/chart2/source/view/main/VTitle.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VTitle.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: iha $ $Date: 2003-12-12 20:07:51 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,11 +66,11 @@ #include "chartview/ObjectIdentifier.hxx" #include "RelativeSizeHelper.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XFORMATTEDSTRING_HPP_ -#include <drafts/com/sun/star/chart2/XFormattedString.hpp> +#ifndef _COM_SUN_STAR_CHART2_XFORMATTEDSTRING_HPP_ +#include <com/sun/star/chart2/XFormattedString.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ -#include <drafts/com/sun/star/chart2/XIdentifiable.hpp> +#ifndef _COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_ +#include <com/sun/star/chart2/XIdentifiable.hpp> #endif // header for class Matrix3D @@ -106,7 +106,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; VTitle::VTitle( const uno::Reference< XTitle > & xTitle , double fAdditionalRotationAngleDegree ) diff --git a/chart2/source/view/main/VTitle.hxx b/chart2/source/view/main/VTitle.hxx index 4cdb09b79e75..e80ddf6d4b07 100644 --- a/chart2/source/view/main/VTitle.hxx +++ b/chart2/source/view/main/VTitle.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VTitle.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: iha $ $Date: 2003-12-12 20:07:24 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,8 +61,8 @@ #ifndef _CHART2_VTITLE_HXX #define _CHART2_VTITLE_HXX -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTITLE_HPP_ -#include <drafts/com/sun/star/chart2/XTitle.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTITLE_HPP_ +#include <com/sun/star/chart2/XTitle.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_XSHAPES_HPP_ @@ -85,7 +85,7 @@ class VTitle { public: VTitle( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTitle > & xTitle + ::com::sun::star::chart2::XTitle > & xTitle , double fAdditionalRotationAngleDegree=0.0 ); //the shape will be rotated by the sum of this value and the rotation given by the title model virtual ~VTitle(); @@ -105,7 +105,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTitle > m_xTitle; + ::com::sun::star::chart2::XTitle > m_xTitle; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xShape; diff --git a/chart2/workbench/fileformat/chart2.mod b/chart2/workbench/fileformat/chart2.mod index 33cf50b6ea18..20bd17fbc318 100644 --- a/chart2/workbench/fileformat/chart2.mod +++ b/chart2/workbench/fileformat/chart2.mod @@ -70,7 +70,7 @@ <!ATTLIST chart2:scale minimum %float; #IMPLIED > -<!-- choose a name of a registered uno component implementing the service ...scaling' ... e.g. drafts.com.sun.star.LogarithmicScaling; +<!-- choose a name of a registered uno component implementing the service ...scaling' ... e.g. com.sun.star.LogarithmicScaling; if no scaling-service is set a linear scaling will be used--> <!ATTLIST chart2:scale scaling-service %service-name; #IMPLIED @@ -184,4 +184,4 @@ renderer: the service ... 'datarenderer' needs to be supported increment IDREF #REQUIRED > <!-- renderer ************************************************************************************************************* --> -<!ELEMENT chart2:renderer EMPTY>
\ No newline at end of file +<!ELEMENT chart2:renderer EMPTY> diff --git a/chart2/workbench/fileformat/newchart_test.xml b/chart2/workbench/fileformat/newchart_test.xml index 44aaa602f431..a26019d5aee0 100644 --- a/chart2/workbench/fileformat/newchart_test.xml +++ b/chart2/workbench/fileformat/newchart_test.xml @@ -8,12 +8,12 @@ <office:body> <!-- body ***************************************************************************************************************** --> <chart2:chart2> - <chart2:legend id="legend_0" service="drafts.com.sun.star.chart2.Legend"/> - <chart2:legend id="legend_1" service="drafts.com.sun.star.chart2.Legend"/> + <chart2:legend id="legend_0" service="com.sun.star.chart2.Legend"/> + <chart2:legend id="legend_1" service="com.sun.star.chart2.Legend"/> <chart2:scale id="scale1_x" minimum="0" maximum="10"> <chart2:break start="2" end="3"/> </chart2:scale> - <chart2:scale id="scale1_y" scaling-service="drafts.com.sun.star.LogarithmicScaling"/> + <chart2:scale id="scale1_y" scaling-service="com.sun.star.LogarithmicScaling"/> <chart2:increment id="increment1_x" scale="scale1_x"> <chart2:subincrement count="2"/> <chart2:subincrement count="5"/> @@ -25,28 +25,28 @@ <chart2:final-target id="final_1"> <chart2:title id="title_1"/> <chart2:logic-target id="logic_1"> - <chart2:coordinate-system id="coosys_1" service="drafts.com.sun.star.chart2.ThreeDimCartesian" legend="legend_1"> + <chart2:coordinate-system id="coosys_1" service="com.sun.star.chart2.ThreeDimCartesian" legend="legend_1"> <chart2:scaleRef scale="scale1_x" direction="reverse"/> <chart2:scaleRef scale="scale1_y"/> </chart2:coordinate-system> </chart2:logic-target> </chart2:final-target> <!-- *************************************** axes ********************************************************************--> - <chart2:resident id="axis1_x" service="drafts.com.sun.star.chart2.CartesianAxis" coordinate-system="coosys_1"> + <chart2:resident id="axis1_x" service="com.sun.star.chart2.CartesianAxis" coordinate-system="coosys_1"> <chart2:axis dimension="1" increment="increment1_x"/> </chart2:resident> - <chart2:resident id="axis1_y" service="drafts.com.sun.star.chart2.CartesianAxis" coordinate-system="coosys_1"> + <chart2:resident id="axis1_y" service="com.sun.star.chart2.CartesianAxis" coordinate-system="coosys_1"> <chart2:axis dimension="2" increment="increment1_y"/> </chart2:resident> <!-- *************************************** grids *******************************************************************--> - <chart2:resident id="grid1_x" service="drafts.com.sun.star.chart2.CartesianGrid" coordinate-system="coosys_1"> + <chart2:resident id="grid1_x" service="com.sun.star.chart2.CartesianGrid" coordinate-system="coosys_1"> <chart2:grid dimension="1" increment="increment1_x"/> </chart2:resident> - <chart2:resident id="grid1_y" service="drafts.com.sun.star.chart2.CartesianGrid" coordinate-system="coosys_1"> + <chart2:resident id="grid1_y" service="com.sun.star.chart2.CartesianGrid" coordinate-system="coosys_1"> <chart2:grid dimension="2" increment="increment1_y"/> </chart2:resident> <!-- *************************************** renderer ***************************************************************--> - <chart2:resident id="barchart_1" service="drafts.com.sun.star.chart2.BarChart" coordinate-system="coosys_1"> + <chart2:resident id="barchart_1" service="com.sun.star.chart2.BarChart" coordinate-system="coosys_1"> <chart2:renderer/> </chart2:resident> </chart2:chart2> diff --git a/chart2/workbench/stub/newCHxx.cxx b/chart2/workbench/stub/newCHxx.cxx index e7b6dc300da5..f9405ff1de16 100644 --- a/chart2/workbench/stub/newCHxx.cxx +++ b/chart2/workbench/stub/newCHxx.cxx @@ -2,9 +2,9 @@ * * $RCSfile: newCHxx.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2003-11-10 19:40:23 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,7 +66,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; //............................................................................. } //namespace chart diff --git a/chart2/workbench/stub/newUNOcomponent.hxx b/chart2/workbench/stub/newUNOcomponent.hxx index 0f207b42c98e..acee56f30a69 100644 --- a/chart2/workbench/stub/newUNOcomponent.hxx +++ b/chart2/workbench/stub/newUNOcomponent.hxx @@ -19,7 +19,7 @@ //---- chart2 #ifndef _COM_SUN_STAR_CHART2_YYYY_HPP_ -#include <drafts/com/sun/star/chart2/YYYY.hpp> +#include <com/sun/star/chart2/YYYY.hpp> #endif //---- @@ -33,7 +33,7 @@ namespace chart //............................................................................. class XXXX : public ::cppu::WeakImplHelper2< - ::drafts::com::sun::star::chart2::YYYY + ::com::sun::star::chart2::YYYY , ::com::sun::star::lang::XServiceInfo //::com::sun::star::lang::XComponent ??? //::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) |