summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/sfx2/objface.hxx20
-rw-r--r--sfx2/source/control/dispatch.cxx2
-rw-r--r--sfx2/source/control/objface.cxx24
3 files changed, 23 insertions, 23 deletions
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index 8e1f772e3791..3a0a81b59d1f 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -63,7 +63,7 @@ public:
const SfxSlot* GetRealSlot( const SfxSlot * ) const;
const SfxSlot* GetRealSlot( sal_uInt16 nSlotId ) const;
virtual const SfxSlot* GetSlot( sal_uInt16 nSlotId ) const;
- const SfxSlot* GetSlot( const String& rCommand ) const;
+ const SfxSlot* GetSlot( const OUString& rCommand ) const;
const char* GetClassName() const { return pName; }
bool HasName() const { return 0 != aNameResId.GetId(); }
@@ -75,21 +75,21 @@ public:
const SfxInterface* GetGenoType() const { return pGenoType; }
const SfxInterface* GetRealInterfaceForSlot( const SfxSlot* ) const;
- void RegisterObjectBar( sal_uInt16, const ResId&, const String* pST=0 );
- void RegisterObjectBar( sal_uInt16, const ResId&, sal_uInt32 nFeature, const String* pST=0 );
- void RegisterChildWindow( sal_uInt16, sal_Bool bContext, const String* pST=0 );
- void RegisterChildWindow( sal_uInt16, sal_Bool bContext, sal_uInt32 nFeature, const String* pST=0 );
+ void RegisterObjectBar( sal_uInt16, const ResId&, const OUString* pST=0 );
+ void RegisterObjectBar( sal_uInt16, const ResId&, sal_uInt32 nFeature, const OUString* pST=0 );
+ void RegisterChildWindow( sal_uInt16, sal_Bool bContext, const OUString* pST=0 );
+ void RegisterChildWindow( sal_uInt16, sal_Bool bContext, sal_uInt32 nFeature, const OUString* pST=0 );
void RegisterStatusBar( const ResId& );
const ResId& GetObjectBarResId( sal_uInt16 nNo ) const;
- sal_uInt16 GetObjectBarPos( sal_uInt16 nNo ) const;
+ sal_uInt16 GetObjectBarPos( sal_uInt16 nNo ) const;
sal_uInt32 GetObjectBarFeature( sal_uInt16 nNo ) const;
- sal_uInt16 GetObjectBarCount() const;
+ sal_uInt16 GetObjectBarCount() const;
void SetObjectBarPos( sal_uInt16 nPos, sal_uInt16 nId );
- const String* GetObjectBarName( sal_uInt16 nNo ) const;
- sal_Bool IsObjectBarVisible( sal_uInt16 nNo) const;
+ const OUString* GetObjectBarName( sal_uInt16 nNo ) const;
+ sal_Bool IsObjectBarVisible( sal_uInt16 nNo) const;
sal_uInt32 GetChildWindowFeature( sal_uInt16 nNo ) const;
sal_uInt32 GetChildWindowId( sal_uInt16 nNo ) const;
- sal_uInt16 GetChildWindowCount() const;
+ sal_uInt16 GetChildWindowCount() const;
void RegisterPopupMenu( const ResId& );
const ResId& GetPopupMenuResId() const;
const ResId& GetStatusBarResId() const;
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index fdaf3698311e..48fad8930c77 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1441,7 +1441,7 @@ void SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bo
SfxObjectBars_Impl& rBar = pImp->aObjBars[nPos & SFX_POSITION_MASK];
rBar.nMode = nPos;
rBar.nResId = pIFace->GetObjectBarResId(nNo).GetId();
- const String *pName = pIFace->GetObjectBarName(nNo);
+ const OUString *pName = pIFace->GetObjectBarName(nNo);
if ( pName )
rBar.aName = *pName;
else
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 09870eafb1d4..8c96d0daa5ac 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -56,7 +56,7 @@ struct SfxObjectUI_Impl
ResId aResId;
sal_Bool bVisible;
sal_Bool bContext;
- String* pName;
+ OUString* pName;
sal_uInt32 nFeature;
SfxObjectUI_Impl(sal_uInt16 n, const ResId& rResId, sal_Bool bVis, sal_uInt32 nFeat) :
@@ -105,7 +105,7 @@ struct SfxInterface_Impl
}
};
-static SfxObjectUI_Impl* CreateObjectBarUI_Impl( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr );
+static SfxObjectUI_Impl* CreateObjectBarUI_Impl( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const OUString *pStr );
//====================================================================
@@ -322,7 +322,7 @@ const SfxSlot* SfxInterface::GetSlot( sal_uInt16 nFuncId ) const
return p ? (const SfxSlot*)p : 0;
}
-const SfxSlot* SfxInterface::GetSlot( const String& rCommand ) const
+const SfxSlot* SfxInterface::GetSlot( const OUString& rCommand ) const
{
static const char UNO_COMMAND[] = ".uno:";
@@ -388,20 +388,20 @@ void SfxInterface::RegisterPopupMenu( const ResId& rResId )
//--------------------------------------------------------------------
void SfxInterface::RegisterObjectBar( sal_uInt16 nPos, const ResId& rResId,
- const String *pStr )
+ const OUString *pStr )
{
RegisterObjectBar( nPos, rResId, 0UL, pStr );
}
-void SfxInterface::RegisterObjectBar( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr )
+void SfxInterface::RegisterObjectBar( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const OUString *pStr )
{
SfxObjectUI_Impl* pUI = CreateObjectBarUI_Impl( nPos, rResId, nFeature, pStr );
if ( pUI )
pImpData->aObjectBars.push_back(pUI);
}
-SfxObjectUI_Impl* CreateObjectBarUI_Impl( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr )
+SfxObjectUI_Impl* CreateObjectBarUI_Impl( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const OUString *pStr )
{
if ((nPos & SFX_VISIBILITY_MASK) == 0)
nPos |= SFX_VISIBILITY_STANDARD;
@@ -416,12 +416,12 @@ SfxObjectUI_Impl* CreateObjectBarUI_Impl( sal_uInt16 nPos, const ResId& rResId,
if( ! aResId.GetResMgr() )
aResId.SetResMgr( SfxApplication::GetOrCreate()->GetOffResManager_Impl() );
if ( !aResId.GetResMgr() || !aResId.GetResMgr()->IsAvailable(aResId) )
- pUI->pName = new String ("NoName");
+ pUI->pName = new OUString ("NoName");
else
- pUI->pName = new String(aResId.toString());
+ pUI->pName = new OUString(aResId.toString());
}
else
- pUI->pName = new String(*pStr);
+ pUI->pName = new OUString(*pStr);
return pUI;
}
@@ -483,12 +483,12 @@ sal_uInt16 SfxInterface::GetObjectBarCount() const
}
//--------------------------------------------------------------------
-void SfxInterface::RegisterChildWindow(sal_uInt16 nId, sal_Bool bContext, const String* pChildWinName)
+void SfxInterface::RegisterChildWindow(sal_uInt16 nId, sal_Bool bContext, const OUString* pChildWinName)
{
RegisterChildWindow( nId, bContext, 0UL, pChildWinName );
}
-void SfxInterface::RegisterChildWindow(sal_uInt16 nId, sal_Bool bContext, sal_uInt32 nFeature, const String*)
+void SfxInterface::RegisterChildWindow(sal_uInt16 nId, sal_Bool bContext, sal_uInt32 nFeature, const OUString*)
{
SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, ResId(nId, *SfxApplication::GetOrCreate()->GetOffResManager_Impl()), sal_True, nFeature);
pUI->bContext = bContext;
@@ -572,7 +572,7 @@ const ResId& SfxInterface::GetStatusBarResId() const
-const String* SfxInterface::GetObjectBarName ( sal_uInt16 nNo ) const
+const OUString* SfxInterface::GetObjectBarName ( sal_uInt16 nNo ) const
{
sal_Bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
if ( bGenoType )
generated by cgit (git 2.34.1) at 2025-03-14 18:23:02 +0000