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

::rtl::OUString to OUString in basctl

Browse Source 
Change-Id: I7be699102eab9cbf7184a5777a4b161db885adec
Reviewed-on: https://gerrit.libreoffice.org/711
Reviewed-by: Olivier Hallot <olivier.hallot@alta.org.br>
Tested-by: Olivier Hallot <olivier.hallot@alta.org.br>
This commit is contained in:
Ricardo Montania 2012-09-27 13:22:42 -03:00 committed by Olivier Hallot
parent 7a3a8a2543
commit 6cb080ff91
6 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
basctl/source/basicide/unomodel.cxx
View File

@ -87,14 +87,14 @@ OUString SIDEModel::getImplementationName(void) throw( uno::RuntimeException )
return getImplementationName_Static(); return getImplementationName_Static();
} }
::rtl::OUString SIDEModel::getImplementationName_Static() OUString SIDEModel::getImplementationName_Static()
{ {
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.basic.BasicIDE" )); return OUString( "com.sun.star.comp.basic.BasicIDE" );
} }
sal_Bool SIDEModel::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) sal_Bool SIDEModel::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
{ {
return rServiceName == ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.BasicIDE" )); return rServiceName == OUString( "com.sun.star.script.BasicIDE" );
} }
uno::Sequence< OUString > SIDEModel::getSupportedServiceNames(void) throw( uno::RuntimeException ) uno::Sequence< OUString > SIDEModel::getSupportedServiceNames(void) throw( uno::RuntimeException )
{ {
@ -105,7 +105,7 @@ uno::Sequence< OUString > SIDEModel::getSupportedServiceNames_Static(void)
{ {
uno::Sequence< OUString > aRet(1); uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray(); OUString* pArray = aRet.getArray();
pArray[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.BasicIDE" )); pArray[0] = "com.sun.star.script.BasicIDE" ;
return aRet; return aRet;
} }

10
basctl/source/basicide/unomodel.hxx
View File

@ -43,15 +43,15 @@ public:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException);
//XServiceInfo //XServiceInfo
virtual rtl::OUString SAL_CALL getImplementationName(void) virtual OUString SAL_CALL getImplementationName(void)
throw( ::com::sun::star::uno::RuntimeException ); throw( ::com::sun::star::uno::RuntimeException );
virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
throw( ::com::sun::star::uno::RuntimeException ); throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void)
throw( ::com::sun::star::uno::RuntimeException ); throw( ::com::sun::star::uno::RuntimeException );
static ::com::sun::star::uno::Sequence< rtl::OUString > getSupportedServiceNames_Static(); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static();
static ::rtl::OUString getImplementationName_Static(); static OUString getImplementationName_Static();
}; };
com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SIDEModel_createInstance( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SIDEModel_createInstance(

16
basctl/source/inc/accessibledialogcontrolshape.hxx
View File

@ -76,7 +76,7 @@ protected:
Window* GetWindow() const; Window* GetWindow() const;
::rtl::OUString GetModelStringProperty( const sal_Char* pPropertyName ); OUString GetModelStringProperty( const sal_Char* pPropertyName );
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
@ -103,9 +103,9 @@ public:
virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo // XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
// XAccessible // XAccessible
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException);
@ -116,8 +116,8 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::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_Int32 SAL_CALL getAccessibleIndexInParent( ) 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 sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); virtual 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 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::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::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); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
@ -130,8 +130,8 @@ public:
// XAccessibleExtendedComponent // XAccessibleExtendedComponent
virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::rtl::OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::rtl::OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException);
}; };
} // namespace basctl } // namespace basctl

8
basctl/source/inc/baside3.hxx
View File

@ -57,7 +57,7 @@ private:
boost::scoped_ptr<DlgEditor> pEditor; // never nullptr boost::scoped_ptr<DlgEditor> pEditor; // never nullptr
boost::scoped_ptr<SfxUndoManager> pUndoMgr; // never nullptr boost::scoped_ptr<SfxUndoManager> pUndoMgr; // never nullptr
Link aOldNotifyUndoActionHdl; Link aOldNotifyUndoActionHdl;
::rtl::OUString aCurPath; OUString aCurPath;
protected: protected:
virtual void Paint( const Rectangle& ); virtual void Paint( const Rectangle& );
@ -78,7 +78,7 @@ protected:
public: public:
TYPEINFO(); TYPEINFO();
DialogWindow (DialogWindowLayout* pParent, ScriptDocument const& rDocument, rtl::OUString aLibName, rtl::OUString aName, com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> const& xDialogModel); DialogWindow (DialogWindowLayout* pParent, ScriptDocument const& rDocument, OUString aLibName, OUString aName, com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> const& xDialogModel);
DialogWindow( DialogWindow* pCurView ); // never implemented DialogWindow( DialogWindow* pCurView ); // never implemented
~DialogWindow(); ~DialogWindow();
@ -89,13 +89,13 @@ public:
DlgEdModel& GetModel() const; DlgEdModel& GetModel() const;
DlgEdPage& GetPage() const; DlgEdPage& GetPage() const;
DlgEdView& GetView() const; DlgEdView& GetView() const;
bool RenameDialog( const ::rtl::OUString& rNewName ); bool RenameDialog( const OUString& rNewName );
void DisableBrowser(); void DisableBrowser();
void UpdateBrowser(); void UpdateBrowser();
bool SaveDialog(); bool SaveDialog();
bool ImportDialog(); bool ImportDialog();
virtual ::rtl::OUString GetTitle(); virtual OUString GetTitle();
virtual EntryDescriptor CreateEntryDescriptor(); virtual EntryDescriptor CreateEntryDescriptor();
virtual void SetReadOnly (bool bReadOnly); virtual void SetReadOnly (bool bReadOnly);
virtual bool IsReadOnly(); virtual bool IsReadOnly();

8
basctl/source/inc/dlgedobj.hxx
View File

@ -31,7 +31,7 @@
namespace basctl namespace basctl
{ {
typedef ::std::multimap< sal_Int16, ::rtl::OUString, ::std::less< sal_Int16 > > IndexToNameMap; typedef ::std::multimap< sal_Int16, OUString, ::std::less< sal_Int16 > > IndexToNameMap;
class DlgEdForm; class DlgEdForm;
@ -59,7 +59,7 @@ private:
protected: protected:
DlgEdObj(); DlgEdObj();
DlgEdObj(const ::rtl::OUString& rModelName, DlgEdObj(const OUString& rModelName,
const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac); const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac);
virtual void NbcMove( const Size& rSize ); virtual void NbcMove( const Size& rSize );
@ -104,8 +104,8 @@ public:
virtual SdrObject* getFullDragClone() const; virtual SdrObject* getFullDragClone() const;
virtual sal_Bool supportsService( const sal_Char* _pServiceName ) const; virtual sal_Bool supportsService( const sal_Char* _pServiceName ) const;
virtual ::rtl::OUString GetDefaultName() const; virtual OUString GetDefaultName() const;
virtual ::rtl::OUString GetUniqueName() const; virtual OUString GetUniqueName() const;
virtual sal_Int32 GetStep() const; virtual sal_Int32 GetStep() const;
virtual void UpdateStep(); virtual void UpdateStep();

2
basctl/source/inc/iderid.hxx
View File

@ -31,7 +31,7 @@ public:
IDEResId( sal_uInt16 nId ); IDEResId( sal_uInt16 nId );
}; };
inline rtl::OUString IDE_RESSTR (sal_uInt16 nId) inline OUString IDE_RESSTR (sal_uInt16 nId)
{ {
return IDEResId(nId).toString(); return IDEResId(nId).toString();
} }