summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorJason Hulme <jsnhulme@gmail.com>2014-05-26 12:30:36 -0500
committerAndras Timar <andras.timar@collabora.com>2014-05-27 02:47:50 -0500
commitceb7ea5091bd9b862f92e853fd9f8f2542fb8b41 (patch)
tree06459a382bc24065199c8626176a32e94e7411dd /svx
parent73e4257ec8eb2079052e2a7d9aef1949c989fb2a (diff)
fdo#78920: Number %NUMBERSTRING in tooltip
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>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.src4
-rw-r--r--svx/source/sidebar/nbdtmg.cxx37
2 files changed, 3 insertions, 38 deletions
diff --git a/svx/source/dialog/svxbmpnumvalueset.src b/svx/source/dialog/svxbmpnumvalueset.src
index 8665a0b37adc..93fb4f7b8335 100644
--- a/svx/source/dialog/svxbmpnumvalueset.src
+++ b/svx/source/dialog/svxbmpnumvalueset.src
@@ -53,8 +53,8 @@ String RID_SVXSTR_BULLET_DESCRIPTION_7
};
String RID_SVXSTR_SINGLENUM_DESCRIPTION_0
{
- //Text [en-US] = "Number 1) 2) 3)";
- Text [en-US] = "Number %NUMBERINGSAMPLE";
+ Text [en-US] = "Number 1) 2) 3)";
+ //Text [en-US] = "Number %NUMBERINGSAMPLE";
};
String RID_SVXSTR_SINGLENUM_DESCRIPTION_1
{
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 5c321396422c..60ec2b36ca4a 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -1351,42 +1351,7 @@ void NumberingTypeMgr::Init()
pNumEntry->nIndex = i + 1;
pNumEntry->nIndexDefault = i;
pNumEntry->pNumSetting = pNew;
- //SetItemText( i + 1, 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 );
+ pNumEntry->sDescription = SVX_RESSTR( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i );
pNumberSettingsArr->push_back(boost::shared_ptr<NumberSettings_Impl>(pNumEntry));
}
}