summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-12-13 19:21:32 +0100
committerEike Rathke <erack@redhat.com>2016-12-13 19:21:37 +0100
commita9a5b95de8cf0005476a375b0e4038283f03b818 (patch)
tree7a45f901fc01868b395126bce387187c0661e6bc
parent97490635ef1b383b8c9759653edb4836015ba6d2 (diff)
rename to numberingtype instead of pagenumbering
... because that now is what it is about, it's just used in page numbering as well. Change-Id: I5516b6babcd5438b6505d189943c21abfbe35a7e
-rw-r--r--include/svx/dialogs.hrc2
-rw-r--r--svx/AllLangResTarget_svx.mk2
-rw-r--r--svx/source/dialog/numberingtype.src (renamed from svx/source/dialog/pagenumbering.src)2
-rw-r--r--svx/source/dialog/pagenumberlistbox.cxx2
-rw-r--r--sw/source/uibase/fldui/fldmgr.cxx2
-rw-r--r--sw/source/uibase/misc/numberingtypelistbox.cxx2
6 files changed, 6 insertions, 6 deletions
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 589b6a8a7413..4e2fab2baac2 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -1075,7 +1075,7 @@
#define RID_SVXIMG_WIDTH_CUSTOM_GRAY (RID_SVX_START + 1394)
#define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 1395)
#define RID_SVXSTRARY_PAPERSIZE_DRAW (RID_SVX_START + 1396)
-#define RID_SVXSTRARY_PAGE_NUMBERING (RID_SVX_START + 1397)
+#define RID_SVXSTRARY_NUMBERINGTYPE (RID_SVX_START + 1397)
#define RID_SVXSTRARY_SPACING (RID_SVX_START + 1398)
#define RID_SVXSTRARY_SAMECONTENT (RID_SVX_START + 1399)
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index 8f4be3fbcf7c..b847e58a7801 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
svx/source/dialog/imapdlg.src \
svx/source/dialog/language.src \
svx/source/dialog/page.src \
- svx/source/dialog/pagenumbering.src \
+ svx/source/dialog/numberingtype.src \
svx/source/dialog/passwd.src \
svx/source/dialog/prtqry.src \
svx/source/dialog/ruler.src \
diff --git a/svx/source/dialog/pagenumbering.src b/svx/source/dialog/numberingtype.src
index 2c3a001912a5..f0702d8403fb 100644
--- a/svx/source/dialog/pagenumbering.src
+++ b/svx/source/dialog/numberingtype.src
@@ -19,7 +19,7 @@
#include <svx/dialogs.hrc>
-StringArray RID_SVXSTRARY_PAGE_NUMBERING
+StringArray RID_SVXSTRARY_NUMBERINGTYPE
{
ItemList [ en-US ] =
{
diff --git a/svx/source/dialog/pagenumberlistbox.cxx b/svx/source/dialog/pagenumberlistbox.cxx
index 94a95854f0cd..2e333b3992c8 100644
--- a/svx/source/dialog/pagenumberlistbox.cxx
+++ b/svx/source/dialog/pagenumberlistbox.cxx
@@ -26,7 +26,7 @@
PageNumberListBox::PageNumberListBox(vcl::Window* pParent)
: ListBox( pParent, WB_BORDER | WB_DROPDOWN)
{
- ResStringArray aPaperAry( SVX_RES( RID_SVXSTRARY_PAGE_NUMBERING ) );
+ ResStringArray aPaperAry( SVX_RES( RID_SVXSTRARY_NUMBERINGTYPE ) );
sal_uInt32 nCnt = aPaperAry.Count();
for ( sal_uInt32 i = 0; i < nCnt; ++i )
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index 600b544999ab..38e8f16a8ee0 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -594,7 +594,7 @@ OUString SwFieldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const
{
if(xNumberingInfo.is())
{
- ResStringArray aNames( SVX_RES( RID_SVXSTRARY_PAGE_NUMBERING ));
+ ResStringArray aNames( SVX_RES( RID_SVXSTRARY_NUMBERINGTYPE ));
Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes();
const sal_Int16* pTypes = aTypes.getConstArray();
diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx
index 32b4eff4b689..b8a4114e8011 100644
--- a/sw/source/uibase/misc/numberingtypelistbox.cxx
+++ b/sw/source/uibase/misc/numberingtypelistbox.cxx
@@ -89,7 +89,7 @@ void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags)
pTypes = aTypes.getConstArray();
}
}
- ResStringArray aNames( SVX_RES( RID_SVXSTRARY_PAGE_NUMBERING ));
+ ResStringArray aNames( SVX_RES( RID_SVXSTRARY_NUMBERINGTYPE ));
for(size_t i = 0; i < aNames.Count(); i++)
{
sal_IntPtr nValue = aNames.GetValue(i);