diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-28 12:10:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-29 09:30:13 +0200 |
| commit | e0c6780fdc8e41eb5915f02240c522dff04a9571 (patch) | |
| tree | 6b26dd2c3f1bdeb19b0ef873234e1a3db0e48922 /sfx2 | |
| parent | 3287636944af9c3e006c2334cb9dffd468ea10f9 (diff) | |
convert sfx2/source/inc/workwin.hxx from String to OUString
Change-Id: I4c6cdbef4a24f389f7e74def94ced7ddb4a3c56e
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/workwin.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/control/dispatch.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/inc/workwin.hxx | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index a76d79924d57..a4afda3f2978 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -1143,7 +1143,7 @@ void SfxWorkWindow::ResetObjectBars_Impl() //------------------------------------------------------------------------ void SfxWorkWindow::SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId, - SfxInterface* pIFace, const String *pName) + SfxInterface* pIFace, const OUString *pName) { DBG_ASSERT( (nPos & SFX_POSITION_MASK) < SFX_OBJECTBAR_MAX, "object bar position overflow" ); @@ -1163,7 +1163,7 @@ void SfxWorkWindow::SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId, if (pName) aObjBar.aName = *pName; else - aObjBar.aName.Erase(); + aObjBar.aName = ""; for ( sal_uInt16 n=0; n<aObjBarList.size(); n++ ) { diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index d13f3d755f9d..cb0e66f60567 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -96,7 +96,7 @@ struct SfxObjectBars_Impl { sal_uInt32 nResId; // Resource - and ConfigId of the Toolbox sal_uInt16 nMode; // special visibility flags - String aName; + OUString aName; SfxInterface* pIFace; SfxObjectBars_Impl() : nResId(0), nMode(0), pIFace(NULL) {} @@ -1445,7 +1445,7 @@ void SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bo if ( pName ) rBar.aName = *pName; else - rBar.aName.Erase(); + rBar.aName = ""; rBar.pIFace = pIFace; if ( bUIActive || bIsActive ) diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 4a9a47a8da65..a0faee2491ff 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -50,9 +50,9 @@ struct SfxObjectBar_Impl sal_uInt16 nMode; // special visibility flags sal_uInt16 nPos; sal_uInt16 nIndex; - sal_Bool bDestroy; - String aName; - SfxInterface* pIFace; + sal_Bool bDestroy; + OUString aName; + SfxInterface* pIFace; SfxObjectBar_Impl() : nId(0), @@ -293,7 +293,7 @@ public: virtual void UpdateObjectBars_Impl(); void ResetObjectBars_Impl(); void SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId, - SfxInterface *pIFace, const String* pName=0 ); + SfxInterface *pIFace, const OUString* pName=0 ); bool KnowsObjectBar_Impl( sal_uInt16 nPos ) const; sal_Bool IsVisible_Impl(); void MakeVisible_Impl( sal_Bool ); |