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 /svx/source/inc | |
| 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 'svx/source/inc')
33 files changed, 286 insertions, 287 deletions
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index bfe358b18c9b..70d5c3e1296b 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -70,8 +70,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); @@ -100,9 +100,9 @@ public: virtual void SAL_CALL removeAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) throw (::com::sun::star::uno::RuntimeException); //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); void Invalidate(); void NotifyFocusListeners(sal_Bool bGetFocus); diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index bebe0520e0d3..dd6e40d2675f 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -86,8 +86,8 @@ public: SvxGraphCtrlAccessibleContext( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, GraphCtrl& rRepresentation, - const ::rtl::OUString* pName = NULL, - const ::rtl::OUString* pDescription = NULL ); + const OUString* pName = NULL, + const OUString* pDescription = NULL ); void Notify( SfxBroadcaster& aBC, const SfxHint& aHint ); @@ -127,8 +127,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale (void) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException); @@ -142,9 +142,9 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService (const ::rtl::OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); //===== XTypeProvider =================================================== @@ -152,7 +152,7 @@ public: //===== XServiceName ==================================================== - virtual ::rtl::OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); //===== XAccessibleSelection ============================================= @@ -223,11 +223,11 @@ private: /** Description of this object. This is not a constant because it can be set from the outside. */ - ::rtl::OUString msDescription; + OUString msDescription; /** Name of this object. */ - ::rtl::OUString msName; + OUString msName; /// map of accessible shapes struct SdrObjectCompareLess diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index d9abdb9a30cf..b389e5909092 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -64,8 +64,8 @@ namespace svx virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); @@ -145,8 +145,8 @@ namespace svx virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); @@ -157,8 +157,8 @@ namespace svx // XAccessibleTable virtual sal_Int32 SAL_CALL getAccessibleRowCount( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) throw (::com::sun::star::uno::RuntimeException); @@ -241,8 +241,8 @@ namespace svx virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 1d05ad23fb9d..e12630733add 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -375,7 +375,7 @@ namespace svxform HelpButton m_aHelpBtn; Timer m_aResultTimer; - ::rtl::OUString m_sPropertyName; + OUString m_sPropertyName; XFormsUIHelper1_ref m_xUIHelper; XPropertySet_ref m_xBinding; @@ -387,7 +387,7 @@ namespace svxform public: AddConditionDialog( Window* pParent, - const ::rtl::OUString& _rPropertyName, const XPropertySet_ref& _rBinding ); + const OUString& _rPropertyName, const XPropertySet_ref& _rBinding ); ~AddConditionDialog(); inline XFormsUIHelper1_ref GetUIHelper() const { return m_xUIHelper; } @@ -405,7 +405,7 @@ namespace svxform class NamespaceItemDialog : public ModalDialog { private: - typedef std::vector< ::rtl::OUString > PrefixList; + typedef std::vector< OUString > PrefixList; FixedText m_aNamespacesFT; SvxSimpleTableContainer m_aNamespacesListContainer; diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 94f12a5820c4..1c0358003830 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -38,35 +38,35 @@ #include <com/sun/star/lang/XComponent.hpp> -#define RECOVERY_CMDPART_PROTOCOL rtl::OUString( "vnd.sun.star.autorecovery:") - -#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE rtl::OUString( "/doEmergencySave" ) -#define RECOVERY_CMDPART_DO_RECOVERY rtl::OUString( "/doAutoRecovery" ) -#define RECOVERY_CMDPART_DO_CRASHREPORT rtl::OUString( "/doCrashReport" ) - -#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE rtl::OUString( "vnd.sun.star.autorecovery:/doPrepareEmergencySave") -#define RECOVERY_CMD_DO_EMERGENCY_SAVE rtl::OUString( "vnd.sun.star.autorecovery:/doEmergencySave" ) -#define RECOVERY_CMD_DO_RECOVERY rtl::OUString( "vnd.sun.star.autorecovery:/doAutoRecovery" ) -#define RECOVERY_CMD_DO_ENTRY_BACKUP rtl::OUString( "vnd.sun.star.autorecovery:/doEntryBackup" ) -#define RECOVERY_CMD_DO_ENTRY_CLEANUP rtl::OUString( "vnd.sun.star.autorecovery:/doEntryCleanUp" ) - -#define PROP_STATUSINDICATOR rtl::OUString( "StatusIndicator" ) -#define PROP_DISPATCHASYNCHRON rtl::OUString( "DispatchAsynchron") -#define PROP_SAVEPATH rtl::OUString( "SavePath" ) -#define PROP_ENTRYID rtl::OUString( "EntryID" ) - -#define STATEPROP_ID rtl::OUString( "ID" ) -#define STATEPROP_STATE rtl::OUString( "DocumentState") -#define STATEPROP_ORGURL rtl::OUString( "OriginalURL" ) -#define STATEPROP_TEMPURL rtl::OUString( "TempURL" ) -#define STATEPROP_FACTORYURL rtl::OUString( "FactoryURL" ) -#define STATEPROP_TEMPLATEURL rtl::OUString( "TemplateURL" ) -#define STATEPROP_TITLE rtl::OUString( "Title" ) -#define STATEPROP_MODULE rtl::OUString( "Module" ) - -#define RECOVERY_OPERATIONSTATE_START rtl::OUString( "start" ) -#define RECOVERY_OPERATIONSTATE_STOP rtl::OUString( "stop" ) -#define RECOVERY_OPERATIONSTATE_UPDATE rtl::OUString( "update") +#define RECOVERY_CMDPART_PROTOCOL OUString( "vnd.sun.star.autorecovery:") + +#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE OUString( "/doEmergencySave" ) +#define RECOVERY_CMDPART_DO_RECOVERY OUString( "/doAutoRecovery" ) +#define RECOVERY_CMDPART_DO_CRASHREPORT OUString( "/doCrashReport" ) + +#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE OUString( "vnd.sun.star.autorecovery:/doPrepareEmergencySave") +#define RECOVERY_CMD_DO_EMERGENCY_SAVE OUString( "vnd.sun.star.autorecovery:/doEmergencySave" ) +#define RECOVERY_CMD_DO_RECOVERY OUString( "vnd.sun.star.autorecovery:/doAutoRecovery" ) +#define RECOVERY_CMD_DO_ENTRY_BACKUP OUString( "vnd.sun.star.autorecovery:/doEntryBackup" ) +#define RECOVERY_CMD_DO_ENTRY_CLEANUP OUString( "vnd.sun.star.autorecovery:/doEntryCleanUp" ) + +#define PROP_STATUSINDICATOR OUString( "StatusIndicator" ) +#define PROP_DISPATCHASYNCHRON OUString( "DispatchAsynchron") +#define PROP_SAVEPATH OUString( "SavePath" ) +#define PROP_ENTRYID OUString( "EntryID" ) + +#define STATEPROP_ID OUString( "ID" ) +#define STATEPROP_STATE OUString( "DocumentState") +#define STATEPROP_ORGURL OUString( "OriginalURL" ) +#define STATEPROP_TEMPURL OUString( "TempURL" ) +#define STATEPROP_FACTORYURL OUString( "FactoryURL" ) +#define STATEPROP_TEMPLATEURL OUString( "TemplateURL" ) +#define STATEPROP_TITLE OUString( "Title" ) +#define STATEPROP_MODULE OUString( "Module" ) + +#define RECOVERY_OPERATIONSTATE_START OUString( "start" ) +#define RECOVERY_OPERATIONSTATE_STOP OUString( "stop" ) +#define RECOVERY_OPERATIONSTATE_UPDATE OUString( "update") #define DLG_RET_UNKNOWN -1 #define DLG_RET_OK 1 @@ -125,22 +125,22 @@ struct TURLInfo sal_Int32 ID; /// the full qualified document URL - ::rtl::OUString OrgURL; + OUString OrgURL; /// the full qualified URL of the temp. file (if it's exists) - ::rtl::OUString TempURL; + OUString TempURL; /// a may be existing factory URL (e.g. for untitled documents) - ::rtl::OUString FactoryURL; + OUString FactoryURL; /// may be the document base on a template file !? - ::rtl::OUString TemplateURL; + OUString TemplateURL; /// the pure file name, without path, disc etcpp. - ::rtl::OUString DisplayName; + OUString DisplayName; /// the application module, where this document was loaded - ::rtl::OUString Module; + OUString Module; /// state info as e.g. VALID, CORRUPTED, NON EXISTING ... sal_Int32 DocState; @@ -243,8 +243,8 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener //--------------------------------------- /** @short TODO */ static bool isBrokenTempEntry(const TURLInfo& rInfo); - virtual void saveBrokenTempEntries(const ::rtl::OUString& sSaveDir); - virtual void saveAllTempEntries(const ::rtl::OUString& sSaveDir); + virtual void saveBrokenTempEntries(const OUString& sSaveDir); + virtual void saveAllTempEntries(const OUString& sSaveDir); virtual void forgetBrokenTempEntries(); virtual void forgetAllRecoveryEntries(); void forgetBrokenRecoveryEntries(); @@ -295,7 +295,7 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener //--------------------------------------- /** @short TODO */ - css::util::URL impl_getParsedURL(const ::rtl::OUString& sURL); + css::util::URL impl_getParsedURL(const OUString& sURL); }; //=============================================== @@ -346,14 +346,14 @@ class PluginProgress : public ::cppu::WeakImplHelper2< css::task::XStatusIndicat //--------------------------------------- // XStatusIndicator - virtual void SAL_CALL start(const ::rtl::OUString& sText , + virtual void SAL_CALL start(const OUString& sText , sal_Int32 nRange) throw(css::uno::RuntimeException); virtual void SAL_CALL end() throw(css::uno::RuntimeException); - virtual void SAL_CALL setText(const ::rtl::OUString& sText) + virtual void SAL_CALL setText(const OUString& sText) throw(css::uno::RuntimeException); virtual void SAL_CALL setValue(sal_Int32 nValue) @@ -696,7 +696,7 @@ class BrokenRecoveryDialog : public ModalDialog OKButton m_aOkBtn; CancelButton m_aCancelBtn; - ::rtl::OUString m_sSavePath; + OUString m_sSavePath; RecoveryCore* m_pCore; bool m_bBeforeRecovery; sal_Bool m_bExecutionNeeded; @@ -721,7 +721,7 @@ class BrokenRecoveryDialog : public ModalDialog //--------------------------------------- /** @short TODO */ - virtual ::rtl::OUString getSaveDirURL(); + virtual OUString getSaveDirURL(); //------------------------------------------- // helper diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index aeaee7408cc1..79d01cc59ea4 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -60,19 +60,19 @@ class FmFilterData { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; FmParentData* m_pParent; - ::rtl::OUString m_aText; + OUString m_aText; public: TYPEINFO(); - FmFilterData(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* pParent = NULL, const ::rtl::OUString& rText = ::rtl::OUString()) + FmFilterData(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* pParent = NULL, const OUString& rText = OUString()) :m_xORB( _rxFactory ) ,m_pParent( pParent ) ,m_aText( rText ) {} virtual ~FmFilterData(){} - void SetText( const ::rtl::OUString& rText ){ m_aText = rText; } - ::rtl::OUString GetText() const { return m_aText; } + void SetText( const OUString& rText ){ m_aText = rText; } + OUString GetText() const { return m_aText; } FmParentData* GetParent() const {return m_pParent;} virtual Image GetImage() const; @@ -86,7 +86,7 @@ protected: public: TYPEINFO(); - FmParentData(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* pParent, const ::rtl::OUString& rText) + FmParentData(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* pParent, const OUString& rText) : FmFilterData(_rxFactory,pParent, rText) {} virtual ~FmParentData(); @@ -106,7 +106,7 @@ public: FmFormItem( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & _xController, - const ::rtl::OUString& _rText) + const OUString& _rText) :FmParentData( _rxFactory, _pParent, _rText ) ,m_xController( _xController ) ,m_xFilterController( _xController, ::com::sun::star::uno::UNO_QUERY_THROW ) @@ -127,8 +127,8 @@ class FmFilterItems : public FmParentData { public: TYPEINFO(); - FmFilterItems(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory):FmParentData(_rxFactory,NULL, ::rtl::OUString()){} - FmFilterItems(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmFormItem* pParent, const ::rtl::OUString& rText ):FmParentData(_rxFactory,pParent, rText){} + FmFilterItems(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory):FmParentData(_rxFactory,NULL, OUString()){} + FmFilterItems(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmFormItem* pParent, const OUString& rText ):FmParentData(_rxFactory,pParent, rText){} FmFilterItem* Find( const ::sal_Int32 _nFilterComponentIndex ) const; virtual Image GetImage() const; @@ -137,7 +137,7 @@ public: //======================================================================== class FmFilterItem : public FmFilterData { - ::rtl::OUString m_aFieldName; + OUString m_aFieldName; const sal_Int32 m_nComponentIndex; public: @@ -145,12 +145,12 @@ public: FmFilterItem( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory, FmFilterItems* pParent, - const ::rtl::OUString& aFieldName, - const ::rtl::OUString& aCondition, + const OUString& aFieldName, + const OUString& aCondition, const sal_Int32 _nComponentIndex ); - const ::rtl::OUString& GetFieldName() const {return m_aFieldName;} + const OUString& GetFieldName() const {return m_aFieldName;} sal_Int32 GetComponentIndex() const { return m_nComponentIndex; } virtual Image GetImage() const; @@ -178,7 +178,7 @@ public: void Clear(); sal_Bool ValidateText(FmFilterItem* pItem, OUString& rText, OUString& rErrorMsg) const; void Append(FmFilterItems* pItems, FmFilterItem* pFilterItem); - void SetTextForItem(FmFilterItem* pItem, const ::rtl::OUString& rText); + void SetTextForItem(FmFilterItem* pItem, const OUString& rText); FmFormItem* GetCurrentForm() const {return m_pCurrentItems ? (FmFormItem*)m_pCurrentItems->GetParent() : NULL;} FmFilterItems* GetCurrentItems() const {return m_pCurrentItems;} @@ -278,7 +278,7 @@ protected: virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind); virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx index 2d8c72393058..50ef095c47aa 100644 --- a/svx/source/inc/fmPropBrw.hxx +++ b/svx/source/inc/fmPropBrw.hxx @@ -45,7 +45,7 @@ class FmPropBrw : public SfxFloatingWindow, public SfxControllerItem { sal_Bool m_bInitialStateChange; bool m_bInStateChange; - ::rtl::OUString m_sLastActivePage; + OUString m_sLastActivePage; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xInspectorContext; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > @@ -73,7 +73,7 @@ protected: void implSetNewSelection( const InterfaceBag& _rSelection ); void implDetachController(); bool implIsReadOnlyModel() const; - ::rtl::OUString getCurrentPage() const; + OUString getCurrentPage() const; public: FmPropBrw( diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx index 39251abcd023..a7caef5bbf8c 100644 --- a/svx/source/inc/fmcontrolbordermanager.hxx +++ b/svx/source/inc/fmcontrolbordermanager.hxx @@ -97,7 +97,7 @@ namespace svxform struct ControlData : public BorderDescriptor, UnderlineDescriptor { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > xControl; - ::rtl::OUString sOriginalHelpText; + OUString sOriginalHelpText; ControlData() : BorderDescriptor() { } ControlData( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ) @@ -109,7 +109,7 @@ namespace svxform BorderDescriptor::clear(); UnderlineDescriptor::clear(); xControl.clear(); - sOriginalHelpText = ::rtl::OUString(); + sOriginalHelpText = OUString(); } }; diff --git a/svx/source/inc/fmdocumentclassification.hxx b/svx/source/inc/fmdocumentclassification.hxx index f28f23926992..9558e2124ee3 100644 --- a/svx/source/inc/fmdocumentclassification.hxx +++ b/svx/source/inc/fmdocumentclassification.hxx @@ -61,10 +61,10 @@ namespace svxform ) SAL_THROW(()); static DocumentType getDocumentTypeForModuleIdentifier( - const ::rtl::OUString& _rModuleIdentifier + const OUString& _rModuleIdentifier ); - static ::rtl::OUString getModuleIdentifierForDocumentType( + static OUString getModuleIdentifierForDocumentType( DocumentType _eType ); }; diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index d3510b5a3939..1b20fe4f666d 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -105,15 +105,15 @@ public: class FmNavNameChangedHint : public SfxHint { FmEntryData* pEntryData; - ::rtl::OUString aNewName; + OUString aNewName; public: TYPEINFO(); - FmNavNameChangedHint( FmEntryData* pData, const ::rtl::OUString& rNewName ); + FmNavNameChangedHint( FmEntryData* pData, const OUString& rNewName ); virtual ~FmNavNameChangedHint(); FmEntryData* GetEntryData() const { return pEntryData; } - ::rtl::OUString GetNewName() const { return aNewName; } + OUString GetNewName() const { return aNewName; } }; //======================================================================== @@ -148,7 +148,7 @@ private: protected: Image m_aNormalImage; - ::rtl::OUString aText; + OUString aText; FmEntryDataList* pChildList; FmEntryData* pParent; @@ -164,12 +164,12 @@ public: virtual ~FmEntryData(); void Clear(); - void SetText( const ::rtl::OUString& rText ){ aText = rText; } + void SetText( const OUString& rText ){ aText = rText; } void SetParent( FmEntryData* pParentData ){ pParent = pParentData; } const Image& GetNormalImage() const { return m_aNormalImage; } - ::rtl::OUString GetText() const { return aText; } + OUString GetText() const { return aText; } FmEntryData* GetParent() const { return pParent; } FmEntryDataList* GetChildList() const { return pChildList; } @@ -390,7 +390,7 @@ namespace svxform sal_Bool bAlterModel = sal_False ); void Remove( FmEntryData* pEntryData, sal_Bool bAlterModel = sal_False ); - sal_Bool Rename( FmEntryData* pEntryData, const ::rtl::OUString& rNewText ); + sal_Bool Rename( FmEntryData* pEntryData, const OUString& rNewText ); void Clear(); void SetModified( sal_Bool bMod=sal_True ); @@ -399,7 +399,7 @@ namespace svxform FmFormShell* GetFormShell() const { return m_pFormShell; } FmFormPage* GetFormPage() const { return m_pFormPage; } FmEntryData* FindData( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xElement, FmEntryDataList* pDataList, sal_Bool bRecurs=sal_True ); - FmEntryData* FindData( const ::rtl::OUString& rText, FmFormData* pParentData, sal_Bool bRecurs=sal_True ); + FmEntryData* FindData( const OUString& rText, FmFormData* pParentData, sal_Bool bRecurs=sal_True ); FmEntryDataList* GetRootList() const { return m_pRootList; } ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > GetFormComponents( FmFormData* pParentFormData ); SdrObject* Search(SdrObjListIter& rIter, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& xComp); @@ -454,7 +454,7 @@ namespace svxform void UpdateContent(); - FmControlData* NewControl( const ::rtl::OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName = sal_True ); + FmControlData* NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName = sal_True ); void NewForm( SvTreeListEntry* pParentEntry ); SvTreeListEntry* Insert( FmEntryData* pEntryData, sal_uLong nRelPos=LIST_APPEND ); void Remove( FmEntryData* pEntryData ); @@ -521,12 +521,12 @@ namespace svxform sal_Bool IsFormEntry( SvTreeListEntry* pEntry ); sal_Bool IsFormComponentEntry( SvTreeListEntry* pEntry ); - ::rtl::OUString GenerateName( FmEntryData* pEntryData ); + OUString GenerateName( FmEntryData* pEntryData ); NavigatorTreeModel* GetNavModel() const { return m_pNavModel; } SvTreeListEntry* FindEntry( FmEntryData* pEntryData ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index 608d6d1b8a80..5bbd02aa01ec 100644 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -44,7 +44,7 @@ class FmFormObj: public SdrUnoObj // only to be used for comparison with the current ref device! public: - SVX_DLLPUBLIC FmFormObj(const ::rtl::OUString& rModelName); + SVX_DLLPUBLIC FmFormObj(const OUString& rModelName); SVX_DLLPUBLIC FmFormObj(); TYPEINFO(); diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index 6fac27514003..db53cc09bf8c 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -81,8 +81,8 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm> findPlaceInFormComponentHierarchy( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent>& rContent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource>& rDatabase = ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource>(), - const ::rtl::OUString& rDBTitle = ::rtl::OUString(), - const ::rtl::OUString& rCursorSource = ::rtl::OUString(), + const OUString& rDBTitle = OUString(), + const OUString& rCursorSource = OUString(), sal_Int32 nCommandType = 0 ); @@ -110,12 +110,12 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm> findFormForDataSource( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& rForm, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource>& rDatabase, - const ::rtl::OUString& rCommand, + const OUString& rCommand, sal_Int32 nCommandType ); public: - ::rtl::OUString setUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent>& xFormComponent, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& xControls); + OUString setUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent>& xFormComponent, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& xControls); void formObjectInserted( const FmFormObj& _object ); void formObjectRemoved( const FmFormObj& _object ); diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx index 9c498f250263..4719360bab20 100644 --- a/svx/source/inc/fmservs.hxx +++ b/svx/source/inc/fmservs.hxx @@ -21,55 +21,55 @@ #include <svx/svxdllapi.h> -#define FM_COMPONENT_EDIT rtl::OUString( "stardiv.one.form.component.Edit" ) -#define FM_COMPONENT_TEXTFIELD rtl::OUString( "stardiv.one.form.component.TextField" ) -#define FM_COMPONENT_LISTBOX rtl::OUString( "stardiv.one.form.component.ListBox" ) -#define FM_COMPONENT_COMBOBOX rtl::OUString( "stardiv.one.form.component.ComboBox" ) -#define FM_COMPONENT_RADIOBUTTON rtl::OUString( "stardiv.one.form.component.RadioButton" ) -#define FM_COMPONENT_GROUPBOX rtl::OUString( "stardiv.one.form.component.GroupBox" ) -#define FM_COMPONENT_FIXEDTEXT rtl::OUString( "stardiv.one.form.component.FixedText" ) -#define FM_COMPONENT_COMMANDBUTTON rtl::OUString( "stardiv.one.form.component.CommandButton" ) -#define FM_COMPONENT_CHECKBOX rtl::OUString( "stardiv.one.form.component.CheckBox" ) -#define FM_COMPONENT_GRID rtl::OUString( "stardiv.one.form.component.Grid" ) -#define FM_COMPONENT_GRIDCONTROL rtl::OUString( "stardiv.one.form.component.GridControl" ) -#define FM_COMPONENT_IMAGEBUTTON rtl::OUString( "stardiv.one.form.component.ImageButton" ) -#define FM_COMPONENT_FILECONTROL rtl::OUString( "stardiv.one.form.component.FileControl" ) -#define FM_COMPONENT_TIMEFIELD rtl::OUString( "stardiv.one.form.component.TimeField" ) -#define FM_COMPONENT_DATEFIELD rtl::OUString( "stardiv.one.form.component.DateField" ) -#define FM_COMPONENT_NUMERICFIELD rtl::OUString( "stardiv.one.form.component.NumericField" ) -#define FM_COMPONENT_CURRENCYFIELD rtl::OUString( "stardiv.one.form.component.CurrencyField" ) -#define FM_COMPONENT_PATTERNFIELD rtl::OUString( "stardiv.one.form.component.PatternField" ) -#define FM_COMPONENT_FORMATTEDFIELD rtl::OUString( "stardiv.one.form.component.FormattedField" ) -#define FM_COMPONENT_HIDDEN rtl::OUString( "stardiv.one.form.component.Hidden" ) -#define FM_COMPONENT_HIDDENCONTROL rtl::OUString( "stardiv.one.form.component.HiddenControl" ) -#define FM_COMPONENT_IMAGECONTROL rtl::OUString( "stardiv.one.form.component.ImageControl" ) -#define FM_CONTROL_GRID rtl::OUString( "stardiv.one.form.control.Grid" ) -#define FM_CONTROL_GRIDCONTROL rtl::OUString( "stardiv.one.form.control.GridControl" ) -#define SRV_SDB_CONNECTION rtl::OUString( "com.sun.star.sdb.Connection" ) -#define FM_SUN_COMPONENT_FORM rtl::OUString( "com.sun.star.form.component.Form" ) -#define FM_SUN_COMPONENT_TEXTFIELD rtl::OUString( "com.sun.star.form.component.TextField" ) -#define FM_SUN_COMPONENT_LISTBOX rtl::OUString( "com.sun.star.form.component.ListBox" ) -#define FM_SUN_COMPONENT_COMBOBOX rtl::OUString( "com.sun.star.form.component.ComboBox" ) -#define FM_SUN_COMPONENT_RADIOBUTTON rtl::OUString( "com.sun.star.form.component.RadioButton" ) -#define FM_SUN_COMPONENT_GROUPBOX rtl::OUString( "com.sun.star.form.component.GroupBox" ) -#define FM_SUN_COMPONENT_FIXEDTEXT rtl::OUString( "com.sun.star.form.component.FixedText" ) -#define FM_SUN_COMPONENT_COMMANDBUTTON rtl::OUString( "com.sun.star.form.component.CommandButton" ) -#define FM_SUN_COMPONENT_CHECKBOX rtl::OUString( "com.sun.star.form.component.CheckBox" ) -#define FM_SUN_COMPONENT_GRIDCONTROL rtl::OUString( "com.sun.star.form.component.GridControl" ) -#define FM_SUN_COMPONENT_IMAGEBUTTON rtl::OUString( "com.sun.star.form.component.ImageButton" ) -#define FM_SUN_COMPONENT_FILECONTROL rtl::OUString( "com.sun.star.form.component.FileControl" ) -#define FM_SUN_COMPONENT_TIMEFIELD rtl::OUString( "com.sun.star.form.component.TimeField" ) -#define FM_SUN_COMPONENT_DATEFIELD rtl::OUString( "com.sun.star.form.component.DateField" ) -#define FM_SUN_COMPONENT_NUMERICFIELD rtl::OUString( "com.sun.star.form.component.NumericField" ) -#define FM_SUN_COMPONENT_CURRENCYFIELD rtl::OUString( "com.sun.star.form.component.CurrencyField" ) -#define FM_SUN_COMPONENT_PATTERNFIELD rtl::OUString( "com.sun.star.form.component.PatternField" ) -#define FM_SUN_COMPONENT_HIDDENCONTROL rtl::OUString( "com.sun.star.form.component.HiddenControl" ) -#define FM_SUN_COMPONENT_IMAGECONTROL rtl::OUString( "com.sun.star.form.component.DatabaseImageControl" ) -#define FM_SUN_COMPONENT_FORMATTEDFIELD rtl::OUString( "com.sun.star.form.component.FormattedField" ) -#define FM_SUN_COMPONENT_SCROLLBAR rtl::OUString( "com.sun.star.form.component.ScrollBar" ) -#define FM_SUN_COMPONENT_SPINBUTTON rtl::OUString( "com.sun.star.form.component.SpinButton" ) -#define FM_SUN_COMPONENT_NAVIGATIONBAR rtl::OUString( "com.sun.star.form.component.NavigationToolBar" ) -#define FM_SUN_CONTROL_GRIDCONTROL rtl::OUString( "com.sun.star.form.control.GridControl" ) +#define FM_COMPONENT_EDIT OUString( "stardiv.one.form.component.Edit" ) +#define FM_COMPONENT_TEXTFIELD OUString( "stardiv.one.form.component.TextField" ) +#define FM_COMPONENT_LISTBOX OUString( "stardiv.one.form.component.ListBox" ) +#define FM_COMPONENT_COMBOBOX OUString( "stardiv.one.form.component.ComboBox" ) +#define FM_COMPONENT_RADIOBUTTON OUString( "stardiv.one.form.component.RadioButton" ) +#define FM_COMPONENT_GROUPBOX OUString( "stardiv.one.form.component.GroupBox" ) +#define FM_COMPONENT_FIXEDTEXT OUString( "stardiv.one.form.component.FixedText" ) +#define FM_COMPONENT_COMMANDBUTTON OUString( "stardiv.one.form.component.CommandButton" ) +#define FM_COMPONENT_CHECKBOX OUString( "stardiv.one.form.component.CheckBox" ) +#define FM_COMPONENT_GRID OUString( "stardiv.one.form.component.Grid" ) +#define FM_COMPONENT_GRIDCONTROL OUString( "stardiv.one.form.component.GridControl" ) +#define FM_COMPONENT_IMAGEBUTTON OUString( "stardiv.one.form.component.ImageButton" ) +#define FM_COMPONENT_FILECONTROL OUString( "stardiv.one.form.component.FileControl" ) +#define FM_COMPONENT_TIMEFIELD OUString( "stardiv.one.form.component.TimeField" ) +#define FM_COMPONENT_DATEFIELD OUString( "stardiv.one.form.component.DateField" ) +#define FM_COMPONENT_NUMERICFIELD OUString( "stardiv.one.form.component.NumericField" ) +#define FM_COMPONENT_CURRENCYFIELD OUString( "stardiv.one.form.component.CurrencyField" ) +#define FM_COMPONENT_PATTERNFIELD OUString( "stardiv.one.form.component.PatternField" ) +#define FM_COMPONENT_FORMATTEDFIELD OUString( "stardiv.one.form.component.FormattedField" ) +#define FM_COMPONENT_HIDDEN OUString( "stardiv.one.form.component.Hidden" ) +#define FM_COMPONENT_HIDDENCONTROL OUString( "stardiv.one.form.component.HiddenControl" ) +#define FM_COMPONENT_IMAGECONTROL OUString( "stardiv.one.form.component.ImageControl" ) +#define FM_CONTROL_GRID OUString( "stardiv.one.form.control.Grid" ) +#define FM_CONTROL_GRIDCONTROL OUString( "stardiv.one.form.control.GridControl" ) +#define SRV_SDB_CONNECTION OUString( "com.sun.star.sdb.Connection" ) +#define FM_SUN_COMPONENT_FORM OUString( "com.sun.star.form.component.Form" ) +#define FM_SUN_COMPONENT_TEXTFIELD OUString( "com.sun.star.form.component.TextField" ) +#define FM_SUN_COMPONENT_LISTBOX OUString( "com.sun.star.form.component.ListBox" ) +#define FM_SUN_COMPONENT_COMBOBOX OUString( "com.sun.star.form.component.ComboBox" ) +#define FM_SUN_COMPONENT_RADIOBUTTON OUString( "com.sun.star.form.component.RadioButton" ) +#define FM_SUN_COMPONENT_GROUPBOX OUString( "com.sun.star.form.component.GroupBox" ) +#define FM_SUN_COMPONENT_FIXEDTEXT OUString( "com.sun.star.form.component.FixedText" ) +#define FM_SUN_COMPONENT_COMMANDBUTTON OUString( "com.sun.star.form.component.CommandButton" ) +#define FM_SUN_COMPONENT_CHECKBOX OUString( "com.sun.star.form.component.CheckBox" ) +#define FM_SUN_COMPONENT_GRIDCONTROL OUString( "com.sun.star.form.component.GridControl" ) +#define FM_SUN_COMPONENT_IMAGEBUTTON OUString( "com.sun.star.form.component.ImageButton" ) +#define FM_SUN_COMPONENT_FILECONTROL OUString( "com.sun.star.form.component.FileControl" ) +#define FM_SUN_COMPONENT_TIMEFIELD OUString( "com.sun.star.form.component.TimeField" ) +#define FM_SUN_COMPONENT_DATEFIELD OUString( "com.sun.star.form.component.DateField" ) +#define FM_SUN_COMPONENT_NUMERICFIELD OUString( "com.sun.star.form.component.NumericField" ) +#define FM_SUN_COMPONENT_CURRENCYFIELD OUString( "com.sun.star.form.component.CurrencyField" ) +#define FM_SUN_COMPONENT_PATTERNFIELD OUString( "com.sun.star.form.component.PatternField" ) +#define FM_SUN_COMPONENT_HIDDENCONTROL OUString( "com.sun.star.form.component.HiddenControl" ) +#define FM_SUN_COMPONENT_IMAGECONTROL OUString( "com.sun.star.form.component.DatabaseImageControl" ) +#define FM_SUN_COMPONENT_FORMATTEDFIELD OUString( "com.sun.star.form.component.FormattedField" ) +#define FM_SUN_COMPONENT_SCROLLBAR OUString( "com.sun.star.form.component.ScrollBar" ) +#define FM_SUN_COMPONENT_SPINBUTTON OUString( "com.sun.star.form.component.SpinButton" ) +#define FM_SUN_COMPONENT_NAVIGATIONBAR OUString( "com.sun.star.form.component.NavigationToolBar" ) +#define FM_SUN_CONTROL_GRIDCONTROL OUString( "com.sun.star.form.control.GridControl" ) namespace svxform { diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 142a6d4999ed..16e549e0761f 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -343,7 +343,7 @@ protected: // sammelt in strNames die Namen aller Formulare static void impl_collectFormSearchContexts_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxStartingPoint, - const ::rtl::OUString& _rCurrentLevelPrefix, + const OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< OUString >& _out_rNames ); @@ -490,7 +490,7 @@ private: // closes the task-local beamer displaying a grid view for a form // ConfigItem related stuff - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames); virtual void Commit(); void implAdjustConfigCache(); @@ -557,18 +557,18 @@ inline sal_Bool FmXFormShell::IsSelectionUpdatePending() class SAL_DLLPRIVATE SearchableControlIterator : public ::comphelper::IndexAccessIterator { - ::rtl::OUString m_sCurrentValue; + OUString m_sCurrentValue; // der aktuelle Wert der ControlSource-::com::sun::star::beans::Property public: - ::rtl::OUString getCurrentValue() const { return m_sCurrentValue; } + OUString getCurrentValue() const { return m_sCurrentValue; } public: SearchableControlIterator(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> xStartingPoint); virtual sal_Bool ShouldHandleElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& rElement); virtual sal_Bool ShouldStepInto(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xContainer) const; - virtual void Invalidate() { IndexAccessIterator::Invalidate(); m_sCurrentValue = ::rtl::OUString(); } + virtual void Invalidate() { IndexAccessIterator::Invalidate(); m_sCurrentValue = OUString(); } }; // ======================================================================== diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index d68c0eea8352..dc23e6437456 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -51,7 +51,7 @@ class SdrObject; class FmUndoPropertyAction: public SdrUndoAction { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xObj; - ::rtl::OUString aPropertyName; + OUString aPropertyName; ::com::sun::star::uno::Any aNewValue; ::com::sun::star::uno::Any aOldValue; @@ -61,7 +61,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; @@ -123,7 +123,7 @@ public: virtual void Undo(); virtual void Redo() { Undo(); } - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; static void DisposeElement( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& xReplaced ); }; diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx index 6c0b6a2795d5..c2c829611337 100644 --- a/svx/source/inc/fmurl.hxx +++ b/svx/source/inc/fmurl.hxx @@ -20,33 +20,33 @@ #ifndef _SVX_FMURL_HXX #define _SVX_FMURL_HXX -#define FMURL_FORM_POSITION rtl::OUString( ".uno:FormController/positionForm" ) -#define FMURL_FORM_RECORDCOUNT rtl::OUString( ".uno:FormController/RecordCount" ) -#define FMURL_RECORD_MOVEFIRST rtl::OUString( ".uno:FormController/moveToFirst" ) -#define FMURL_RECORD_MOVEPREV rtl::OUString( ".uno:FormController/moveToPrev" ) -#define FMURL_RECORD_MOVENEXT rtl::OUString( ".uno:FormController/moveToNext" ) -#define FMURL_RECORD_MOVELAST rtl::OUString( ".uno:FormController/moveToLast" ) -#define FMURL_RECORD_MOVETONEW rtl::OUString( ".uno:FormController/moveToNew" ) -#define FMURL_RECORD_UNDO rtl::OUString( ".uno:FormController/undoRecord" ) -#define FMURL_RECORD_SAVE rtl::OUString( ".uno:FormController/saveRecord" ) -#define FMURL_RECORD_DELETE rtl::OUString( ".uno:FormController/deleteRecord" ) -#define FMURL_FORM_REFRESH rtl::OUString( ".uno:FormController/refreshForm" ) -#define FMURL_FORM_REFRESH_CURRENT_CONTROL rtl::OUString( ".uno:FormController/refreshCurrentControl" ) -#define FMURL_FORM_SORT_UP rtl::OUString( ".uno:FormController/sortUp" ) -#define FMURL_FORM_SORT_DOWN rtl::OUString( ".uno:FormController/sortDown" ) -#define FMURL_FORM_SORT rtl::OUString( ".uno:FormController/sort" ) -#define FMURL_FORM_AUTO_FILTER rtl::OUString( ".uno:FormController/autoFilter" ) -#define FMURL_FORM_FILTER rtl::OUString( ".uno:FormController/filter" ) -#define FMURL_FORM_APPLY_FILTER rtl::OUString( ".uno:FormController/applyFilter" ) -#define FMURL_FORM_REMOVE_FILTER rtl::OUString( ".uno:FormController/removeFilterOrder" ) -#define FMURL_CONFIRM_DELETION rtl::OUString( ".uno:FormSlots/ConfirmDeletion" ) -#define FMURL_COMPONENT_FORMGRIDVIEW rtl::OUString( ".component:DB/FormGridView" ) -#define FMURL_GRIDVIEW_CLEARVIEW rtl::OUString( ".uno:FormSlots/ClearView" ) -#define FMURL_GRIDVIEW_ADDCOLUMN rtl::OUString( ".uno:FormSlots/AddGridColumn" ) -#define FMURL_GRIDVIEW_ATTACHTOFORM rtl::OUString( ".uno:FormSlots/AttachToForm" ) -#define FMARG_ATTACHTO_MASTERFORM rtl::OUString( "MasterForm" ) -#define FMARG_ADDCOL_COLUMNTYPE rtl::OUString( "ColumnType" ) -#define FMARG_ADDCOL_COLUMNPOS rtl::OUString( "ColumnPosition" ) +#define FMURL_FORM_POSITION OUString( ".uno:FormController/positionForm" ) +#define FMURL_FORM_RECORDCOUNT OUString( ".uno:FormController/RecordCount" ) +#define FMURL_RECORD_MOVEFIRST OUString( ".uno:FormController/moveToFirst" ) +#define FMURL_RECORD_MOVEPREV OUString( ".uno:FormController/moveToPrev" ) +#define FMURL_RECORD_MOVENEXT OUString( ".uno:FormController/moveToNext" ) +#define FMURL_RECORD_MOVELAST OUString( ".uno:FormController/moveToLast" ) +#define FMURL_RECORD_MOVETONEW OUString( ".uno:FormController/moveToNew" ) +#define FMURL_RECORD_UNDO OUString( ".uno:FormController/undoRecord" ) +#define FMURL_RECORD_SAVE OUString( ".uno:FormController/saveRecord" ) +#define FMURL_RECORD_DELETE OUString( ".uno:FormController/deleteRecord" ) +#define FMURL_FORM_REFRESH OUString( ".uno:FormController/refreshForm" ) +#define FMURL_FORM_REFRESH_CURRENT_CONTROL OUString( ".uno:FormController/refreshCurrentControl" ) +#define FMURL_FORM_SORT_UP OUString( ".uno:FormController/sortUp" ) +#define FMURL_FORM_SORT_DOWN OUString( ".uno:FormController/sortDown" ) +#define FMURL_FORM_SORT OUString( ".uno:FormController/sort" ) +#define FMURL_FORM_AUTO_FILTER OUString( ".uno:FormController/autoFilter" ) +#define FMURL_FORM_FILTER OUString( ".uno:FormController/filter" ) +#define FMURL_FORM_APPLY_FILTER OUString( ".uno:FormController/applyFilter" ) +#define FMURL_FORM_REMOVE_FILTER OUString( ".uno:FormController/removeFilterOrder" ) +#define FMURL_CONFIRM_DELETION OUString( ".uno:FormSlots/ConfirmDeletion" ) +#define FMURL_COMPONENT_FORMGRIDVIEW OUString( ".component:DB/FormGridView" ) +#define FMURL_GRIDVIEW_CLEARVIEW OUString( ".uno:FormSlots/ClearView" ) +#define FMURL_GRIDVIEW_ADDCOLUMN OUString( ".uno:FormSlots/AddGridColumn" ) +#define FMURL_GRIDVIEW_ATTACHTOFORM OUString( ".uno:FormSlots/AttachToForm" ) +#define FMARG_ATTACHTO_MASTERFORM OUString( "MasterForm" ) +#define FMARG_ADDCOL_COLUMNTYPE OUString( "ColumnType" ) +#define FMARG_ADDCOL_COLUMNPOS OUString( "ColumnPosition" ) #endif // _SVX_FMURL_HXX diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index e51c9e3667ef..4124f84cfcd0 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -259,7 +259,7 @@ private: const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, - const ::rtl::OUString& _rFieldPostfix, + const OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, @@ -276,12 +276,12 @@ private: const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, - const ::rtl::OUString& _rFieldPostfix, + const OUString& _rFieldPostfix, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource >& _rxDataSource = NULL, - const ::rtl::OUString& _rDataSourceName = ::rtl::OUString(), - const ::rtl::OUString& _rCommand= ::rtl::OUString(), + const OUString& _rDataSourceName = OUString(), + const OUString& _rCommand= OUString(), const sal_Int32 _nCommandType = -1 ); diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx index bb956e836806..23e0fb08c80d 100644 --- a/svx/source/inc/formcontrolfactory.hxx +++ b/svx/source/inc/formcontrolfactory.hxx @@ -84,19 +84,19 @@ namespace svxform const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats ); - static ::rtl::OUString getDefaultName( + static OUString getDefaultName( const sal_Int16 nClassId, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo >& _rxObject ); - static ::rtl::OUString getDefaultUniqueName_ByComponentType( + static OUString getDefaultUniqueName_ByComponentType( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ); - static ::rtl::OUString getUniqueName( + static OUString getUniqueName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer, - const ::rtl::OUString& _rBaseName + const OUString& _rBaseName ); private: diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index 44bdc513d9a8..e12180e301c4 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -89,7 +89,7 @@ struct FmXTextComponentLess : public ::std::binary_function< ::com::sun::star::u } }; -typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, ::rtl::OUString, FmXTextComponentLess> FmFilterRow; +typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, OUString, FmXTextComponentLess> FmFilterRow; typedef ::std::vector< FmFilterRow > FmFilterRows; typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > > FmFormControllers; @@ -177,7 +177,7 @@ namespace svxform DispatcherContainer m_aFeatureDispatchers; ::std::set< sal_Int16 > m_aInvalidFeatures; // for asynchronous feature invalidation - ::rtl::OUString m_aMode; + OUString m_aMode; ::svxform::DelayedEvent m_aLoadEvent; ::svxform::DelayedEvent m_aToggleEvent; @@ -258,9 +258,9 @@ namespace svxform virtual ::sal_Int32 SAL_CALL getDisjunctiveTerms() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addFilterControllerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFilterControllerListener >& _Listener ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removeFilterControllerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFilterControllerListener >& _Listener ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const ::rtl::OUString& _PredicateExpression ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const OUString& _PredicateExpression ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getFilterComponent( ::sal_Int32 _Component ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getPredicateExpressions() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL getPredicateExpressions() throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removeDisjunctiveTerm( ::sal_Int32 _Term ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendEmptyDisjunctiveTerm() throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getActiveTerm() throw (::com::sun::star::uno::RuntimeException); @@ -286,10 +286,10 @@ namespace svxform virtual void SAL_CALL reloaded(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException ); // XModeSelector - virtual void SAL_CALL setMode(const ::rtl::OUString& Mode) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getMode(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedModes(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsMode(const ::rtl::OUString& Mode) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setMode(const OUString& Mode) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getMode(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedModes(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::container::XIndexAccess virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -397,9 +397,9 @@ namespace svxform virtual sal_Bool SAL_CALL confirmDelete(const ::com::sun::star::sdb::RowChangeEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); // 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(void) 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(void) throw(::com::sun::star::uno::RuntimeException); // XResetListener virtual sal_Bool SAL_CALL approveReset(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException ); @@ -410,7 +410,7 @@ namespace svxform virtual void SAL_CALL invalidateAllFeatures( ) throw (::com::sun::star::uno::RuntimeException); // method for registration - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void); // comphelper::OPropertyArrayUsageHelper virtual void fillProperties( @@ -423,7 +423,7 @@ namespace svxform virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> interceptedQueryDispatch( const ::com::sun::star::util::URL& aURL, - const ::rtl::OUString& aTargetFrameName, + const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw( ::com::sun::star::uno::RuntimeException ); @@ -551,7 +551,7 @@ namespace svxform <TRUE/> if and only if all controls belonging to our form are valid */ bool checkFormComponentValidity( - ::rtl::OUString& /* [out] */ _rFirstInvalidityExplanation, + OUString& /* [out] */ _rFirstInvalidityExplanation, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& /* [out] */ _rxFirstInvalidModel ) SAL_THROW(()); diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index be168cdbe3b7..7f08fbea818a 100644 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx @@ -44,7 +44,7 @@ namespace svx { public: /// retrieves the feature id for a given feature URL - static sal_Int32 getControllerFeatureSlotIdForURL( const ::rtl::OUString& _rMainURL ); + static sal_Int32 getControllerFeatureSlotIdForURL( const OUString& _rMainURL ); /// retrieves the css.form.runtime.FormFeature ID for a given slot ID static sal_Int16 getFormFeatureForSlotId( sal_Int32 _nSlotId ); @@ -192,7 +192,7 @@ namespace svx ) const; sal_Bool isEnabled( sal_Int32 _nSlotId ) const; void execute( sal_Int32 _nSlotId ) const; - void execute( sal_Int32 _nSlotId, const ::rtl::OUString& _rParamName, const ::com::sun::star::uno::Any& _rParamValue ) const; + void execute( sal_Int32 _nSlotId, const OUString& _rParamName, const ::com::sun::star::uno::Any& _rParamValue ) const; sal_Bool commitCurrentRecord() const; sal_Bool commitCurrentControl( ) const; sal_Bool isInsertionRow() const; diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx index 59528cb3ffc0..e13997e3d9c1 100644 --- a/svx/source/inc/formdispatchinterceptor.hxx +++ b/svx/source/inc/formdispatchinterceptor.hxx @@ -38,7 +38,7 @@ namespace svxform { public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> interceptedQueryDispatch( - const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ) = 0; + const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ) = 0; virtual ::osl::Mutex* getInterceptorMutex() = 0; @@ -87,7 +87,7 @@ namespace svxform DECLARE_UNO3_DEFAULTS(DispatchInterceptionMultiplexer, DispatchInterceptionMultiplexer_BASE); // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XDispatchProviderInterceptor diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx index 92158f480d87..ce8eb4aca371 100644 --- a/svx/source/inc/formtoolbars.hxx +++ b/svx/source/inc/formtoolbars.hxx @@ -54,7 +54,7 @@ namespace svxform /** retrieves the URI for the toolbox associated with the given slot, depending on the type of our document */ - SVX_DLLPUBLIC ::rtl::OUString + SVX_DLLPUBLIC OUString getToolboxResourceName( sal_uInt16 _nSlotId ) const; /** toggles the toolbox associated with the given slot diff --git a/svx/source/inc/gridcols.hxx b/svx/source/inc/gridcols.hxx index 90e039a51ef3..555e31ea99c3 100644 --- a/svx/source/inc/gridcols.hxx +++ b/svx/source/inc/gridcols.hxx @@ -20,19 +20,18 @@ #define _SVX_GRIDCOLS_HXX #include <sal/types.h> - -namespace rtl { class OUString; } - -#define FM_COL_TEXTFIELD rtl::OUString( "TextField" ) -#define FM_COL_COMBOBOX rtl::OUString( "ComboBox" ) -#define FM_COL_CHECKBOX rtl::OUString( "CheckBox" ) -#define FM_COL_TIMEFIELD rtl::OUString( "TimeField" ) -#define FM_COL_DATEFIELD rtl::OUString( "DateField" ) -#define FM_COL_NUMERICFIELD rtl::OUString( "NumericField" ) -#define FM_COL_CURRENCYFIELD rtl::OUString( "CurrencyField" ) -#define FM_COL_PATTERNFIELD rtl::OUString( "PatternField" ) -#define FM_COL_LISTBOX rtl::OUString( "ListBox" ) -#define FM_COL_FORMATTEDFIELD rtl::OUString( "FormattedField" ) +#include <rtl/ustring.hxx> + +#define FM_COL_TEXTFIELD OUString( "TextField" ) +#define FM_COL_COMBOBOX OUString( "ComboBox" ) +#define FM_COL_CHECKBOX OUString( "CheckBox" ) +#define FM_COL_TIMEFIELD OUString( "TimeField" ) +#define FM_COL_DATEFIELD OUString( "DateField" ) +#define FM_COL_NUMERICFIELD OUString( "NumericField" ) +#define FM_COL_CURRENCYFIELD OUString( "CurrencyField" ) +#define FM_COL_PATTERNFIELD OUString( "PatternField" ) +#define FM_COL_LISTBOX OUString( "ListBox" ) +#define FM_COL_FORMATTEDFIELD OUString( "FormattedField" ) // column type ids #define TYPE_CHECKBOX 0 @@ -47,7 +46,7 @@ namespace rtl { class OUString; } #define TYPE_TIMEFIELD 9 //------------------------------------------------------------------------------ -sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName); +sal_Int32 getColumnTypeByModelName(const OUString& aModelName); #endif // _SVX_GRIDCOLS_HXX diff --git a/svx/source/inc/recoveryui.hxx b/svx/source/inc/recoveryui.hxx index 33c5e431cc2a..d8454c9e4c35 100644 --- a/svx/source/inc/recoveryui.hxx +++ b/svx/source/inc/recoveryui.hxx @@ -81,13 +81,13 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo //--------------------------------------- // css.lang.XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& sServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) throw(css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException); //--------------------------------------- @@ -112,8 +112,8 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo //--------------------------------------- // XServiceInfo helper - static ::rtl::OUString st_getImplementationName(); - static css::uno::Sequence< ::rtl::OUString > st_getSupportedServiceNames(); + static OUString st_getImplementationName(); + static css::uno::Sequence< OUString > st_getSupportedServiceNames(); static css::uno::Reference< css::uno::XInterface > SAL_CALL st_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); //------------------------------------------- diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx index d0b3c83dade2..f1ee6eb5c03b 100644 --- a/svx/source/inc/sdbdatacolumn.hxx +++ b/svx/source/inc/sdbdatacolumn.hxx @@ -76,16 +76,16 @@ namespace svxform // ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> getPropertySetInfo() const throw( ::com::sun::star::uno::RuntimeException ); - inline void 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 ); - inline ::com::sun::star::uno::Any getPropertyValue(const ::rtl::OUString& PropertyName) const throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - inline void 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 ); - inline void 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 ); - inline void 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 ); - inline void 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 ); + inline void 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 ); + inline ::com::sun::star::uno::Any getPropertyValue(const OUString& PropertyName) const throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + inline void 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 ); + inline void 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 ); + inline void 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 ); + inline void 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::sdb::XColumn inline sal_Bool wasNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::rtl::OUString getString() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); + inline OUString getString() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline sal_Bool getBoolean() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline sal_Int8 getByte() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline sal_Int16 getShort() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); @@ -114,7 +114,7 @@ namespace svxform inline void updateLong(sal_Int64 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateFloat(float x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateDouble(double x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateString(const ::rtl::OUString& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); + inline void updateString(const OUString& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateBytes(const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateDate(const com::sun::star::util::Date& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateTime(const ::com::sun::star::util::Time& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx index cc28505216cb..a7b85f154d7f 100644 --- a/svx/source/inc/sqlparserclient.hxx +++ b/svx/source/inc/sqlparserclient.hxx @@ -49,8 +49,8 @@ namespace svxform protected: inline ::rtl::Reference< ::connectivity::simple::ISQLParseNode > predicateTree( - ::rtl::OUString& _rErrorMessage, - const ::rtl::OUString& _rStatement, + OUString& _rErrorMessage, + const OUString& _rStatement, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField ) const diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 7575d7690252..e21942d33c9d 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -73,8 +73,8 @@ public: SvxRectCtlAccessibleContext( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, SvxRectCtl& rRepresentation, - const ::rtl::OUString* pName = NULL, - const ::rtl::OUString* pDescription = NULL ); + const OUString* pName = NULL, + const OUString* pDescription = NULL ); protected: virtual ~SvxRectCtlAccessibleContext(); public: @@ -150,10 +150,10 @@ public: virtual sal_Int16 SAL_CALL getAccessibleRole( void ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription( void ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName( void ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL @@ -181,13 +181,13 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName( void ) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames( void ) throw( ::com::sun::star::uno::RuntimeException ); //===== XTypeProvider =================================================== @@ -276,11 +276,11 @@ private: /** Description of this object. This is not a constant because it can be set from the outside. */ - ::rtl::OUString msDescription; + OUString msDescription; /** Name of this object. */ - ::rtl::OUString msName; + OUString msName; /// Reference to the parent object. ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > @@ -329,7 +329,7 @@ public: SvxRectCtlChildAccessibleContext( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, const Window& rParentWindow, - const ::rtl::OUString& rName, const ::rtl::OUString& rDescription, + const OUString& rName, const OUString& rDescription, const Rectangle& rBoundingBox, long nIndexInParent ); protected: @@ -405,10 +405,10 @@ public: virtual sal_Int16 SAL_CALL getAccessibleRole( void ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription( void ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName( void ) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL @@ -449,13 +449,13 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName( void ) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames( void ) throw( ::com::sun::star::uno::RuntimeException ); @@ -496,12 +496,12 @@ private: be set from the outside. Furthermore, it changes according the the draw page's display mode. */ - ::rtl::OUString msDescription; + OUString msDescription; /** Name of this object. It changes according the draw page's display mode. */ - ::rtl::OUString msName; + OUString msName; /// Reference to the parent object. ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index ba6f87c1be98..08723f91ca05 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -77,7 +77,7 @@ class SAL_DLLPRIVATE FmFieldWin :public SfxFloatingWindow FmFieldWinData* pData; ::svxform::SharedConnection m_aConnection; - ::rtl::OUString m_aDatabaseName, + OUString m_aDatabaseName, m_aObjectName; sal_Int32 m_nObjectType; @@ -101,9 +101,9 @@ public: void UpdateContent(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > &); void FillInfo( SfxChildWinInfo& rInfo ) const; - const ::rtl::OUString& GetDatabaseName() const { return m_aDatabaseName; } + const OUString& GetDatabaseName() const { return m_aDatabaseName; } ::svxform::SharedConnection GetConnection() const { return m_aConnection; } - const ::rtl::OUString& GetObjectName() const { return m_aObjectName; } + const OUString& GetObjectName() const { return m_aObjectName; } sal_Int32 GetObjectType() const { return m_nObjectType; } sal_Bool createSelectionControls( ); diff --git a/svx/source/inc/typeconversionclient.hxx b/svx/source/inc/typeconversionclient.hxx index fa3c4b64cba1..2c8652e0edeb 100644 --- a/svx/source/inc/typeconversionclient.hxx +++ b/svx/source/inc/typeconversionclient.hxx @@ -61,14 +61,14 @@ namespace svxform } // -------------------------------------------------------- - inline ::rtl::OUString getFormattedValue( + inline OUString getFormattedValue( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::util::Date& _rNullDate, sal_Int32 _nKey, sal_Int16 _nKeyType) const { - ::rtl::OUString sReturn; + OUString sReturn; if ( ensureLoaded() ) sReturn = m_xTypeConversion->getFormattedValue(_rxColumn, _rxFormatter, _rNullDate, _nKey, _nKeyType); return sReturn; diff --git a/svx/source/inc/unogalthemeprovider.hxx b/svx/source/inc/unogalthemeprovider.hxx index 70877c83054c..23c769b84d7a 100644 --- a/svx/source/inc/unogalthemeprovider.hxx +++ b/svx/source/inc/unogalthemeprovider.hxx @@ -36,8 +36,8 @@ namespace unogallery { // ------------------------- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL GalleryThemeProvider_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider_getSupportedServiceNames() throw(); -::rtl::OUString SAL_CALL GalleryThemeProvider_getImplementationName() throw(); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL GalleryThemeProvider_getSupportedServiceNames() throw(); +OUString SAL_CALL GalleryThemeProvider_getImplementationName() throw(); // ----------------- // - GalleryThemes - @@ -51,15 +51,15 @@ public: GalleryThemeProvider(); ~GalleryThemeProvider(); - SVX_DLLPUBLIC static ::rtl::OUString getImplementationName_Static() throw(); - SVX_DLLPUBLIC static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + SVX_DLLPUBLIC static OUString getImplementationName_Static() throw(); + SVX_DLLPUBLIC static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); protected: // 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 ); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -70,16 +70,16 @@ protected: virtual ::sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) 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 ); // XGalleryThemeProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::gallery::XGalleryTheme > SAL_CALL insertNewByName( const ::rtl::OUString& ThemeName ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& ThemeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::gallery::XGalleryTheme > SAL_CALL insertNewByName( const OUString& ThemeName ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& ThemeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); private: diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx index 02e5adf7ec18..beaaf6b47db9 100644 --- a/svx/source/inc/xfm_addcondition.hxx +++ b/svx/source/inc/xfm_addcondition.hxx @@ -41,8 +41,8 @@ namespace svxform // <properties> ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xBinding; - ::rtl::OUString m_sFacetName; - ::rtl::OUString m_sConditionValue; + OUString m_sFacetName; + OUString m_sConditionValue; ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XModel > m_xWorkModel; // </properties> @@ -58,8 +58,8 @@ namespace svxform virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException); // 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); // XPropertySet virtual com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException); diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx index 04a17e2ecd90..69cd12ddd86b 100644 --- a/svx/source/inc/xmlxtexp.hxx +++ b/svx/source/inc/xmlxtexp.hxx @@ -38,19 +38,19 @@ public: // #110680# SvxXMLXTableExportComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, - const rtl::OUString& rFileName, + const OUString& rFileName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > & xHandler, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > & xTable, com::sun::star::uno::Reference< com::sun::star::document::XGraphicObjectResolver >& xGrfResolver); ~SvxXMLXTableExportComponent(); - static bool save( const rtl::OUString& rURL, + static bool save( const OUString& rURL, const com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xTable, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > &xStorage, - rtl::OUString *pOptName ) throw(); + OUString *pOptName ) throw(); // methods without content: virtual void _ExportAutoStyles(); diff --git a/svx/source/inc/xmlxtimp.hxx b/svx/source/inc/xmlxtimp.hxx index ab055910ae2a..0a9ba8701766 100644 --- a/svx/source/inc/xmlxtimp.hxx +++ b/svx/source/inc/xmlxtimp.hxx @@ -42,13 +42,13 @@ public: virtual ~SvxXMLXTableImport() throw (); - static bool load( const rtl::OUString &rPath, + static bool load( const OUString &rPath, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > &xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xTable, bool *bOptLoadedFromStorage ) throw(); protected: 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 ); private: |