mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#46808, fix up some NumberFormatter createInstance calls I missed

Browse Source 
Change-Id: Ieb3ce841243797a119f1d1d40379ff2a4614168f
This commit is contained in:
Noel Grandin
2012-09-19 15:29:46 +02:00
committed by Stephan Bergmann
parent d40dceb75b
commit f4776bf465
11 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forms/source/inc/services.hxx
View File

@@ -210,7 +210,6 @@ namespace frm
// ----------------------- // -----------------------
FORMS_CONSTASCII_STRING( SRV_AWT_POINTER, "com.sun.star.awt.Pointer" ); FORMS_CONSTASCII_STRING( SRV_AWT_POINTER, "com.sun.star.awt.Pointer" );
FORMS_CONSTASCII_STRING( SRV_AWT_IMAGEPRODUCER, "com.sun.star.awt.ImageProducer" ); FORMS_CONSTASCII_STRING( SRV_AWT_IMAGEPRODUCER, "com.sun.star.awt.ImageProducer" );
FORMS_CONSTASCII_STRING( FRM_NUMBER_FORMATTER, "com.sun.star.util.NumberFormatter" );
FORMS_CONSTASCII_STRING( FRM_NUMBER_FORMATS_SUPPLIER, "com.sun.star.util.NumberFormatsSupplier" ); FORMS_CONSTASCII_STRING( FRM_NUMBER_FORMATS_SUPPLIER, "com.sun.star.util.NumberFormatsSupplier" );
FORMS_CONSTASCII_STRING( SRV_SDB_ROWSET, "com.sun.star.sdb.RowSet" ); FORMS_CONSTASCII_STRING( SRV_SDB_ROWSET, "com.sun.star.sdb.RowSet" );

1
scaddins/Library_analysis.mk
View File

@@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_internal_comprehensive_api,analysis,\
)) ))
$(eval $(call gb_Library_use_libraries,analysis,\ $(eval $(call gb_Library_use_libraries,analysis,\
comphelper \
cppu \ cppu \
cppuhelper \ cppuhelper \
sal \ sal \

7
scaddins/source/analysis/analysis.cxx
View File

@@ -19,6 +19,7 @@
#include "analysis.hxx" #include "analysis.hxx"
#include <comphelper/processfactory.hxx>
#include <cppuhelper/factory.hxx> #include <cppuhelper/factory.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
@@ -155,13 +156,13 @@ void AnalysisAddIn::InitData( void )
} }
AnalysisAddIn::AnalysisAddIn( const uno::Reference< lang::XMultiServiceFactory >& xServiceFact ) : AnalysisAddIn::AnalysisAddIn( const uno::Reference< uno::XComponentContext >& xContext ) :
pDefLocales( NULL ), pDefLocales( NULL ),
pFD( NULL ), pFD( NULL ),
pFactDoubles( NULL ), pFactDoubles( NULL ),
pCDL( NULL ), pCDL( NULL ),
pResMgr( NULL ), pResMgr( NULL ),
aAnyConv( xServiceFact ) aAnyConv( xContext )
{ {
} }
@@ -259,7 +260,7 @@ SEQ( STRING ) AnalysisAddIn::getSupportedServiceNames_Static()
REF( uno::XInterface ) SAL_CALL AnalysisAddIn_CreateInstance( REF( uno::XInterface ) SAL_CALL AnalysisAddIn_CreateInstance(
const uno::Reference< lang::XMultiServiceFactory >& xServiceFact ) const uno::Reference< lang::XMultiServiceFactory >& xServiceFact )
{ {
static uno::Reference< uno::XInterface > xInst = (cppu::OWeakObject*) new AnalysisAddIn( xServiceFact ); static uno::Reference< uno::XInterface > xInst = (cppu::OWeakObject*) new AnalysisAddIn( comphelper::getComponentContext(xServiceFact) );
return xInst; return xInst;
} }

2
scaddins/source/analysis/analysis.hxx
View File

@@ -76,7 +76,7 @@ private:
public: public:
AnalysisAddIn( AnalysisAddIn(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFact ); const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
virtual ~AnalysisAddIn(); virtual ~AnalysisAddIn();
double FactDouble( sal_Int32 nNum ) THROWDEF_RTE_IAE; double FactDouble( sal_Int32 nNum ) THROWDEF_RTE_IAE;

10
scaddins/source/analysis/analysishelper.cxx
View File

@@ -18,6 +18,7 @@
*/ */
#include <com/sun/star/util/XNumberFormatTypes.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp>
#include <com/sun/star/util/NumberFormatter.hpp>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
@@ -2845,15 +2846,10 @@ sal_Bool ScaDate::operator<( const ScaDate& rCmp ) const
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
ScaAnyConverter::ScaAnyConverter( const uno::Reference< lang::XMultiServiceFactory >& xServiceFact ) : ScaAnyConverter::ScaAnyConverter( const uno::Reference< uno::XComponentContext >& xContext ) :
bHasValidFormat( sal_False ) bHasValidFormat( sal_False )
{ {
if( xServiceFact.is() ) xFormatter = util::NumberFormatter::create(xContext);
{
uno::Reference< uno::XInterface > xInstance = xServiceFact->createInstance(
OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.NumberFormatter" )) );
xFormatter = uno::Reference< util::XNumberFormatter >( xInstance, uno::UNO_QUERY );
}
} }
ScaAnyConverter::~ScaAnyConverter() ScaAnyConverter::~ScaAnyConverter()

7
scaddins/source/analysis/analysishelper.hxx
View File

@@ -23,8 +23,9 @@
#include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/lang/XServiceName.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/util/XNumberFormatter2.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/sheet/XAddIn.hpp> #include <com/sun/star/sheet/XAddIn.hpp>
#include <com/sun/star/sheet/addin/XAnalysis.hpp> #include <com/sun/star/sheet/addin/XAnalysis.hpp>
@@ -1030,7 +1031,7 @@ inline void ScaDate::addYears( sal_Int32 nYearCount ) throw( ::com::sun::star::l
class ScaAnyConverter class ScaAnyConverter
{ {
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > xFormatter; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter2 > xFormatter;
sal_Int32 nDefaultFormat; sal_Int32 nDefaultFormat;
sal_Bool bHasValidFormat; sal_Bool bHasValidFormat;
@@ -1045,7 +1046,7 @@ private:
public: public:
ScaAnyConverter( ScaAnyConverter(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFact ); const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
~ScaAnyConverter(); ~ScaAnyConverter();
/// Initializing with current language settings /// Initializing with current language settings

7
svtools/source/table/cellvalueconversion.cxx
View File

@@ -27,7 +27,7 @@
#include "cellvalueconversion.hxx" #include "cellvalueconversion.hxx"
#include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/util/NumberFormatter.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/Date.hpp>
@@ -54,6 +54,8 @@ namespace svt
/** === begin UNO using === **/ /** === begin UNO using === **/
using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Any;
using ::com::sun::star::util::XNumberFormatter; using ::com::sun::star::util::XNumberFormatter;
using ::com::sun::star::util::XNumberFormatter2;
using ::com::sun::star::util::NumberFormatter;
using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::UNO_QUERY_THROW;
using ::com::sun::star::util::XNumberFormatsSupplier; using ::com::sun::star::util::XNumberFormatsSupplier;
using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::XPropertySet;
@@ -343,8 +345,7 @@ namespace svt
try try
{ {
// a number formatter // a number formatter
Reference< XNumberFormatter > const xFormatter( Reference< XNumberFormatter > const xFormatter( NumberFormatter::create( io_data.aContext.getUNOContext() ), UNO_QUERY_THROW );
io_data.aContext.createComponent( "com.sun.star.util.NumberFormatter" ), UNO_QUERY_THROW );
// a supplier of number formats // a supplier of number formats
Sequence< Any > aInitArgs(1); Sequence< Any > aInitArgs(1);

10
svx/source/fmcomp/gridctrl.cxx
View File

@@ -44,12 +44,13 @@
#include <com/sun/star/sdbc/XResultSetUpdate.hpp> #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
#include <com/sun/star/sdbcx/Privilege.hpp> #include <com/sun/star/sdbcx/Privilege.hpp>
#include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/util/NumberFormatter.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyChangeEvent.hpp> #include <com/sun/star/beans/PropertyChangeEvent.hpp>
#include <comphelper/extract.hxx> #include <comphelper/extract.hxx>
#include <comphelper/processfactory.hxx>
#include <tools/resid.hxx> #include <tools/resid.hxx>
#include <tools/diagnose_ex.h> #include <tools/diagnose_ex.h>
#include <vcl/menu.hxx> #include <vcl/menu.hxx>
@@ -1451,13 +1452,11 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
m_xFormatter = NULL; m_xFormatter = NULL;
OStaticDataAccessTools aStaticTools; OStaticDataAccessTools aStaticTools;
Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier = aStaticTools.getNumberFormats(aStaticTools.getRowSetConnection(_xCursor), sal_True); Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier = aStaticTools.getNumberFormats(aStaticTools.getRowSetConnection(_xCursor), sal_True);
if (xSupplier.is() && m_xServiceFactory.is()) if (xSupplier.is())
{ {
m_xFormatter = Reference< ::com::sun::star::util::XNumberFormatter >( m_xFormatter = Reference< ::com::sun::star::util::XNumberFormatter >(
m_xServiceFactory->createInstance(FM_NUMBER_FORMATTER), ::com::sun::star::util::NumberFormatter::create(comphelper::getComponentContext(m_xServiceFactory)),
UNO_QUERY); UNO_QUERY);
if (m_xFormatter.is())
{
m_xFormatter->attachNumberFormatsSupplier(xSupplier); m_xFormatter->attachNumberFormatsSupplier(xSupplier);
// retrieve the datebase of the Numberformatter // retrieve the datebase of the Numberformatter
@@ -1469,7 +1468,6 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
{ {
} }
} }
}
m_pDataCursor = new CursorWrapper(_xCursor); m_pDataCursor = new CursorWrapper(_xCursor);

7
svx/source/form/filtnav.cxx
View File

@@ -38,9 +38,10 @@
#include <com/sun/star/awt/XTextComponent.hpp> #include <com/sun/star/awt/XTextComponent.hpp>
#include <com/sun/star/form/runtime/XFormController.hpp> #include <com/sun/star/form/runtime/XFormController.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/util/NumberFormatter.hpp>
#include <com/sun/star/beans/XFastPropertySet.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp>
#include <comphelper/componentcontext.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <comphelper/property.hxx> #include <comphelper/property.hxx>
#include <comphelper/sequence.hxx> #include <comphelper/sequence.hxx>
@@ -103,6 +104,8 @@ namespace svxform
using ::com::sun::star::util::XNumberFormatsSupplier; using ::com::sun::star::util::XNumberFormatsSupplier;
using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::XPropertySet;
using ::com::sun::star::util::XNumberFormatter; using ::com::sun::star::util::XNumberFormatter;
using ::com::sun::star::util::XNumberFormatter2;
using ::com::sun::star::util::NumberFormatter;
using ::com::sun::star::sdbc::XRowSet; using ::com::sun::star::sdbc::XRowSet;
using ::com::sun::star::lang::Locale; using ::com::sun::star::lang::Locale;
using ::com::sun::star::sdb::SQLContext; using ::com::sun::star::sdb::SQLContext;
@@ -895,7 +898,7 @@ sal_Bool FmFilterModel::ValidateText(FmFilterItem* pItem, UniString& rText, UniS
// obtain a number formatter for this connection // obtain a number formatter for this connection
// TODO: shouldn't this be cached? // TODO: shouldn't this be cached?
Reference< XNumberFormatsSupplier > xFormatSupplier = aStaticTools.getNumberFormats( xConnection, sal_True ); Reference< XNumberFormatsSupplier > xFormatSupplier = aStaticTools.getNumberFormats( xConnection, sal_True );
Reference< XNumberFormatter > xFormatter( m_xORB->createInstance( FM_NUMBER_FORMATTER ), UNO_QUERY ); Reference< XNumberFormatter > xFormatter( NumberFormatter::create( comphelper::getComponentContext(m_xORB) ), UNO_QUERY_THROW );
xFormatter->attachNumberFormatsSupplier( xFormatSupplier ); xFormatter->attachNumberFormatsSupplier( xFormatSupplier );
// get the field (database column) which the item is responsible for // get the field (database column) which the item is responsible for

8
svx/source/form/fmsrcimp.cxx
View File

@@ -49,7 +49,7 @@
#include <com/sun/star/i18n/CollatorOptions.hpp> #include <com/sun/star/i18n/CollatorOptions.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/util/NumberFormatter.hpp>
#include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/NumberFormat.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/util/XNumberFormats.hpp> #include <com/sun/star/util/XNumberFormats.hpp>
@@ -710,9 +710,9 @@ FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB,
{ {
DBG_CTOR(FmSearchEngine,NULL); DBG_CTOR(FmSearchEngine,NULL);
m_xFormatter = Reference< ::com::sun::star::util::XNumberFormatter > (::comphelper::getProcessServiceFactory() m_xFormatter = Reference< ::com::sun::star::util::XNumberFormatter >(
->createInstance(FM_NUMBER_FORMATTER), UNO_QUERY); ::com::sun::star::util::NumberFormatter::create( ::comphelper::getProcessComponentContext() ),
if (m_xFormatter.is()) UNO_QUERY_THROW);
m_xFormatter->attachNumberFormatsSupplier(m_xFormatSupplier); m_xFormatter->attachNumberFormatsSupplier(m_xFormatSupplier);
Init(sVisibleFields); Init(sVisibleFields);

1
svx/source/inc/fmservs.hxx
View File

@@ -21,7 +21,6 @@
#include <svx/svxdllapi.h> #include <svx/svxdllapi.h>
#define FM_NUMBER_FORMATTER rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.NumberFormatter" ) )
#define FM_COMPONENT_EDIT rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.Edit" ) ) #define FM_COMPONENT_EDIT rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.Edit" ) )
#define FM_COMPONENT_TEXTFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.TextField" ) ) #define FM_COMPONENT_TEXTFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.TextField" ) )
#define FM_COMPONENT_LISTBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.ListBox" ) ) #define FM_COMPONENT_LISTBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.ListBox" ) )