diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /reportdesign | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'reportdesign')
165 files changed, 2124 insertions, 2124 deletions
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx index c923f1d940a9..b4842117ab97 100644 --- a/reportdesign/inc/ReportDefinition.hxx +++ b/reportdesign/inc/ReportDefinition.hxx @@ -99,12 +99,12 @@ namespace reportdesign OReportDefinition(const OReportDefinition&); OReportDefinition& operator=(const OReportDefinition&); - void setSection( const ::rtl::OUString& _sProperty + void setSection( const OUString& _sProperty ,const sal_Bool& _bOn - ,const ::rtl::OUString& _sName + ,const OUString& _sName ,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _member); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const OUString& _sProperty ,const T& _Value ,T& _member) { @@ -145,7 +145,7 @@ namespace reportdesign const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rMediaDesc); - void notifyEvent(const ::rtl::OUString& _sEventName); + void notifyEvent(const OUString& _sEventName); void init(); void fillArgs(::comphelper::MediaDescriptor& _aDescriptor); @@ -174,8 +174,8 @@ namespace reportdesign ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _xFactory ,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _xShape); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); @@ -192,42 +192,42 @@ namespace reportdesign DECLARE_XINTERFACE( ) DECLARE_XTYPEPROVIDER( ) // ::com::sun::star::lang::XServiceInfo - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XReportDefinition - virtual ::rtl::OUString SAL_CALL getMimeType() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMimeType( const ::rtl::OUString& _mimetype ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCaption() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getMimeType() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setMimeType( const OUString& _mimetype ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getGroupKeepTogether() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setGroupKeepTogether( ::sal_Int16 _groupkeeptogether ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getPageHeaderOption() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPageHeaderOption( ::sal_Int16 _pageheaderoption ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getPageFooterOption() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPageFooterOption( ::sal_Int16 _pagefooteroption ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCommand() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCommand( const ::rtl::OUString& _command ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCommand() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCommand( const OUString& _command ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getCommandType() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setCommandType( ::sal_Int32 _commandtype ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFilter() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFilter( const ::rtl::OUString& _filter ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getFilter() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFilter( const OUString& _filter ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getEscapeProcessing() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setEscapeProcessing( ::sal_Bool _escapeprocessing ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getActiveConnection() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setActiveConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _activeconnection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDataSourceName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDataSourceName( const ::rtl::OUString& _datasourcename ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDataSourceName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDataSourceName( const OUString& _datasourcename ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getReportHeaderOn() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setReportHeaderOn( ::sal_Bool _reportheaderon ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getReportFooterOn() throw (::com::sun::star::uno::RuntimeException); @@ -243,7 +243,7 @@ namespace reportdesign virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getPageFooter() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getReportFooter() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventBroadcaster > SAL_CALL getEventBroadcaster( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableMimeTypes( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableMimeTypes( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XReportComponent REPORTCOMPONENT_HEADER() @@ -252,7 +252,7 @@ namespace reportdesign SHAPE_HEADER() // XShapeDescriptor - virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException); //XFunctionsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions > SAL_CALL getFunctions() throw (::com::sun::star::uno::RuntimeException); @@ -283,8 +283,8 @@ namespace reportdesign virtual void SAL_CALL close( ::sal_Bool DeliverOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException); // XModel - virtual ::sal_Bool SAL_CALL attachResource( const ::rtl::OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL attachResource( const OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) throw (::com::sun::star::uno::RuntimeException); @@ -341,32 +341,32 @@ namespace reportdesign virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( ) throw (::com::sun::star::uno::RuntimeException); // XDocumentSubStorageSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getDocumentSubStorage( const ::rtl::OUString& aStorageName, sal_Int32 nMode ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getDocumentSubStoragesNames( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); // SvxUnoDrawMSFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); // XStyleFamiliesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw (::com::sun::star::uno::RuntimeException); // XModule - virtual void SAL_CALL setIdentifier( const ::rtl::OUString& Identifier ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getIdentifier( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setIdentifier( const OUString& Identifier ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getIdentifier( ) throw (::com::sun::star::uno::RuntimeException); // XNumberFormatsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getNumberFormatSettings( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL getNumberFormats( ) throw (::com::sun::star::uno::RuntimeException); // XTitle - virtual ::rtl::OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (::com::sun::star::uno::RuntimeException); // XTitleChangeBroadcaster virtual void SAL_CALL addTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); @@ -376,7 +376,7 @@ namespace reportdesign virtual ::sal_Int32 SAL_CALL leaseNumber( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xComponent ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL releaseNumberForComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xComponent ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUntitledPrefix( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUntitledPrefix( ) throw (::com::sun::star::uno::RuntimeException); // XDocumentPropertiesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > SAL_CALL getDocumentProperties( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/reportdesign/inc/ReportHelperDefines.hxx b/reportdesign/inc/ReportHelperDefines.hxx index a54dea39a218..afdfc9bfd707 100644 --- a/reportdesign/inc/ReportHelperDefines.hxx +++ b/reportdesign/inc/ReportHelperDefines.hxx @@ -20,12 +20,12 @@ #define INCLUDED_REPORTHELPERDEFINES_HXX #define REPORTCONTROLMODEL_HEADER() \ - virtual ::rtl::OUString SAL_CALL getDataField() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \ - virtual void SAL_CALL setDataField(const ::rtl::OUString & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException); \ + virtual OUString SAL_CALL getDataField() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \ + virtual void SAL_CALL setDataField(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException); \ virtual ::sal_Bool SAL_CALL getPrintWhenGroupChange() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \ virtual void SAL_CALL setPrintWhenGroupChange(::sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \ - virtual ::rtl::OUString SAL_CALL getConditionalPrintExpression() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \ - virtual void SAL_CALL setConditionalPrintExpression(const ::rtl::OUString & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \ + virtual OUString SAL_CALL getConditionalPrintExpression() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \ + virtual void SAL_CALL setConditionalPrintExpression(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \ virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition > SAL_CALL createFormatCondition() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception); #define SHAPE_HEADER() \ @@ -35,8 +35,8 @@ virtual void SAL_CALL setSize(const ::com::sun::star::awt::Size & aSize) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException); #define REPORTCOMPONENT_HEADER() \ - virtual ::rtl::OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); \ - virtual void SAL_CALL setName(const ::rtl::OUString & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException); \ + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); \ + virtual void SAL_CALL setName(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException); \ virtual ::sal_Int32 SAL_CALL getHeight() throw (::com::sun::star::uno::RuntimeException); \ virtual void SAL_CALL setHeight(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException); \ virtual ::sal_Int32 SAL_CALL getPositionX() throw (::com::sun::star::uno::RuntimeException); \ @@ -51,10 +51,10 @@ virtual void SAL_CALL setControlBorderColor(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException); \ virtual ::sal_Bool SAL_CALL getPrintRepeatedValues() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \ virtual void SAL_CALL setPrintRepeatedValues(::sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getMasterFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); \ - virtual void SAL_CALL setMasterFields( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _masterfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); \ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getDetailFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); \ - virtual void SAL_CALL setDetailFields( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _detailfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); \ + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getMasterFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); \ + virtual void SAL_CALL setMasterFields( const ::com::sun::star::uno::Sequence< OUString >& _masterfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); \ + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getDetailFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); \ + virtual void SAL_CALL setDetailFields( const ::com::sun::star::uno::Sequence< OUString >& _detailfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); \ virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getSection() throw (::com::sun::star::uno::RuntimeException); #define REPORTCONTROLFORMAT_HEADER() \ @@ -76,10 +76,10 @@ virtual void SAL_CALL setCharEmphasis( ::sal_Int16 _charemphasis ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual ::sal_Bool SAL_CALL getCharCombineIsOn() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual void SAL_CALL setCharCombineIsOn( ::sal_Bool _charcombineison ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual ::rtl::OUString SAL_CALL getCharCombinePrefix() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual void SAL_CALL setCharCombinePrefix( const ::rtl::OUString& _charcombineprefix ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual ::rtl::OUString SAL_CALL getCharCombineSuffix() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual void SAL_CALL setCharCombineSuffix( const ::rtl::OUString& _charcombinesuffix ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual OUString SAL_CALL getCharCombinePrefix() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual void SAL_CALL setCharCombinePrefix( const OUString& _charcombineprefix ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual OUString SAL_CALL getCharCombineSuffix() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual void SAL_CALL setCharCombineSuffix( const OUString& _charcombinesuffix ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual ::sal_Bool SAL_CALL getCharHidden() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual void SAL_CALL setCharHidden( ::sal_Bool _charhidden ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual ::sal_Bool SAL_CALL getCharShadowed() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ @@ -102,10 +102,10 @@ virtual void SAL_CALL setCharFlash( ::sal_Bool _charflash ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual ::sal_Int16 SAL_CALL getCharRelief() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual void SAL_CALL setCharRelief( ::sal_Int16 _charrelief ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual ::rtl::OUString SAL_CALL getCharFontName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual void SAL_CALL setCharFontName( const ::rtl::OUString& _charfontname ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual ::rtl::OUString SAL_CALL getCharFontStyleName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual void SAL_CALL setCharFontStyleName( const ::rtl::OUString& _charfontstylename ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual OUString SAL_CALL getCharFontName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual void SAL_CALL setCharFontName( const OUString& _charfontname ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual OUString SAL_CALL getCharFontStyleName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual void SAL_CALL setCharFontStyleName( const OUString& _charfontstylename ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual ::sal_Int16 SAL_CALL getCharFontFamily() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual void SAL_CALL setCharFontFamily( ::sal_Int16 _charfontfamily ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual ::sal_Int16 SAL_CALL getCharFontCharSet() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ @@ -134,24 +134,24 @@ virtual void SAL_CALL setCharScaleWidth( ::sal_Int16 _charscalewidth ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual ::com::sun::star::style::VerticalAlignment SAL_CALL getVerticalAlign() throw (::com::sun::star::beans::UnknownPropertyException,::com::sun::star::uno::RuntimeException);\ virtual void SAL_CALL setVerticalAlign( ::com::sun::star::style::VerticalAlignment _paravertalignment ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual ::rtl::OUString SAL_CALL getHyperLinkURL() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual void SAL_CALL setHyperLinkURL( const ::rtl::OUString& _hyperlinkurl ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual ::rtl::OUString SAL_CALL getHyperLinkTarget() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual void SAL_CALL setHyperLinkTarget( const ::rtl::OUString& _hyperlinktarget ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual ::rtl::OUString SAL_CALL getHyperLinkName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual void SAL_CALL setHyperLinkName( const ::rtl::OUString& _hyperlinkname ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual ::rtl::OUString SAL_CALL getVisitedCharStyleName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual void SAL_CALL setVisitedCharStyleName( const ::rtl::OUString& _visitedcharstylename ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual ::rtl::OUString SAL_CALL getUnvisitedCharStyleName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual void SAL_CALL setUnvisitedCharStyleName( const ::rtl::OUString& _unvisitedcharstylename ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual OUString SAL_CALL getHyperLinkURL() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual void SAL_CALL setHyperLinkURL( const OUString& _hyperlinkurl ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual OUString SAL_CALL getHyperLinkTarget() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual void SAL_CALL setHyperLinkTarget( const OUString& _hyperlinktarget ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual OUString SAL_CALL getHyperLinkName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual void SAL_CALL setHyperLinkName( const OUString& _hyperlinkname ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual OUString SAL_CALL getVisitedCharStyleName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual void SAL_CALL setVisitedCharStyleName( const OUString& _visitedcharstylename ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual OUString SAL_CALL getUnvisitedCharStyleName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual void SAL_CALL setUnvisitedCharStyleName( const OUString& _unvisitedcharstylename ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual float SAL_CALL getCharHeightAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual void SAL_CALL setCharHeightAsian( float _charheightasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual float SAL_CALL getCharWeightAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual void SAL_CALL setCharWeightAsian( float _charweightasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual ::rtl::OUString SAL_CALL getCharFontNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual void SAL_CALL setCharFontNameAsian( const ::rtl::OUString& _charfontnameasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual ::rtl::OUString SAL_CALL getCharFontStyleNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual void SAL_CALL setCharFontStyleNameAsian( const ::rtl::OUString& _charfontstylenameasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual OUString SAL_CALL getCharFontNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual void SAL_CALL setCharFontNameAsian( const OUString& _charfontnameasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual OUString SAL_CALL getCharFontStyleNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual void SAL_CALL setCharFontStyleNameAsian( const OUString& _charfontstylenameasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual ::sal_Int16 SAL_CALL getCharFontFamilyAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual void SAL_CALL setCharFontFamilyAsian( ::sal_Int16 _charfontfamilyasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual ::sal_Int16 SAL_CALL getCharFontCharSetAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ @@ -166,10 +166,10 @@ virtual void SAL_CALL setCharHeightComplex( float _charheightcomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual float SAL_CALL getCharWeightComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual void SAL_CALL setCharWeightComplex( float _charweightcomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual ::rtl::OUString SAL_CALL getCharFontNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual void SAL_CALL setCharFontNameComplex( const ::rtl::OUString& _charfontnamecomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual ::rtl::OUString SAL_CALL getCharFontStyleNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ - virtual void SAL_CALL setCharFontStyleNameComplex( const ::rtl::OUString& _charfontstylenamecomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual OUString SAL_CALL getCharFontNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual void SAL_CALL setCharFontNameComplex( const OUString& _charfontnamecomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual OUString SAL_CALL getCharFontStyleNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ + virtual void SAL_CALL setCharFontStyleNameComplex( const OUString& _charfontstylenamecomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual ::sal_Int16 SAL_CALL getCharFontFamilyComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual void SAL_CALL setCharFontFamilyComplex( ::sal_Int16 _charfontfamilycomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual ::sal_Int16 SAL_CALL getCharFontCharSetComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index da1efc198b3c..f633259f631b 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -78,11 +78,11 @@ namespace ControlModification static const ::sal_Int32 HEIGHT_GREATEST = (sal_Int32)10; } -class AnyConverter : public ::std::binary_function< ::rtl::OUString,::com::sun::star::uno::Any,::com::sun::star::uno::Any > +class AnyConverter : public ::std::binary_function< OUString,::com::sun::star::uno::Any,::com::sun::star::uno::Any > { public: virtual ~AnyConverter(){} - virtual ::com::sun::star::uno::Any operator() (const ::rtl::OUString& /*_sPropertyName*/,const ::com::sun::star::uno::Any& lhs) const + virtual ::com::sun::star::uno::Any operator() (const OUString& /*_sPropertyName*/,const ::com::sun::star::uno::Any& lhs) const { return lhs; } @@ -91,7 +91,7 @@ public: @param _xComponent the report component */ REPORTDESIGN_DLLPUBLIC sal_uInt16 getObjectType(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent); -typedef ::std::pair< ::rtl::OUString, ::boost::shared_ptr<AnyConverter> > TPropertyConverter; +typedef ::std::pair< OUString, ::boost::shared_ptr<AnyConverter> > TPropertyConverter; DECLARE_STL_USTRINGACCESS_MAP(TPropertyConverter , TPropertyNamePair); /** returns the property name map for the givern property id @param _nObjectId the object id @@ -100,7 +100,7 @@ REPORTDESIGN_DLLPUBLIC const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _n REPORTDESIGN_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle> getUsedStyle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport); // ----------------------------------------------------------------------------- -template < typename T> T getStyleProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,const ::rtl::OUString& _sPropertyName) +template < typename T> T getStyleProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,const OUString& _sPropertyName) { T nReturn = T(); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xProp(getUsedStyle(_xReport),::com::sun::star::uno::UNO_QUERY_THROW); @@ -108,7 +108,7 @@ template < typename T> T getStyleProperty(const ::com::sun::star::uno::Reference return nReturn; } // ----------------------------------------------------------------------------- -template<typename T> void setStyleProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,const ::rtl::OUString& _sPropertyName,const T& _aValue) +template<typename T> void setStyleProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,const OUString& _sPropertyName,const T& _aValue) { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xProp(getUsedStyle(_xReport),::com::sun::star::uno::UNO_QUERY); if ( xProp.is() ) diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx index 197932b424b2..9062a7aaf0f7 100644 --- a/reportdesign/inc/RptModel.hxx +++ b/reportdesign/inc/RptModel.hxx @@ -87,7 +87,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > getReportDefinition() const; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createShape(const ::rtl::OUString& aServiceSpecifier,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rShape,sal_Int32 nOrientation = -1); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createShape(const OUString& aServiceSpecifier,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rShape,sal_Int32 nOrientation = -1); }; } #endif diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index 7a11c4e52c50..ac22e47d4f45 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -38,7 +38,7 @@ namespace rptui { -typedef ::std::multimap< sal_Int16, ::rtl::OUString, ::std::less< sal_Int16 > > IndexToNameMap; +typedef ::std::multimap< sal_Int16, OUString, ::std::less< sal_Int16 > > IndexToNameMap; enum DlgEdHintKind { RPTUI_HINT_UNKNOWN, @@ -83,11 +83,11 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener> m_xContainerListener; ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xSection; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xKeepShapeAlive; - ::rtl::OUString m_sComponentName; + OUString m_sComponentName; sal_Bool m_bIsListening; OObjectBase(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent); - OObjectBase(const ::rtl::OUString& _sComponentName); + OObjectBase(const OUString& _sComponentName); virtual ~OObjectBase(); @@ -115,14 +115,14 @@ public: virtual void _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException); virtual void initializeOle() {} - sal_Bool supportsService( const ::rtl::OUString& _sServiceName ) const; + sal_Bool supportsService( const OUString& _sServiceName ) const; ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> getReportComponent() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent(); inline void setOldParent(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) { m_xSection = _xSection; } inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> getOldParent() const { return m_xSection;} ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> getSection() const; - inline const ::rtl::OUString getServiceName() const { return m_sComponentName; } + inline const OUString getServiceName() const { return m_sComponentName; } /** releases the reference to our UNO shape (m_xKeepShapeAlive) */ @@ -147,7 +147,7 @@ public: protected: OCustomShape(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent); - OCustomShape(const ::rtl::OUString& _sComponentName); + OCustomShape(const OUString& _sComponentName); virtual void NbcMove( const Size& rSize ); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); @@ -189,7 +189,7 @@ public: } protected: OOle2Obj(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent,sal_uInt16 _nType); - OOle2Obj(const ::rtl::OUString& _sComponentName,sal_uInt16 _nType); + OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType); virtual void NbcMove( const Size& rSize ); @@ -231,11 +231,11 @@ class REPORTDESIGN_DLLPUBLIC OUnoObject: public SdrUnoObj , public OObjectBase sal_uInt16 m_nObjectType; protected: - OUnoObject(const ::rtl::OUString& _sComponentName - ,const ::rtl::OUString& rModelName + OUnoObject(const OUString& _sComponentName + ,const OUString& rModelName ,sal_uInt16 _nObjectType); OUnoObject( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent - ,const ::rtl::OUString& rModelName + ,const OUString& rModelName ,sal_uInt16 _nObjectType); virtual ~OUnoObject(); @@ -261,7 +261,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent(); - static ::rtl::OUString GetDefaultName(const OUnoObject* _pObj); + static OUString GetDefaultName(const OUnoObject* _pObj); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape(); virtual sal_uInt16 GetObjIdentifier() const; diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index 056ebf8773d5..4f8a1d8ec65b 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -113,7 +113,7 @@ namespace rptui class UndoContext { public: - UndoContext( SfxUndoManager& i_undoManager, const ::rtl::OUString& i_undoTitle ) + UndoContext( SfxUndoManager& i_undoManager, const OUString& i_undoTitle ) :m_rUndoManager( i_undoManager ) { m_rUndoManager.EnterListAction( i_undoTitle, String() ); @@ -164,7 +164,7 @@ namespace rptui ,sal_uInt16 nCommentID); virtual ~OCommentUndoAction(); - virtual rtl::OUString GetComment() const { return m_strComment; } + virtual OUString GetComment() const { return m_strComment; } virtual void Undo(); virtual void Redo(); }; @@ -252,7 +252,7 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC ORptUndoPropertyAction: public OCommentUndoAction { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xObj; - ::rtl::OUString m_aPropertyName; + OUString m_aPropertyName; ::com::sun::star::uno::Any m_aNewValue; ::com::sun::star::uno::Any m_aOldValue; @@ -270,7 +270,7 @@ namespace rptui virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; //================================================================== diff --git a/reportdesign/inc/conditionalexpression.hxx b/reportdesign/inc/conditionalexpression.hxx index a8a968ab40d3..bc7c89ea4900 100644 --- a/reportdesign/inc/conditionalexpression.hxx +++ b/reportdesign/inc/conditionalexpression.hxx @@ -38,14 +38,14 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC ConditionalExpression { private: - const ::rtl::OUString m_sPattern; + const OUString m_sPattern; public: ConditionalExpression( const sal_Char* _pAsciiPattern ); /** assembles an expression string from a field data source, and one or two operands */ - ::rtl::OUString assembleExpression( const ::rtl::OUString& _rFieldDataSource, const ::rtl::OUString& _rLHS, const ::rtl::OUString& _rRHS ) const; + OUString assembleExpression( const OUString& _rFieldDataSource, const OUString& _rLHS, const OUString& _rRHS ) const; /** matches the given expression string to the expression pattern represented by the object @param _rExpression @@ -60,7 +60,7 @@ namespace rptui <TRUE/> if and only if the expression string could be successfully matched to the pattern. */ - bool matchExpression( const ::rtl::OUString& _rExpression, const ::rtl::OUString& _rFieldDataSource, ::rtl::OUString& _out_rLHS, ::rtl::OUString& _out_rRHS ) const; + bool matchExpression( const OUString& _rExpression, const OUString& _rFieldDataSource, OUString& _out_rLHS, OUString& _out_rRHS ) const; }; //======================================================================== diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx index 01f502bf59de..12f9eae4695c 100644 --- a/reportdesign/inc/reportformula.hxx +++ b/reportdesign/inc/reportformula.hxx @@ -47,15 +47,15 @@ namespace rptui private: BindType m_eType; - ::rtl::OUString m_sCompleteFormula; - ::rtl::OUString m_sUndecoratedContent; + OUString m_sCompleteFormula; + OUString m_sUndecoratedContent; public: /// constructs a ReportFormula object from a string - ReportFormula( const ::rtl::OUString& _rFormula ); + ReportFormula( const OUString& _rFormula ); /// constructs a ReportFormula by BindType - ReportFormula( const BindType _eType, const ::rtl::OUString& _rFieldOrExpression ); + ReportFormula( const BindType _eType, const OUString& _rFieldOrExpression ); ~ReportFormula(); ReportFormula& operator=(class ReportFormula const &); @@ -67,7 +67,7 @@ namespace rptui inline BindType getType() const { return m_eType; } /// returns the complete formula represented by the object - const ::rtl::OUString& + const OUString& getCompleteFormula() const; /** gets the <em>undecorated formula</em> content @@ -78,18 +78,18 @@ namespace rptui If the formula denotes an expression, then the <em>undecorated content</em> is the expression itself. */ - const ::rtl::OUString& getUndecoratedContent() const; + const OUString& getUndecoratedContent() const; /// convenience alias for <code>getUndecoratedContent</code>, which asserts (in a non-product build) when used on an expression - inline ::rtl::OUString getFieldName() const; + inline OUString getFieldName() const; /** @returns "=" + getFieldName() */ - ::rtl::OUString getEqualUndecoratedContent() const; + OUString getEqualUndecoratedContent() const; /// convenience alias for <code>getUndecoratedContent</code>, which asserts (in a non-product build) when used on a field - inline ::rtl::OUString getExpression() const; + inline OUString getExpression() const; /** returns a bracketed field name of the formula denotes a field reference, or the undecorated expression if the formula denotes an expression. @@ -97,21 +97,21 @@ namespace rptui Effectively, this means the method returns the complete formular, stripped by the prefix which indicates a field or a expression. */ - ::rtl::OUString getBracketedFieldOrExpression() const; + OUString getBracketedFieldOrExpression() const; private: - void impl_construct( const ::rtl::OUString& _rFormula ); + void impl_construct( const OUString& _rFormula ); }; //-------------------------------------------------------------------- - inline ::rtl::OUString ReportFormula::getFieldName() const + inline OUString ReportFormula::getFieldName() const { OSL_PRECOND( getType() == Field, "ReportFormula::getFieldName: not bound to a field!" ); return getUndecoratedContent(); } //-------------------------------------------------------------------- - inline ::rtl::OUString ReportFormula::getExpression() const + inline OUString ReportFormula::getExpression() const { OSL_PRECOND( getType() == Expression, "ReportFormula::getExpression: not bound to an expression!" ); return getUndecoratedContent(); diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 9d5e56f89c85..f22fb7a0bb04 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -38,9 +38,9 @@ namespace reportdesign // ============================================================================= using namespace com::sun::star; using namespace comphelper; -uno::Sequence< ::rtl::OUString > lcl_getLineOptionals() +uno::Sequence< OUString > lcl_getLineOptionals() { - ::rtl::OUString pProps[] = { + OUString pProps[] = { PROPERTY_DATAFIELD ,PROPERTY_DEFAULTCONTROL ,PROPERTY_CONTROLBORDER @@ -124,7 +124,7 @@ uno::Sequence< ::rtl::OUString > lcl_getLineOptionals() }; - return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); + return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); } DBG_NAME(rpt_OFixedLine) // ----------------------------------------------------------------------------- @@ -207,20 +207,20 @@ void SAL_CALL OFixedLine::dispose() throw(uno::RuntimeException) cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- -::rtl::OUString OFixedLine::getImplementationName_Static( ) throw(uno::RuntimeException) +OUString OFixedLine::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.OFixedLine"); + return OUString("com.sun.star.comp.report.OFixedLine"); } //-------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OFixedLine::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL OFixedLine::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > OFixedLine::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) +uno::Sequence< OUString > OFixedLine::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aServices(1); + uno::Sequence< OUString > aServices(1); aServices.getArray()[0] = SERVICE_FIXEDLINE; return aServices; @@ -232,12 +232,12 @@ uno::Reference< uno::XInterface > OFixedLine::create(uno::Reference< uno::XCompo } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OFixedLine::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OFixedLine::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL OFixedLine::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException ) +sal_Bool SAL_CALL OFixedLine::supportsService(const OUString& ServiceName) throw( uno::RuntimeException ) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } @@ -271,43 +271,43 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OFixedLine::getPropertySetInf return FixedLinePropertySet::getPropertySetInfo(); } // ----------------------------------------------------------------------------- -void SAL_CALL OFixedLine::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFixedLine::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { FixedLinePropertySet::setPropertyValue( aPropertyName, aValue ); } // ----------------------------------------------------------------------------- -uno::Any SAL_CALL OFixedLine::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL OFixedLine::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return FixedLinePropertySet::getPropertyValue( PropertyName); } // ----------------------------------------------------------------------------- -void SAL_CALL OFixedLine::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFixedLine::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FixedLinePropertySet::addPropertyChangeListener( aPropertyName, xListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OFixedLine::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFixedLine::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FixedLinePropertySet::removePropertyChangeListener( aPropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OFixedLine::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFixedLine::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FixedLinePropertySet::addVetoableChangeListener( PropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OFixedLine::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFixedLine::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FixedLinePropertySet::removeVetoableChangeListener( PropertyName, aListener ); } // ----------------------------------------------------------------------------- // XReportControlModel -::rtl::OUString SAL_CALL OFixedLine::getDataField() throw (beans::UnknownPropertyException, uno::RuntimeException) +OUString SAL_CALL OFixedLine::getDataField() throw (beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } // ----------------------------------------------------------------------------- -void SAL_CALL OFixedLine::setDataField( const ::rtl::OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) +void SAL_CALL OFixedLine::setDataField( const OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } @@ -342,12 +342,12 @@ void SAL_CALL OFixedLine::setPrintWhenGroupChange( ::sal_Bool /*_printwhengroupc throw beans::UnknownPropertyException(); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OFixedLine::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException) +OUString SAL_CALL OFixedLine::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } // ----------------------------------------------------------------------------- -void SAL_CALL OFixedLine::setConditionalPrintExpression( const ::rtl::OUString& /*_conditionalprintexpression*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException) +void SAL_CALL OFixedLine::setConditionalPrintExpression( const OUString& /*_conditionalprintexpression*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } @@ -515,7 +515,7 @@ awt::Size SAL_CALL OFixedLine::getSize( ) throw (uno::RuntimeException) void SAL_CALL OFixedLine::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, uno::RuntimeException) { const char hundredthmmC[] = "0\xe2\x80\x89\xC2\xB5""m"; // in UTF-8: 0, thin space, µ (micro), m (meter) - const rtl::OUString hundredthmm(hundredthmmC, sizeof(hundredthmmC)-1, RTL_TEXTENCODING_UTF8); + const OUString hundredthmm(hundredthmmC, sizeof(hundredthmmC)-1, RTL_TEXTENCODING_UTF8); if ( aSize.Width < MIN_WIDTH && m_nOrientation == 1 ) throw beans::PropertyVetoException("Too small width for FixedLine; minimum is " + OUString::number(MIN_WIDTH) + hundredthmm, static_cast<cppu::OWeakObject*>(this)); else if ( aSize.Height < MIN_HEIGHT && m_nOrientation == 0 ) @@ -524,32 +524,32 @@ void SAL_CALL OFixedLine::setSize( const awt::Size& aSize ) throw (beans::Proper } // ----------------------------------------------------------------------------- // XShapeDescriptor -::rtl::OUString SAL_CALL OFixedLine::getShapeType( ) throw (uno::RuntimeException) +OUString SAL_CALL OFixedLine::getShapeType( ) throw (uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.drawing.ControlShape"); + return OUString("com.sun.star.drawing.ControlShape"); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OFixedLine::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) +OUString SAL_CALL OFixedLine::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) { throw beans::UnknownPropertyException(); } -void SAL_CALL OFixedLine::setHyperLinkURL(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) +void SAL_CALL OFixedLine::setHyperLinkURL(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) { throw beans::UnknownPropertyException(); } -::rtl::OUString SAL_CALL OFixedLine::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) +OUString SAL_CALL OFixedLine::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) { throw beans::UnknownPropertyException(); } -void SAL_CALL OFixedLine::setHyperLinkTarget(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) +void SAL_CALL OFixedLine::setHyperLinkTarget(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) { throw beans::UnknownPropertyException(); } -::rtl::OUString SAL_CALL OFixedLine::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) +OUString SAL_CALL OFixedLine::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) { throw beans::UnknownPropertyException(); } -void SAL_CALL OFixedLine::setHyperLinkName(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) +void SAL_CALL OFixedLine::setHyperLinkName(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) { throw beans::UnknownPropertyException(); } diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx index de2ff89b7c82..8c256c15e354 100644 --- a/reportdesign/source/core/api/FixedText.cxx +++ b/reportdesign/source/core/api/FixedText.cxx @@ -36,10 +36,10 @@ namespace reportdesign // ============================================================================= using namespace com::sun::star; using namespace comphelper; -uno::Sequence< ::rtl::OUString > lcl_getFixedTextOptionals() +uno::Sequence< OUString > lcl_getFixedTextOptionals() { - ::rtl::OUString pProps[] = { PROPERTY_DATAFIELD,PROPERTY_MASTERFIELDS,PROPERTY_DETAILFIELDS }; - return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); + OUString pProps[] = { PROPERTY_DATAFIELD,PROPERTY_MASTERFIELDS,PROPERTY_DETAILFIELDS }; + return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); } DBG_NAME( rpt_OFixedText ) // ----------------------------------------------------------------------------- @@ -97,20 +97,20 @@ void SAL_CALL OFixedText::dispose() throw(uno::RuntimeException) uno::Reference< report::XFixedText> xHoldAlive = this; } // ----------------------------------------------------------------------------- -::rtl::OUString OFixedText::getImplementationName_Static( ) throw(uno::RuntimeException) +OUString OFixedText::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.OFixedText"); + return OUString("com.sun.star.comp.report.OFixedText"); } //-------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OFixedText::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL OFixedText::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > OFixedText::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) +uno::Sequence< OUString > OFixedText::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aServices(1); + uno::Sequence< OUString > aServices(1); aServices.getArray()[0] = SERVICE_FIXEDTEXT; return aServices; @@ -122,12 +122,12 @@ uno::Reference< uno::XInterface > OFixedText::create(uno::Reference< uno::XCompo } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OFixedText::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OFixedText::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL OFixedText::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException ) +sal_Bool SAL_CALL OFixedText::supportsService(const OUString& ServiceName) throw( uno::RuntimeException ) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } @@ -143,43 +143,43 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OFixedText::getPropertySetInf return FixedTextPropertySet::getPropertySetInfo(); } // ----------------------------------------------------------------------------- -void SAL_CALL OFixedText::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFixedText::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { FixedTextPropertySet::setPropertyValue( aPropertyName, aValue ); } // ----------------------------------------------------------------------------- -uno::Any SAL_CALL OFixedText::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL OFixedText::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return FixedTextPropertySet::getPropertyValue( PropertyName); } // ----------------------------------------------------------------------------- -void SAL_CALL OFixedText::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFixedText::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FixedTextPropertySet::addPropertyChangeListener( aPropertyName, xListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OFixedText::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFixedText::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FixedTextPropertySet::removePropertyChangeListener( aPropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OFixedText::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFixedText::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FixedTextPropertySet::addVetoableChangeListener( PropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OFixedText::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFixedText::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FixedTextPropertySet::removeVetoableChangeListener( PropertyName, aListener ); } // ----------------------------------------------------------------------------- // XReportControlModel -::rtl::OUString SAL_CALL OFixedText::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException) +OUString SAL_CALL OFixedText::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } // ----------------------------------------------------------------------------- -void SAL_CALL OFixedText::setDataField( const ::rtl::OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) +void SAL_CALL OFixedText::setDataField( const OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } @@ -197,13 +197,13 @@ void SAL_CALL OFixedText::setPrintWhenGroupChange( ::sal_Bool _printwhengroupcha set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OFixedText::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException) +OUString SAL_CALL OFixedText::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.aConditionalPrintExpression; } // ----------------------------------------------------------------------------- -void SAL_CALL OFixedText::setConditionalPrintExpression( const ::rtl::OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException) +void SAL_CALL OFixedText::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException) { set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression); } @@ -219,13 +219,13 @@ uno::Reference< util::XCloneable > SAL_CALL OFixedText::createClone( ) throw (u // ----------------------------------------------------------------------------- // XFixedText -::rtl::OUString SAL_CALL OFixedText::getLabel() throw (uno::RuntimeException) +OUString SAL_CALL OFixedText::getLabel() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_sLabel; } // ----------------------------------------------------------------------------- -void SAL_CALL OFixedText::setLabel( const ::rtl::OUString& _label ) throw (uno::RuntimeException) +void SAL_CALL OFixedText::setLabel( const OUString& _label ) throw (uno::RuntimeException) { set(PROPERTY_LABEL,_label,m_sLabel); } @@ -319,9 +319,9 @@ void SAL_CALL OFixedText::setSize( const awt::Size& aSize ) throw (beans::Proper // ----------------------------------------------------------------------------- // XShapeDescriptor -::rtl::OUString SAL_CALL OFixedText::getShapeType( ) throw (uno::RuntimeException) +OUString SAL_CALL OFixedText::getShapeType( ) throw (uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.drawing.ControlShape"); + return OUString("com.sun.star.drawing.ControlShape"); } // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx index 96d9df3c4c3b..b17ea240b7f3 100644 --- a/reportdesign/source/core/api/FormatCondition.cxx +++ b/reportdesign/source/core/api/FormatCondition.cxx @@ -43,7 +43,7 @@ DBG_NAME( rpt_OFormatCondition ) // ----------------------------------------------------------------------------- OFormatCondition::OFormatCondition(uno::Reference< uno::XComponentContext > const & _xContext) :FormatConditionBase(m_aMutex) -,FormatConditionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >()) +,FormatConditionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >()) ,m_bEnabled(sal_True) { DBG_CTOR( rpt_OFormatCondition,NULL); @@ -62,31 +62,31 @@ void SAL_CALL OFormatCondition::dispose() throw(uno::RuntimeException) cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- -::rtl::OUString OFormatCondition::getImplementationName_Static( ) throw(uno::RuntimeException) +OUString OFormatCondition::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.OFormatCondition"); + return OUString("com.sun.star.comp.report.OFormatCondition"); } //-------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OFormatCondition::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL OFormatCondition::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > OFormatCondition::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) +uno::Sequence< OUString > OFormatCondition::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aServices(1); + uno::Sequence< OUString > aServices(1); aServices.getArray()[0] = SERVICE_FORMATCONDITION; return aServices; } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OFormatCondition::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OFormatCondition::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL OFormatCondition::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException ) +sal_Bool SAL_CALL OFormatCondition::supportsService(const OUString& ServiceName) throw( uno::RuntimeException ) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } @@ -96,32 +96,32 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OFormatCondition::getProperty return FormatConditionPropertySet::getPropertySetInfo(); } // ----------------------------------------------------------------------------- -void SAL_CALL OFormatCondition::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFormatCondition::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { FormatConditionPropertySet::setPropertyValue( aPropertyName, aValue ); } // ----------------------------------------------------------------------------- -uno::Any SAL_CALL OFormatCondition::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL OFormatCondition::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return FormatConditionPropertySet::getPropertyValue( PropertyName); } // ----------------------------------------------------------------------------- -void SAL_CALL OFormatCondition::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFormatCondition::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FormatConditionPropertySet::addPropertyChangeListener( aPropertyName, xListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OFormatCondition::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFormatCondition::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FormatConditionPropertySet::removePropertyChangeListener( aPropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OFormatCondition::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFormatCondition::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FormatConditionPropertySet::addVetoableChangeListener( PropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OFormatCondition::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFormatCondition::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FormatConditionPropertySet::removeVetoableChangeListener( PropertyName, aListener ); } @@ -138,13 +138,13 @@ void SAL_CALL OFormatCondition::setEnabled( ::sal_Bool _enabled ) throw (uno::Ru set(PROPERTY_ENABLED,_enabled,m_bEnabled); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OFormatCondition::getFormula() throw (uno::RuntimeException) +OUString SAL_CALL OFormatCondition::getFormula() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_sFormula; } // ----------------------------------------------------------------------------- -void SAL_CALL OFormatCondition::setFormula( const ::rtl::OUString& _formula ) throw (uno::RuntimeException) +void SAL_CALL OFormatCondition::setFormula( const OUString& _formula ) throw (uno::RuntimeException) { set(PROPERTY_FORMULA,_formula,m_sFormula); } diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index 9f5462fe01db..646cae21bce1 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -43,10 +43,10 @@ uno::Reference< uno::XInterface > OFormattedField::create(uno::Reference< uno::X return *(new OFormattedField(xContext)); } -uno::Sequence< ::rtl::OUString > lcl_getFormattedFieldOptionals() +uno::Sequence< OUString > lcl_getFormattedFieldOptionals() { - ::rtl::OUString pProps[] = { PROPERTY_MASTERFIELDS,PROPERTY_DETAILFIELDS }; - return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); + OUString pProps[] = { PROPERTY_MASTERFIELDS,PROPERTY_DETAILFIELDS }; + return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); } DBG_NAME( rpt_OFormattedField ) // ----------------------------------------------------------------------------- @@ -105,32 +105,32 @@ void SAL_CALL OFormattedField::dispose() throw(uno::RuntimeException) m_xFunction.clear(); } // ----------------------------------------------------------------------------- -::rtl::OUString OFormattedField::getImplementationName_Static( ) throw(uno::RuntimeException) +OUString OFormattedField::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.OFormattedField"); + return OUString("com.sun.star.comp.report.OFormattedField"); } //-------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OFormattedField::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL OFormattedField::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > OFormattedField::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) +uno::Sequence< OUString > OFormattedField::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aServices(2); + uno::Sequence< OUString > aServices(2); aServices.getArray()[0] = SERVICE_FORMATTEDFIELD; - aServices.getArray()[1] = ::rtl::OUString("com.sun.star.awt.UnoControlFormattedFieldModel"); + aServices.getArray()[1] = OUString("com.sun.star.awt.UnoControlFormattedFieldModel"); return aServices; } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OFormattedField::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OFormattedField::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL OFormattedField::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException ) +sal_Bool SAL_CALL OFormattedField::supportsService(const OUString& ServiceName) throw( uno::RuntimeException ) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } @@ -147,7 +147,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OFormattedField::getPropertyS return FormattedFieldPropertySet::getPropertySetInfo(); } // ----------------------------------------------------------------------------- -void SAL_CALL OFormattedField::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFormattedField::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { // special case here /// TODO check if ( !aValue.hasValue() && aPropertyName == PROPERTY_FORMATKEY ) @@ -156,39 +156,39 @@ void SAL_CALL OFormattedField::setPropertyValue( const ::rtl::OUString& aPropert FormattedFieldPropertySet::setPropertyValue( aPropertyName, aValue ); } // ----------------------------------------------------------------------------- -uno::Any SAL_CALL OFormattedField::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL OFormattedField::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return FormattedFieldPropertySet::getPropertyValue( PropertyName); } // ----------------------------------------------------------------------------- -void SAL_CALL OFormattedField::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFormattedField::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FormattedFieldPropertySet::addPropertyChangeListener( aPropertyName, xListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OFormattedField::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFormattedField::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FormattedFieldPropertySet::removePropertyChangeListener( aPropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OFormattedField::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFormattedField::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FormattedFieldPropertySet::addVetoableChangeListener( PropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OFormattedField::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFormattedField::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FormattedFieldPropertySet::removeVetoableChangeListener( PropertyName, aListener ); } // ----------------------------------------------------------------------------- // XReportControlModel -::rtl::OUString SAL_CALL OFormattedField::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException) +OUString SAL_CALL OFormattedField::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.aDataField; } // ----------------------------------------------------------------------------- -void SAL_CALL OFormattedField::setDataField( const ::rtl::OUString& _datafield ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) +void SAL_CALL OFormattedField::setDataField( const OUString& _datafield ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { set(PROPERTY_DATAFIELD,_datafield,m_aProps.aDataField); } @@ -204,13 +204,13 @@ void SAL_CALL OFormattedField::setPrintWhenGroupChange( ::sal_Bool _printwhengro set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OFormattedField::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException) +OUString SAL_CALL OFormattedField::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.aConditionalPrintExpression; } // ----------------------------------------------------------------------------- -void SAL_CALL OFormattedField::setConditionalPrintExpression( const ::rtl::OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException) +void SAL_CALL OFormattedField::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException) { set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression); } @@ -262,7 +262,7 @@ uno::Reference< util::XNumberFormatsSupplier > SAL_CALL OFormattedField::getForm { uno::Reference< beans::XPropertySet> xProp(::dbtools::findDataSource(getParent()),uno::UNO_QUERY); if ( xProp.is() ) - m_xFormatsSupplier.set(xProp->getPropertyValue(::rtl::OUString("NumberFormatsSupplier")),uno::UNO_QUERY); + m_xFormatsSupplier.set(xProp->getPropertyValue(OUString("NumberFormatsSupplier")),uno::UNO_QUERY); } } return m_xFormatsSupplier; @@ -362,9 +362,9 @@ void SAL_CALL OFormattedField::setSize( const awt::Size& aSize ) throw (beans::P // ----------------------------------------------------------------------------- // XShapeDescriptor -::rtl::OUString SAL_CALL OFormattedField::getShapeType( ) throw (uno::RuntimeException) +OUString SAL_CALL OFormattedField::getShapeType( ) throw (uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.drawing.ControlShape"); + return OUString("com.sun.star.drawing.ControlShape"); } // ----------------------------------------------------------------------------- // ============================================================================= diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx index 36bbd10b703e..38868973be49 100644 --- a/reportdesign/source/core/api/Function.cxx +++ b/reportdesign/source/core/api/Function.cxx @@ -40,7 +40,7 @@ DBG_NAME( rpt_OFunction ) // ----------------------------------------------------------------------------- OFunction::OFunction(uno::Reference< uno::XComponentContext > const & _xContext) :FunctionBase(m_aMutex) -,FunctionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >()) +,FunctionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >()) ,m_xContext(_xContext) ,m_bPreEvaluated(sal_False) ,m_bDeepTraversing(sal_False) @@ -62,31 +62,31 @@ void SAL_CALL OFunction::dispose() throw(uno::RuntimeException) cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- -::rtl::OUString OFunction::getImplementationName_Static( ) throw(uno::RuntimeException) +OUString OFunction::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.OFunction"); + return OUString("com.sun.star.comp.report.OFunction"); } //-------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OFunction::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL OFunction::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > OFunction::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) +uno::Sequence< OUString > OFunction::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aServices(1); + uno::Sequence< OUString > aServices(1); aServices.getArray()[0] = SERVICE_FUNCTION; return aServices; } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OFunction::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OFunction::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL OFunction::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException ) +sal_Bool SAL_CALL OFunction::supportsService(const OUString& ServiceName) throw( uno::RuntimeException ) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } @@ -96,32 +96,32 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OFunction::getPropertySetInfo return FunctionPropertySet::getPropertySetInfo(); } // ----------------------------------------------------------------------------- -void SAL_CALL OFunction::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFunction::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { FunctionPropertySet::setPropertyValue( aPropertyName, aValue ); } // ----------------------------------------------------------------------------- -uno::Any SAL_CALL OFunction::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL OFunction::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return FunctionPropertySet::getPropertyValue( PropertyName); } // ----------------------------------------------------------------------------- -void SAL_CALL OFunction::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFunction::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FunctionPropertySet::addPropertyChangeListener( aPropertyName, xListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OFunction::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFunction::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FunctionPropertySet::removePropertyChangeListener( aPropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OFunction::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFunction::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FunctionPropertySet::addVetoableChangeListener( PropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OFunction::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OFunction::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { FunctionPropertySet::removeVetoableChangeListener( PropertyName, aListener ); } @@ -152,36 +152,36 @@ void SAL_CALL OFunction::setDeepTraversing(::sal_Bool the_value) throw (uno::Run } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OFunction::getName() throw (uno::RuntimeException) +OUString SAL_CALL OFunction::getName() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_sName; } // ----------------------------------------------------------------------------- -void SAL_CALL OFunction::setName(const ::rtl::OUString & the_value) throw (uno::RuntimeException) +void SAL_CALL OFunction::setName(const OUString & the_value) throw (uno::RuntimeException) { set(PROPERTY_NAME,the_value,m_sName); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OFunction::getFormula() throw (uno::RuntimeException) +OUString SAL_CALL OFunction::getFormula() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_sFormula; } // ----------------------------------------------------------------------------- -void SAL_CALL OFunction::setFormula(const ::rtl::OUString & the_value) throw (uno::RuntimeException) +void SAL_CALL OFunction::setFormula(const OUString & the_value) throw (uno::RuntimeException) { set(PROPERTY_FORMULA,the_value,m_sFormula); } // ----------------------------------------------------------------------------- -beans::Optional< ::rtl::OUString> SAL_CALL OFunction::getInitialFormula() throw (uno::RuntimeException) +beans::Optional< OUString> SAL_CALL OFunction::getInitialFormula() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_sInitialFormula; } // ----------------------------------------------------------------------------- -void SAL_CALL OFunction::setInitialFormula(const beans::Optional< ::rtl::OUString> & the_value) throw (uno::RuntimeException) +void SAL_CALL OFunction::setInitialFormula(const beans::Optional< OUString> & the_value) throw (uno::RuntimeException) { set(PROPERTY_INITIALFORMULA,the_value,m_sInitialFormula); } diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index ba056faf96ba..353d3695e080 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -40,7 +40,7 @@ DBG_NAME( rpt_OGroup ) OGroup::OGroup(const uno::Reference< report::XGroups >& _xParent ,const uno::Reference< uno::XComponentContext >& _xContext) :GroupBase(m_aMutex) -,GroupPropertySet(_xContext,static_cast< GroupPropertySet::Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >()) +,GroupPropertySet(_xContext,static_cast< GroupPropertySet::Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >()) ,m_xContext(_xContext) ,m_xParent(_xParent) { @@ -78,24 +78,24 @@ void OGroup::copyGroup(const uno::Reference< report::XGroup >& _xSource) //-------------------------------------------------------------------------- IMPLEMENT_FORWARD_XINTERFACE2(OGroup,GroupBase,GroupPropertySet) //-------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OGroup::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL OGroup::getImplementationName( ) throw(uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.Group"); + return OUString("com.sun.star.comp.report.Group"); } //------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString> OGroup::getSupportedServiceNames_Static(void) throw( uno::RuntimeException ) +uno::Sequence< OUString> OGroup::getSupportedServiceNames_Static(void) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString> aSupported(1); + uno::Sequence< OUString> aSupported(1); aSupported.getArray()[0] = SERVICE_GROUP; return aSupported; } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString> SAL_CALL OGroup::getSupportedServiceNames() throw(uno::RuntimeException) +uno::Sequence< OUString> SAL_CALL OGroup::getSupportedServiceNames() throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } // ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OGroup::supportsService( const ::rtl::OUString& _rServiceName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL OGroup::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException) { return ::comphelper::existsValue(_rServiceName,getSupportedServiceNames_Static()); } @@ -138,7 +138,7 @@ void SAL_CALL OGroup::setHeaderOn( ::sal_Bool _headeron ) throw (uno::RuntimeExc { if ( _headeron != m_xHeader.is() ) { - ::rtl::OUString sName(RPT_RESSTRING(RID_STR_GROUP_HEADER,m_xContext->getServiceManager())); + OUString sName(RPT_RESSTRING(RID_STR_GROUP_HEADER,m_xContext->getServiceManager())); setSection(PROPERTY_HEADERON,_headeron,sName,m_xHeader); } } @@ -153,7 +153,7 @@ void SAL_CALL OGroup::setFooterOn( ::sal_Bool _footeron ) throw (uno::RuntimeExc { if ( _footeron != m_xFooter.is() ) { - ::rtl::OUString sName(RPT_RESSTRING(RID_STR_GROUP_FOOTER,m_xContext->getServiceManager())); + OUString sName(RPT_RESSTRING(RID_STR_GROUP_FOOTER,m_xContext->getServiceManager())); setSection(PROPERTY_FOOTERON,_footeron,sName,m_xFooter); } } @@ -193,7 +193,7 @@ uno::Reference< report::XSection > SAL_CALL OGroup::getFooter() throw (container void SAL_CALL OGroup::setGroupOn( ::sal_Int16 _groupon ) throw (lang::IllegalArgumentException, uno::RuntimeException) { if ( _groupon < report::GroupOn::DEFAULT || _groupon > report::GroupOn::INTERVAL ) - throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::GroupOn") + throwIllegallArgumentException(OUString("com::sun::star::report::GroupOn") ,*this ,1 ,m_xContext); @@ -220,7 +220,7 @@ void SAL_CALL OGroup::setGroupInterval( ::sal_Int32 _groupinterval ) throw (uno: void SAL_CALL OGroup::setKeepTogether( ::sal_Int16 _keeptogether ) throw (lang::IllegalArgumentException, uno::RuntimeException) { if ( _keeptogether < report::KeepTogether::NO || _keeptogether > report::KeepTogether::WITH_FIRST_DETAIL ) - throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::KeepTogether") + throwIllegallArgumentException(OUString("com::sun::star::report::KeepTogether") ,*this ,1 ,m_xContext); @@ -232,13 +232,13 @@ uno::Reference< report::XGroups > SAL_CALL OGroup::getGroups() throw (uno::Runti return m_xParent; } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OGroup::getExpression() throw (uno::RuntimeException) +OUString SAL_CALL OGroup::getExpression() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.m_sExpression; } // ----------------------------------------------------------------------------- -void SAL_CALL OGroup::setExpression( const ::rtl::OUString& _expression ) throw (uno::RuntimeException) +void SAL_CALL OGroup::setExpression( const OUString& _expression ) throw (uno::RuntimeException) { set(PROPERTY_EXPRESSION,_expression,m_aProps.m_sExpression); } @@ -282,39 +282,39 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OGroup::getPropertySetInfo( return GroupPropertySet::getPropertySetInfo(); } // ----------------------------------------------------------------------------- -void SAL_CALL OGroup::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OGroup::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { GroupPropertySet::setPropertyValue( aPropertyName, aValue ); } // ----------------------------------------------------------------------------- -uno::Any SAL_CALL OGroup::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL OGroup::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return GroupPropertySet::getPropertyValue( PropertyName); } // ----------------------------------------------------------------------------- -void SAL_CALL OGroup::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OGroup::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { GroupPropertySet::addPropertyChangeListener( aPropertyName, xListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OGroup::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OGroup::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { GroupPropertySet::removePropertyChangeListener( aPropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OGroup::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OGroup::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { GroupPropertySet::addVetoableChangeListener( PropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OGroup::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OGroup::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { GroupPropertySet::removeVetoableChangeListener( PropertyName, aListener ); } // ----------------------------------------------------------------------------- -void OGroup::setSection( const ::rtl::OUString& _sProperty +void OGroup::setSection( const OUString& _sProperty ,const sal_Bool& _bOn - ,const ::rtl::OUString& _sName + ,const OUString& _sName ,uno::Reference< report::XSection>& _member) { BoundListeners l; diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index d083e8d9da2c..d41e83dae278 100644 --- a/reportdesign/source/core/api/ImageControl.cxx +++ b/reportdesign/source/core/api/ImageControl.cxx @@ -37,9 +37,9 @@ namespace reportdesign // ============================================================================= using namespace com::sun::star; using namespace comphelper; -uno::Sequence< ::rtl::OUString > lcl_getImageOptionals() +uno::Sequence< OUString > lcl_getImageOptionals() { - ::rtl::OUString pProps[] = { + OUString pProps[] = { PROPERTY_CHARCOLOR ,PROPERTY_CHAREMPHASIS ,PROPERTY_CHARFONTCHARSET @@ -109,7 +109,7 @@ uno::Sequence< ::rtl::OUString > lcl_getImageOptionals() , PROPERTY_CHARLOCALECOMPLEX }; - return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); + return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); } DBG_NAME( rpt_OImageControl ) @@ -171,20 +171,20 @@ void SAL_CALL OImageControl::dispose() throw(uno::RuntimeException) cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- -::rtl::OUString OImageControl::getImplementationName_Static( ) throw(uno::RuntimeException) +OUString OImageControl::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.OImageControl"); + return OUString("com.sun.star.comp.report.OImageControl"); } //-------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OImageControl::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL OImageControl::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > OImageControl::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) +uno::Sequence< OUString > OImageControl::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aServices(1); + uno::Sequence< OUString > aServices(1); aServices.getArray()[0] = SERVICE_IMAGECONTROL; return aServices; @@ -196,12 +196,12 @@ uno::Reference< uno::XInterface > OImageControl::create(uno::Reference< uno::XCo } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OImageControl::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OImageControl::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL OImageControl::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException ) +sal_Bool SAL_CALL OImageControl::supportsService(const OUString& ServiceName) throw( uno::RuntimeException ) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } @@ -211,30 +211,30 @@ REPORTCOMPONENT_IMPL(OImageControl,m_aProps.aComponent) REPORTCOMPONENT_IMPL2(OImageControl,m_aProps.aComponent) REPORTCOMPONENT_NOMASTERDETAIL(OImageControl) NO_REPORTCONTROLFORMAT_IMPL(OImageControl) -::rtl::OUString SAL_CALL OImageControl::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) +OUString SAL_CALL OImageControl::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.aFormatProperties.sHyperLinkURL; } -void SAL_CALL OImageControl::setHyperLinkURL(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) +void SAL_CALL OImageControl::setHyperLinkURL(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) { set(PROPERTY_HYPERLINKURL,the_value,m_aProps.aFormatProperties.sHyperLinkURL); } -::rtl::OUString SAL_CALL OImageControl::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) +OUString SAL_CALL OImageControl::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.aFormatProperties.sHyperLinkTarget; } -void SAL_CALL OImageControl::setHyperLinkTarget(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) +void SAL_CALL OImageControl::setHyperLinkTarget(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) { set(PROPERTY_HYPERLINKTARGET,the_value,m_aProps.aFormatProperties.sHyperLinkTarget); } -::rtl::OUString SAL_CALL OImageControl::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) +OUString SAL_CALL OImageControl::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.aFormatProperties.sHyperLinkName; } -void SAL_CALL OImageControl::setHyperLinkName(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) +void SAL_CALL OImageControl::setHyperLinkName(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) { set(PROPERTY_HYPERLINKNAME,the_value,m_aProps.aFormatProperties.sHyperLinkName); } @@ -273,44 +273,44 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OImageControl::getPropertySet return ImageControlPropertySet::getPropertySetInfo(); } // ----------------------------------------------------------------------------- -void SAL_CALL OImageControl::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OImageControl::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { ImageControlPropertySet::setPropertyValue( aPropertyName, aValue ); } // ----------------------------------------------------------------------------- -uno::Any SAL_CALL OImageControl::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL OImageControl::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return ImageControlPropertySet::getPropertyValue( PropertyName); } // ----------------------------------------------------------------------------- -void SAL_CALL OImageControl::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OImageControl::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ImageControlPropertySet::addPropertyChangeListener( aPropertyName, xListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OImageControl::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OImageControl::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ImageControlPropertySet::removePropertyChangeListener( aPropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OImageControl::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OImageControl::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ImageControlPropertySet::addVetoableChangeListener( PropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OImageControl::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OImageControl::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ImageControlPropertySet::removeVetoableChangeListener( PropertyName, aListener ); } // ----------------------------------------------------------------------------- // XReportControlModel -::rtl::OUString SAL_CALL OImageControl::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException) +OUString SAL_CALL OImageControl::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.aDataField; } // ----------------------------------------------------------------------------- -void SAL_CALL OImageControl::setDataField( const ::rtl::OUString& _datafield ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) +void SAL_CALL OImageControl::setDataField( const OUString& _datafield ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { set(PROPERTY_DATAFIELD,_datafield,m_aProps.aDataField); } @@ -327,13 +327,13 @@ void SAL_CALL OImageControl::setPrintWhenGroupChange( ::sal_Bool _printwhengroup set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OImageControl::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException) +OUString SAL_CALL OImageControl::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.aConditionalPrintExpression; } // ----------------------------------------------------------------------------- -void SAL_CALL OImageControl::setConditionalPrintExpression( const ::rtl::OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException) +void SAL_CALL OImageControl::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException) { set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression); } @@ -351,13 +351,13 @@ uno::Reference< util::XCloneable > SAL_CALL OImageControl::createClone( ) throw // XImageControl // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OImageControl::getImageURL() throw (uno::RuntimeException) +OUString SAL_CALL OImageControl::getImageURL() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aImageURL; } // ----------------------------------------------------------------------------- -void SAL_CALL OImageControl::setImageURL( const ::rtl::OUString& _imageurl ) throw (uno::RuntimeException) +void SAL_CALL OImageControl::setImageURL( const OUString& _imageurl ) throw (uno::RuntimeException) { set(PROPERTY_IMAGEURL,_imageurl,m_aImageURL); } @@ -456,9 +456,9 @@ void SAL_CALL OImageControl::setSize( const awt::Size& aSize ) throw (beans::Pro // ----------------------------------------------------------------------------- // XShapeDescriptor -::rtl::OUString SAL_CALL OImageControl::getShapeType( ) throw (uno::RuntimeException) +OUString SAL_CALL OImageControl::getShapeType( ) throw (uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.drawing.ControlShape"); + return OUString("com.sun.star.drawing.ControlShape"); } // ----------------------------------------------------------------------------- ::sal_Int16 SAL_CALL OImageControl::getScaleMode() throw (uno::RuntimeException) diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index b8c9b13bc901..998aefb9c936 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -83,11 +83,11 @@ OFormatProperties::OFormatProperties() SvtLinguConfig aLinguConfig; using namespace ::com::sun::star::i18n::ScriptType; - aLinguConfig.GetProperty(::rtl::OUString("DefaultLocale")) >>= aCharLocale; + aLinguConfig.GetProperty(OUString("DefaultLocale")) >>= aCharLocale; LanguageType eCurLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aCharLocale).getLanguageType(false), LATIN); - aLinguConfig.GetProperty(::rtl::OUString("DefaultLocale_CJK")) >>= aCharLocaleAsian; + aLinguConfig.GetProperty(OUString("DefaultLocale_CJK")) >>= aCharLocaleAsian; LanguageType eCurLangCJK = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aCharLocaleAsian).getLanguageType(false), ASIAN); - aLinguConfig.GetProperty(::rtl::OUString("DefaultLocale_CTL")) >>= aCharLocaleComplex; + aLinguConfig.GetProperty(OUString("DefaultLocale_CTL")) >>= aCharLocaleComplex; LanguageType eCurLangCTL = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aCharLocaleComplex).getLanguageType(false), COMPLEX); Font aLatin,aCJK,aCTL; diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index c6dc7eef15e4..0186ead39269 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -124,7 +124,7 @@ #include <boost/utility.hpp> #define MAP_LEN(x) x, sizeof(x) - 1 -#define MAP_CHAR_LEN(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(x)) +#define MAP_CHAR_LEN(x) OUString(RTL_CONSTASCII_USTRINGPARAM(x)) // page styles #define SC_UNO_PAGE_LEFTBORDER "LeftBorder" #define SC_UNO_PAGE_RIGHTBORDER "RightBorder" @@ -201,15 +201,15 @@ void lcl_setModelReadOnly(const uno::Reference< embed::XStorage >& _xStorage,::b uno::Reference<beans::XPropertySet> xProp(_xStorage,uno::UNO_QUERY); sal_Int32 nOpenMode = embed::ElementModes::READ; if ( xProp.is() ) - xProp->getPropertyValue(::rtl::OUString("OpenMode")) >>= nOpenMode; + xProp->getPropertyValue(OUString("OpenMode")) >>= nOpenMode; _rModel->SetReadOnly((nOpenMode & embed::ElementModes::WRITE) != embed::ElementModes::WRITE); } void lcl_stripLoadArguments( ::comphelper::MediaDescriptor& _rDescriptor, uno::Sequence< beans::PropertyValue >& _rArgs ) { - _rDescriptor.erase( ::rtl::OUString( "StatusIndicator" ) ); - _rDescriptor.erase( ::rtl::OUString( "InteractionHandler" ) ); - _rDescriptor.erase( ::rtl::OUString( "Model" ) ); + _rDescriptor.erase( OUString( "StatusIndicator" ) ); + _rDescriptor.erase( OUString( "InteractionHandler" ) ); + _rDescriptor.erase( OUString( "Model" ) ); _rDescriptor >> _rArgs; } // ----------------------------------------------------------------------------- @@ -221,7 +221,7 @@ void lcl_extractAndStartStatusIndicator( const ::comphelper::MediaDescriptor& _r _rxStatusIndicator = _rDescriptor.getUnpackedValueOrDefault( _rDescriptor.PROP_STATUSINDICATOR(), _rxStatusIndicator ); if ( _rxStatusIndicator.is() ) { - _rxStatusIndicator->start( ::rtl::OUString(), (sal_Int32)1000000 ); + _rxStatusIndicator->start( OUString(), (sal_Int32)1000000 ); sal_Int32 nLength = _rCallArgs.getLength(); _rCallArgs.realloc( nLength + 1 ); @@ -264,21 +264,21 @@ public: // XStyle ::sal_Bool SAL_CALL isUserDefined( ) throw (uno::RuntimeException); ::sal_Bool SAL_CALL isInUse( ) throw (uno::RuntimeException); - ::rtl::OUString SAL_CALL getParentStyle( ) throw (uno::RuntimeException); - void SAL_CALL setParentStyle( const ::rtl::OUString& aParentStyle ) throw (container::NoSuchElementException, uno::RuntimeException); + OUString SAL_CALL getParentStyle( ) throw (uno::RuntimeException); + void SAL_CALL setParentStyle( const OUString& aParentStyle ) throw (container::NoSuchElementException, uno::RuntimeException); // XNamed - ::rtl::OUString SAL_CALL getName( ) throw (uno::RuntimeException); - void SAL_CALL setName( const ::rtl::OUString& aName ) throw (uno::RuntimeException); + OUString SAL_CALL getName( ) throw (uno::RuntimeException); + void SAL_CALL setName( const OUString& aName ) throw (uno::RuntimeException); // XMultiPropertyState - uno::Sequence< beans::PropertyState > SAL_CALL getPropertyStates( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException) + uno::Sequence< beans::PropertyState > SAL_CALL getPropertyStates( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException) { return OStyle_PBASE::getPropertyStates(aPropertyNames); } void SAL_CALL setAllPropertiesToDefault( ) throw (uno::RuntimeException); - void SAL_CALL setPropertiesToDefault( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException); - uno::Sequence< uno::Any > SAL_CALL getPropertyDefaults( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException); + void SAL_CALL setPropertiesToDefault( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException); + uno::Sequence< uno::Any > SAL_CALL getPropertyDefaults( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException); }; // ----------------------------------------------------------------------------- OStyle::OStyle() @@ -298,8 +298,8 @@ OStyle::OStyle() const sal_Int32 nZero = 0; const sal_Int16 n16Zero = 0; const sal_Int16 nNummeringType = style::NumberingType::ARABIC; - const ::rtl::OUString sName("Default"); - const ::rtl::OUString sEmpty; + const OUString sName("Default"); + const OUString sEmpty; const table::BorderLine eBorderLine(0,0,0,0); const table::ShadowFormat eShadowFormat(table::ShadowLocation_NONE,0,0,0); const style::PageStyleLayout ePageStyleLayout = style::PageStyleLayout_ALL; @@ -307,7 +307,7 @@ OStyle::OStyle() const sal_Int32 nMayBeVoid = beans::PropertyAttribute::MAYBEVOID; sal_Int32 i = 0; - registerPropertyNoMember( PROPERTY_NAME, ++i,nBound,::getCppuType( static_cast< ::rtl::OUString *>(NULL) ), &sName ); + registerPropertyNoMember( PROPERTY_NAME, ++i,nBound,::getCppuType( static_cast< OUString *>(NULL) ), &sName ); registerPropertyNoMember(PROPERTY_BACKCOLOR, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent); @@ -317,11 +317,11 @@ OStyle::OStyle() registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nMargin); - registerPropertyNoMember(MAP_CHAR_LEN("DisplayName"), ++i,nBound,::getCppuType((rtl::OUString*)0) ,&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN("DisplayName"), ++i,nBound,::getCppuType((OUString*)0) ,&sEmpty); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ++i,nBound,::getCppuType((const OUString*)0) ,&sEmpty); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ++i,nBound,::getCppuType((const OUString*)0) ,&sEmpty); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), ++i,nBound,::getBooleanCppuType() ,&bTrue); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); @@ -342,9 +342,9 @@ OStyle::OStyle() registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); // registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nTransparent); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ++i,nBound|nMayBeVoid,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ++i,nBound|nMayBeVoid,::getCppuType((const OUString*)0) ,&sEmpty); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), ++i,nBound|nMayBeVoid,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ++i,nBound|nMayBeVoid,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ++i,nBound|nMayBeVoid,::getCppuType((const OUString*)0) ,&sEmpty); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bTrue); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); @@ -372,8 +372,8 @@ OStyle::OStyle() registerPropertyNoMember(PROPERTY_NUMBERINGTYPE, ++i,nBound,::getCppuType((const sal_Int16*)0) ,&nNummeringType); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALEVAL), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); registerPropertyNoMember(PROPERTY_PAGESTYLELAYOUT, ++i,nBound,::getCppuType((const style::PageStyleLayout*)0) ,&ePageStyleLayout); - const ::rtl::OUString sPaperTray("[From printer settings]"); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sPaperTray); + const OUString sPaperTray("[From printer settings]"); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ++i,nBound,::getCppuType((const OUString*)0) ,&sPaperTray); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBRDDIST),++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(PROPERTY_RIGHTMARGIN, ++i,beans::PropertyAttribute::BOUND,::getCppuType((const sal_Int32*)0) ,&nMargin); @@ -388,7 +388,7 @@ OStyle::OStyle() uno::Reference< container::XNameContainer> xAttribs = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast< xml::AttributeData* >(NULL))); registerPropertyNoMember(MAP_CHAR_LEN("UserDefinedAttributes"), ++i,nBound,::getCppuType((uno::Reference<container::XNameContainer>*)0) ,&xAttribs); registerProperty(PROPERTY_WIDTH, ++i,nBound,&m_aSize.Width,::getCppuType((const sal_Int32*)0) ); - registerPropertyNoMember(MAP_CHAR_LEN("PrinterName"), ++i,nBound,::getCppuType((const ::rtl::OUString*)0),&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN("PrinterName"), ++i,nBound,::getCppuType((const OUString*)0),&sEmpty); uno::Sequence<sal_Int8> aSe; registerPropertyNoMember(MAP_CHAR_LEN("PrinterSetup"), ++i,nBound,::getCppuType((const uno::Sequence<sal_Int8>*)0),&aSe); @@ -429,24 +429,24 @@ void OStyle::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, uno::Any& /*_rD return sal_True; } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OStyle::getParentStyle( ) throw (uno::RuntimeException) +OUString SAL_CALL OStyle::getParentStyle( ) throw (uno::RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- -void SAL_CALL OStyle::setParentStyle( const ::rtl::OUString& /*aParentStyle*/ ) throw (container::NoSuchElementException, uno::RuntimeException) +void SAL_CALL OStyle::setParentStyle( const OUString& /*aParentStyle*/ ) throw (container::NoSuchElementException, uno::RuntimeException) { } // ----------------------------------------------------------------------------- // XNamed -::rtl::OUString SAL_CALL OStyle::getName( ) throw (uno::RuntimeException) +OUString SAL_CALL OStyle::getName( ) throw (uno::RuntimeException) { - ::rtl::OUString sName; + OUString sName; getPropertyValue(PROPERTY_NAME) >>= sName; return sName; } // ----------------------------------------------------------------------------- -void SAL_CALL OStyle::setName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) +void SAL_CALL OStyle::setName( const OUString& aName ) throw (uno::RuntimeException) { setPropertyValue(PROPERTY_NAME,uno::makeAny(aName)); } @@ -455,19 +455,19 @@ void SAL_CALL OStyle::setAllPropertiesToDefault( ) throw (uno::RuntimeException { } // ----------------------------------------------------------------------------- -void SAL_CALL OStyle::setPropertiesToDefault( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException) +void SAL_CALL OStyle::setPropertiesToDefault( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException) { - const ::rtl::OUString* pIter = aPropertyNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aPropertyNames.getLength(); + const OUString* pIter = aPropertyNames.getConstArray(); + const OUString* pEnd = pIter + aPropertyNames.getLength(); for(;pIter != pEnd;++pIter) setPropertyToDefault(*pIter); } // ----------------------------------------------------------------------------- -uno::Sequence< uno::Any > SAL_CALL OStyle::getPropertyDefaults( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Sequence< uno::Any > SAL_CALL OStyle::getPropertyDefaults( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { uno::Sequence< uno::Any > aRet(aPropertyNames.getLength()); - const ::rtl::OUString* pIter = aPropertyNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aPropertyNames.getLength(); + const OUString* pIter = aPropertyNames.getConstArray(); + const OUString* pEnd = pIter + aPropertyNames.getLength(); for(sal_Int32 i = 0;pIter != pEnd;++pIter,++i) aRet[i] = getPropertyDefault(*pIter); return aRet; @@ -476,10 +476,10 @@ namespace { class FactoryLoader : public ::osl::Thread { - ::rtl::OUString m_sMimeType; + OUString m_sMimeType; uno::Reference< uno::XComponentContext > m_xContext; public: - FactoryLoader(const ::rtl::OUString& _sMimeType,uno::Reference< uno::XComponentContext > const & _xContext) + FactoryLoader(const OUString& _sMimeType,uno::Reference< uno::XComponentContext > const & _xContext) :m_sMimeType(_sMimeType) ,m_xContext(_xContext) {} @@ -498,7 +498,7 @@ namespace { uno::Reference<frame::XDesktop2> xDesktop = frame::Desktop::create(m_xContext); uno::Reference<frame::XComponentLoader> xFrameLoad(xDesktop,uno::UNO_QUERY); - ::rtl::OUString sTarget("_blank"); + OUString sTarget("_blank"); sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | frame::FrameSearchFlag::CREATE; uno::Reference< frame::XFrame> xFrame = xDesktop->findFrame(sTarget,nFrameSearchFlag); xFrameLoad.set(xFrame,uno::UNO_QUERY); @@ -507,20 +507,20 @@ namespace { uno::Sequence < beans::PropertyValue > aArgs( 3); sal_Int32 nLen = 0; - aArgs[nLen].Name = ::rtl::OUString("AsTemplate"); + aArgs[nLen].Name = OUString("AsTemplate"); aArgs[nLen++].Value <<= sal_False; - aArgs[nLen].Name = ::rtl::OUString("ReadOnly"); + aArgs[nLen].Name = OUString("ReadOnly"); aArgs[nLen++].Value <<= sal_True; - aArgs[nLen].Name = ::rtl::OUString("Hidden"); + aArgs[nLen].Name = OUString("Hidden"); aArgs[nLen++].Value <<= sal_True; ::comphelper::MimeConfigurationHelper aHelper(m_xContext); SvtModuleOptions aModuleOptions; uno::Reference< frame::XModel > xModel(xFrameLoad->loadComponentFromURL( aModuleOptions.GetFactoryEmptyDocumentURL( aModuleOptions.ClassifyFactoryByServiceName( aHelper.GetDocServiceNameFromMediaType(m_sMimeType) )), - ::rtl::OUString(), // empty frame name + OUString(), // empty frame name 0, aArgs ),uno::UNO_QUERY); @@ -577,12 +577,12 @@ struct OReportDefinitionImpl m_pObjectContainer; ::boost::shared_ptr<rptui::OReportModel> m_pReportModel; ::rtl::Reference< ::dbaui::UndoManager > m_pUndoManager; - ::rtl::OUString m_sCaption; - ::rtl::OUString m_sCommand; - ::rtl::OUString m_sFilter; - ::rtl::OUString m_sMimeType; - ::rtl::OUString m_sIdentifier; - ::rtl::OUString m_sDataSourceName; + OUString m_sCaption; + OUString m_sCommand; + OUString m_sFilter; + OUString m_sMimeType; + OUString m_sIdentifier; + OUString m_sDataSourceName; awt::Size m_aVisualAreaSize; ::sal_Int64 m_nAspect; ::sal_Int16 m_nGroupKeepTogether; @@ -639,7 +639,7 @@ DBG_NAME( rpt_OReportDefinition ) // ----------------------------------------------------------------------------- OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > const & _xContext) : ReportDefinitionBase(m_aMutex) -,ReportDefinitionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >()) +,ReportDefinitionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >()) ,m_aProps(new OReportComponentProperties(_xContext)) ,m_pImpl(new OReportDefinitionImpl(m_aMutex)) { @@ -659,7 +659,7 @@ OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > co ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape) : ReportDefinitionBase(m_aMutex) -,ReportDefinitionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >()) +,ReportDefinitionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >()) ,m_aProps(new OReportComponentProperties(_xContext)) ,m_pImpl(new OReportDefinitionImpl(m_aMutex)) { @@ -679,7 +679,7 @@ OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > co OReportDefinition::OReportDefinition(const OReportDefinition& _rCopy) : cppu::BaseMutex() ,ReportDefinitionBase(m_aMutex) -,ReportDefinitionPropertySet(_rCopy.m_aProps->m_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >()) +,ReportDefinitionPropertySet(_rCopy.m_aProps->m_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >()) ,comphelper::IEmbeddedHelper() ,m_aProps(new OReportComponentProperties(*_rCopy.m_aProps)) ,m_pImpl(new OReportDefinitionImpl(m_aMutex,*_rCopy.m_pImpl)) @@ -725,9 +725,9 @@ void OReportDefinition::init() if ( s_bFirstTime ) { s_bFirstTime = false; - const uno::Sequence< ::rtl::OUString > aMimeTypes = getAvailableMimeTypes(); - const ::rtl::OUString* pIter = aMimeTypes.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aMimeTypes.getLength(); + const uno::Sequence< OUString > aMimeTypes = getAvailableMimeTypes(); + const OUString* pIter = aMimeTypes.getConstArray(); + const OUString* pEnd = pIter + aMimeTypes.getLength(); for ( ; pIter != pEnd; ++pIter ) { FactoryLoader* pCreatorThread = new FactoryLoader(*pIter,m_aProps->m_xContext); @@ -742,8 +742,8 @@ void OReportDefinition::init() m_pImpl->m_pReportModel->SetScaleUnit( MAP_100TH_MM ); SdrLayerAdmin& rAdmin = m_pImpl->m_pReportModel->GetLayerAdmin(); rAdmin.NewStandardLayer(RPT_LAYER_FRONT); - rAdmin.NewLayer(rtl::OUString("back"), RPT_LAYER_BACK); - rAdmin.NewLayer(rtl::OUString("HiddenLayer"), RPT_LAYER_HIDDEN); + rAdmin.NewLayer(OUString("back"), RPT_LAYER_BACK); + rAdmin.NewLayer(OUString("HiddenLayer"), RPT_LAYER_HIDDEN); m_pImpl->m_pUndoManager = new ::dbaui::UndoManager( *this, m_aMutex ); m_pImpl->m_pReportModel->SetSdrUndoManager( &m_pImpl->m_pUndoManager->GetSfxUndoManager() ); @@ -755,10 +755,10 @@ void OReportDefinition::init() uno::Reference<beans::XPropertySet> xStorProps(m_pImpl->m_xStorage,uno::UNO_QUERY); if ( xStorProps.is()) { - ::rtl::OUString sMediaType; - xStorProps->getPropertyValue( ::rtl::OUString("MediaType")) >>= sMediaType; + OUString sMediaType; + xStorProps->getPropertyValue( OUString("MediaType")) >>= sMediaType; if ( sMediaType.isEmpty() ) - xStorProps->setPropertyValue( ::rtl::OUString("MediaType"),uno::makeAny(MIMETYPE_OASIS_OPENDOCUMENT_REPORT)); + xStorProps->setPropertyValue( OUString("MediaType"),uno::makeAny(MIMETYPE_OASIS_OPENDOCUMENT_REPORT)); } m_pImpl->m_pObjectContainer.reset( new comphelper::EmbeddedObjectContainer(m_pImpl->m_xStorage , static_cast<cppu::OWeakObject*>(this) ) ); } @@ -776,7 +776,7 @@ void SAL_CALL OReportDefinition::dispose() throw(uno::RuntimeException) // ----------------------------------------------------------------------------- void SAL_CALL OReportDefinition::disposing() { - notifyEvent(::rtl::OUString("OnUnload")); + notifyEvent(OUString("OnUnload")); uno::Reference< frame::XModel > xHoldAlive( this ); @@ -827,29 +827,29 @@ void SAL_CALL OReportDefinition::disposing() } // ----------------------------------------------------------------------------- -::rtl::OUString OReportDefinition::getImplementationName_Static( ) throw(uno::RuntimeException) +OUString OReportDefinition::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.OReportDefinition"); + return OUString("com.sun.star.comp.report.OReportDefinition"); } //-------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OReportDefinition::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL OReportDefinition::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > OReportDefinition::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) +uno::Sequence< OUString > OReportDefinition::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aServices(1); + uno::Sequence< OUString > aServices(1); aServices.getArray()[0] = SERVICE_REPORTDEFINITION; return aServices; } // -------------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OReportDefinition::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OReportDefinition::getSupportedServiceNames( ) throw(uno::RuntimeException) { // first collect the services which are supported by our aggregate - uno::Sequence< ::rtl::OUString > aSupported; + uno::Sequence< OUString > aSupported; if ( m_aProps->m_xServiceInfo.is() ) aSupported = m_aProps->m_xServiceInfo->getSupportedServiceNames(); @@ -866,7 +866,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OReportDefinition::getSupportedService } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL OReportDefinition::supportsService( const ::rtl::OUString& _rServiceName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL OReportDefinition::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException) { return ::comphelper::findValue( getSupportedServiceNames(), _rServiceName, sal_True ).getLength() != 0; } @@ -898,13 +898,13 @@ uno::Reference< uno::XInterface > OReportDefinition::create(uno::Reference< uno: // ----------------------------------------------------------------------------- // XReportDefinition -::rtl::OUString SAL_CALL OReportDefinition::getCaption() throw (uno::RuntimeException) +OUString SAL_CALL OReportDefinition::getCaption() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_pImpl->m_sCaption; } // ----------------------------------------------------------------------------- -void SAL_CALL OReportDefinition::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException) +void SAL_CALL OReportDefinition::setCaption( const OUString& _caption ) throw (uno::RuntimeException) { set(PROPERTY_CAPTION,_caption,m_pImpl->m_sCaption); } @@ -918,7 +918,7 @@ void SAL_CALL OReportDefinition::setCaption( const ::rtl::OUString& _caption ) t void SAL_CALL OReportDefinition::setGroupKeepTogether( ::sal_Int16 _groupkeeptogether ) throw (uno::RuntimeException) { if ( _groupkeeptogether < report::GroupKeepTogether::PER_PAGE || _groupkeeptogether > report::GroupKeepTogether::PER_COLUMN ) - throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::GroupKeepTogether") + throwIllegallArgumentException(OUString("com::sun::star::report::GroupKeepTogether") ,*this ,1 ,m_aProps->m_xContext); @@ -934,7 +934,7 @@ void SAL_CALL OReportDefinition::setGroupKeepTogether( ::sal_Int16 _groupkeeptog void SAL_CALL OReportDefinition::setPageHeaderOption( ::sal_Int16 _pageheaderoption ) throw (uno::RuntimeException) { if ( _pageheaderoption < report::ReportPrintOption::ALL_PAGES || _pageheaderoption > report::ReportPrintOption::NOT_WITH_REPORT_HEADER_FOOTER ) - throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::ReportPrintOption") + throwIllegallArgumentException(OUString("com::sun::star::report::ReportPrintOption") ,*this ,1 ,m_aProps->m_xContext); @@ -950,20 +950,20 @@ void SAL_CALL OReportDefinition::setPageHeaderOption( ::sal_Int16 _pageheaderopt void SAL_CALL OReportDefinition::setPageFooterOption( ::sal_Int16 _pagefooteroption ) throw (uno::RuntimeException) { if ( _pagefooteroption < report::ReportPrintOption::ALL_PAGES || _pagefooteroption > report::ReportPrintOption::NOT_WITH_REPORT_HEADER_FOOTER ) - throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::ReportPrintOption") + throwIllegallArgumentException(OUString("com::sun::star::report::ReportPrintOption") ,*this ,1 ,m_aProps->m_xContext); set(PROPERTY_PAGEFOOTEROPTION,_pagefooteroption,m_pImpl->m_nPageFooterOption); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OReportDefinition::getCommand() throw (uno::RuntimeException) +OUString SAL_CALL OReportDefinition::getCommand() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_pImpl->m_sCommand; } // ----------------------------------------------------------------------------- -void SAL_CALL OReportDefinition::setCommand( const ::rtl::OUString& _command ) throw (uno::RuntimeException) +void SAL_CALL OReportDefinition::setCommand( const OUString& _command ) throw (uno::RuntimeException) { set(PROPERTY_COMMAND,_command,m_pImpl->m_sCommand); } @@ -977,20 +977,20 @@ void SAL_CALL OReportDefinition::setCommand( const ::rtl::OUString& _command ) t void SAL_CALL OReportDefinition::setCommandType( ::sal_Int32 _commandtype ) throw (uno::RuntimeException) { if ( _commandtype < sdb::CommandType::TABLE || _commandtype > sdb::CommandType::COMMAND ) - throwIllegallArgumentException(::rtl::OUString("com::sun::star::sdb::CommandType") + throwIllegallArgumentException(OUString("com::sun::star::sdb::CommandType") ,*this ,1 ,m_aProps->m_xContext); set(PROPERTY_COMMANDTYPE,_commandtype,m_pImpl->m_nCommandType); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OReportDefinition::getFilter() throw (uno::RuntimeException) +OUString SAL_CALL OReportDefinition::getFilter() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_pImpl->m_sFilter; } // ----------------------------------------------------------------------------- -void SAL_CALL OReportDefinition::setFilter( const ::rtl::OUString& _filter ) throw (uno::RuntimeException) +void SAL_CALL OReportDefinition::setFilter( const OUString& _filter ) throw (uno::RuntimeException) { set(PROPERTY_FILTER,_filter,m_pImpl->m_sFilter); } @@ -1123,32 +1123,32 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OReportDefinition::getPropert return ReportDefinitionPropertySet::getPropertySetInfo(); } // ----------------------------------------------------------------------------- -void SAL_CALL OReportDefinition::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OReportDefinition::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { ReportDefinitionPropertySet::setPropertyValue( aPropertyName, aValue ); } // ----------------------------------------------------------------------------- -uno::Any SAL_CALL OReportDefinition::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL OReportDefinition::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return ReportDefinitionPropertySet::getPropertyValue( PropertyName); } // ----------------------------------------------------------------------------- -void SAL_CALL OReportDefinition::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OReportDefinition::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ReportDefinitionPropertySet::addPropertyChangeListener( aPropertyName, xListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OReportDefinition::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OReportDefinition::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ReportDefinitionPropertySet::removePropertyChangeListener( aPropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OReportDefinition::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OReportDefinition::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ReportDefinitionPropertySet::addVetoableChangeListener( PropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OReportDefinition::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OReportDefinition::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ReportDefinitionPropertySet::removeVetoableChangeListener( PropertyName, aListener ); } @@ -1184,9 +1184,9 @@ uno::Reference< util::XCloneable > SAL_CALL OReportDefinition::createClone( ) t return xSet.get(); } // ----------------------------------------------------------------------------- -void OReportDefinition::setSection( const ::rtl::OUString& _sProperty +void OReportDefinition::setSection( const OUString& _sProperty ,const sal_Bool& _bOn - ,const ::rtl::OUString& _sName + ,const OUString& _sName ,uno::Reference< report::XSection>& _member) { BoundListeners l; @@ -1258,7 +1258,7 @@ void SAL_CALL OReportDefinition::close( ::sal_Bool _bDeliverOwnership ) throw (u } // ----------------------------------------------------------------------------- // XModel -::sal_Bool SAL_CALL OReportDefinition::attachResource( const ::rtl::OUString& /*_rURL*/, const uno::Sequence< beans::PropertyValue >& _aArguments ) throw (uno::RuntimeException) +::sal_Bool SAL_CALL OReportDefinition::attachResource( const OUString& /*_rURL*/, const uno::Sequence< beans::PropertyValue >& _aArguments ) throw (uno::RuntimeException) { // LLA: we had a deadlock problem in our context, so we get the SolarMutex earlier. SolarMutexGuard aSolarGuard; @@ -1285,11 +1285,11 @@ void SAL_CALL OReportDefinition::close( ::sal_Bool _bDeliverOwnership ) throw (u void OReportDefinition::fillArgs(::comphelper::MediaDescriptor& _aDescriptor) { uno::Sequence<beans::PropertyValue> aComponentData; - aComponentData = _aDescriptor.getUnpackedValueOrDefault(::rtl::OUString("ComponentData"),aComponentData); + aComponentData = _aDescriptor.getUnpackedValueOrDefault(OUString("ComponentData"),aComponentData); if ( aComponentData.getLength() && (!m_pImpl->m_xActiveConnection.is() || !m_pImpl->m_xNumberFormatsSupplier.is()) ) { ::comphelper::SequenceAsHashMap aComponentDataMap( aComponentData ); - m_pImpl->m_xActiveConnection = aComponentDataMap.getUnpackedValueOrDefault(::rtl::OUString("ActiveConnection"),m_pImpl->m_xActiveConnection); + m_pImpl->m_xActiveConnection = aComponentDataMap.getUnpackedValueOrDefault(OUString("ActiveConnection"),m_pImpl->m_xActiveConnection); m_pImpl->m_xNumberFormatsSupplier = dbtools::getNumberFormats(m_pImpl->m_xActiveConnection); } if ( !m_pImpl->m_xNumberFormatsSupplier.is() ) @@ -1297,14 +1297,14 @@ void OReportDefinition::fillArgs(::comphelper::MediaDescriptor& _aDescriptor) m_pImpl->m_xNumberFormatsSupplier.set( util::NumberFormatsSupplier::createWithDefaultLocale( m_aProps->m_xContext ) ); } lcl_stripLoadArguments( _aDescriptor, m_pImpl->m_aArgs ); - ::rtl::OUString sCaption; - sCaption = _aDescriptor.getUnpackedValueOrDefault(::rtl::OUString("DocumentTitle"),sCaption); + OUString sCaption; + sCaption = _aDescriptor.getUnpackedValueOrDefault(OUString("DocumentTitle"),sCaption); setCaption(sCaption); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OReportDefinition::getURL( ) throw (uno::RuntimeException) +OUString SAL_CALL OReportDefinition::getURL( ) throw (uno::RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- uno::Sequence< beans::PropertyValue > SAL_CALL OReportDefinition::getArgs( ) throw (uno::RuntimeException) @@ -1387,7 +1387,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference< ::comphelper::MediaDescriptor aDescriptor( _aMediaDescriptor ); fillArgs(aDescriptor); - aDescriptor.createItemIfMissing(::rtl::OUString("Storage"),uno::makeAny(_xStorageToLoadFrom)); + aDescriptor.createItemIfMissing(OUString("Storage"),uno::makeAny(_xStorageToLoadFrom)); uno::Sequence< uno::Any > aDelegatorArguments(_aMediaDescriptor.getLength()); uno::Any* pIter = aDelegatorArguments.getArray(); @@ -1399,7 +1399,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference< sal_Int32 nPos = aDelegatorArguments.getLength(); aDelegatorArguments.realloc(nPos+1); beans::PropertyValue aPropVal; - aPropVal.Name = ::rtl::OUString("Storage"); + aPropVal.Name = OUString("Storage"); aPropVal.Value <<= _xStorageToLoadFrom; aDelegatorArguments[nPos] <<= aPropVal; @@ -1407,7 +1407,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference< rptui::OXUndoEnvironment::OUndoEnvLock aLock(rEnv); { uno::Reference< document::XFilter > xFilter( - m_aProps->m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(::rtl::OUString("com.sun.star.comp.report.OReportFilter"),aDelegatorArguments,m_aProps->m_xContext), + m_aProps->m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(OUString("com.sun.star.comp.report.OReportFilter"),aDelegatorArguments,m_aProps->m_xContext), uno::UNO_QUERY_THROW ); uno::Reference< document::XImporter> xImporter(xFilter,uno::UNO_QUERY_THROW); @@ -1453,13 +1453,13 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS // export sub streams for package, else full stream into a file sal_Bool bWarn = sal_False, bErr = sal_False; - ::rtl::OUString sWarnFile, sErrFile; + OUString sWarnFile, sErrFile; uno::Reference< beans::XPropertySet> xProp(_xStorageToSaveTo,uno::UNO_QUERY); if ( xProp.is() ) { - static const ::rtl::OUString sPropName("MediaType"); - ::rtl::OUString sOldMediaType; + static const OUString sPropName("MediaType"); + OUString sOldMediaType; xProp->getPropertyValue(sPropName) >>= sOldMediaType; if ( !xProp->getPropertyValue(sPropName).hasValue() || sOldMediaType.isEmpty() || MIMETYPE_OASIS_OPENDOCUMENT_REPORT != sOldMediaType ) xProp->setPropertyValue( sPropName, uno::makeAny(MIMETYPE_OASIS_OPENDOCUMENT_REPORT) ); @@ -1469,22 +1469,22 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS comphelper::PropertyMapEntry aExportInfoMap[] = { { MAP_LEN( "UsePrettyPrinting" ), 0, &::getCppuType((sal_Bool*)0), beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "StreamName") , 0,&::getCppuType( (::rtl::OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "StreamRelPath") , 0,&::getCppuType( (::rtl::OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "BaseURI") , 0,&::getCppuType( (::rtl::OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "StreamName") , 0,&::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "StreamRelPath") , 0,&::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "BaseURI") , 0,&::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, { NULL, 0, 0, NULL, 0, 0 } }; uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) ); SvtSaveOptions aSaveOpt; - xInfoSet->setPropertyValue(rtl::OUString("UsePrettyPrinting"), uno::makeAny(aSaveOpt.IsPrettyPrinting())); + xInfoSet->setPropertyValue(OUString("UsePrettyPrinting"), uno::makeAny(aSaveOpt.IsPrettyPrinting())); if ( aSaveOpt.IsSaveRelFSys() ) { - const ::rtl::OUString sVal( aDescriptor.getUnpackedValueOrDefault(aDescriptor.PROP_DOCUMENTBASEURL(),::rtl::OUString()) ); - xInfoSet->setPropertyValue(rtl::OUString("BaseURI"), uno::makeAny(sVal)); + const OUString sVal( aDescriptor.getUnpackedValueOrDefault(aDescriptor.PROP_DOCUMENTBASEURL(),OUString()) ); + xInfoSet->setPropertyValue(OUString("BaseURI"), uno::makeAny(sVal)); } - const ::rtl::OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(rtl::OUString("HierarchicalDocumentName"),::rtl::OUString()) ); - xInfoSet->setPropertyValue(rtl::OUString("StreamRelPath"), uno::makeAny(sHierarchicalDocumentName)); + const OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(OUString("HierarchicalDocumentName"),OUString()) ); + xInfoSet->setPropertyValue(OUString("StreamRelPath"), uno::makeAny(sHierarchicalDocumentName)); sal_Int32 nArgsLen = aDelegatorArguments.getLength(); @@ -1507,7 +1507,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS uno::Reference<XComponent> xCom(static_cast<OWeakObject*>(this),uno::UNO_QUERY); if( !bErr ) { - xInfoSet->setPropertyValue(rtl::OUString("StreamName"), uno::makeAny(::rtl::OUString("settings.xml"))); + xInfoSet->setPropertyValue(OUString("StreamName"), uno::makeAny(OUString("settings.xml"))); if( !WriteThroughComponent( xCom, "settings.xml", "com.sun.star.comp.report.XMLSettingsExporter", @@ -1516,14 +1516,14 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS if( !bWarn ) { bWarn = sal_True; - sWarnFile = ::rtl::OUString("settings.xml"); + sWarnFile = OUString("settings.xml"); } } } if( !bErr ) { - xInfoSet->setPropertyValue(rtl::OUString("StreamName"), uno::makeAny(::rtl::OUString("meta.xml"))); + xInfoSet->setPropertyValue(OUString("StreamName"), uno::makeAny(OUString("meta.xml"))); if( !WriteThroughComponent( xCom, "meta.xml", "com.sun.star.comp.report.XMLMetaExporter", @@ -1532,14 +1532,14 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS if( !bWarn ) { bWarn = sal_True; - sWarnFile = ::rtl::OUString("meta.xml"); + sWarnFile = OUString("meta.xml"); } } } if( !bErr ) { - xInfoSet->setPropertyValue(rtl::OUString("StreamName"), uno::makeAny(::rtl::OUString("styles.xml"))); + xInfoSet->setPropertyValue(OUString("StreamName"), uno::makeAny(OUString("styles.xml"))); if( !WriteThroughComponent( xCom, "styles.xml", "com.sun.star.comp.report.XMLStylesExporter", @@ -1548,21 +1548,21 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS if( !bWarn ) { bWarn = sal_True; - sWarnFile = ::rtl::OUString("styles.xml"); + sWarnFile = OUString("styles.xml"); } } } if ( !bErr ) { - xInfoSet->setPropertyValue(rtl::OUString("StreamName"), uno::makeAny(::rtl::OUString("content.xml"))); + xInfoSet->setPropertyValue(OUString("StreamName"), uno::makeAny(OUString("content.xml"))); if( !WriteThroughComponent( xCom, "content.xml", "com.sun.star.comp.report.ExportFilter", aDelegatorArguments, aProps, _xStorageToSaveTo ) ) { bErr = sal_True; - sErrFile = ::rtl::OUString("content.xml"); + sErrFile = OUString("content.xml"); } } @@ -1575,8 +1575,8 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS } if ( aImage.hasValue() ) { - ::rtl::OUString sObject1("report"); - ::rtl::OUString sPng("image/png"); + OUString sObject1("report"); + OUString sPng("image/png"); uno::Sequence<sal_Int8> aSeq; aImage >>= aSeq; @@ -1665,7 +1665,7 @@ sal_Bool OReportDefinition::WriteThroughComponent( { uno::Reference<embed::XStorage> xMyStorage = _xStorageToSaveTo; // open stream - ::rtl::OUString sStreamName = ::rtl::OUString::createFromAscii( pStreamName ); + OUString sStreamName = OUString::createFromAscii( pStreamName ); uno::Reference<io::XStream> xStream = xMyStorage->openStreamElement( sStreamName,embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE ); if ( !xStream.is() ) return sal_False; @@ -1684,8 +1684,8 @@ sal_Bool OReportDefinition::WriteThroughComponent( xSeek->seek(0); } - ::rtl::OUString aPropName("MediaType"); - ::rtl::OUString aMime("text/xml"); + OUString aPropName("MediaType"); + OUString aMime("text/xml"); uno::Any aAny; aAny <<= aMime; xStreamProp->setPropertyValue( aPropName, aAny ); @@ -1736,7 +1736,7 @@ sal_Bool OReportDefinition::WriteThroughComponent( // get filter component uno::Reference< document::XExporter > xExporter( m_aProps->m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - ::rtl::OUString::createFromAscii(pServiceName), aArgs,m_aProps->m_xContext), uno::UNO_QUERY); + OUString::createFromAscii(pServiceName), aArgs,m_aProps->m_xContext), uno::UNO_QUERY); OSL_ENSURE( xExporter.is(), "can't instantiate export filter component" ); if( !xExporter.is() ) @@ -1769,7 +1769,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue // the source for the to-be-created storage: either an URL, or a stream uno::Reference< io::XInputStream > xStream; - ::rtl::OUString sURL; + OUString sURL; if ( aArguments.has( "Stream" ) ) { @@ -1800,7 +1800,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue aStorageSource <<= sURL; else throw lang::IllegalArgumentException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No input source (URL or InputStream) found." ) ), + OUString( RTL_CONSTASCII_USTRINGPARAM( "No input source (URL or InputStream) found." ) ), // TODO: resource *this, 1 @@ -1836,7 +1836,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue { if ( i == nLastOpenMode ) throw lang::WrappedTargetException( - ::rtl::OUString( "An error occurred while creating the document storage." ), + OUString( "An error occurred while creating the document storage." ), // TODO: resource *this, ::cppu::getCaughtException() @@ -1880,8 +1880,8 @@ embed::VisualRepresentation SAL_CALL OReportDefinition::getPreferredVisualRepres ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); embed::VisualRepresentation aResult; - ::rtl::OUString sImageName("report"); - ::rtl::OUString sMimeType; + OUString sImageName("report"); + OUString sMimeType; uno::Reference<io::XInputStream> xStream = m_pImpl->m_pObjectContainer->GetGraphicStream(sImageName,&sMimeType); if ( xStream.is() ) { @@ -1960,7 +1960,7 @@ void SAL_CALL OReportDefinition::setModified( ::sal_Bool _bModified ) throw (bea lang::EventObject aEvent(*this); aGuard.clear(); m_pImpl->m_aModifyListeners.notifyEach(&util::XModifyListener::modified,aEvent); - notifyEvent(::rtl::OUString("OnModifyChanged")); + notifyEvent(OUString("OnModifyChanged")); } } // ----------------------------------------------------------------------------- @@ -1980,7 +1980,7 @@ void SAL_CALL OReportDefinition::removeModifyListener( const uno::Reference< uti m_pImpl->m_aModifyListeners.removeInterface(_xListener); } // ----------------------------------------------------------------------------- -void OReportDefinition::notifyEvent(const ::rtl::OUString& _sEventName) +void OReportDefinition::notifyEvent(const OUString& _sEventName) { try { @@ -2084,45 +2084,45 @@ uno::Reference< ui::XUIConfigurationManager2 > OReportDefinition::getUIConfigura return m_pImpl->m_xUIConfigurationManager; } // ----------------------------------------------------------------------------- -uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentSubStorage( const ::rtl::OUString& aStorageName, sal_Int32 nMode ) throw (uno::RuntimeException) +uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); return m_pImpl->m_xStorage->openStorageElement(aStorageName, nMode); } // ----------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OReportDefinition::getDocumentSubStoragesNames( ) throw (io::IOException, uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OReportDefinition::getDocumentSubStoragesNames( ) throw (io::IOException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); uno::Reference<container::XNameAccess> xNameAccess(m_pImpl->m_xStorage,uno::UNO_QUERY); - return xNameAccess.is() ? xNameAccess->getElementNames() : uno::Sequence< ::rtl::OUString >(); + return xNameAccess.is() ? xNameAccess->getElementNames() : uno::Sequence< OUString >(); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OReportDefinition::getMimeType() throw (uno::RuntimeException) +OUString SAL_CALL OReportDefinition::getMimeType() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); return m_pImpl->m_sMimeType; } // ----------------------------------------------------------------------------- -void SAL_CALL OReportDefinition::setMimeType( const ::rtl::OUString& _mimetype ) throw (lang::IllegalArgumentException, uno::RuntimeException) +void SAL_CALL OReportDefinition::setMimeType( const OUString& _mimetype ) throw (lang::IllegalArgumentException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); - uno::Sequence< ::rtl::OUString > aList = getAvailableMimeTypes(); - const ::rtl::OUString* pEnd = aList.getConstArray()+aList.getLength(); + uno::Sequence< OUString > aList = getAvailableMimeTypes(); + const OUString* pEnd = aList.getConstArray()+aList.getLength(); if ( ::std::find(aList.getConstArray(),pEnd,_mimetype) == pEnd ) - throwIllegallArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getAvailableMimeTypes()")) + throwIllegallArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("getAvailableMimeTypes()")) ,*this ,1 ,m_aProps->m_xContext); set(PROPERTY_MIMETYPE,_mimetype,m_pImpl->m_sMimeType); } // ----------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OReportDefinition::getAvailableMimeTypes( ) throw (lang::DisposedException, uno::Exception, uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableMimeTypes( ) throw (lang::DisposedException, uno::Exception, uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > s_aList(2); + uno::Sequence< OUString > s_aList(2); s_aList[0] = MIMETYPE_OASIS_OPENDOCUMENT_TEXT; s_aList[1] = MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET; return s_aList; @@ -2192,7 +2192,7 @@ uno::Reference< uno::XComponentContext > OReportDefinition::getContext() return pReportModel; } // ----------------------------------------------------------------------------- -uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstanceWithArguments( const ::rtl::OUString& aServiceSpecifier, const uno::Sequence< uno::Any >& _aArgs) +uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstanceWithArguments( const OUString& aServiceSpecifier, const uno::Sequence< uno::Any >& _aArgs) throw( uno::Exception, uno::RuntimeException ) { ::osl::MutexGuard aGuard(m_aMutex); @@ -2217,7 +2217,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstanceWith return xRet; } // ----------------------------------------------------------------------------- -uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( const ::rtl::OUString& aServiceSpecifier ) throw(uno::Exception, uno::RuntimeException) +uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( const OUString& aServiceSpecifier ) throw(uno::Exception, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); @@ -2225,14 +2225,14 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co if ( aServiceSpecifier.indexOf( "com.sun.star.report." ) == 0 ) { if ( aServiceSpecifier == SERVICE_SHAPE ) - xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString("com.sun.star.drawing.CustomShape") ),uno::UNO_QUERY_THROW); + xShape.set(SvxUnoDrawMSFactory::createInstance( OUString("com.sun.star.drawing.CustomShape") ),uno::UNO_QUERY_THROW); else if ( aServiceSpecifier == SERVICE_FORMATTEDFIELD || aServiceSpecifier == SERVICE_FIXEDTEXT || aServiceSpecifier == SERVICE_FIXEDLINE || aServiceSpecifier == SERVICE_IMAGECONTROL ) - xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString("com.sun.star.drawing.ControlShape") ),uno::UNO_QUERY_THROW); + xShape.set(SvxUnoDrawMSFactory::createInstance( OUString("com.sun.star.drawing.ControlShape") ),uno::UNO_QUERY_THROW); else - xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString("com.sun.star.drawing.OLE2Shape") ),uno::UNO_QUERY_THROW); + xShape.set(SvxUnoDrawMSFactory::createInstance( OUString("com.sun.star.drawing.OLE2Shape") ),uno::UNO_QUERY_THROW); } else if ( aServiceSpecifier.indexOf( "com.sun.star.form.component." ) == 0 ) { @@ -2244,10 +2244,10 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co ) { uno::Reference< style::XStyle> xStyle = new OStyle(); - xStyle->setName(::rtl::OUString("Default")); + xStyle->setName(OUString("Default")); uno::Reference<beans::XPropertySet> xProp(xStyle,uno::UNO_QUERY); - ::rtl::OUString sTray; - xProp->getPropertyValue(::rtl::OUString("PrinterPaperTray"))>>= sTray; + OUString sTray; + xProp->getPropertyValue(OUString("PrinterPaperTray"))>>= sTray; return xStyle.get(); } @@ -2328,7 +2328,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co else if ( aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.xml.NamespaceMap")) == 0 ) { if ( !m_pImpl->m_xXMLNamespaceMap.is() ) - m_pImpl->m_xXMLNamespaceMap = comphelper::NameContainer_createInstance( ::getCppuType( (const ::rtl::OUString*) 0 ) ).get(); + m_pImpl->m_xXMLNamespaceMap = comphelper::NameContainer_createInstance( ::getCppuType( (const OUString*) 0 ) ).get(); return m_pImpl->m_xXMLNamespaceMap; } else @@ -2337,39 +2337,39 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co return m_pImpl->m_pReportModel->createShape(aServiceSpecifier,xShape); } //----------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OReportDefinition::getAvailableServiceNames(void) throw( uno::RuntimeException ) -{ - static const ::rtl::OUString aSvxComponentServiceNameList[] = - { - ::rtl::OUString("com.sun.star.form.component.FixedText"), - ::rtl::OUString("com.sun.star.form.component.DatabaseImageControl"), - ::rtl::OUString("com.sun.star.style.PageStyle"), - ::rtl::OUString("com.sun.star.style.GraphicStyle"), - ::rtl::OUString("com.sun.star.style.FrameStyle"), - ::rtl::OUString("com.sun.star.drawing.Defaults"), - ::rtl::OUString("com.sun.star.document.ImportEmbeddedObjectResolver"), - ::rtl::OUString("com.sun.star.document.ExportEmbeddedObjectResolver"), - ::rtl::OUString("com.sun.star.document.ImportGraphicObjectResolver"), - ::rtl::OUString("com.sun.star.document.ExportGraphicObjectResolver"), - ::rtl::OUString("com.sun.star.chart2.data.DataProvider"), - ::rtl::OUString("com.sun.star.xml.NamespaceMap"), - ::rtl::OUString("com.sun.star.document.Settings"), - ::rtl::OUString("com.sun.star.drawing.GradientTable"), - ::rtl::OUString("com.sun.star.drawing.HatchTable"), - ::rtl::OUString("com.sun.star.drawing.BitmapTable"), - ::rtl::OUString("com.sun.star.drawing.TransparencyGradientTable"), - ::rtl::OUString("com.sun.star.drawing.DashTable"), - ::rtl::OUString("com.sun.star.drawing.MarkerTable") +uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableServiceNames(void) throw( uno::RuntimeException ) +{ + static const OUString aSvxComponentServiceNameList[] = + { + OUString("com.sun.star.form.component.FixedText"), + OUString("com.sun.star.form.component.DatabaseImageControl"), + OUString("com.sun.star.style.PageStyle"), + OUString("com.sun.star.style.GraphicStyle"), + OUString("com.sun.star.style.FrameStyle"), + OUString("com.sun.star.drawing.Defaults"), + OUString("com.sun.star.document.ImportEmbeddedObjectResolver"), + OUString("com.sun.star.document.ExportEmbeddedObjectResolver"), + OUString("com.sun.star.document.ImportGraphicObjectResolver"), + OUString("com.sun.star.document.ExportGraphicObjectResolver"), + OUString("com.sun.star.chart2.data.DataProvider"), + OUString("com.sun.star.xml.NamespaceMap"), + OUString("com.sun.star.document.Settings"), + OUString("com.sun.star.drawing.GradientTable"), + OUString("com.sun.star.drawing.HatchTable"), + OUString("com.sun.star.drawing.BitmapTable"), + OUString("com.sun.star.drawing.TransparencyGradientTable"), + OUString("com.sun.star.drawing.DashTable"), + OUString("com.sun.star.drawing.MarkerTable") }; static const sal_uInt16 nSvxComponentServiceNameListCount = sizeof(aSvxComponentServiceNameList) / sizeof ( aSvxComponentServiceNameList[0] ); - uno::Sequence< ::rtl::OUString > aSeq( nSvxComponentServiceNameListCount ); - ::rtl::OUString* pStrings = aSeq.getArray(); + uno::Sequence< OUString > aSeq( nSvxComponentServiceNameListCount ); + OUString* pStrings = aSeq.getArray(); for( sal_uInt16 nIdx = 0; nIdx < nSvxComponentServiceNameListCount; nIdx++ ) pStrings[nIdx] = aSvxComponentServiceNameList[nIdx]; - uno::Sequence< ::rtl::OUString > aParentSeq( SvxUnoDrawMSFactory::getAvailableServiceNames() ); + uno::Sequence< OUString > aParentSeq( SvxUnoDrawMSFactory::getAvailableServiceNames() ); return concatServiceNames( aParentSeq, aSeq ); } // ----------------------------------------------------------------------------- @@ -2414,9 +2414,9 @@ void SAL_CALL OReportDefinition::setSize( const awt::Size& aSize ) throw (beans: // ----------------------------------------------------------------------------- // XShapeDescriptor -::rtl::OUString SAL_CALL OReportDefinition::getShapeType( ) throw (uno::RuntimeException) +OUString SAL_CALL OReportDefinition::getShapeType( ) throw (uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.drawing.OLE2Shape"); + return OUString("com.sun.star.drawing.OLE2Shape"); } // ----------------------------------------------------------------------------- typedef ::cppu::WeakImplHelper2< container::XNameContainer, @@ -2424,7 +2424,7 @@ typedef ::cppu::WeakImplHelper2< container::XNameContainer, > TStylesBASE; class OStylesHelper : public ::cppu::BaseMutex, public TStylesBASE { - typedef ::std::map< ::rtl::OUString, uno::Any , ::comphelper::UStringMixLess> TStyleElements; + typedef ::std::map< OUString, uno::Any , ::comphelper::UStringMixLess> TStyleElements; TStyleElements m_aElements; ::std::vector<TStyleElements::iterator> m_aElementsPos; uno::Type m_aType; @@ -2437,11 +2437,11 @@ public: OStylesHelper(const uno::Type _aType = ::getCppuType(static_cast< uno::Reference< container::XElementAccess >* >(NULL))); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException,lang::WrappedTargetException, uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw(container::NoSuchElementException, lang::WrappedTargetException,uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException,lang::WrappedTargetException, uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& Name ) throw(container::NoSuchElementException, lang::WrappedTargetException,uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException,lang::WrappedTargetException, uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException,lang::WrappedTargetException, uno::RuntimeException); // container::XElementAccess virtual uno::Type SAL_CALL getElementType( ) throw(uno::RuntimeException); @@ -2451,9 +2451,9 @@ public: virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException); // container::XNameAccess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(uno::RuntimeException); + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(uno::RuntimeException); }; OStylesHelper::OStylesHelper(const uno::Type _aType) @@ -2490,7 +2490,7 @@ uno::Any SAL_CALL OStylesHelper::getByIndex( sal_Int32 Index ) throw(lang::Index } // ----------------------------------------------------------------------------- // container::XNameAccess -uno::Any SAL_CALL OStylesHelper::getByName( const ::rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL OStylesHelper::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); TStyleElements::iterator aFind = m_aElements.find(aName); @@ -2499,12 +2499,12 @@ uno::Any SAL_CALL OStylesHelper::getByName( const ::rtl::OUString& aName ) throw return uno::makeAny(aFind->second); } // ----------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OStylesHelper::getElementNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OStylesHelper::getElementNames( ) throw(uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - uno::Sequence< ::rtl::OUString > aNameList(m_aElementsPos.size()); + uno::Sequence< OUString > aNameList(m_aElementsPos.size()); - ::rtl::OUString* pStringArray = aNameList.getArray(); + OUString* pStringArray = aNameList.getArray(); ::std::vector<TStyleElements::iterator>::const_iterator aEnd = m_aElementsPos.end(); for(::std::vector<TStyleElements::iterator>::const_iterator aIter = m_aElementsPos.begin(); aIter != aEnd;++aIter,++pStringArray) *pStringArray = (*aIter)->first; @@ -2512,14 +2512,14 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OStylesHelper::getElementNames( ) thr return aNameList; } // ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OStylesHelper::hasByName( const ::rtl::OUString& aName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL OStylesHelper::hasByName( const OUString& aName ) throw(uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aElements.find(aName) != m_aElements.end(); } // ----------------------------------------------------------------------------- // XNameContainer -void SAL_CALL OStylesHelper::insertByName( const ::rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException,lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OStylesHelper::insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException,lang::WrappedTargetException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); if ( m_aElements.find(aName) != m_aElements.end() ) @@ -2531,7 +2531,7 @@ void SAL_CALL OStylesHelper::insertByName( const ::rtl::OUString& aName, const u m_aElementsPos.push_back(m_aElements.insert(TStyleElements::value_type(aName,aElement)).first); } // ----------------------------------------------------------------------------- -void SAL_CALL OStylesHelper::removeByName( const ::rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException,uno::RuntimeException) +void SAL_CALL OStylesHelper::removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException,uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); TStyleElements::iterator aFind = m_aElements.find(aName); @@ -2542,7 +2542,7 @@ void SAL_CALL OStylesHelper::removeByName( const ::rtl::OUString& aName ) throw( } // ----------------------------------------------------------------------------- // XNameReplace -void SAL_CALL OStylesHelper::replaceByName( const ::rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException,lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OStylesHelper::replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException,lang::WrappedTargetException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); TStyleElements::iterator aFind = m_aElements.find(aName); @@ -2563,30 +2563,30 @@ uno::Reference< container::XNameAccess > SAL_CALL OReportDefinition::getStyleFam uno::Reference< container::XNameContainer> xStyles(m_pImpl->m_xStyles,uno::UNO_QUERY); uno::Reference< container::XNameContainer> xPageStyles = new OStylesHelper(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL))); - xStyles->insertByName(::rtl::OUString("PageStyles"),uno::makeAny(xPageStyles)); - uno::Reference< style::XStyle> xPageStyle(createInstance(::rtl::OUString("com.sun.star.style.PageStyle")),uno::UNO_QUERY); + xStyles->insertByName(OUString("PageStyles"),uno::makeAny(xPageStyles)); + uno::Reference< style::XStyle> xPageStyle(createInstance(OUString("com.sun.star.style.PageStyle")),uno::UNO_QUERY); xPageStyles->insertByName(xPageStyle->getName(),uno::makeAny(xPageStyle)); uno::Reference< container::XNameContainer> xFrameStyles = new OStylesHelper(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL))); - xStyles->insertByName(::rtl::OUString("FrameStyles"),uno::makeAny(xFrameStyles)); - uno::Reference< style::XStyle> xFrameStyle(createInstance(::rtl::OUString("com.sun.star.style.FrameStyle")),uno::UNO_QUERY); + xStyles->insertByName(OUString("FrameStyles"),uno::makeAny(xFrameStyles)); + uno::Reference< style::XStyle> xFrameStyle(createInstance(OUString("com.sun.star.style.FrameStyle")),uno::UNO_QUERY); xFrameStyles->insertByName(xFrameStyle->getName(),uno::makeAny(xFrameStyle)); uno::Reference< container::XNameContainer> xGraphicStyles = new OStylesHelper(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL))); - xStyles->insertByName(::rtl::OUString("graphics"),uno::makeAny(xGraphicStyles)); - uno::Reference< style::XStyle> xGraphicStyle(createInstance(::rtl::OUString("com.sun.star.style.GraphicStyle")),uno::UNO_QUERY); + xStyles->insertByName(OUString("graphics"),uno::makeAny(xGraphicStyles)); + uno::Reference< style::XStyle> xGraphicStyle(createInstance(OUString("com.sun.star.style.GraphicStyle")),uno::UNO_QUERY); xGraphicStyles->insertByName(xGraphicStyle->getName(),uno::makeAny(xGraphicStyle)); } return m_pImpl->m_xStyles; } -::rtl::OUString SAL_CALL OReportDefinition::getIdentifier( ) throw (uno::RuntimeException) +OUString SAL_CALL OReportDefinition::getIdentifier( ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); return m_pImpl->m_sIdentifier; } // ----------------------------------------------------------------------------- -void SAL_CALL OReportDefinition::setIdentifier( const ::rtl::OUString& Identifier ) throw (uno::RuntimeException) +void SAL_CALL OReportDefinition::setIdentifier( const OUString& Identifier ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); @@ -2640,13 +2640,13 @@ void SAL_CALL OReportDefinition::setActiveConnection( const uno::Reference< sdbc set(PROPERTY_ACTIVECONNECTION,_activeconnection,m_pImpl->m_xActiveConnection); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OReportDefinition::getDataSourceName() throw (uno::RuntimeException) +OUString SAL_CALL OReportDefinition::getDataSourceName() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_pImpl->m_sDataSourceName; } // ----------------------------------------------------------------------------- -void SAL_CALL OReportDefinition::setDataSourceName(const ::rtl::OUString& the_value) throw (uno::RuntimeException) +void SAL_CALL OReportDefinition::setDataSourceName(const OUString& the_value) throw (uno::RuntimeException) { set(PROPERTY_DATASOURCENAME,the_value,m_pImpl->m_sDataSourceName); } @@ -2690,14 +2690,14 @@ uno::Reference< frame::XUntitledNumbers > OReportDefinition::impl_getUntitledHel m_pImpl->m_xNumberedControllers = uno::Reference< frame::XUntitledNumbers >(static_cast< ::cppu::OWeakObject* >(pHelper), uno::UNO_QUERY_THROW); pHelper->setOwner (xThis); - pHelper->setUntitledPrefix (::rtl::OUString(" : ")); + pHelper->setUntitledPrefix (OUString(" : ")); } return m_pImpl->m_xNumberedControllers; } // ----------------------------------------------------------------------------- // css.frame.XTitle -::rtl::OUString SAL_CALL OReportDefinition::getTitle() +OUString SAL_CALL OReportDefinition::getTitle() throw (uno::RuntimeException) { // SYNCHRONIZED -> @@ -2710,7 +2710,7 @@ uno::Reference< frame::XUntitledNumbers > OReportDefinition::impl_getUntitledHel } // ----------------------------------------------------------------------------- // css.frame.XTitle -void SAL_CALL OReportDefinition::setTitle( const ::rtl::OUString& sTitle ) +void SAL_CALL OReportDefinition::setTitle( const OUString& sTitle ) throw (uno::RuntimeException) { // SYNCHRONIZED -> @@ -2792,7 +2792,7 @@ void SAL_CALL OReportDefinition::releaseNumberForComponent( const uno::Reference } // ----------------------------------------------------------------------------- // css.frame.XUntitledNumbers -::rtl::OUString SAL_CALL OReportDefinition::getUntitledPrefix() +OUString SAL_CALL OReportDefinition::getUntitledPrefix() throw (uno::RuntimeException) { // object already disposed? @@ -2845,8 +2845,8 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL OReportDefinition::getTransfe { uno::Sequence< datatransfer::DataFlavor > aRet(1); - aRet[0] = datatransfer::DataFlavor( ::rtl::OUString("image/png"), - ::rtl::OUString("PNG"), + aRet[0] = datatransfer::DataFlavor( OUString("image/png"), + OUString("PNG"), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); return aRet; diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 9a61db0f2439..e99d1440df61 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -64,7 +64,7 @@ DBG_NAME( rpt_OReportEngineJFree ) // ----------------------------------------------------------------------------- OReportEngineJFree::OReportEngineJFree( const uno::Reference< uno::XComponentContext >& context) :ReportEngineBase(m_aMutex) -,ReportEnginePropertySet(context,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >()) +,ReportEnginePropertySet(context,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >()) ,m_xContext(context) ,m_nMaxRows(0) { @@ -87,20 +87,20 @@ void SAL_CALL OReportEngineJFree::dispose() throw(uno::RuntimeException) m_xActiveConnection.clear(); } // ----------------------------------------------------------------------------- -::rtl::OUString OReportEngineJFree::getImplementationName_Static( ) throw(uno::RuntimeException) +OUString OReportEngineJFree::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.OReportEngineJFree"); + return OUString("com.sun.star.comp.report.OReportEngineJFree"); } //-------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OReportEngineJFree::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL OReportEngineJFree::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > OReportEngineJFree::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) +uno::Sequence< OUString > OReportEngineJFree::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aServices(1); + uno::Sequence< OUString > aServices(1); aServices.getArray()[0] = OUString("com.sun.star.report.ReportEngine"); return aServices; @@ -112,12 +112,12 @@ uno::Reference< uno::XInterface > OReportEngineJFree::create(uno::Reference< uno } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OReportEngineJFree::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OReportEngineJFree::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL OReportEngineJFree::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException ) +sal_Bool SAL_CALL OReportEngineJFree::supportsService(const OUString& ServiceName) throw( uno::RuntimeException ) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } @@ -157,26 +157,26 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task set(PROPERTY_STATUSINDICATOR,_statusindicator,m_StatusIndicator); } // ----------------------------------------------------------------------------- -::rtl::OUString OReportEngineJFree::getNewOutputName() +OUString OReportEngineJFree::getNewOutputName() { - ::rtl::OUString sOutputName; + OUString sOutputName; { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportEngineBase::rBHelper.bDisposed); if ( !m_xReport.is() || !m_xActiveConnection.is() ) throw lang::IllegalArgumentException(); - static const ::rtl::OUString s_sMediaType("MediaType"); + static const OUString s_sMediaType("MediaType"); try { MimeConfigurationHelper aConfighelper(m_xContext); - const ::rtl::OUString sMimeType = m_xReport->getMimeType(); + const OUString sMimeType = m_xReport->getMimeType(); const SfxFilter* pFilter = SfxFilter::GetDefaultFilter( aConfighelper.GetDocServiceNameFromMediaType(sMimeType) ); String sExt; if ( pFilter ) sExt = ::comphelper::string::stripStart(pFilter->GetDefaultExtension(), '*'); else - sExt = rtl::OUString(".rpt"); + sExt = OUString(".rpt"); uno::Reference< embed::XStorage > xTemp = OStorageHelper::GetTemporaryStorage(/*sFileTemp,embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE,*/ m_xContext); utl::DisposableComponent aTemp(xTemp); @@ -190,11 +190,11 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task uno::Sequence< beans::NamedValue > aConvertedProperties(8); sal_Int32 nPos = 0; - aConvertedProperties[nPos].Name = ::rtl::OUString("InputStorage"); + aConvertedProperties[nPos].Name = OUString("InputStorage"); aConvertedProperties[nPos++].Value <<= xTemp; - aConvertedProperties[nPos].Name = ::rtl::OUString("OutputStorage"); + aConvertedProperties[nPos].Name = OUString("OutputStorage"); - ::rtl::OUString sFileURL; + OUString sFileURL; String sName = m_xReport->getCaption(); if ( !sName.Len() ) sName = m_xReport->getName(); @@ -231,19 +231,19 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task // some meta data SvtUserOptions aUserOpts; - ::rtl::OUStringBuffer sAuthor(aUserOpts.GetFirstName()); + OUStringBuffer sAuthor(aUserOpts.GetFirstName()); sAuthor.appendAscii(" "); sAuthor.append(aUserOpts.GetLastName()); - static const ::rtl::OUString s_sAuthor("Author"); + static const OUString s_sAuthor("Author"); aConvertedProperties[nPos].Name = s_sAuthor; aConvertedProperties[nPos++].Value <<= sAuthor.makeStringAndClear(); - static const ::rtl::OUString s_sTitle("Title"); + static const OUString s_sTitle("Title"); aConvertedProperties[nPos].Name = s_sTitle; aConvertedProperties[nPos++].Value <<= m_xReport->getCaption(); // create job factory and initialize - const ::rtl::OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_xContext); + const OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_xContext); uno::Reference<task::XJob> xJob(m_xContext->getServiceManager()->createInstanceWithContext(sReportEngineServiceName,m_xContext),uno::UNO_QUERY_THROW); if ( !m_xReport->getCommand().isEmpty() ) { @@ -284,7 +284,7 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive( const uno::Reference< frame::XFrame >& _frame,bool _bHidden ) throw (lang::DisposedException, lang::IllegalArgumentException, uno::Exception, uno::RuntimeException) { uno::Reference< frame::XModel > xModel; - ::rtl::OUString sOutputName = getNewOutputName(); // starts implicite the report generator + OUString sOutputName = getNewOutputName(); // starts implicite the report generator if ( !sOutputName.isEmpty() ) { ::osl::MutexGuard aGuard(m_aMutex); @@ -294,7 +294,7 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive { // if there is no frame given, find the right xFrameLoad.set( frame::Desktop::create(m_xContext), uno::UNO_QUERY); - ::rtl::OUString sTarget("_blank"); + OUString sTarget("_blank"); sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | frame::FrameSearchFlag::CREATE; uno::Reference< frame::XFrame> xFrame = uno::Reference< frame::XFrame>(xFrameLoad,uno::UNO_QUERY)->findFrame(sTarget,nFrameSearchFlag); xFrameLoad.set( xFrame,uno::UNO_QUERY); @@ -304,22 +304,22 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive { uno::Sequence < beans::PropertyValue > aArgs( _bHidden ? 3 : 2 ); sal_Int32 nLen = 0; - aArgs[nLen].Name = ::rtl::OUString("AsTemplate"); + aArgs[nLen].Name = OUString("AsTemplate"); aArgs[nLen++].Value <<= sal_False; - aArgs[nLen].Name = ::rtl::OUString("ReadOnly"); + aArgs[nLen].Name = OUString("ReadOnly"); aArgs[nLen++].Value <<= sal_True; if ( _bHidden ) { - aArgs[nLen].Name = ::rtl::OUString("Hidden"); + aArgs[nLen].Name = OUString("Hidden"); aArgs[nLen++].Value <<= sal_True; } uno::Reference< lang::XMultiServiceFactory > xFac(m_xContext->getServiceManager(),uno::UNO_QUERY); xModel.set( xFrameLoad->loadComponentFromURL( sOutputName, - ::rtl::OUString(), // empty frame name + OUString(), // empty frame name 0, aArgs ),uno::UNO_QUERY); @@ -353,32 +353,32 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OReportEngineJFree::getProper return ReportEnginePropertySet::getPropertySetInfo(); } // ------------------------------------------------------------------------- -void SAL_CALL OReportEngineJFree::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OReportEngineJFree::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { ReportEnginePropertySet::setPropertyValue( aPropertyName, aValue ); } // ----------------------------------------------------------------------------- -uno::Any SAL_CALL OReportEngineJFree::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL OReportEngineJFree::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return ReportEnginePropertySet::getPropertyValue( PropertyName); } // ----------------------------------------------------------------------------- -void SAL_CALL OReportEngineJFree::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OReportEngineJFree::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ReportEnginePropertySet::addPropertyChangeListener( aPropertyName, xListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OReportEngineJFree::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OReportEngineJFree::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ReportEnginePropertySet::removePropertyChangeListener( aPropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OReportEngineJFree::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OReportEngineJFree::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ReportEnginePropertySet::addVetoableChangeListener( PropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OReportEngineJFree::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OReportEngineJFree::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ReportEnginePropertySet::removeVetoableChangeListener( PropertyName, aListener ); } diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 265ed3e6121b..931e1ecbc40f 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -45,22 +45,22 @@ namespace reportdesign DBG_NAME( rpt_OSection ) // ----------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString> lcl_getGroupAbsent() +uno::Sequence< OUString> lcl_getGroupAbsent() { - ::rtl::OUString pProps[] = { + OUString pProps[] = { PROPERTY_CANGROW ,PROPERTY_CANSHRINK }; - return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); + return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); } // ----------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString> lcl_getAbsent(bool _bPageSection) +uno::Sequence< OUString> lcl_getAbsent(bool _bPageSection) { if ( _bPageSection ) { - ::rtl::OUString pProps[] = { + OUString pProps[] = { PROPERTY_FORCENEWPAGE ,PROPERTY_NEWROWORCOL ,PROPERTY_KEEPTOGETHER @@ -68,16 +68,16 @@ uno::Sequence< ::rtl::OUString> lcl_getAbsent(bool _bPageSection) ,PROPERTY_CANSHRINK ,PROPERTY_REPEATSECTION }; - return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); + return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); } - ::rtl::OUString pProps[] = { + OUString pProps[] = { PROPERTY_CANGROW ,PROPERTY_CANSHRINK ,PROPERTY_REPEATSECTION }; - return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); + return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); } uno::Reference<report::XSection> OSection::createOSection( @@ -106,7 +106,7 @@ uno::Reference<report::XSection> OSection::createOSection( OSection::OSection(const uno::Reference< report::XReportDefinition >& xParentDef ,const uno::Reference< report::XGroup >& xParentGroup ,const uno::Reference< uno::XComponentContext >& context - ,uno::Sequence< ::rtl::OUString> const& rStrings) + ,uno::Sequence< OUString> const& rStrings) :SectionBase(m_aMutex) ,SectionPropertySet(context,SectionPropertySet::IMPLEMENTS_PROPERTY_SET,rStrings) ,m_aContainerListeners(m_aMutex) @@ -175,24 +175,24 @@ void SAL_CALL OSection::disposing() m_xContext.clear(); } //-------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OSection::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL OSection::getImplementationName( ) throw(uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.Section"); + return OUString("com.sun.star.comp.report.Section"); } //------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString> OSection::getSupportedServiceNames_Static(void) throw( uno::RuntimeException ) +uno::Sequence< OUString> OSection::getSupportedServiceNames_Static(void) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString> aSupported(1); + uno::Sequence< OUString> aSupported(1); aSupported.getArray()[0] = SERVICE_SECTION; return aSupported; } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString> SAL_CALL OSection::getSupportedServiceNames() throw(uno::RuntimeException) +uno::Sequence< OUString> SAL_CALL OSection::getSupportedServiceNames() throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } // ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OSection::supportsService( const ::rtl::OUString& _rServiceName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL OSection::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException) { return ::comphelper::existsValue(_rServiceName,getSupportedServiceNames_Static()); } @@ -233,13 +233,13 @@ void SAL_CALL OSection::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeExc set(PROPERTY_VISIBLE,_visible,m_bVisible); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OSection::getName() throw (uno::RuntimeException) +OUString SAL_CALL OSection::getName() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_sName; } // ----------------------------------------------------------------------------- -void SAL_CALL OSection::setName( const ::rtl::OUString& _name ) throw (uno::RuntimeException) +void SAL_CALL OSection::setName( const OUString& _name ) throw (uno::RuntimeException) { set(PROPERTY_NAME,_name,m_sName); } @@ -282,13 +282,13 @@ void SAL_CALL OSection::setBackTransparent( ::sal_Bool _backtransparent ) throw set(PROPERTY_BACKCOLOR,static_cast<sal_Int32>(COL_TRANSPARENT),m_nBackgroundColor); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OSection::getConditionalPrintExpression() throw (uno::RuntimeException) +OUString SAL_CALL OSection::getConditionalPrintExpression() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_sConditionalPrintExpression; } // ----------------------------------------------------------------------------- -void SAL_CALL OSection::setConditionalPrintExpression( const ::rtl::OUString& _conditionalprintexpression ) throw (uno::RuntimeException) +void SAL_CALL OSection::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (uno::RuntimeException) { set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_sConditionalPrintExpression); } @@ -317,7 +317,7 @@ void OSection::checkNotPageHeaderFooter() void SAL_CALL OSection::setForceNewPage( ::sal_Int16 _forcenewpage ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { if ( _forcenewpage < report::ForceNewPage::NONE || _forcenewpage > report::ForceNewPage::BEFORE_AFTER_SECTION ) - throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::ForceNewPage") + throwIllegallArgumentException(OUString("com::sun::star::report::ForceNewPage") ,*this ,1 ,m_xContext); @@ -335,7 +335,7 @@ void SAL_CALL OSection::setForceNewPage( ::sal_Int16 _forcenewpage ) throw (lang void SAL_CALL OSection::setNewRowOrCol( ::sal_Int16 _newroworcol ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { if ( _newroworcol < report::ForceNewPage::NONE || _newroworcol > report::ForceNewPage::BEFORE_AFTER_SECTION ) - throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::ForceNewPage") + throwIllegallArgumentException(OUString("com::sun::star::report::ForceNewPage") ,*this ,1 ,m_xContext); @@ -422,26 +422,26 @@ uno::Reference< report::XReportDefinition > SAL_CALL OSection::getReportDefiniti return xRet; } // ----------------------------------------------------------------------------- -const ::std::vector< ::rtl::OUString >& lcl_getControlModelMap() +const ::std::vector< OUString >& lcl_getControlModelMap() { - static ::std::vector< ::rtl::OUString > s_sControlModels; + static ::std::vector< OUString > s_sControlModels; if ( s_sControlModels.empty() ) { - s_sControlModels.push_back( ::rtl::OUString("FixedText") ); - s_sControlModels.push_back( ::rtl::OUString("FixedLine") ); - s_sControlModels.push_back( ::rtl::OUString("ImageControl") ); - s_sControlModels.push_back( ::rtl::OUString("FormattedField") ); - s_sControlModels.push_back( ::rtl::OUString("Shape") ); + s_sControlModels.push_back( OUString("FixedText") ); + s_sControlModels.push_back( OUString("FixedLine") ); + s_sControlModels.push_back( OUString("ImageControl") ); + s_sControlModels.push_back( OUString("FormattedField") ); + s_sControlModels.push_back( OUString("Shape") ); } return s_sControlModels; } // ----------------------------------------------------------------------------- -uno::Reference< report::XReportComponent > SAL_CALL OSection::createReportComponent( const ::rtl::OUString& _sReportComponentSpecifier ) throw (uno::Exception, lang::IllegalArgumentException,uno::RuntimeException) +uno::Reference< report::XReportComponent > SAL_CALL OSection::createReportComponent( const OUString& _sReportComponentSpecifier ) throw (uno::Exception, lang::IllegalArgumentException,uno::RuntimeException) { ::osl::ResettableMutexGuard aGuard(m_aMutex); - const ::std::vector< ::rtl::OUString >& aRet = lcl_getControlModelMap(); - ::std::vector< ::rtl::OUString >::const_iterator aFind = ::std::find(aRet.begin(),aRet.end(),_sReportComponentSpecifier); + const ::std::vector< OUString >& aRet = lcl_getControlModelMap(); + ::std::vector< OUString >::const_iterator aFind = ::std::find(aRet.begin(),aRet.end(),_sReportComponentSpecifier); if ( aFind == aRet.end() ) throw lang::IllegalArgumentException(); @@ -450,19 +450,19 @@ uno::Reference< report::XReportComponent > SAL_CALL OSection::createReportCompon switch( aFind - aRet.begin() ) { case 0: - xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.form.component.FixedText")),uno::UNO_QUERY); + xRet.set(xFac->createInstance(OUString("com.sun.star.form.component.FixedText")),uno::UNO_QUERY); break; case 1: - xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.awt.UnoControlFixedLineModel")),uno::UNO_QUERY); + xRet.set(xFac->createInstance(OUString("com.sun.star.awt.UnoControlFixedLineModel")),uno::UNO_QUERY); break; case 2: - xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.form.component.DatabaseImageControl")),uno::UNO_QUERY); + xRet.set(xFac->createInstance(OUString("com.sun.star.form.component.DatabaseImageControl")),uno::UNO_QUERY); break; case 3: - xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.form.component.FormattedField")),uno::UNO_QUERY); + xRet.set(xFac->createInstance(OUString("com.sun.star.form.component.FormattedField")),uno::UNO_QUERY); break; case 4: - xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.drawing.ControlShape")),uno::UNO_QUERY); + xRet.set(xFac->createInstance(OUString("com.sun.star.drawing.ControlShape")),uno::UNO_QUERY); break; default: break; @@ -470,13 +470,13 @@ uno::Reference< report::XReportComponent > SAL_CALL OSection::createReportCompon return xRet; } // ----------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OSection::getAvailableReportComponentNames( ) throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OSection::getAvailableReportComponentNames( ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - const ::std::vector< ::rtl::OUString >& aRet = lcl_getControlModelMap(); - const ::rtl::OUString* pRet = aRet.empty() ? 0 : &aRet[0]; - return uno::Sequence< ::rtl::OUString >(pRet, aRet.size()); + const ::std::vector< OUString >& aRet = lcl_getControlModelMap(); + const OUString* pRet = aRet.empty() ? 0 : &aRet[0]; + return uno::Sequence< OUString >(pRet, aRet.size()); } // ----------------------------------------------------------------------------- // XChild @@ -545,32 +545,32 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OSection::getPropertySetInfo( return SectionPropertySet::getPropertySetInfo(); } // ------------------------------------------------------------------------- -void SAL_CALL OSection::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OSection::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { SectionPropertySet::setPropertyValue( aPropertyName, aValue ); } // ----------------------------------------------------------------------------- -uno::Any SAL_CALL OSection::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL OSection::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return SectionPropertySet::getPropertyValue( PropertyName); } // ----------------------------------------------------------------------------- -void SAL_CALL OSection::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OSection::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { SectionPropertySet::addPropertyChangeListener( aPropertyName, xListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OSection::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OSection::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { SectionPropertySet::removePropertyChangeListener( aPropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OSection::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OSection::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { SectionPropertySet::addVetoableChangeListener( PropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OSection::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OSection::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { SectionPropertySet::removeVetoableChangeListener( PropertyName, aListener ); } diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index c875df30e1a0..bd8295b6088c 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -41,14 +41,14 @@ namespace reportdesign // ============================================================================= using namespace com::sun::star; using namespace comphelper; -uno::Sequence< ::rtl::OUString > lcl_getShapeOptionals() +uno::Sequence< OUString > lcl_getShapeOptionals() { - ::rtl::OUString pProps[] = { + OUString pProps[] = { PROPERTY_DATAFIELD ,PROPERTY_CONTROLBACKGROUND ,PROPERTY_CONTROLBACKGROUNDTRANSPARENT }; - return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); + return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); } DBG_NAME( rpt_OShape ) @@ -67,7 +67,7 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext) OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape - ,const ::rtl::OUString& _sServiceName) + ,const OUString& _sServiceName) :ShapeBase(m_aMutex) ,ShapePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getShapeOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) @@ -118,20 +118,20 @@ void SAL_CALL OShape::dispose() throw(uno::RuntimeException) cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- -::rtl::OUString OShape::getImplementationName_Static( ) throw(uno::RuntimeException) +OUString OShape::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.Shape"); + return OUString("com.sun.star.comp.report.Shape"); } //-------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OShape::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL OShape::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > OShape::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) +uno::Sequence< OUString > OShape::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aServices(1); + uno::Sequence< OUString > aServices(1); aServices.getArray()[0] = SERVICE_SHAPE; return aServices; @@ -143,12 +143,12 @@ uno::Reference< uno::XInterface > OShape::create(uno::Reference< uno::XComponent } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OShape::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OShape::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL OShape::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException ) +sal_Bool SAL_CALL OShape::supportsService(const OUString& ServiceName) throw( uno::RuntimeException ) { return m_sServiceName == ServiceName || ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); @@ -200,7 +200,7 @@ cppu::IPropertyArrayHelper& OShape::getInfoHelper() } // ----------------------------------------------------------------------------- -void SAL_CALL OShape::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OShape::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { getInfoHelper(); if( m_pAggHelper->classifyProperty(aPropertyName) == OPropertyArrayAggregationHelper::AGGREGATE_PROPERTY ) @@ -210,7 +210,7 @@ void SAL_CALL OShape::setPropertyValue( const ::rtl::OUString& aPropertyName, co ShapePropertySet::setPropertyValue( aPropertyName, aValue ); } // ----------------------------------------------------------------------------- -uno::Any SAL_CALL OShape::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL OShape::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { getInfoHelper(); if( m_pAggHelper->classifyProperty(PropertyName) == OPropertyArrayAggregationHelper::AGGREGATE_PROPERTY ) @@ -221,7 +221,7 @@ uno::Any SAL_CALL OShape::getPropertyValue( const ::rtl::OUString& PropertyName return uno::Any(); } // ----------------------------------------------------------------------------- -void SAL_CALL OShape::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OShape::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { getInfoHelper(); if( m_pAggHelper->classifyProperty(aPropertyName) == OPropertyArrayAggregationHelper::AGGREGATE_PROPERTY || aPropertyName.isEmpty() ) @@ -231,7 +231,7 @@ void SAL_CALL OShape::addPropertyChangeListener( const ::rtl::OUString& aPropert ShapePropertySet::addPropertyChangeListener( aPropertyName, xListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OShape::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OShape::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { getInfoHelper(); if( m_pAggHelper->classifyProperty(aPropertyName) == OPropertyArrayAggregationHelper::AGGREGATE_PROPERTY || aPropertyName.isEmpty() ) @@ -241,7 +241,7 @@ void SAL_CALL OShape::removePropertyChangeListener( const ::rtl::OUString& aProp ShapePropertySet::removePropertyChangeListener( aPropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OShape::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OShape::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { getInfoHelper(); if( m_pAggHelper->classifyProperty(PropertyName) == OPropertyArrayAggregationHelper::AGGREGATE_PROPERTY || PropertyName.isEmpty() ) @@ -251,7 +251,7 @@ void SAL_CALL OShape::addVetoableChangeListener( const ::rtl::OUString& Property ShapePropertySet::addVetoableChangeListener( PropertyName, aListener ); } // ----------------------------------------------------------------------------- -void SAL_CALL OShape::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL OShape::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { getInfoHelper(); if( m_pAggHelper->classifyProperty(PropertyName) == OPropertyArrayAggregationHelper::AGGREGATE_PROPERTY || PropertyName.isEmpty() ) @@ -262,12 +262,12 @@ void SAL_CALL OShape::removeVetoableChangeListener( const ::rtl::OUString& Prope } // ----------------------------------------------------------------------------- // XReportControlModel -::rtl::OUString SAL_CALL OShape::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException) +OUString SAL_CALL OShape::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } // ----------------------------------------------------------------------------- -void SAL_CALL OShape::setDataField( const ::rtl::OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) +void SAL_CALL OShape::setDataField( const OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } @@ -283,13 +283,13 @@ void SAL_CALL OShape::setPrintWhenGroupChange( ::sal_Bool _printwhengroupchange set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OShape::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException) +OUString SAL_CALL OShape::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); return m_aProps.aConditionalPrintExpression; } // ----------------------------------------------------------------------------- -void SAL_CALL OShape::setConditionalPrintExpression( const ::rtl::OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException) +void SAL_CALL OShape::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException) { set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression); } @@ -412,9 +412,9 @@ void SAL_CALL OShape::setSize( const awt::Size& aSize ) throw (beans::PropertyVe // ----------------------------------------------------------------------------- // XShapeDescriptor -::rtl::OUString SAL_CALL OShape::getShapeType( ) throw (uno::RuntimeException) +OUString SAL_CALL OShape::getShapeType( ) throw (uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.drawing.CustomShape"); + return OUString("com.sun.star.drawing.CustomShape"); } // ----------------------------------------------------------------------------- ::sal_Int32 SAL_CALL OShape::getZOrder() throw (uno::RuntimeException) @@ -456,7 +456,7 @@ void SAL_CALL OShape::setTransformation( const drawing::HomogenMatrix3& _transfo set(PROPERTY_TRANSFORMATION,_transformation,m_Transformation); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OShape::getCustomShapeEngine() throw (uno::RuntimeException) +OUString SAL_CALL OShape::getCustomShapeEngine() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_CUSTOMSHAPEENGINE) >>= m_CustomShapeEngine; @@ -464,20 +464,20 @@ void SAL_CALL OShape::setTransformation( const drawing::HomogenMatrix3& _transfo return m_CustomShapeEngine; } // ----------------------------------------------------------------------------- -void SAL_CALL OShape::setCustomShapeEngine( const ::rtl::OUString& _customshapeengine ) throw (uno::RuntimeException) +void SAL_CALL OShape::setCustomShapeEngine( const OUString& _customshapeengine ) throw (uno::RuntimeException) { m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_CUSTOMSHAPEENGINE,uno::makeAny(_customshapeengine)); set(PROPERTY_CUSTOMSHAPEENGINE,_customshapeengine,m_CustomShapeEngine); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OShape::getCustomShapeData() throw (uno::RuntimeException) +OUString SAL_CALL OShape::getCustomShapeData() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_CUSTOMSHAPEDATA) >>= m_CustomShapeData; return m_CustomShapeData; } // ----------------------------------------------------------------------------- -void SAL_CALL OShape::setCustomShapeData( const ::rtl::OUString& _customshapedata ) throw (uno::RuntimeException) +void SAL_CALL OShape::setCustomShapeData( const OUString& _customshapedata ) throw (uno::RuntimeException) { m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_CUSTOMSHAPEDATA,uno::makeAny(_customshapedata)); set(PROPERTY_CUSTOMSHAPEDATA,_customshapedata,m_CustomShapeData); diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx index a1f13642b424..be6dacb58c6d 100644 --- a/reportdesign/source/core/api/Tools.cxx +++ b/reportdesign/source/core/api/Tools.cxx @@ -40,20 +40,20 @@ uno::Reference< report::XSection> lcl_getSection(const uno::Reference< uno::XInt return xRet; } // ----------------------------------------------------------------------------- -void throwIllegallArgumentException( const ::rtl::OUString& _sTypeName +void throwIllegallArgumentException( const OUString& _sTypeName ,const uno::Reference< uno::XInterface >& ExceptionContext_ ,const ::sal_Int16& ArgumentPosition_ ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context_ ) { - ::rtl::OUString sErrorMessage(RPT_RESSTRING(RID_STR_ERROR_WRONG_ARGUMENT,Context_->getServiceManager())); + OUString sErrorMessage(RPT_RESSTRING(RID_STR_ERROR_WRONG_ARGUMENT,Context_->getServiceManager())); sErrorMessage = sErrorMessage.replaceAt(sErrorMessage.indexOf('#'),2,_sTypeName); throw lang::IllegalArgumentException(sErrorMessage,ExceptionContext_,ArgumentPosition_); } // ----------------------------------------------------------------------------- uno::Reference< util::XCloneable > cloneObject(const uno::Reference< report::XReportComponent>& _xReportComponent ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory - ,const ::rtl::OUString& _sServiceName) + ,const OUString& _sServiceName) { OSL_ENSURE(_xReportComponent.is() && _xFactory.is() ,"reportcomponent is null -> GPF"); uno::Reference< report::XReportComponent> xClone(_xFactory->createInstance(_sServiceName),uno::UNO_QUERY_THROW); diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx index 70a0f912203c..30fff054dbec 100644 --- a/reportdesign/source/core/inc/FixedLine.hxx +++ b/reportdesign/source/core/inc/FixedLine.hxx @@ -55,7 +55,7 @@ namespace reportdesign OFixedLine(const OFixedLine&); OFixedLine& operator=(const OFixedLine&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const OUString& _sProperty ,const T& _Value ,T& _member) { @@ -79,22 +79,22 @@ namespace reportdesign DECLARE_XINTERFACE( ) // ::com::sun::star::lang::XServiceInfo - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XReportComponent REPORTCOMPONENT_HEADER() @@ -103,7 +103,7 @@ namespace reportdesign SHAPE_HEADER() // XShapeDescriptor - virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException); // XReportControlModel REPORTCONTROLMODEL_HEADER() diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx index 2f7eece67fb5..f71a5fcb324e 100644 --- a/reportdesign/source/core/inc/FixedText.hxx +++ b/reportdesign/source/core/inc/FixedText.hxx @@ -45,12 +45,12 @@ namespace reportdesign { friend class OShapeHelper; OReportControlModel m_aProps; - ::rtl::OUString m_sLabel; + OUString m_sLabel; private: OFixedText(const OFixedText&); OFixedText& operator=(const OFixedText&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const OUString& _sProperty ,const T& _Value ,T& _member) { @@ -76,22 +76,22 @@ namespace reportdesign DECLARE_XINTERFACE( ) // ::com::sun::star::lang::XServiceInfo - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XReportComponent REPORTCOMPONENT_HEADER() @@ -99,7 +99,7 @@ namespace reportdesign SHAPE_HEADER() // XShapeDescriptor - virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException); // XReportControlModel REPORTCONTROLMODEL_HEADER() @@ -108,8 +108,8 @@ namespace reportdesign virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException); // XFixedText - virtual ::rtl::OUString SAL_CALL getLabel() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLabel( const ::rtl::OUString& _label ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getLabel() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setLabel( const OUString& _label ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::report::XReportControlFormat REPORTCONTROLFORMAT_HEADER() diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx index 143cb81ed5e8..3d983850cd4e 100644 --- a/reportdesign/source/core/inc/FormatCondition.hxx +++ b/reportdesign/source/core/inc/FormatCondition.hxx @@ -42,13 +42,13 @@ namespace reportdesign public FormatConditionPropertySet { OFormatProperties m_aFormatProperties; - ::rtl::OUString m_sFormula; + OUString m_sFormula; sal_Bool m_bEnabled; private: OFormatCondition(const OFormatCondition&); OFormatCondition& operator=(const OFormatCondition&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const OUString& _sProperty ,const T& _Value ,T& _member) { @@ -68,28 +68,28 @@ namespace reportdesign DECLARE_XINTERFACE( ) // ::com::sun::star::lang::XServiceInfo - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XFormatCondition virtual ::sal_Bool SAL_CALL getEnabled() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFormula() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula( const ::rtl::OUString& _formula ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getFormula() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFormula( const OUString& _formula ) throw (::com::sun::star::uno::RuntimeException); // XReportControlFormat REPORTCONTROLFORMAT_HEADER() diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx index d44d3f46d72a..f902b13d7309 100644 --- a/reportdesign/source/core/inc/FormattedField.hxx +++ b/reportdesign/source/core/inc/FormattedField.hxx @@ -53,7 +53,7 @@ namespace reportdesign OFormattedField(const OFormattedField&); OFormattedField& operator=(const OFormattedField&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const OUString& _sProperty ,const T& _Value ,T& _member) { @@ -79,22 +79,22 @@ namespace reportdesign DECLARE_XINTERFACE( ) // ::com::sun::star::lang::XServiceInfo - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); @@ -122,7 +122,7 @@ namespace reportdesign SHAPE_HEADER() // XShapeDescriptor - virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException); // XReportControlModel REPORTCONTROLMODEL_HEADER() diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx index 036417044a8a..1e06a772b3fa 100644 --- a/reportdesign/source/core/inc/Function.hxx +++ b/reportdesign/source/core/inc/Function.hxx @@ -40,18 +40,18 @@ namespace reportdesign public FunctionBase, public FunctionPropertySet { - com::sun::star::beans::Optional< ::rtl::OUString> m_sInitialFormula; + com::sun::star::beans::Optional< OUString> m_sInitialFormula; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XFunctions > m_xParent; - ::rtl::OUString m_sName; - ::rtl::OUString m_sFormula; + OUString m_sName; + OUString m_sFormula; ::sal_Bool m_bPreEvaluated; ::sal_Bool m_bDeepTraversing; private: OFunction(const OFunction&); OFunction& operator=(const OFunction&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const OUString& _sProperty ,const T& _Value ,T& _member) { @@ -70,34 +70,34 @@ namespace reportdesign DECLARE_XINTERFACE( ) // ::com::sun::star::lang::XServiceInfo - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::report::XFunction: virtual ::sal_Bool SAL_CALL getPreEvaluated() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPreEvaluated(::sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getDeepTraversing() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDeepTraversing(::sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName(const ::rtl::OUString & the_value) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFormula() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula(const ::rtl::OUString & the_value) throw (::com::sun::star::uno::RuntimeException); - virtual com::sun::star::beans::Optional< ::rtl::OUString> SAL_CALL getInitialFormula() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setInitialFormula(const com::sun::star::beans::Optional< ::rtl::OUString> & the_value) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getFormula() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFormula(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException); + virtual com::sun::star::beans::Optional< OUString> SAL_CALL getInitialFormula() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setInitialFormula(const com::sun::star::beans::Optional< OUString> & the_value) throw (::com::sun::star::uno::RuntimeException); // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx index f6b6f0bd2a1b..b13d12b58c47 100644 --- a/reportdesign/source/core/inc/Group.hxx +++ b/reportdesign/source/core/inc/Group.hxx @@ -54,7 +54,7 @@ namespace reportdesign OGroup& operator=(const OGroup&); OGroup(const OGroup&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const OUString& _sProperty ,const T& _Value ,T& _member) { @@ -69,9 +69,9 @@ namespace reportdesign } l.notify(); } - void setSection( const ::rtl::OUString& _sProperty + void setSection( const OUString& _sProperty ,const sal_Bool& _bOn - ,const ::rtl::OUString& _sName + ,const OUString& _sName ,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _member); protected: // TODO: VirtualFunctionFinder: This is virtual function! @@ -91,20 +91,20 @@ namespace reportdesign DECLARE_XINTERFACE( ) // ::com::sun::star::lang::XServiceInfo - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XGroup virtual ::sal_Bool SAL_CALL getSortAscending() throw (::com::sun::star::uno::RuntimeException); @@ -122,8 +122,8 @@ namespace reportdesign virtual ::sal_Int16 SAL_CALL getKeepTogether() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setKeepTogether( ::sal_Int16 _keeptogether ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups > SAL_CALL getGroups() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExpression() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setExpression( const ::rtl::OUString& _expression ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getExpression() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setExpression( const OUString& _expression ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getStartNewColumn() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setStartNewColumn( ::sal_Bool _startnewcolumn ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getResetPageNumber() throw (::com::sun::star::uno::RuntimeException); diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx index eb7fa10fa451..6d0f8a43235a 100644 --- a/reportdesign/source/core/inc/ImageControl.hxx +++ b/reportdesign/source/core/inc/ImageControl.hxx @@ -43,14 +43,14 @@ namespace reportdesign { friend class OShapeHelper; OReportControlModel m_aProps; - ::rtl::OUString m_aImageURL; + OUString m_aImageURL; sal_Int16 m_nScaleMode; ::sal_Bool m_bPreserveIRI; private: OImageControl(const OImageControl&); OImageControl& operator=(const OImageControl&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const OUString& _sProperty ,const T& _Value ,T& _member) { @@ -73,22 +73,22 @@ namespace reportdesign DECLARE_XINTERFACE( ) // ::com::sun::star::lang::XServiceInfo - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XReportComponent REPORTCOMPONENT_HEADER() @@ -96,7 +96,7 @@ namespace reportdesign SHAPE_HEADER() // XShapeDescriptor - virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException); // XReportControlModel REPORTCONTROLMODEL_HEADER() @@ -108,8 +108,8 @@ namespace reportdesign virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException); // XImageControl - virtual ::rtl::OUString SAL_CALL getImageURL() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setImageURL( const ::rtl::OUString& _imageurl ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImageURL() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setImageURL( const OUString& _imageurl ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getPreserveIRI() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPreserveIRI( ::sal_Bool _preserveiri ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getScaleMode() throw (::com::sun::star::uno::RuntimeException); diff --git a/reportdesign/source/core/inc/ReportComponent.hxx b/reportdesign/source/core/inc/ReportComponent.hxx index e42941f216be..36bd9b80e5d6 100644 --- a/reportdesign/source/core/inc/ReportComponent.hxx +++ b/reportdesign/source/core/inc/ReportComponent.hxx @@ -47,9 +47,9 @@ namespace reportdesign ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > m_xTypeProvider; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > m_xUnoTunnel; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > m_xServiceInfo; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aMasterFields; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aDetailFields; - ::rtl::OUString m_sName; + ::com::sun::star::uno::Sequence< OUString > m_aMasterFields; + ::com::sun::star::uno::Sequence< OUString > m_aDetailFields; + OUString m_sName; ::sal_Int32 m_nHeight; ::sal_Int32 m_nWidth; ::sal_Int32 m_nPosX; diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx index 43a8f73f89ca..445d5abac624 100644 --- a/reportdesign/source/core/inc/ReportControlModel.hxx +++ b/reportdesign/source/core/inc/ReportControlModel.hxx @@ -55,13 +55,13 @@ namespace reportdesign ::sal_Int32 nTextLineColor; ::sal_Int32 nCharUnderlineColor; ::sal_Int32 nBackgroundColor; - ::rtl::OUString sCharCombinePrefix; - ::rtl::OUString sCharCombineSuffix; - ::rtl::OUString sHyperLinkURL; - ::rtl::OUString sHyperLinkTarget; - ::rtl::OUString sHyperLinkName; - ::rtl::OUString sVisitedCharStyleName; - ::rtl::OUString sUnvisitedCharStyleName; + OUString sCharCombinePrefix; + OUString sCharCombineSuffix; + OUString sHyperLinkURL; + OUString sHyperLinkTarget; + OUString sHyperLinkName; + OUString sVisitedCharStyleName; + OUString sUnvisitedCharStyleName; com::sun::star::style::VerticalAlignment aVerticalAlignment; ::sal_Int16 nCharEscapement; ::sal_Int16 nCharCaseMap; @@ -89,8 +89,8 @@ namespace reportdesign ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition> > m_aFormatConditions; osl::Mutex& m_rMutex; - ::rtl::OUString aDataField; - ::rtl::OUString aConditionalPrintExpression; + OUString aDataField; + OUString aConditionalPrintExpression; sal_Bool bPrintWhenGroupChange; OReportControlModel(osl::Mutex& _rMutex diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx index ea4abcfab3fb..7dc478d2db22 100644 --- a/reportdesign/source/core/inc/ReportEngineJFree.hxx +++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx @@ -41,7 +41,7 @@ namespace reportdesign public ReportEngineBase, public ReportEnginePropertySet { - typedef ::std::multimap< ::rtl::OUString, ::com::sun::star::uno::Any , ::comphelper::UStringMixLess> TComponentMap; + typedef ::std::multimap< OUString, ::com::sun::star::uno::Any , ::comphelper::UStringMixLess> TComponentMap; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xReport; ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator> m_StatusIndicator; @@ -50,7 +50,7 @@ namespace reportdesign private: OReportEngineJFree(const OReportEngineJFree&); OReportEngineJFree& operator=(const OReportEngineJFree&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const OUString& _sProperty ,const T& _Value ,T& _member) { @@ -67,7 +67,7 @@ namespace reportdesign * * \return The new file url. */ - ::rtl::OUString getNewOutputName(); + OUString getNewOutputName(); protected: // TODO: VirtualFunctionFinder: This is virtual function! @@ -80,23 +80,23 @@ namespace reportdesign DECLARE_XINTERFACE( ) // ::com::sun::star::lang::XServiceInfo - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); private: // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XReportEngine // Attributes diff --git a/reportdesign/source/core/inc/ReportHelperImpl.hxx b/reportdesign/source/core/inc/ReportHelperImpl.hxx index 1734998d3c95..2522e5a2d065 100644 --- a/reportdesign/source/core/inc/ReportHelperImpl.hxx +++ b/reportdesign/source/core/inc/ReportHelperImpl.hxx @@ -20,12 +20,12 @@ #define INCLUDED_REPORTHELPERIMPL_HXX // ::com::sun::star::report::XReportComponent: #define REPORTCOMPONENT_IMPL3(clazz,arg) \ -::rtl::OUString SAL_CALL clazz::getName() throw (uno::RuntimeException) \ +OUString SAL_CALL clazz::getName() throw (uno::RuntimeException) \ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return (arg).m_sName; \ } \ -void SAL_CALL clazz::setName( const ::rtl::OUString& _name ) throw (uno::RuntimeException,beans::PropertyVetoException) \ +void SAL_CALL clazz::setName( const OUString& _name ) throw (uno::RuntimeException,beans::PropertyVetoException) \ { \ set(PROPERTY_NAME,_name,(arg).m_sName); \ } \ @@ -109,41 +109,41 @@ void SAL_CALL clazz::setControlBorderColor( ::sal_Int32 _bordercolor ) throw (un } #define REPORTCOMPONENT_MASTERDETAIL(clazz,arg) \ -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL clazz::getMasterFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) \ +::com::sun::star::uno::Sequence< OUString > SAL_CALL clazz::getMasterFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) \ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return (arg).m_aMasterFields; \ } \ -void SAL_CALL clazz::setMasterFields( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _masterfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ +void SAL_CALL clazz::setMasterFields( const ::com::sun::star::uno::Sequence< OUString >& _masterfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ set(PROPERTY_MASTERFIELDS,_masterfields,(arg).m_aMasterFields); \ } \ -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL clazz::getDetailFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ +::com::sun::star::uno::Sequence< OUString > SAL_CALL clazz::getDetailFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return (arg).m_aDetailFields; \ } \ -void SAL_CALL clazz::setDetailFields( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _detailfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ +void SAL_CALL clazz::setDetailFields( const ::com::sun::star::uno::Sequence< OUString >& _detailfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ set(PROPERTY_DETAILFIELDS,_detailfields,(arg).m_aDetailFields); \ } #define REPORTCOMPONENT_NOMASTERDETAIL(clazz) \ -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL clazz::getMasterFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) \ +::com::sun::star::uno::Sequence< OUString > SAL_CALL clazz::getMasterFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) \ { \ throw ::com::sun::star::beans::UnknownPropertyException();\ } \ -void SAL_CALL clazz::setMasterFields( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ +void SAL_CALL clazz::setMasterFields( const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ { \ throw ::com::sun::star::beans::UnknownPropertyException();\ } \ -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL clazz::getDetailFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ +::com::sun::star::uno::Sequence< OUString > SAL_CALL clazz::getDetailFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ { \ throw ::com::sun::star::beans::UnknownPropertyException();\ } \ -void SAL_CALL clazz::setDetailFields( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ +void SAL_CALL clazz::setDetailFields( const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ { \ throw ::com::sun::star::beans::UnknownPropertyException();\ } @@ -330,24 +330,24 @@ void SAL_CALL clazz::setCharEmphasis( ::sal_Int16 _charemphasis ) throw (beans:: set(PROPERTY_CHAREMPHASIS,_charemphasis,varName.nFontEmphasisMark); \ } \ \ -::rtl::OUString SAL_CALL clazz::getCharFontName() throw (beans::UnknownPropertyException, uno::RuntimeException) \ +OUString SAL_CALL clazz::getCharFontName() throw (beans::UnknownPropertyException, uno::RuntimeException) \ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aFontDescriptor.Name; \ } \ \ -void SAL_CALL clazz::setCharFontName( const ::rtl::OUString& _charfontname ) throw (beans::UnknownPropertyException, uno::RuntimeException) \ +void SAL_CALL clazz::setCharFontName( const OUString& _charfontname ) throw (beans::UnknownPropertyException, uno::RuntimeException) \ { \ set(PROPERTY_CHARFONTNAME,_charfontname,varName.aFontDescriptor.Name); \ } \ \ -::rtl::OUString SAL_CALL clazz::getCharFontStyleName() throw (beans::UnknownPropertyException, uno::RuntimeException) \ +OUString SAL_CALL clazz::getCharFontStyleName() throw (beans::UnknownPropertyException, uno::RuntimeException) \ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aFontDescriptor.StyleName; \ } \ \ -void SAL_CALL clazz::setCharFontStyleName( const ::rtl::OUString& _charfontstylename ) throw (beans::UnknownPropertyException, uno::RuntimeException) \ +void SAL_CALL clazz::setCharFontStyleName( const OUString& _charfontstylename ) throw (beans::UnknownPropertyException, uno::RuntimeException) \ { \ set(PROPERTY_CHARFONTSTYLENAME,_charfontstylename,varName.aFontDescriptor.StyleName); \ } \ @@ -502,21 +502,21 @@ void SAL_CALL clazz::setCharCombineIsOn(::sal_Bool the_value) throw (uno::Runtim { \ set(PROPERTY_CHARCOMBINEISON,the_value,varName.bCharCombineIsOn); \ }\ -::rtl::OUString SAL_CALL clazz::getCharCombinePrefix() throw (uno::RuntimeException, beans::UnknownPropertyException) \ +OUString SAL_CALL clazz::getCharCombinePrefix() throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.sCharCombinePrefix; \ } \ -void SAL_CALL clazz::setCharCombinePrefix(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \ +void SAL_CALL clazz::setCharCombinePrefix(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ set(PROPERTY_CHARCOMBINEPREFIX,the_value,varName.sCharCombinePrefix); \ }\ -::rtl::OUString SAL_CALL clazz::getCharCombineSuffix() throw (uno::RuntimeException, beans::UnknownPropertyException) \ +OUString SAL_CALL clazz::getCharCombineSuffix() throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.sCharCombineSuffix; \ } \ -void SAL_CALL clazz::setCharCombineSuffix(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \ +void SAL_CALL clazz::setCharCombineSuffix(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ set(PROPERTY_CHARCOMBINESUFFIX,the_value,varName.sCharCombineSuffix); \ }\ @@ -547,48 +547,48 @@ void SAL_CALL clazz::setCharContoured(::sal_Bool the_value) throw (uno::RuntimeE { \ set(PROPERTY_CHARCONTOURED,the_value,varName.bCharContoured); \ }\ -::rtl::OUString SAL_CALL clazz::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) \ +OUString SAL_CALL clazz::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.sHyperLinkURL; \ } \ -void SAL_CALL clazz::setHyperLinkURL(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \ +void SAL_CALL clazz::setHyperLinkURL(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ set(PROPERTY_HYPERLINKURL,the_value,varName.sHyperLinkURL); \ }\ -::rtl::OUString SAL_CALL clazz::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) \ +OUString SAL_CALL clazz::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.sHyperLinkTarget; \ } \ -void SAL_CALL clazz::setHyperLinkTarget(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \ +void SAL_CALL clazz::setHyperLinkTarget(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ set(PROPERTY_HYPERLINKTARGET,the_value,varName.sHyperLinkTarget); \ }\ -::rtl::OUString SAL_CALL clazz::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) \ +OUString SAL_CALL clazz::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.sHyperLinkName; \ } \ -void SAL_CALL clazz::setHyperLinkName(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \ +void SAL_CALL clazz::setHyperLinkName(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ set(PROPERTY_HYPERLINKNAME,the_value,varName.sHyperLinkName); \ }\ -::rtl::OUString SAL_CALL clazz::getVisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException) \ +OUString SAL_CALL clazz::getVisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.sVisitedCharStyleName; \ } \ -void SAL_CALL clazz::setVisitedCharStyleName(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \ +void SAL_CALL clazz::setVisitedCharStyleName(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ set(PROPERTY_VISITEDCHARSTYLENAME,the_value,varName.sVisitedCharStyleName); \ }\ -::rtl::OUString SAL_CALL clazz::getUnvisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException) \ +OUString SAL_CALL clazz::getUnvisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.sUnvisitedCharStyleName; \ } \ -void SAL_CALL clazz::setUnvisitedCharStyleName(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \ +void SAL_CALL clazz::setUnvisitedCharStyleName(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ set(PROPERTY_UNVISITEDCHARSTYLENAME,the_value,varName.sUnvisitedCharStyleName); \ }\ @@ -619,21 +619,21 @@ void SAL_CALL clazz::setCharWeightAsian( float the_value ) throw (::com::sun::st { \ set(PROPERTY_CHARWEIGHTASIAN,the_value,varName.aAsianFontDescriptor.Weight); \ }\ -::rtl::OUString SAL_CALL clazz::getCharFontNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ +OUString SAL_CALL clazz::getCharFontNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aAsianFontDescriptor.Name; \ }\ -void SAL_CALL clazz::setCharFontNameAsian( const ::rtl::OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ +void SAL_CALL clazz::setCharFontNameAsian( const OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ { \ set(PROPERTY_CHARFONTNAMEASIAN,the_value,varName.aAsianFontDescriptor.Name); \ }\ -::rtl::OUString SAL_CALL clazz::getCharFontStyleNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ +OUString SAL_CALL clazz::getCharFontStyleNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aAsianFontDescriptor.StyleName; \ }\ -void SAL_CALL clazz::setCharFontStyleNameAsian( const ::rtl::OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ +void SAL_CALL clazz::setCharFontStyleNameAsian( const OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ { \ set(PROPERTY_CHARFONTSTYLENAMEASIAN,the_value,varName.aAsianFontDescriptor.StyleName); \ }\ @@ -711,21 +711,21 @@ void SAL_CALL clazz::setCharWeightComplex( float the_value ) throw (::com::sun:: { \ set(PROPERTY_CHARWEIGHTCOMPLEX,the_value,varName.aComplexFontDescriptor.Weight); \ }\ -::rtl::OUString SAL_CALL clazz::getCharFontNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ +OUString SAL_CALL clazz::getCharFontNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aComplexFontDescriptor.Name; \ }\ -void SAL_CALL clazz::setCharFontNameComplex( const ::rtl::OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ +void SAL_CALL clazz::setCharFontNameComplex( const OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ { \ set(PROPERTY_CHARFONTNAMECOMPLEX,the_value,varName.aComplexFontDescriptor.Name); \ }\ -::rtl::OUString SAL_CALL clazz::getCharFontStyleNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ +OUString SAL_CALL clazz::getCharFontStyleNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aComplexFontDescriptor.StyleName; \ }\ -void SAL_CALL clazz::setCharFontStyleNameComplex( const ::rtl::OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ +void SAL_CALL clazz::setCharFontStyleNameComplex( const OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ { \ set(PROPERTY_CHARFONTSTYLENAMECOMPLEX,the_value,varName.aComplexFontDescriptor.StyleName); \ }\ @@ -884,19 +884,19 @@ void SAL_CALL clazz::setCharCombineIsOn(::sal_Bool /*the_value*/) throw (uno::Ru { \ throw beans::UnknownPropertyException();\ }\ -::rtl::OUString SAL_CALL clazz::getCharCombinePrefix() throw (uno::RuntimeException, beans::UnknownPropertyException) \ +OUString SAL_CALL clazz::getCharCombinePrefix() throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ throw beans::UnknownPropertyException();\ } \ -void SAL_CALL clazz::setCharCombinePrefix(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) \ +void SAL_CALL clazz::setCharCombinePrefix(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ throw beans::UnknownPropertyException();\ }\ -::rtl::OUString SAL_CALL clazz::getCharCombineSuffix() throw (uno::RuntimeException, beans::UnknownPropertyException) \ +OUString SAL_CALL clazz::getCharCombineSuffix() throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ throw beans::UnknownPropertyException();\ } \ -void SAL_CALL clazz::setCharCombineSuffix(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) \ +void SAL_CALL clazz::setCharCombineSuffix(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ throw beans::UnknownPropertyException();\ }\ @@ -924,19 +924,19 @@ void SAL_CALL clazz::setCharContoured(::sal_Bool /*the_value*/) throw (uno::Runt { \ throw beans::UnknownPropertyException();\ }\ -::rtl::OUString SAL_CALL clazz::getVisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException) \ +OUString SAL_CALL clazz::getVisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ throw beans::UnknownPropertyException();\ } \ -void SAL_CALL clazz::setVisitedCharStyleName(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) \ +void SAL_CALL clazz::setVisitedCharStyleName(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ throw beans::UnknownPropertyException();\ }\ -::rtl::OUString SAL_CALL clazz::getUnvisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException) \ +OUString SAL_CALL clazz::getUnvisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ throw beans::UnknownPropertyException();\ } \ -void SAL_CALL clazz::setUnvisitedCharStyleName(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) \ +void SAL_CALL clazz::setUnvisitedCharStyleName(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) \ { \ throw beans::UnknownPropertyException();\ }\ @@ -1038,22 +1038,22 @@ void SAL_CALL clazz::setCharEmphasis( ::sal_Int16 /*_charemphasis*/ ) throw (bea throw beans::UnknownPropertyException();\ }\ \ -::rtl::OUString SAL_CALL clazz::getCharFontName() throw (beans::UnknownPropertyException, uno::RuntimeException)\ +OUString SAL_CALL clazz::getCharFontName() throw (beans::UnknownPropertyException, uno::RuntimeException)\ {\ throw beans::UnknownPropertyException();\ }\ \ -void SAL_CALL clazz::setCharFontName( const ::rtl::OUString& /*_charfontname*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException)\ +void SAL_CALL clazz::setCharFontName( const OUString& /*_charfontname*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException)\ {\ throw beans::UnknownPropertyException();\ }\ \ -::rtl::OUString SAL_CALL clazz::getCharFontStyleName() throw (beans::UnknownPropertyException, uno::RuntimeException)\ +OUString SAL_CALL clazz::getCharFontStyleName() throw (beans::UnknownPropertyException, uno::RuntimeException)\ {\ throw beans::UnknownPropertyException();\ }\ \ -void SAL_CALL clazz::setCharFontStyleName( const ::rtl::OUString& /*_charfontstylename*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException)\ +void SAL_CALL clazz::setCharFontStyleName( const OUString& /*_charfontstylename*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException)\ {\ throw beans::UnknownPropertyException();\ }\ @@ -1143,19 +1143,19 @@ void SAL_CALL clazz::setCharPosture( awt::FontSlant /*_charposture*/ ) throw (be {\ throw beans::UnknownPropertyException();\ }\ - ::rtl::OUString SAL_CALL clazz::getCharFontNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ + OUString SAL_CALL clazz::getCharFontNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharFontNameAsian( const ::rtl::OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ + void SAL_CALL clazz::setCharFontNameAsian( const OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ {\ throw beans::UnknownPropertyException();\ }\ - ::rtl::OUString SAL_CALL clazz::getCharFontStyleNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ + OUString SAL_CALL clazz::getCharFontStyleNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharFontStyleNameAsian( const ::rtl::OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ + void SAL_CALL clazz::setCharFontStyleNameAsian( const OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ {\ throw beans::UnknownPropertyException();\ }\ @@ -1215,19 +1215,19 @@ void SAL_CALL clazz::setCharPosture( awt::FontSlant /*_charposture*/ ) throw (be {\ throw beans::UnknownPropertyException();\ }\ - ::rtl::OUString SAL_CALL clazz::getCharFontNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ + OUString SAL_CALL clazz::getCharFontNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharFontNameComplex( const ::rtl::OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ + void SAL_CALL clazz::setCharFontNameComplex( const OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ {\ throw beans::UnknownPropertyException();\ }\ - ::rtl::OUString SAL_CALL clazz::getCharFontStyleNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ + OUString SAL_CALL clazz::getCharFontStyleNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharFontStyleNameComplex( const ::rtl::OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ + void SAL_CALL clazz::setCharFontStyleNameComplex( const OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\ {\ throw beans::UnknownPropertyException();\ }\ diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx index c117126d1d27..f6311191bab7 100644 --- a/reportdesign/source/core/inc/Section.hxx +++ b/reportdesign/source/core/inc/Section.hxx @@ -61,8 +61,8 @@ namespace reportdesign ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > m_xDrawPage_Tunnel; ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XGroup > m_xGroup; ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XReportDefinition > m_xReportDefinition; - ::rtl::OUString m_sName; - ::rtl::OUString m_sConditionalPrintExpression; + OUString m_sName; + OUString m_sConditionalPrintExpression; ::sal_uInt32 m_nHeight; ::sal_Int32 m_nBackgroundColor; ::sal_Int16 m_nForceNewPage; @@ -80,7 +80,7 @@ namespace reportdesign OSection(const OSection&); OSection& operator=(const OSection&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const OUString& _sProperty ,const T& _Value ,T& _member) { @@ -119,7 +119,7 @@ namespace reportdesign OSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& xParentDef ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& xParentGroup ,const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context, - ::com::sun::star::uno::Sequence< ::rtl::OUString> const&); + ::com::sun::star::uno::Sequence< OUString> const&); public: static ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> createOSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xParent @@ -131,33 +131,33 @@ namespace reportdesign DECLARE_XINTERFACE( ) // ::com::sun::star::lang::XServiceInfo - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XSection virtual ::sal_Bool SAL_CALL getVisible() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& _name ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& _name ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_uInt32 SAL_CALL getHeight() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setHeight( ::sal_uInt32 _height ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getBackColor() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBackColor( ::sal_Int32 _backgroundcolor ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getBackTransparent() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBackTransparent( ::sal_Bool _backtransparent ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getConditionalPrintExpression() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setConditionalPrintExpression( const ::rtl::OUString& _conditionalprintexpression ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getConditionalPrintExpression() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getForceNewPage() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setForceNewPage( ::sal_Int16 _forcenewpage ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getNewRowOrCol() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); @@ -173,8 +173,8 @@ namespace reportdesign virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > SAL_CALL getGroup() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > SAL_CALL getReportDefinition() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > SAL_CALL createReportComponent( const ::rtl::OUString& _sReportComponentSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::lang::IllegalArgumentException,::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableReportComponentNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > SAL_CALL createReportComponent( const OUString& _sReportComponentSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::lang::IllegalArgumentException,::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableReportComponentNames( ) throw (::com::sun::star::uno::RuntimeException); // XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx index 314c8381a301..463843f72bc6 100644 --- a/reportdesign/source/core/inc/Shape.hxx +++ b/reportdesign/source/core/inc/Shape.hxx @@ -50,9 +50,9 @@ namespace reportdesign ::sal_Int32 m_nZOrder; ::sal_Bool m_bOpaque; - ::rtl::OUString m_sServiceName; - ::rtl::OUString m_CustomShapeEngine; - ::rtl::OUString m_CustomShapeData; + OUString m_sServiceName; + OUString m_CustomShapeEngine; + OUString m_CustomShapeData; com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > m_CustomShapeGeometry; @@ -60,7 +60,7 @@ namespace reportdesign OShape(const OShape&); OShape& operator=(const OShape&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const OUString& _sProperty ,const T& _Value ,T& _member) { @@ -81,26 +81,26 @@ namespace reportdesign explicit OShape(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _xFactory ,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _xShape - ,const ::rtl::OUString& _sServiceName); + ,const OUString& _sServiceName); DECLARE_XINTERFACE( ) // ::com::sun::star::lang::XServiceInfo - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XReportComponent REPORTCOMPONENT_HEADER() @@ -108,10 +108,10 @@ namespace reportdesign // XShape SHAPE_HEADER() - virtual ::rtl::OUString SAL_CALL getCustomShapeEngine() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCustomShapeEngine( const ::rtl::OUString& _customshapeengine ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCustomShapeData() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCustomShapeData( const ::rtl::OUString& _customshapedata ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCustomShapeEngine() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCustomShapeEngine( const OUString& _customshapeengine ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCustomShapeData() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCustomShapeData( const OUString& _customshapedata ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCustomShapeGeometry() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setCustomShapeGeometry( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _customshapegeometry ) throw (::com::sun::star::uno::RuntimeException); @@ -119,7 +119,7 @@ namespace reportdesign virtual void SAL_CALL setOpaque( ::sal_Bool _opaque ) throw (::com::sun::star::uno::RuntimeException); // XShapeDescriptor - virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException); // XReportControlModel REPORTCONTROLMODEL_HEADER() diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx index 94d6a4d28a26..c9210ba61d3a 100644 --- a/reportdesign/source/core/inc/Tools.hxx +++ b/reportdesign/source/core/inc/Tools.hxx @@ -47,7 +47,7 @@ namespace reportdesign * * \return A sequence of all properties which should be removed for none char able implementations. */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > lcl_getCharOptionals(); + ::com::sun::star::uno::Sequence< OUString > lcl_getCharOptionals(); /** uses the XChild interface to get the section from any child of it. * @@ -63,7 +63,7 @@ namespace reportdesign * \param ArgumentPosition_ The argument position. * \param Context_ The context to get the factory service. */ - void throwIllegallArgumentException(const ::rtl::OUString& _sTypeName + void throwIllegallArgumentException(const OUString& _sTypeName ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& ExceptionContext_ ,const ::sal_Int16& ArgumentPosition_ ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context_); @@ -78,7 +78,7 @@ namespace reportdesign ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > cloneObject( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xReportComponent ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _xFactory - ,const ::rtl::OUString& _sServiceName); + ,const OUString& _sServiceName); class OShapeHelper { diff --git a/reportdesign/source/core/inc/conditionupdater.hxx b/reportdesign/source/core/inc/conditionupdater.hxx index 4508769a73fe..d679a26321ce 100644 --- a/reportdesign/source/core/inc/conditionupdater.hxx +++ b/reportdesign/source/core/inc/conditionupdater.hxx @@ -50,8 +50,8 @@ namespace rptui void impl_adjustFormatConditions_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel >& _rxRptControlModel, - const ::rtl::OUString& _rOldDataSource, - const ::rtl::OUString& _rNewDataSource + const OUString& _rOldDataSource, + const OUString& _rNewDataSource ); private: diff --git a/reportdesign/source/core/inc/core_resource.hxx b/reportdesign/source/core/inc/core_resource.hxx index 468cabb9fea3..80422e3c9200 100644 --- a/reportdesign/source/core/inc/core_resource.hxx +++ b/reportdesign/source/core/inc/core_resource.hxx @@ -59,7 +59,7 @@ namespace reportdesign public: /** loads the string with the specified resource id from the FormLayer resource file */ - static ::rtl::OUString loadString(sal_uInt16 _nResId,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiComponentFactory >& _rM); + static OUString loadString(sal_uInt16 _nResId,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiComponentFactory >& _rM); }; //......................................................................... diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx index 8b3776c76a61..2a278a9a13fd 100644 --- a/reportdesign/source/core/misc/conditionalexpression.cxx +++ b/reportdesign/source/core/misc/conditionalexpression.cxx @@ -26,19 +26,19 @@ namespace rptui // ============================================================================= // ----------------------------------------------------------------------------- ConditionalExpression::ConditionalExpression( const sal_Char* _pAsciiPattern ) - :m_sPattern( ::rtl::OUString::createFromAscii( _pAsciiPattern ) ) + :m_sPattern( OUString::createFromAscii( _pAsciiPattern ) ) { } // ----------------------------------------------------------------------------- - ::rtl::OUString ConditionalExpression::assembleExpression( const ::rtl::OUString& _rFieldDataSource, const ::rtl::OUString& _rLHS, const ::rtl::OUString& _rRHS ) const + OUString ConditionalExpression::assembleExpression( const OUString& _rFieldDataSource, const OUString& _rLHS, const OUString& _rRHS ) const { - ::rtl::OUString sExpression( m_sPattern ); + OUString sExpression( m_sPattern ); sal_Int32 nPatternIndex = sExpression.indexOf( '$' ); while ( nPatternIndex > -1 ) { - const ::rtl::OUString* pReplace = NULL; + const OUString* pReplace = NULL; switch ( sExpression.getStr()[ nPatternIndex + 1 ] ) { case '$': pReplace = &_rFieldDataSource; break; @@ -60,7 +60,7 @@ namespace rptui } // ----------------------------------------------------------------------------- - bool ConditionalExpression::matchExpression( const ::rtl::OUString& _rExpression, const ::rtl::OUString& _rFieldDataSource, ::rtl::OUString& _out_rLHS, ::rtl::OUString& _out_rRHS ) const + bool ConditionalExpression::matchExpression( const OUString& _rExpression, const OUString& _rFieldDataSource, OUString& _out_rLHS, OUString& _out_rRHS ) const { (void)_rExpression; (void)_rFieldDataSource; @@ -72,8 +72,8 @@ namespace rptui // Unfortunately, we don't have such a regexp engine ... // Okay, let's start with replacing all $$ in our pattern with the actual field data source - ::rtl::OUString sMatchExpression( m_sPattern ); - const ::rtl::OUString sFieldDataPattern( "$$" ); + OUString sMatchExpression( m_sPattern ); + const OUString sFieldDataPattern( "$$" ); sal_Int32 nIndex( sMatchExpression.indexOf( sFieldDataPattern ) ); while ( nIndex != -1 ) { @@ -81,8 +81,8 @@ namespace rptui nIndex = sMatchExpression.indexOf( sFieldDataPattern, nIndex + _rFieldDataSource.getLength() ); } - const ::rtl::OUString sLHSPattern( "$1" ); - const ::rtl::OUString sRHSPattern( "$2" ); + const OUString sLHSPattern( "$1" ); + const OUString sRHSPattern( "$2" ); sal_Int32 nLHSIndex( sMatchExpression.indexOf( sLHSPattern ) ); sal_Int32 nRHSIndex( sMatchExpression.indexOf( sRHSPattern ) ); @@ -99,8 +99,8 @@ namespace rptui // must be identical if ( _rExpression.getLength() < nLHSIndex ) return false; - const ::rtl::OUString sExprPart1( _rExpression.copy( 0, nLHSIndex ) ); - const ::rtl::OUString sMatchExprPart1( sMatchExpression.copy( 0, nLHSIndex ) ); + const OUString sExprPart1( _rExpression.copy( 0, nLHSIndex ) ); + const OUString sMatchExprPart1( sMatchExpression.copy( 0, nLHSIndex ) ); if ( sExprPart1 != sMatchExprPart1 ) // the left-most expression parts do not match return false; @@ -109,11 +109,11 @@ namespace rptui // must be identical, too bool bHaveRHS( nRHSIndex != -1 ); sal_Int32 nRightMostIndex( bHaveRHS ? nRHSIndex : nLHSIndex ); - const ::rtl::OUString sMatchExprPart3( sMatchExpression.copy( nRightMostIndex + 2 ) ); + const OUString sMatchExprPart3( sMatchExpression.copy( nRightMostIndex + 2 ) ); if ( _rExpression.getLength() < sMatchExprPart3.getLength() ) // the expression is not even long enough to hold the right-most part of the match expression return false; - const ::rtl::OUString sExprPart3( _rExpression.copy( _rExpression.getLength() - sMatchExprPart3.getLength() ) ); + const OUString sExprPart3( _rExpression.copy( _rExpression.getLength() - sMatchExprPart3.getLength() ) ); if ( sExprPart3 != sMatchExprPart3 ) // the right-most expression parts do not match return false; @@ -127,12 +127,12 @@ namespace rptui // strip the match expression by its right-most and left-most part, and by the placeholders $1 and $2 sal_Int32 nMatchExprPart2Start( nLHSIndex + sLHSPattern.getLength() ); - ::rtl::OUString sMatchExprPart2 = sMatchExpression.copy( + OUString sMatchExprPart2 = sMatchExpression.copy( nMatchExprPart2Start, sMatchExpression.getLength() - nMatchExprPart2Start - sMatchExprPart3.getLength() - 2 ); // strip the expression by its left-most and right-most part - const ::rtl::OUString sExpression( _rExpression.copy( + const OUString sExpression( _rExpression.copy( sExprPart1.getLength(), _rExpression.getLength() - sExprPart1.getLength() - sExprPart3.getLength() ) ); diff --git a/reportdesign/source/core/misc/conditionupdater.cxx b/reportdesign/source/core/misc/conditionupdater.cxx index 9a0456221dfe..b14d4ad2966b 100644 --- a/reportdesign/source/core/misc/conditionupdater.cxx +++ b/reportdesign/source/core/misc/conditionupdater.cxx @@ -58,7 +58,7 @@ namespace rptui Reference< XReportControlModel > xRptControlModel( _rEvent.Source, UNO_QUERY ); if ( xRptControlModel.is() && _rEvent.PropertyName == "DataField" ) { - ::rtl::OUString sOldDataSource, sNewDataSource; + OUString sOldDataSource, sNewDataSource; OSL_VERIFY( _rEvent.OldValue >>= sOldDataSource ); OSL_VERIFY( _rEvent.NewValue >>= sNewDataSource ); impl_adjustFormatConditions_nothrow( xRptControlModel, sOldDataSource, sNewDataSource ); @@ -77,18 +77,18 @@ namespace rptui //-------------------------------------------------------------------- void ConditionUpdater::impl_adjustFormatConditions_nothrow( const Reference< XReportControlModel >& _rxRptControlModel, - const ::rtl::OUString& _rOldDataSource, const ::rtl::OUString& _rNewDataSource ) + const OUString& _rOldDataSource, const OUString& _rNewDataSource ) { try { ReportFormula aOldContentFormula( _rOldDataSource ); - ::rtl::OUString sOldUnprefixed( aOldContentFormula.getBracketedFieldOrExpression() ); + OUString sOldUnprefixed( aOldContentFormula.getBracketedFieldOrExpression() ); ReportFormula aNewContentFormula( _rNewDataSource ); - ::rtl::OUString sNewUnprefixed( aNewContentFormula.getBracketedFieldOrExpression() ); + OUString sNewUnprefixed( aNewContentFormula.getBracketedFieldOrExpression() ); sal_Int32 nCount( _rxRptControlModel->getCount() ); Reference< XFormatCondition > xFormatCondition; - ::rtl::OUString sFormulaExpression, sLHS, sRHS; + OUString sFormulaExpression, sLHS, sRHS; for ( sal_Int32 i=0; i<nCount; ++i ) { xFormatCondition.set( _rxRptControlModel->getByIndex( i ), UNO_QUERY_THROW ); diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx index be73a0aa3be7..94158d8d00eb 100644 --- a/reportdesign/source/core/misc/reportformula.cxx +++ b/reportdesign/source/core/misc/reportformula.cxx @@ -31,18 +31,18 @@ namespace rptui namespace { //---------------------------------------------------------------- - const ::rtl::OUString& lcl_getExpressionPrefix( sal_Int32* _pTakeLengthOrNull = NULL ) + const OUString& lcl_getExpressionPrefix( sal_Int32* _pTakeLengthOrNull = NULL ) { - static ::rtl::OUString s_sPrefix( "rpt:" ); + static OUString s_sPrefix( "rpt:" ); if ( _pTakeLengthOrNull ) *_pTakeLengthOrNull = s_sPrefix.getLength(); return s_sPrefix; } //---------------------------------------------------------------- - const ::rtl::OUString& lcl_getFieldPrefix( sal_Int32* _pTakeLengthOrNull = NULL ) + const OUString& lcl_getFieldPrefix( sal_Int32* _pTakeLengthOrNull = NULL ) { - static ::rtl::OUString s_sPrefix( "field:" ); + static OUString s_sPrefix( "field:" ); if ( _pTakeLengthOrNull ) *_pTakeLengthOrNull = s_sPrefix.getLength(); return s_sPrefix; @@ -53,14 +53,14 @@ namespace rptui //= ReportFormula //==================================================================== //-------------------------------------------------------------------- - ReportFormula::ReportFormula( const ::rtl::OUString& _rFormula ) + ReportFormula::ReportFormula( const OUString& _rFormula ) :m_eType( Invalid ) { impl_construct( _rFormula ); } //-------------------------------------------------------------------- - ReportFormula::ReportFormula( const BindType _eType, const ::rtl::OUString& _rFieldOrExpression ) + ReportFormula::ReportFormula( const BindType _eType, const OUString& _rFieldOrExpression ) :m_eType( _eType ) { switch ( m_eType ) @@ -76,7 +76,7 @@ namespace rptui case Field: { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append( lcl_getFieldPrefix() ); aBuffer.appendAscii( "[" ); aBuffer.append( _rFieldOrExpression ); @@ -96,7 +96,7 @@ namespace rptui { } //-------------------------------------------------------------------- - void ReportFormula::impl_construct( const ::rtl::OUString& _rFormula ) + void ReportFormula::impl_construct( const OUString& _rFormula ) { m_sCompleteFormula = _rFormula; @@ -127,10 +127,10 @@ namespace rptui } //-------------------------------------------------------------------- - ::rtl::OUString ReportFormula::getBracketedFieldOrExpression() const + OUString ReportFormula::getBracketedFieldOrExpression() const { bool bIsField = ( getType() == Field ); - ::rtl::OUStringBuffer aFieldContent; + OUStringBuffer aFieldContent; if ( bIsField ) aFieldContent.appendAscii( "[" ); aFieldContent.append( getUndecoratedContent() ); @@ -140,11 +140,11 @@ namespace rptui return aFieldContent.makeStringAndClear(); } //-------------------------------------------------------------------- - const ::rtl::OUString& ReportFormula::getUndecoratedContent() const + const OUString& ReportFormula::getUndecoratedContent() const { return m_sUndecoratedContent; } - const ::rtl::OUString& ReportFormula::getCompleteFormula() const { return m_sCompleteFormula; } + const OUString& ReportFormula::getCompleteFormula() const { return m_sCompleteFormula; } bool ReportFormula::isValid() const { return getType() != Invalid; } ReportFormula& ReportFormula::operator=(class ReportFormula const & _rHd) { @@ -156,9 +156,9 @@ namespace rptui return *this; } //-------------------------------------------------------------------- - ::rtl::OUString ReportFormula::getEqualUndecoratedContent() const + OUString ReportFormula::getEqualUndecoratedContent() const { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.appendAscii( "=" ); aBuffer.append( getUndecoratedContent() ); return aBuffer.makeStringAndClear(); diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx index 0abc584d5017..dab14578f8b3 100644 --- a/reportdesign/source/core/resource/core_resource.cxx +++ b/reportdesign/source/core/resource/core_resource.cxx @@ -59,9 +59,9 @@ namespace reportdesign } //------------------------------------------------------------------ - ::rtl::OUString ResourceManager::loadString(sal_uInt16 _nResId,const uno::Reference< lang::XMultiComponentFactory >& _rM) + OUString ResourceManager::loadString(sal_uInt16 _nResId,const uno::Reference< lang::XMultiComponentFactory >& _rM) { - ::rtl::OUString sReturn; + OUString sReturn; ensureImplExists(_rM); if (m_pImpl) diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index 5c1ee6a8b10e..42abfe421be1 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -115,7 +115,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt else { TPropertyNamePair::iterator aFind = m_aNameMap.find(evt.PropertyName); - ::rtl::OUString sPropName; + OUString sPropName; if ( aFind != m_aNameMap.end() ) sPropName = aFind->second.first; else @@ -124,7 +124,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt m_aNameMap.begin(), m_aNameMap.end(), ::o3tl::compose1( - ::std::bind2nd(::std::equal_to< ::rtl::OUString >(), evt.PropertyName), + ::std::bind2nd(::std::equal_to< OUString >(), evt.PropertyName), ::o3tl::compose1(::o3tl::select1st<TPropertyConverter>(),::o3tl::select2nd<TPropertyNamePair::value_type>()) ) ); @@ -179,17 +179,17 @@ void SAL_CALL OPropertyMediator::disposing() void OPropertyMediator::stopListening() { if ( m_xSource.is() ) - m_xSource->removePropertyChangeListener(::rtl::OUString(), this); + m_xSource->removePropertyChangeListener(OUString(), this); if ( m_xDest.is() ) - m_xDest->removePropertyChangeListener(::rtl::OUString(), this); + m_xDest->removePropertyChangeListener(OUString(), this); } // ----------------------------------------------------------------------------- void OPropertyMediator::startListening() { if ( m_xSource.is() ) - m_xSource->addPropertyChangeListener(::rtl::OUString(), this); + m_xSource->addPropertyChangeListener(OUString(), this); if ( m_xDest.is() ) - m_xDest->addPropertyChangeListener(::rtl::OUString(), this); + m_xDest->addPropertyChangeListener(OUString(), this); } // ----------------------------------------------------------------------------- //........................................................................ diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx index 9e44dc25910c..b2cbb2160bea 100644 --- a/reportdesign/source/core/sdr/ReportDrawPage.cxx +++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx @@ -69,7 +69,7 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb if ( xFactory.is() ) { bool bChangeOrientation = false; - ::rtl::OUString sServiceName = pBaseObj->getServiceName(); + OUString sServiceName = pBaseObj->getServiceName(); OSL_ENSURE(!sServiceName.isEmpty(),"No Service Name given!"); if ( pObj->ISA(OUnoObject) ) @@ -101,10 +101,10 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb { sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; uno::Reference < embed::XEmbeddedObject > xObj; - ::rtl::OUString sName; + OUString sName; xObj = pObj->GetModel()->GetPersist()->getEmbeddedObjectContainer().CreateEmbeddedObject( ::comphelper::MimeConfigurationHelper::GetSequenceClassIDRepresentation( - ::rtl::OUString("80243D39-6741-46C5-926E-069164FF87BB")), sName ); + OUString("80243D39-6741-46C5-926E-069164FF87BB")), sName ); OSL_ENSURE(xObj.is(),"Embedded Object could not be created!"); /************************************************** diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index 1e7ddbfbf3a9..43600f3dfa59 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -151,7 +151,7 @@ uno::Reference< uno::XInterface > OReportModel::createUnoModel() return uno::Reference< uno::XInterface >(getReportDefinition(),uno::UNO_QUERY); } // ----------------------------------------------------------------------------- -uno::Reference< uno::XInterface > OReportModel::createShape(const ::rtl::OUString& aServiceSpecifier,uno::Reference< drawing::XShape >& _rShape,sal_Int32 nOrientation) +uno::Reference< uno::XInterface > OReportModel::createShape(const OUString& aServiceSpecifier,uno::Reference< drawing::XShape >& _rShape,sal_Int32 nOrientation) { uno::Reference< uno::XInterface > xRet; if ( _rShape.is() ) diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 05af0253be91..43dc1817d423 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -99,7 +99,7 @@ sal_uInt16 OObjectBase::getObjectType(const uno::Reference< report::XReportCompo return OBJ_DLG_IMAGECONTROL; if ( xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD )) return OBJ_DLG_FORMATTEDFIELD; - if ( xServiceInfo->supportsService( ::rtl::OUString("com.sun.star.drawing.OLE2Shape") ) ) + if ( xServiceInfo->supportsService( OUString("com.sun.star.drawing.OLE2Shape") ) ) return OBJ_OLE2; if ( xServiceInfo->supportsService( SERVICE_SHAPE )) return OBJ_CUSTOMSHAPE; @@ -119,7 +119,7 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon case OBJ_DLG_FIXEDTEXT: { OUnoObject* pUnoObj = new OUnoObject( _xComponent - ,::rtl::OUString("com.sun.star.form.component.FixedText") + ,OUString("com.sun.star.form.component.FixedText") ,OBJ_DLG_FIXEDTEXT); pNewObj = pUnoObj; @@ -130,18 +130,18 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon break; case OBJ_DLG_IMAGECONTROL: pNewObj = new OUnoObject(_xComponent - ,::rtl::OUString("com.sun.star.form.component.DatabaseImageControl") + ,OUString("com.sun.star.form.component.DatabaseImageControl") ,OBJ_DLG_IMAGECONTROL); break; case OBJ_DLG_FORMATTEDFIELD: pNewObj = new OUnoObject( _xComponent - ,::rtl::OUString("com.sun.star.form.component.FormattedField") + ,OUString("com.sun.star.form.component.FormattedField") ,OBJ_DLG_FORMATTEDFIELD); break; case OBJ_DLG_HFIXEDLINE: case OBJ_DLG_VFIXEDLINE: pNewObj = new OUnoObject( _xComponent - ,::rtl::OUString("com.sun.star.awt.UnoControlFixedLineModel") + ,OUString("com.sun.star.awt.UnoControlFixedLineModel") ,nType); break; case OBJ_CUSTOMSHAPE: @@ -176,7 +176,7 @@ namespace class ParaAdjust : public AnyConverter { public: - virtual ::com::sun::star::uno::Any operator() (const ::rtl::OUString& _sPropertyName,const ::com::sun::star::uno::Any& lhs) const + virtual ::com::sun::star::uno::Any operator() (const OUString& _sPropertyName,const ::com::sun::star::uno::Any& lhs) const { uno::Any aRet; if (_sPropertyName.equalsAsciiL(PROPERTY_PARAADJUST.ascii, PROPERTY_PARAADJUST.length)) @@ -293,7 +293,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId) if ( s_aNameMap.empty() ) { ::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter()); - s_aNameMap.insert(TPropertyNamePair::value_type(::rtl::OUString("FillColor"),TPropertyConverter(PROPERTY_CONTROLBACKGROUND,aNoConverter))); + s_aNameMap.insert(TPropertyNamePair::value_type(OUString("FillColor"),TPropertyConverter(PROPERTY_CONTROLBACKGROUND,aNoConverter))); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aNoConverter))); } return s_aNameMap; @@ -315,7 +315,7 @@ OObjectBase::OObjectBase(const uno::Reference< report::XReportComponent>& _xComp m_xReportComponent = _xComponent; } //---------------------------------------------------------------------------- -OObjectBase::OObjectBase(const ::rtl::OUString& _sComponentName) +OObjectBase::OObjectBase(const OUString& _sComponentName) :m_sComponentName(_sComponentName) ,m_bIsListening(sal_False) { @@ -363,7 +363,7 @@ void OObjectBase::StartListening() { m_xPropertyChangeListener = new OObjectListener( this ); // register listener to all properties - m_xReportComponent->addPropertyChangeListener( ::rtl::OUString() , m_xPropertyChangeListener ); + m_xReportComponent->addPropertyChangeListener( OUString() , m_xPropertyChangeListener ); } } } @@ -382,7 +382,7 @@ void OObjectBase::EndListening(sal_Bool /*bRemoveListener*/) // remove listener try { - m_xReportComponent->removePropertyChangeListener( ::rtl::OUString() , m_xPropertyChangeListener ); + m_xReportComponent->removePropertyChangeListener( OUString() , m_xPropertyChangeListener ); } catch(const uno::Exception &) { @@ -422,7 +422,7 @@ void OObjectBase::SetObjectItemHelper(const SfxPoolItem& /*rItem*/) } //---------------------------------------------------------------------------- -sal_Bool OObjectBase::supportsService( const ::rtl::OUString& _sServiceName ) const +sal_Bool OObjectBase::supportsService( const OUString& _sServiceName ) const { DBG_CHKTHIS( rpt_OObjectBase,NULL); sal_Bool bSupports = sal_False; @@ -486,7 +486,7 @@ OCustomShape::OCustomShape(const uno::Reference< report::XReportComponent>& _xCo m_bIsListening = sal_True; } //---------------------------------------------------------------------------- -OCustomShape::OCustomShape(const ::rtl::OUString& _sComponentName) +OCustomShape::OCustomShape(const OUString& _sComponentName) :SdrObjCustomShape() ,OObjectBase(_sComponentName) { @@ -614,8 +614,8 @@ uno::Reference< uno::XInterface > OCustomShape::getUnoShape() TYPEINIT1(OUnoObject, SdrUnoObj); DBG_NAME( rpt_OUnoObject ); //---------------------------------------------------------------------------- -OUnoObject::OUnoObject(const ::rtl::OUString& _sComponentName - ,const ::rtl::OUString& rModelName +OUnoObject::OUnoObject(const OUString& _sComponentName + ,const OUString& rModelName ,sal_uInt16 _nObjectType) :SdrUnoObj(rModelName, sal_True) ,OObjectBase(_sComponentName) @@ -627,7 +627,7 @@ OUnoObject::OUnoObject(const ::rtl::OUString& _sComponentName } //---------------------------------------------------------------------------- OUnoObject::OUnoObject(const uno::Reference< report::XReportComponent>& _xComponent - ,const ::rtl::OUString& rModelName + ,const OUString& rModelName ,sal_uInt16 _nObjectType) :SdrUnoObj(rModelName, sal_True) ,OObjectBase(_xComponent) @@ -654,7 +654,7 @@ void OUnoObject::impl_initializeModel_nothrow() if ( xFormatted.is() ) { const Reference< XPropertySet > xModelProps( GetUnoControlModel(), UNO_QUERY_THROW ); - const ::rtl::OUString sTreatAsNumberProperty = ::rtl::OUString( "TreatAsNumber" ); + const OUString sTreatAsNumberProperty = OUString( "TreatAsNumber" ); xModelProps->setPropertyValue( sTreatAsNumberProperty, makeAny( sal_False ) ); xModelProps->setPropertyValue( PROPERTY_VERTICALALIGN,m_xReportComponent->getPropertyValue(PROPERTY_VERTICALALIGN)); } @@ -823,10 +823,10 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) return bResult; } //---------------------------------------------------------------------------- -::rtl::OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj) +OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj) { sal_uInt16 nResId = 0; - ::rtl::OUString aDefaultName = ::rtl::OUString("HERE WE HAVE TO INSERT OUR NAME!"); + OUString aDefaultName = OUString("HERE WE HAVE TO INSERT OUR NAME!"); if ( _pObj->supportsService( SERVICE_FIXEDTEXT ) ) { nResId = RID_STR_CLASS_FIXEDTEXT; @@ -845,7 +845,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } if (nResId) - aDefaultName = ::rtl::OUString( String(ModuleRes(nResId)) ); + aDefaultName = OUString( String(ModuleRes(nResId)) ); return aDefaultName; } @@ -879,11 +879,11 @@ void OUnoObject::_propertyChange( const beans::PropertyChangeEvent& evt ) throw if ( xControlModel.is() && xControlModel->getPropertySetInfo()->hasPropertyByName(PROPERTY_NAME) ) { // get old name - ::rtl::OUString aOldName; + OUString aOldName; evt.OldValue >>= aOldName; // get new name - ::rtl::OUString aNewName; + OUString aNewName; evt.NewValue >>= aNewName; if ( !aNewName.equals(aOldName) ) @@ -967,7 +967,7 @@ OOle2Obj::OOle2Obj(const uno::Reference< report::XReportComponent>& _xComponent, m_bIsListening = sal_True; } //---------------------------------------------------------------------------- -OOle2Obj::OOle2Obj(const ::rtl::OUString& _sComponentName,sal_uInt16 _nType) +OOle2Obj::OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType) :SdrOle2Obj() ,OObjectBase(_sComponentName) ,m_nType(_nType) @@ -1191,7 +1191,7 @@ void OOle2Obj::impl_createDataProvider_nothrow(const uno::Reference< frame::XMod if( xReceiver.is() ) { uno::Reference< lang::XMultiServiceFactory> xFac(_xModel,uno::UNO_QUERY); - uno::Reference< chart2::data::XDatabaseDataProvider > xDataProvider( xFac->createInstance(::rtl::OUString("com.sun.star.chart2.data.DataProvider")),uno::UNO_QUERY); + uno::Reference< chart2::data::XDatabaseDataProvider > xDataProvider( xFac->createInstance(OUString("com.sun.star.chart2.data.DataProvider")),uno::UNO_QUERY); xReceiver->attachDataProvider( xDataProvider.get() ); } } @@ -1214,7 +1214,7 @@ void OOle2Obj::initializeOle() { uno::Reference< beans::XPropertySet > xChartProps( xCompSupp->getComponent(), uno::UNO_QUERY ); if ( xChartProps.is() ) - xChartProps->setPropertyValue(::rtl::OUString("NullDate"),uno::makeAny(util::DateTime(0,0,0,0,1,1,1900))); + xChartProps->setPropertyValue(OUString("NullDate"),uno::makeAny(util::DateTime(0,0,0,0,1,1,1900))); } } } @@ -1241,7 +1241,7 @@ void OOle2Obj::initializeChart( const uno::Reference< frame::XModel>& _xModel) pRptModel->GetUndoEnv().AddElement(lcl_getDataProvider(xObj)); ::comphelper::NamedValueCollection aArgs; - aArgs.put( "CellRangeRepresentation", uno::makeAny( ::rtl::OUString( "all" ) ) ); + aArgs.put( "CellRangeRepresentation", uno::makeAny( OUString( "all" ) ) ); aArgs.put( "HasCategories", uno::makeAny( sal_True ) ); aArgs.put( "FirstCellAsLabel", uno::makeAny( sal_True ) ); aArgs.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) ); @@ -1255,12 +1255,12 @@ void OOle2Obj::initializeChart( const uno::Reference< frame::XModel>& _xModel) uno::Reference< style::XStyle> getUsedStyle(const uno::Reference< report::XReportDefinition>& _xReport) { uno::Reference<container::XNameAccess> xStyles = _xReport->getStyleFamilies(); - uno::Reference<container::XNameAccess> xPageStyles(xStyles->getByName(::rtl::OUString("PageStyles")),uno::UNO_QUERY); + uno::Reference<container::XNameAccess> xPageStyles(xStyles->getByName(OUString("PageStyles")),uno::UNO_QUERY); uno::Reference< style::XStyle> xReturn; - uno::Sequence< ::rtl::OUString> aSeq = xPageStyles->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + uno::Sequence< OUString> aSeq = xPageStyles->getElementNames(); + const OUString* pIter = aSeq.getConstArray(); + const OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd && !xReturn.is() ;++pIter) { uno::Reference< style::XStyle> xStyle(xPageStyles->getByName(*pIter),uno::UNO_QUERY); diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index c6fc902a1ce7..943a5e30a656 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -390,11 +390,11 @@ void ORptUndoPropertyAction::setProperty(sal_Bool _bOld) } } -rtl::OUString ORptUndoPropertyAction::GetComment() const +OUString ORptUndoPropertyAction::GetComment() const { String aStr(ModuleRes(RID_STR_UNDO_PROPERTY).toString()); - aStr.SearchAndReplace(rtl::OUString('#'), m_aPropertyName); + aStr.SearchAndReplace(OUString('#'), m_aPropertyName); return aStr; } diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index ece3f15dba84..b924100ff6b6 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -77,7 +77,7 @@ struct PropertyInfo } }; -typedef ::boost::unordered_map< ::rtl::OUString, PropertyInfo, ::rtl::OUStringHash > PropertiesInfo; +typedef ::boost::unordered_map< OUString, PropertyInfo, OUStringHash > PropertiesInfo; struct ObjectInfo { @@ -545,9 +545,9 @@ void OXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > & if (xSet.is()) { if (!m_pImpl->m_bReadOnly) - xSet->addPropertyChangeListener( ::rtl::OUString(), this ); + xSet->addPropertyChangeListener( OUString(), this ); else - xSet->removePropertyChangeListener( ::rtl::OUString(), this ); + xSet->removePropertyChangeListener( OUString(), this ); } } @@ -602,9 +602,9 @@ void OXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObjec if ( xProps.is() ) { if ( _bStartListening ) - xProps->addPropertyChangeListener( ::rtl::OUString(), this ); + xProps->addPropertyChangeListener( OUString(), this ); else - xProps->removePropertyChangeListener( ::rtl::OUString(), this ); + xProps->removePropertyChangeListener( OUString(), this ); } } diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx index b3f4d95bbf03..1032158af108 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.cxx +++ b/reportdesign/source/core/sdr/formatnormalizer.cxx @@ -111,7 +111,7 @@ namespace rptui } //-------------------------------------------------------------------- - void FormatNormalizer::impl_onDefinitionPropertyChange( const ::rtl::OUString& _rChangedPropName ) + void FormatNormalizer::impl_onDefinitionPropertyChange( const OUString& _rChangedPropName ) { if ( _rChangedPropName != "Command" && _rChangedPropName != "CommandType" && _rChangedPropName != "EscapeProcessing" ) // nothing we're interested in @@ -120,7 +120,7 @@ namespace rptui } //-------------------------------------------------------------------- - void FormatNormalizer::impl_onFormattedProperttyChange( const Reference< XFormattedField >& _rxFormatted, const ::rtl::OUString& _rChangedPropName ) + void FormatNormalizer::impl_onFormattedProperttyChange( const Reference< XFormattedField >& _rxFormatted, const OUString& _rChangedPropName ) { if ( _rChangedPropName != "DataField" ) // nothing we're interested in @@ -145,10 +145,10 @@ namespace rptui for ( sal_Int32 i=0; i<nCount; ++i ) { xColumn.set( _rxColumns->getByIndex( i ), UNO_QUERY_THROW ); - OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( "Name" ) ) >>= aField.sName ); - OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= aField.nDataType ); - OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( "Scale" ) ) >>= aField.nScale ); - OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( "IsCurrency" ) ) >>= aField.bIsCurrency ); + OSL_VERIFY( xColumn->getPropertyValue( OUString( "Name" ) ) >>= aField.sName ); + OSL_VERIFY( xColumn->getPropertyValue( OUString( "Type" ) ) >>= aField.nDataType ); + OSL_VERIFY( xColumn->getPropertyValue( OUString( "Scale" ) ) >>= aField.nScale ); + OSL_VERIFY( xColumn->getPropertyValue( OUString( "IsCurrency" ) ) >>= aField.bIsCurrency ); _inout_rFields.push_back( aField ); } } @@ -221,8 +221,8 @@ namespace rptui // it's not the "standard numeric" format -> not interested in return; - ::rtl::OUString sDataField( _rxFormatted->getDataField() ); - const ::rtl::OUString sFieldPrefix( "field:[" ); + OUString sDataField( _rxFormatted->getDataField() ); + const OUString sFieldPrefix( "field:[" ); if ( sDataField.indexOf( sFieldPrefix ) != 0 ) // not bound to a table field // TODO: we might also do this kind of thing for functions and expressions ... diff --git a/reportdesign/source/core/sdr/formatnormalizer.hxx b/reportdesign/source/core/sdr/formatnormalizer.hxx index b23795218da9..877991ec9042 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.hxx +++ b/reportdesign/source/core/sdr/formatnormalizer.hxx @@ -42,7 +42,7 @@ namespace rptui public: struct Field { - ::rtl::OUString sName; + OUString sName; sal_Int32 nDataType; sal_Int32 nScale; sal_Bool bIsCurrency; @@ -69,8 +69,8 @@ namespace rptui private: bool impl_lateInit(); - void impl_onDefinitionPropertyChange( const ::rtl::OUString& _rChangedPropName ); - void impl_onFormattedProperttyChange( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormattedField >& _rxFormatted, const ::rtl::OUString& _rChangedPropName ); + void impl_onDefinitionPropertyChange( const OUString& _rChangedPropName ); + void impl_onFormattedProperttyChange( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormattedField >& _rxFormatted, const OUString& _rChangedPropName ); bool impl_ensureUpToDateFieldList_nothrow(); diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index 231c87f34759..dd4820b2f63b 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -45,17 +45,17 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon { } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ORptTypeDetection::detect( Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (RuntimeException) +OUString SAL_CALL ORptTypeDetection::detect( Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (RuntimeException) { ::comphelper::SequenceAsHashMap aTemp(Descriptor); - ::rtl::OUString sTemp = aTemp.getUnpackedValueOrDefault(::rtl::OUString("URL"),::rtl::OUString()); + OUString sTemp = aTemp.getUnpackedValueOrDefault(OUString("URL"),OUString()); if ( !sTemp.isEmpty() ) { INetURLObject aURL(sTemp); if ( aURL.GetExtension().equalsIgnoreAsciiCase("orp") ) - return ::rtl::OUString("StarBaseReport"); + return OUString("StarBaseReport"); else { try @@ -63,10 +63,10 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon Reference<XPropertySet> xProp(::comphelper::OStorageHelper::GetStorageFromURL(sTemp,ElementModes::READ, m_xContext),UNO_QUERY); if ( xProp.is() ) { - ::rtl::OUString sMediaType; - xProp->getPropertyValue( ::rtl::OUString("MediaType") ) >>= sMediaType; + OUString sMediaType; + xProp->getPropertyValue( OUString("MediaType") ) >>= sMediaType; if ( sMediaType == MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII ) - return ::rtl::OUString("StarBaseReport"); + return OUString("StarBaseReport"); ::comphelper::disposeComponent(xProp); } } @@ -75,7 +75,7 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon } } } - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- Reference< XInterface > SAL_CALL @@ -85,29 +85,29 @@ Reference< XInterface > SAL_CALL } // ------------------------------------------------------------------------- // XServiceInfo -::rtl::OUString SAL_CALL ORptTypeDetection::getImplementationName() throw( ) +OUString SAL_CALL ORptTypeDetection::getImplementationName() throw( ) { return getImplementationName_Static(); } // ------------------------------------------------------------------------- // XServiceInfo -sal_Bool SAL_CALL ORptTypeDetection::supportsService(const ::rtl::OUString& ServiceName) throw( ) +sal_Bool SAL_CALL ORptTypeDetection::supportsService(const OUString& ServiceName) throw( ) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } // ------------------------------------------------------------------------- // XServiceInfo -Sequence< ::rtl::OUString > SAL_CALL ORptTypeDetection::getSupportedServiceNames(void) throw( ) +Sequence< OUString > SAL_CALL ORptTypeDetection::getSupportedServiceNames(void) throw( ) { return getSupportedServiceNames_Static(); } // ------------------------------------------------------------------------- // ORegistryServiceManager_Static -Sequence< ::rtl::OUString > ORptTypeDetection::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString > ORptTypeDetection::getSupportedServiceNames_Static(void) throw( RuntimeException ) { - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.document.ExtendedTypeDetection"); + Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[0] = OUString("com.sun.star.document.ExtendedTypeDetection"); return aSNS; } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx index 33dcfe8769f5..a7e6d037b4b1 100644 --- a/reportdesign/source/filter/xml/dbloader2.hxx +++ b/reportdesign/source/filter/xml/dbloader2.hxx @@ -73,20 +73,20 @@ public: ORptTypeDetection(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName() throw( ); - sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); + OUString SAL_CALL getImplementationName() throw( ); + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ); // static methods - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ) + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ) { - return ::rtl::OUString("com.sun.star.comp.report.ORptTypeDetection"); + return OUString("com.sun.star.comp.report.ORptTypeDetection"); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); - virtual ::rtl::OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException); }; } #endif diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx b/reportdesign/source/filter/xml/xmlAutoStyle.cxx index faf0d94fdea3..9b511bdca622 100644 --- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx +++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx @@ -49,7 +49,7 @@ void OXMLAutoStylePoolP::exportStyleAttributes( { case CTF_RPT_NUMBERFORMAT : { - rtl::OUString sAttrValue; + OUString sAttrValue; if ( i->maValue >>= sAttrValue ) { if ( !sAttrValue.isEmpty() ) diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index 18a6cb857b28..57ac5aaecbff 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -51,7 +51,7 @@ DBG_NAME( rpt_OXMLCell ) OXMLCell::OXMLCell( ORptFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,OXMLTable* _pContainer ,OXMLCell* _pCell) : @@ -72,10 +72,10 @@ OXMLCell::OXMLCell( ORptFilter& rImport const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -101,14 +101,14 @@ OXMLCell::~OXMLCell() // ----------------------------------------------------------------------------- SvXMLImportContext* OXMLCell::CreateChildContext( sal_uInt16 _nPrefix, - const ::rtl::OUString& _rLocalName, + const OUString& _rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); const SvXMLTokenMap& rTokenMap = rImport.GetCellElemTokenMap(); Reference<XMultiServiceFactory> xFactor(rImport.GetModel(),uno::UNO_QUERY); - static const ::rtl::OUString s_sStringConcat(" & "); + static const OUString s_sStringConcat(" & "); const sal_uInt16 nToken = rTokenMap.Get( _nPrefix, _rLocalName ); switch( nToken ) @@ -120,10 +120,10 @@ SvXMLImportContext* OXMLCell::CreateChildContext( } break; case XML_TOK_PAGE_NUMBER: - m_sText += s_sStringConcat + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" PageNumber()")); + m_sText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageNumber()")); break; case XML_TOK_PAGE_COUNT: - m_sText += s_sStringConcat + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" PageCount()")); + m_sText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageCount()")); break; case XML_TOK_FORMATTED_TEXT: { @@ -204,7 +204,7 @@ void OXMLCell::EndElement() Reference<XMultiServiceFactory> xFactor(rImport.GetModel(),uno::UNO_QUERY); uno::Reference< uno::XInterface> xInt = xFactor->createInstance(SERVICE_FORMATTEDFIELD); Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY); - xControl->setDataField(::rtl::OUString("rpt:") + m_sText); + xControl->setDataField(OUString("rpt:") + m_sText); OSL_ENSURE(xControl.is(),"Could not create FormattedField!"); setComponent(xControl.get()); @@ -254,14 +254,14 @@ void OXMLCell::setComponent(const uno::Reference< report::XReportComponent >& _x m_xComponent = _xComponent; } // ----------------------------------------------------------------------------- -void OXMLCell::Characters( const ::rtl::OUString& rChars ) +void OXMLCell::Characters( const OUString& rChars ) { if ( !rChars.isEmpty() ) { - static const ::rtl::OUString s_Quote(RTL_CONSTASCII_USTRINGPARAM("\"")); + static const OUString s_Quote(RTL_CONSTASCII_USTRINGPARAM("\"")); if ( !m_sText.isEmpty() ) { - static const ::rtl::OUString s_sStringConcat(" & "); + static const OUString s_sStringConcat(" & "); m_sText += s_sStringConcat; } diff --git a/reportdesign/source/filter/xml/xmlCell.hxx b/reportdesign/source/filter/xml/xmlCell.hxx index 48338307c536..abdce954d017 100644 --- a/reportdesign/source/filter/xml/xmlCell.hxx +++ b/reportdesign/source/filter/xml/xmlCell.hxx @@ -31,8 +31,8 @@ namespace rptxml ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; OXMLTable* m_pContainer; OXMLCell* m_pCell; - ::rtl::OUString m_sStyleName; - ::rtl::OUString m_sText; + OUString m_sStyleName; + OUString m_sText; sal_Int32 m_nCurrentCount; bool m_bContainsShape; @@ -43,17 +43,17 @@ namespace rptxml OXMLCell( ORptFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,OXMLTable* _pContainer ,OXMLCell* _pCell = NULL); virtual ~OXMLCell(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); void setComponent(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent); diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx index 3f4eb4ca4c19..ddc053a87591 100644 --- a/reportdesign/source/filter/xml/xmlColumn.cxx +++ b/reportdesign/source/filter/xml/xmlColumn.cxx @@ -47,7 +47,7 @@ DBG_NAME( rpt_OXMLRowColumn ) OXMLRowColumn::OXMLRowColumn( ORptFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,OXMLTable* _pContainer ) : @@ -62,10 +62,10 @@ OXMLRowColumn::OXMLRowColumn( ORptFilter& rImport const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -86,7 +86,7 @@ OXMLRowColumn::~OXMLRowColumn() // ----------------------------------------------------------------------------- SvXMLImportContext* OXMLRowColumn::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; @@ -123,7 +123,7 @@ SvXMLImportContext* OXMLRowColumn::CreateChildContext( return pContext; } // ----------------------------------------------------------------------------- -void OXMLRowColumn::fillStyle(const ::rtl::OUString& _sStyleName) +void OXMLRowColumn::fillStyle(const OUString& _sStyleName) { if ( !_sStyleName.isEmpty() ) { diff --git a/reportdesign/source/filter/xml/xmlColumn.hxx b/reportdesign/source/filter/xml/xmlColumn.hxx index bb5088d505b2..2366abcb82da 100644 --- a/reportdesign/source/filter/xml/xmlColumn.hxx +++ b/reportdesign/source/filter/xml/xmlColumn.hxx @@ -31,21 +31,21 @@ namespace rptxml ORptFilter& GetOwnImport(); - void fillStyle(const ::rtl::OUString& _sStyleName); + void fillStyle(const OUString& _sStyleName); OXMLRowColumn(const OXMLRowColumn&); void operator =(const OXMLRowColumn&); public: OXMLRowColumn( ORptFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,OXMLTable* _pContainer ); virtual ~OXMLRowColumn(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); }; diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx index 39d7968db555..b41313653af9 100644 --- a/reportdesign/source/filter/xml/xmlComponent.cxx +++ b/reportdesign/source/filter/xml/xmlComponent.cxx @@ -45,7 +45,7 @@ namespace rptxml DBG_NAME( rpt_OXMLComponent ) OXMLComponent::OXMLComponent( ORptFilter& _rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,const Reference< XReportComponent > & _xComponent ) : @@ -65,10 +65,10 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport { try { - ::rtl::OUString sLocalName; - const ::rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - const ::rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { diff --git a/reportdesign/source/filter/xml/xmlComponent.hxx b/reportdesign/source/filter/xml/xmlComponent.hxx index 21f91e661a50..40915d4482fe 100644 --- a/reportdesign/source/filter/xml/xmlComponent.hxx +++ b/reportdesign/source/filter/xml/xmlComponent.hxx @@ -30,8 +30,8 @@ namespace rptxml { protected: ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; - ::rtl::OUString m_sName; - ::rtl::OUString m_sTextStyleName; + OUString m_sName; + OUString m_sTextStyleName; OXMLComponent(const OXMLComponent&); OXMLComponent& operator =(const OXMLComponent&); @@ -39,7 +39,7 @@ namespace rptxml OXMLComponent( ORptFilter& rImport , sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent ); diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx index b3fb83285d0c..07a1f7945f1a 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx @@ -37,7 +37,7 @@ DBG_NAME( rpt_OXMLCondPrtExpr ) OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport, sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const uno::Reference< xml::sax::XAttributeList > & _xAttrList ,const Reference< XPropertySet > & _xComponent ) : SvXMLImportContext( _rImport, nPrfx, rLName ) @@ -53,10 +53,10 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport, { for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -83,7 +83,7 @@ OXMLCondPrtExpr::~OXMLCondPrtExpr() } // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- -void OXMLCondPrtExpr::Characters( const ::rtl::OUString& rChars ) +void OXMLCondPrtExpr::Characters( const OUString& rChars ) { m_xComponent->setPropertyValue(PROPERTY_CONDITIONALPRINTEXPRESSION,makeAny(rChars)); } diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx index cb0042405803..5c8a61d17c14 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx @@ -34,14 +34,14 @@ namespace rptxml OXMLCondPrtExpr( ORptFilter& _rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & _xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xComponent); virtual ~OXMLCondPrtExpr(); // This method is called for all characters that are contained in the // current element. The default is to ignore them. - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; // ----------------------------------------------------------------------------- } // namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index b5a021c96e01..aca8453b511d 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -49,7 +49,7 @@ DBG_NAME( rpt_OXMLControlProperty ) OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,const Reference< XPropertySet >& _xControl ,OXMLControlProperty* _pContainer) : @@ -71,10 +71,10 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -90,7 +90,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< OUString* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_DATE)] = ::getCppuType( static_cast< com::sun::star::util::Date* >(NULL) ); @@ -122,7 +122,7 @@ OXMLControlProperty::~OXMLControlProperty() // ----------------------------------------------------------------------------- SvXMLImportContext* OXMLControlProperty::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; @@ -166,13 +166,13 @@ void OXMLControlProperty::EndElement() } } // ----------------------------------------------------------------------------- -void OXMLControlProperty::Characters( const ::rtl::OUString& rChars ) +void OXMLControlProperty::Characters( const OUString& rChars ) { if ( m_pContainer ) m_pContainer->addValue(rChars); } // ----------------------------------------------------------------------------- -void OXMLControlProperty::addValue(const ::rtl::OUString& _sValue) +void OXMLControlProperty::addValue(const OUString& _sValue) { Any aValue; if( TypeClass_VOID != m_aPropType.getTypeClass() ) @@ -193,7 +193,7 @@ ORptFilter& OXMLControlProperty::GetOwnImport() return static_cast<ORptFilter&>(GetImport()); } // ----------------------------------------------------------------------------- -Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpectedType, const ::rtl::OUString& _rReadCharacters) +Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters) { Any aReturn; switch (_rExpectedType.getTypeClass()) @@ -206,8 +206,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe #endif ::sax::Converter::convertBool(bValue, _rReadCharacters); OSL_ENSURE(bSuccess, - ::rtl::OStringBuffer("OXMLControlProperty::convertString: could not convert \""). - append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). + OStringBuffer("OXMLControlProperty::convertString: could not convert \""). + append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). append("\" into a boolean!").getStr()); aReturn <<= bValue; } @@ -221,8 +221,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe #endif ::sax::Converter::convertNumber(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, - ::rtl::OStringBuffer("OXMLControlProperty::convertString: could not convert \""). - append(rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). + OStringBuffer("OXMLControlProperty::convertString: could not convert \""). + append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). append("\" into an integer!").getStr()); if (TypeClass_SHORT == _rExpectedType.getTypeClass()) aReturn <<= (sal_Int16)nValue; @@ -243,8 +243,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe #endif ::sax::Converter::convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, - ::rtl::OStringBuffer("OXMLControlProperty::convertString: could not convert \""). - append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). + OStringBuffer("OXMLControlProperty::convertString: could not convert \""). + append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). append("\" into a double!").getStr()); aReturn <<= (double)nValue; } @@ -274,8 +274,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe #endif ::sax::Converter::convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, - ::rtl::OStringBuffer("OPropertyImport::convertString: could not convert \""). - append(rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). + OStringBuffer("OPropertyImport::convertString: could not convert \""). + append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). append("\" into a double!").getStr()); // then convert it into the target type diff --git a/reportdesign/source/filter/xml/xmlControlProperty.hxx b/reportdesign/source/filter/xml/xmlControlProperty.hxx index 4261441fea35..696a5ac48c3e 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.hxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.hxx @@ -39,33 +39,33 @@ namespace rptxml sal_Bool m_bIsList; ORptFilter& GetOwnImport(); - ::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const ::rtl::OUString& _rReadCharacters); + ::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters); OXMLControlProperty(const OXMLControlProperty&); void operator =(const OXMLControlProperty&); public: OXMLControlProperty( ORptFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xControl ,OXMLControlProperty* _pContainer = NULL); virtual ~OXMLControlProperty(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); /** adds value to property @param _sValue The value to add. */ - void addValue(const ::rtl::OUString& _sValue); + void addValue(const OUString& _sValue); private: static ::com::sun::star::util::Time implGetTime(double _nValue); diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 7a3c0e019bb9..a4e03b563cc9 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -76,15 +76,15 @@ namespace rptxml return static_cast< XServiceInfo* >(new ORptExport(xContext,EXPORT_SETTINGS )); } //--------------------------------------------------------------------- - ::rtl::OUString ORptExportHelper::getImplementationName_Static( ) throw (RuntimeException) + OUString ORptExportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.XMLSettingsExporter"); + return OUString("com.sun.star.comp.report.XMLSettingsExporter"); } //--------------------------------------------------------------------- - Sequence< ::rtl::OUString > ORptExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) + Sequence< OUString > ORptExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.document.ExportFilter"); return aSupported; } //--------------------------------------------------------------------- @@ -93,15 +93,15 @@ namespace rptxml return static_cast< XServiceInfo* >(new ORptExport(xContext,EXPORT_CONTENT )); } //--------------------------------------------------------------------- - ::rtl::OUString ORptContentExportHelper::getImplementationName_Static( ) throw (RuntimeException) + OUString ORptContentExportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.XMLContentExporter"); + return OUString("com.sun.star.comp.report.XMLContentExporter"); } //--------------------------------------------------------------------- - Sequence< ::rtl::OUString > ORptContentExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) + Sequence< OUString > ORptContentExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.document.ExportFilter"); return aSupported; } @@ -112,15 +112,15 @@ namespace rptxml EXPORT_FONTDECLS|EXPORT_OASIS )); } //--------------------------------------------------------------------- - ::rtl::OUString ORptStylesExportHelper::getImplementationName_Static( ) throw (RuntimeException) + OUString ORptStylesExportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.XMLStylesExporter"); + return OUString("com.sun.star.comp.report.XMLStylesExporter"); } //--------------------------------------------------------------------- - Sequence< ::rtl::OUString > ORptStylesExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) + Sequence< OUString > ORptStylesExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.document.ExportFilter"); return aSupported; } @@ -130,15 +130,15 @@ namespace rptxml return static_cast< XServiceInfo* >(new ORptExport(xContext, EXPORT_META )); } //--------------------------------------------------------------------- - ::rtl::OUString ORptMetaExportHelper::getImplementationName_Static( ) throw (RuntimeException) + OUString ORptMetaExportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.XMLMetaExporter"); + return OUString("com.sun.star.comp.report.XMLMetaExporter"); } //--------------------------------------------------------------------- - Sequence< ::rtl::OUString > ORptMetaExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) + Sequence< OUString > ORptMetaExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.document.ExportFilter"); return aSupported; } @@ -148,15 +148,15 @@ namespace rptxml return static_cast< XServiceInfo* >(new ORptExport(xContext,EXPORT_ALL)); } //--------------------------------------------------------------------- - ::rtl::OUString ODBFullExportHelper::getImplementationName_Static( ) throw (RuntimeException) + OUString ODBFullExportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.XMLFullExporter"); + return OUString("com.sun.star.comp.report.XMLFullExporter"); } //--------------------------------------------------------------------- - Sequence< ::rtl::OUString > ODBFullExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) + Sequence< OUString > ODBFullExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.document.ExportFilter"); return aSupported; } @@ -288,19 +288,19 @@ ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext,sal_uInt UniReference < XMLPropertySetMapper > xPropMapper(new XMLTextPropertySetMapper( TEXT_PROP_MAP_PARA )); m_xParaPropMapper = new OSpecialHanldeXMLExportPropertyMapper( xPropMapper); - ::rtl::OUString sFamily( GetXMLToken(XML_PARAGRAPH) ); - ::rtl::OUString aPrefix( 'P'); + OUString sFamily( GetXMLToken(XML_PARAGRAPH) ); + OUString aPrefix( 'P'); GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_TEXT_PARAGRAPH, sFamily, m_xParaPropMapper, aPrefix ); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), - m_xCellStylesExportPropertySetMapper, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_COLUMN, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME)), - m_xColumnStylesExportPropertySetMapper, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_ROW, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME)), - m_xRowStylesExportPropertySetMapper, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME)), - m_xTableStylesExportPropertySetMapper, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX))); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), + m_xCellStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX))); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_COLUMN, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME)), + m_xColumnStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX))); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_ROW, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME)), + m_xRowStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX))); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME)), + m_xTableStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX))); } // ----------------------------------------------------------------------------- Reference< XInterface > ORptExport::create(Reference< XComponentContext > const & xContext) @@ -309,31 +309,31 @@ Reference< XInterface > ORptExport::create(Reference< XComponentContext > const } // ----------------------------------------------------------------------------- -::rtl::OUString ORptExport::getImplementationName_Static( ) throw(uno::RuntimeException) +OUString ORptExport::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.ExportFilter"); + return OUString("com.sun.star.comp.report.ExportFilter"); } //-------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ORptExport::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL ORptExport::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > ORptExport::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) +uno::Sequence< OUString > ORptExport::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aServices(1); - aServices.getArray()[0] = ::rtl::OUString("com.sun.star.document.ExportFilter"); + uno::Sequence< OUString > aServices(1); + aServices.getArray()[0] = OUString("com.sun.star.document.ExportFilter"); return aServices; } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL ORptExport::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL ORptExport::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL ORptExport::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException ) +sal_Bool SAL_CALL ORptExport::supportsService(const OUString& ServiceName) throw( uno::RuntimeException ) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } @@ -352,7 +352,7 @@ void ORptExport::exportFunctions(const Reference<XIndexAccess>& _xFunctions) void ORptExport::exportFunction(const uno::Reference< XFunction>& _xFunction) { exportFormula(XML_FORMULA,_xFunction->getFormula()); - beans::Optional< ::rtl::OUString> aInitial = _xFunction->getInitialFormula(); + beans::Optional< OUString> aInitial = _xFunction->getInitialFormula(); if ( aInitial.IsPresent && !aInitial.Value.isEmpty() ) exportFormula(XML_INITIAL_FORMULA ,aInitial.Value ); AddAttribute( XML_NAMESPACE_REPORT, XML_NAME , _xFunction->getName() ); @@ -366,17 +366,17 @@ void ORptExport::exportFunction(const uno::Reference< XFunction>& _xFunction) // ----------------------------------------------------------------------------- void ORptExport::exportMasterDetailFields(const Reference<XReportComponent>& _xReportComponet) { - const uno::Sequence< ::rtl::OUString> aMasterFields = _xReportComponet->getMasterFields(); + const uno::Sequence< OUString> aMasterFields = _xReportComponet->getMasterFields(); if ( aMasterFields.getLength() ) { SvXMLElementExport aElement(*this,XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELDS, sal_True, sal_True); - const uno::Sequence< ::rtl::OUString> aDetailFields = _xReportComponet->getDetailFields(); + const uno::Sequence< OUString> aDetailFields = _xReportComponet->getDetailFields(); OSL_ENSURE(aDetailFields.getLength() == aMasterFields.getLength(),"not equal length for master and detail fields!"); - const ::rtl::OUString* pDetailFieldsIter = aDetailFields.getConstArray(); - const ::rtl::OUString* pIter = aMasterFields.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aMasterFields.getLength(); + const OUString* pDetailFieldsIter = aDetailFields.getConstArray(); + const OUString* pIter = aMasterFields.getConstArray(); + const OUString* pEnd = pIter + aMasterFields.getLength(); for(;pIter != pEnd;++pIter,++pDetailFieldsIter) { AddAttribute( XML_NAMESPACE_REPORT, XML_MASTER , *pIter ); @@ -401,7 +401,7 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini } if ( _xReportDefinition->getPageHeaderOn() ) { - ::rtl::OUStringBuffer sValue; + OUStringBuffer sValue; sal_uInt16 nRet = _xReportDefinition->getPageHeaderOption(); const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetReportPrintOptions(); if ( SvXMLUnitConverter::convertEnum( sValue, nRet,aXML_EnumMap ) ) @@ -415,7 +415,7 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini if ( _xReportDefinition->getPageFooterOn() ) { - ::rtl::OUStringBuffer sValue; + OUStringBuffer sValue; sal_uInt16 nRet = _xReportDefinition->getPageFooterOption(); const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetReportPrintOptions(); if ( SvXMLUnitConverter::convertEnum( sValue, nRet,aXML_EnumMap ) ) @@ -481,7 +481,7 @@ void ORptExport::exportReportElement(const Reference<XReportControlModel>& _xRep exportFormatConditions(_xReportElement); } - ::rtl::OUString sExpr = _xReportElement->getConditionalPrintExpression(); + OUString sExpr = _xReportElement->getConditionalPrintExpression(); if ( !sExpr.isEmpty() ) { exportFormula(XML_FORMULA,sExpr); @@ -719,7 +719,7 @@ void ORptExport::exportReportComponentAutoStyles(const Reference<XSection>& _xPr void ORptExport::exportSection(const Reference<XSection>& _xSection,bool bHeader) { OSL_ENSURE(_xSection.is(),"Section is NULL -> GPF"); - ::rtl::OUStringBuffer sValue; + OUStringBuffer sValue; AddAttribute(XML_NAMESPACE_TABLE, XML_NAME,_xSection->getName()); if ( !_xSection->getVisible() ) @@ -744,7 +744,7 @@ void ORptExport::exportSection(const Reference<XSection>& _xSection,bool bHeader /// TODO export as table layout SvXMLElementExport aComponents(*this,XML_NAMESPACE_TABLE, XML_TABLE, sal_True, sal_True); - ::rtl::OUString sExpr = _xSection->getConditionalPrintExpression(); + OUString sExpr = _xSection->getConditionalPrintExpression(); if ( !sExpr.isEmpty() ) { exportFormula(XML_FORMULA,sExpr); @@ -852,7 +852,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) { XMLNumberFormatAttributesExportHelper aHelper(GetNumberFormatsSupplier(),*this); bool bIsStandard = false; - ::rtl::OUString sEmpty; + OUString sEmpty; if ( util::NumberFormat::TEXT == aHelper.GetCellType(nFormatKey,bIsStandard) ) aHelper.SetNumberFormatAttributes(sEmpty, sEmpty); else @@ -896,14 +896,14 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) else if ( xElement->supportsService(SERVICE_IMAGECONTROL) ) { eToken = XML_IMAGE; - ::rtl::OUString sTargetLocation = xImage->getImageURL(); + OUString sTargetLocation = xImage->getImageURL(); if ( !sTargetLocation.isEmpty() ) { sTargetLocation = GetRelativeReference(sTargetLocation); AddAttribute(XML_NAMESPACE_FORM, XML_IMAGE_DATA,sTargetLocation); } bExportData = sal_True; - ::rtl::OUStringBuffer sValue; + OUStringBuffer sValue; const SvXMLEnumMapEntry* aXML_ImageScaleEnumMap = OXMLHelper::GetImageScaleOptions(); if ( SvXMLUnitConverter::convertEnum( sValue, xImage->getScaleMode(),aXML_ImageScaleEnumMap ) ) AddAttribute(XML_NAMESPACE_REPORT, XML_SCALE, sValue.makeStringAndClear() ); @@ -1012,19 +1012,19 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) } } // ----------------------------------------------------------------------------- -::rtl::OUString ORptExport::convertFormula(const ::rtl::OUString& _sFormula) +OUString ORptExport::convertFormula(const OUString& _sFormula) { - ::rtl::OUString sFormula = _sFormula; + OUString sFormula = _sFormula; if ( _sFormula.equalsAsciiL("rpt:",4) ) - sFormula = ::rtl::OUString(); + sFormula = OUString(); return sFormula; } // ----------------------------------------------------------------------------- -bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const ::rtl::OUString& _sFormula) +bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const OUString& _sFormula) { - const ::rtl::OUString sFieldData = convertFormula(_sFormula); - static const ::rtl::OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()")); - static const ::rtl::OUString s_sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()")); + const OUString sFieldData = convertFormula(_sFormula); + static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()")); + static const OUString s_sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()")); sal_Int32 nPageNumberIndex = sFieldData.indexOf(s_sPageNumber); sal_Int32 nPageCountIndex = sFieldData.indexOf(s_sPageCount); bool bRet = nPageNumberIndex != -1 || nPageCountIndex != -1; @@ -1034,7 +1034,7 @@ bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const :: return bRet; } // ----------------------------------------------------------------------------- -void ORptExport::exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const ::rtl::OUString& _sName) +void ORptExport::exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const OUString& _sName) { Reference<XPropertySet> xFind(_xProp); TPropertyStyleMap::iterator aFind = m_aAutoStyleNames.find(xFind); @@ -1078,30 +1078,30 @@ sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDef if ( xGroup->getResetPageNumber() ) AddAttribute(XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER, XML_TRUE ); - const ::rtl::OUString sField = xGroup->getExpression(); - ::rtl::OUString sExpression = sField; + const OUString sField = xGroup->getExpression(); + OUString sExpression = sField; if ( !sExpression.isEmpty() ) { - static ::rtl::OUString s_sQuote(RTL_CONSTASCII_USTRINGPARAM("\"\"")); + static OUString s_sQuote(RTL_CONSTASCII_USTRINGPARAM("\"\"")); sal_Int32 nIndex = sExpression.indexOf('"'); while ( nIndex > -1 ) { sExpression = sExpression.replaceAt(nIndex,1,s_sQuote); nIndex = sExpression.indexOf('"',nIndex+2); } - ::rtl::OUString sFormula(RTL_CONSTASCII_USTRINGPARAM("rpt:HASCHANGED(\"")); + OUString sFormula(RTL_CONSTASCII_USTRINGPARAM("rpt:HASCHANGED(\"")); TGroupFunctionMap::iterator aGroupFind = m_aGroupFunctionMap.find(xGroup); if ( aGroupFind != m_aGroupFunctionMap.end() ) sExpression = aGroupFind->second->getName(); sFormula += sExpression; - sFormula += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\")")); + sFormula += OUString(RTL_CONSTASCII_USTRINGPARAM("\")")); sExpression = sFormula; } AddAttribute(XML_NAMESPACE_REPORT, XML_SORT_EXPRESSION, sField); AddAttribute(XML_NAMESPACE_REPORT, XML_GROUP_EXPRESSION,sExpression); sal_Int16 nRet = xGroup->getKeepTogether(); - ::rtl::OUStringBuffer sValue; + OUStringBuffer sValue; const SvXMLEnumMapEntry* aXML_KeepTogetherEnumMap = OXMLHelper::GetKeepTogetherOptions(); if ( SvXMLUnitConverter::convertEnum( sValue, nRet,aXML_KeepTogetherEnumMap ) ) AddAttribute(XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER,sValue.makeStringAndClear()); @@ -1179,23 +1179,23 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted awt::Size aSize = xFixedLine->getSize(); sal_Int32 nSectionHeight = xFixedLine->getSection()->getHeight(); - ::rtl::OUString sBorderProp; - ::std::vector< ::rtl::OUString> aProps; + OUString sBorderProp; + ::std::vector< OUString> aProps; if ( xFixedLine->getOrientation() == 1 ) // vertical { // check if border should be left if ( !aPos.X ) { sBorderProp = PROPERTY_BORDERLEFT; - aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERRIGHT)); + aProps.push_back(static_cast<const OUString&>(PROPERTY_BORDERRIGHT)); } else { sBorderProp = PROPERTY_BORDERRIGHT; - aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERLEFT)); + aProps.push_back(static_cast<const OUString&>(PROPERTY_BORDERLEFT)); } - aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERTOP)); - aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERBOTTOM)); + aProps.push_back(static_cast<const OUString&>(PROPERTY_BORDERTOP)); + aProps.push_back(static_cast<const OUString&>(PROPERTY_BORDERBOTTOM)); } else // horizontal { @@ -1203,15 +1203,15 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted if ( (aPos.Y + aSize.Height) == nSectionHeight ) { sBorderProp = PROPERTY_BORDERBOTTOM; - aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERTOP)); + aProps.push_back(static_cast<const OUString&>(PROPERTY_BORDERTOP)); } else { sBorderProp = PROPERTY_BORDERTOP; - aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERBOTTOM)); + aProps.push_back(static_cast<const OUString&>(PROPERTY_BORDERBOTTOM)); } - aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERRIGHT)); - aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERLEFT)); + aProps.push_back(static_cast<const OUString&>(PROPERTY_BORDERRIGHT)); + aProps.push_back(static_cast<const OUString&>(PROPERTY_BORDERLEFT)); } xBorderProp->setPropertyValue(sBorderProp,uno::makeAny(aValue)); @@ -1265,16 +1265,16 @@ void ORptExport::exportReportAttributes(const Reference<XReportDefinition>& _xRe { if ( _xReport.is() ) { - ::rtl::OUStringBuffer sValue; + OUStringBuffer sValue; const SvXMLEnumMapEntry* aXML_CommnadTypeEnumMap = OXMLHelper::GetCommandTypeOptions(); if ( SvXMLUnitConverter::convertEnum( sValue, static_cast<sal_uInt16>(_xReport->getCommandType()),aXML_CommnadTypeEnumMap ) ) AddAttribute(XML_NAMESPACE_REPORT, XML_COMMAND_TYPE,sValue.makeStringAndClear()); - ::rtl::OUString sComamnd = _xReport->getCommand(); + OUString sComamnd = _xReport->getCommand(); if ( !sComamnd.isEmpty() ) AddAttribute(XML_NAMESPACE_REPORT, XML_COMMAND, sComamnd); - ::rtl::OUString sFilter( _xReport->getFilter() ); + OUString sFilter( _xReport->getFilter() ); if ( !sFilter.isEmpty() ) AddAttribute( XML_NAMESPACE_REPORT, XML_FILTER, sFilter ); @@ -1284,7 +1284,7 @@ void ORptExport::exportReportAttributes(const Reference<XReportDefinition>& _xRe if ( !bEscapeProcessing ) AddAttribute( XML_NAMESPACE_REPORT, XML_ESCAPE_PROCESSING, ::xmloff::token::GetXMLToken( XML_FALSE ) ); - ::rtl::OUString sName = _xReport->getCaption(); + OUString sName = _xReport->getCaption(); if ( !sName.isEmpty() ) AddAttribute(XML_NAMESPACE_OFFICE, XML_CAPTION,sName); sName = _xReport->getName(); @@ -1381,9 +1381,9 @@ sal_uInt32 ORptExport::exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) return SvXMLExport::exportDoc( eClass ); } // ----------------------------------------------------------------------------- -::rtl::OUString ORptExport::implConvertNumber(sal_Int32 _nValue) +OUString ORptExport::implConvertNumber(sal_Int32 _nValue) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertNumber(aBuffer, _nValue); return aBuffer.makeStringAndClear(); } @@ -1420,10 +1420,10 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor SvXMLElementExport aParagraphContent(*this,XML_NAMESPACE_TEXT, XML_P, sal_False, sal_False); if ( Reference<XFormattedField>(_xReportElement,uno::UNO_QUERY).is() ) { - ::rtl::OUString sFieldData = _xReportElement->getDataField(); - static const ::rtl::OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()")); - static const ::rtl::OUString s_sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()")); - static const ::rtl::OUString s_sReportPrefix("rpt:"); + OUString sFieldData = _xReportElement->getDataField(); + static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()")); + static const OUString s_sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()")); + static const OUString s_sReportPrefix("rpt:"); sFieldData = sFieldData.copy(s_sReportPrefix.getLength(),sFieldData.getLength() - s_sReportPrefix.getLength()); sal_Int32 nPageNumberIndex = sFieldData.indexOf(s_sPageNumber); if ( nPageNumberIndex != -1 ) @@ -1431,21 +1431,21 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor sal_Int32 nIndex = 0; do { - ::rtl::OUString sToken = sFieldData.getToken( 0, '&', nIndex ); + OUString sToken = sFieldData.getToken( 0, '&', nIndex ); sToken = sToken.trim(); if ( !sToken.isEmpty() ) { if ( sToken == s_sPageNumber ) { - static const ::rtl::OUString s_sCurrent("current"); + static const OUString s_sCurrent("current"); AddAttribute(XML_NAMESPACE_TEXT, XML_SELECT_PAGE, s_sCurrent ); SvXMLElementExport aPageNumber(*this,XML_NAMESPACE_TEXT, XML_PAGE_NUMBER, sal_False, sal_False); - Characters(::rtl::OUString("1")); + Characters(OUString("1")); } else if ( sToken == s_sPageCount ) { SvXMLElementExport aPageNumber(*this,XML_NAMESPACE_TEXT, XML_PAGE_COUNT, sal_False, sal_False); - Characters(::rtl::OUString("1")); + Characters(OUString("1")); } else { @@ -1464,7 +1464,7 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor Reference< XFixedText > xFT(_xReportElement,UNO_QUERY); if ( xFT.is() ) { - ::rtl::OUString sExpr = xFT->getLabel(); + OUString sExpr = xFT->getLabel(); bool bPrevCharIsSpace = false; GetTextParagraphExport()->exportText(sExpr,bPrevCharIsSpace); } @@ -1497,7 +1497,7 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<SvXMLElementExport> pSubDocument; SAL_WNODEPRECATED_DECLARATIONS_POP - uno::Reference< frame::XModel> xModel(xShape->getPropertyValue(::rtl::OUString("Model")),uno::UNO_QUERY); + uno::Reference< frame::XModel> xModel(xShape->getPropertyValue(OUString("Model")),uno::UNO_QUERY); if ( xModel.is() ) // special handling for chart object { pSubDocument.reset(new SvXMLElementExport(*this,XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT, sal_False, sal_False)); @@ -1524,62 +1524,62 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG if ( nGroupOn != report::GroupOn::DEFAULT ) { uno::Reference< XFunction> xFunction = xFunctions->createFunction(); - ::rtl::OUString sFunction,sPrefix,sPostfix; - ::rtl::OUString sExpression = xGroup->getExpression(); - ::rtl::OUString sFunctionName; - ::rtl::OUString sInitialFormula; + OUString sFunction,sPrefix,sPostfix; + OUString sExpression = xGroup->getExpression(); + OUString sFunctionName; + OUString sInitialFormula; switch(nGroupOn) { case report::GroupOn::PREFIX_CHARACTERS: - sFunction = ::rtl::OUString("LEFT"); - sPrefix = ::rtl::OUString(";") + ::rtl::OUString::valueOf(xGroup->getGroupInterval()); + sFunction = OUString("LEFT"); + sPrefix = OUString(";") + OUString::valueOf(xGroup->getGroupInterval()); break; case report::GroupOn::YEAR: - sFunction = ::rtl::OUString("YEAR"); + sFunction = OUString("YEAR"); break; case report::GroupOn::QUARTAL: - sFunction = ::rtl::OUString("INT((MONTH"); - sPostfix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-1)/3)+1")); - sFunctionName = ::rtl::OUString("QUARTAL_") + sExpression; + sFunction = OUString("INT((MONTH"); + sPostfix = OUString(RTL_CONSTASCII_USTRINGPARAM("-1)/3)+1")); + sFunctionName = OUString("QUARTAL_") + sExpression; break; case report::GroupOn::MONTH: - sFunction = ::rtl::OUString("MONTH"); + sFunction = OUString("MONTH"); break; case report::GroupOn::WEEK: - sFunction = ::rtl::OUString("WEEK"); + sFunction = OUString("WEEK"); break; case report::GroupOn::DAY: - sFunction = ::rtl::OUString("DAY"); + sFunction = OUString("DAY"); break; case report::GroupOn::HOUR: - sFunction = ::rtl::OUString("HOUR"); + sFunction = OUString("HOUR"); break; case report::GroupOn::MINUTE: - sFunction = ::rtl::OUString("MINUTE"); + sFunction = OUString("MINUTE"); break; case report::GroupOn::INTERVAL: { - sFunction = ::rtl::OUString("INT"); + sFunction = OUString("INT"); uno::Reference< XFunction> xCountFunction = xFunctions->createFunction(); - xCountFunction->setInitialFormula(beans::Optional< ::rtl::OUString>(sal_True,::rtl::OUString("rpt:0"))); - ::rtl::OUString sCountName = sFunction + ::rtl::OUString("_count_") + sExpression; + xCountFunction->setInitialFormula(beans::Optional< OUString>(sal_True,OUString("rpt:0"))); + OUString sCountName = sFunction + OUString("_count_") + sExpression; xCountFunction->setName(sCountName); - xCountFunction->setFormula(::rtl::OUString("rpt:[") + sCountName + ::rtl::OUString("] + 1")); + xCountFunction->setFormula(OUString("rpt:[") + sCountName + OUString("] + 1")); exportFunction(xCountFunction); sExpression = sCountName; // The reference to sCountName in the formula of sFunctionName refers to the *old* value // so we need to expand the the formula of sCountName - sPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" + 1) / ")) + ::rtl::OUString::valueOf(xGroup->getGroupInterval()); - sFunctionName = sFunction + ::rtl::OUString("_") + sExpression; - sFunction = sFunction + ::rtl::OUString("("); - sInitialFormula = ::rtl::OUString("rpt:0"); + sPrefix = OUString(RTL_CONSTASCII_USTRINGPARAM(" + 1) / ")) + OUString::valueOf(xGroup->getGroupInterval()); + sFunctionName = sFunction + OUString("_") + sExpression; + sFunction = sFunction + OUString("("); + sInitialFormula = OUString("rpt:0"); } break; default: ; } if ( sFunctionName.isEmpty() ) - sFunctionName = sFunction + ::rtl::OUString("_") + sExpression; + sFunctionName = sFunction + OUString("_") + sExpression; if ( !sFunction.isEmpty() ) { sal_Unicode pReplaceChars[] = { '(',')',';',',','+','-','[',']','/','*'}; @@ -1588,15 +1588,15 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG xFunction->setName(sFunctionName); if ( !sInitialFormula.isEmpty() ) - xFunction->setInitialFormula(beans::Optional< ::rtl::OUString>(sal_True, sInitialFormula)); - sFunction = ::rtl::OUString("rpt:") + sFunction; - sFunction += ::rtl::OUString("(["); + xFunction->setInitialFormula(beans::Optional< OUString>(sal_True, sInitialFormula)); + sFunction = OUString("rpt:") + sFunction; + sFunction += OUString("(["); sFunction += sExpression; - sFunction += ::rtl::OUString("]"); + sFunction += OUString("]"); if ( !sPrefix.isEmpty() ) sFunction += sPrefix; - sFunction += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sFunction += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); if ( !sPostfix.isEmpty() ) sFunction += sPostfix; xFunction->setFormula(sFunction); diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx index 8e048cc5d94b..d5f23258eff6 100644 --- a/reportdesign/source/filter/xml/xmlExport.hxx +++ b/reportdesign/source/filter/xml/xmlExport.hxx @@ -95,16 +95,16 @@ public: ,bSet(true) {} }; - typedef ::std::pair< ::rtl::OUString ,::rtl::OUString> TStringPair; + typedef ::std::pair< OUString ,OUString> TStringPair; typedef struct { - ::rtl::OUString sText; - ::rtl::OUString sField; - ::rtl::OUString sDecimal; - ::rtl::OUString sThousand; + OUString sText; + OUString sField; + OUString sDecimal; + OUString sThousand; } TDelimiter; - typedef ::std::vector< ::rtl::OUString> TStringVec; - typedef ::std::map< Reference<XPropertySet> ,::rtl::OUString > TPropertyStyleMap; + typedef ::std::vector< OUString> TStringVec; + typedef ::std::map< Reference<XPropertySet> ,OUString > TPropertyStyleMap; typedef ::std::map< Reference<XPropertySet> , TStringVec> TGridStyleMap; typedef ::std::vector< TCell > TRow; typedef ::std::vector< ::std::pair< sal_Bool, TRow > > TGrid; @@ -121,10 +121,10 @@ private: TGridStyleMap m_aRowStyleNames; TGroupFunctionMap m_aGroupFunctionMap; - ::rtl::OUString m_sCharSet; - ::rtl::OUString m_sTableStyle; - ::rtl::OUString m_sCellStyle; - ::rtl::OUString m_sColumnStyle; + OUString m_sCharSet; + OUString m_sTableStyle; + OUString m_sCellStyle; + OUString m_sColumnStyle; Any m_aPreviewMode; UniReference < SvXMLExportPropertyMapper> m_xExportHelper; UniReference < SvXMLExportPropertyMapper> m_xSectionPropMapper; @@ -148,7 +148,7 @@ private: void exportMasterDetailFields(const Reference<XReportComponent>& _xReportComponet); void exportComponent(const Reference<XReportComponent>& _xReportComponent); sal_Bool exportGroup(const Reference<XReportDefinition>& _xReportDefinition,sal_Int32 _nPos,sal_Bool _bExportAutoStyle = sal_False); - void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const ::rtl::OUString& _sName); + void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const OUString& _sName); void exportSection(const Reference<XSection>& _xProp,bool bHeader = false); void exportContainer(const Reference< XSection>& _xSection); void exportShapes(const Reference< XSection>& _xSection,bool _bAddParagraph = true); @@ -162,11 +162,11 @@ private: void collectComponentStyles(); void collectStyleNames(sal_Int32 _nFamily,const ::std::vector< sal_Int32>& _aSize, ORptExport::TStringVec& _rStyleNames); void exportParagraph(const Reference< XReportControlModel >& _xReportElement); - bool exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const ::rtl::OUString& _sFormula); + bool exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const OUString& _sFormula); void exportGroupsExpressionAsFunction(const Reference< XGroups>& _xGroups); - ::rtl::OUString convertFormula(const ::rtl::OUString& _sFormula); + OUString convertFormula(const OUString& _sFormula); - ::rtl::OUString implConvertNumber(sal_Int32 _nValue); + OUString implConvertNumber(sal_Int32 _nValue); private: ORptExport(); @@ -187,12 +187,12 @@ public: ORptExport(const Reference< XComponentContext >& _rxContext, sal_uInt16 nExportFlag = (EXPORT_CONTENT | EXPORT_AUTOSTYLES | EXPORT_FONTDECLS)); // XServiceInfo - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); @@ -211,8 +211,8 @@ public: class ORptExportHelper { public: - static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); - static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); + static Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); }; @@ -224,8 +224,8 @@ public: class ORptContentExportHelper { public: - static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); - static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); + static Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); }; @@ -237,8 +237,8 @@ public: class ORptStylesExportHelper { public: - static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); - static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); + static Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); }; @@ -250,8 +250,8 @@ public: class ORptMetaExportHelper { public: - static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); - static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); + static Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); }; @@ -262,8 +262,8 @@ public: class ODBFullExportHelper { public: - static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); - static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); + static Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); }; diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index b32245c1931e..a990058c3799 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -43,14 +43,14 @@ void lcl_exportPrettyPrinting(const uno::Reference< xml::sax::XDocumentHandler > SvtSaveOptions aSaveOpt; if ( aSaveOpt.IsPrettyPrinting() ) { - static const ::rtl::OUString s_sWhitespaces(" "); + static const OUString s_sWhitespaces(" "); _xDelegatee->ignorableWhitespace(s_sWhitespaces); } } -::rtl::OUString lcl_createAttribute(const xmloff::token::XMLTokenEnum& _eNamespace,const xmloff::token::XMLTokenEnum& _eAttribute) +OUString lcl_createAttribute(const xmloff::token::XMLTokenEnum& _eNamespace,const xmloff::token::XMLTokenEnum& _eAttribute) { - ::rtl::OUStringBuffer sQName; + OUStringBuffer sQName; // ...if it's in our map, make the prefix sQName.append ( xmloff::token::GetXMLToken(_eNamespace) ); sQName.append ( sal_Unicode(':') ); @@ -58,15 +58,15 @@ void lcl_exportPrettyPrinting(const uno::Reference< xml::sax::XDocumentHandler > return sQName.makeStringAndClear(); } -void lcl_correctCellAddress(const ::rtl::OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs) +void lcl_correctCellAddress(const OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs) { SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs); - ::rtl::OUString sCellAddress = pList->getValueByName(_sName); + OUString sCellAddress = pList->getValueByName(_sName); const sal_Int32 nPos = sCellAddress.lastIndexOf('$'); if ( nPos != -1 ) { sCellAddress = sCellAddress.copy(0,nPos); - sCellAddress += ::rtl::OUString("$65535"); + sCellAddress += OUString("$65535"); pList->RemoveAttribute(_sName); pList->AddAttribute(_sName,sCellAddress); } @@ -94,37 +94,37 @@ ExportDocumentHandler::~ExportDocumentHandler() IMPLEMENT_GET_IMPLEMENTATION_ID(ExportDocumentHandler) IMPLEMENT_FORWARD_REFCOUNT( ExportDocumentHandler, ExportDocumentHandler_BASE ) //------------------------------------------------------------------------ -::rtl::OUString SAL_CALL ExportDocumentHandler::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL ExportDocumentHandler::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------ -sal_Bool SAL_CALL ExportDocumentHandler::supportsService( const ::rtl::OUString& ServiceName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL ExportDocumentHandler::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_static()); } //------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL ExportDocumentHandler::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL ExportDocumentHandler::getSupportedServiceNames( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSupported; + uno::Sequence< OUString > aSupported; if ( m_xServiceInfo.is() ) aSupported = m_xServiceInfo->getSupportedServiceNames(); return ::comphelper::concatSequences(getSupportedServiceNames_static(),aSupported); } //------------------------------------------------------------------------ -::rtl::OUString ExportDocumentHandler::getImplementationName_Static( ) throw(uno::RuntimeException) +OUString ExportDocumentHandler::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.ExportDocumentHandler"); + return OUString("com.sun.star.comp.report.ExportDocumentHandler"); } //------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > ExportDocumentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) +uno::Sequence< OUString > ExportDocumentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.report.ExportDocumentHandler"); + uno::Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.report.ExportDocumentHandler"); return aSupported; } @@ -144,14 +144,14 @@ void SAL_CALL ExportDocumentHandler::endDocument() throw (uno::RuntimeException, m_xDelegatee->endDocument(); } -void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs) throw (uno::RuntimeException, xml::sax::SAXException) +void SAL_CALL ExportDocumentHandler::startElement(const OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs) throw (uno::RuntimeException, xml::sax::SAXException) { bool bExport = true; if ( _sName == "office:chart" ) { SvXMLAttributeList* pList = new SvXMLAttributeList(); uno::Reference< xml::sax::XAttributeList > xNewAttribs = pList; - ::rtl::OUStringBuffer sValue; + OUStringBuffer sValue; static SvXMLEnumMapEntry aXML_CommnadTypeEnumMap[] = { { XML_TABLE, sdb::CommandType::TABLE }, @@ -162,11 +162,11 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName { pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_COMMAND_TYPE),sValue.makeStringAndClear()); } - const ::rtl::OUString sComamnd = m_xDatabaseDataProvider->getCommand(); + const OUString sComamnd = m_xDatabaseDataProvider->getCommand(); if ( !sComamnd.isEmpty() ) pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_COMMAND),sComamnd); - const ::rtl::OUString sFilter( m_xDatabaseDataProvider->getFilter() ); + const OUString sFilter( m_xDatabaseDataProvider->getFilter() ); if ( !sFilter.isEmpty() ) pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_FILTER),sFilter); @@ -178,13 +178,13 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName m_xDelegatee->startElement(lcl_createAttribute(XML_NP_OFFICE,XML_REPORT),xNewAttribs); - const ::rtl::OUString sTableCalc = lcl_createAttribute(XML_NP_TABLE,XML_CALCULATION_SETTINGS); + const OUString sTableCalc = lcl_createAttribute(XML_NP_TABLE,XML_CALCULATION_SETTINGS); m_xDelegatee->startElement(sTableCalc,NULL); pList = new SvXMLAttributeList(); uno::Reference< xml::sax::XAttributeList > xNullAttr = pList; - pList->AddAttribute(lcl_createAttribute(XML_NP_TABLE,XML_DATE_VALUE),::rtl::OUString("1900-01-01")); + pList->AddAttribute(lcl_createAttribute(XML_NP_TABLE,XML_DATE_VALUE),OUString("1900-01-01")); - const ::rtl::OUString sNullDate = lcl_createAttribute(XML_NP_TABLE,XML_NULL_DATE); + const OUString sNullDate = lcl_createAttribute(XML_NP_TABLE,XML_NULL_DATE); m_xDelegatee->startElement(sNullDate,xNullAttr); m_xDelegatee->endElement(sNullDate); m_xDelegatee->endElement(sTableCalc); @@ -216,22 +216,22 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName else if ( _sName == "chart:plot-area" ) { SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs); - pList->RemoveAttribute(::rtl::OUString("table:cell-range-address")); + pList->RemoveAttribute(OUString("table:cell-range-address")); } else if ( _sName == "chart:categories" ) { - static ::rtl::OUString s_sCellAddress(lcl_createAttribute(XML_NP_TABLE,XML_CELL_RANGE_ADDRESS)); + static OUString s_sCellAddress(lcl_createAttribute(XML_NP_TABLE,XML_CELL_RANGE_ADDRESS)); lcl_correctCellAddress(s_sCellAddress,xAttribs); } else if ( _sName == "chart:series" ) { - static ::rtl::OUString s_sCellAddress(lcl_createAttribute(XML_NP_CHART,XML_VALUES_CELL_RANGE_ADDRESS)); + static OUString s_sCellAddress(lcl_createAttribute(XML_NP_CHART,XML_VALUES_CELL_RANGE_ADDRESS)); lcl_correctCellAddress(s_sCellAddress,xAttribs); } else if ( m_bTableRowsStarted && !m_bFirstRowExported && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell")) ) { SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs); - static ::rtl::OUString s_sValue(lcl_createAttribute(XML_NP_OFFICE,XML_VALUE)); + static OUString s_sValue(lcl_createAttribute(XML_NP_OFFICE,XML_VALUE)); pList->RemoveAttribute(s_sValue); } else if ( m_bTableRowsStarted && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text:p")) ) @@ -242,10 +242,10 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName m_xDelegatee->startElement(_sName,xAttribs); } // ----------------------------------------------------------------------------- -void SAL_CALL ExportDocumentHandler::endElement(const ::rtl::OUString & _sName) throw (uno::RuntimeException, xml::sax::SAXException) +void SAL_CALL ExportDocumentHandler::endElement(const OUString & _sName) throw (uno::RuntimeException, xml::sax::SAXException) { bool bExport = true; - ::rtl::OUString sNewName = _sName; + OUString sNewName = _sName; if ( _sName == "office:chart" ) { sNewName = lcl_createAttribute(XML_NP_OFFICE,XML_REPORT); @@ -275,7 +275,7 @@ void SAL_CALL ExportDocumentHandler::endElement(const ::rtl::OUString & _sName) m_xDelegatee->endElement(sNewName); } -void SAL_CALL ExportDocumentHandler::characters(const ::rtl::OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException) +void SAL_CALL ExportDocumentHandler::characters(const OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException) { if ( !(m_bTableRowsStarted || m_bFirstRowExported) ) { @@ -283,17 +283,17 @@ void SAL_CALL ExportDocumentHandler::characters(const ::rtl::OUString & aChars) } else if ( m_bExportChar ) { - static const ::rtl::OUString s_sZero("0"); + static const OUString s_sZero("0"); m_xDelegatee->characters(s_sZero); } } -void SAL_CALL ExportDocumentHandler::ignorableWhitespace(const ::rtl::OUString & aWhitespaces) throw (uno::RuntimeException, xml::sax::SAXException) +void SAL_CALL ExportDocumentHandler::ignorableWhitespace(const OUString & aWhitespaces) throw (uno::RuntimeException, xml::sax::SAXException) { m_xDelegatee->ignorableWhitespace(aWhitespaces); } -void SAL_CALL ExportDocumentHandler::processingInstruction(const ::rtl::OUString & aTarget, const ::rtl::OUString & aData) throw (uno::RuntimeException, xml::sax::SAXException) +void SAL_CALL ExportDocumentHandler::processingInstruction(const OUString & aTarget, const OUString & aData) throw (uno::RuntimeException, xml::sax::SAXException) { m_xDelegatee->processingInstruction(aTarget,aData); } @@ -306,8 +306,8 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any > { ::osl::MutexGuard aGuard(m_aMutex); comphelper::SequenceAsHashMap aArgs(_aArguments); - m_xDelegatee = aArgs.getUnpackedValueOrDefault(::rtl::OUString("DocumentHandler"),m_xDelegatee); - m_xModel = aArgs.getUnpackedValueOrDefault(::rtl::OUString("Model"),m_xModel); + m_xDelegatee = aArgs.getUnpackedValueOrDefault(OUString("DocumentHandler"),m_xDelegatee); + m_xModel = aArgs.getUnpackedValueOrDefault(OUString("Model"),m_xModel); OSL_ENSURE(m_xDelegatee.is(),"No document handler avialable!"); if ( !m_xDelegatee.is() || !m_xModel.is() ) @@ -325,7 +325,7 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any > // set ourself as delegator m_xProxy->setDelegator( *this ); - const ::rtl::OUString sCommand = m_xDatabaseDataProvider->getCommand(); + const OUString sCommand = m_xDatabaseDataProvider->getCommand(); if ( !sCommand.isEmpty() ) m_aColumns = ::dbtools::getFieldNamesByCommandDescriptor(m_xDatabaseDataProvider->getActiveConnection() ,m_xDatabaseDataProvider->getCommandType() @@ -335,7 +335,7 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any > if ( xDataProvider.is() ) { m_aColumns.realloc(1); - uno::Sequence< ::rtl::OUString > aColumnNames = xDataProvider->getColumnDescriptions(); + uno::Sequence< OUString > aColumnNames = xDataProvider->getColumnDescriptions(); for(sal_Int32 i = 0 ; i < aColumnNames.getLength();++i) { if ( !aColumnNames[i].isEmpty() ) @@ -366,28 +366,28 @@ uno::Sequence< uno::Type > SAL_CALL ExportDocumentHandler::getTypes( ) throw (u // ----------------------------------------------------------------------------- void ExportDocumentHandler::exportTableRows() { - const ::rtl::OUString sRow( lcl_createAttribute(XML_NP_TABLE, XML_TABLE_ROW) ); + const OUString sRow( lcl_createAttribute(XML_NP_TABLE, XML_TABLE_ROW) ); m_xDelegatee->startElement(sRow,NULL); - const ::rtl::OUString sValueType( lcl_createAttribute(XML_NP_OFFICE, XML_VALUE_TYPE) ); + const OUString sValueType( lcl_createAttribute(XML_NP_OFFICE, XML_VALUE_TYPE) ); - const static ::rtl::OUString s_sFieldPrefix("field:["); - const static ::rtl::OUString s_sFieldPostfix("]"); - const ::rtl::OUString sCell( lcl_createAttribute(XML_NP_TABLE, XML_TABLE_CELL) ); - const ::rtl::OUString sP( lcl_createAttribute(XML_NP_TEXT, XML_P) ); - const ::rtl::OUString sFtext(lcl_createAttribute(XML_NP_RPT,XML_FORMATTED_TEXT) ); - const ::rtl::OUString sRElement(lcl_createAttribute(XML_NP_RPT,XML_REPORT_ELEMENT) ); - const ::rtl::OUString sRComponent( lcl_createAttribute(XML_NP_RPT,XML_REPORT_COMPONENT) ) ; - const ::rtl::OUString sFormulaAttrib( lcl_createAttribute(XML_NP_RPT,XML_FORMULA) ); - const static ::rtl::OUString s_sString("string"); - const static ::rtl::OUString s_sFloat("float"); + const static OUString s_sFieldPrefix("field:["); + const static OUString s_sFieldPostfix("]"); + const OUString sCell( lcl_createAttribute(XML_NP_TABLE, XML_TABLE_CELL) ); + const OUString sP( lcl_createAttribute(XML_NP_TEXT, XML_P) ); + const OUString sFtext(lcl_createAttribute(XML_NP_RPT,XML_FORMATTED_TEXT) ); + const OUString sRElement(lcl_createAttribute(XML_NP_RPT,XML_REPORT_ELEMENT) ); + const OUString sRComponent( lcl_createAttribute(XML_NP_RPT,XML_REPORT_COMPONENT) ) ; + const OUString sFormulaAttrib( lcl_createAttribute(XML_NP_RPT,XML_FORMULA) ); + const static OUString s_sString("string"); + const static OUString s_sFloat("float"); SvXMLAttributeList* pCellAtt = new SvXMLAttributeList(); uno::Reference< xml::sax::XAttributeList > xCellAtt = pCellAtt; pCellAtt->AddAttribute(sValueType,s_sString); bool bRemoveString = true; - ::rtl::OUString sFormula; + OUString sFormula; const sal_Int32 nCount = m_aColumns.getLength(); if ( m_nColumnCount > nCount ) { diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx index eb39242a3072..9a079697307b 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx @@ -40,8 +40,8 @@ class ExportDocumentHandler : public ExportDocumentHandler_BASE { public: // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); public: @@ -49,9 +49,9 @@ public: private: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); DECLARE_XINTERFACE( ) DECLARE_XTYPEPROVIDER( ) @@ -59,11 +59,11 @@ private: // ::com::sun::star::xml::sax::XDocumentHandler: virtual void SAL_CALL startDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); virtual void SAL_CALL endDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); - virtual void SAL_CALL startElement(const ::rtl::OUString & aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); - virtual void SAL_CALL endElement(const ::rtl::OUString & aName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); - virtual void SAL_CALL characters(const ::rtl::OUString & aChars) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); - virtual void SAL_CALL ignorableWhitespace(const ::rtl::OUString & aWhitespaces) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); - virtual void SAL_CALL processingInstruction(const ::rtl::OUString & aTarget, const ::rtl::OUString & aData) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); + virtual void SAL_CALL startElement(const OUString & aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); + virtual void SAL_CALL endElement(const OUString & aName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); + virtual void SAL_CALL characters(const OUString & aChars) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); + virtual void SAL_CALL ignorableWhitespace(const OUString & aWhitespaces) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); + virtual void SAL_CALL processingInstruction(const OUString & aTarget, const OUString & aData) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -83,7 +83,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > m_xServiceInfo; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xModel; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDatabaseDataProvider > m_xDatabaseDataProvider; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aColumns; + ::com::sun::star::uno::Sequence< OUString > m_aColumns; sal_Int32 m_nCurrentCellIndex; sal_Int32 m_nColumnCount; bool m_bTableRowsStarted; diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index a62125b682cf..2a89840d0a7b 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -47,7 +47,7 @@ public: SvXMLImport& rImport, OXMLFixedContent* _pFixedContent, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, sal_Unicode c, sal_Bool bCount ); @@ -55,18 +55,18 @@ public: SvXMLImport& rImport, OXMLFixedContent* _pFixedContent, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, sal_Int16 nControl ); virtual void InsertControlCharacter(sal_Int16 _nControl); - virtual void InsertString(const ::rtl::OUString& _sString); + virtual void InsertString(const OUString& _sString); }; OXMLCharContent::OXMLCharContent( SvXMLImport& rImport, OXMLFixedContent* _pFixedContent, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, sal_Unicode c, sal_Bool bCount ) @@ -79,7 +79,7 @@ OXMLCharContent::OXMLCharContent( SvXMLImport& rImport, OXMLFixedContent* _pFixedContent, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, sal_Int16 nControl ) : XMLCharContext(rImport,nPrfx,rLName,xAttrList,nControl) @@ -92,7 +92,7 @@ void OXMLCharContent::InsertControlCharacter(sal_Int16 _nControl) switch( _nControl ) { case ControlCharacter::LINE_BREAK: - m_pFixedContent->Characters(::rtl::OUString("\n")); + m_pFixedContent->Characters(OUString("\n")); break; default: OSL_FAIL("Not supported control character"); @@ -100,7 +100,7 @@ void OXMLCharContent::InsertControlCharacter(sal_Int16 _nControl) } } // ----------------------------------------------------------------------------- -void OXMLCharContent::InsertString(const ::rtl::OUString& _sString) +void OXMLCharContent::InsertString(const OUString& _sString) { m_pFixedContent->Characters(_sString); } @@ -109,7 +109,7 @@ void OXMLCharContent::InsertString(const ::rtl::OUString& _sString) DBG_NAME( rpt_OXMLFixedContent ) OXMLFixedContent::OXMLFixedContent( ORptFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& rLName + sal_uInt16 nPrfx, const OUString& rLName ,OXMLCell& _rCell ,OXMLTable* _pContainer ,OXMLFixedContent* _pInP) : @@ -131,14 +131,14 @@ OXMLFixedContent::~OXMLFixedContent() // ----------------------------------------------------------------------------- SvXMLImportContext* OXMLFixedContent::_CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = OXMLReportElementBase::_CreateChildContext(nPrefix,rLocalName,xAttrList); if ( pContext ) return pContext; - static const ::rtl::OUString s_sStringConcat(" & "); + static const OUString s_sStringConcat(" & "); const SvXMLTokenMap& rTokenMap = m_rImport.GetCellElemTokenMap(); Reference<XComponentContext> xContext = m_rImport.GetComponentContext(); @@ -167,11 +167,11 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext( 0x0020, sal_True ); break; case XML_TOK_PAGE_NUMBER: - m_sPageText += s_sStringConcat + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" PageNumber()")); + m_sPageText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageNumber()")); m_bFormattedField = true; break; case XML_TOK_PAGE_COUNT: - m_sPageText += s_sStringConcat + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" PageCount()")); + m_sPageText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageCount()")); m_bFormattedField = true; break; default: @@ -189,7 +189,7 @@ void OXMLFixedContent::EndElement() { uno::Reference< uno::XInterface> xInt = xFactor->createInstance(SERVICE_FORMATTEDFIELD); Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY); - xControl->setDataField(::rtl::OUString("rpt:") + m_sPageText); + xControl->setDataField(OUString("rpt:") + m_sPageText); OSL_ENSURE(xControl.is(),"Could not create FormattedField!"); m_pInP->m_xComponent = xControl.get(); m_xComponent = xControl.get(); @@ -210,15 +210,15 @@ void OXMLFixedContent::EndElement() } } // ----------------------------------------------------------------------------- -void OXMLFixedContent::Characters( const ::rtl::OUString& rChars ) +void OXMLFixedContent::Characters( const OUString& rChars ) { m_sLabel += rChars; if ( !rChars.isEmpty() ) { - static const ::rtl::OUString s_Quote(RTL_CONSTASCII_USTRINGPARAM("\"")); + static const OUString s_Quote(RTL_CONSTASCII_USTRINGPARAM("\"")); if ( !m_sPageText.isEmpty() ) { - static const ::rtl::OUString s_sStringConcat(" & "); + static const OUString s_sStringConcat(" & "); m_sPageText += s_sStringConcat; } diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx b/reportdesign/source/filter/xml/xmlFixedContent.hxx index f6076e9d658d..04e8ae4b1ab0 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.hxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.hxx @@ -29,15 +29,15 @@ namespace rptxml class OXMLCell; class OXMLFixedContent : public OXMLReportElementBase { - ::rtl::OUString m_sPageText; // page count and page number - ::rtl::OUString m_sLabel; + OUString m_sPageText; // page count and page number + OUString m_sLabel; OXMLCell& m_rCell; OXMLFixedContent* m_pInP; // if set than we are in text-p element bool m_bFormattedField; protected: virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); private: OXMLFixedContent(const OXMLFixedContent&); @@ -45,7 +45,7 @@ namespace rptxml public: OXMLFixedContent( ORptFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName + const OUString& rLName ,OXMLCell& _rCell ,OXMLTable* _pContainer ,OXMLFixedContent* _pInP = NULL); @@ -53,7 +53,7 @@ namespace rptxml // This method is called for all characters that are contained in the // current element. The default is to ignore them. - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); }; diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx index 612fda8cd41c..e50edf70fb8c 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx @@ -44,7 +44,7 @@ namespace rptxml DBG_NAME( rpt_OXMLFormatCondition ) OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList > & _xAttrList ,const Reference< XFormatCondition > & _xComponent ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -56,16 +56,16 @@ OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport, OSL_ENSURE(m_xComponent.is(),"Component is NULL!"); const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap(); const SvXMLTokenMap& rTokenMap = rImport.GetFormatElemTokenMap(); - static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); + static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; try { for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.hxx b/reportdesign/source/filter/xml/xmlFormatCondition.hxx index a25bd6022de6..93e0c79f81ba 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.hxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.hxx @@ -28,14 +28,14 @@ namespace rptxml class OXMLFormatCondition : public SvXMLImportContext { ORptFilter& m_rImport; - ::rtl::OUString m_sStyleName; + OUString m_sStyleName; ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition > m_xComponent; OXMLFormatCondition(const OXMLFormatCondition&); void operator =(const OXMLFormatCondition&); public: OXMLFormatCondition( ORptFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition >& _xComponent ); diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx index 503c27aeebae..7e074d05c0e5 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.cxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx @@ -37,7 +37,7 @@ namespace rptxml DBG_NAME( rpt_OXMLFormattedField ) OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& rLName + sal_uInt16 nPrfx, const OUString& rLName ,const uno::Reference< xml::sax::XAttributeList > & _xAttrList ,const uno::Reference< XFormattedField > & _xComponent ,OXMLTable* _pContainer @@ -54,10 +54,10 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport, { for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -66,7 +66,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport, break; case XML_TOK_SELECT_PAGE: { - static const ::rtl::OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("rpt:PageNumber()")); + static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("rpt:PageNumber()")); _xComponent->setDataField(s_sPageNumber); } break; @@ -76,7 +76,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport, } if ( _bPageCount ) { - static const ::rtl::OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("rpt:PageCount()")); + static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("rpt:PageCount()")); _xComponent->setDataField(s_sPageNumber); } } diff --git a/reportdesign/source/filter/xml/xmlFormattedField.hxx b/reportdesign/source/filter/xml/xmlFormattedField.hxx index 26def541a358..6298d3d70396 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.hxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.hxx @@ -33,7 +33,7 @@ namespace rptxml OXMLFormattedField( ORptFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormattedField >& _xComponent ,OXMLTable* _pContainer diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx index 9b1ddfe6f7b8..923847f6cbfb 100644 --- a/reportdesign/source/filter/xml/xmlFunction.cxx +++ b/reportdesign/source/filter/xml/xmlFunction.cxx @@ -37,7 +37,7 @@ DBG_NAME( rpt_OXMLFunction ) OXMLFunction::OXMLFunction( ORptFilter& _rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,const Reference< XFunctionsSupplier >& _xFunctions ,bool _bAddToReport @@ -57,13 +57,13 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport const SvXMLTokenMap& rTokenMap = _rImport.GetFunctionElemTokenMap(); const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; - static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); + static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); try { @@ -80,7 +80,7 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport break; case XML_TOK_INITIAL_FORMULA: if ( !sValue.isEmpty() ) - m_xFunction->setInitialFormula(beans::Optional< ::rtl::OUString>(sal_True,ORptFilter::convertFormula(sValue))); + m_xFunction->setInitialFormula(beans::Optional< OUString>(sal_True,ORptFilter::convertFormula(sValue))); break; case XML_TOK_DEEP_TRAVERSING: m_xFunction->setDeepTraversing(sValue == s_sTRUE); diff --git a/reportdesign/source/filter/xml/xmlFunction.hxx b/reportdesign/source/filter/xml/xmlFunction.hxx index c90b37a77dc0..1319b241be6a 100644 --- a/reportdesign/source/filter/xml/xmlFunction.hxx +++ b/reportdesign/source/filter/xml/xmlFunction.hxx @@ -43,7 +43,7 @@ namespace rptxml OXMLFunction( ORptFilter& rImport , sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier >& _xFunctions ,bool _bAddToReport = false diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx index 240a03830c16..9a521952b0c5 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -39,7 +39,7 @@ namespace rptxml using namespace ::com::sun::star::report; using namespace ::com::sun::star::xml::sax; - sal_uInt16 lcl_getKeepTogetherOption(const ::rtl::OUString& _sValue) + sal_uInt16 lcl_getKeepTogetherOption(const OUString& _sValue) { sal_uInt16 nRet = report::KeepTogether::NO; const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetKeepTogetherOptions(); @@ -50,7 +50,7 @@ DBG_NAME( rpt_OXMLGroup ) OXMLGroup::OXMLGroup( ORptFilter& _rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ) : SvXMLImportContext( _rImport, nPrfx, _sLocalName ) @@ -67,13 +67,13 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport const SvXMLTokenMap& rTokenMap = _rImport.GetGroupElemTokenMap(); m_xGroup->setSortAscending(sal_False);// the default value has to be set const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; - static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); + static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - const ::rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - ::rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + OUString sValue = _xAttrList->getValueByIndex( i ); try { @@ -94,15 +94,15 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport if ( nLen ) { - const static ::rtl::OUString s_sChanged(RTL_CONSTASCII_USTRINGPARAM("rpt:HASCHANGED(\"")); + const static OUString s_sChanged(RTL_CONSTASCII_USTRINGPARAM("rpt:HASCHANGED(\"")); sal_Int32 nPos = sValue.indexOf(s_sChanged); if ( nPos == -1 ) nPos = 5; else { nPos = s_sChanged.getLength(); - static ::rtl::OUString s_sQuote(RTL_CONSTASCII_USTRINGPARAM("\"\"")); - static ::rtl::OUString s_sSingleQuote(RTL_CONSTASCII_USTRINGPARAM("\"")); + static OUString s_sQuote(RTL_CONSTASCII_USTRINGPARAM("\"\"")); + static OUString s_sSingleQuote(RTL_CONSTASCII_USTRINGPARAM("\"")); sal_Int32 nIndex = sValue.indexOf(s_sQuote,nPos); while ( nIndex > -1 ) { @@ -117,49 +117,49 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport if ( aFind != aFunctions.end() ) { sal_Int32 nIndex = 0; - const ::rtl::OUString sCompleteFormula = aFind->second->getFormula(); - ::rtl::OUString sExpression = sCompleteFormula.getToken(1,'[',nIndex); + const OUString sCompleteFormula = aFind->second->getFormula(); + OUString sExpression = sCompleteFormula.getToken(1,'[',nIndex); nIndex = 0; sExpression = sExpression.getToken(0,']',nIndex); nIndex = 0; - const ::rtl::OUString sFormula = sCompleteFormula.getToken(0,'(',nIndex); + const OUString sFormula = sCompleteFormula.getToken(0,'(',nIndex); ::sal_Int16 nGroupOn = report::GroupOn::DEFAULT; - if ( sFormula ==::rtl::OUString("rpt:LEFT")) + if ( sFormula ==OUString("rpt:LEFT")) { nGroupOn = report::GroupOn::PREFIX_CHARACTERS; - ::rtl::OUString sInterval = sCompleteFormula.getToken(1,';',nIndex); + OUString sInterval = sCompleteFormula.getToken(1,';',nIndex); nIndex = 0; sInterval = sInterval.getToken(0,')',nIndex); m_xGroup->setGroupInterval(sInterval.toInt32()); } - else if ( sFormula == ::rtl::OUString("rpt:YEAR")) + else if ( sFormula == OUString("rpt:YEAR")) nGroupOn = report::GroupOn::YEAR; - else if ( sFormula == ::rtl::OUString("rpt:MONTH")) + else if ( sFormula == OUString("rpt:MONTH")) { nGroupOn = report::GroupOn::MONTH; } - else if ( sCompleteFormula.matchIgnoreAsciiCase(::rtl::OUString("rpt:INT((MONTH"),0) + else if ( sCompleteFormula.matchIgnoreAsciiCase(OUString("rpt:INT((MONTH"),0) && sCompleteFormula.endsWithIgnoreAsciiCaseAsciiL("-1)/3)+1",8) ) { nGroupOn = report::GroupOn::QUARTAL; } - else if ( sFormula ==::rtl::OUString("rpt:WEEK")) + else if ( sFormula ==OUString("rpt:WEEK")) nGroupOn = report::GroupOn::WEEK; - else if ( sFormula ==::rtl::OUString("rpt:DAY")) + else if ( sFormula ==OUString("rpt:DAY")) nGroupOn = report::GroupOn::DAY; - else if ( sFormula ==::rtl::OUString("rpt:HOUR")) + else if ( sFormula ==OUString("rpt:HOUR")) nGroupOn = report::GroupOn::HOUR; - else if ( sFormula ==::rtl::OUString("rpt:MINUTE")) + else if ( sFormula ==OUString("rpt:MINUTE")) nGroupOn = report::GroupOn::MINUTE; - else if ( sFormula ==::rtl::OUString("rpt:INT")) + else if ( sFormula ==OUString("rpt:INT")) { nGroupOn = report::GroupOn::INTERVAL; _rImport.removeFunction(sExpression); - sExpression = sExpression.copy(::rtl::OUString("INT_count_").getLength()); + sExpression = sExpression.copy(OUString("INT_count_").getLength()); nIndex = 0; - ::rtl::OUString sInterval = sCompleteFormula.getToken(1,'/',nIndex); + OUString sInterval = sCompleteFormula.getToken(1,'/',nIndex); nIndex = 0; sInterval = sInterval.getToken(0,')',nIndex); m_xGroup->setGroupInterval(sInterval.toInt32()); @@ -197,7 +197,7 @@ OXMLGroup::~OXMLGroup() // ----------------------------------------------------------------------------- SvXMLImportContext* OXMLGroup::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/reportdesign/source/filter/xml/xmlGroup.hxx b/reportdesign/source/filter/xml/xmlGroup.hxx index 9fe76b18cf9b..869d9d02b7b6 100644 --- a/reportdesign/source/filter/xml/xmlGroup.hxx +++ b/reportdesign/source/filter/xml/xmlGroup.hxx @@ -40,13 +40,13 @@ namespace rptxml OXMLGroup( ORptFilter& rImport , sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual ~OXMLGroup(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index 1aec99ae2cb6..8cfd55e11cd0 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -251,7 +251,7 @@ const SvXMLEnumMapEntry* OXMLHelper::GetCommandTypeOptions() #define PROPERTY_ID_FONTKERNING 14 #define PROPERTY_ID_FONTWORDLINEMODE 15 #define PROPERTY_ID_FONTTYPE 16 -void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sStyleName,const SvXMLStylesContext* _pAutoStyles,const uno::Reference<beans::XPropertySet>& _xProp) +void OXMLHelper::copyStyleElements(const bool _bOld,const OUString& _sStyleName,const SvXMLStylesContext* _pAutoStyles,const uno::Reference<beans::XPropertySet>& _xProp) { if ( !_xProp.is() || _sStyleName.isEmpty() || !_pAutoStyles ) return; diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx index f1c55a1d1696..6cc32dcf3a1f 100644 --- a/reportdesign/source/filter/xml/xmlHelper.hxx +++ b/reportdesign/source/filter/xml/xmlHelper.hxx @@ -69,7 +69,7 @@ namespace rptxml static const XMLPropertyMapEntry* GetRowStyleProps(); - static void copyStyleElements(const bool _bOld,const ::rtl::OUString& _sStyleName,const SvXMLStylesContext* _pAutoStyles,const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& _xProp); + static void copyStyleElements(const bool _bOld,const OUString& _sStyleName,const SvXMLStylesContext* _pAutoStyles,const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& _xProp); static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet> createBorderPropertySet(); static SvXMLTokenMap* GetReportElemTokenMap(); diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx index ca9e02f7b1e2..724689e00d9a 100644 --- a/reportdesign/source/filter/xml/xmlImage.cxx +++ b/reportdesign/source/filter/xml/xmlImage.cxx @@ -43,7 +43,7 @@ DBG_NAME( rpt_OXMLImage ) // ----------------------------------------------------------------------------- OXMLImage::OXMLImage( ORptFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList > & _xAttrList ,const Reference< XImageControl > & _xComponent ,OXMLTable* _pContainer) : @@ -54,17 +54,17 @@ OXMLImage::OXMLImage( ORptFilter& rImport, OSL_ENSURE(m_xComponent.is(),"Component is NULL!"); const SvXMLNamespaceMap& rMap = m_rImport.GetNamespaceMap(); const SvXMLTokenMap& rTokenMap = m_rImport.GetControlElemTokenMap(); - static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); + static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; try { for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - /* const */ rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + /* const */ OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { diff --git a/reportdesign/source/filter/xml/xmlImage.hxx b/reportdesign/source/filter/xml/xmlImage.hxx index 8fad8dd899c9..57de9de5dfb1 100644 --- a/reportdesign/source/filter/xml/xmlImage.hxx +++ b/reportdesign/source/filter/xml/xmlImage.hxx @@ -32,7 +32,7 @@ namespace rptxml public: OXMLImage( ORptFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XImageControl >& _xComponent ,OXMLTable* _pContainer); diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index 64ed6651078c..2f46b990a0bd 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -45,7 +45,7 @@ namespace rptxml using namespace ::com::sun::star; using namespace ::xmloff::token; -::rtl::OUString lcl_createAttribute(const xmloff::token::XMLTokenEnum& _eNamespace,const xmloff::token::XMLTokenEnum& _eAttribute); +OUString lcl_createAttribute(const xmloff::token::XMLTokenEnum& _eNamespace,const xmloff::token::XMLTokenEnum& _eAttribute); ImportDocumentHandler::ImportDocumentHandler(uno::Reference< uno::XComponentContext > const & context) :m_bImportedChart( false ) @@ -64,37 +64,37 @@ ImportDocumentHandler::~ImportDocumentHandler() IMPLEMENT_GET_IMPLEMENTATION_ID(ImportDocumentHandler) IMPLEMENT_FORWARD_REFCOUNT( ImportDocumentHandler, ImportDocumentHandler_BASE ) //------------------------------------------------------------------------ -::rtl::OUString SAL_CALL ImportDocumentHandler::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL ImportDocumentHandler::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------ -sal_Bool SAL_CALL ImportDocumentHandler::supportsService( const ::rtl::OUString& ServiceName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL ImportDocumentHandler::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_static()); } //------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL ImportDocumentHandler::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL ImportDocumentHandler::getSupportedServiceNames( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSupported; + uno::Sequence< OUString > aSupported; if ( m_xServiceInfo.is() ) aSupported = m_xServiceInfo->getSupportedServiceNames(); return ::comphelper::concatSequences(getSupportedServiceNames_static(),aSupported); } //------------------------------------------------------------------------ -::rtl::OUString ImportDocumentHandler::getImplementationName_Static( ) throw(uno::RuntimeException) +OUString ImportDocumentHandler::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.ImportDocumentHandler"); + return OUString("com.sun.star.comp.report.ImportDocumentHandler"); } //------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > ImportDocumentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) +uno::Sequence< OUString > ImportDocumentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.report.ImportDocumentHandler"); + uno::Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.report.ImportDocumentHandler"); return aSupported; } @@ -117,7 +117,7 @@ void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException, { // this fills the chart again ::comphelper::NamedValueCollection aArgs; - aArgs.put( "CellRangeRepresentation", ::rtl::OUString("all") ); + aArgs.put( "CellRangeRepresentation", OUString("all") ); aArgs.put( "HasCategories", uno::makeAny( sal_True ) ); aArgs.put( "FirstCellAsLabel", uno::makeAny( sal_True ) ); aArgs.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) ); @@ -125,7 +125,7 @@ void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException, uno::Reference< chart::XComplexDescriptionAccess > xDataProvider(m_xModel->getDataProvider(),uno::UNO_QUERY); if ( xDataProvider.is() ) { - const uno::Sequence< ::rtl::OUString > aColumnNames = xDataProvider->getColumnDescriptions(); + const uno::Sequence< OUString > aColumnNames = xDataProvider->getColumnDescriptions(); aArgs.put( "ColumnDescriptions", uno::makeAny( aColumnNames ) ); } @@ -134,26 +134,26 @@ void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException, } } -void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & _xAttrList) throw (uno::RuntimeException, xml::sax::SAXException) +void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & _xAttrList) throw (uno::RuntimeException, xml::sax::SAXException) { uno::Reference< xml::sax::XAttributeList > xNewAttribs = _xAttrList; bool bExport = true; if ( _sName == "office:report" ) { const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; - static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); + static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); try { for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_Int32 nColonPos = sAttrName.indexOf( sal_Unicode(':') ); if( -1L == nColonPos ) sLocalName = sAttrName; else sLocalName = sAttrName.copy( nColonPos + 1L ); - const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); switch( m_pReportElemTokenMap->Get( XML_NAMESPACE_REPORT, sLocalName ) ) { @@ -194,17 +194,17 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName SAL_WNODEPRECATED_DECLARATIONS_POP try { - ::rtl::OUString sMasterField,sDetailField; + OUString sMasterField,sDetailField; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_Int32 nColonPos = sAttrName.indexOf( sal_Unicode(':') ); if( -1L == nColonPos ) sLocalName = sAttrName; else sLocalName = sAttrName.copy( nColonPos + 1L ); - const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); switch( pMasterElemTokenMap->Get( XML_NAMESPACE_REPORT, sLocalName ) ) { @@ -242,8 +242,8 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName SAL_WNODEPRECATED_DECLARATIONS_POP for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_Int32 nColonPos = sAttrName.indexOf( sal_Unicode(':') ); if( -1L == nColonPos ) sLocalName = sAttrName; @@ -251,7 +251,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName sLocalName = sAttrName.copy( nColonPos + 1L ); if ( sLocalName == "data-source-has-labels" ) { - const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); bHasCategories = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("both")); break; } @@ -270,7 +270,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName SvXMLAttributeList* pList = new SvXMLAttributeList(); xNewAttribs = pList; pList->AppendAttributeList(_xAttrList); - pList->AddAttribute(::rtl::OUString("table:cell-range-address"),::rtl::OUString("local-table.$A$1:.$Z$65536")); + pList->AddAttribute(OUString("table:cell-range-address"),OUString("local-table.$A$1:.$Z$65536")); } @@ -278,10 +278,10 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName m_xDelegatee->startElement(_sName,xNewAttribs); } -void SAL_CALL ImportDocumentHandler::endElement(const ::rtl::OUString & _sName) throw (uno::RuntimeException, xml::sax::SAXException) +void SAL_CALL ImportDocumentHandler::endElement(const OUString & _sName) throw (uno::RuntimeException, xml::sax::SAXException) { bool bExport = true; - ::rtl::OUString sNewName = _sName; + OUString sNewName = _sName; if ( _sName == "office:report" ) { sNewName = lcl_createAttribute(XML_NP_OFFICE,XML_CHART); @@ -289,9 +289,9 @@ void SAL_CALL ImportDocumentHandler::endElement(const ::rtl::OUString & _sName) else if ( _sName == "rpt:master-detail-fields" ) { if ( !m_aMasterFields.empty() ) - m_xDatabaseDataProvider->setMasterFields(uno::Sequence< ::rtl::OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size())); + m_xDatabaseDataProvider->setMasterFields(uno::Sequence< OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size())); if ( !m_aDetailFields.empty() ) - m_xDatabaseDataProvider->setDetailFields(uno::Sequence< ::rtl::OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size())); + m_xDatabaseDataProvider->setDetailFields(uno::Sequence< OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size())); bExport = false; } else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:detail")) @@ -305,17 +305,17 @@ void SAL_CALL ImportDocumentHandler::endElement(const ::rtl::OUString & _sName) m_xDelegatee->endElement(sNewName); } -void SAL_CALL ImportDocumentHandler::characters(const ::rtl::OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException) +void SAL_CALL ImportDocumentHandler::characters(const OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException) { m_xDelegatee->characters(aChars); } -void SAL_CALL ImportDocumentHandler::ignorableWhitespace(const ::rtl::OUString & aWhitespaces) throw (uno::RuntimeException, xml::sax::SAXException) +void SAL_CALL ImportDocumentHandler::ignorableWhitespace(const OUString & aWhitespaces) throw (uno::RuntimeException, xml::sax::SAXException) { m_xDelegatee->ignorableWhitespace(aWhitespaces); } -void SAL_CALL ImportDocumentHandler::processingInstruction(const ::rtl::OUString & aTarget, const ::rtl::OUString & aData) throw (uno::RuntimeException, xml::sax::SAXException) +void SAL_CALL ImportDocumentHandler::processingInstruction(const OUString & aTarget, const OUString & aData) throw (uno::RuntimeException, xml::sax::SAXException) { m_xDelegatee->processingInstruction(aTarget,aData); } @@ -328,8 +328,8 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any > { ::osl::MutexGuard aGuard(m_aMutex); comphelper::SequenceAsHashMap aArgs(_aArguments); - m_xDelegatee = aArgs.getUnpackedValueOrDefault(::rtl::OUString("DocumentHandler"),m_xDelegatee); - m_xModel = aArgs.getUnpackedValueOrDefault(::rtl::OUString("Model"),m_xModel); + m_xDelegatee = aArgs.getUnpackedValueOrDefault(OUString("DocumentHandler"),m_xDelegatee); + m_xModel = aArgs.getUnpackedValueOrDefault(OUString("Model"),m_xModel); OSL_ENSURE(m_xDelegatee.is(),"No document handler avialable!"); if ( !m_xDelegatee.is() || !m_xModel.is() ) @@ -338,7 +338,7 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any > m_xDatabaseDataProvider.set(m_xModel->getDataProvider(),uno::UNO_QUERY); if ( !m_xDatabaseDataProvider.is() ) { - const static ::rtl::OUString s_sDatabaseDataProvider("com.sun.star.chart2.data.DatabaseDataProvider"); + const static OUString s_sDatabaseDataProvider("com.sun.star.chart2.data.DatabaseDataProvider"); m_xDatabaseDataProvider.set(m_xContext->getServiceManager()->createInstanceWithContext(s_sDatabaseDataProvider ,m_xContext),uno::UNO_QUERY); if ( !m_xDatabaseDataProvider.is() ) diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx index a890f6266d36..3d26a62b2530 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx @@ -42,8 +42,8 @@ class ImportDocumentHandler : public ImportDocumentHandler_BASE { public: // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); public: @@ -51,9 +51,9 @@ public: private: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); DECLARE_XINTERFACE( ) DECLARE_XTYPEPROVIDER( ) @@ -61,11 +61,11 @@ private: // ::com::sun::star::xml::sax::XDocumentHandler: virtual void SAL_CALL startDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); virtual void SAL_CALL endDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); - virtual void SAL_CALL startElement(const ::rtl::OUString & aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); - virtual void SAL_CALL endElement(const ::rtl::OUString & aName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); - virtual void SAL_CALL characters(const ::rtl::OUString & aChars) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); - virtual void SAL_CALL ignorableWhitespace(const ::rtl::OUString & aWhitespaces) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); - virtual void SAL_CALL processingInstruction(const ::rtl::OUString & aTarget, const ::rtl::OUString & aData) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); + virtual void SAL_CALL startElement(const OUString & aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); + virtual void SAL_CALL endElement(const OUString & aName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); + virtual void SAL_CALL characters(const OUString & aChars) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); + virtual void SAL_CALL ignorableWhitespace(const OUString & aWhitespaces) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); + virtual void SAL_CALL processingInstruction(const OUString & aTarget, const OUString & aData) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -78,8 +78,8 @@ private: ::osl::Mutex m_aMutex; bool m_bImportedChart; - ::std::vector< ::rtl::OUString> m_aMasterFields; - ::std::vector< ::rtl::OUString> m_aDetailFields; + ::std::vector< OUString> m_aMasterFields; + ::std::vector< OUString> m_aDetailFields; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aArguments; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xDelegatee; diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx index 591650fc0cc6..18549f93c008 100644 --- a/reportdesign/source/filter/xml/xmlMasterFields.cxx +++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx @@ -35,7 +35,7 @@ namespace rptxml DBG_NAME( rpt_OXMLMasterFields ) OXMLMasterFields::OXMLMasterFields( ORptFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList > & _xAttrList ,IMasterDetailFieds* _pReport ) : @@ -47,14 +47,14 @@ OXMLMasterFields::OXMLMasterFields( ORptFilter& rImport, const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap(); const SvXMLTokenMap& rTokenMap = rImport.GetSubDocumentElemTokenMap(); - ::rtl::OUString sMasterField,sDetailField; + OUString sMasterField,sDetailField; const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -71,7 +71,7 @@ OXMLMasterFields::OXMLMasterFields( ORptFilter& rImport, if ( sDetailField.isEmpty() ) sDetailField = sMasterField; if ( !sMasterField.isEmpty() ) - m_pReport->addMasterDetailPair(::std::pair< ::rtl::OUString,::rtl::OUString >(sMasterField,sDetailField)); + m_pReport->addMasterDetailPair(::std::pair< OUString,OUString >(sMasterField,sDetailField)); } // ----------------------------------------------------------------------------- @@ -83,7 +83,7 @@ OXMLMasterFields::~OXMLMasterFields() // ----------------------------------------------------------------------------- SvXMLImportContext* OXMLMasterFields::CreateChildContext( sal_uInt16 _nPrefix, - const ::rtl::OUString& _rLocalName, + const OUString& _rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/reportdesign/source/filter/xml/xmlMasterFields.hxx b/reportdesign/source/filter/xml/xmlMasterFields.hxx index f4a1d0364560..605815ac3aba 100644 --- a/reportdesign/source/filter/xml/xmlMasterFields.hxx +++ b/reportdesign/source/filter/xml/xmlMasterFields.hxx @@ -32,13 +32,13 @@ namespace rptxml public: OXMLMasterFields( ORptFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,IMasterDetailFieds* _pReport); virtual ~OXMLMasterFields(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx index 0fe6a3787366..d2362235b92c 100644 --- a/reportdesign/source/filter/xml/xmlReport.cxx +++ b/reportdesign/source/filter/xml/xmlReport.cxx @@ -40,7 +40,7 @@ namespace rptxml DBG_NAME( rpt_OXMLReport ) OXMLReport::OXMLReport( ORptFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList > & _xAttrList ,const uno::Reference< report::XReportDefinition >& _xComponent ,OXMLTable* _pContainer) : @@ -56,15 +56,15 @@ OXMLReport::OXMLReport( ORptFilter& rImport, const SvXMLTokenMap& rTokenMap = m_rImport.GetReportElemTokenMap(); const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; - static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); + static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); try { for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -133,7 +133,7 @@ void OXMLReport::impl_initRuntimeDefaults() const SvXMLImportContext* OXMLReport::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = _CreateChildContext(nPrefix,rLocalName,xAttrList); @@ -212,12 +212,12 @@ void OXMLReport::EndElement() xFunctions->insertByIndex(xFunctions->getCount(),uno::makeAny(aIter->second)); if ( !m_aMasterFields.empty() ) - m_xComponent->setMasterFields(Sequence< ::rtl::OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size())); + m_xComponent->setMasterFields(Sequence< OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size())); if ( !m_aDetailFields.empty() ) - m_xComponent->setDetailFields(Sequence< ::rtl::OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size())); + m_xComponent->setDetailFields(Sequence< OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size())); } // ----------------------------------------------------------------------------- -void OXMLReport::addMasterDetailPair(const ::std::pair< ::rtl::OUString,::rtl::OUString >& _aPair) +void OXMLReport::addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair) { m_aMasterFields.push_back(_aPair.first); m_aDetailFields.push_back(_aPair.second); diff --git a/reportdesign/source/filter/xml/xmlReport.hxx b/reportdesign/source/filter/xml/xmlReport.hxx index b6cc9ca8dc2b..ffcf432f1de9 100644 --- a/reportdesign/source/filter/xml/xmlReport.hxx +++ b/reportdesign/source/filter/xml/xmlReport.hxx @@ -28,26 +28,26 @@ namespace rptxml class OXMLReport : public OXMLReportElementBase, public IMasterDetailFieds { ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xComponent; - ::std::vector< ::rtl::OUString> m_aMasterFields; - ::std::vector< ::rtl::OUString> m_aDetailFields; + ::std::vector< OUString> m_aMasterFields; + ::std::vector< OUString> m_aDetailFields; OXMLReport(const OXMLReport&); void operator =(const OXMLReport&); public: OXMLReport( ORptFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xComponent ,OXMLTable* _pContainer); virtual ~OXMLReport(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); - virtual void addMasterDetailPair(const ::std::pair< ::rtl::OUString,::rtl::OUString >& _aPair); + virtual void addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair); private: /** initializes our object's properties whose runtime (API) default is different from the file diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx index 2c4d6c893feb..738691f8b394 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.cxx +++ b/reportdesign/source/filter/xml/xmlReportElement.cxx @@ -37,7 +37,7 @@ namespace rptxml DBG_NAME( rpt_OXMLReportElement ) OXMLReportElement::OXMLReportElement( ORptFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList > & _xAttrList ,const Reference< XReportControlModel > & _xComponent) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -49,16 +49,16 @@ OXMLReportElement::OXMLReportElement( ORptFilter& rImport, const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap(); const SvXMLTokenMap& rTokenMap = rImport.GetReportElementElemTokenMap(); - static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); + static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; try { for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -89,7 +89,7 @@ OXMLReportElement::~OXMLReportElement() SvXMLImportContext* OXMLReportElement::CreateChildContext( sal_uInt16 _nPrefix, - const ::rtl::OUString& _rLocalName, + const OUString& _rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/reportdesign/source/filter/xml/xmlReportElement.hxx b/reportdesign/source/filter/xml/xmlReportElement.hxx index 7634abe8a5a1..ccf980bc4c81 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.hxx +++ b/reportdesign/source/filter/xml/xmlReportElement.hxx @@ -34,13 +34,13 @@ namespace rptxml public: OXMLReportElement( ORptFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel >& _xComponent); virtual ~OXMLReportElement(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx index 9579f63753ef..18e5dc45822e 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx @@ -32,7 +32,7 @@ namespace rptxml OXMLReportElementBase::OXMLReportElementBase( ORptFilter& rImport ,sal_uInt16 nPrfx - , const ::rtl::OUString& rLName + , const OUString& rLName ,const Reference< XReportComponent > & _xComponent ,OXMLTable* _pContainer) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -49,7 +49,7 @@ OXMLReportElementBase::~OXMLReportElementBase() // ----------------------------------------------------------------------------- SvXMLImportContext* OXMLReportElementBase::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = _CreateChildContext(nPrefix,rLocalName,xAttrList); @@ -60,7 +60,7 @@ SvXMLImportContext* OXMLReportElementBase::CreateChildContext( // ----------------------------------------------------------------------------- SvXMLImportContext* OXMLReportElementBase::_CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx index c9401c056be2..1ceda231e425 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx @@ -31,7 +31,7 @@ namespace rptxml class SAL_NO_VTABLE IMasterDetailFieds { public: - virtual void addMasterDetailPair(const ::std::pair< ::rtl::OUString,::rtl::OUString >& _aPair) = 0; + virtual void addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair) = 0; protected: ~IMasterDetailFieds() {} @@ -47,19 +47,19 @@ namespace rptxml ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: OXMLReportElementBase( ORptFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent ,OXMLTable* _pContainer); virtual ~OXMLReportElementBase(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); diff --git a/reportdesign/source/filter/xml/xmlRow.cxx b/reportdesign/source/filter/xml/xmlRow.cxx index 8f89bf7d9e75..ce99996c7c2a 100644 --- a/reportdesign/source/filter/xml/xmlRow.cxx +++ b/reportdesign/source/filter/xml/xmlRow.cxx @@ -42,7 +42,7 @@ DBG_NAME( rpt_OXMLRow ) OXMLRow::OXMLRow( ORptFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,OXMLTable* _pContainer) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) @@ -58,10 +58,10 @@ OXMLRow::OXMLRow( ORptFilter& rImport const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -86,7 +86,7 @@ OXMLRow::~OXMLRow() // ----------------------------------------------------------------------------- SvXMLImportContext* OXMLRow::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx index 23870a685d9f..b51186ee9766 100644 --- a/reportdesign/source/filter/xml/xmlSection.cxx +++ b/reportdesign/source/filter/xml/xmlSection.cxx @@ -41,7 +41,7 @@ namespace rptxml using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; - sal_uInt16 lcl_getReportPrintOption(const ::rtl::OUString& _sValue) + sal_uInt16 lcl_getReportPrintOption(const OUString& _sValue) { sal_uInt16 nRet = report::ReportPrintOption::ALL_PAGES; const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetReportPrintOptions(); @@ -53,7 +53,7 @@ namespace rptxml DBG_NAME( rpt_OXMLSection ) OXMLSection::OXMLSection( ORptFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName, + sal_uInt16 nPrfx, const OUString& _sLocalName, const uno::Reference< xml::sax::XAttributeList > & _xAttrList ,const uno::Reference< report::XSection >& _xSection ,sal_Bool _bPageHeader) @@ -68,15 +68,15 @@ OXMLSection::OXMLSection( ORptFilter& rImport, const SvXMLTokenMap& rTokenMap = rImport.GetSectionElemTokenMap(); const sal_Int16 nLength = (m_xSection.is() && _xAttrList.is()) ? _xAttrList->getLength() : 0; - static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); + static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); try { for(sal_Int16 i = 0; i < nLength; ++i) { - rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -110,7 +110,7 @@ OXMLSection::~OXMLSection() SvXMLImportContext* OXMLSection::CreateChildContext( sal_uInt16 _nPrefix, - const ::rtl::OUString& _rLocalName, + const OUString& _rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/reportdesign/source/filter/xml/xmlSection.hxx b/reportdesign/source/filter/xml/xmlSection.hxx index 647f100a9b6b..b425aad9ad90 100644 --- a/reportdesign/source/filter/xml/xmlSection.hxx +++ b/reportdesign/source/filter/xml/xmlSection.hxx @@ -39,14 +39,14 @@ namespace rptxml OXMLSection( ORptFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection ,sal_Bool _bPageHeader = sal_True); virtual ~OXMLSection(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index 14d8a4ee9f56..1898e502ce1b 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -60,7 +60,7 @@ public: virtual bool handleSpecialItem( XMLPropertyState& /*rProperty*/, ::std::vector< XMLPropertyState >& /*rProperties*/, - const ::rtl::OUString& /*rValue*/, + const OUString& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/, const SvXMLNamespaceMap& /*rNamespaceMap*/ ) const { @@ -74,11 +74,11 @@ TYPEINIT1( OReportStylesContext, SvXMLStylesContext ); DBG_NAME( rpt_OControlStyleContext ) OControlStyleContext::OControlStyleContext( ORptFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle ) : XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle ), - sNumberFormat(rtl::OUString("NumberFormat")), + sNumberFormat(OUString("NumberFormat")), pStyles(&rStyles), m_nNumberFormat(-1), m_rImport(rImport), @@ -142,8 +142,8 @@ void OControlStyleContext::AddProperty(const sal_Int16 nContextID, const uno::An } // ----------------------------------------------------------------------------- void OControlStyleContext::SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ) + const OUString& rLocalName, + const OUString& rValue ) { // TODO: use a map here if( IsXMLToken(rLocalName, XML_DATA_STYLE_NAME ) ) @@ -163,14 +163,14 @@ DBG_NAME( rpt_OReportStylesContext ) OReportStylesContext::OReportStylesContext( ORptFilter& rImport, sal_uInt16 nPrfx , - const ::rtl::OUString& rLName , + const OUString& rLName , const Reference< XAttributeList > & xAttrList, const sal_Bool bTempAutoStyles ) : SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ), - m_sTableStyleFamilyName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))), - m_sColumnStyleFamilyName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))), - m_sRowStyleFamilyName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ))), - m_sCellStyleFamilyName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME ))), + m_sTableStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))), + m_sColumnStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))), + m_sRowStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ))), + m_sCellStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME ))), m_rImport(rImport), m_nNumberFormatIndex(-1), bAutoStyles(bTempAutoStyles) @@ -255,7 +255,7 @@ UniReference < SvXMLImportPropertyMapper > } // ----------------------------------------------------------------------------- SvXMLStyleContext *OReportStylesContext::CreateDefaultStyleStyleChildContext( - sal_uInt16 nFamily, sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { SvXMLStyleContext *pStyle = 0; @@ -278,7 +278,7 @@ SvXMLStyleContext *OReportStylesContext::CreateDefaultStyleStyleChildContext( } // ---------------------------------------------------------------------------- SvXMLStyleContext *OReportStylesContext::CreateStyleStyleChildContext( - sal_uInt16 nFamily, sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) { SvXMLStyleContext *pStyle = SvXMLStylesContext::CreateStyleStyleChildContext( nFamily, nPrefix, @@ -310,7 +310,7 @@ Reference < XNameContainer > Reference < XNameContainer > xStyles(SvXMLStylesContext::GetStylesContainer(nFamily)); if (!xStyles.is()) { - ::rtl::OUString sName; + OUString sName; switch( nFamily ) { case XML_STYLE_FAMILY_TABLE_TABLE: @@ -319,7 +319,7 @@ Reference < XNameContainer > xStyles.set(m_xTableStyles); else sName = - ::rtl::OUString( rtl::OUString( "TableStyles" )); + OUString( OUString( "TableStyles" )); } break; case XML_STYLE_FAMILY_TABLE_CELL: @@ -328,7 +328,7 @@ Reference < XNameContainer > xStyles.set(m_xCellStyles); else sName = - ::rtl::OUString( rtl::OUString( "CellStyles" )); + OUString( OUString( "CellStyles" )); } break; case XML_STYLE_FAMILY_TABLE_COLUMN: @@ -337,7 +337,7 @@ Reference < XNameContainer > xStyles.set(m_xColumnStyles); else sName = - ::rtl::OUString( rtl::OUString( "ColumnStyles" )); + OUString( OUString( "ColumnStyles" )); } break; case XML_STYLE_FAMILY_TABLE_ROW: @@ -346,7 +346,7 @@ Reference < XNameContainer > xStyles.set(m_xRowStyles); else sName = - ::rtl::OUString( rtl::OUString( "RowStyles" )); + OUString( OUString( "RowStyles" )); } break; case XML_STYLE_FAMILY_SD_GRAPHICS_ID: @@ -390,9 +390,9 @@ Reference < XNameContainer > } // ----------------------------------------------------------------------------- -::rtl::OUString OReportStylesContext::GetServiceName( sal_uInt16 nFamily ) const +OUString OReportStylesContext::GetServiceName( sal_uInt16 nFamily ) const { - rtl::OUString sServiceName = SvXMLStylesContext::GetServiceName(nFamily); + OUString sServiceName = SvXMLStylesContext::GetServiceName(nFamily); if (sServiceName.isEmpty()) { switch( nFamily ) @@ -434,7 +434,7 @@ ORptFilter& OReportStylesContext::GetOwnImport() const return m_rImport; } // ----------------------------------------------------------------------------- -sal_uInt16 OReportStylesContext::GetFamily( const ::rtl::OUString& rFamily ) const +sal_uInt16 OReportStylesContext::GetFamily( const OUString& rFamily ) const { sal_uInt16 nFamily = SvXMLStylesContext::GetFamily(rFamily); return nFamily; diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx index aa8b6e6e2b6d..656513146ae7 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.hxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx @@ -38,9 +38,9 @@ namespace rptxml class OControlStyleContext : public XMLPropStyleContext { - ::rtl::OUString m_sDataStyleName; - ::rtl::OUString sPageStyle; - const rtl::OUString sNumberFormat; + OUString m_sDataStyleName; + OUString sPageStyle; + const OUString sNumberFormat; SvXMLStylesContext* pStyles; // std::vector<ScXMLMapContent> aMaps; com::sun::star::uno::Any aConditionalFormat; @@ -56,15 +56,15 @@ namespace rptxml protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); public: TYPEINFO(); OControlStyleContext( ORptFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle = sal_False ); @@ -83,10 +83,10 @@ namespace rptxml class OReportStylesContext : public SvXMLStylesContext { - const ::rtl::OUString m_sTableStyleFamilyName; - const ::rtl::OUString m_sColumnStyleFamilyName; - const ::rtl::OUString m_sRowStyleFamilyName; - const ::rtl::OUString m_sCellStyleFamilyName; + const OUString m_sTableStyleFamilyName; + const OUString m_sColumnStyleFamilyName; + const OUString m_sRowStyleFamilyName; + const OUString m_sCellStyleFamilyName; ORptFilter& m_rImport; sal_Int32 m_nNumberFormatIndex; sal_Int32 nMasterPageNameIndex; @@ -117,12 +117,12 @@ namespace rptxml virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -131,7 +131,7 @@ namespace rptxml TYPEINFO(); OReportStylesContext( ORptFilter& rImport, sal_uInt16 nPrfx , - const ::rtl::OUString& rLName , + const OUString& rLName , const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const sal_Bool bAutoStyles ); virtual ~OReportStylesContext(); @@ -143,8 +143,8 @@ namespace rptxml virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameContainer > GetStylesContainer( sal_uInt16 nFamily ) const; - virtual ::rtl::OUString GetServiceName( sal_uInt16 nFamily ) const; - virtual sal_uInt16 GetFamily( const ::rtl::OUString& rFamily ) const; + virtual OUString GetServiceName( sal_uInt16 nFamily ) const; + virtual sal_uInt16 GetFamily( const OUString& rFamily ) const; sal_Int32 GetIndex(const sal_Int16 nContextID); }; diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx index c59810f4fcc0..49ae6e0ed4da 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.cxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx @@ -39,7 +39,7 @@ DBG_NAME( rpt_OXMLSubDocument ) OXMLSubDocument::OXMLSubDocument( ORptFilter& rImport, sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const Reference< XReportComponent > & _xComponent ,OXMLTable* _pContainer ,OXMLCell* _pCellParent) : @@ -62,7 +62,7 @@ OXMLSubDocument::~OXMLSubDocument() // ----------------------------------------------------------------------------- SvXMLImportContext* OXMLSubDocument::_CreateChildContext( sal_uInt16 _nPrefix, - const ::rtl::OUString& _rLocalName, + const OUString& _rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = OXMLReportElementBase::_CreateChildContext(_nPrefix,_rLocalName,xAttrList); @@ -111,9 +111,9 @@ void OXMLSubDocument::EndElement() if ( m_xComponent.is() ) { if ( !m_aMasterFields.empty() ) - m_xComponent->setMasterFields(Sequence< ::rtl::OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size())); + m_xComponent->setMasterFields(Sequence< OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size())); if ( !m_aDetailFields.empty() ) - m_xComponent->setDetailFields(Sequence< ::rtl::OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size())); + m_xComponent->setDetailFields(Sequence< OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size())); m_xComponent->setName(m_xFake->getName()); m_xComponent->setPrintRepeatedValues(m_xFake->getPrintRepeatedValues()); @@ -142,7 +142,7 @@ void OXMLSubDocument::EndElement() } } // ----------------------------------------------------------------------------- -void OXMLSubDocument::addMasterDetailPair(const ::std::pair< ::rtl::OUString,::rtl::OUString >& _aPair) +void OXMLSubDocument::addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair) { m_aMasterFields.push_back(_aPair.first); m_aDetailFields.push_back(_aPair.second); diff --git a/reportdesign/source/filter/xml/xmlSubDocument.hxx b/reportdesign/source/filter/xml/xmlSubDocument.hxx index e74d98650baa..f0dd87458536 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.hxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.hxx @@ -31,8 +31,8 @@ namespace rptxml { ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xComponent; ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xFake; - ::std::vector< ::rtl::OUString> m_aMasterFields; - ::std::vector< ::rtl::OUString> m_aDetailFields; + ::std::vector< OUString> m_aMasterFields; + ::std::vector< OUString> m_aDetailFields; OXMLCell* m_pCellParent; sal_Int32 m_nCurrentCount; bool m_bContainsShape; @@ -41,20 +41,20 @@ namespace rptxml void operator =(const OXMLSubDocument&); virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: OXMLSubDocument( ORptFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent ,OXMLTable* _pContainer ,OXMLCell* _pCellParent); virtual ~OXMLSubDocument(); virtual void EndElement(); - virtual void addMasterDetailPair(const ::std::pair< ::rtl::OUString,::rtl::OUString >& _aPair); + virtual void addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair); }; // ----------------------------------------------------------------------------- } // namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx index d380cf6c30e2..29e525867aa5 100644 --- a/reportdesign/source/filter/xml/xmlTable.cxx +++ b/reportdesign/source/filter/xml/xmlTable.cxx @@ -46,7 +46,7 @@ namespace rptxml using namespace ::com::sun::star::xml::sax; using ::com::sun::star::xml::sax::XAttributeList; - sal_uInt16 lcl_getForceNewPageOption(const ::rtl::OUString& _sValue) + sal_uInt16 lcl_getForceNewPageOption(const OUString& _sValue) { sal_uInt16 nRet = report::ForceNewPage::NONE; const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetForceNewPageOptions(); @@ -57,7 +57,7 @@ DBG_NAME( rpt_OXMLTable ) OXMLTable::OXMLTable( ORptFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,const uno::Reference< report::XSection >& _xSection ) @@ -74,15 +74,15 @@ OXMLTable::OXMLTable( ORptFilter& rImport const SvXMLTokenMap& rTokenMap = rImport.GetSectionElemTokenMap(); const sal_Int16 nLength = (m_xSection.is() && _xAttrList.is()) ? _xAttrList->getLength() : 0; - static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); + static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); try { for(sal_Int16 i = 0; i < nLength; ++i) { - rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -123,7 +123,7 @@ OXMLTable::~OXMLTable() SvXMLImportContext* OXMLTable::CreateChildContext( sal_uInt16 _nPrefix, - const ::rtl::OUString& _rLocalName, + const OUString& _rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/reportdesign/source/filter/xml/xmlTable.hxx b/reportdesign/source/filter/xml/xmlTable.hxx index daebbec01f8b..d7e44d48efad 100644 --- a/reportdesign/source/filter/xml/xmlTable.hxx +++ b/reportdesign/source/filter/xml/xmlTable.hxx @@ -43,7 +43,7 @@ namespace rptxml ::std::vector<sal_Int32> m_aHeight; ::std::vector<sal_Int32> m_aWidth; ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; - ::rtl::OUString m_sStyleName; + OUString m_sStyleName; sal_Int32 m_nColSpan; sal_Int32 m_nRowSpan; sal_Int32 m_nRowIndex; @@ -56,14 +56,14 @@ namespace rptxml OXMLTable( ORptFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection ); virtual ~OXMLTable(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 4b5d6ea96f80..fa83c1668f55 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -92,7 +92,7 @@ public: RptMLMasterStylesContext_Impl( ORptFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName , + const OUString& rLName , const uno::Reference< xml::sax::XAttributeList > & xAttrList ); virtual ~RptMLMasterStylesContext_Impl(); virtual void EndElement(); @@ -102,7 +102,7 @@ TYPEINIT1( RptMLMasterStylesContext_Impl, XMLTextMasterStylesContext ); DBG_NAME(rpt_RptMLMasterStylesContext_Impl) RptMLMasterStylesContext_Impl::RptMLMasterStylesContext_Impl( ORptFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName , + const OUString& rLName , const uno::Reference< xml::sax::XAttributeList > & xAttrList ) : XMLTextMasterStylesContext( rImport, nPrfx, rLName, xAttrList ) ,m_rImport(rImport) @@ -170,9 +170,9 @@ sal_Int32 ReadThroughComponent( catch (const SAXParseException& r) { #if OSL_DEBUG_LEVEL > 1 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "SAX parse exception caught while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); aError.append(r.LineNumber); aError.append(','); @@ -213,7 +213,7 @@ sal_Int32 ReadThroughComponent( const uno::Reference<XComponentContext> & rxContext, const Reference< document::XGraphicObjectResolver > & _xGraphicObjectResolver, const Reference<document::XEmbeddedObjectResolver>& _xEmbeddedObjectResolver, - const ::rtl::OUString& _sFilterName + const OUString& _sFilterName ,const uno::Reference<beans::XPropertySet>& _xProp) { OSL_ENSURE( xStorage.is(), "Need storage!"); @@ -227,7 +227,7 @@ sal_Int32 ReadThroughComponent( try { // open stream (and set parser input) - ::rtl::OUString sStreamName = ::rtl::OUString::createFromAscii(pStreamName); + OUString sStreamName = OUString::createFromAscii(pStreamName); if ( !xStorage->hasByName( sStreamName ) || !xStorage->isStreamElement( sStreamName ) ) { // stream name not found! Then try the compatibility name. @@ -238,7 +238,7 @@ sal_Int32 ReadThroughComponent( return 0; // if so, does the stream exist? - sStreamName = ::rtl::OUString::createFromAscii(pCompatibilityStreamName); + sStreamName = OUString::createFromAscii(pCompatibilityStreamName); if ( !xStorage->hasByName( sStreamName ) || !xStorage->isStreamElement( sStreamName ) ) return 0; } @@ -247,7 +247,7 @@ sal_Int32 ReadThroughComponent( xDocStream = xStorage->openStreamElement( sStreamName, embed::ElementModes::READ ); uno::Reference< beans::XPropertySet > xProps( xDocStream, uno::UNO_QUERY_THROW ); - xProps->getPropertyValue( ::rtl::OUString("Encrypted") ) >>= bEncrypted; + xProps->getPropertyValue( OUString("Encrypted") ) >>= bEncrypted; } catch (const packages::WrongPasswordException&) { @@ -299,14 +299,14 @@ uno::Reference< uno::XInterface > ORptImportHelper::create(uno::Reference< uno:: return static_cast< XServiceInfo* >(new ORptFilter(xContext, IMPORT_SETTINGS )); } //--------------------------------------------------------------------- -::rtl::OUString ORptImportHelper::getImplementationName_Static( ) throw (RuntimeException) +OUString ORptImportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString(SERVICE_SETTINGSIMPORTER); + return OUString(SERVICE_SETTINGSIMPORTER); } //--------------------------------------------------------------------- -Sequence< ::rtl::OUString > ORptImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) +Sequence< OUString > ORptImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); + Sequence< OUString > aSupported(1); aSupported[0] = SERVICE_IMPORTFILTER; return aSupported; } @@ -317,14 +317,14 @@ Reference< XInterface > ORptContentImportHelper::create(const Reference< XCompon IMPORT_FONTDECLS )); } //--------------------------------------------------------------------- -::rtl::OUString ORptContentImportHelper::getImplementationName_Static( ) throw (RuntimeException) +OUString ORptContentImportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString(SERVICE_CONTENTIMPORTER); + return OUString(SERVICE_CONTENTIMPORTER); } //--------------------------------------------------------------------- -Sequence< ::rtl::OUString > ORptContentImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) +Sequence< OUString > ORptContentImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); + Sequence< OUString > aSupported(1); aSupported[0] = SERVICE_IMPORTFILTER; return aSupported; } @@ -337,14 +337,14 @@ Reference< XInterface > ORptStylesImportHelper::create(Reference< XComponentCont IMPORT_FONTDECLS )); } //--------------------------------------------------------------------- -::rtl::OUString ORptStylesImportHelper::getImplementationName_Static( ) throw (RuntimeException) +OUString ORptStylesImportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString(SERVICE_STYLESIMPORTER); + return OUString(SERVICE_STYLESIMPORTER); } //--------------------------------------------------------------------- -Sequence< ::rtl::OUString > ORptStylesImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) +Sequence< OUString > ORptStylesImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); + Sequence< OUString > aSupported(1); aSupported[0] = SERVICE_IMPORTFILTER; return aSupported; } @@ -356,14 +356,14 @@ Reference< XInterface > ORptMetaImportHelper::create(Reference< XComponentContex IMPORT_META)); } //--------------------------------------------------------------------- -::rtl::OUString ORptMetaImportHelper::getImplementationName_Static( ) throw (RuntimeException) +OUString ORptMetaImportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString(SERVICE_METAIMPORTER); + return OUString(SERVICE_METAIMPORTER); } //--------------------------------------------------------------------- -Sequence< ::rtl::OUString > ORptMetaImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) +Sequence< OUString > ORptMetaImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); + Sequence< OUString > aSupported(1); aSupported[0] = SERVICE_IMPORTFILTER; return aSupported; } @@ -378,11 +378,11 @@ ORptFilter::ORptFilter( const uno::Reference< XComponentContext >& _rxContext,sa DBG_CTOR(rpt_ORptFilter,NULL); GetMM100UnitConverter().SetCoreMeasureUnit(util::MeasureUnit::MM_100TH); GetMM100UnitConverter().SetXMLMeasureUnit(util::MeasureUnit::CM); - GetNamespaceMap().Add( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__rpt) ), + GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__rpt) ), GetXMLToken(XML_N_RPT), XML_NAMESPACE_REPORT ); - GetNamespaceMap().Add( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np___rpt) ), + GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np___rpt) ), GetXMLToken(XML_N_RPT_OASIS), XML_NAMESPACE_REPORT ); @@ -406,32 +406,32 @@ uno::Reference< XInterface > ORptFilter::create(uno::Reference< XComponentContex } // ----------------------------------------------------------------------------- -::rtl::OUString ORptFilter::getImplementationName_Static( ) throw(uno::RuntimeException) +OUString ORptFilter::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.OReportFilter"); + return OUString("com.sun.star.comp.report.OReportFilter"); } //-------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ORptFilter::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL ORptFilter::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > ORptFilter::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) +uno::Sequence< OUString > ORptFilter::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aServices(1); + uno::Sequence< OUString > aServices(1); aServices.getArray()[0] = SERVICE_IMPORTFILTER; return aServices; } //-------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL ORptFilter::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL ORptFilter::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL ORptFilter::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException ) +sal_Bool SAL_CALL ORptFilter::supportsService(const OUString& ServiceName) throw( uno::RuntimeException ) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } @@ -457,7 +457,7 @@ sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescript sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException) { - ::rtl::OUString sFileName; + OUString sFileName; uno::Reference< embed::XStorage > xStorage; uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier; @@ -515,9 +515,9 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) #if OSL_DEBUG_LEVEL > 1 uno::Reference < container::XNameAccess > xAccess( xStorage, uno::UNO_QUERY ); - uno::Sequence< ::rtl::OUString> aSeq = xAccess->getElementNames(); - const ::rtl::OUString* pDebugIter = aSeq.getConstArray(); - const ::rtl::OUString* pDebugEnd = pDebugIter + aSeq.getLength(); + uno::Sequence< OUString> aSeq = xAccess->getElementNames(); + const OUString* pDebugIter = aSeq.getConstArray(); + const OUString* pDebugEnd = pDebugIter + aSeq.getLength(); for(;pDebugIter != pDebugEnd;++pDebugIter) { (void)*pDebugIter; @@ -535,29 +535,29 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) uno::UNO_QUERY ); uno::Reference< lang::XMultiServiceFactory > xReportServiceFactory( m_xReportDefinition, uno::UNO_QUERY); - aArgs[0] <<= beans::NamedValue(::rtl::OUString("Storage"),uno::makeAny(xStorage)); - xEmbeddedObjectResolver.set( xReportServiceFactory->createInstanceWithArguments(::rtl::OUString("com.sun.star.document.ImportEmbeddedObjectResolver"),aArgs) , uno::UNO_QUERY); + aArgs[0] <<= beans::NamedValue(OUString("Storage"),uno::makeAny(xStorage)); + xEmbeddedObjectResolver.set( xReportServiceFactory->createInstanceWithArguments(OUString("com.sun.star.document.ImportEmbeddedObjectResolver"),aArgs) , uno::UNO_QUERY); - static const ::rtl::OUString s_sOld("OldFormat"); + static const OUString s_sOld("OldFormat"); static comphelper::PropertyMapEntry pMap[] = { { MAP_LEN( "OldFormat" ), 1, &::getCppuType((const sal_Bool*)0), beans::PropertyAttribute::BOUND, 0 }, - { MAP_LEN( "StreamName"), 0, &::getCppuType( (::rtl::OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "StreamName"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN("PrivateData"), 0, &::getCppuType( (uno::Reference<XInterface> *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "BaseURI"), 0, &::getCppuType( (::rtl::OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "StreamRelPath"), 0, &::getCppuType( (::rtl::OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "BaseURI"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "StreamRelPath"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, { NULL, 0, 0, NULL, 0, 0 } }; ::comphelper::MediaDescriptor aDescriptor(rDescriptor); uno::Reference<beans::XPropertySet> xProp = comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap)); - const ::rtl::OUString sVal( aDescriptor.getUnpackedValueOrDefault(aDescriptor.PROP_DOCUMENTBASEURL(),::rtl::OUString()) ); - xProp->setPropertyValue(rtl::OUString("BaseURI"), uno::makeAny(sVal)); - const ::rtl::OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(rtl::OUString("HierarchicalDocumentName"),::rtl::OUString()) ); - xProp->setPropertyValue(rtl::OUString("StreamRelPath"), uno::makeAny(sHierarchicalDocumentName)); + const OUString sVal( aDescriptor.getUnpackedValueOrDefault(aDescriptor.PROP_DOCUMENTBASEURL(),OUString()) ); + xProp->setPropertyValue(OUString("BaseURI"), uno::makeAny(sVal)); + const OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(OUString("HierarchicalDocumentName"),OUString()) ); + xProp->setPropertyValue(OUString("StreamRelPath"), uno::makeAny(sHierarchicalDocumentName)); uno::Reference<XComponent> xModel(GetModel(),UNO_QUERY); - static const ::rtl::OUString s_sMeta("meta.xml"); - static const rtl::OUString s_sStreamName("StreamName"); + static const OUString s_sMeta("meta.xml"); + static const OUString s_sStreamName("StreamName"); xProp->setPropertyValue(s_sStreamName, uno::makeAny(s_sMeta)); sal_Int32 nRet = ReadThroughComponent( xStorage ,xModel @@ -582,7 +582,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) if ( nRet == 0 ) { - xProp->setPropertyValue(s_sStreamName, uno::makeAny(::rtl::OUString("settings.xml"))); + xProp->setPropertyValue(s_sStreamName, uno::makeAny(OUString("settings.xml"))); nRet = ReadThroughComponent( xStorage ,xModel ,"settings.xml" @@ -596,7 +596,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) } if ( nRet == 0 ) { - xProp->setPropertyValue(s_sStreamName, uno::makeAny(::rtl::OUString("styles.xml"))); + xProp->setPropertyValue(s_sStreamName, uno::makeAny(OUString("styles.xml"))); nRet = ReadThroughComponent(xStorage ,xModel ,"styles.xml" @@ -610,7 +610,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) if ( nRet == 0 ) { - xProp->setPropertyValue(s_sStreamName, uno::makeAny(::rtl::OUString("content.xml"))); + xProp->setPropertyValue(s_sStreamName, uno::makeAny(OUString("content.xml"))); nRet = ReadThroughComponent( xStorage ,xModel ,"content.xml" @@ -656,7 +656,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) } // ----------------------------------------------------------------------------- SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -674,7 +674,7 @@ SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix, const SvXMLStylesContext* pAutoStyles = GetAutoStyles(); if ( pAutoStyles ) { - XMLPropStyleContext* pAutoStyle = PTR_CAST(XMLPropStyleContext,pAutoStyles->FindStyleChildContext(XML_STYLE_FAMILY_PAGE_MASTER,::rtl::OUString("pm1"))); + XMLPropStyleContext* pAutoStyle = PTR_CAST(XMLPropStyleContext,pAutoStyles->FindStyleChildContext(XML_STYLE_FAMILY_PAGE_MASTER,OUString("pm1"))); if ( pAutoStyle ) { pAutoStyle->FillPropertySet(getReportDefinition().get()); @@ -963,7 +963,7 @@ const SvXMLTokenMap& ORptFilter::GetCellElemTokenMap() const return *m_pCellElemTokenMap; } // ----------------------------------------------------------------------------- -SvXMLImportContext* ORptFilter::CreateStylesContext(const ::rtl::OUString& rLocalName, +SvXMLImportContext* ORptFilter::CreateStylesContext(const OUString& rLocalName, const uno::Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle ) { SvXMLImportContext* pContext = bIsAutoStyle ? GetAutoStyles() : GetStyles(); @@ -992,7 +992,7 @@ void ORptFilter::leaveEventContext() } // ----------------------------------------------------------------------------- SvXMLImportContext *ORptFilter::CreateFontDeclsContext( - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { XMLFontStylesContext *pFSContext = @@ -1014,7 +1014,7 @@ void ORptFilter::FinishStyles() GetStyles()->FinishStyles( sal_True ); } // ----------------------------------------------------------------------------- -::rtl::OUString ORptFilter::convertFormula(const ::rtl::OUString& _sFormula) +OUString ORptFilter::convertFormula(const OUString& _sFormula) { return _sFormula; } @@ -1052,7 +1052,7 @@ void ORptFilter::endDocument( void ) SvXMLImport::endDocument(); } // ----------------------------------------------------------------------------- -void ORptFilter::removeFunction(const ::rtl::OUString& _sFunctionName) +void ORptFilter::removeFunction(const OUString& _sFunctionName) { m_aFunctions.erase(_sFunctionName); } @@ -1062,7 +1062,7 @@ void ORptFilter::insertFunction(const ::com::sun::star::uno::Reference< ::com::s m_aFunctions.insert(TGroupFunctionMap::value_type(_xFunction->getName(),_xFunction)); } // ----------------------------------------------------------------------------- -SvXMLImportContext* ORptFilter::CreateMetaContext(const ::rtl::OUString& rLocalName,const uno::Reference<xml::sax::XAttributeList>&) +SvXMLImportContext* ORptFilter::CreateMetaContext(const OUString& rLocalName,const uno::Reference<xml::sax::XAttributeList>&) { SvXMLImportContext* pContext = NULL; @@ -1080,7 +1080,7 @@ sal_Bool ORptFilter::isOldFormat() const uno::Reference<beans::XPropertySet> xProp = getImportInfo(); if ( xProp.is() ) { - const static ::rtl::OUString s_sOld("OldFormat"); + const static OUString s_sOld("OldFormat"); if ( xProp->getPropertySetInfo()->hasPropertyByName(s_sOld)) { xProp->getPropertyValue(s_sOld) >>= bOldFormat; diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index c2327d2c8883..b31940d074ab 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -103,16 +103,16 @@ private: sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException); - SvXMLImportContext* CreateStylesContext(const ::rtl::OUString& rLocalName, + SvXMLImportContext* CreateStylesContext(const OUString& rLocalName, const Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle ); - SvXMLImportContext* CreateMetaContext(const ::rtl::OUString& rLocalName, + SvXMLImportContext* CreateMetaContext(const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - SvXMLImportContext* CreateFontDeclsContext(const ::rtl::OUString& rLocalName, + SvXMLImportContext* CreateFontDeclsContext(const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); protected: // SvXMLImport virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual XMLShapeImportHelper* CreateShapeImport(); @@ -126,12 +126,12 @@ public: virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); @@ -167,13 +167,13 @@ public: inline UniReference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const { return m_xColumnStylesPropertySetMapper; } inline UniReference < XMLPropertySetMapper > GetRowStylesPropertySetMapper() const { return m_xRowStylesPropertySetMapper; } inline UniReference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const { return m_xTableStylesPropertySetMapper; } - static ::rtl::OUString convertFormula(const ::rtl::OUString& _sFormula); + static OUString convertFormula(const OUString& _sFormula); /** inserts a new function * * \param _xFunction */ void insertFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > & _xFunction); - void removeFunction(const ::rtl::OUString& _sFunctionName); + void removeFunction(const OUString& _sFunctionName); inline const TGroupFunctionMap& getFunctions() const { return m_aFunctions; } virtual SvXMLImport& getGlobalContext(); @@ -191,8 +191,8 @@ public: class ORptImportHelper { public: - static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); - static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); + static Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); }; @@ -204,8 +204,8 @@ public: class ORptContentImportHelper { public: - static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); - static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); + static Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); }; @@ -217,8 +217,8 @@ public: class ORptStylesImportHelper { public: - static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); - static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); + static Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); }; @@ -230,8 +230,8 @@ public: class ORptMetaImportHelper { public: - static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); - static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); + static Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); }; diff --git a/reportdesign/source/inc/GroupProperties.hxx b/reportdesign/source/inc/GroupProperties.hxx index 6b524c833b39..8ecac5ebe36a 100644 --- a/reportdesign/source/inc/GroupProperties.hxx +++ b/reportdesign/source/inc/GroupProperties.hxx @@ -26,7 +26,7 @@ namespace rptshared struct GroupProperties { ::sal_Int32 m_nGroupInterval; - ::rtl::OUString m_sExpression; + OUString m_sExpression; ::sal_Int16 m_nGroupOn; ::sal_Int16 m_nKeepTogether; ::sal_Bool m_eSortAscending; diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 681023fb232c..54ff5c2f7e58 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -276,22 +276,22 @@ void OAddFieldWindow::_propertyChanged( const beans::PropertyChangeEvent& _evt ) //----------------------------------------------------------------------- namespace { - void lcl_addToList( OAddFieldWindowListBox& _rListBox, const uno::Sequence< ::rtl::OUString >& _rEntries ) + void lcl_addToList( OAddFieldWindowListBox& _rListBox, const uno::Sequence< OUString >& _rEntries ) { - const ::rtl::OUString* pEntries = _rEntries.getConstArray(); + const OUString* pEntries = _rEntries.getConstArray(); sal_Int32 nEntries = _rEntries.getLength(); for ( sal_Int32 i = 0; i < nEntries; ++i, ++pEntries ) _rListBox.InsertEntry( *pEntries,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries) ); } void lcl_addToList( OAddFieldWindowListBox& _rListBox, const uno::Reference< container::XNameAccess>& i_xColumns ) { - uno::Sequence< ::rtl::OUString > aEntries = i_xColumns->getElementNames(); - const ::rtl::OUString* pEntries = aEntries.getConstArray(); + uno::Sequence< OUString > aEntries = i_xColumns->getElementNames(); + const OUString* pEntries = aEntries.getConstArray(); sal_Int32 nEntries = aEntries.getLength(); for ( sal_Int32 i = 0; i < nEntries; ++i, ++pEntries ) { uno::Reference< beans::XPropertySet> xColumn(i_xColumns->getByName(*pEntries),UNO_QUERY_THROW); - ::rtl::OUString sLabel; + OUString sLabel; if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) ) xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel; if ( !sLabel.isEmpty() ) @@ -324,10 +324,10 @@ void OAddFieldWindow::Update() SetText(aTitle); if ( m_xRowSet.is() ) { - ::rtl::OUString sCommand( m_aCommandName ); + OUString sCommand( m_aCommandName ); sal_Int32 nCommandType( m_nCommandType ); sal_Bool bEscapeProcessing( m_bEscapeProcessing ); - ::rtl::OUString sFilter( m_sFilter ); + OUString sFilter( m_sFilter ); OSL_VERIFY( m_xRowSet->getPropertyValue( PROPERTY_COMMAND ) >>= sCommand ); OSL_VERIFY( m_xRowSet->getPropertyValue( PROPERTY_COMMANDTYPE ) >>= nCommandType ); @@ -353,7 +353,7 @@ void OAddFieldWindow::Update() // add the parameter columns to the list uno::Reference< ::com::sun::star::sdbc::XRowSet > xRowSet(m_xRowSet,uno::UNO_QUERY); - Sequence< ::rtl::OUString > aParamNames( getParameterNames( xRowSet ) ); + Sequence< OUString > aParamNames( getParameterNames( xRowSet ) ); lcl_addToList( *m_pListBox, aParamNames ); // set title @@ -454,11 +454,11 @@ void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent { if ( m_pListBox.get() ) { - ::rtl::OUString sName; + OUString sName; if ( (_rEvent.Accessor >>= sName) && m_xColumns->hasByName(sName) ) { uno::Reference< beans::XPropertySet> xColumn(m_xColumns->getByName(sName),UNO_QUERY_THROW); - ::rtl::OUString sLabel; + OUString sLabel; if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) ) xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel; if ( !sLabel.isEmpty() ) diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index fa4fb8b99413..5839248267ed 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -213,7 +213,7 @@ namespace rptui if ( bLastCondition ) { Reference< XFormatCondition > xFormatCondition( m_xCopy->getByIndex( 0 ), UNO_QUERY_THROW ); - xFormatCondition->setFormula( ::rtl::OUString() ); + xFormatCondition->setFormula( OUString() ); (*pos)->setCondition( xFormatCondition ); } else @@ -429,9 +429,9 @@ namespace rptui } // ----------------------------------------------------------------------------- - ::rtl::OUString ConditionalFormattingDialog::getDataField() const + OUString ConditionalFormattingDialog::getDataField() const { - ::rtl::OUString sDataField; + OUString sDataField; try { sDataField = m_xFormatConditions->getDataField(); diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 2d6ad039369a..eee8c29e0762 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -63,7 +63,7 @@ ConditionField::ConditionField( Condition* _pParent, const ResId& _rResId ) : Ed m_pSubEdit->EnableRTL( sal_False ); m_pSubEdit->SetPosPixel( Point() ); - m_aFormula.SetText(::rtl::OUString("...")); + m_aFormula.SetText(OUString("...")); m_aFormula.SetClickHdl( LINK( this, ConditionField, OnFormula ) ); m_aFormula.Show(); m_pSubEdit->Show(); @@ -88,7 +88,7 @@ void ConditionField::Resize() // ----------------------------------------------------------------------------- IMPL_LINK( ConditionField, OnFormula, Button*, /*_pClickedButton*/ ) { - ::rtl::OUString sFormula(m_pSubEdit->GetText()); + OUString sFormula(m_pSubEdit->GetText()); const sal_Int32 nLen = sFormula.getLength(); if ( nLen ) { @@ -569,21 +569,21 @@ void Condition::impl_layoutOperands() } // ----------------------------------------------------------------------------- -void Condition::impl_setCondition( const ::rtl::OUString& _rConditionFormula ) +void Condition::impl_setCondition( const OUString& _rConditionFormula ) { // determine the condition's type and comparison operation ConditionType eType( eFieldValueComparison ); ComparisonOperation eOperation( eBetween ); // LHS and RHS, matched below - ::rtl::OUString sLHS, sRHS; + OUString sLHS, sRHS; if ( !_rConditionFormula.isEmpty() ) { // the unprefixed expression which forms the condition ReportFormula aFormula( _rConditionFormula ); OSL_ENSURE( aFormula.getType() == ReportFormula::Expression, "Condition::setCondition: illegal formula!" ); - ::rtl::OUString sExpression; + OUString sExpression; if ( aFormula.getType() == ReportFormula::Expression ) sExpression = aFormula.getExpression(); // as fallback, if the below matching does not succeed, assume @@ -593,7 +593,7 @@ void Condition::impl_setCondition( const ::rtl::OUString& _rConditionFormula ) // the data field (or expression) to which our control is bound const ReportFormula aFieldContentFormula( m_rAction.getDataField() ); - const ::rtl::OUString sUnprefixedFieldContent( aFieldContentFormula.getBracketedFieldOrExpression() ); + const OUString sUnprefixedFieldContent( aFieldContentFormula.getBracketedFieldOrExpression() ); // check whether one of the Field Value Expression Factories recognizes the expression for ( ConditionalExpressions::const_iterator exp = m_aConditionalExpressions.begin(); @@ -627,7 +627,7 @@ void Condition::setCondition( const uno::Reference< report::XFormatCondition >& if ( !_rxCondition.is() ) return; - ::rtl::OUString sConditionFormula; + OUString sConditionFormula; try { if ( _rxCondition.is() ) @@ -678,15 +678,15 @@ void Condition::fillFormatCondition(const uno::Reference< report::XFormatConditi const ConditionType eType( impl_getCurrentConditionType() ); const ComparisonOperation eOperation( impl_getCurrentComparisonOperation() ); - const ::rtl::OUString sLHS( m_aCondLHS.GetText() ); - const ::rtl::OUString sRHS( m_aCondRHS.GetText() ); + const OUString sLHS( m_aCondLHS.GetText() ); + const OUString sRHS( m_aCondRHS.GetText() ); - ::rtl::OUString sUndecoratedFormula( sLHS ); + OUString sUndecoratedFormula( sLHS ); if ( eType == eFieldValueComparison ) { ReportFormula aFieldContentFormula( m_rAction.getDataField() ); - ::rtl::OUString sUnprefixedFieldContent( aFieldContentFormula.getBracketedFieldOrExpression() ); + OUString sUnprefixedFieldContent( aFieldContentFormula.getBracketedFieldOrExpression() ); PConditionalExpression pFactory( m_aConditionalExpressions[ eOperation ] ); sUndecoratedFormula = pFactory->assembleExpression( sUnprefixedFieldContent, sLHS, sRHS ); diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index b46b2e768915..321baefd8089 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -159,7 +159,7 @@ namespace rptui inline ComparisonOperation impl_getCurrentComparisonOperation() const; - void impl_setCondition( const ::rtl::OUString& _rConditionFormula ); + void impl_setCondition( const OUString& _rConditionFormula ); private: DECL_LINK( OnTypeSelected, ListBox* ); diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index aa393881f7c2..e2574d109280 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -177,12 +177,12 @@ short ODateTimeDialog::Execute() return nRet; } // ----------------------------------------------------------------------------- -::rtl::OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,const uno::Reference< util::XNumberFormats>& _xFormats,bool _bTime) +OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,const uno::Reference< util::XNumberFormats>& _xFormats,bool _bTime) { uno::Reference< beans::XPropertySet> xFormSet = _xFormats->getByKey(_nNumberFormatKey); OSL_ENSURE(xFormSet.is(),"XPropertySet is null!"); - ::rtl::OUString sFormat; - xFormSet->getPropertyValue(::rtl::OUString("FormatString")) >>= sFormat; + OUString sFormat; + xFormSet->getPropertyValue(OUString("FormatString")) >>= sFormat; double nValue = 0; if ( _bTime ) diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 61b9dcbc3293..abbed45b6655 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -45,7 +45,7 @@ namespace rptui FormulaDialog::FormulaDialog(Window* pParent , const uno::Reference<lang::XMultiServiceFactory>& _xServiceFactory , const ::boost::shared_ptr< IFunctionManager >& _pFunctionMgr - , const ::rtl::OUString& _sFormula + , const OUString& _sFormula , const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& _xRowSet) : FormulaModalDialog( pParent, false,false,false,_pFunctionMgr.get(),this) ,m_aFunctionManager(_pFunctionMgr) @@ -53,7 +53,7 @@ FormulaDialog::FormulaDialog(Window* pParent ,m_pAddField(NULL) ,m_xRowSet(_xRowSet) ,m_pEdit(NULL) - ,m_sFormula(::rtl::OUString("=")) + ,m_sFormula(OUString("=")) ,m_nStart(0) ,m_nEnd(1) { @@ -64,7 +64,7 @@ FormulaDialog::FormulaDialog(Window* pParent else m_sFormula = _sFormula; } - m_xParser.set(_xServiceFactory->createInstance(::rtl::OUString("org.libreoffice.report.pentaho.SOFormulaParser")),uno::UNO_QUERY); + m_xParser.set(_xServiceFactory->createInstance(OUString("org.libreoffice.report.pentaho.SOFormulaParser")),uno::UNO_QUERY); if ( m_xParser.is() ) m_xOpCodeMapper = m_xParser->getFormulaOpCodeMapper(); fill(); @@ -86,8 +86,8 @@ FormulaDialog::~FormulaDialog() { if ( m_pAddField ) { - SvtViewOptions aDlgOpt( E_WINDOW, rtl::OUString( HID_RPT_FIELD_SEL_WIN ) ); - aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US)); + SvtViewOptions aDlgOpt( E_WINDOW, OUString( HID_RPT_FIELD_SEL_WIN ) ); + aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US)); boost::scoped_ptr<Window> aTemp2(m_pAddField); m_pAddField = NULL; @@ -198,10 +198,10 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton) { m_pAddField = new OAddFieldWindow(this,m_xRowSet); m_pAddField->SetCreateHdl(LINK( this, FormulaDialog, OnClickHdl ) ); - SvtViewOptions aDlgOpt( E_WINDOW, rtl::OUString( HID_RPT_FIELD_SEL_WIN ) ); + SvtViewOptions aDlgOpt( E_WINDOW, OUString( HID_RPT_FIELD_SEL_WIN ) ); if ( aDlgOpt.Exists() ) { - m_pAddField->SetWindowState(::rtl::OUStringToOString(aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US)); + m_pAddField->SetWindowState(OUStringToOString(aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US)); } @@ -221,11 +221,11 @@ IMPL_LINK( FormulaDialog, OnClickHdl, OAddFieldWindow* ,_pAddFieldDlg) uno::Sequence< beans::PropertyValue > aValue; aArgs[0].Value >>= aValue; ::svx::ODataAccessDescriptor aDescriptor(aValue); - ::rtl::OUString sName; + OUString sName; aDescriptor[ ::svx::daColumnName ] >>= sName; if ( !sName.isEmpty() ) { - sName = ::rtl::OUString("[") + sName + ::rtl::OUString("]"); + sName = OUString("[") + sName + OUString("]"); m_pEdit->SetText(sName); } } diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx index eb127406bb75..06753d8d7653 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.cxx +++ b/reportdesign/source/ui/dlg/GroupExchange.cxx @@ -31,7 +31,7 @@ namespace rptui static sal_uInt32 s_nReportFormat = (sal_uInt32)-1; if ( (sal_uInt32)-1 == s_nReportFormat ) { - s_nReportFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"reportdesign.GroupFormat\"" )); + s_nReportFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"reportdesign.GroupFormat\"" )); OSL_ENSURE((sal_uInt32)-1 != s_nReportFormat, "Bad exchange id!"); } return s_nReportFormat; diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index d8b950fb1ac6..201093267276 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -59,13 +59,13 @@ using namespace ::comphelper; void lcl_addToList_throw( ComboBoxControl& _rListBox, ::std::vector<ColumnInfo>& o_aColumnList,const uno::Reference< container::XNameAccess>& i_xColumns ) { - uno::Sequence< ::rtl::OUString > aEntries = i_xColumns->getElementNames(); - const ::rtl::OUString* pEntries = aEntries.getConstArray(); + uno::Sequence< OUString > aEntries = i_xColumns->getElementNames(); + const OUString* pEntries = aEntries.getConstArray(); sal_Int32 nEntries = aEntries.getLength(); for ( sal_Int32 i = 0; i < nEntries; ++i, ++pEntries ) { uno::Reference< beans::XPropertySet> xColumn(i_xColumns->getByName(*pEntries),uno::UNO_QUERY_THROW); - ::rtl::OUString sLabel; + OUString sLabel; if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) ) xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel; o_aColumnList.push_back( ColumnInfo(*pEntries,sLabel) ); @@ -357,7 +357,7 @@ void OFieldExpressionControl::lateInit() aFont.SetWeight( WEIGHT_LIGHT ); SetFont(aFont); - InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth(rtl::OUString('0')) * 4)/*, sal_True */); + InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth(OUString('0')) * 4)/*, sal_True */); InsertDataColumn( FIELD_EXPRESSION, String(ModuleRes(STR_RPT_EXPRESSION)), 100); m_pComboCell = new ComboBoxControl( &GetDataWindow() ); @@ -455,7 +455,7 @@ sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow) if ( xGroup.is() ) { sal_uInt16 nPos = m_pComboCell->GetSelectEntryPos(); - ::rtl::OUString sExpression; + OUString sExpression; if ( COMBOBOX_ENTRY_NOTFOUND == nPos ) sExpression = m_pComboCell->GetText(); else @@ -499,7 +499,7 @@ String OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/ ) try { uno::Reference< report::XGroup> xGroup = m_pParent->getGroup(m_aGroupPositions[nRow]); - ::rtl::OUString sExpression = xGroup->getExpression(); + OUString sExpression = xGroup->getExpression(); for(::std::vector<ColumnInfo>::const_iterator aIter = m_aColumnInfo.begin(); aIter != m_aColumnInfo.end();++aIter) { @@ -1116,7 +1116,7 @@ void OGroupsSortingDialog::SaveData( sal_Int32 _nRow) } // ----------------------------------------------------------------------------- -sal_Int32 OGroupsSortingDialog::getColumnDataType(const ::rtl::OUString& _sColumnName) +sal_Int32 OGroupsSortingDialog::getColumnDataType(const OUString& _sColumnName) { sal_Int32 nDataType = sdbc::DataType::VARCHAR; try @@ -1344,7 +1344,7 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x nPos = 0; } m_aGroupOnLst.SelectEntryPos(nPos); - m_aGroupIntervalEd.SetText(rtl::OUString::valueOf(_xGroup->getGroupInterval())); + m_aGroupIntervalEd.SetText(OUString::valueOf(_xGroup->getGroupInterval())); m_aGroupIntervalEd.SaveValue(); m_aGroupIntervalEd.Enable( nPos != 0 ); m_aKeepTogetherLst.SelectEntryPos(_xGroup->getKeepTogether()); diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 9680fb8584ca..b37468cc4be5 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -79,17 +79,17 @@ sal_uInt16 lcl_getImageId(const uno::Reference< report::XReportComponent>& _xEle return nId; } // ----------------------------------------------------------------------------- -::rtl::OUString lcl_getName(const uno::Reference< beans::XPropertySet>& _xElement) +OUString lcl_getName(const uno::Reference< beans::XPropertySet>& _xElement) { OSL_ENSURE(_xElement.is(),"Found report element which is NULL!"); - ::rtl::OUString sTempName; + OUString sTempName; _xElement->getPropertyValue(PROPERTY_NAME) >>= sTempName; - ::rtl::OUStringBuffer sName = sTempName; + OUStringBuffer sName = sTempName; uno::Reference< report::XFixedText> xFixedText(_xElement,uno::UNO_QUERY); uno::Reference< report::XReportControlModel> xReportModel(_xElement,uno::UNO_QUERY); if ( xFixedText.is() ) { - sName.append(::rtl::OUString(" : ")); + sName.append(OUString(" : ")); sName.append(xFixedText->getLabel()); } else if ( xReportModel.is() && _xElement->getPropertySetInfo()->hasPropertyByName(PROPERTY_DATAFIELD) ) @@ -97,7 +97,7 @@ sal_uInt16 lcl_getImageId(const uno::Reference< report::XReportComponent>& _xEle ReportFormula aFormula( xReportModel->getDataField() ); if ( aFormula.isValid() ) { - sName.append(::rtl::OUString(" : ")); + sName.append(OUString(" : ")); sName.append( aFormula.getUndecoratedContent() ); } } @@ -151,7 +151,7 @@ class NavigatorTree : public ::cppu::BaseMutex ::rtl::Reference< comphelper::OSelectionChangeMultiplexer> m_pSelectionListener; unsigned short m_nTimerCounter; - SvTreeListEntry* insertEntry(const ::rtl::OUString& _sName,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData); + SvTreeListEntry* insertEntry(const OUString& _sName,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData); void traverseSection(const uno::Reference< report::XSection>& _xSection,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition = LIST_APPEND); void traverseFunctions(const uno::Reference< report::XFunctions>& _xFunctions,SvTreeListEntry* _pParent); @@ -500,7 +500,7 @@ void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw ( m_pSelectionListener->unlock(); } // ----------------------------------------------------------------------------- -SvTreeListEntry* NavigatorTree::insertEntry(const ::rtl::OUString& _sName,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData) +SvTreeListEntry* NavigatorTree::insertEntry(const OUString& _sName,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData) { SvTreeListEntry* pEntry = NULL; if ( _nImageId ) @@ -676,7 +676,7 @@ void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent ) { SvTreeListEntry* pEntry = find(_rEvent.Source); uno::Reference<beans::XPropertySet> xProp(_rEvent.Element,uno::UNO_QUERY_THROW); - ::rtl::OUString sName; + OUString sName; uno::Reference< beans::XPropertySetInfo> xInfo = xProp->getPropertySetInfo(); if ( xInfo.is() ) { @@ -725,7 +725,7 @@ void NavigatorTree::_elementReplaced( const container::ContainerEvent& _rEvent ) UserData* pData = static_cast<UserData*>(pEntry->GetUserData()); xProp.set(_rEvent.Element,uno::UNO_QUERY); pData->setContent(xProp); - ::rtl::OUString sName; + OUString sName; xProp->getPropertyValue(PROPERTY_NAME) >>= sName; SetEntryText(pEntry,sName); } @@ -828,7 +828,7 @@ void NavigatorTree::UserData::_propertyChanged(const beans::PropertyChangeEvent& } else if ( PROPERTY_EXPRESSION == _rEvent.PropertyName) { - ::rtl::OUString sNewName; + OUString sNewName; _rEvent.NewValue >>= sNewName; m_pTree->SetEntryText(pEntry,sNewName); } diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index 07db3b7e1373..bee27840d260 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -62,8 +62,8 @@ class OAddFieldWindow :public FloatingWindow PushButton m_aInsertButton; Link m_aCreateLink; - ::rtl::OUString m_aCommandName; - ::rtl::OUString m_sFilter; + OUString m_aCommandName; + OUString m_sFilter; sal_Int32 m_nCommandType; sal_Bool m_bEscapeProcessing; ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pChangeListener; @@ -84,7 +84,7 @@ public: virtual void GetFocus(); virtual long PreNotify( NotifyEvent& _rNEvt ); - inline const ::rtl::OUString& GetCommand() const { return m_aCommandName; } + inline const OUString& GetCommand() const { return m_aCommandName; } inline sal_Int32 GetCommandType() const { return m_nCommandType; } inline sal_Bool GetEscapeProcessing() const { return m_bEscapeProcessing; } inline void SetCreateHdl(const Link& _aCreateLink) { m_aCreateLink = _aCreateLink; } diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx index 97a5331f4ce7..10142e381d85 100644 --- a/reportdesign/source/ui/inc/ColorListener.hxx +++ b/reportdesign/source/ui/inc/ColorListener.hxx @@ -36,7 +36,7 @@ namespace rptui Link m_aCollapsedLink; svtools::ColorConfig m_aColorConfig; svtools::ExtendedColorConfig m_aExtendedColorConfig; - ::rtl::OUString m_sColorEntry; + OUString m_sColorEntry; sal_Int32 m_nColor; sal_Int32 m_nTextBoundaries; sal_Bool m_bCollapsed; @@ -46,7 +46,7 @@ namespace rptui protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: - OColorListener(Window* _pParent,const ::rtl::OUString& _sColorEntry); + OColorListener(Window* _pParent,const OUString& _sColorEntry); virtual ~OColorListener(); using Window::Notify; diff --git a/reportdesign/source/ui/inc/ColumnInfo.hxx b/reportdesign/source/ui/inc/ColumnInfo.hxx index a0cf8be24112..4a3a64e10291 100644 --- a/reportdesign/source/ui/inc/ColumnInfo.hxx +++ b/reportdesign/source/ui/inc/ColumnInfo.hxx @@ -25,16 +25,16 @@ namespace rptui { struct ColumnInfo { - ::rtl::OUString sColumnName; - ::rtl::OUString sLabel; + OUString sColumnName; + OUString sLabel; bool bColumn; - ColumnInfo(const ::rtl::OUString& i_sColumnName,const ::rtl::OUString& i_sLabel) + ColumnInfo(const OUString& i_sColumnName,const OUString& i_sLabel) : sColumnName(i_sColumnName) , sLabel(i_sLabel) , bColumn(true) { } - ColumnInfo(const ::rtl::OUString& i_sColumnName) + ColumnInfo(const OUString& i_sColumnName) : sColumnName(i_sColumnName) , bColumn(false) { diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx index 465f02aebd63..4d8fa7c515cd 100644 --- a/reportdesign/source/ui/inc/CondFormat.hxx +++ b/reportdesign/source/ui/inc/CondFormat.hxx @@ -55,7 +55,7 @@ namespace rptui virtual void applyCommand( size_t _nCondIndex, sal_uInt16 _nCommandId, const ::Color _aColor ) = 0; virtual void moveConditionUp( size_t _nCondIndex ) = 0; virtual void moveConditionDown( size_t _nCondIndex ) = 0; - virtual ::rtl::OUString getDataField() const = 0; + virtual OUString getDataField() const = 0; protected: ~IConditionalFormatAction() {} @@ -107,7 +107,7 @@ namespace rptui virtual void applyCommand( size_t _nCondIndex, sal_uInt16 _nCommandId, const ::Color _aColor ); virtual void moveConditionUp( size_t _nCondIndex ); virtual void moveConditionDown( size_t _nCondIndex ); - virtual ::rtl::OUString getDataField() const; + virtual OUString getDataField() const; protected: virtual long PreNotify( NotifyEvent& rNEvt ); diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx index 102b52c6aa4d..f24d1f58e024 100644 --- a/reportdesign/source/ui/inc/DataProviderHandler.hxx +++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx @@ -51,8 +51,8 @@ namespace rptui { public: // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -60,9 +60,9 @@ namespace rptui private: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent: virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) throw (::com::sun::star::uno::RuntimeException); @@ -70,20 +70,20 @@ namespace rptui // ::com::sun::star::inspection::XPropertyHandler: virtual void SAL_CALL inspect(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Component) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual void SAL_CALL setPropertyValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); virtual void SAL_CALL addPropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & Listener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); virtual void SAL_CALL removePropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & _rxListener) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isComposable(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const ::rtl::OUString & PropertyName, ::sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException); - virtual void SAL_CALL actuatingPropertyChanged(const ::rtl::OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isComposable(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, ::sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException); + virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); virtual ::sal_Bool SAL_CALL suspend(::sal_Bool Suspend) throw (::com::sun::star::uno::RuntimeException); protected: diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index ae709eec530a..6d2e16612080 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -68,7 +68,7 @@ class ODateTimeDialog : public ModalDialog * \param _bTime * \return */ - ::rtl::OUString getFormatStringByKey(::sal_Int32 _nNumberFormatKey,const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats>& _xFormats,bool _bTime); + OUString getFormatStringByKey(::sal_Int32 _nNumberFormatKey,const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats>& _xFormats,bool _bTime); /** returns the number format key @param _nNumberFormatIndex the number format index @see com::sun::star::i18n::NumberFormatIndex diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx index 7efd3f8a563f..e108a0e9968e 100644 --- a/reportdesign/source/ui/inc/DefaultInspection.hxx +++ b/reportdesign/source/ui/inc/DefaultInspection.hxx @@ -59,9 +59,9 @@ namespace rptui virtual ~DefaultComponentInspectorModel(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XObjectInspectorModel virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getHandlerFactories() throw (::com::sun::star::uno::RuntimeException); @@ -72,15 +72,15 @@ namespace rptui virtual void SAL_CALL setIsReadOnly( ::sal_Bool _isreadonly ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::inspection::PropertyCategoryDescriptor > SAL_CALL describeCategories( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) throw (::com::sun::star::uno::RuntimeException); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); public: // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index efaae2c8bafd..d0bd083cc181 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -114,9 +114,9 @@ namespace rptui inline OReportController& getController() const { return m_rReportController; } void SetMode( DlgEdMode m_eMode ); - void SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); + void SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString()); sal_uInt16 GetInsertObj() const; - rtl::OUString GetInsertObjString() const; + OUString GetInsertObjString() const; DlgEdMode GetMode() const { return m_eMode; } /** cuts the current selection in this section @@ -168,7 +168,7 @@ namespace rptui If the position is grater than the current elements, the section will be appended. */ void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection - ,const ::rtl::OUString& _sColorEntry + ,const OUString& _sColorEntry ,sal_uInt16 _nPosition = USHRT_MAX); inline Size getGridSizeCoarse() const { return m_aGridSizeCoarse; } @@ -231,8 +231,8 @@ namespace rptui */ void collapseSections(const com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aCollpasedSections); - ::rtl::OUString getCurrentPage() const; - void setCurrentPage(const ::rtl::OUString& _sLastActivePage); + OUString getCurrentPage() const; + void setCurrentPage(const OUString& _sLastActivePage); /** checks if the keycode is known by the child windows @param _rCode the keycode diff --git a/reportdesign/source/ui/inc/EndMarker.hxx b/reportdesign/source/ui/inc/EndMarker.hxx index cfd340cb4c97..6cd3f195fd38 100644 --- a/reportdesign/source/ui/inc/EndMarker.hxx +++ b/reportdesign/source/ui/inc/EndMarker.hxx @@ -33,7 +33,7 @@ namespace rptui protected: virtual void ImplInitSettings(); public: - OEndMarker(Window* _pParent,const ::rtl::OUString& _sColorEntry); + OEndMarker(Window* _pParent,const OUString& _sColorEntry); virtual ~OEndMarker(); // windows diff --git a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx index ba75b9274b93..b32b90395df4 100644 --- a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx +++ b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx @@ -40,7 +40,7 @@ namespace rptui ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer > getVclWindowPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent) throw(::com::sun::star::uno::RuntimeException); void setPlaceholderText( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); - void setPlaceholderText( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >& _xVclWindowPeer, const ::rtl::OUString& _rText ); + void setPlaceholderText( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >& _xVclWindowPeer, const OUString& _rText ); sal_Int32 getTextColor(); diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index 8bb6a5238b66..fcfbc6c82e62 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -56,7 +56,7 @@ public: FormulaDialog( Window* pParent , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _xServiceFactory , const ::boost::shared_ptr< formula::IFunctionManager >& _pFunctionMgr - , const ::rtl::OUString& _sFormula + , const OUString& _sFormula , const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& _xRowSet); virtual ~FormulaDialog(); diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx index df42f61bfd98..99dbd351a40d 100644 --- a/reportdesign/source/ui/inc/FunctionHelper.hxx +++ b/reportdesign/source/ui/inc/FunctionHelper.hxx @@ -49,7 +49,7 @@ public: virtual sal_uInt32 getCount() const; virtual const formula::IFunctionCategory* getCategory(sal_uInt32 nPos) const; virtual void fillLastRecentlyUsedFunctions(::std::vector< const formula::IFunctionDescription*>& _rLastRUFunctions) const; - virtual const formula::IFunctionDescription* getFunctionByName(const ::rtl::OUString& _sFunctionName) const; + virtual const formula::IFunctionDescription* getFunctionByName(const OUString& _sFunctionName) const; virtual sal_Unicode getSingleToken(const EToken _eToken) const; ::boost::shared_ptr< FunctionDescription > get(const ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionDescription>& _xFunctionDescription) const; @@ -64,18 +64,18 @@ public: FunctionDescription(const formula::IFunctionCategory* _pFunctionCategory,const ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionDescription>& _xFunctionDescription); virtual ~FunctionDescription(){} - virtual ::rtl::OUString getFunctionName() const ; + virtual OUString getFunctionName() const ; virtual const formula::IFunctionCategory* getCategory() const ; - virtual ::rtl::OUString getDescription() const ; + virtual OUString getDescription() const ; virtual xub_StrLen getSuppressedArgumentCount() const ; - virtual ::rtl::OUString getFormula(const ::std::vector< ::rtl::OUString >& _aArguments) const ; + virtual OUString getFormula(const ::std::vector< OUString >& _aArguments) const ; virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const ; virtual void initArgumentInfo() const; - virtual ::rtl::OUString getSignature() const ; - virtual rtl::OString getHelpId() const ; + virtual OUString getSignature() const ; + virtual OString getHelpId() const ; virtual sal_uInt32 getParameterCount() const ; - virtual ::rtl::OUString getParameterName(sal_uInt32 _nPos) const ; - virtual ::rtl::OUString getParameterDescription(sal_uInt32 _nPos) const ; + virtual OUString getParameterName(sal_uInt32 _nPos) const ; + virtual OUString getParameterDescription(sal_uInt32 _nPos) const ; virtual bool isParameterOptional(sal_uInt32 _nPos) const ; }; //============================================================================ @@ -94,7 +94,7 @@ public: virtual const formula::IFunctionDescription* getFunction(sal_uInt32 _nPos) const; virtual sal_uInt32 getNumber() const; virtual const formula::IFunctionManager* getFunctionManager() const; - virtual ::rtl::OUString getName() const; + virtual OUString getName() const; }; // ============================================================================= } // rptui diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx index bdef435806c2..ef9bfcfb1bcb 100644 --- a/reportdesign/source/ui/inc/GeometryHandler.hxx +++ b/reportdesign/source/ui/inc/GeometryHandler.hxx @@ -44,19 +44,19 @@ namespace rptui struct DefaultFunction { - com::sun::star::beans::Optional< ::rtl::OUString> m_sInitialFormula; - ::rtl::OUString m_sName; - ::rtl::OUString m_sSearchString; - ::rtl::OUString m_sFormula; + com::sun::star::beans::Optional< OUString> m_sInitialFormula; + OUString m_sName; + OUString m_sSearchString; + OUString m_sFormula; ::sal_Bool m_bPreEvaluated; ::sal_Bool m_bDeepTraversing; - inline ::rtl::OUString getName() const { return m_sName; } + inline OUString getName() const { return m_sName; } } ; class OPropertyInfoService; typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction>, ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier> > TFunctionPair; - typedef ::std::multimap< ::rtl::OUString,TFunctionPair, ::comphelper::UStringMixLess > TFunctions; + typedef ::std::multimap< OUString,TFunctionPair, ::comphelper::UStringMixLess > TFunctions; typedef ::comphelper::OSimpleListenerContainer < ::com::sun::star::beans::XPropertyChangeListener , ::com::sun::star::beans::PropertyChangeEvent > PropertyChangeListeners; @@ -81,17 +81,17 @@ namespace rptui @return <TRUE/> if and only if the user successfully chose a clause */ - bool impl_dialogFilter_nothrow( ::rtl::OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; + bool impl_dialogFilter_nothrow( OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; /** returns the data field type depending on the data field of the report control * * \param _sDataField if the data field is not empty it will be used as data field, otherwise the data field will be used. * \return the data field type */ - sal_uInt32 impl_getDataFieldType_throw(const ::rtl::OUString& _sDataField = ::rtl::OUString()) const; + sal_uInt32 impl_getDataFieldType_throw(const OUString& _sDataField = OUString()) const; - ::com::sun::star::uno::Any getConstantValue(sal_Bool bToControlValue,sal_uInt16 nResId,const ::com::sun::star::uno::Any& _aValue,const ::rtl::OUString& _sConstantName,const ::rtl::OUString & PropertyName ); - ::com::sun::star::beans::Property getProperty(const ::rtl::OUString & PropertyName); + ::com::sun::star::uno::Any getConstantValue(sal_Bool bToControlValue,sal_uInt16 nResId,const ::com::sun::star::uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName ); + ::com::sun::star::beans::Property getProperty(const OUString & PropertyName); void implCreateListLikeControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ,::com::sun::star::inspection::LineDescriptor & out_Descriptor @@ -102,16 +102,16 @@ namespace rptui void implCreateListLikeControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ,::com::sun::star::inspection::LineDescriptor & out_Descriptor - ,const ::std::vector< ::rtl::OUString>& _aEntries + ,const ::std::vector< OUString>& _aEntries ,sal_Bool _bReadOnlyControl ,sal_Bool _bTrueIfListBoxFalseIfComboBox ); void checkPosAndSize( const ::com::sun::star::awt::Point& _aNewPos, const ::com::sun::star::awt::Size& _aSize); - ::rtl::OUString impl_convertToFormula( const ::com::sun::star::uno::Any& _rControlValue ); + OUString impl_convertToFormula( const ::com::sun::star::uno::Any& _rControlValue ); - void impl_initFieldList_nothrow( ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rFieldNames ) const; + void impl_initFieldList_nothrow( ::com::sun::star::uno::Sequence< OUString >& _rFieldNames ) const; /** Creates the function defined by the function template * @@ -119,7 +119,7 @@ namespace rptui * \param _sDataField the data field * \param _aFunction the function template */ - void impl_createFunction(const ::rtl::OUString& _sFunctionName,const ::rtl::OUString& _sDataField,const DefaultFunction& _aFunction); + void impl_createFunction(const OUString& _sFunctionName,const OUString& _sDataField,const DefaultFunction& _aFunction); /** check whether the given function name is a countr function. * @@ -127,7 +127,7 @@ namespace rptui * \param _Out_sScope the scope of the function * \return When true it is a counter functions otherwise false. */ - bool impl_isCounterFunction_throw(const ::rtl::OUString& _sQuotedFunctionName,::rtl::OUString& _Out_sScope) const; + bool impl_isCounterFunction_throw(const OUString& _sQuotedFunctionName,OUString& _Out_sScope) const; /** clear the own properties like function and scope and send a notification * @@ -136,51 +136,51 @@ namespace rptui * \param _sOldScope * \param _nOldDataFieldType */ - void resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,const ::rtl::OUString& _sOldFunctionName,const ::rtl::OUString& _sOldScope,const sal_uInt32 _nOldDataFieldType); + void resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,const OUString& _sOldFunctionName,const OUString& _sOldScope,const sal_uInt32 _nOldDataFieldType); /** checks whether the name is a field or a parameter * * \param _sName the name to check * \return true when it is a field or parameter otherwise false */ - bool impl_isDataField(const ::rtl::OUString& _sName) const; + bool impl_isDataField(const OUString& _sName) const; /**return all formula in a semicolon separated list * * \param _rList the localized function names */ - void impl_fillFormulaList_nothrow(::std::vector< ::rtl::OUString >& _out_rList) const; + void impl_fillFormulaList_nothrow(::std::vector< OUString >& _out_rList) const; /** return all group names in a semicolon separated list starting with the group where this control is contained in. * * \param _rList fills the list with all scope names. */ - void impl_fillScopeList_nothrow(::std::vector< ::rtl::OUString >& _out_rList) const; + void impl_fillScopeList_nothrow(::std::vector< OUString >& _out_rList) const; /** return all supported output formats of the report definition * * \param _rList fills the list with all mime types */ - void impl_fillMimeTypes_nothrow(::std::vector< ::rtl::OUString >& _out_rList) const; + void impl_fillMimeTypes_nothrow(::std::vector< OUString >& _out_rList) const; /** return the one supported output formats of the report definition * * \param _sMimetype the mimetype */ - ::rtl::OUString impl_ConvertMimeTypeToUI_nothrow(const ::rtl::OUString& _sMimetype) const; + OUString impl_ConvertMimeTypeToUI_nothrow(const OUString& _sMimetype) const; /** return the MimeType for the given UI Name * * \param _sUIName the doc ui name */ - ::rtl::OUString impl_ConvertUIToMimeType_nothrow(const ::rtl::OUString& _sUIName) const; + OUString impl_ConvertUIToMimeType_nothrow(const OUString& _sUIName) const; /** get the functions supplier for the set scope, default is the surrounding group. * * \param _rsNamePostFix the name post fix which canbe used when the scope as name part is needed * \return the function supplier */ - ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier> fillScope_throw(::rtl::OUString& _rsNamePostFix); + ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier> fillScope_throw(OUString& _rsNamePostFix); /** checks if the given function is a default function we know. * @@ -190,8 +190,8 @@ namespace rptui * \param _bSet If set to sal_True than the m_sDefaultFunction and m_sScope vars will be set if successful. * \return sal_True with known otherwise sal_False */ - sal_Bool isDefaultFunction(const ::rtl::OUString& _sQuotedFunction - ,::rtl::OUString& _Out_rDataField + sal_Bool isDefaultFunction(const OUString& _sQuotedFunction + ,OUString& _Out_rDataField ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier>& _xFunctionsSupplier = ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier>() ,bool _bSet = false) const; @@ -203,8 +203,8 @@ namespace rptui * \return */ sal_Bool impl_isDefaultFunction_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction>& _xFunction - ,::rtl::OUString& _rDataField - ,::rtl::OUString& _rsDefaultFunctionName) const; + ,OUString& _rDataField + ,OUString& _rsDefaultFunctionName) const; /** fills the memeber m_aDefaultFunctions * @@ -218,7 +218,7 @@ namespace rptui * \param _sFunction The name of the function. * \param _sDataField The name of the data field. */ - void createDefaultFunction(::osl::ResettableMutexGuard& _aGuard ,const ::rtl::OUString& _sFunction,const ::rtl::OUString& _sDataField); + void createDefaultFunction(::osl::ResettableMutexGuard& _aGuard ,const OUString& _sFunction,const OUString& _sDataField); void removeFunction(); @@ -238,8 +238,8 @@ namespace rptui public: // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -247,9 +247,9 @@ namespace rptui explicit GeometryHandler(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent: virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) throw (::com::sun::star::uno::RuntimeException); @@ -257,20 +257,20 @@ namespace rptui // ::com::sun::star::inspection::XPropertyHandler: virtual void SAL_CALL inspect(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Component) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual void SAL_CALL setPropertyValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); virtual void SAL_CALL addPropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & Listener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); virtual void SAL_CALL removePropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & _rxListener) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isComposable(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const ::rtl::OUString & PropertyName, ::sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException); - virtual void SAL_CALL actuatingPropertyChanged(const ::rtl::OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isComposable(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, ::sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException); + virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); virtual ::sal_Bool SAL_CALL suspend(::sal_Bool Suspend) throw (::com::sun::star::uno::RuntimeException); protected: @@ -286,8 +286,8 @@ namespace rptui virtual void SAL_CALL disposing(); PropertyChangeListeners m_aPropertyListeners; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aFieldNames; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aParamNames; + ::com::sun::star::uno::Sequence< OUString > m_aFieldNames; + ::com::sun::star::uno::Sequence< OUString > m_aParamNames; TFunctions m_aFunctionNames; ::std::vector< DefaultFunction > m_aDefaultFunctions; DefaultFunction m_aCounterFunction; @@ -302,8 +302,8 @@ namespace rptui SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< OPropertyInfoService > m_pInfoService; SAL_WNODEPRECATED_DECLARATIONS_POP - mutable ::rtl::OUString m_sDefaultFunction; - mutable ::rtl::OUString m_sScope; + mutable OUString m_sDefaultFunction; + mutable OUString m_sScope; sal_uInt32 m_nDataFieldType; mutable bool m_bNewFunction; bool m_bIn; diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 1b67a6d5506a..53b7d50e4569 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -124,7 +124,7 @@ private: /** returns the data type for the given column name @param _sColumnName */ - sal_Int32 getColumnDataType(const ::rtl::OUString& _sColumnName); + sal_Int32 getColumnDataType(const OUString& _sColumnName); /** shows the text given by the id in the multiline edit @param _nResId the string id diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx index 833513ce9c45..97532abd31ef 100644 --- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx +++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx @@ -45,8 +45,8 @@ namespace rptui { public: // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -54,9 +54,9 @@ namespace rptui explicit ReportComponentHandler(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent: virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) throw (::com::sun::star::uno::RuntimeException); @@ -64,20 +64,20 @@ namespace rptui // ::com::sun::star::inspection::XPropertyHandler: virtual void SAL_CALL inspect(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Component) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual void SAL_CALL setPropertyValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); virtual void SAL_CALL addPropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & Listener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); virtual void SAL_CALL removePropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & _rxListener) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isComposable(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const ::rtl::OUString & PropertyName, ::sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException); - virtual void SAL_CALL actuatingPropertyChanged(const ::rtl::OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isComposable(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, ::sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException); + virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); virtual ::sal_Bool SAL_CALL suspend(::sal_Bool Suspend) throw (::com::sun::star::uno::RuntimeException); protected: diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index cb3c95cacc1e..9f2cbe0167fb 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -112,9 +112,9 @@ namespace rptui ::boost::shared_ptr<rptui::OReportModel> m_aReportModel; - ::rtl::OUString m_sName; /// name for the report definition - ::rtl::OUString m_sLastActivePage; /// last active property browser page - ::rtl::OUString m_sMode; /// the current mode of the controller + OUString m_sName; /// name for the report definition + OUString m_sLastActivePage; /// last active property browser page + OUString m_sMode; /// the current mode of the controller sal_Int32 m_nSplitPos; /// the position of the splitter sal_Int32 m_nPageNum; /// the page number from the restoreView call sal_Int32 m_nSelectionCount; @@ -137,7 +137,7 @@ namespace rptui * \param _xSection the section where to create the formatted field * \param _sFunction the function which will be set at the data field. */ - void createControl(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aArgs,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,const ::rtl::OUString& _sFunction ,sal_uInt16 _nObjectId = OBJ_DLG_FORMATTEDFIELD); + void createControl(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aArgs,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,const OUString& _sFunction ,sal_uInt16 _nObjectId = OBJ_DLG_FORMATTEDFIELD); /** switch the report header/footer sectionon off with undo or without depending on the given id. * * \param _nId Can either be SID_REPORTHEADER_WITHOUT_UNDO or SID_REPORTFOOTER_WITHOUT_UNDO or SID_REPORTHEADERFOOTER. @@ -201,7 +201,7 @@ namespace rptui @param _bShow when <TRUE/> the header and footer will be shown otherwise not */ void groupChange( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup - ,const ::rtl::OUString& _sPropName + ,const OUString& _sPropName ,sal_Int32 _nGroupPos ,bool _bShow); @@ -304,14 +304,14 @@ namespace rptui @param _sProperty the property which should be filled in the value @param _rState the state to fill */ - void impl_fillState_nothrow(const ::rtl::OUString& _sProperty,dbaui::FeatureState& _rState) const; + void impl_fillState_nothrow(const OUString& _sProperty,dbaui::FeatureState& _rState) const; void impl_fillCustomShapeState_nothrow(const char* _pCustomShapeType,dbaui::FeatureState& _rState) const; /** set the property at all selected controls. @return <TRUE/> when the selection is not empty */ bool impl_setPropertyAtControls_throw(const sal_uInt16 _nUndoResId - ,const ::rtl::OUString& _sProperty + ,const OUString& _sProperty ,const ::com::sun::star::uno::Any& _aValue ,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aArgs); @@ -363,11 +363,11 @@ namespace rptui virtual void SAL_CALL disposing(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // need by registration - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); @@ -399,13 +399,13 @@ namespace rptui virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel(void) throw( ::com::sun::star::uno::RuntimeException ); // XTitle - virtual ::rtl::OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); // XModeSelector - virtual void SAL_CALL setMode( const ::rtl::OUString& aMode ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getMode( ) throw (::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedModes( ) throw (::com::sun::star::uno::RuntimeException) ; - virtual ::sal_Bool SAL_CALL supportsMode( const ::rtl::OUString& aMode ) throw (::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL setMode( const OUString& aMode ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException) ; + virtual OUString SAL_CALL getMode( ) throw (::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedModes( ) throw (::com::sun::star::uno::RuntimeException) ; + virtual ::sal_Bool SAL_CALL supportsMode( const OUString& aMode ) throw (::com::sun::star::uno::RuntimeException) ; // XVisualObject virtual void SAL_CALL setVisualAreaSize( ::sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -462,7 +462,7 @@ namespace rptui ::boost::shared_ptr<OSectionWindow> getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getColumns() const; - ::rtl::OUString getColumnLabel_throw(const ::rtl::OUString& i_sColumnName) const; + OUString getColumnLabel_throw(const OUString& i_sColumnName) const; SfxUndoManager& getUndoManager() const; void clearUndoManager() const; diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx index a7cf37642048..072973d2f1ff 100644 --- a/reportdesign/source/ui/inc/ReportSection.hxx +++ b/reportdesign/source/ui/inc/ReportSection.hxx @@ -144,14 +144,14 @@ namespace rptui * * @param _sType */ - void createDefault(const ::rtl::OUString& _sType); + void createDefault(const OUString& _sType); /** creates a new default custom shape * * \param _sType * \param _pObj */ - void createDefault(const ::rtl::OUString& _sType,SdrObject* _pObj); + void createDefault(const OUString& _sType,SdrObject* _pObj); void stopScrollTimer(); /** deactivate the currect active ole object if any diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx index 878914bfe651..93c7e87f3173 100644 --- a/reportdesign/source/ui/inc/ReportWindow.hxx +++ b/reportdesign/source/ui/inc/ReportWindow.hxx @@ -78,8 +78,8 @@ namespace rptui inline OScrollWindowHelper* getScrollWindow() const { return m_pParent; } void SetMode( DlgEdMode m_eMode ); - void SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); - rtl::OUString GetInsertObjString() const; + void SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString()); + OUString GetInsertObjString() const; void setGridSnap(sal_Bool bOn); void setDragStripes(sal_Bool bOn); @@ -123,7 +123,7 @@ namespace rptui If the position is grater than the current elements, the section will be appended. */ void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection - ,const ::rtl::OUString& _sColorEntry + ,const OUString& _sColorEntry ,sal_uInt16 _nPosition = USHRT_MAX); sal_uInt16 getSectionCount() const; diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx index 1e36634a9a03..b4d47c7fcc37 100644 --- a/reportdesign/source/ui/inc/RptUndo.hxx +++ b/reportdesign/source/ui/inc/RptUndo.hxx @@ -40,7 +40,7 @@ namespace rptui protected: ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> > m_aControls; - ::std::vector< ::std::pair< ::rtl::OUString ,::com::sun::star::uno::Any> > + ::std::vector< ::std::pair< OUString ,::com::sun::star::uno::Any> > m_aValues; Action m_eAction; sal_uInt16 m_nSlot; @@ -95,7 +95,7 @@ namespace rptui ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > ,OGroupHelper> m_pMemberFunction; - mutable ::rtl::OUString m_sName; + mutable OUString m_sName; void implReInsert( ); void implReRemove( ); @@ -112,7 +112,7 @@ namespace rptui ,Action _eAction ,sal_uInt16 nCommentID); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; /** /class OGroupUndo diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx index 618d8ad6a7a3..c2b0816cd921 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/source/ui/inc/ScrollHelper.hxx @@ -88,8 +88,8 @@ namespace rptui // forwards void SetMode( DlgEdMode _eMode ); - void SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); - rtl::OUString GetInsertObjString() const; + void SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString()); + OUString GetInsertObjString() const; void setGridSnap(sal_Bool bOn); void setDragStripes(sal_Bool bOn); /** copies the current selection in this section @@ -130,7 +130,7 @@ namespace rptui If the position is grater than the current elements, the section will be appended. */ void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection - ,const ::rtl::OUString& _sColorEntry + ,const OUString& _sColorEntry ,sal_uInt16 _nPosition = USHRT_MAX); sal_uInt16 getSectionCount() const; diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx index 7f00e8ea3b59..0b262fa18e77 100644 --- a/reportdesign/source/ui/inc/SectionWindow.hxx +++ b/reportdesign/source/ui/inc/SectionWindow.hxx @@ -95,7 +95,7 @@ namespace rptui public: OSectionWindow( OViewsWindow* _pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection - ,const ::rtl::OUString& _sColorEntry); + ,const OUString& _sColorEntry); virtual ~OSectionWindow(); inline OStartMarker& getStartMarker() { return m_aStartMarker; } diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx index 6bfe03a55849..0c3115cfb87a 100644 --- a/reportdesign/source/ui/inc/StartMarker.hxx +++ b/reportdesign/source/ui/inc/StartMarker.hxx @@ -48,7 +48,7 @@ namespace rptui OStartMarker(OStartMarker&); void operator =(OStartMarker&); public: - OStartMarker(OSectionWindow* _pParent,const ::rtl::OUString& _sColorEntry); + OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry); virtual ~OStartMarker(); // SfxListener diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx index 29b7c4c1095d..19967ed3c059 100644 --- a/reportdesign/source/ui/inc/UITools.hxx +++ b/reportdesign/source/ui/inc/UITools.hxx @@ -101,7 +101,7 @@ namespace rptui @return <TRUE/> if and only if the user successfully chose a clause */ - bool openDialogFormula_nothrow( ::rtl::OUString& _in_out_rFormula + bool openDialogFormula_nothrow( OUString& _in_out_rFormula , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext , const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& _xWindow , const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& _xRowSet @@ -153,7 +153,7 @@ namespace rptui /** retrieves the names of the parameters of the command which the given RowSet is bound to */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > getParameterNames( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet ); /** ensures that no control overlaps the given one. diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index 1c469f96b666..d868f25453ac 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -128,7 +128,7 @@ namespace rptui TSectionsMap m_aSections; svtools::ColorConfig m_aColorConfig; OReportWindow* m_pParent; - ::rtl::OUString m_sShapeType; + OUString m_sShapeType; sal_Bool m_bInSplitHandler; sal_Bool m_bInUnmark; @@ -177,7 +177,7 @@ namespace rptui If the position is grater than the current elements, the section will be appended. */ void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection - ,const ::rtl::OUString& _sColorEntry + ,const OUString& _sColorEntry ,sal_uInt16 _nPosition = USHRT_MAX); sal_uInt16 getSectionCount() const; @@ -202,8 +202,8 @@ namespace rptui inline bool empty() const { return m_aSections.empty(); } void SetMode( DlgEdMode m_eMode ); - void SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); - rtl::OUString GetInsertObjString() const; + void SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString()); + OUString GetInsertObjString() const; /** copies the current selection in this section */ void Copy(); @@ -277,7 +277,7 @@ namespace rptui * * \return \member m_sShapeType */ - inline ::rtl::OUString getShapeType() const { return m_sShapeType; } + inline OUString getShapeType() const { return m_sShapeType; } /** returns the current position in the list */ diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index 06493f08cfc8..543efb1bf0b0 100644 --- a/reportdesign/source/ui/inc/metadata.hxx +++ b/reportdesign/source/ui/inc/metadata.hxx @@ -50,12 +50,12 @@ namespace rptui // IPropertyInfoService sal_Int32 getPropertyId(const String& _rName) const; String getPropertyTranslation(sal_Int32 _nId) const; - rtl::OString getPropertyHelpId(sal_Int32 _nId) const; + OString getPropertyHelpId(sal_Int32 _nId) const; sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const; static void getExcludeProperties(::std::vector< com::sun::star::beans::Property >& _rExcludeProperties,const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler); bool isComposable( - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler ); @@ -73,7 +73,7 @@ namespace rptui class HelpIdUrl { public: - static ::rtl::OUString getHelpURL( const rtl::OString& _sHelpId ); + static OUString getHelpURL( const OString& _sHelpId ); }; //======================================================================== diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx index fcb6809cb16b..005d1d554a38 100644 --- a/reportdesign/source/ui/inc/propbrw.hxx +++ b/reportdesign/source/ui/inc/propbrw.hxx @@ -58,7 +58,7 @@ private: m_xBrowserComponentWindow; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xLastSection; /// is the previously displayed section - ::rtl::OUString m_sLastActivePage; + OUString m_sLastActivePage; ODesignView* m_pDesignView; OSectionView* m_pView; sal_Bool m_bInitialStateChange; @@ -76,7 +76,7 @@ protected: void implSetNewObject( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> >& _aObjects = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> >()); - ::rtl::OUString GetHeadlineName( + OUString GetHeadlineName( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> >& _aObjects); void implDetachController(); @@ -97,8 +97,8 @@ public: void Update( OSectionView* m_pView ); void Update( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xReportComponent); inline OSectionView* GetCurView() const { return m_pView; } - ::rtl::OUString getCurrentPage() const; - void setCurrentPage(const ::rtl::OUString& _sLastActivePage); + OUString getCurrentPage() const; + void setCurrentPage(const OUString& _sLastActivePage); ::Size getMinimumSize() const; private: diff --git a/reportdesign/source/ui/inc/statusbarcontroller.hxx b/reportdesign/source/ui/inc/statusbarcontroller.hxx index a6927bc724f1..413cca6d2ac9 100644 --- a/reportdesign/source/ui/inc/statusbarcontroller.hxx +++ b/reportdesign/source/ui/inc/statusbarcontroller.hxx @@ -40,8 +40,8 @@ namespace rptui public: OStatusbarController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); @@ -50,11 +50,11 @@ namespace rptui // XInterface DECLARE_XINTERFACE( ) // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // need by registration - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx index 01e534de889e..41c0a5fd33b7 100644 --- a/reportdesign/source/ui/inc/toolboxcontroller.hxx +++ b/reportdesign/source/ui/inc/toolboxcontroller.hxx @@ -53,14 +53,14 @@ namespace rptui virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // need by registration - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -71,8 +71,8 @@ namespace rptui // XSubToolbarController virtual ::sal_Bool SAL_CALL opensSubToolbar( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubToolbarName( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL functionSelected( const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSubToolbarName( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateImage( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 6dad9740dcd4..219860eabd33 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -63,7 +63,7 @@ DataProviderHandler::DataProviderHandler(uno::Reference< uno::XComponentContext { try { - m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW); + m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW); m_xTypeConverter.set(script::Converter::create(m_xContext)); }catch(const uno::Exception &) @@ -72,34 +72,34 @@ DataProviderHandler::DataProviderHandler(uno::Reference< uno::XComponentContext } //------------------------------------------------------------------------ -::rtl::OUString SAL_CALL DataProviderHandler::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL DataProviderHandler::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------ -sal_Bool SAL_CALL DataProviderHandler::supportsService( const ::rtl::OUString& ServiceName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL DataProviderHandler::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_static()); } //------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL DataProviderHandler::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DataProviderHandler::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_static(); } //------------------------------------------------------------------------ -::rtl::OUString DataProviderHandler::getImplementationName_Static( ) throw(uno::RuntimeException) +OUString DataProviderHandler::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.DataProviderHandler"); + return OUString("com.sun.star.comp.report.DataProviderHandler"); } //------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > DataProviderHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) +uno::Sequence< OUString > DataProviderHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.report.inspection.DataProviderHandler"); + uno::Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.report.inspection.DataProviderHandler"); return aSupported; } @@ -136,11 +136,11 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface try { uno::Reference< container::XNameContainer > xNameCont(Component,uno::UNO_QUERY); - const ::rtl::OUString sFormComponent("FormComponent"); + const OUString sFormComponent("FormComponent"); if ( xNameCont->hasByName(sFormComponent) ) { uno::Reference<beans::XPropertySet> xProp(xNameCont->getByName(sFormComponent),uno::UNO_QUERY); - const ::rtl::OUString sModel("Model"); + const OUString sModel("Model"); if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(sModel) ) { m_xChartModel.set(xProp->getPropertyValue(sModel),uno::UNO_QUERY); @@ -149,7 +149,7 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface } } m_xDataProvider.set(m_xFormComponent,uno::UNO_QUERY); - m_xReportComponent.set( xNameCont->getByName( ::rtl::OUString( "ReportComponent" ) ), uno::UNO_QUERY ); + m_xReportComponent.set( xNameCont->getByName( OUString( "ReportComponent" ) ), uno::UNO_QUERY ); if ( m_xDataProvider.is() ) { ::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter()); @@ -170,7 +170,7 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface } } -uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const ::rtl::OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException) +uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException) { ::osl::MutexGuard aGuard( m_aMutex ); uno::Any aPropertyValue; @@ -184,7 +184,7 @@ uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const ::rtl::OUString & // uno::Reference< chart2::XDiagram > xDiagram( m_xChartModel->getFirstDiagram() ); // if( xDiagram.is() ) // { - // ::rtl::OUString sChartTypes; + // OUString sChartTypes; // uno::Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xDiagram, uno::UNO_QUERY_THROW ); // const uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > aCooSysSeq( xCooSysCnt->getCoordinateSystems()); // const uno::Reference< chart2::XCoordinateSystem >* pIter = aCooSysSeq.getConstArray(); @@ -198,7 +198,7 @@ uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const ::rtl::OUString & // for(;pChartTypeIter != pChartTypeEnd;++pChartTypeIter) // { // sChartTypes += (*pChartTypeIter)->getChartType(); - // sChartTypes += ::rtl::OUString(";"); + // sChartTypes += OUString(";"); // } // } // aPropertyValue;// <<= sChartTypes; @@ -215,7 +215,7 @@ uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const ::rtl::OUString & return aPropertyValue; } -void SAL_CALL DataProviderHandler::setPropertyValue(const ::rtl::OUString & PropertyName, const uno::Any & Value) throw (uno::RuntimeException, beans::UnknownPropertyException) +void SAL_CALL DataProviderHandler::setPropertyValue(const OUString & PropertyName, const uno::Any & Value) throw (uno::RuntimeException, beans::UnknownPropertyException) { ::osl::MutexGuard aGuard( m_aMutex ); uno::Any aPropertyValue; @@ -241,13 +241,13 @@ void DataProviderHandler::impl_updateChartTitle_throw(const uno::Any& _aValue) uno::Reference<chart2::XTitle> xTitle = xTitled->getTitleObject(); if ( !xTitle.is() ) { - xTitle.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.chart2.Title"),m_xContext),uno::UNO_QUERY); + xTitle.set(m_xContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.chart2.Title"),m_xContext),uno::UNO_QUERY); xTitled->setTitleObject(xTitle); } if ( xTitle.is() ) { - uno::Reference< chart2::XFormattedString> xFormatted(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.chart2.FormattedString"),m_xContext),uno::UNO_QUERY); - ::rtl::OUString sStr; + uno::Reference< chart2::XFormattedString> xFormatted(m_xContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.chart2.FormattedString"),m_xContext),uno::UNO_QUERY); + OUString sStr; _aValue>>= sStr; xFormatted->setString(sStr); uno::Sequence< uno::Reference< chart2::XFormattedString> > aArgs(1); @@ -257,19 +257,19 @@ void DataProviderHandler::impl_updateChartTitle_throw(const uno::Any& _aValue) } } -beans::PropertyState SAL_CALL DataProviderHandler::getPropertyState(const ::rtl::OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException) +beans::PropertyState SAL_CALL DataProviderHandler::getPropertyState(const OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException) { return m_xFormComponentHandler->getPropertyState(PropertyName); } -inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(const ::rtl::OUString & PropertyName, const uno::Reference< inspection::XPropertyControlFactory > & _xControlFactory) throw (beans::UnknownPropertyException, lang::NullPointerException,uno::RuntimeException) +inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(const OUString & PropertyName, const uno::Reference< inspection::XPropertyControlFactory > & _xControlFactory) throw (beans::UnknownPropertyException, lang::NullPointerException,uno::RuntimeException) { inspection::LineDescriptor aOut; const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName); switch(nId) { case PROPERTY_ID_CHARTTYPE: - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_CHARTTYPE_DLG); + aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_PROP_CHARTTYPE_DLG); aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::TextField , sal_True); aOut.HasPrimaryButton = sal_True; break; @@ -279,7 +279,7 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co case PROPERTY_ID_MASTERFIELDS: case PROPERTY_ID_DETAILFIELDS: aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::StringListField , sal_False); - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_DLG_LINKFIELDS); + aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_PROP_DLG_LINKFIELDS); aOut.HasPrimaryButton = sal_True; break; default: @@ -288,16 +288,16 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co if ( nId != -1 ) { aOut.Category = ((m_pInfoService->getPropertyUIFlags(nId ) & PROP_FLAG_DATA_PROPERTY) != 0) ? - ::rtl::OUString("Data") + OUString("Data") : - ::rtl::OUString("General"); + OUString("General"); aOut.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nId ) ); aOut.DisplayName = m_pInfoService->getPropertyTranslation(nId); } return aOut; } -uno::Any SAL_CALL DataProviderHandler::convertToPropertyValue(const ::rtl::OUString & _rPropertyValue, const uno::Any & _rControlValue) throw (uno::RuntimeException, beans::UnknownPropertyException) +uno::Any SAL_CALL DataProviderHandler::convertToPropertyValue(const OUString & _rPropertyValue, const uno::Any & _rControlValue) throw (uno::RuntimeException, beans::UnknownPropertyException) { ::osl::MutexGuard aGuard( m_aMutex ); uno::Any aPropertyValue( _rControlValue ); @@ -325,7 +325,7 @@ uno::Any SAL_CALL DataProviderHandler::convertToPropertyValue(const ::rtl::OUStr return aPropertyValue; } -uno::Any SAL_CALL DataProviderHandler::convertToControlValue(const ::rtl::OUString & _rPropertyName, const uno::Any & _rPropertyValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, beans::UnknownPropertyException) +uno::Any SAL_CALL DataProviderHandler::convertToControlValue(const OUString & _rPropertyName, const uno::Any & _rPropertyValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, beans::UnknownPropertyException) { uno::Any aControlValue( _rPropertyValue ); if ( !aControlValue.hasValue() ) @@ -373,7 +373,7 @@ uno::Sequence< beans::Property > SAL_CALL DataProviderHandler::getSupportedPrope { m_pInfoService->getExcludeProperties( aNewProps, m_xFormComponentHandler ); beans::Property aValue; - static const ::rtl::OUString s_pProperties[] = + static const OUString s_pProperties[] = { PROPERTY_CHARTTYPE ,PROPERTY_MASTERFIELDS @@ -390,28 +390,28 @@ uno::Sequence< beans::Property > SAL_CALL DataProviderHandler::getSupportedPrope return aNewProps.empty() ? uno::Sequence< beans::Property > () : uno::Sequence< beans::Property > (&(*aNewProps.begin()),aNewProps.size()); } -uno::Sequence< ::rtl::OUString > SAL_CALL DataProviderHandler::getSupersededProperties() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DataProviderHandler::getSupersededProperties() throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aRet(1); + uno::Sequence< OUString > aRet(1); aRet[0] = PROPERTY_TITLE; // have a look at OPropertyInfoService::getExcludeProperties return aRet; } -uno::Sequence< ::rtl::OUString > SAL_CALL DataProviderHandler::getActuatingProperties() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DataProviderHandler::getActuatingProperties() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - uno::Sequence< ::rtl::OUString > aSeq(1); + uno::Sequence< OUString > aSeq(1); aSeq[0] = PROPERTY_TITLE; return ::comphelper::concatSequences(m_xFormComponentHandler->getActuatingProperties(),aSeq); } -::sal_Bool SAL_CALL DataProviderHandler::isComposable( const ::rtl::OUString& _rPropertyName ) throw (uno::RuntimeException, beans::UnknownPropertyException) +::sal_Bool SAL_CALL DataProviderHandler::isComposable( const OUString& _rPropertyName ) throw (uno::RuntimeException, beans::UnknownPropertyException) { return m_pInfoService->isComposable( _rPropertyName, m_xFormComponentHandler ); } -inspection::InteractiveSelectionResult SAL_CALL DataProviderHandler::onInteractivePropertySelection(const ::rtl::OUString & PropertyName, ::sal_Bool Primary, uno::Any & out_Data, const uno::Reference< inspection::XObjectInspectorUI > & _rxInspectorUI) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::NullPointerException) +inspection::InteractiveSelectionResult SAL_CALL DataProviderHandler::onInteractivePropertySelection(const OUString & PropertyName, ::sal_Bool Primary, uno::Any & out_Data, const uno::Reference< inspection::XObjectInspectorUI > & _rxInspectorUI) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::NullPointerException) { if ( !_rxInspectorUI.is() ) throw lang::NullPointerException(); @@ -438,7 +438,7 @@ inspection::InteractiveSelectionResult SAL_CALL DataProviderHandler::onInteracti return eResult; } -void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const ::rtl::OUString & ActuatingPropertyName, const uno::Any & NewValue, const uno::Any & OldValue, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (uno::RuntimeException, lang::NullPointerException) +void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const OUString & ActuatingPropertyName, const uno::Any & NewValue, const uno::Any & OldValue, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (uno::RuntimeException, lang::NullPointerException) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -454,7 +454,7 @@ void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const ::rtl::OUStrin sal_Bool bModified = xReport->isModified(); // this fills the chart again ::comphelper::NamedValueCollection aArgs; - aArgs.put( "CellRangeRepresentation", uno::makeAny( ::rtl::OUString( "all" ) ) ); + aArgs.put( "CellRangeRepresentation", uno::makeAny( OUString( "all" ) ) ); aArgs.put( "HasCategories", uno::makeAny( sal_True ) ); aArgs.put( "FirstCellAsLabel", uno::makeAny( sal_True ) ); aArgs.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) ); @@ -494,29 +494,29 @@ bool DataProviderHandler::impl_dialogLinkedFields_nothrow( ::osl::ClearableMutex { uno::Sequence<uno::Any> aSeq(6); beans::PropertyValue aParam; - aParam.Name = ::rtl::OUString("ParentWindow"); - aParam.Value <<= m_xContext->getValueByName( ::rtl::OUString("DialogParentWindow")); + aParam.Name = OUString("ParentWindow"); + aParam.Value <<= m_xContext->getValueByName( OUString("DialogParentWindow")); aSeq[0] <<= aParam; - aParam.Name = ::rtl::OUString("Detail"); + aParam.Name = OUString("Detail"); aParam.Value <<= m_xDataProvider; aSeq[1] <<= aParam; - aParam.Name = ::rtl::OUString("Master"); + aParam.Name = OUString("Master"); aParam.Value <<= m_xReportComponent->getSection()->getReportDefinition(); aSeq[2] <<= aParam; - aParam.Name = ::rtl::OUString("Explanation"); - aParam.Value <<= ::rtl::OUString(String(ModuleRes(RID_STR_EXPLANATION))); + aParam.Name = OUString("Explanation"); + aParam.Value <<= OUString(String(ModuleRes(RID_STR_EXPLANATION))); aSeq[3] <<= aParam; - aParam.Name = ::rtl::OUString("DetailLabel"); - aParam.Value <<= ::rtl::OUString(String(ModuleRes(RID_STR_DETAILLABEL))); + aParam.Name = OUString("DetailLabel"); + aParam.Value <<= OUString(String(ModuleRes(RID_STR_DETAILLABEL))); aSeq[4] <<= aParam; - aParam.Name = ::rtl::OUString("MasterLabel"); - aParam.Value <<= ::rtl::OUString(String(ModuleRes(RID_STR_MASTERLABEL))); + aParam.Name = OUString("MasterLabel"); + aParam.Value <<= OUString(String(ModuleRes(RID_STR_MASTERLABEL))); aSeq[5] <<= aParam; uno::Reference< ui::dialogs::XExecutableDialog > xDialog( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - ::rtl::OUString("org.openoffice.comp.form.ui.MasterDetailLinkDialog"),aSeq + OUString("org.openoffice.comp.form.ui.MasterDetailLinkDialog"),aSeq , m_xContext), uno::UNO_QUERY); _rClearBeforeDialog.clear(); @@ -527,16 +527,16 @@ bool DataProviderHandler::impl_dialogChartType_nothrow( ::osl::ClearableMutexGua { uno::Sequence<uno::Any> aSeq(2); beans::PropertyValue aParam; - aParam.Name = ::rtl::OUString("ParentWindow"); - aParam.Value <<= m_xContext->getValueByName( ::rtl::OUString("DialogParentWindow")); + aParam.Name = OUString("ParentWindow"); + aParam.Value <<= m_xContext->getValueByName( OUString("DialogParentWindow")); aSeq[0] <<= aParam; - aParam.Name = ::rtl::OUString("ChartModel"); + aParam.Name = OUString("ChartModel"); aParam.Value <<= m_xChartModel; aSeq[1] <<= aParam; uno::Reference< ui::dialogs::XExecutableDialog > xDialog( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - ::rtl::OUString("com.sun.star.comp.chart2.ChartTypeDialog"),aSeq + OUString("com.sun.star.comp.chart2.ChartTypeDialog"),aSeq , m_xContext), uno::UNO_QUERY); _rClearBeforeDialog.clear(); diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index 977cf8660456..bb5088dc365a 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -33,10 +33,10 @@ //........................................................................ namespace rptui { - ::rtl::OUString HelpIdUrl::getHelpURL( const rtl::OString& sHelpId ) + OUString HelpIdUrl::getHelpURL( const OString& sHelpId ) { - ::rtl::OUStringBuffer aBuffer; - ::rtl::OUString aTmp( rtl::OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8) ); + OUStringBuffer aBuffer; + OUString aTmp( OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8) ); DBG_ASSERT( INetURLObject( aTmp ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" ); aBuffer.appendAscii( INET_HID_SCHEME ); aBuffer.append( aTmp.getStr() ); @@ -71,34 +71,34 @@ namespace rptui } //------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL DefaultComponentInspectorModel::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL DefaultComponentInspectorModel::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------ - sal_Bool SAL_CALL DefaultComponentInspectorModel::supportsService( const ::rtl::OUString& ServiceName ) throw(RuntimeException) + sal_Bool SAL_CALL DefaultComponentInspectorModel::supportsService( const OUString& ServiceName ) throw(RuntimeException) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_static()); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL DefaultComponentInspectorModel::getSupportedServiceNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL DefaultComponentInspectorModel::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_static(); } //------------------------------------------------------------------------ - ::rtl::OUString DefaultComponentInspectorModel::getImplementationName_Static( ) throw(RuntimeException) + OUString DefaultComponentInspectorModel::getImplementationName_Static( ) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.DefaultComponentInspectorModel"); + return OUString("com.sun.star.comp.report.DefaultComponentInspectorModel"); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > DefaultComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > DefaultComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.report.inspection.DefaultComponentInspectorModel"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.report.inspection.DefaultComponentInspectorModel"); return aSupported; } @@ -134,7 +134,7 @@ namespace rptui Any* pReturn = aReturn.getArray(); for ( size_t i = 0; i < nFactories; ++i ) { - *pReturn++ <<= ::rtl::OUString::createFromAscii( aFactories[i].serviceName ); + *pReturn++ <<= OUString::createFromAscii( aFactories[i].serviceName ); } return aReturn; @@ -188,12 +188,12 @@ namespace rptui if ( _arguments.getLength() == 2 ) { // constructor: "createWithHelpSection( long, long )" if ( !( _arguments[0] >>= nMinHelpTextLines ) || !( _arguments[1] >>= nMaxHelpTextLines ) ) - throw lang::IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw lang::IllegalArgumentException( OUString(), *this, 0 ); createWithHelpSection( nMinHelpTextLines, nMaxHelpTextLines ); return; } - throw lang::IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw lang::IllegalArgumentException( OUString(), *this, 0 ); } //-------------------------------------------------------------------- @@ -205,7 +205,7 @@ namespace rptui void DefaultComponentInspectorModel::createWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ) { if ( ( _nMinHelpTextLines <= 0 ) || ( _nMaxHelpTextLines <= 0 ) || ( _nMinHelpTextLines > _nMaxHelpTextLines ) ) - throw lang::IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw lang::IllegalArgumentException( OUString(), *this, 0 ); m_bHasHelpSection = true; m_nMinHelpTextLines = _nMinHelpTextLines; @@ -221,7 +221,7 @@ namespace rptui { const sal_Char* programmaticName; sal_uInt16 uiNameResId; - rtl::OString helpId; + OString helpId; } aCategories[] = { { "General", RID_STR_PROPPAGE_DEFAULT, HID_RPT_PROPDLG_TAB_GENERAL }, { "Data", RID_STR_PROPPAGE_DATA, HID_RPT_PROPDLG_TAB_DATA }, @@ -232,7 +232,7 @@ namespace rptui PropertyCategoryDescriptor* pReturn = aReturn.getArray(); for ( size_t i=0; i<nCategories; ++i, ++pReturn ) { - pReturn->ProgrammaticName = ::rtl::OUString::createFromAscii( aCategories[i].programmaticName ); + pReturn->ProgrammaticName = OUString::createFromAscii( aCategories[i].programmaticName ); pReturn->UIName = String( ModuleRes( aCategories[i].uiNameResId ) ); pReturn->HelpURL = HelpIdUrl::getHelpURL( aCategories[i].helpId ); } @@ -241,7 +241,7 @@ namespace rptui } //-------------------------------------------------------------------- - ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getPropertyOrderIndex( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getPropertyOrderIndex( const OUString& _rPropertyName ) throw (RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); const sal_Int32 nPropertyId( m_pInfoService->getPropertyId( _rPropertyName ) ); @@ -251,7 +251,7 @@ namespace rptui if ( !m_xComponent.is() ) try { - m_xComponent.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.form.inspection.DefaultFormComponentInspectorModel"),m_xContext),UNO_QUERY_THROW); + m_xComponent.set(m_xContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.form.inspection.DefaultFormComponentInspectorModel"),m_xContext),UNO_QUERY_THROW); } catch(const Exception &) { diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index e1d18fd0af77..d586521002aa 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -781,12 +781,12 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const break; case PROPERTY_ID_INITIALFORMULA: case PROPERTY_ID_FORMULA: - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_FORMULA); + aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_PROP_FORMULA); aOut.HasPrimaryButton = sal_True; aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False); break; case PROPERTY_ID_CONDITIONALPRINTEXPRESSION: - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_FORMULA); + aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_PROP_FORMULA); aOut.HasPrimaryButton = sal_True; aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False); break; @@ -801,7 +801,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const if ( m_nDataFieldType == DATA_OR_FORMULA ) { - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_FORMULA); + aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_PROP_FORMULA); aOut.HasPrimaryButton = sal_True; } @@ -828,12 +828,12 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::ColorListBox, sal_False ); break; case PROPERTY_ID_FONT: - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_RPT_PROP_DLG_FONT_TYPE); + aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_RPT_PROP_DLG_FONT_TYPE); aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, sal_True ); aOut.HasPrimaryButton = sal_True; break; case PROPERTY_ID_AREA: - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_RPT_PROP_DLG_AREA); + aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_RPT_PROP_DLG_AREA); aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, sal_True ); aOut.HasPrimaryButton = sal_True; break; diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index 13f179165c81..df01a77b1118 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -45,7 +45,7 @@ ReportComponentHandler::ReportComponentHandler(uno::Reference< uno::XComponentCo { try { - m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW); + m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW); }catch(const uno::Exception &) { @@ -53,34 +53,34 @@ ReportComponentHandler::ReportComponentHandler(uno::Reference< uno::XComponentCo } //------------------------------------------------------------------------ -::rtl::OUString SAL_CALL ReportComponentHandler::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL ReportComponentHandler::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------ -sal_Bool SAL_CALL ReportComponentHandler::supportsService( const ::rtl::OUString& ServiceName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL ReportComponentHandler::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_static()); } //------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL ReportComponentHandler::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL ReportComponentHandler::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_static(); } //------------------------------------------------------------------------ -::rtl::OUString ReportComponentHandler::getImplementationName_Static( ) throw(uno::RuntimeException) +OUString ReportComponentHandler::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.ReportComponentHandler"); + return OUString("com.sun.star.comp.report.ReportComponentHandler"); } //------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > ReportComponentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) +uno::Sequence< OUString > ReportComponentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.report.inspection.ReportComponentHandler"); + uno::Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.report.inspection.ReportComponentHandler"); return aSupported; } @@ -115,10 +115,10 @@ void SAL_CALL ReportComponentHandler::inspect(const uno::Reference< uno::XInterf try { uno::Reference< container::XNameContainer > xNameCont(Component,uno::UNO_QUERY); - const ::rtl::OUString sFormComponent("FormComponent"); + const OUString sFormComponent("FormComponent"); if ( xNameCont->hasByName(sFormComponent) ) xNameCont->getByName(sFormComponent) >>= m_xFormComponent; - const ::rtl::OUString sRowSet("RowSet"); + const OUString sRowSet("RowSet"); if ( xNameCont->hasByName(sRowSet) ) { uno::Reference<beans::XPropertySet> xProp(m_xFormComponentHandler,uno::UNO_QUERY); @@ -135,32 +135,32 @@ void SAL_CALL ReportComponentHandler::inspect(const uno::Reference< uno::XInterf } } -uno::Any SAL_CALL ReportComponentHandler::getPropertyValue(const ::rtl::OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException) +uno::Any SAL_CALL ReportComponentHandler::getPropertyValue(const OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException) { return m_xFormComponentHandler->getPropertyValue(PropertyName); } -void SAL_CALL ReportComponentHandler::setPropertyValue(const ::rtl::OUString & PropertyName, const uno::Any & Value) throw (uno::RuntimeException, beans::UnknownPropertyException) +void SAL_CALL ReportComponentHandler::setPropertyValue(const OUString & PropertyName, const uno::Any & Value) throw (uno::RuntimeException, beans::UnknownPropertyException) { m_xFormComponentHandler->setPropertyValue(PropertyName, Value); } -beans::PropertyState SAL_CALL ReportComponentHandler::getPropertyState(const ::rtl::OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException) +beans::PropertyState SAL_CALL ReportComponentHandler::getPropertyState(const OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException) { return m_xFormComponentHandler->getPropertyState(PropertyName); } -inspection::LineDescriptor SAL_CALL ReportComponentHandler::describePropertyLine(const ::rtl::OUString & PropertyName, const uno::Reference< inspection::XPropertyControlFactory > & ControlFactory) throw (beans::UnknownPropertyException, lang::NullPointerException,uno::RuntimeException) +inspection::LineDescriptor SAL_CALL ReportComponentHandler::describePropertyLine(const OUString & PropertyName, const uno::Reference< inspection::XPropertyControlFactory > & ControlFactory) throw (beans::UnknownPropertyException, lang::NullPointerException,uno::RuntimeException) { return m_xFormComponentHandler->describePropertyLine(PropertyName, ControlFactory); } -uno::Any SAL_CALL ReportComponentHandler::convertToPropertyValue(const ::rtl::OUString & PropertyName, const uno::Any & ControlValue) throw (uno::RuntimeException, beans::UnknownPropertyException) +uno::Any SAL_CALL ReportComponentHandler::convertToPropertyValue(const OUString & PropertyName, const uno::Any & ControlValue) throw (uno::RuntimeException, beans::UnknownPropertyException) { return m_xFormComponentHandler->convertToPropertyValue(PropertyName, ControlValue); } -uno::Any SAL_CALL ReportComponentHandler::convertToControlValue(const ::rtl::OUString & PropertyName, const uno::Any & PropertyValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, beans::UnknownPropertyException) +uno::Any SAL_CALL ReportComponentHandler::convertToControlValue(const OUString & PropertyName, const uno::Any & PropertyValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, beans::UnknownPropertyException) { return m_xFormComponentHandler->convertToControlValue(PropertyName, PropertyValue, ControlValueType); } @@ -183,28 +183,28 @@ uno::Sequence< beans::Property > SAL_CALL ReportComponentHandler::getSupportedPr return aNewProps.empty() ? uno::Sequence< beans::Property > () : uno::Sequence< beans::Property > (&(*aNewProps.begin()),aNewProps.size()); } -uno::Sequence< ::rtl::OUString > SAL_CALL ReportComponentHandler::getSupersededProperties() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL ReportComponentHandler::getSupersededProperties() throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aRet; + uno::Sequence< OUString > aRet; return aRet; } -uno::Sequence< ::rtl::OUString > SAL_CALL ReportComponentHandler::getActuatingProperties() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL ReportComponentHandler::getActuatingProperties() throw (uno::RuntimeException) { return m_xFormComponentHandler->getActuatingProperties(); } -::sal_Bool SAL_CALL ReportComponentHandler::isComposable( const ::rtl::OUString& _rPropertyName ) throw (uno::RuntimeException, beans::UnknownPropertyException) +::sal_Bool SAL_CALL ReportComponentHandler::isComposable( const OUString& _rPropertyName ) throw (uno::RuntimeException, beans::UnknownPropertyException) { return m_pInfoService->isComposable( _rPropertyName, m_xFormComponentHandler ); } -inspection::InteractiveSelectionResult SAL_CALL ReportComponentHandler::onInteractivePropertySelection(const ::rtl::OUString & PropertyName, ::sal_Bool Primary, uno::Any & out_Data, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::NullPointerException) +inspection::InteractiveSelectionResult SAL_CALL ReportComponentHandler::onInteractivePropertySelection(const OUString & PropertyName, ::sal_Bool Primary, uno::Any & out_Data, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::NullPointerException) { return m_xFormComponentHandler->onInteractivePropertySelection(PropertyName, Primary, out_Data, InspectorUI); } -void SAL_CALL ReportComponentHandler::actuatingPropertyChanged(const ::rtl::OUString & ActuatingPropertyName, const uno::Any & NewValue, const uno::Any & OldValue, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (uno::RuntimeException, lang::NullPointerException) +void SAL_CALL ReportComponentHandler::actuatingPropertyChanged(const OUString & ActuatingPropertyName, const uno::Any & NewValue, const uno::Any & OldValue, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (uno::RuntimeException, lang::NullPointerException) { m_xFormComponentHandler->actuatingPropertyChanged(ActuatingPropertyName, NewValue, OldValue, InspectorUI, FirstTimeInit); } diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index d9f12f309b65..aa14f7c43db7 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -42,7 +42,7 @@ namespace rptui { String sName; String sTranslation; - rtl::OString sHelpId; + OString sHelpId; sal_Int32 nId; sal_uInt32 nUIFlags; @@ -50,13 +50,13 @@ namespace rptui const OUString& rName, sal_Int32 _nId, const String& aTranslation, - const rtl::OString& _sHelpId, + const OString& _sHelpId, sal_uInt32 _nUIFlags); }; //------------------------------------------------------------------------ OPropertyInfoImpl::OPropertyInfoImpl(const OUString& _rName, sal_Int32 _nId, - const String& aString, const rtl::OString& sHid, sal_uInt32 _nUIFlags) + const String& aString, const OString& sHid, sal_uInt32 _nUIFlags) :sName(_rName) ,sTranslation(aString) ,sHelpId(sHid) @@ -170,10 +170,10 @@ namespace rptui } //------------------------------------------------------------------------ - rtl::OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const + OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); - return (pInfo) ? pInfo->sHelpId : rtl::OString(); + return (pInfo) ? pInfo->sHelpId : OString(); } //------------------------------------------------------------------------ diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx index 7c8237b4d2fd..66e83b974224 100644 --- a/reportdesign/source/ui/misc/ColorListener.cxx +++ b/reportdesign/source/ui/misc/ColorListener.cxx @@ -25,7 +25,7 @@ namespace rptui { //===================================================================== DBG_NAME( rpt_OColorListener ) -OColorListener::OColorListener(Window* _pParent ,const ::rtl::OUString& _sColorEntry) +OColorListener::OColorListener(Window* _pParent ,const OUString& _sColorEntry) : Window(_pParent) ,m_sColorEntry(_sColorEntry) ,m_nColor(COL_LIGHTBLUE) diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index bfd87207dcb6..19ce7b86bd4b 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -67,7 +67,7 @@ const formula::IFunctionCategory* FunctionManager::getCategory(sal_uInt32 _nPos) return m_aCategoryIndex[_nPos]->second.get(); } // ----------------------------------------------------------------------------- -const formula::IFunctionDescription* FunctionManager::getFunctionByName(const ::rtl::OUString& _sFunctionName) const +const formula::IFunctionDescription* FunctionManager::getFunctionByName(const OUString& _sFunctionName) const { const formula::IFunctionDescription* pDesc = NULL; try @@ -89,12 +89,12 @@ void FunctionManager::fillLastRecentlyUsedFunctions(::std::vector< const formula ::boost::shared_ptr< FunctionDescription > pDesc; if ( _xFunctionDescription.is() ) { - const ::rtl::OUString sFunctionName = _xFunctionDescription->getName(); + const OUString sFunctionName = _xFunctionDescription->getName(); TFunctionsMap::const_iterator aFunctionFind = m_aFunctions.find(sFunctionName); if ( aFunctionFind == m_aFunctions.end() ) { const uno::Reference< report::meta::XFunctionCategory> xCategory = _xFunctionDescription->getCategory(); - const ::rtl::OUString sCategoryName = xCategory->getName(); + const OUString sCategoryName = xCategory->getName(); TCategoriesMap::iterator aCategoryFind = m_aCategories.find(sCategoryName); if ( aCategoryFind == m_aCategories.end() ) { @@ -142,7 +142,7 @@ const formula::IFunctionManager* FunctionCategory::getFunctionManager() const return m_pFunctionManager; } // ----------------------------------------------------------------------------- -::rtl::OUString FunctionCategory::getName() const +OUString FunctionCategory::getName() const { return m_xCategory->getName(); } @@ -153,7 +153,7 @@ FunctionDescription::FunctionDescription(const formula::IFunctionCategory* _pFun { m_aParameter = m_xFunctionDescription->getArguments(); } -::rtl::OUString FunctionDescription::getFunctionName() const +OUString FunctionDescription::getFunctionName() const { return m_xFunctionDescription->getName(); } @@ -163,7 +163,7 @@ const formula::IFunctionCategory* FunctionDescription::getCategory() const return m_pFunctionCategory; } // ----------------------------------------------------------------------------- -::rtl::OUString FunctionDescription::getDescription() const +OUString FunctionDescription::getDescription() const { return m_xFunctionDescription->getDescription(); } @@ -173,13 +173,13 @@ xub_StrLen FunctionDescription::getSuppressedArgumentCount() const return static_cast<xub_StrLen>(m_aParameter.getLength()); } // ----------------------------------------------------------------------------- -::rtl::OUString FunctionDescription::getFormula(const ::std::vector< ::rtl::OUString >& _aArguments) const +OUString FunctionDescription::getFormula(const ::std::vector< OUString >& _aArguments) const { - ::rtl::OUString sFormula; + OUString sFormula; try { - const ::rtl::OUString *pArguments = _aArguments.empty() ? 0 : &_aArguments[0]; - sFormula = m_xFunctionDescription->createFormula(uno::Sequence< ::rtl::OUString >(pArguments, _aArguments.size())); + const OUString *pArguments = _aArguments.empty() ? 0 : &_aArguments[0]; + sFormula = m_xFunctionDescription->createFormula(uno::Sequence< OUString >(pArguments, _aArguments.size())); } catch(const uno::Exception&) { @@ -201,14 +201,14 @@ void FunctionDescription::initArgumentInfo() const { } // ----------------------------------------------------------------------------- -::rtl::OUString FunctionDescription::getSignature() const +OUString FunctionDescription::getSignature() const { return m_xFunctionDescription->getSignature(); } // ----------------------------------------------------------------------------- -rtl::OString FunctionDescription::getHelpId() const +OString FunctionDescription::getHelpId() const { - return rtl::OString(); + return OString(); } // ----------------------------------------------------------------------------- sal_uInt32 FunctionDescription::getParameterCount() const @@ -216,18 +216,18 @@ sal_uInt32 FunctionDescription::getParameterCount() const return m_aParameter.getLength(); } // ----------------------------------------------------------------------------- -::rtl::OUString FunctionDescription::getParameterName(sal_uInt32 _nPos) const +OUString FunctionDescription::getParameterName(sal_uInt32 _nPos) const { if ( _nPos < static_cast<sal_uInt32>(m_aParameter.getLength()) ) return m_aParameter[_nPos].Name; - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- -::rtl::OUString FunctionDescription::getParameterDescription(sal_uInt32 _nPos) const +OUString FunctionDescription::getParameterDescription(sal_uInt32 _nPos) const { if ( _nPos < static_cast<sal_uInt32>(m_aParameter.getLength()) ) return m_aParameter[_nPos].Description; - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- bool FunctionDescription::isParameterOptional(sal_uInt32 _nPos) const diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index 497ec21131c1..6a280720da5a 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -87,12 +87,12 @@ namespace } } //---------------------------------------------------------------------------- - void lcl_setValues(const uno::Reference< report::XSection >& _xSection,const ::std::vector< ::std::pair< ::rtl::OUString ,uno::Any> >& _aValues) + void lcl_setValues(const uno::Reference< report::XSection >& _xSection,const ::std::vector< ::std::pair< OUString ,uno::Any> >& _aValues) { if ( _xSection.is() ) { - ::std::vector< ::std::pair< ::rtl::OUString ,uno::Any> >::const_iterator aIter = _aValues.begin(); - ::std::vector< ::std::pair< ::rtl::OUString ,uno::Any> >::const_iterator aEnd = _aValues.end(); + ::std::vector< ::std::pair< OUString ,uno::Any> >::const_iterator aIter = _aValues.begin(); + ::std::vector< ::std::pair< OUString ,uno::Any> >::const_iterator aEnd = _aValues.end(); for (; aIter != aEnd; ++aIter) { try @@ -166,7 +166,7 @@ void OSectionUndo::collectControls(const uno::Reference< report::XSection >& _xS for(;pIter != pEnd;++pIter) { if ( 0 == (pIter->Attributes & beans::PropertyAttribute::READONLY) ) - m_aValues.push_back(::std::pair< ::rtl::OUString ,uno::Any>(pIter->Name,_xSection->getPropertyValue(pIter->Name))); + m_aValues.push_back(::std::pair< OUString ,uno::Any>(pIter->Name,_xSection->getPropertyValue(pIter->Name))); } lcl_collectElements(_xSection,m_aControls); } @@ -277,7 +277,7 @@ OGroupSectionUndo::OGroupSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot } } //---------------------------------------------------------------------------- -rtl::OUString OGroupSectionUndo::GetComment() const +OUString OGroupSectionUndo::GetComment() const { if ( m_sName.isEmpty() ) { diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index ff16950ad394..9d2103a33f4a 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -161,15 +161,15 @@ void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32 OSL_ENSURE(_xGroup.is(),"Group is NULL -> GPF"); if ( _xGroup->getHeaderOn() && _xGroup->getHeader()->getName().isEmpty() ) { - ::rtl::OUString sName = String(ModuleRes(RID_STR_GROUPHEADER)); - sName += ::rtl::OUString::valueOf(_nPos); + OUString sName = String(ModuleRes(RID_STR_GROUPHEADER)); + sName += OUString::valueOf(_nPos); _xGroup->getHeader()->setName(sName); } if ( _xGroup->getFooterOn() && _xGroup->getFooter()->getName().isEmpty() ) { - ::rtl::OUString sName = String(ModuleRes(RID_STR_GROUPFOOTER)); - sName += ::rtl::OUString::valueOf(_nPos); + OUString sName = String(ModuleRes(RID_STR_GROUPFOOTER)); + sName += OUString::valueOf(_nPos); _xGroup->getFooter()->setName(sName); } } @@ -365,7 +365,7 @@ namespace } // ------------------------------------------------------------------------- - void lcl_pushBack( uno::Sequence< beans::NamedValue >& _out_rProperties, const ::rtl::OUString& _sName, const uno::Any& _rValue ) + void lcl_pushBack( uno::Sequence< beans::NamedValue >& _out_rProperties, const OUString& _sName, const uno::Any& _rValue ) { sal_Int32 nLen( _out_rProperties.getLength() ); _out_rProperties.realloc( nLen + 1 ); @@ -445,11 +445,11 @@ namespace // create an AWT font awt::FontDescriptor aAwtFont; lcl_initAwtFont( _rOriginalControlFont, _rItemSet, aAwtFont,ITEMID_FONT,ITEMID_FONTHEIGHT,ITEMID_POSTURE, ITEMID_WEIGHT); - lcl_pushBack( _out_rProperties, ::rtl::OUString("Font"), uno::makeAny( aAwtFont ) ); + lcl_pushBack( _out_rProperties, OUString("Font"), uno::makeAny( aAwtFont ) ); lcl_initAwtFont( _rOriginalControlFontAsian, _rItemSet, aAwtFont,ITEMID_FONT_ASIAN,ITEMID_FONTHEIGHT_ASIAN,ITEMID_POSTURE_ASIAN, ITEMID_WEIGHT_ASIAN); - lcl_pushBack( _out_rProperties, ::rtl::OUString("FontAsian"), uno::makeAny( aAwtFont ) ); + lcl_pushBack( _out_rProperties, OUString("FontAsian"), uno::makeAny( aAwtFont ) ); lcl_initAwtFont( _rOriginalControlFontComplex, _rItemSet, aAwtFont,ITEMID_FONT_COMPLEX,ITEMID_FONTHEIGHT_COMPLEX,ITEMID_POSTURE_COMPLEX, ITEMID_WEIGHT_COMPLEX); - lcl_pushBack( _out_rProperties, ::rtl::OUString("FontComplex"), uno::makeAny( aAwtFont ) ); + lcl_pushBack( _out_rProperties, OUString("FontComplex"), uno::makeAny( aAwtFont ) ); // properties which cannot be represented in an AWT font need to be preserved directly if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_SHADOWED,sal_True,&pItem) && pItem->ISA(SvxShadowedItem)) @@ -515,8 +515,8 @@ namespace { const SvxTwoLinesItem* pFontItem = static_cast<const SvxTwoLinesItem*>(pItem); lcl_pushBack( _out_rProperties, PROPERTY_CHARCOMBINEISON, uno::makeAny( pFontItem->GetValue() ) ); - lcl_pushBack( _out_rProperties, PROPERTY_CHARCOMBINEPREFIX, uno::makeAny( ::rtl::OUString( pFontItem->GetStartBracket() ) ) ); - lcl_pushBack( _out_rProperties, PROPERTY_CHARCOMBINESUFFIX, uno::makeAny( ::rtl::OUString( pFontItem->GetEndBracket() ) ) ); + lcl_pushBack( _out_rProperties, PROPERTY_CHARCOMBINEPREFIX, uno::makeAny( OUString( pFontItem->GetStartBracket() ) ) ); + lcl_pushBack( _out_rProperties, PROPERTY_CHARCOMBINESUFFIX, uno::makeAny( OUString( pFontItem->GetEndBracket() ) ) ); } if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_COLOR,sal_True,&pItem) && pItem->ISA(SvxColorItem)) { @@ -535,7 +535,7 @@ namespace } struct Items { sal_uInt16 nWhich; - ::rtl::OUString sPropertyName; + OUString sPropertyName; }; const Items pItems[] = { {ITEMID_LANGUAGE,PROPERTY_CHARLOCALE} ,{ITEMID_LANGUAGE_ASIAN,PROPERTY_CHARLOCALEASIAN} @@ -572,9 +572,9 @@ namespace // ------------------------------------------------------------------------- void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const sal_Char* _pAttributeName, const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, - void (SAL_CALL report::XReportControlFormat::*pSetter)( const ::rtl::OUString& ) ) + void (SAL_CALL report::XReportControlFormat::*pSetter)( const OUString& ) ) { - ::rtl::OUString aAttributeValue; + OUString aAttributeValue; if ( _rAttrValues.get_ensureType( _pAttributeName, aAttributeValue ) ) (_rxReportControlFormat.get()->*pSetter)( aAttributeValue ); } @@ -704,7 +704,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep 0 }; - SfxItemPool* pPool( new SfxItemPool(rtl::OUString("ReportCharProperties"), ITEMID_FONT,ITEMID_WEIGHT_COMPLEX, aItemInfos, pDefaults) ); + SfxItemPool* pPool( new SfxItemPool(OUString("ReportCharProperties"), ITEMID_FONT,ITEMID_WEIGHT_COMPLEX, aItemInfos, pDefaults) ); // not needed for font height pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same bool bSuccess = false; @@ -787,22 +787,22 @@ void applyCharacterSettings( const uno::Reference< report::XReportControlFormat awt::FontDescriptor aAwtFont; if ( aSettings.get( "Font" ) >>= aAwtFont ) { - ::rtl::OUString sTemp = aAwtFont.Name; - aAwtFont.Name = ::rtl::OUString(); // hack to + OUString sTemp = aAwtFont.Name; + aAwtFont.Name = OUString(); // hack to _rxReportControlFormat->setFontDescriptor( aAwtFont ); _rxReportControlFormat->setCharFontName( sTemp ); } if ( aSettings.get( "FontAsian" ) >>= aAwtFont ) { - ::rtl::OUString sTemp = aAwtFont.Name; - aAwtFont.Name = ::rtl::OUString(); // hack to + OUString sTemp = aAwtFont.Name; + aAwtFont.Name = OUString(); // hack to _rxReportControlFormat->setFontDescriptorAsian( aAwtFont ); _rxReportControlFormat->setCharFontNameAsian( sTemp ); } if ( aSettings.get( "FontComplex" ) >>= aAwtFont ) { - ::rtl::OUString sTemp = aAwtFont.Name; - aAwtFont.Name = ::rtl::OUString(); // hack to + OUString sTemp = aAwtFont.Name; + aAwtFont.Name = OUString(); // hack to _rxReportControlFormat->setFontDescriptorComplex( aAwtFont ); _rxReportControlFormat->setCharFontNameComplex( sTemp ); } @@ -925,9 +925,9 @@ SdrObject* isOver(SdrObject* _pObj,SdrPage& _rPage,SdrView& _rView,bool _bUnMark } // ----------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > getParameterNames( const uno::Reference< sdbc::XRowSet >& _rxRowSet ) +uno::Sequence< OUString > getParameterNames( const uno::Reference< sdbc::XRowSet >& _rxRowSet ) { - uno::Sequence< ::rtl::OUString > aNames; + uno::Sequence< OUString > aNames; try { @@ -939,7 +939,7 @@ uno::Sequence< ::rtl::OUString > getParameterNames( const uno::Reference< sdbc:: aNames.realloc( count ); uno::Reference< beans::XPropertySet > xParam; - ::rtl::OUString sParamName; + OUString sParamName; for ( sal_Int32 i=0; i<count; ++i ) { xParam.set( xParams->getByIndex(i), uno::UNO_QUERY_THROW ); @@ -1003,7 +1003,7 @@ void setZoomFactor(const Fraction& _aZoom,Window& _rWindow) _rWindow.SetMapMode(aMapMode); } // ----------------------------------------------------------------------------- -bool openDialogFormula_nothrow( ::rtl::OUString& _in_out_rFormula +bool openDialogFormula_nothrow( OUString& _in_out_rFormula , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext , const uno::Reference< awt::XWindow>& _xInspectorWindow , const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& _xRowSet @@ -1023,7 +1023,7 @@ bool openDialogFormula_nothrow( ::rtl::OUString& _in_out_rFormula xServiceFactory.set(xFactory,uno::UNO_QUERY); Window* pParent = VCLUnoHelper::GetWindow( _xInspectorWindow ); - uno::Reference< report::meta::XFunctionManager> xMgr(xFactory->createInstanceWithContext(::rtl::OUString("org.libreoffice.report.pentaho.SOFunctionManager"),_xContext),uno::UNO_QUERY); + uno::Reference< report::meta::XFunctionManager> xMgr(xFactory->createInstanceWithContext(OUString("org.libreoffice.report.pentaho.SOFunctionManager"),_xContext),uno::UNO_QUERY); if ( xMgr.is() ) { ::boost::shared_ptr< formula::IFunctionManager > pFormulaManager(new FunctionManager(xMgr) ); @@ -1036,7 +1036,7 @@ bool openDialogFormula_nothrow( ::rtl::OUString& _in_out_rFormula xub_StrLen nIndex = 0; if ( sFormula.GetChar(0) == '=' ) nIndex = 1; - _in_out_rFormula = ::rtl::OUString("rpt:") + sFormula.Copy(nIndex); + _in_out_rFormula = OUString("rpt:") + sFormula.Copy(nIndex); } } } diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index c0ebbdbd9e1a..6f73dadbdcd5 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -39,30 +39,30 @@ namespace rptui using namespace ::com::sun::star::frame; using namespace ::com::sun::star::util; -::rtl::OUString SAL_CALL OStatusbarController::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL OStatusbarController::getImplementationName() throw( RuntimeException ) { return getImplementationName_Static(); } //------------------------------------------------------------------------------ -::rtl::OUString OStatusbarController::getImplementationName_Static() throw( RuntimeException ) +OUString OStatusbarController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString("com.sun.star.report.comp.StatusbarController"); + return OUString("com.sun.star.report.comp.StatusbarController"); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString> OStatusbarController::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString> OStatusbarController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { - Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.frame.StatusbarController"); + Sequence< OUString> aSupported(1); + aSupported.getArray()[0] = OUString("com.sun.star.frame.StatusbarController"); return aSupported; } // ----------------------------------------------------------------------------- -::sal_Bool SAL_CALL OStatusbarController::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException) +::sal_Bool SAL_CALL OStatusbarController::supportsService( const OUString& ServiceName ) throw (RuntimeException) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } //------------------------------------------------------------------------- -Sequence< ::rtl::OUString> SAL_CALL OStatusbarController::getSupportedServiceNames() throw(RuntimeException) +Sequence< OUString> SAL_CALL OStatusbarController::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index 598d0db94ba3..f05b07f995a6 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -56,30 +56,30 @@ namespace rptui using namespace util; using namespace ui; -::rtl::OUString SAL_CALL OToolboxController::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL OToolboxController::getImplementationName() throw( RuntimeException ) { return getImplementationName_Static(); } //------------------------------------------------------------------------------ -::rtl::OUString OToolboxController::getImplementationName_Static() throw( RuntimeException ) +OUString OToolboxController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString("com.sun.star.report.comp.ReportToolboxController"); + return OUString("com.sun.star.report.comp.ReportToolboxController"); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString> OToolboxController::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString> OToolboxController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { - Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.report.ReportToolboxController"); + Sequence< OUString> aSupported(1); + aSupported.getArray()[0] = OUString("com.sun.star.report.ReportToolboxController"); return aSupported; } // ----------------------------------------------------------------------------- -::sal_Bool SAL_CALL OToolboxController::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException) +::sal_Bool SAL_CALL OToolboxController::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } //------------------------------------------------------------------------- -Sequence< ::rtl::OUString> SAL_CALL OToolboxController::getSupportedServiceNames() throw(RuntimeException) +Sequence< OUString> SAL_CALL OToolboxController::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } @@ -147,48 +147,48 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments } if ( m_aCommandURL == ".uno:BasicShapes" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:BasicShapes"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:BasicShapes"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_BASIC,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL == ".uno:SymbolShapes" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:SymbolShapes"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:SymbolShapes"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_SYMBOL,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL == ".uno:ArrowShapes" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:ArrowShapes"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:ArrowShapes"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_ARROW,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL == ".uno:FlowChartShapes" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:FlowChartShapes"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:FlowChartShapes"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_FLOWCHART,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL == ".uno:CalloutShapes" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:CalloutShapes"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:CalloutShapes"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_CALLOUT,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL == ".uno:StarShapes" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:StarShapes"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:StarShapes"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_STAR,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL == ".uno:CharFontName" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:CharFontName"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:CharFontName"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxFontNameToolBoxControl/*SvxStyleToolBoxControl*/(m_nSlotId = SID_ATTR_CHAR_FONT,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:FontColor")) || m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Color")) ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:FontColor"),sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:Color"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:FontColor"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:Color"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxColorExtToolBoxControl(m_nSlotId = SID_ATTR_CHAR_COLOR2,m_nToolBoxId,*pToolBox)); } else { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:BackgroundColor"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:BackgroundColor"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxColorToolBoxControl(m_nSlotId = SID_BACKGROUND_COLOR,m_nToolBoxId,*pToolBox)); } @@ -223,7 +223,7 @@ void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event if ( nId == 0 ) continue; - rtl::OUString aCmd = rTb.GetItemCommand( nId ); + OUString aCmd = rTb.GetItemCommand( nId ); if ( aCmd == Event.FeatureURL.Complete ) { // Enable/disable item @@ -237,7 +237,7 @@ void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event rTb.CheckItem( nId, bCheckmark ); else { - rtl::OUString aItemText; + OUString aItemText; if ( Event.State >>= aItemText ) rTb.SetItemText( nId, aItemText ); @@ -290,17 +290,17 @@ Reference< awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw return m_nSlotId == SID_DRAWTBX_CS_BASIC; } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OToolboxController::getSubToolbarName() throw (uno::RuntimeException) +OUString SAL_CALL OToolboxController::getSubToolbarName() throw (uno::RuntimeException) { SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard(m_aMutex); uno::Reference< frame::XSubToolbarController> xSub(m_pToolbarController.getRef(),uno::UNO_QUERY); if ( xSub.is() ) return xSub->getSubToolbarName(); - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- -void SAL_CALL OToolboxController::functionSelected( const ::rtl::OUString& rCommand ) throw (uno::RuntimeException) +void SAL_CALL OToolboxController::functionSelected( const OUString& rCommand ) throw (uno::RuntimeException) { SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard(m_aMutex); diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index c60bd113567f..9d9ef89ea7c1 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -147,8 +147,8 @@ ODesignView::~ODesignView() } if ( m_pAddField ) { - SvtViewOptions aDlgOpt( E_WINDOW, rtl::OUString( UID_RPT_RPT_APP_VIEW ) ); - aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); + SvtViewOptions aDlgOpt( E_WINDOW, OUString( UID_RPT_RPT_APP_VIEW ) ); + aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<Window> aTemp2(m_pAddField); @@ -158,7 +158,7 @@ ODesignView::~ODesignView() if ( m_pReportExplorer ) { SvtViewOptions aDlgOpt( E_WINDOW, OUString::number( RID_NAVIGATOR) ); - aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pReportExplorer->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); + aDlgOpt.SetWindowState(OStringToOUString(m_pReportExplorer->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); notifySystemWindow(this,m_pReportExplorer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<Window> aTemp2(m_pReportExplorer); @@ -312,13 +312,13 @@ void ODesignView::SetMode( DlgEdMode _eNewMode ) m_aScrollWindow.SetMode(_eNewMode); } //---------------------------------------------------------------------------- -void ODesignView::SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType ) +void ODesignView::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType ) { m_eActObj = eObj; m_aScrollWindow.SetInsertObj( eObj,_sShapeType ); } //---------------------------------------------------------------------------- -rtl::OUString ODesignView::GetInsertObjString() const +OUString ODesignView::GetInsertObjString() const { return m_aScrollWindow.GetInsertObjString(); } @@ -404,7 +404,7 @@ void ODesignView::removeSection(sal_uInt16 _nPosition) m_aScrollWindow.removeSection(_nPosition); } //---------------------------------------------------------------------------- -void ODesignView::addSection(const uno::Reference< report::XSection >& _xSection,const ::rtl::OUString& _sColorEntry,sal_uInt16 _nPosition) +void ODesignView::addSection(const uno::Reference< report::XSection >& _xSection,const OUString& _sColorEntry,sal_uInt16 _nPosition) { m_aScrollWindow.addSection(_xSection,_sColorEntry,_nPosition); } @@ -510,7 +510,7 @@ void ODesignView::toggleReportExplorer() m_pReportExplorer = new ONavigator(this,rReportController); SvtViewOptions aDlgOpt( E_WINDOW, OUString::number( RID_NAVIGATOR) ); if ( aDlgOpt.Exists() ) - m_pReportExplorer->SetWindowState(rtl::OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); + m_pReportExplorer->SetWindowState(OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); m_pReportExplorer->AddEventListener(LINK(&rReportController,OReportController,EventLstHdl)); notifySystemWindow(this,m_pReportExplorer,::comphelper::mem_fun(&TaskPaneList::AddWindow)); } @@ -545,9 +545,9 @@ void ODesignView::toggleAddField() uno::Reference < beans::XPropertySet > xSet(rReportController.getRowSet(),uno::UNO_QUERY); m_pAddField = new OAddFieldWindow(this,xSet); m_pAddField->SetCreateHdl(LINK( &rReportController, OReportController, OnCreateHdl ) ); - SvtViewOptions aDlgOpt( E_WINDOW, rtl::OUString( UID_RPT_RPT_APP_VIEW ) ); + SvtViewOptions aDlgOpt( E_WINDOW, OUString( UID_RPT_RPT_APP_VIEW ) ); if ( aDlgOpt.Exists() ) - m_pAddField->SetWindowState(::rtl::OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); + m_pAddField->SetWindowState(OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); m_pAddField->Update(); m_pAddField->AddEventListener(LINK(&rReportController,OReportController,EventLstHdl)); notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::AddWindow)); @@ -601,12 +601,12 @@ void ODesignView::collapseSections(const uno::Sequence< beans::PropertyValue>& _ m_aScrollWindow.collapseSections(_aCollpasedSections); } // ----------------------------------------------------------------------------- -::rtl::OUString ODesignView::getCurrentPage() const +OUString ODesignView::getCurrentPage() const { - return m_pPropWin ? m_pPropWin->getCurrentPage() : ::rtl::OUString(); + return m_pPropWin ? m_pPropWin->getCurrentPage() : OUString(); } // ----------------------------------------------------------------------------- -void ODesignView::setCurrentPage(const ::rtl::OUString& _sLastActivePage) +void ODesignView::setCurrentPage(const OUString& _sLastActivePage) { if ( m_pPropWin ) m_pPropWin->setCurrentPage(_sLastActivePage); diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index 0b54ed385a2a..bf414c564d24 100644 --- a/reportdesign/source/ui/report/EndMarker.cxx +++ b/reportdesign/source/ui/report/EndMarker.cxx @@ -31,7 +31,7 @@ namespace rptui { //===================================================================== DBG_NAME( rpt_OEndMarker ) -OEndMarker::OEndMarker(Window* _pParent ,const ::rtl::OUString& _sColorEntry) +OEndMarker::OEndMarker(Window* _pParent ,const OUString& _sColorEntry) : OColorListener(_pParent,_sColorEntry) { DBG_CTOR( rpt_OEndMarker,NULL); diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index 43ae9e24f2c9..0cbe5ffab466 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -77,7 +77,7 @@ namespace rptui // ----------------------------------------------------------------------------- void FormattedFieldBeautifier::setPlaceholderText( const uno::Reference< uno::XInterface >& _rxComponent ) { - ::rtl::OUString sDataField; + OUString sDataField; try { @@ -92,11 +92,11 @@ namespace rptui bool bSet = true; if ( aFormula.getType() == ReportFormula::Field ) { - const ::rtl::OUString sColumnName = aFormula.getFieldName(); - ::rtl::OUString sLabel = m_rReportController.getColumnLabel_throw(sColumnName); + const OUString sColumnName = aFormula.getFieldName(); + OUString sLabel = m_rReportController.getColumnLabel_throw(sColumnName); if ( !sLabel.isEmpty() ) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.appendAscii( "=" ); aBuffer.append( sLabel ); sDataField = aBuffer.makeStringAndClear(); @@ -118,7 +118,7 @@ namespace rptui } // ----------------------------------------------------------------------------- - void FormattedFieldBeautifier::setPlaceholderText( const uno::Reference< awt::XVclWindowPeer >& _xVclWindowPeer, const ::rtl::OUString& _rText ) + void FormattedFieldBeautifier::setPlaceholderText( const uno::Reference< awt::XVclWindowPeer >& _xVclWindowPeer, const OUString& _rText ) { OSL_ENSURE( _xVclWindowPeer.is(), "FormattedFieldBeautifier::setPlaceholderText: invalid peer!" ); if ( !_xVclWindowPeer.is() ) diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 360967886093..4498bed857bc 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -178,13 +178,13 @@ using namespace ::cppu; namespace { // comparing two PropertyValue instances - struct PropertyValueCompare : public ::std::binary_function< beans::PropertyValue, ::rtl::OUString , bool > + struct PropertyValueCompare : public ::std::binary_function< beans::PropertyValue, OUString , bool > { - bool operator() (const beans::PropertyValue& x, const ::rtl::OUString& y) const + bool operator() (const beans::PropertyValue& x, const OUString& y) const { return x.Name.equals(y); } - bool operator() (const ::rtl::OUString& x,const beans::PropertyValue& y) const + bool operator() (const OUString& x,const beans::PropertyValue& y) const { return x.equals(y.Name); } @@ -250,25 +250,25 @@ static void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs, _xWindow = VCLUnoHelper::GetInterface(_pView); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OReportController::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL OReportController::getImplementationName() throw( RuntimeException ) { return getImplementationName_Static(); } //------------------------------------------------------------------------------ -::rtl::OUString OReportController::getImplementationName_Static() throw( RuntimeException ) +OUString OReportController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString("com.sun.star.report.comp.ReportDesign"); + return OUString("com.sun.star.report.comp.ReportDesign"); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString> OReportController::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString> OReportController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { - Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.ReportDesign"); + Sequence< OUString> aSupported(1); + aSupported.getArray()[0] = OUString("com.sun.star.sdb.ReportDesign"); return aSupported; } //------------------------------------------------------------------------- -Sequence< ::rtl::OUString> SAL_CALL OReportController::getSupportedServiceNames() throw(RuntimeException) +Sequence< OUString> SAL_CALL OReportController::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } @@ -307,9 +307,9 @@ OReportController::OReportController(Reference< XComponentContext > const & xCon m_pReportControllerObserver = new OXReportControllerObserver(*this); m_pReportControllerObserver->acquire(); - m_sMode = ::rtl::OUString("normal"); + m_sMode = OUString("normal"); DBG_CTOR( rpt_OReportController,NULL); - registerProperty(::rtl::OUString("ZoomValue"),PROPERTY_ID_ZOOMVALUE,beans::PropertyAttribute::BOUND| beans::PropertyAttribute::TRANSIENT,&m_nZoomValue,::getCppuType(static_cast< sal_Int16*>(0))); + registerProperty(OUString("ZoomValue"),PROPERTY_ID_ZOOMVALUE,beans::PropertyAttribute::BOUND| beans::PropertyAttribute::TRANSIENT,&m_nZoomValue,::getCppuType(static_cast< sal_Int16*>(0))); } // ----------------------------------------------------------------------------- @@ -334,7 +334,7 @@ void OReportController::disposing() if ( m_pGroupsFloater ) { SvtViewOptions aDlgOpt( E_WINDOW, OUString::number( RID_GROUPS_SORTING ) ); - aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pGroupsFloater->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); + aDlgOpt.SetWindowState(OStringToOUString(m_pGroupsFloater->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<FloatingWindow> aTemp(m_pGroupsFloater); SAL_WNODEPRECATED_DECLARATIONS_POP @@ -424,7 +424,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const case SID_REPORTHEADERFOOTER: { aReturn.bEnabled = isEditable(); - ::rtl::OUString sText = String(ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getReportHeaderOn()) ? RID_STR_REPORTHEADERFOOTER_DELETE : RID_STR_REPORTHEADERFOOTER_INSERT)); + OUString sText = String(ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getReportHeaderOn()) ? RID_STR_REPORTHEADERFOOTER_DELETE : RID_STR_REPORTHEADERFOOTER_INSERT)); aReturn.sTitle = sText; } break; @@ -433,7 +433,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const case SID_PAGEHEADERFOOTER: { aReturn.bEnabled = isEditable(); - ::rtl::OUString sText = String(ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getPageHeaderOn()) ? RID_STR_PAGEHEADERFOOTER_DELETE : RID_STR_PAGEHEADERFOOTER_INSERT)); + OUString sText = String(ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getPageHeaderOn()) ? RID_STR_PAGEHEADERFOOTER_DELETE : RID_STR_PAGEHEADERFOOTER_INSERT)); aReturn.sTitle = sText; } break; @@ -459,7 +459,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const if ( aReturn.bEnabled ) { // TODO: add "Undo/Redo: prefix" - rtl::OUString ( SfxUndoManager::*retrieveComment )( size_t, bool const ) const = + OUString ( SfxUndoManager::*retrieveComment )( size_t, bool const ) const = ( _nId == SID_UNDO ) ? &SfxUndoManager::GetUndoActionComment : &SfxUndoManager::GetRedoActionComment; aReturn.sTitle = (rUndoManager.*retrieveComment)( 0, ::svl::IUndoManager::TopLevel ); } @@ -586,7 +586,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const aReturn.bEnabled = !pSectionWindow->getReportSection().isUiActive(); } { - ::rtl::OUString sText = String(ModuleRes(RID_STR_DELETE)); + OUString sText = String(ModuleRes(RID_STR_DELETE)); aReturn.sTitle = sText; } break; @@ -1355,28 +1355,28 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > { URL aUrl = getURLForId(_nId); sal_Int32 nIndex = 1; - ::rtl::OUString sType = aUrl.Complete.getToken(0,'.',nIndex); + OUString sType = aUrl.Complete.getToken(0,'.',nIndex); if ( nIndex == -1 || sType.isEmpty() ) { switch(_nId) { case SID_DRAWTBX_CS_SYMBOL: - sType = ::rtl::OUString("smiley"); + sType = OUString("smiley"); break; case SID_DRAWTBX_CS_ARROW: - sType = ::rtl::OUString("left-right-arrow"); + sType = OUString("left-right-arrow"); break; case SID_DRAWTBX_CS_FLOWCHART: - sType = ::rtl::OUString("flowchart-internal-storage"); + sType = OUString("flowchart-internal-storage"); break; case SID_DRAWTBX_CS_CALLOUT: - sType = ::rtl::OUString("round-rectangular-callout"); + sType = OUString("round-rectangular-callout"); break; case SID_DRAWTBX_CS_STAR: - sType = ::rtl::OUString("star5"); + sType = OUString("star5"); break; default: - sType = ::rtl::OUString("diamond"); + sType = OUString("diamond"); } } else @@ -1661,7 +1661,7 @@ void OReportController::impl_initialize( ) const ::comphelper::NamedValueCollection& rArguments( getInitParams() ); - rArguments.get_ensureType( (::rtl::OUString)PROPERTY_REPORTNAME, m_sName ); + rArguments.get_ensureType( (OUString)PROPERTY_REPORTNAME, m_sName ); if ( m_sName.isEmpty() ) rArguments.get_ensureType( "DocumentTitle", m_sName ); @@ -1680,7 +1680,7 @@ void OReportController::impl_initialize( ) UndoSuppressor aSuppressUndo( getUndoManager() ); ::comphelper::NamedValueCollection aArgs(getModel()->getArgs()); - setMode(aArgs.getOrDefault("Mode", ::rtl::OUString("normal"))); + setMode(aArgs.getOrDefault("Mode", OUString("normal"))); listen(true); setEditable( !m_aReportModel->IsReadOnly() ); @@ -1688,14 +1688,14 @@ void OReportController::impl_initialize( ) m_xFormatter->attachNumberFormatsSupplier(Reference< XNumberFormatsSupplier>(m_xReportDefinition,uno::UNO_QUERY)); ::comphelper::MediaDescriptor aDescriptor( m_xReportDefinition->getArgs() ); - ::rtl::OUString sHierarchicalDocumentName; - sHierarchicalDocumentName = aDescriptor.getUnpackedValueOrDefault(::rtl::OUString("HierarchicalDocumentName"),sHierarchicalDocumentName); + OUString sHierarchicalDocumentName; + sHierarchicalDocumentName = aDescriptor.getUnpackedValueOrDefault(OUString("HierarchicalDocumentName"),sHierarchicalDocumentName); if ( sHierarchicalDocumentName.isEmpty() && getConnection().is() ) { uno::Reference<sdbcx::XTablesSupplier> xTablesSup(getConnection(),uno::UNO_QUERY_THROW); uno::Reference<container::XNameAccess> xTables = xTablesSup->getTables(); - const uno::Sequence< ::rtl::OUString > aNames( xTables->getElementNames() ); + const uno::Sequence< OUString > aNames( xTables->getElementNames() ); if ( aNames.hasElements() ) { @@ -1740,7 +1740,7 @@ void OReportController::impl_initialize( ) if ( m_bShowProperties && m_nPageNum == -1 ) { - m_sLastActivePage = ::rtl::OUString("Data"); + m_sLastActivePage = OUString("Data"); getDesignView()->setCurrentPage(m_sLastActivePage); uno::Sequence< beans::PropertyValue> aArgs; executeUnChecked(SID_SELECT_REPORT,aArgs); @@ -1781,7 +1781,7 @@ void OReportController::doOpenHelpAgent() { if (getFrame().is()) { - rtl::OUString suURL("vnd.sun.star.help://shared/text/shared/explorer/database/rep_main.xhp?UseDB=no&DbPAR=swriter"); + OUString suURL("vnd.sun.star.help://shared/text/shared/explorer/database/rep_main.xhp?UseDB=no&DbPAR=swriter"); openHelpAgent(suURL); } else @@ -2103,15 +2103,15 @@ void OReportController::onLoadedMenu(const Reference< frame::XLayoutManager >& _ { if ( _xLayoutManager.is() ) { - static const ::rtl::OUString s_sMenu[] = { - ::rtl::OUString("private:resource/statusbar/statusbar") - ,::rtl::OUString("private:resource/toolbar/reportcontrols") - ,::rtl::OUString("private:resource/toolbar/drawbar") - ,::rtl::OUString("private:resource/toolbar/Formatting") - ,::rtl::OUString("private:resource/toolbar/alignmentbar") - ,::rtl::OUString("private:resource/toolbar/sectionalignmentbar") - ,::rtl::OUString("private:resource/toolbar/resizebar") - ,::rtl::OUString("private:resource/toolbar/sectionshrinkbar") + static const OUString s_sMenu[] = { + OUString("private:resource/statusbar/statusbar") + ,OUString("private:resource/toolbar/reportcontrols") + ,OUString("private:resource/toolbar/drawbar") + ,OUString("private:resource/toolbar/Formatting") + ,OUString("private:resource/toolbar/alignmentbar") + ,OUString("private:resource/toolbar/sectionalignmentbar") + ,OUString("private:resource/toolbar/resizebar") + ,OUString("private:resource/toolbar/sectionshrinkbar") }; for (size_t i = 0; i< sizeof(s_sMenu)/sizeof(s_sMenu[0]); ++i) { @@ -2308,11 +2308,11 @@ static sal_uInt16 lcl_getNonVisbleGroupsBefore( const uno::Reference< report::XG return nNonVisibleGroups; } // ----------------------------------------------------------------------------- -void OReportController::groupChange( const uno::Reference< report::XGroup>& _xGroup,const ::rtl::OUString& _sPropName,sal_Int32 _nGroupPos,bool _bShow) +void OReportController::groupChange( const uno::Reference< report::XGroup>& _xGroup,const OUString& _sPropName,sal_Int32 _nGroupPos,bool _bShow) { ::std::mem_fun_t<sal_Bool,OGroupHelper> pMemFun = ::std::mem_fun(&OGroupHelper::getHeaderOn); ::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> pMemFunSection = ::std::mem_fun(&OGroupHelper::getHeader); - ::rtl::OUString sColor(DBGROUPHEADER); + OUString sColor(DBGROUPHEADER); sal_uInt16 nPosition = 0; bool bHandle = false; if ( _sPropName.equals( PROPERTY_HEADERON ) ) @@ -2405,7 +2405,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ SID_ATTR_METRIC,SID_ATTR_METRIC, 0 }; - SfxItemPool* pPool( new SfxItemPool(rtl::OUString("ReportPageProperties"), RPTUI_ID_LRSPACE,RPTUI_ID_METRIC, aItemInfos, pDefaults) ); + SfxItemPool* pPool( new SfxItemPool(OUString("ReportPageProperties"), RPTUI_ID_LRSPACE,RPTUI_ID_METRIC, aItemInfos, pDefaults) ); pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same @@ -2539,7 +2539,7 @@ void OReportController::openSortingAndGroupingDialog() m_pGroupsFloater = new OGroupsSortingDialog(getView(),!isEditable(),this); SvtViewOptions aDlgOpt( E_WINDOW, OUString::number( RID_GROUPS_SORTING) ); if ( aDlgOpt.Exists() ) - m_pGroupsFloater->SetWindowState(::rtl::OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); + m_pGroupsFloater->SetWindowState(OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); m_pGroupsFloater->AddEventListener(LINK(this,OReportController,EventLstHdl)); } else if ( isUiVisible() ) @@ -2715,7 +2715,7 @@ uno::Any SAL_CALL OReportController::getViewData(void) throw( uno::RuntimeExcept { const FeatureState aFeatureState = GetState( nCommandIDs[i] ); - ::rtl::OUString sCommandURL( getURLForId( nCommandIDs[i] ).Main ); + OUString sCommandURL( getURLForId( nCommandIDs[i] ).Main ); OSL_ENSURE( sCommandURL.indexOfAsciiL( ".uno:", 5 ) == 0, "OReportController::getViewData: illegal command URL!" ); sCommandURL = sCommandURL.copy( 5 ); @@ -2778,9 +2778,9 @@ void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data) throw( ::comphelper::NamedValueCollection aCommandProperties( aViewData.get( "CommandProperties" ) ); - const ::std::vector< ::rtl::OUString > aCommandNames( aCommandProperties.getNames() ); + const ::std::vector< OUString > aCommandNames( aCommandProperties.getNames() ); - for ( ::std::vector< ::rtl::OUString >::const_iterator commandName = aCommandNames.begin(); + for ( ::std::vector< OUString >::const_iterator commandName = aCommandNames.begin(); commandName != aCommandNames.end(); ++commandName ) @@ -2792,10 +2792,10 @@ void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data) throw( if ( getView() ) { util::URL aCommand; - aCommand.Complete = ::rtl::OUString( ".uno:" ) + *commandName; + aCommand.Complete = OUString( ".uno:" ) + *commandName; Sequence< PropertyValue > aCommandArgs(1); - aCommandArgs[0].Name = ::rtl::OUString( "Value" ); + aCommandArgs[0].Name = OUString( "Value" ); aCommandArgs[0].Value = rCommandValue; executeUnChecked( aCommand, aCommandArgs ); @@ -2839,7 +2839,7 @@ Reference<XFrame> OReportController::getXFrame() m_xFrameLoader.set( frame::Desktop::create(m_xContext) ); } const sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | frame::FrameSearchFlag::CREATE; - const ::rtl::OUString sTarget("_blank"); + const OUString sTarget("_blank"); Reference<XFrame> xFrame = m_xFrameLoader->findFrame(sTarget,nFrameSearchFlag); return xFrame; } @@ -2883,7 +2883,7 @@ uno::Reference<frame::XModel> OReportController::executeReport() if ( !m_bShowProperties ) executeUnChecked(SID_SHOW_PROPERTYBROWSER,uno::Sequence< beans::PropertyValue>()); - m_sLastActivePage = ::rtl::OUString("Data"); + m_sLastActivePage = OUString("Data"); getDesignView()->setCurrentPage(m_sLastActivePage); nCommand = SID_SELECT_REPORT; } @@ -3022,10 +3022,10 @@ void OReportController::insertGraphic() xController->getValue( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0) >>= bLink; uno::Sequence<beans::PropertyValue> aArgs(2); aArgs[0].Name = PROPERTY_IMAGEURL; - aArgs[0].Value <<= ::rtl::OUString(aDialog.GetPath()); + aArgs[0].Value <<= OUString(aDialog.GetPath()); aArgs[1].Name = PROPERTY_PRESERVEIRI; aArgs[1].Value <<= bLink; - createControl(aArgs,xSection,::rtl::OUString(),OBJ_DLG_IMAGECONTROL); + createControl(aArgs,xSection,OUString(),OBJ_DLG_IMAGECONTROL); } } catch(const Exception&) @@ -3105,7 +3105,7 @@ void SAL_CALL OReportController::removeSelectionChangeListener( const Reference< void OReportController::createNewFunction(const uno::Any& _aValue) { uno::Reference< container::XIndexContainer> xFunctions(_aValue,uno::UNO_QUERY_THROW); - const ::rtl::OUString sNewName = String(ModuleRes(RID_STR_FUNCTION)); + const OUString sNewName = String(ModuleRes(RID_STR_FUNCTION)); uno::Reference< report::XFunction> xFunction(report::Function::create(m_xContext)); xFunction->setName(sNewName); // the call below will also create an undo action -> listener @@ -3118,7 +3118,7 @@ IMPL_LINK( OReportController, OnExecuteReport, void* ,/*_pMemfun*/) return 0L; } // ----------------------------------------------------------------------------- -void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,const uno::Reference< report::XSection>& _xSection,const ::rtl::OUString& _sFunction,sal_uInt16 _nObjectId) +void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,const uno::Reference< report::XSection>& _xSection,const OUString& _sFunction,sal_uInt16 _nObjectId) { SequenceAsHashMap aMap(_aArgs); getDesignView()->setMarked(_xSection ,sal_True); @@ -3141,9 +3141,9 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co { pNewControl = SdrObjFactory::MakeNewObject( ReportInventor, _nObjectId, pSectionWindow->getReportSection().getPage(),m_aReportModel.get() ); xShapeProp.set(pNewControl->getUnoShape(),uno::UNO_QUERY); - ::rtl::OUString sCustomShapeType = getDesignView()->GetInsertObjString(); + OUString sCustomShapeType = getDesignView()->GetInsertObjString(); if ( sCustomShapeType.isEmpty() ) - sCustomShapeType = ::rtl::OUString("diamond"); + sCustomShapeType = OUString("diamond"); pSectionWindow->getReportSection().createDefault(sCustomShapeType,pNewControl); pNewControl->SetLogicRect(Rectangle(3000,500,6000,3500)); // switch height and width } @@ -3165,7 +3165,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co SdrUnoObj* pControl( NULL ); FmFormView::createControlLabelPair( getDesignView() ,nLeftMargin,0 - ,NULL,NULL,_nObjectId,::rtl::OUString(),ReportInventor,OBJ_DLG_FIXEDTEXT, + ,NULL,NULL,_nObjectId,OUString(),ReportInventor,OBJ_DLG_FIXEDTEXT, NULL,pSectionWindow->getReportSection().getPage(),m_aReportModel.get(), pLabel,pControl); delete pLabel; @@ -3177,7 +3177,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co uno::Reference<beans::XPropertySetInfo> xShapeInfo = xShapeProp->getPropertySetInfo(); uno::Reference<beans::XPropertySetInfo> xInfo = xUnoProp->getPropertySetInfo(); - const ::rtl::OUString sProps[] = { PROPERTY_NAME + const OUString sProps[] = { PROPERTY_NAME ,PROPERTY_FONTDESCRIPTOR ,PROPERTY_FONTDESCRIPTORASIAN ,PROPERTY_FONTDESCRIPTORCOMPLEX @@ -3206,7 +3206,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co if ( nFormatKey && xInfo->hasPropertyByName(PROPERTY_FORMATKEY) ) xUnoProp->setPropertyValue( PROPERTY_FORMATKEY, uno::makeAny( nFormatKey ) ); - ::rtl::OUString sUrl = aMap.getUnpackedValueOrDefault(PROPERTY_IMAGEURL,::rtl::OUString()); + OUString sUrl = aMap.getUnpackedValueOrDefault(PROPERTY_IMAGEURL,OUString()); if ( !sUrl.isEmpty() && xInfo->hasPropertyByName(PROPERTY_IMAGEURL) ) xUnoProp->setPropertyValue( PROPERTY_IMAGEURL, uno::makeAny( sUrl ) ); @@ -3244,18 +3244,18 @@ void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs) aMap.createItemIfMissing(PROPERTY_FORMATKEY,aMap.getUnpackedValueOrDefault(PROPERTY_FORMATKEYDATE,sal_Int32(0))); uno::Reference< report::XSection> xSection = aMap.getUnpackedValueOrDefault(PROPERTY_SECTION,uno::Reference< report::XSection>()); - ::rtl::OUString sFunction; + OUString sFunction; sal_Bool bDate = aMap.getUnpackedValueOrDefault(PROPERTY_DATE_STATE,sal_False); if ( bDate ) { - sFunction = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("TODAY()")); + sFunction = OUString (RTL_CONSTASCII_USTRINGPARAM("TODAY()")); createControl(aMap.getAsConstPropertyValueList(),xSection,sFunction); } sal_Bool bTime = aMap.getUnpackedValueOrDefault(PROPERTY_TIME_STATE,sal_False); if ( bTime ) { - sFunction = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("TIMEVALUE(NOW())")); + sFunction = OUString (RTL_CONSTASCII_USTRINGPARAM("TIMEVALUE(NOW())")); aMap[PROPERTY_FORMATKEY] <<= aMap.getUnpackedValueOrDefault(PROPERTY_FORMATKEYTIME,sal_Int32(0)); createControl(aMap.getAsConstPropertyValueList(),xSection,sFunction); } @@ -3278,14 +3278,14 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs sal_Bool bStateOfPage = aMap.getUnpackedValueOrDefault(PROPERTY_STATE,sal_False); String sFunction = String(ModuleRes(STR_RPT_PN_PAGE)); - ::rtl::OUString sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()")); - sFunction.SearchAndReplace(rtl::OUString("#PAGENUMBER#"),sPageNumber); + OUString sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()")); + sFunction.SearchAndReplace(OUString("#PAGENUMBER#"),sPageNumber); if ( bStateOfPage ) { - ::rtl::OUString sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()")); + OUString sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()")); sFunction += String(ModuleRes(STR_RPT_PN_PAGE_OF)); - sFunction.SearchAndReplace(rtl::OUString("#PAGECOUNT#"),sPageCount); + sFunction.SearchAndReplace(OUString("#PAGECOUNT#"),sPageCount); } sal_Bool bInPageHeader = aMap.getUnpackedValueOrDefault(PROPERTY_PAGEHEADERON,sal_True); @@ -3327,7 +3327,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) } ::svx::ODataAccessDescriptor aDescriptor(aValue); SequenceAsHashMap aMap(aValue); - uno::Reference<report::XSection> xSection = aMap.getUnpackedValueOrDefault(::rtl::OUString("Section"),xCurrentSection); + uno::Reference<report::XSection> xSection = aMap.getUnpackedValueOrDefault(OUString("Section"),xCurrentSection); uno::Reference<report::XReportDefinition> xReportDefinition = xSection->getReportDefinition(); getDesignView()->setMarked(xSection,sal_True); @@ -3339,7 +3339,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) aPos.X = nLeftMargin; // LLA: new feature, add the Label in dependency of the given DND_ACTION one section up, normal or one section down - sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault(::rtl::OUString("DNDAction"), sal_Int8(0)); + sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault(OUString("DNDAction"), sal_Int8(0)); pSectionWindow[1] = pSectionWindow[0]; sal_Bool bLabelAboveTextField = nDNDAction == DND_ACTION_COPY; if ( bLabelAboveTextField || nDNDAction == DND_ACTION_LINK ) @@ -3359,8 +3359,8 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) uno::Reference< lang::XComponent > xHoldAlive; if ( !xField.is() ) { - ::rtl::OUString sCommand; - ::rtl::OUString sColumnName; + OUString sCommand; + OUString sColumnName; sal_Int32 nCommandType( -1 ); OSL_VERIFY( aDescriptor[ ::svx::daCommand ] >>= sCommand ); OSL_VERIFY( aDescriptor[ ::svx::daColumnName ] >>= sColumnName ); @@ -3387,7 +3387,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) try { uno::Reference< beans::XPropertySet > xRowSetProps( getRowSet(), UNO_QUERY_THROW ); - ::rtl::OUString sRowSetCommand; + OUString sRowSetCommand; sal_Int32 nRowSetCommandType( -1 ); OSL_VERIFY( xRowSetProps->getPropertyValue( PROPERTY_COMMAND ) >>= sRowSetCommand ); OSL_VERIFY( xRowSetProps->getPropertyValue( PROPERTY_COMMANDTYPE ) >>= nRowSetCommandType ); @@ -3411,8 +3411,8 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) for ( sal_Int32 i=0; i<nParamCount; ++i) { uno::Reference< beans::XPropertySet > xParamCol( xParams->getByIndex(i), uno::UNO_QUERY_THROW ); - ::rtl::OUString sParamName; - OSL_VERIFY( xParamCol->getPropertyValue( ::rtl::OUString( "Name" ) ) >>= sParamName ); + OUString sParamName; + OSL_VERIFY( xParamCol->getPropertyValue( OUString( "Name" ) ) >>= sParamName ); if ( sParamName == sColumnName ) { xField = xParamCol; @@ -3458,7 +3458,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) // find this in svx FmFormView::createControlLabelPair( getDesignView() ,nLeftMargin,0 - ,xField,xNumberFormats,nOBJID,::rtl::OUString(),ReportInventor,OBJ_DLG_FIXEDTEXT, + ,xField,xNumberFormats,nOBJID,OUString(),ReportInventor,OBJ_DLG_FIXEDTEXT, pSectionWindow[1]->getReportSection().getPage(),pSectionWindow[0]->getReportSection().getPage(),m_aReportModel.get(), pControl[0],pControl[1]); if ( pControl[0] && pControl[1] ) @@ -3468,7 +3468,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) pPgViews[1] = pSectionViews[1]->GetSdrPageView(); if ( pPgViews[0] && pPgViews[1] ) { - ::rtl::OUString sDefaultName; + OUString sDefaultName; size_t i = 0; OUnoObject* pObjs[2]; for(i = 0; i < sizeof(pControl)/sizeof(pControl[0]);++i) @@ -3480,7 +3480,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) uno::Reference<beans::XPropertySetInfo> xShapeInfo = xShapeProp->getPropertySetInfo(); uno::Reference<beans::XPropertySetInfo> xInfo = xUnoProp->getPropertySetInfo(); - const ::rtl::OUString sProps[] = { PROPERTY_FONTDESCRIPTOR + const OUString sProps[] = { PROPERTY_FONTDESCRIPTOR ,PROPERTY_FONTDESCRIPTORASIAN ,PROPERTY_FONTDESCRIPTORCOMPLEX ,PROPERTY_BORDER @@ -3493,7 +3493,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) } if ( xInfo->hasPropertyByName(PROPERTY_DATAFIELD) ) { - ::rtl::OUString sName; + OUString sName; xUnoProp->getPropertyValue(PROPERTY_DATAFIELD) >>= sName; sDefaultName = sName; xUnoProp->setPropertyValue(PROPERTY_NAME,uno::makeAny(sDefaultName)); @@ -3516,7 +3516,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) aPos.Y += xShapeProp->getHeight(); aPos.X += nShapeWidth; } - ::rtl::OUString sLabel; + OUString sLabel; if ( xField->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) ) xField->getPropertyValue(PROPERTY_LABEL) >>= sLabel; @@ -3650,12 +3650,12 @@ void OReportController::changeZOrder(sal_Int32 _nId) // ----------------------------------------------------------------------------- void OReportController::listen(const bool _bAdd) { - const ::rtl::OUString aProps [] = { PROPERTY_REPORTHEADERON,PROPERTY_REPORTFOOTERON + const OUString aProps [] = { PROPERTY_REPORTHEADERON,PROPERTY_REPORTFOOTERON ,PROPERTY_PAGEHEADERON,PROPERTY_PAGEFOOTERON ,PROPERTY_COMMAND, PROPERTY_COMMANDTYPE,PROPERTY_CAPTION }; - void (SAL_CALL XPropertySet::*pPropertyListenerAction)( const ::rtl::OUString&, const uno::Reference< XPropertyChangeListener >& ) = + void (SAL_CALL XPropertySet::*pPropertyListenerAction)( const OUString&, const uno::Reference< XPropertyChangeListener >& ) = _bAdd ? &XPropertySet::addPropertyChangeListener : &XPropertySet::removePropertyChangeListener; for (size_t i = 0; i < sizeof(aProps)/sizeof(aProps[0]); ++i) @@ -3666,8 +3666,8 @@ void OReportController::listen(const bool _bAdd) uno::Sequence< beans::Property> aSeq = m_xReportDefinition->getPropertySetInfo()->getProperties(); const beans::Property* pIter = aSeq.getConstArray(); const beans::Property* pEnd = pIter + aSeq.getLength(); - const ::rtl::OUString* pPropsBegin = &aProps[0]; - const ::rtl::OUString* pPropsEnd = pPropsBegin + (sizeof(aProps)/sizeof(aProps[0])) - 3; + const OUString* pPropsBegin = &aProps[0]; + const OUString* pPropsEnd = pPropsBegin + (sizeof(aProps)/sizeof(aProps[0])) - 3; for(;pIter != pEnd;++pIter) { if ( ::std::find(pPropsBegin,pPropsEnd,pIter->Name) == pPropsEnd ) @@ -3962,7 +3962,7 @@ void OReportController::createDefaultControl(const uno::Sequence< beans::Propert if ( xSection.is() ) { - const ::rtl::OUString sKeyModifier("KeyModifier"); + const OUString sKeyModifier("KeyModifier"); const beans::PropertyValue* pIter = _aArgs.getConstArray(); const beans::PropertyValue* pEnd = pIter + _aArgs.getLength(); const beans::PropertyValue* pKeyModifier = ::std::find_if(pIter,pEnd,::std::bind2nd(PropertyValueCompare(),boost::cref(sKeyModifier))); @@ -3971,7 +3971,7 @@ void OReportController::createDefaultControl(const uno::Sequence< beans::Propert { Sequence< PropertyValue > aCreateArgs; getDesignView()->unmarkAllObjects(NULL); - createControl(aCreateArgs,xSection,::rtl::OUString(),getDesignView()->GetInsertObj()); + createControl(aCreateArgs,xSection,OUString(),getDesignView()->GetInsertObj()); } } } @@ -3986,8 +3986,8 @@ void OReportController::checkChartEnabled() if ( !m_bChartEnabledAsked ) { m_bChartEnabledAsked = true; - const ::rtl::OUString sConfigName( "/org.openoffice.Office.ReportDesign" ); - const ::rtl::OUString sPropertyName( "UserData/Chart" ); + const OUString sConfigName( "/org.openoffice.Office.ReportDesign" ); + const OUString sPropertyName( "UserData/Chart" ); try { @@ -4007,7 +4007,7 @@ void OReportController::checkChartEnabled() // ----------------------------------------------------------------------------- // css.frame.XTitle -::rtl::OUString SAL_CALL OReportController::getTitle() +OUString SAL_CALL OReportController::getTitle() throw (uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -4047,27 +4047,27 @@ void SAL_CALL OReportController::setFastPropertyValue_NoBroadcast(sal_Int32 _nHa impl_zoom_nothrow(); } } -void SAL_CALL OReportController::setMode( const ::rtl::OUString& aMode ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL OReportController::setMode( const OUString& aMode ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); m_sMode = aMode; } -::rtl::OUString SAL_CALL OReportController::getMode( ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OReportController::getMode( ) throw (::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); return m_sMode; } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OReportController::getSupportedModes( ) throw (::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL OReportController::getSupportedModes( ) throw (::com::sun::star::uno::RuntimeException) { - static ::rtl::OUString s_sModes[] = { ::rtl::OUString("remote"), - ::rtl::OUString("normal") }; - return uno::Sequence< ::rtl::OUString> (&s_sModes[0],sizeof(s_sModes)/sizeof(s_sModes[0])); + static OUString s_sModes[] = { OUString("remote"), + OUString("normal") }; + return uno::Sequence< OUString> (&s_sModes[0],sizeof(s_sModes)/sizeof(s_sModes[0])); } -::sal_Bool SAL_CALL OReportController::supportsMode( const ::rtl::OUString& aMode ) throw (::com::sun::star::uno::RuntimeException) +::sal_Bool SAL_CALL OReportController::supportsMode( const OUString& aMode ) throw (::com::sun::star::uno::RuntimeException) { - uno::Sequence< ::rtl::OUString> aModes = getSupportedModes(); - const ::rtl::OUString* pIter = aModes.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aModes.getLength(); + uno::Sequence< OUString> aModes = getSupportedModes(); + const OUString* pIter = aModes.getConstArray(); + const OUString* pEnd = pIter + aModes.getLength(); for(;pIter != pEnd;++pIter) { if ( pIter->equals(aMode ) ) @@ -4081,7 +4081,7 @@ bool OReportController::isUiVisible() const return m_sMode != "remote"; } // ----------------------------------------------------------------------------- -void OReportController::impl_fillState_nothrow(const ::rtl::OUString& _sProperty,dbaui::FeatureState& _rState) const +void OReportController::impl_fillState_nothrow(const OUString& _sProperty,dbaui::FeatureState& _rState) const { _rState.bEnabled = isEditable(); if ( _rState.bEnabled ) @@ -4157,7 +4157,7 @@ sal_Bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const un return bRet; } // ----------------------------------------------------------------------------- -bool OReportController::impl_setPropertyAtControls_throw(const sal_uInt16 _nUndoResId,const ::rtl::OUString& _sProperty,const uno::Any& _aValue,const Sequence< PropertyValue >& _aArgs) +bool OReportController::impl_setPropertyAtControls_throw(const sal_uInt16 _nUndoResId,const OUString& _sProperty,const uno::Any& _aValue,const Sequence< PropertyValue >& _aArgs) { ::std::vector< uno::Reference< uno::XInterface > > aSelection; uno::Reference< awt::XWindow> xWindow; @@ -4216,7 +4216,7 @@ void OReportController::openZoomDialog() SID_ATTR_ZOOM,SID_ATTR_ZOOM, 0 }; - SfxItemPool* pPool( new SfxItemPool(rtl::OUString("ZoomProperties"), SID_ATTR_ZOOM,SID_ATTR_ZOOM, aItemInfos, pDefaults) ); + SfxItemPool* pPool( new SfxItemPool(OUString("ZoomProperties"), SID_ATTR_ZOOM,SID_ATTR_ZOOM, aItemInfos, pDefaults) ); pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same try @@ -4329,9 +4329,9 @@ uno::Reference< container::XNameAccess > OReportController::getColumns() const return m_xColumns; } // ----------------------------------------------------------------------------- -::rtl::OUString OReportController::getColumnLabel_throw(const ::rtl::OUString& i_sColumnName) const +OUString OReportController::getColumnLabel_throw(const OUString& i_sColumnName) const { - ::rtl::OUString sLabel; + OUString sLabel; uno::Reference< container::XNameAccess > xColumns = getColumns(); if ( xColumns.is() && xColumns->hasByName(i_sColumnName) ) { diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 97d78406acdc..cc9890eecb9c 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -245,9 +245,9 @@ void OXReportControllerObserver::TogglePropertyListening(const uno::Reference< u if (xSet.is()) { if (!m_pImpl->m_bReadOnly) - xSet->addPropertyChangeListener( ::rtl::OUString(), this ); + xSet->addPropertyChangeListener( OUString(), this ); else - xSet->removePropertyChangeListener( ::rtl::OUString(), this ); + xSet->removePropertyChangeListener( OUString(), this ); } } @@ -302,9 +302,9 @@ void OXReportControllerObserver::switchListening( const uno::Reference< uno::XIn if ( xProps.is() ) { if ( _bStartListening ) - xProps->addPropertyChangeListener( ::rtl::OUString(), this ); + xProps->addPropertyChangeListener( OUString(), this ); else - xProps->removePropertyChangeListener( ::rtl::OUString(), this ); + xProps->removePropertyChangeListener( OUString(), this ); } } diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 13eb3a5e5454..ffcfbc20fad8 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -245,7 +245,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC // unmark all objects m_pView->UnmarkAll(); - const ::rtl::OUString sSectionName = m_xSection->getName(); + const OUString sSectionName = m_xSection->getName(); const sal_Int32 nLength = _aAllreadyCopiedObjects.getLength(); const beans::NamedValue* pIter = _aAllreadyCopiedObjects.getConstArray(); const beans::NamedValue* pEnd = pIter + nLength; @@ -450,7 +450,7 @@ void lcl_insertMenuItemImages( } else { - const ::rtl::OUString sCommand = rContextMenu.GetItemCommand(nId); + const OUString sCommand = rContextMenu.GetItemCommand(nId); rContextMenu.SetItemImage(nId,framework::GetImageFromURL(_rFrame,sCommand,sal_False)); if ( nId == SID_PAGEHEADERFOOTER ) { @@ -492,7 +492,7 @@ void OReportSection::Command( const CommandEvent& _rCEvt ) if ( nId == SID_ATTR_CHAR_COLOR_BACKGROUND ) { aArgs.realloc(1); - aArgs[0].Name = ::rtl::OUString("Selection"); + aArgs[0].Name = OUString("Selection"); aArgs[0].Value <<= m_xSection; } rController.executeChecked(nId,aArgs); @@ -614,7 +614,7 @@ void OReportSection::deactivateOle() m_pFunc->deactivateOle(true); } // ----------------------------------------------------------------------------- -void OReportSection::createDefault(const ::rtl::OUString& _sType) +void OReportSection::createDefault(const OUString& _sType) { SdrObject* pObj = m_pView->GetCreateObj(); if ( !pObj ) @@ -622,17 +622,17 @@ void OReportSection::createDefault(const ::rtl::OUString& _sType) createDefault(_sType,pObj); } // ----------------------------------------------------------------------------- -void OReportSection::createDefault(const ::rtl::OUString& _sType,SdrObject* _pObj) +void OReportSection::createDefault(const OUString& _sType,SdrObject* _pObj) { sal_Bool bAttributesAppliedFromGallery = sal_False; if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) ) { - std::vector< rtl::OUString > aObjList; + std::vector< OUString > aObjList; if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) ) { - std::vector< rtl::OUString >::iterator aIter = aObjList.begin(); - std::vector< rtl::OUString >::iterator aEnd = aObjList.end(); + std::vector< OUString >::iterator aIter = aObjList.begin(); + std::vector< OUString >::iterator aEnd = aObjList.end(); for (sal_uInt32 i=0 ; aIter != aEnd; ++aIter,++i) { if ( aIter->equalsIgnoreAsciiCase( _sType ) ) @@ -833,10 +833,10 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt ) aCurrent[nLength].Name = PROPERTY_POSITION; aCurrent[nLength++].Value <<= AWTPoint(aDropPos); // give also the DND Action (Shift|Ctrl) Key to really say what we want - aCurrent[nLength].Name = ::rtl::OUString("DNDAction"); + aCurrent[nLength].Name = OUString("DNDAction"); aCurrent[nLength++].Value <<= _rEvt.mnAction; - aCurrent[nLength].Name = ::rtl::OUString("Section"); + aCurrent[nLength].Name = OUString("Section"); aCurrent[nLength++].Value <<= getSection(); pIter->Value <<= aCurrent; } diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index 2542c37df2a5..7b1ef7285a59 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -96,13 +96,13 @@ void OReportWindow::initialize() m_aViewsWindow.initialize(); } //---------------------------------------------------------------------------- -void OReportWindow::SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType ) +void OReportWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType ) { m_aViewsWindow.SetInsertObj( eObj,_sShapeType); } //---------------------------------------------------------------------------- -rtl::OUString OReportWindow::GetInsertObjString() const +OUString OReportWindow::GetInsertObjString() const { return m_aViewsWindow.GetInsertObjString(); } @@ -119,7 +119,7 @@ void OReportWindow::removeSection(sal_uInt16 _nPosition) m_aViewsWindow.Invalidate(INVALIDATE_TRANSPARENT); } //---------------------------------------------------------------------------- -void OReportWindow::addSection(const uno::Reference< report::XSection >& _xSection,const ::rtl::OUString& _sColorEntry,sal_uInt16 _nPosition) +void OReportWindow::addSection(const uno::Reference< report::XSection >& _xSection,const OUString& _sColorEntry,sal_uInt16 _nPosition) { if ( !_xSection.is() ) return; diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index 4698db625882..ca153c51a2f0 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -191,7 +191,7 @@ IMPL_LINK( OScrollWindowHelper, ScrollHdl, ScrollBar*, /*pScroll*/ ) } //------------------------------------------------------------------------------ void OScrollWindowHelper::addSection(const uno::Reference< report::XSection >& _xSection - ,const ::rtl::OUString& _sColorEntry + ,const OUString& _sColorEntry ,sal_uInt16 _nPosition) { m_aReportWindow.addSection(_xSection,_sColorEntry,_nPosition); @@ -212,12 +212,12 @@ sal_uInt16 OScrollWindowHelper::getSectionCount() const return m_aReportWindow.getSectionCount(); } //------------------------------------------------------------------------------ -void OScrollWindowHelper::SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType ) +void OScrollWindowHelper::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType ) { m_aReportWindow.SetInsertObj(eObj,_sShapeType); } //---------------------------------------------------------------------------- -rtl::OUString OScrollWindowHelper::GetInsertObjString() const +OUString OScrollWindowHelper::GetInsertObjString() const { return m_aReportWindow.GetInsertObjString(); } diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index 4030f8e02824..d6a49ed62423 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star; using namespace ::comphelper; DBG_NAME( rpt_OSectionWindow ) -OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< report::XSection >& _xSection,const ::rtl::OUString& _sColorEntry) +OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< report::XSection >& _xSection,const OUString& _sColorEntry) : Window( _pParent,WB_DIALOGCONTROL) ,OPropertyChangeListener(m_aMutex) ,m_pParent(_pParent) @@ -176,15 +176,15 @@ bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>& const bool bRet = _pIsSectionOn(&aGroupHelper) && _pGetSection(&aGroupHelper) == m_aReportSection.getSection() ; if ( bRet ) { - ::rtl::OUString sExpression = _xGroup->getExpression(); - ::rtl::OUString sLabel = getViewsWindow()->getView()->getReportView()->getController().getColumnLabel_throw(sExpression); + OUString sExpression = _xGroup->getExpression(); + OUString sLabel = getViewsWindow()->getView()->getReportView()->getController().getColumnLabel_throw(sExpression); if ( !sLabel.isEmpty() ) { sExpression = sLabel; } String sTitle = ModuleRes(_nResId).toString(); - sTitle.SearchAndReplace(rtl::OUString('#') ,sExpression); + sTitle.SearchAndReplace(OUString('#') ,sExpression); m_aStartMarker.setTitle(sTitle); m_aStartMarker.Invalidate(INVALIDATE_CHILDREN); } diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 14bc01063820..fbb10b47f914 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -45,7 +45,7 @@ oslInterlockedCount OStartMarker::s_nImageRefCount = 0; DBG_NAME( rpt_OStartMarker ) // ----------------------------------------------------------------------------- -OStartMarker::OStartMarker(OSectionWindow* _pParent,const ::rtl::OUString& _sColorEntry) +OStartMarker::OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry) : OColorListener(_pParent,_sColorEntry) ,m_aVRuler(this,WB_VERT) ,m_aText(this,WB_HYPHENATION) diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 39bb7e9a8a0f..d7277b84babe 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -296,7 +296,7 @@ void OViewsWindow::DataChanged( const DataChangedEvent& rDCEvt ) } } //---------------------------------------------------------------------------- -void OViewsWindow::addSection(const uno::Reference< report::XSection >& _xSection,const ::rtl::OUString& _sColorEntry,sal_uInt16 _nPosition) +void OViewsWindow::addSection(const uno::Reference< report::XSection >& _xSection,const OUString& _sColorEntry,sal_uInt16 _nPosition) { ::boost::shared_ptr<OSectionWindow> pSectionWindow( new OSectionWindow(this,_xSection,_sColorEntry) ); m_aSections.insert(getIteratorAtPos(_nPosition) , TSectionsMap::value_type(pSectionWindow)); @@ -343,7 +343,7 @@ sal_uInt16 OViewsWindow::getSectionCount() const return static_cast<sal_uInt16>(m_aSections.size()); } //---------------------------------------------------------------------------- -void OViewsWindow::SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType ) +void OViewsWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType ) { TSectionsMap::iterator aIter = m_aSections.begin(); TSectionsMap::iterator aEnd = m_aSections.end(); @@ -353,7 +353,7 @@ void OViewsWindow::SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeT m_sShapeType = _sShapeType; } //---------------------------------------------------------------------------- -rtl::OUString OViewsWindow::GetInsertObjString() const +OUString OViewsWindow::GetInsertObjString() const { return m_sShapeType; } @@ -1017,7 +1017,7 @@ void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _ if ( &rView != &_rSection ) { - SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString("com.sun.star.form.component.FixedText")); + SdrObject *pNewObj = new SdrUnoObj(OUString("com.sun.star.form.component.FixedText")); if (pNewObj) { pNewObj->SetLogicRect(_aRect); diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx index e70bd8e32495..48b334e9cbd5 100644 --- a/reportdesign/source/ui/report/dlgedclip.cxx +++ b/reportdesign/source/ui/report/dlgedclip.cxx @@ -41,7 +41,7 @@ sal_uInt32 OReportExchange::getDescriptorFormatId() static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"report.ReportObjectsTransfer\"")); + s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"report.ReportObjectsTransfer\"")); OSL_ENSURE((sal_uInt32)-1 != s_nFormat, "OReportExchange::getDescriptorFormatId: bad exchange id!"); } return s_nFormat; diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index 9d7f52c31f9c..8afad4a9ada3 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -54,24 +54,24 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) { case OBJ_DLG_FIXEDTEXT: pObjFactory->pNewObj = new OUnoObject( SERVICE_FIXEDTEXT - ,::rtl::OUString("com.sun.star.form.component.FixedText") + ,OUString("com.sun.star.form.component.FixedText") ,OBJ_DLG_FIXEDTEXT); break; case OBJ_DLG_IMAGECONTROL: pObjFactory->pNewObj = new OUnoObject( SERVICE_IMAGECONTROL - ,::rtl::OUString("com.sun.star.form.component.DatabaseImageControl") + ,OUString("com.sun.star.form.component.DatabaseImageControl") ,OBJ_DLG_IMAGECONTROL); break; case OBJ_DLG_FORMATTEDFIELD: pObjFactory->pNewObj = new OUnoObject( SERVICE_FORMATTEDFIELD - ,::rtl::OUString("com.sun.star.form.component.FormattedField") + ,OUString("com.sun.star.form.component.FormattedField") ,OBJ_DLG_FORMATTEDFIELD); break; case OBJ_DLG_VFIXEDLINE: case OBJ_DLG_HFIXEDLINE: { OUnoObject* pObj = new OUnoObject( SERVICE_FIXEDLINE - ,::rtl::OUString("com.sun.star.awt.UnoControlFixedLineModel") + ,OUString("com.sun.star.awt.UnoControlFixedLineModel") ,pObjFactory->nIdentifier); pObjFactory->pNewObj = pObj; if ( pObjFactory->nIdentifier == OBJ_DLG_HFIXEDLINE ) @@ -88,7 +88,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) pObjFactory->pNewObj = new OOle2Obj(SERVICE_REPORTDEFINITION,OBJ_DLG_SUBREPORT); break; case OBJ_OLE2: - pObjFactory->pNewObj = new OOle2Obj(::rtl::OUString("com.sun.star.chart2.ChartDocument"),OBJ_OLE2); + pObjFactory->pNewObj = new OOle2Obj(OUString("com.sun.star.chart2.ChartDocument"),OBJ_OLE2); break; default: OSL_FAIL("Unknown object id"); diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 6805f5e496dc..d915dce80df1 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -182,7 +182,7 @@ sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) if ( m_pParent->GetMode() != RPTUI_READONLY ) { uno::Sequence<beans::PropertyValue> aArgs(1); - aArgs[0].Name = ::rtl::OUString("ShowProperties"); + aArgs[0].Name = OUString("ShowProperties"); aArgs[0].Value <<= sal_True; m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->getController().executeUnChecked(SID_SHOW_PROPERTYBROWSER,aArgs); m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_rView); diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index a804d872b292..d7f4e22054dc 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -72,8 +72,8 @@ namespace { static bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& _rxContext ) { - const ::rtl::OUString sConfigName( "/org.openoffice.Office.ReportDesign/PropertyBrowser/" ); - const ::rtl::OUString sPropertyName( "DirectHelp" ); + const OUString sConfigName( "/org.openoffice.Office.ReportDesign/PropertyBrowser/" ); + const OUString sPropertyName( "DirectHelp" ); ::utl::OConfigurationTreeRoot aConfiguration( ::utl::OConfigurationTreeRoot::createWithComponentContext( _rxContext, sConfigName ) ); @@ -107,11 +107,11 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen try { // create a frame wrapper for myself - m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString("com.sun.star.frame.Frame")), UNO_QUERY); + m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(OUString("com.sun.star.frame.Frame")), UNO_QUERY); if (m_xMeAsFrame.is()) { m_xMeAsFrame->initialize( VCLUnoHelper::GetInterface ( this ) ); - m_xMeAsFrame->setName(::rtl::OUString("report property browser")); // change name! + m_xMeAsFrame->setName(OUString("report property browser")); // change name! } } catch (Exception&) @@ -129,9 +129,9 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen { ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( ::rtl::OUString( "ContextDocument" ), makeAny( m_pDesignView->getController().getModel() )), - ::cppu::ContextEntry_Init( ::rtl::OUString( "DialogParentWindow" ), makeAny( VCLUnoHelper::GetInterface ( this ) )), - ::cppu::ContextEntry_Init( ::rtl::OUString( "ActiveConnection" ), makeAny( m_pDesignView->getController().getConnection() ) ), + ::cppu::ContextEntry_Init( OUString( "ContextDocument" ), makeAny( m_pDesignView->getController().getModel() )), + ::cppu::ContextEntry_Init( OUString( "DialogParentWindow" ), makeAny( VCLUnoHelper::GetInterface ( this ) )), + ::cppu::ContextEntry_Init( OUString( "ActiveConnection" ), makeAny( m_pDesignView->getController().getConnection() ) ), }; m_xInspectorContext.set( ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ), @@ -145,7 +145,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen m_xBrowserController = inspection::ObjectInspector::createWithModel(m_xInspectorContext, xInspectorModel); if ( !m_xBrowserController.is() ) { - const ::rtl::OUString sServiceName( "com.sun.star.inspection.ObjectInspector" ); + const OUString sServiceName( "com.sun.star.inspection.ObjectInspector" ); ShowServiceNotAvailableError(pParent, sServiceName, sal_True); } else @@ -199,9 +199,9 @@ PropBrw::~PropBrw() uno::Reference<container::XNameContainer> xName(m_xInspectorContext,uno::UNO_QUERY); if ( xName.is() ) { - const ::rtl::OUString pProps[] = { ::rtl::OUString( "ContextDocument" ) - , ::rtl::OUString( "DialogParentWindow" ) - , ::rtl::OUString( "ActiveConnection" )}; + const OUString pProps[] = { OUString( "ContextDocument" ) + , OUString( "DialogParentWindow" ) + , OUString( "ActiveConnection" )}; for (size_t i = 0; i < sizeof(pProps)/sizeof(pProps[0]); ++i) xName->removeByName(pProps[i]); } @@ -214,7 +214,7 @@ PropBrw::~PropBrw() DBG_DTOR( rpt_PropBrw,NULL); } // ----------------------------------------------------------------------------- -void PropBrw::setCurrentPage(const ::rtl::OUString& _sLastActivePage) +void PropBrw::setCurrentPage(const OUString& _sLastActivePage) { m_sLastActivePage = _sLastActivePage; } @@ -236,9 +236,9 @@ void PropBrw::implDetachController() m_xBrowserComponentWindow.clear(); } //----------------------------------------------------------------------- -::rtl::OUString PropBrw::getCurrentPage() const +OUString PropBrw::getCurrentPage() const { - ::rtl::OUString sCurrentPage; + OUString sCurrentPage; try { if ( m_xBrowserController.is() ) @@ -336,9 +336,9 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface> //---------------------------------------------------------------------------- -::rtl::OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterface> >& _aObjects ) +OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterface> >& _aObjects ) { - ::rtl::OUString aName; + OUString aName; if ( !_aObjects.getLength() ) { aName = String(ModuleRes(RID_STR_BRWTITLE_NO_PROPERTIES)); @@ -348,7 +348,7 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface> aName = String(ModuleRes(RID_STR_BRWTITLE_PROPERTIES)); uno::Reference< container::XNameContainer > xNameCont(_aObjects[0],uno::UNO_QUERY); - Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName(::rtl::OUString("ReportComponent")), UNO_QUERY ); + Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName(OUString("ReportComponent")), UNO_QUERY ); if ( xServiceInfo.is() ) { sal_uInt16 nResId = 0; @@ -419,9 +419,9 @@ uno::Reference< uno::XInterface> PropBrw::CreateComponentPair(const uno::Referen ,const uno::Reference< uno::XInterface>& _xReportComponent) { uno::Reference< container::XNameContainer > xNameCont = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast<Reference<XInterface> * >(NULL))); - xNameCont->insertByName(::rtl::OUString("FormComponent"),uno::makeAny(_xFormComponent)); - xNameCont->insertByName(::rtl::OUString("ReportComponent"),uno::makeAny(_xReportComponent)); - xNameCont->insertByName(::rtl::OUString("RowSet") + xNameCont->insertByName(OUString("FormComponent"),uno::makeAny(_xFormComponent)); + xNameCont->insertByName(OUString("ReportComponent"),uno::makeAny(_xReportComponent)); + xNameCont->insertByName(OUString("RowSet") ,uno::makeAny(uno::Reference< uno::XInterface>(m_pDesignView->getController().getRowSet()))); return xNameCont.get(); @@ -534,7 +534,7 @@ void PropBrw::Update( OSectionView* pNewView ) uno::Reference< uno::XInterface> xTemp(m_pView->getReportSection()->getSection()); m_xLastSection = xTemp; uno::Reference< container::XNameContainer > xNameCont = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast<Reference<XInterface> * >(NULL))); - xNameCont->insertByName(::rtl::OUString("ReportComponent"),uno::makeAny(xTemp)); + xNameCont->insertByName(OUString("ReportComponent"),uno::makeAny(xTemp)); xTemp = xNameCont; implSetNewObject( uno::Sequence< uno::Reference< uno::XInterface> >(&xTemp,1) ); |