mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#78920: Number %NUMBERSTRING in tooltip

Browse Source 
Fixed string in Bullets and Numbering and changed sidebar to use the same set of strings.

Change-Id: Ib8a103e203cf66c979216175d4047bca518290ce
Reviewed-on: https://gerrit.libreoffice.org/9492
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
This commit is contained in:
Jason Hulme
2014-05-26 12:30:36 -05:00
committed by Andras Timar
parent 73e4257ec8
commit ceb7ea5091
2 changed files with 3 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
svx/source/dialog/svxbmpnumvalueset.src
View File

@@ -53,8 +53,8 @@ String RID_SVXSTR_BULLET_DESCRIPTION_7
}; };
String RID_SVXSTR_SINGLENUM_DESCRIPTION_0 String RID_SVXSTR_SINGLENUM_DESCRIPTION_0
{ {
//Text [en-US] = "Number 1) 2) 3)"; Text [en-US] = "Number 1) 2) 3)";
Text [en-US] = "Number %NUMBERINGSAMPLE"; //Text [en-US] = "Number %NUMBERINGSAMPLE";
}; };
String RID_SVXSTR_SINGLENUM_DESCRIPTION_1 String RID_SVXSTR_SINGLENUM_DESCRIPTION_1
{ {

37
svx/source/sidebar/nbdtmg.cxx
View File

@@ -1351,42 +1351,7 @@ void NumberingTypeMgr::Init()
pNumEntry->nIndex = i + 1; pNumEntry->nIndex = i + 1;
pNumEntry->nIndexDefault = i; pNumEntry->nIndexDefault = i;
pNumEntry->pNumSetting = pNew; pNumEntry->pNumSetting = pNew;
//SetItemText( i + 1, SVX_RESSTR( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i )); pNumEntry->sDescription = SVX_RESSTR( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i );
{
OUString sText;
//const OUString sValue(C2U("Value"));
Reference<XNumberingFormatter> xFormatter(xDefNum, UNO_QUERY);
if(xFormatter.is() && aNumberings.getLength() > i)
{
for (sal_uInt16 j=0;j<3;j++)
{
Sequence<PropertyValue> aLevel = aNumberings.getConstArray()[i];
try
{
aLevel.realloc(aLevel.getLength() + 1);
PropertyValue& rValue = aLevel.getArray()[aLevel.getLength() - 1];
rValue.Name = "Value";
rValue.Value <<= (sal_Int32)(j + 1);
if (j!=0)
sText += " ";
sText += xFormatter->makeNumberingString( aLevel, aLocale );
}
catch (const Exception&)
{
OSL_ENSURE(false, "Exception in DefaultNumberingProvider::makeNumberingString");
}
}
}
OUString aStrFromRES(SVX_RESSTR( RID_SVXSTR_SINGLENUM_DESCRIPTIONS));
aStrFromRES = aStrFromRES.replaceFirst("%NUMBERINGSAMPLE",sText);
pNumEntry->sDescription = aStrFromRES;
}
//End modification
//pNumEntry->sDescription = SVX_RESSTR( RID_SVXSTR_SINGLENUM_DESCRIPTION_0 + i );
pNumberSettingsArr->push_back(boost::shared_ptr<NumberSettings_Impl>(pNumEntry)); pNumberSettingsArr->push_back(boost::shared_ptr<NumberSettings_Impl>(pNumEntry));
} }
} }