From 3bf16bf9e6c2e2c1e43169d4c3e3f0192ad84956 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 30 May 2011 18:05:10 +0200 Subject: ause130: #i117218# change .idl handling to gnu make --- chart2/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chart2') diff --git a/chart2/prj/build.lst b/chart2/prj/build.lst index ac3381587de3..c21ce8f2b313 100644 --- a/chart2/prj/build.lst +++ b/chart2/prj/build.lst @@ -1,3 +1,3 @@ -ch chart2 : offapi offuh TRANSLATIONS:translations comphelper cppu cppuhelper sal svtools svx tools vcl toolkit unotools sfx2 LIBXSLT:libxslt NULL +ch chart2 : offapi TRANSLATIONS:translations comphelper cppu cppuhelper sal svtools svx tools vcl toolkit unotools sfx2 LIBXSLT:libxslt NULL ch chart2 usr1 - all ch_mkout NULL ch chart2\prj nmake - all ch_prj NULL -- cgit From 5e7d51d43897c3d6acd6951ccd2279a1ab358705 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 30 May 2011 18:47:52 +0200 Subject: remove all traces of offuh from makefiles --- chart2/Library_chartcontroller.mk | 6 +++++- chart2/Library_chartmodel.mk | 6 +++++- chart2/Library_charttools.mk | 6 +++++- chart2/Library_chartview.mk | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) (limited to 'chart2') diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index b717c2ddadee..090d3ea893e1 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -35,7 +35,11 @@ $(eval $(call gb_Library_set_include,chartcontroller,\ -I$(realpath $(SRCDIR)/chart2/source/controller/inc) \ -I$(realpath $(SRCDIR)/chart2/source/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_api,chartcontroller,\ + offapi \ + udkapi \ )) # TODO: is this still necessary? diff --git a/chart2/Library_chartmodel.mk b/chart2/Library_chartmodel.mk index cf258737e1bc..e9ac4553fea1 100644 --- a/chart2/Library_chartmodel.mk +++ b/chart2/Library_chartmodel.mk @@ -35,7 +35,11 @@ $(eval $(call gb_Library_set_include,chartmodel,\ -I$(realpath $(SRCDIR)/chart2/source/model/inc) \ -I$(realpath $(SRCDIR)/chart2/source/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_api,chartmodel,\ + offapi \ + udkapi \ )) # TODO: is this still necessary? diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk index 2bf40ca05750..9eac6390876c 100644 --- a/chart2/Library_charttools.mk +++ b/chart2/Library_charttools.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,charttools,\ -I$(realpath $(SRCDIR)/chart2/inc/pch) \ -I$(realpath $(SRCDIR)/chart2/source/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_set_defs,charttools,\ @@ -42,6 +41,11 @@ $(eval $(call gb_Library_set_defs,charttools,\ -DOOO_DLLIMPLEMENTATION_CHARTTOOLS \ )) +$(eval $(call gb_Library_add_api,charttools,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,charttools,\ basegfx \ comphelper \ diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk index 802a13d40728..9fc0e50adfed 100644 --- a/chart2/Library_chartview.mk +++ b/chart2/Library_chartview.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,chartview,\ -I$(realpath $(SRCDIR)/chart2/source/view/inc) \ -I$(realpath $(SRCDIR)/chart2/source/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_set_defs,chartview,\ @@ -43,6 +42,11 @@ $(eval $(call gb_Library_set_defs,chartview,\ -DOOO_DLLIMPLEMENTATION_CHARTVIEW \ )) +$(eval $(call gb_Library_add_api,chartview,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,chartview,\ basegfx \ charttools \ -- cgit From b0a7f87a861c4ef9caab40b904f4d22d39496493 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 20 Jun 2011 21:57:53 +0100 Subject: catch by const reference --- .../chartapiwrapper/ChartDocumentWrapper.cxx | 35 +++++++++++----------- chart2/source/controller/main/ChartController.cxx | 2 +- chart2/source/model/filter/XMLFilter.cxx | 28 ++++++++--------- chart2/source/model/main/ChartModel.cxx | 16 +++++----- chart2/source/tools/ReferenceSizeProvider.cxx | 10 +++---- 5 files changed, 45 insertions(+), 46 deletions(-) (limited to 'chart2') diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 75d232dcb36e..71a80b12e387 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -533,7 +533,7 @@ void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const R xLegendProp->setPropertyValue( C2U("Show"), uno::makeAny( bNewValue )); } } - catch( uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } @@ -552,7 +552,7 @@ Any WrappedHasLegendProperty::getPropertyValue( const Reference< beans::XPropert else aRet <<= sal_False; } - catch( uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } @@ -614,7 +614,7 @@ void WrappedHasMainTitleProperty::setPropertyValue( const Any& rOuterValue, cons else TitleHelper::removeTitle( TitleHelper::MAIN_TITLE, m_spChart2ModelContact->getChartModel() ); } - catch( uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } @@ -628,7 +628,7 @@ Any WrappedHasMainTitleProperty::getPropertyValue( const Reference< beans::XProp { aRet <<= sal_Bool( TitleHelper::getTitle( TitleHelper::MAIN_TITLE, m_spChart2ModelContact->getChartModel() ).is() ); } - catch( uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } @@ -691,7 +691,7 @@ void WrappedHasSubTitleProperty::setPropertyValue( const Any& rOuterValue, const else TitleHelper::removeTitle( TitleHelper::SUB_TITLE, m_spChart2ModelContact->getChartModel() ); } - catch( uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } @@ -705,7 +705,7 @@ Any WrappedHasSubTitleProperty::getPropertyValue( const Reference< beans::XPrope { aRet <<= sal_Bool( TitleHelper::getTitle( TitleHelper::SUB_TITLE, m_spChart2ModelContact->getChartModel() ).is() ); } - catch( uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } @@ -802,7 +802,7 @@ Reference< XDiagram > SAL_CALL ChartDocumentWrapper::getDiagram() { m_xDiagram = new DiagramWrapper( m_spChart2ModelContact ); } - catch( uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } @@ -837,7 +837,7 @@ void SAL_CALL ChartDocumentWrapper::setDiagram( const Reference< XDiagram >& xDi m_xDiagram = xDiagram; } } - catch( uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } @@ -1004,12 +1004,12 @@ void SAL_CALL ChartDocumentWrapper::dispose() if( xFormerDelegator.is()) xFormerDelegator->dispose(); } - catch( lang::DisposedException ) + catch (const lang::DisposedException&) { // this is ok, don't panic } } - catch( uno::Exception &ex ) + catch (const uno::Exception &ex) { ASSERT_EXCEPTION( ex ); } @@ -1041,11 +1041,11 @@ void ChartDocumentWrapper::impl_resetAddIn() } } } - catch( const uno::RuntimeException& ex ) + catch (const uno::RuntimeException& ex) { ASSERT_EXCEPTION( ex ); } - catch( const uno::Exception& ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } @@ -1347,7 +1347,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( xResult = static_cast< ::cppu::OWeakObject* >( new DiagramWrapper( m_spChart2ModelContact )); } - catch( uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } @@ -1390,7 +1390,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( aArguments[1]=uno::makeAny(bRefreshAddIn); xViewInit->initialize(aArguments); } - catch( uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } @@ -1422,7 +1422,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( bServiceFound = true; } } - catch( const uno::Exception ) + catch (const uno::Exception&) { // couldn't create shape } @@ -1446,9 +1446,8 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( } } } - catch( const uno::Exception& ex ) + catch (const uno::Exception&) { - (void)ex; // couldn't create service } } @@ -1509,7 +1508,7 @@ void SAL_CALL ChartDocumentWrapper::setDelegator( { this->dispose(); } - catch( uno::Exception &ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index e95d50d0614a..af5f2cbe421f 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -241,7 +241,7 @@ void ChartController::TheModel::tryTermination() #if OSL_DEBUG_LEVEL > 1 OSL_ENSURE( !m_bOwnership, - "INFO: a well known owner has catched a CloseVetoException after calling close(true)" ); + "INFO: a well known owner has caught a CloseVetoException after calling close(true)" ); #endif m_bOwnership = false; diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 66ba3d77f8ec..ff77dea9991a 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -162,7 +162,7 @@ uno::Reference< embed::XStorage > lcl_getWriteStorage( xProp->setPropertyValue( C2U("MediaType"), uno::makeAny( _sMediaType )); } } - catch( uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } @@ -226,7 +226,7 @@ uno::Reference< embed::XStorage > lcl_getReadStorage( OSL_ENSURE( xStorage.is(), "No Storage" ); } - catch( uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } @@ -465,7 +465,7 @@ sal_Int32 XMLFilter::impl_Import( xStorage, xSaxParser, xFactory, xGraphicObjectResolver, xImportInfo ); } } - catch( uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); @@ -549,7 +549,7 @@ sal_Int32 XMLFilter::impl_ImportStream( xDocHandler.set(xFactory->createInstanceWithArgumentsAndContext(m_sDocumentHandler,aArgs,m_xContext), uno::UNO_QUERY ); xImporter.set(xDocHandler,uno::UNO_QUERY); } - catch(uno::Exception&) + catch (const uno::Exception&) { OSL_FAIL("Exception caught!"); } @@ -561,24 +561,24 @@ sal_Int32 XMLFilter::impl_ImportStream( // load was successful nWarning = 0; } - catch( xml::sax::SAXParseException ) + catch (const xml::sax::SAXParseException&) { // todo: if encrypted: ERRCODE_SFX_WRONGPASSWORD } - catch( xml::sax::SAXException ) + catch (const xml::sax::SAXException&) { // todo: if encrypted: ERRCODE_SFX_WRONGPASSWORD } - catch( packages::zip::ZipIOException ) + catch (const packages::zip::ZipIOException&) { nWarning = ERRCODE_IO_BROKENPACKAGE; } - catch( io::IOException ) + catch (const io::IOException&) { } - catch( uno::Exception& aEx ) + catch (const uno::Exception& rEx) { - ASSERT_EXCEPTION( aEx ); + ASSERT_EXCEPTION(rEx); } } @@ -647,7 +647,7 @@ sal_Int32 XMLFilter::impl_Export( xDocHandler.set(xServiceFactory->createInstanceWithArguments(m_sDocumentHandler,aArgs), uno::UNO_QUERY ); xSaxWriter.set(xDocHandler,uno::UNO_QUERY); } - catch(uno::Exception&) + catch (const uno::Exception&) { OSL_FAIL("Exception caught!"); } @@ -727,7 +727,7 @@ sal_Int32 XMLFilter::impl_Export( if ( xTransact.is() ) xTransact->commit(); } - catch( uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); @@ -772,7 +772,7 @@ sal_Int32 XMLFilter::impl_ExportStream( xStreamProp->setPropertyValue( C2U("Compressed"), uno::makeAny( sal_True ) );//@todo? xStreamProp->setPropertyValue( C2U("UseCommonStoragePasswordEncryption"), uno::makeAny( sal_True ) ); } - catch( uno::Exception& rEx ) + catch (const uno::Exception& rEx) { ASSERT_EXCEPTION( rEx ); } @@ -804,7 +804,7 @@ sal_Int32 XMLFilter::impl_ExportStream( //@todo? filter properties? ... url? ... xFilter->filter( aMediaDesc ); } - catch( uno::Exception& rEx ) + catch (const uno::Exception& rEx) { ASSERT_EXCEPTION( rEx ); } diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 9d88b849220b..67c9f1fbab79 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -235,7 +235,7 @@ sal_Bool ChartModel::impl_isControllerConnected( const uno::Reference< frame::XC return sal_True; } } - catch( uno::Exception ) + catch (const uno::Exception&) { } return sal_False; @@ -654,7 +654,7 @@ void SAL_CALL ChartModel::close( sal_Bool bDeliverOwnership ) //try to cancel running longlasting calls //// @todo } - catch( uno::Exception ) + catch (const uno::Exception&) { //// @todo //do not throw anything here!! (without endTryClose) @@ -837,7 +837,7 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data sal_Bool bIncludeHiddenCells = ChartModelHelper::isIncludeHiddenCells( Reference< frame::XModel >(this) ); xProp->setPropertyValue(C2U("IncludeHiddenCells"), uno::makeAny(bIncludeHiddenCells)); } - catch( const beans::UnknownPropertyException& ) + catch (const beans::UnknownPropertyException&) { } } @@ -906,11 +906,11 @@ void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >& xDia->setDiagramData( xDataSource, aArguments ); } } - catch( lang::IllegalArgumentException & ) + catch (const lang::IllegalArgumentException&) { throw; } - catch( uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } @@ -1011,7 +1011,7 @@ uno::Any SAL_CALL ChartModel::queryInterface( const uno::Type& aType ) if( m_xOldModelAgg.is()) aResult = m_xOldModelAgg->queryAggregation( aType ); } - catch( uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } @@ -1105,7 +1105,7 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio aResult.Data <<= aMetafile; } - catch( uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } @@ -1143,7 +1143,7 @@ uno::Any SAL_CALL ChartModel::getTransferData( const datatransfer::DataFlavor& a aResult = xTransferable->getTransferData( aFlavor ); } } - catch( uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index 909eaf61942c..5826103b9fd1 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -109,7 +109,7 @@ void ReferenceSizeProvider::setValuesAtTitle( setValuesAtPropertySet( xTitleProp, /* bAdaptFontSizes = */ false ); } - catch( const uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } @@ -140,7 +140,7 @@ void ReferenceSizeProvider::setValuesAtAllDataSeries() (*aIt)->getDataPointByIndex( aPointIndexes[i] ) ); } } - catch( const uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } @@ -183,7 +183,7 @@ void ReferenceSizeProvider::setValuesAtPropertySet( } } } - catch( const uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } @@ -205,7 +205,7 @@ void ReferenceSizeProvider::getAutoResizeFromPropSet( else eSingleState = AUTO_RESIZE_NO; } - catch( uno::Exception ) + catch (const uno::Exception&) { // unknown property -> state stays unknown } @@ -320,7 +320,7 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState } } } - catch( const uno::Exception & ex ) + catch (const uno::Exception& ex) { ASSERT_EXCEPTION( ex ); } -- cgit From b0eefda7585fa96a21428af4164aff13fc5e7312 Mon Sep 17 00:00:00 2001 From: Regina Henschel Date: Thu, 23 Jun 2011 18:33:44 +0300 Subject: Adapt texts to new B-spline implementation --- chart2/source/controller/dialogs/tp_ChartType.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chart2') diff --git a/chart2/source/controller/dialogs/tp_ChartType.src b/chart2/source/controller/dialogs/tp_ChartType.src index 69c33cd14021..334c8d54a183 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.src +++ b/chart2/source/controller/dialogs/tp_ChartType.src @@ -245,7 +245,7 @@ ModalDialog DLG_SPLINE_PROPERTIES { Pos = MAP_APPFONT ( POS_X_SPLINE_EXTRAS , POS_Y_SPLINES_3 ) ; Size = MAP_APPFONT ( SPLINES_WIDTH_METRIC_TEXT , 10 ) ; - Text [ en-US ] = "~Data points order" ; + Text [ en-US ] = "~Degree of polynomials" ; }; MetricField MF_SPLINE_ORDER { -- cgit From 109afdcc3fcb415db79f8c2db2f8417343c65515 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Mon, 27 Jun 2011 23:25:46 +0200 Subject: Use definition of BUTTONS_HELP_OK_CANCEL directly. --- chart2/source/controller/dialogs/CommonResources.hrc | 4 ---- chart2/source/controller/dialogs/tp_ChartType.src | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'chart2') diff --git a/chart2/source/controller/dialogs/CommonResources.hrc b/chart2/source/controller/dialogs/CommonResources.hrc index 8a3ae8f9f63c..81c2a83ca05e 100644 --- a/chart2/source/controller/dialogs/CommonResources.hrc +++ b/chart2/source/controller/dialogs/CommonResources.hrc @@ -72,8 +72,4 @@ CancelButton BTN_CANCEL \ TabStop = TRUE ; \ }; -#define BUTTONS_HELP_OK_CANCEL_NEXT( xPos, yPos ) \ -BUTTONS_HELP_OK_CANCEL( xPos, yPos, 53, 0 ) - - #endif diff --git a/chart2/source/controller/dialogs/tp_ChartType.src b/chart2/source/controller/dialogs/tp_ChartType.src index 334c8d54a183..37361901f459 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.src +++ b/chart2/source/controller/dialogs/tp_ChartType.src @@ -269,5 +269,5 @@ ModalDialog DLG_SPLINE_PROPERTIES Pos = MAP_APPFONT ( 0 , POS_Y_SPLINES_4 ) ; Size = MAP_APPFONT ( SPLINE_DIALOG_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ; }; - BUTTONS_HELP_OK_CANCEL_NEXT(POS_X_SPLINES_1,POS_Y_SPLINES_5) + BUTTONS_HELP_OK_CANCEL( POS_X_SPLINES_1, POS_Y_SPLINES_5, 53, 0 ) }; -- cgit From ac02b95bcc77797b72250b6d252a248af2ab49cc Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Mon, 27 Jun 2011 23:40:56 +0200 Subject: fdo#38725: Reorder buttons to Ok, Cancel, Help Remove BUTTONS_HELP_OK_CANCEL definition and use more intuitive usable BUTTONS_OK_CANCEL_HELP. --- .../source/controller/dialogs/CommonResources.hrc | 21 --------------------- chart2/source/controller/dialogs/tp_ChartType.src | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) (limited to 'chart2') diff --git a/chart2/source/controller/dialogs/CommonResources.hrc b/chart2/source/controller/dialogs/CommonResources.hrc index 81c2a83ca05e..43b3062a7a6d 100644 --- a/chart2/source/controller/dialogs/CommonResources.hrc +++ b/chart2/source/controller/dialogs/CommonResources.hrc @@ -51,25 +51,4 @@ HelpButton BTN_HELP \ #define BUTTONS_OK_CANCEL_HELP_STACKED( xPos ) \ BUTTONS_OK_CANCEL_HELP( xPos, 6, 0, 17 ) -#define BUTTONS_HELP_OK_CANCEL( xPos, yPos, xOffset, yOffset ) \ -HelpButton BTN_HELP \ -{ \ - Pos = MAP_APPFONT ( xPos , yPos ) ; \ - Size = MAP_APPFONT ( 50 , 14 ) ; \ - TabStop = TRUE ; \ -}; \ -OKButton BTN_OK \ -{ \ - Pos = MAP_APPFONT ( xPos+xOffset , yPos+yOffset ) ; \ - Size = MAP_APPFONT ( 50 , 14 ) ; \ - TabStop = TRUE ; \ - DefButton = TRUE ; \ -}; \ -CancelButton BTN_CANCEL \ -{ \ - Pos = MAP_APPFONT ( xPos+xOffset+xOffset , yPos+yOffset+yOffset ) ; \ - Size = MAP_APPFONT ( 50 , 14 ) ; \ - TabStop = TRUE ; \ -}; - #endif diff --git a/chart2/source/controller/dialogs/tp_ChartType.src b/chart2/source/controller/dialogs/tp_ChartType.src index 37361901f459..049ef897f795 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.src +++ b/chart2/source/controller/dialogs/tp_ChartType.src @@ -269,5 +269,5 @@ ModalDialog DLG_SPLINE_PROPERTIES Pos = MAP_APPFONT ( 0 , POS_Y_SPLINES_4 ) ; Size = MAP_APPFONT ( SPLINE_DIALOG_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ; }; - BUTTONS_HELP_OK_CANCEL( POS_X_SPLINES_1, POS_Y_SPLINES_5, 53, 0 ) + BUTTONS_OK_CANCEL_HELP( POS_X_SPLINES_1, POS_Y_SPLINES_5, 53, 0 ) }; -- cgit From bc925cc2ad591f7ac2d956ef31db7be3497a99e9 Mon Sep 17 00:00:00 2001 From: Matus Kukan Date: Sun, 3 Jul 2011 12:36:54 +0200 Subject: Remove component_getImplementationEnvironment --- chart2/source/controller/main/_serviceregistration_controller.cxx | 7 ------- chart2/source/inc/exports.dxp | 1 - chart2/source/model/main/_serviceregistration_model.cxx | 7 ------- chart2/source/tools/_serviceregistration_tools.cxx | 7 ------- chart2/source/view/main/_serviceregistration_view.cxx | 7 ------- chart2/workbench/addin/exports.dxp | 1 - chart2/workbench/addin/sampleaddin.cxx | 6 ------ chart2/workbench/addin/sampleaddin.def | 1 - 8 files changed, 37 deletions(-) (limited to 'chart2') diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx b/chart2/source/controller/main/_serviceregistration_controller.cxx index 40be8ac313fa..c6d9acfca95d 100644 --- a/chart2/source/controller/main/_serviceregistration_controller.cxx +++ b/chart2/source/controller/main/_serviceregistration_controller.cxx @@ -102,13 +102,6 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_controller[] = // component exports extern "C" { -//================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/chart2/source/inc/exports.dxp b/chart2/source/inc/exports.dxp index f0e1c69934bc..70033078921a 100644 --- a/chart2/source/inc/exports.dxp +++ b/chart2/source/inc/exports.dxp @@ -1,2 +1 @@ -component_getImplementationEnvironment component_getFactory diff --git a/chart2/source/model/main/_serviceregistration_model.cxx b/chart2/source/model/main/_serviceregistration_model.cxx index 49a0ee73e53c..5b783e95e613 100644 --- a/chart2/source/model/main/_serviceregistration_model.cxx +++ b/chart2/source/model/main/_serviceregistration_model.cxx @@ -185,13 +185,6 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_model[] = // component exports extern "C" { -//================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/chart2/source/tools/_serviceregistration_tools.cxx b/chart2/source/tools/_serviceregistration_tools.cxx index 6fca1124e594..a2444e171e28 100644 --- a/chart2/source/tools/_serviceregistration_tools.cxx +++ b/chart2/source/tools/_serviceregistration_tools.cxx @@ -177,13 +177,6 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_tools[] = // component exports extern "C" { -//================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/chart2/source/view/main/_serviceregistration_view.cxx b/chart2/source/view/main/_serviceregistration_view.cxx index 828564bec31c..f90ea3aa5ee3 100644 --- a/chart2/source/view/main/_serviceregistration_view.cxx +++ b/chart2/source/view/main/_serviceregistration_view.cxx @@ -48,13 +48,6 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_view[] = // component exports extern "C" { -//================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/chart2/workbench/addin/exports.dxp b/chart2/workbench/addin/exports.dxp index 9630d7e06768..51703a04666a 100644 --- a/chart2/workbench/addin/exports.dxp +++ b/chart2/workbench/addin/exports.dxp @@ -1,3 +1,2 @@ -component_getImplementationEnvironment component_writeInfo component_getFactory diff --git a/chart2/workbench/addin/sampleaddin.cxx b/chart2/workbench/addin/sampleaddin.cxx index 2b95474708b1..db7993c607a0 100644 --- a/chart2/workbench/addin/sampleaddin.cxx +++ b/chart2/workbench/addin/sampleaddin.cxx @@ -44,12 +44,6 @@ using ::rtl::OUString; extern "C" { -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey ) { diff --git a/chart2/workbench/addin/sampleaddin.def b/chart2/workbench/addin/sampleaddin.def index 78cb684a92f3..b13949b6a22b 100644 --- a/chart2/workbench/addin/sampleaddin.def +++ b/chart2/workbench/addin/sampleaddin.def @@ -2,6 +2,5 @@ LIBRARY sampleaddin DESCRIPTION 'Sample Chart AddIn' HEAPSIZE 0 EXPORTS -component_getImplementationEnvironment component_writeInfo component_getFactory -- cgit From a945fbf59ca0847da961d905c44ca1eb947bb369 Mon Sep 17 00:00:00 2001 From: Maciej Rumianowski Date: Tue, 19 Jul 2011 10:50:54 +0200 Subject: Get rid of SvULongs in calc Instead of SvULongs use ::std::vector < sal_Int32 > --- .../source/controller/itemsetwrapper/DataPointItemConverter.cxx | 7 +------ .../controller/itemsetwrapper/SeriesOptionsItemConverter.cxx | 7 +------ chart2/source/view/main/ChartItemPool.cxx | 8 +++----- 3 files changed, 5 insertions(+), 17 deletions(-) (limited to 'chart2') diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index e399e4ba82b1..1c494c94de31 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -54,8 +54,6 @@ #include //SfxIntegerListItem #include -#define _SVSTDARR_ULONGS -#include #include #include @@ -641,10 +639,7 @@ void DataPointItemConverter::FillSpecialItem( case SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS: { - SvULongs aList; - for ( sal_Int32 nN=0; nN(nN) ); - rOutItemSet.Put( SfxIntegerListItem( nWhichId, aList ) ); + rOutItemSet.Put( SfxIntegerListItem( nWhichId, m_aAvailableLabelPlacements ) ); } break; diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx index 1782d9513caa..20277edf0c00 100644 --- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx @@ -51,8 +51,6 @@ //SfxIntegerListItem #include -#define _SVSTDARR_ULONGS -#include #include #include @@ -433,10 +431,7 @@ void SeriesOptionsItemConverter::FillSpecialItem( } case SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS: { - SvULongs aList; - for ( sal_Int32 nN=0; nN(nN) ); - rOutItemSet.Put( SfxIntegerListItem( nWhichId, aList ) ); + rOutItemSet.Put( SfxIntegerListItem( nWhichId, m_aSupportedMissingValueTreatments ) ); break; } case SCHATTR_INCLUDE_HIDDEN_CELLS: diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index 0e8c53566098..887352b9ca90 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -39,10 +39,9 @@ #include #include #include -#define _SVSTDARR_ULONGS -#include #include #include +#include #include @@ -63,8 +62,7 @@ ChartItemPool::ChartItemPool(): ppPoolDefaults[SCHATTR_DATADESCR_SHOW_SYMBOL - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_SHOW_SYMBOL); ppPoolDefaults[SCHATTR_DATADESCR_SEPARATOR - SCHATTR_START] = new SfxStringItem(SCHATTR_DATADESCR_SEPARATOR,C2U(" ")); ppPoolDefaults[SCHATTR_DATADESCR_PLACEMENT - SCHATTR_START] = new SfxInt32Item(SCHATTR_DATADESCR_PLACEMENT,0); - SvULongs aTmp; - ppPoolDefaults[SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS,aTmp); + ppPoolDefaults[SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS, ::std::vector < sal_Int32 >() ); ppPoolDefaults[SCHATTR_DATADESCR_NO_PERCENTVALUE - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_NO_PERCENTVALUE); ppPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_VALUE - SCHATTR_START] = new SfxUInt32Item(SCHATTR_PERCENT_NUMBERFORMAT_VALUE, 0); ppPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_SOURCE - SCHATTR_START] = new SfxBoolItem(SCHATTR_PERCENT_NUMBERFORMAT_SOURCE); @@ -157,7 +155,7 @@ ChartItemPool::ChartItemPool(): ppPoolDefaults[SCHATTR_CLOCKWISE - SCHATTR_START] = new SfxBoolItem( SCHATTR_CLOCKWISE, sal_False ); ppPoolDefaults[SCHATTR_MISSING_VALUE_TREATMENT - SCHATTR_START] = new SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT, 0); - ppPoolDefaults[SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS,aTmp); + ppPoolDefaults[SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS, ::std::vector < sal_Int32 >() ); ppPoolDefaults[SCHATTR_INCLUDE_HIDDEN_CELLS - SCHATTR_START] = new SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, sal_True); ppPoolDefaults[SCHATTR_AXIS_FOR_ALL_SERIES - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_FOR_ALL_SERIES, 0); -- cgit