Kaydet (Commit) 0357ff2e authored tarafından Noel Grandin's avatar Noel Grandin

convert sfx2/source/appl/helpinterceptor.hxx from String to OUString

Change-Id: I3999e64cdc7c538fa300ec5ad648ec257f6faa3b
üst 5d5b0c20
...@@ -63,7 +63,7 @@ HelpInterceptor_Impl::~HelpInterceptor_Impl() ...@@ -63,7 +63,7 @@ HelpInterceptor_Impl::~HelpInterceptor_Impl()
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void HelpInterceptor_Impl::addURL( const String& rURL ) void HelpInterceptor_Impl::addURL( const OUString& rURL )
{ {
if ( !m_pHistory ) if ( !m_pHistory )
m_pHistory = new HelpHistoryList_Impl; m_pHistory = new HelpHistoryList_Impl;
......
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
struct HelpHistoryEntry_Impl struct HelpHistoryEntry_Impl
{ {
String aURL; OUString aURL;
com::sun::star::uno::Any aViewData; com::sun::star::uno::Any aViewData;
HelpHistoryEntry_Impl( const String& rURL, const com::sun::star::uno::Any& rViewData ) : HelpHistoryEntry_Impl( const OUString& rURL, const com::sun::star::uno::Any& rViewData ) :
aURL( rURL ), aViewData(rViewData) {} aURL( rURL ), aViewData(rViewData) {}
}; };
...@@ -65,18 +65,18 @@ friend class SfxHelpWindow_Impl; ...@@ -65,18 +65,18 @@ friend class SfxHelpWindow_Impl;
HelpHistoryList_Impl* m_pHistory; HelpHistoryList_Impl* m_pHistory;
SfxHelpWindow_Impl* m_pWindow; SfxHelpWindow_Impl* m_pWindow;
sal_uIntPtr m_nCurPos; sal_uIntPtr m_nCurPos;
String m_aCurrentURL; OUString m_aCurrentURL;
com::sun::star::uno::Any m_aViewData; com::sun::star::uno::Any m_aViewData;
void addURL( const String& rURL ); void addURL( const OUString& rURL );
public: public:
HelpInterceptor_Impl(); HelpInterceptor_Impl();
~HelpInterceptor_Impl(); ~HelpInterceptor_Impl();
void setInterception( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame ); void setInterception( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame );
String GetCurrentURL() const { return m_aCurrentURL; } OUString GetCurrentURL() const { return m_aCurrentURL; }
...@@ -121,7 +121,7 @@ class HelpListener_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::fram ...@@ -121,7 +121,7 @@ class HelpListener_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::fram
private: private:
HelpInterceptor_Impl* pInterceptor; HelpInterceptor_Impl* pInterceptor;
Link aChangeLink; Link aChangeLink;
String aFactory; OUString aFactory;
public: public:
HelpListener_Impl( HelpInterceptor_Impl* pInter ); HelpListener_Impl( HelpInterceptor_Impl* pInter );
...@@ -132,7 +132,7 @@ public: ...@@ -132,7 +132,7 @@ public:
throw( ::com::sun::star::uno::RuntimeException ); throw( ::com::sun::star::uno::RuntimeException );
void SetChangeHdl( const Link& rLink ) { aChangeLink = rLink; } void SetChangeHdl( const Link& rLink ) { aChangeLink = rLink; }
String GetFactory() const { return aFactory; } OUString GetFactory() const { return aFactory; }
}; };
// HelpStatusListener_Impl ----------------------------------------------------- // HelpStatusListener_Impl -----------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment