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

convert sfx2/source/inc/workwin.hxx from String to OUString

Change-Id: I4c6cdbef4a24f389f7e74def94ced7ddb4a3c56e
üst 32876369
......@@ -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++ )
{
......
......@@ -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 )
......
......@@ -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 );
......
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