Kaydet (Commit) 74c527ab authored tarafından Yousuf Philips's avatar Yousuf Philips Kaydeden (comit) Michael Stahl

tdf#106988 New names for the new numbering styles

Change-Id: Ibc93aaa552652d61ac49652cf0ac5fcb68b48a12
Reviewed-on: https://gerrit.libreoffice.org/37995Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 1bac5cde
......@@ -3121,7 +3121,7 @@
<value>11</value>
</prop>
</node>
<node oor:name=".uno:StyleApply?Style:string=Numbering 1&amp;FamilyName:string=NumberingStyles" oor:op="replace">
<node oor:name=".uno:StyleApply?Style:string=Numbering 123&amp;FamilyName:string=NumberingStyles" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Number List</value>
</prop>
......@@ -3134,13 +3134,13 @@
<value xml:lang="en-US">Number List Style</value>
</prop>
<prop oor:name="TargetURL" oor:type="xs:string">
<value>.uno:StyleApply?Style:string=Numbering 1&amp;FamilyName:string=NumberingStyles</value>
<value>.uno:StyleApply?Style:string=Numbering 123&amp;FamilyName:string=NumberingStyles</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>11</value>
</prop>
</node>
<node oor:name=".uno:StyleApply?Style:string=Numbering 4&amp;FamilyName:string=NumberingStyles" oor:op="replace">
<node oor:name=".uno:StyleApply?Style:string=Numbering IVX&amp;FamilyName:string=NumberingStyles" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Roman List</value>
</prop>
......@@ -3153,7 +3153,7 @@
<value xml:lang="en-US">Roman List Style</value>
</prop>
<prop oor:name="TargetURL" oor:type="xs:string">
<value>.uno:StyleApply?Style:string=Numbering 4&amp;FamilyName:string=NumberingStyles</value>
<value>.uno:StyleApply?Style:string=Numbering IVX&amp;FamilyName:string=NumberingStyles</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>11</value>
......
......@@ -102,16 +102,16 @@ import com.sun.star.xml.AttributeData;
public class _ParagraphProperties extends MultiPropertyTest {
/**
* Custom tester for numbering style properties. Switches between
* 'Numbering 1' and 'Numbering 2' styles.
* 'Numbering 123' and 'Numbering ABC' styles.
*/
protected PropertyTester NumberingStyleTester = new PropertyTester() {
@Override
protected Object getNewValue(String propName, Object oldValue)
throws java.lang.IllegalArgumentException {
if ((oldValue != null) && (oldValue.equals("Numbering 1"))) {
return "Numbering 2";
if ((oldValue != null) && (oldValue.equals("Numbering 123"))) {
return "Numbering ABC";
} else {
return "Numbering 1";
return "Numbering 123";
}
}
};
......
......@@ -196,7 +196,7 @@ public class SwXParagraph extends TestCase {
portP = UnoRuntime.queryInterface(XPropertySet.class, port);
paraP = UnoRuntime.queryInterface(XPropertySet.class, para);
paraP.setPropertyValue("NumberingStyleName","Numbering 4");
paraP.setPropertyValue("NumberingStyleName","Numbering IVX");
nRules = paraP.getPropertyValue("NumberingRules");
......
......@@ -187,11 +187,11 @@ RES_POOLPAGE_END
enum RES_POOL_NUMRULE_TYPE
{
RES_POOLNUMRULE_BEGIN = POOLGRP_NUMRULE,
RES_POOLNUMRULE_NUM1 = RES_POOLNUMRULE_BEGIN, ///< NumRule Numbering 1.
RES_POOLNUMRULE_NUM2, ///< NumRule Numbering 2.
RES_POOLNUMRULE_NUM3, ///< NumRule Numbering 3.
RES_POOLNUMRULE_NUM4, ///< NumRule Numbering 4.
RES_POOLNUMRULE_NUM5, ///< NumRule Numbering 5.
RES_POOLNUMRULE_NUM1 = RES_POOLNUMRULE_BEGIN, ///< NumRule Numbering 123.
RES_POOLNUMRULE_NUM2, ///< NumRule Numbering ABC.
RES_POOLNUMRULE_NUM3, ///< NumRule Numbering abc.
RES_POOLNUMRULE_NUM4, ///< NumRule Numbering IVX.
RES_POOLNUMRULE_NUM5, ///< NumRule Numbering ivx.
RES_POOLNUMRULE_BUL1, ///< NumRule Bullets 1.
RES_POOLNUMRULE_BUL2, ///< NumRule Bullets 2.
RES_POOLNUMRULE_BUL3, ///< NumRule Bullets 3.
......
......@@ -196,11 +196,11 @@
#define STR_POOLPAGE_ENDNOTE NC_("STR_POOLPAGE_ENDNOTE", "Endnote")
#define STR_POOLPAGE_LANDSCAPE NC_("STR_POOLPAGE_LANDSCAPE", "Landscape")
// Numbering rules
#define STR_POOLNUMRULE_NUM1 NC_("STR_POOLNUMRULE_NUM1", "Numbering 1")
#define STR_POOLNUMRULE_NUM2 NC_("STR_POOLNUMRULE_NUM2", "Numbering 2")
#define STR_POOLNUMRULE_NUM3 NC_("STR_POOLNUMRULE_NUM3", "Numbering 3")
#define STR_POOLNUMRULE_NUM4 NC_("STR_POOLNUMRULE_NUM4", "Numbering 4")
#define STR_POOLNUMRULE_NUM5 NC_("STR_POOLNUMRULE_NUM5", "Numbering 5")
#define STR_POOLNUMRULE_NUM1 NC_("STR_POOLNUMRULE_NUM1", "Numbering 123")
#define STR_POOLNUMRULE_NUM2 NC_("STR_POOLNUMRULE_NUM2", "Numbering ABC")
#define STR_POOLNUMRULE_NUM3 NC_("STR_POOLNUMRULE_NUM3", "Numbering abc")
#define STR_POOLNUMRULE_NUM4 NC_("STR_POOLNUMRULE_NUM4", "Numbering IVX")
#define STR_POOLNUMRULE_NUM5 NC_("STR_POOLNUMRULE_NUM5", "Numbering ivx")
#define STR_POOLNUMRULE_BUL1 NC_("STR_POOLNUMRULE_BUL1", "List 1")
#define STR_POOLNUMRULE_BUL2 NC_("STR_POOLNUMRULE_BUL2", "List 2")
#define STR_POOLNUMRULE_BUL3 NC_("STR_POOLNUMRULE_BUL3", "List 3")
......
......@@ -159,7 +159,7 @@ class CheckStyle(unittest.TestCase):
def test_NumberingFamily(self):
xDoc = CheckStyle._uno.openEmptyWriterDoc()
xNumberingStyles = xDoc.StyleFamilies["NumberingStyles"]
vEmptyDocStyles = ['List 1', 'List 2', 'List 3', 'List 4', 'List 5', 'Numbering 1', 'Numbering 2', 'Numbering 3', 'Numbering 4', 'Numbering 5']
vEmptyDocStyles = ['List 1', 'List 2', 'List 3', 'List 4', 'List 5', 'Numbering 123', 'Numbering ABC', 'Numbering abc', 'Numbering IVX', 'Numbering ivx']
self.__test_StyleFamily(xNumberingStyles, vEmptyDocStyles, "SwXStyle")
self.__test_StyleFamilyIndex(xNumberingStyles, vEmptyDocStyles, "SwXStyle")
self.__test_StyleFamilyInsert(xDoc, xNumberingStyles, vEmptyDocStyles, "com.sun.star.style.NumberingStyle", "com.sun.star.style.CharacterStyle")
......
......@@ -289,11 +289,11 @@ const struct SwTableEntry PageDescProgNameTable [] =
const struct SwTableEntry NumRuleProgNameTable [] =
{
ENTRY( "Numbering 1" ), // STR_POOLNUMRULE_PRGM_NUM1
ENTRY( "Numbering 2" ),
ENTRY( "Numbering 3" ),
ENTRY( "Numbering 4" ),
ENTRY( "Numbering 5" ),
ENTRY( "Numbering 123" ), // STR_POOLNUMRULE_PRGM_NUM1
ENTRY( "Numbering ABC" ),
ENTRY( "Numbering abc" ),
ENTRY( "Numbering IVX" ),
ENTRY( "Numbering ivx" ),
ENTRY( "List 1" ),
ENTRY( "List 2" ),
ENTRY( "List 3" ),
......
......@@ -111,11 +111,11 @@ static const BuiltinStyleTable aBuiltinStyleTable[] =
{ word::WdBuiltinStyle::wdStyleListContinue3, "", word::WdStyleType::wdStyleTypeParagraph },
{ word::WdBuiltinStyle::wdStyleListContinue4, "", word::WdStyleType::wdStyleTypeParagraph },
{ word::WdBuiltinStyle::wdStyleListContinue5, "", word::WdStyleType::wdStyleTypeParagraph },
{ word::WdBuiltinStyle::wdStyleListNumber, "Numbering 1", word::WdStyleType::wdStyleTypeList },
{ word::WdBuiltinStyle::wdStyleListNumber2, "Numbering 2", word::WdStyleType::wdStyleTypeList },
{ word::WdBuiltinStyle::wdStyleListNumber3, "Numbering 3", word::WdStyleType::wdStyleTypeList },
{ word::WdBuiltinStyle::wdStyleListNumber4, "Numbering 4", word::WdStyleType::wdStyleTypeList },
{ word::WdBuiltinStyle::wdStyleListNumber5, "Numbering 5", word::WdStyleType::wdStyleTypeList },
{ word::WdBuiltinStyle::wdStyleListNumber, "Numbering 123", word::WdStyleType::wdStyleTypeList },
{ word::WdBuiltinStyle::wdStyleListNumber2, "Numbering ABC", word::WdStyleType::wdStyleTypeList },
{ word::WdBuiltinStyle::wdStyleListNumber3, "Numbering abc", word::WdStyleType::wdStyleTypeList },
{ word::WdBuiltinStyle::wdStyleListNumber4, "Numbering IVX", word::WdStyleType::wdStyleTypeList },
{ word::WdBuiltinStyle::wdStyleListNumber5, "Numbering ivx", word::WdStyleType::wdStyleTypeList },
{ word::WdBuiltinStyle::wdStyleMacroText, "", word::WdStyleType::wdStyleTypeParagraph },
{ word::WdBuiltinStyle::wdStyleMessageHeader, "", word::WdStyleType::wdStyleTypeParagraph },
{ word::WdBuiltinStyle::wdStyleNavPane, "", word::WdStyleType::wdStyleTypeParagraph },
......
......@@ -584,8 +584,8 @@
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Source Text&amp;FamilyName:string=CharacterStyles" menu:style="radio"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=List 1&amp;FamilyName:string=NumberingStyles" menu:style="radio"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering 1&amp;FamilyName:string=NumberingStyles" menu:style="radio"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering 4&amp;FamilyName:string=NumberingStyles" menu:style="radio"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering 123&amp;FamilyName:string=NumberingStyles" menu:style="radio"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering IVX&amp;FamilyName:string=NumberingStyles" menu:style="radio"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:EditStyle"/>
<menu:menuitem menu:id=".uno:StyleUpdateByExample"/>
......
......@@ -548,8 +548,8 @@
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Source Text&amp;FamilyName:string=CharacterStyles" menu:style="radio"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=List 1&amp;FamilyName:string=NumberingStyles" menu:style="radio"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering 1&amp;FamilyName:string=NumberingStyles" menu:style="radio"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering 4&amp;FamilyName:string=NumberingStyles" menu:style="radio"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering 123&amp;FamilyName:string=NumberingStyles" menu:style="radio"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering IVX&amp;FamilyName:string=NumberingStyles" menu:style="radio"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:EditStyle"/>
<menu:menuitem menu:id=".uno:StyleUpdateByExample"/>
......
......@@ -3388,14 +3388,14 @@
<object class="GtkMenuItem" id="numbering1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:StyleApply?Style:string=Numbering 1&amp;FamilyName:string=NumberingStyles</property>
<property name="action_name">.uno:StyleApply?Style:string=Numbering 123&amp;FamilyName:string=NumberingStyles</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="numbering4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:StyleApply?Style:string=Numbering 4&amp;FamilyName:string=NumberingStyles</property>
<property name="action_name">.uno:StyleApply?Style:string=Numbering IVX&amp;FamilyName:string=NumberingStyles</property>
</object>
</child>
<child>
......
......@@ -3305,14 +3305,14 @@
<object class="GtkMenuItem" id="numbering1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:StyleApply?Style:string=Numbering 1&amp;FamilyName:string=NumberingStyles</property>
<property name="action_name">.uno:StyleApply?Style:string=Numbering 123&amp;FamilyName:string=NumberingStyles</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="numbering4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:StyleApply?Style:string=Numbering 4&amp;FamilyName:string=NumberingStyles</property>
<property name="action_name">.uno:StyleApply?Style:string=Numbering IVX&amp;FamilyName:string=NumberingStyles</property>
</object>
</child>
<child>
......
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