Kaydet (Commit) 03f54ec2 authored tarafından Caolán McNamara's avatar Caolán McNamara

so SfxInterface::GetObjectBarName is now unused

Change-Id: I88f5c84386216339d617589ba6a7e0de1235a9e9
üst 22cc0d39
...@@ -80,7 +80,6 @@ public: ...@@ -80,7 +80,6 @@ public:
sal_uInt32 GetObjectBarFeature( 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 ); void SetObjectBarPos( sal_uInt16 nPos, sal_uInt16 nId );
const OUString* GetObjectBarName( sal_uInt16 nNo ) const;
bool IsObjectBarVisible( sal_uInt16 nNo) const; bool IsObjectBarVisible( sal_uInt16 nNo) const;
sal_uInt32 GetChildWindowFeature( sal_uInt16 nNo ) const; sal_uInt32 GetChildWindowFeature( sal_uInt16 nNo ) const;
sal_uInt32 GetChildWindowId( sal_uInt16 nNo ) const; sal_uInt32 GetChildWindowId( sal_uInt16 nNo ) const;
......
...@@ -548,13 +548,11 @@ sal_uInt16 SfxInterface::GetChildWindowCount() const ...@@ -548,13 +548,11 @@ sal_uInt16 SfxInterface::GetChildWindowCount() const
return pImpData->aChildWindows.size(); return pImpData->aChildWindows.size();
} }
const ResId& SfxInterface::GetPopupMenuResId() const const ResId& SfxInterface::GetPopupMenuResId() const
{ {
return pImpData->aPopupRes; return pImpData->aPopupRes;
} }
const ResId& SfxInterface::GetStatusBarResId() const const ResId& SfxInterface::GetStatusBarResId() const
{ {
if (pImpData->aStatBarRes.GetId() == 0 && pGenoType) if (pImpData->aStatBarRes.GetId() == 0 && pGenoType)
...@@ -563,27 +561,6 @@ const ResId& SfxInterface::GetStatusBarResId() const ...@@ -563,27 +561,6 @@ const ResId& SfxInterface::GetStatusBarResId() const
return pImpData->aStatBarRes; return pImpData->aStatBarRes;
} }
const OUString* SfxInterface::GetObjectBarName ( sal_uInt16 nNo ) const
{
bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
if ( bGenoType )
{
// Are there toolbars in the super class?
sal_uInt16 nBaseCount = pGenoType->GetObjectBarCount();
if ( nNo < nBaseCount )
// The Super class comes first
return pGenoType->GetObjectBarName( nNo );
else
nNo = nNo - nBaseCount;
}
assert( nNo<pImpData->aObjectBars.size() );
return pImpData->aObjectBars[nNo]->pName;
}
sal_uInt32 SfxInterface::GetObjectBarFeature ( sal_uInt16 nNo ) const sal_uInt32 SfxInterface::GetObjectBarFeature ( sal_uInt16 nNo ) const
{ {
bool bGenoType = (pGenoType != 0 && !pGenoType->HasName()); bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
......
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