Skip to content

C
core
Kaydet (Commit) d2f468dd authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert include/svx/nbdtmg.hxx from String to OUString 

Change-Id: I278acc5df9c934d42b9747df00704a5a9b3ef56e
üst 9d003eca
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
include/svx/nbdtmg.hxx
Dosyayı görüntüle @ d2f468dd
......@@ -109,7 +109,7 @@ class SVX_DLLPUBLIC BulletsSettings_Impl:public BulletsSettings
class SVX_DLLPUBLIC GrfBulDataRelation: public BulletsSettings
{
public:
String sGrfName;
OUString sGrfName;
sal_uInt16 nTabIndex;
sal_uInt16 nGallaryIndex;
const Graphic* pGrfObj;
......@@ -185,7 +185,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
const SfxItemSet* pSet;
SfxMapUnit eCoreUnit;
//Sym3_2508 store the attributes passed from pSet
String aNumCharFmtName;
OUString aNumCharFmtName;
void StoreBulCharFmtName_impl();
void StoreMapUnit_impl();
......@@ -217,14 +217,14 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0)=0;
virtual sal_Bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF)=0;
virtual sal_Bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF, sal_Bool isDefault=false,sal_Bool isResetSize=false)=0;
virtual String GetDescription(sal_uInt16 nIndex,sal_Bool isDefault=false)=0;
virtual OUString GetDescription(sal_uInt16 nIndex,sal_Bool isDefault=false)=0;
virtual sal_Bool IsCustomized(sal_uInt16 nIndex)=0;
sal_uInt16 IsSingleLevel(sal_uInt16 nCurLevel);
const SfxItemSet* GetItems() { return pSet;}
//Sym3_2508 store the attributes passed from pSet
void SetItems(const SfxItemSet* pArg) { pSet = pArg;StoreBulCharFmtName_impl();StoreMapUnit_impl();}
protected:
String GetBulCharFmtName();
OUString GetBulCharFmtName();
SfxMapUnit GetMapUnit();
protected:
bool bIsLoading;
......@@ -251,7 +251,7 @@ class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0);
virtual sal_Bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF);
virtual sal_Bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,sal_Bool isDefault=false,sal_Bool isResetSize=false);
virtual String GetDescription(sal_uInt16 nIndex,sal_Bool isDefault=false);
virtual OUString GetDescription(sal_uInt16 nIndex,sal_Bool isDefault=false);
virtual sal_Bool IsCustomized(sal_uInt16 nIndex);
sal_Unicode GetBulChar(sal_uInt16 nIndex);
Font GetBulCharFont(sal_uInt16 nIndex);
......@@ -283,9 +283,9 @@ class SVX_DLLPUBLIC GraphyicBulletsTypeMgr: public NBOTypeMgrBase
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0);
virtual sal_Bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF);
virtual sal_Bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,sal_Bool isDefault=false,sal_Bool isResetSize=false);
virtual String GetDescription(sal_uInt16 nIndex,sal_Bool isDefault=false);
virtual OUString GetDescription(sal_uInt16 nIndex,sal_Bool isDefault=false);
virtual sal_Bool IsCustomized(sal_uInt16 nIndex);
String GetGrfName(sal_uInt16 nIndex);
OUString GetGrfName(sal_uInt16 nIndex);
static GraphyicBulletsTypeMgr* GetInstance()
{
if ( _instance == 0 )
......@@ -314,7 +314,7 @@ class SVX_DLLPUBLIC MixBulletsTypeMgr: public NBOTypeMgrBase
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0);
virtual sal_Bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF);
virtual sal_Bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,sal_Bool isDefault=false,sal_Bool isResetSize=false);
virtual String GetDescription(sal_uInt16 nIndex,sal_Bool isDefault=false);
virtual OUString GetDescription(sal_uInt16 nIndex,sal_Bool isDefault=false);
virtual sal_Bool IsCustomized(sal_uInt16 nIndex);
static MixBulletsTypeMgr* GetInstance()
{
......@@ -343,7 +343,7 @@ class SVX_DLLPUBLIC NumberingTypeMgr: public NBOTypeMgrBase
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0);
virtual sal_Bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF);
virtual sal_Bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,sal_Bool isDefault=false,sal_Bool isResetSize=false);
virtual String GetDescription(sal_uInt16 nIndex,sal_Bool isDefault=false);
virtual OUString GetDescription(sal_uInt16 nIndex,sal_Bool isDefault=false);
virtual sal_Bool IsCustomized(sal_uInt16 nIndex);
static NumberingTypeMgr* GetInstance()
{
......@@ -371,7 +371,7 @@ class SVX_DLLPUBLIC OutlineTypeMgr: public NBOTypeMgrBase
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0);
virtual sal_Bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF);
virtual sal_Bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,sal_Bool isDefault=false,sal_Bool isResetSize=false);
virtual String GetDescription(sal_uInt16 nIndex,sal_Bool isDefault=false);
virtual OUString GetDescription(sal_uInt16 nIndex,sal_Bool isDefault=false);
virtual sal_Bool IsCustomized(sal_uInt16 nIndex);
static OutlineTypeMgr* GetInstance()
{
......
svx/source/sidebar/nbdtmg.cxx
Dosyayı görüntüle @ d2f468dd
......@@ -171,7 +171,7 @@ void NBOTypeMgrBase::StoreBulCharFmtName_impl() {
}
}
}
String NBOTypeMgrBase::GetBulCharFmtName()
OUString NBOTypeMgrBase::GetBulCharFmtName()
{
return aNumCharFmtName;
}
......@@ -477,7 +477,7 @@ sal_Bool BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uIn
return sal_True;
}
String BulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool /*isDefault*/)
OUString BulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool /*isDefault*/)
{
String sRet;
//sal_uInt16 nLength = 0;
......@@ -736,7 +736,7 @@ sal_Bool GraphyicBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex
return sal_True;
}
String GraphyicBulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool /*isDefault*/)
OUString GraphyicBulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool /*isDefault*/)
{
String sRet;
sal_uInt16 nLength = 0;
......@@ -774,9 +774,9 @@ sal_Bool GraphyicBulletsTypeMgr::IsCustomized(sal_uInt16 nIndex)
return bRet;
}
String GraphyicBulletsTypeMgr::GetGrfName(sal_uInt16 nIndex)
OUString GraphyicBulletsTypeMgr::GetGrfName(sal_uInt16 nIndex)
{
String sRet;
OUString sRet;
if ( nIndex < aGrfDataLst.size() )
{
GrfBulDataRelation* pEntry = aGrfDataLst[nIndex];
......@@ -1291,7 +1291,7 @@ sal_Bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_
return sal_True;
}
String MixBulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool isDefault)
OUString MixBulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool isDefault)
{
String sRet;
//sal_uInt16 nLength = 0;
......@@ -1526,7 +1526,7 @@ sal_Bool NumberingTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_u
return sal_True;
}
String NumberingTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool isDefault)
OUString NumberingTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool isDefault)
{
String sRet;
sal_uInt16 nLength = 0;
......@@ -1895,7 +1895,7 @@ sal_Bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uIn
return sal_True;
}
String OutlineTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool isDefault)
OUString OutlineTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool isDefault)
{
String sRet;
sal_uInt16 nLength = 0;
......
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