From 3db96bfbac475022a32b70473b767b21a8d70c7f Mon Sep 17 00:00:00 2001 From: psykose Date: Sat, 22 Jul 2023 04:11:36 +0000 Subject: [PATCH] replace uses of PAGE_SIZE with PAGE_SIZE_NAME fixes #4427 --- src/attributes.cpp | 2 +- src/attributes.h | 2 +- src/object/sp-page.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/attributes.cpp b/src/attributes.cpp index 4e7f1ee2c53..55d07462139 100644 --- a/src/attributes.cpp +++ b/src/attributes.cpp @@ -142,7 +142,7 @@ static SPStyleProp const props[] = { /* SPPage */ {SPAttr::PAGE_MARGIN, "margin"}, {SPAttr::PAGE_BLEED, "bleed"}, - {SPAttr::PAGE_SIZE, "page-size"}, + {SPAttr::PAGE_SIZE_NAME, "page-size"}, /* SPGrid */ {SPAttr::ORIGINX, "originx"}, {SPAttr::ORIGINY, "originy"}, diff --git a/src/attributes.h b/src/attributes.h index 7061c86b769..120be046630 100644 --- a/src/attributes.h +++ b/src/attributes.h @@ -141,7 +141,7 @@ enum class SPAttr { /* SPPage */ PAGE_MARGIN, PAGE_BLEED, - PAGE_SIZE, + PAGE_SIZE_NAME, /* SPGrid */ ORIGINX, ORIGINY, diff --git a/src/object/sp-page.cpp b/src/object/sp-page.cpp index cc5c41fdcfa..6634a402cb6 100644 --- a/src/object/sp-page.cpp +++ b/src/object/sp-page.cpp @@ -42,7 +42,7 @@ void SPPage::build(SPDocument *document, Inkscape::XML::Node *repr) SPObject::build(document, repr); this->readAttr(SPAttr::INKSCAPE_LABEL); - this->readAttr(SPAttr::PAGE_SIZE); + this->readAttr(SPAttr::PAGE_SIZE_NAME); this->readAttr(SPAttr::X); this->readAttr(SPAttr::Y); this->readAttr(SPAttr::WIDTH); @@ -85,7 +85,7 @@ void SPPage::set(SPAttr key, const gchar *value) case SPAttr::PAGE_BLEED: this->bleed.readOrUnset(value); break; - case SPAttr::PAGE_SIZE: + case SPAttr::PAGE_SIZE_NAME: this->_size_label = value ? std::string(value) : ""; break; default: -- GitLab