include/svx/svddef.hxx | 4 ++--
svx/source/svdraw/svdattr.cxx | 2 +-
svx/source/table/cell.cxx | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit eafc57233e90cafeee6f3c9e9ad655df5f1c3185
Author: Sarper Akdemir <sarper.akde...@collabora.com>
AuthorDate: Fri Apr 21 00:37:37 2023 +0300
Commit: Sarper Akdemir <sarper.akde...@collabora.com>
CommitDate: Wed May 10 22:16:20 2023 +0200
rename SDRATTR_TABLE_GRABBAG to SDRATTR_TABLE_CELL_GRABBAG
Since SDRATTR_TABLE_GRABBAG was only used in the cell context, rename
it to SDRATTR_TABLE_CELL_GRABBAG to reflect that.
As per Miklos' suggestion in:
https://gerrit.libreoffice.org/c/core/+/150521/3/svx/source/table/cell.cxx#99
Change-Id: Id18e1ab077072d0d8ba45774ef6a3443bbea52e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150736
Tested-by: Jenkins
Reviewed-by: Sarper Akdemir <sarper.akde...@collabora.com>
diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx
index e5b1c884acfd..fa57a8aa0bfc 100644
--- a/include/svx/svddef.hxx
+++ b/include/svx/svddef.hxx
@@ -419,8 +419,8 @@ constexpr TypedWhichId<SvxBoxInfoItem>
SDRATTR_TABLE_BORDER_INNER (SDRATTR_T
constexpr TypedWhichId<SvxLineItem> SDRATTR_TABLE_BORDER_TLBR
(SDRATTR_TABLE_FIRST+2); // 1238
constexpr TypedWhichId<SvxLineItem> SDRATTR_TABLE_BORDER_BLTR
(SDRATTR_TABLE_FIRST+3); // 1239
constexpr TypedWhichId<SvxTextRotateItem> SDRATTR_TABLE_TEXT_ROTATION
(SDRATTR_TABLE_FIRST+4); // 1240
-constexpr TypedWhichId<SfxGrabBagItem> SDRATTR_TABLE_GRABBAG
(SDRATTR_TABLE_FIRST+5); // 1241
-constexpr sal_uInt16 SDRATTR_TABLE_LAST
(SDRATTR_TABLE_GRABBAG); // 1241
+constexpr TypedWhichId<SfxGrabBagItem> SDRATTR_TABLE_CELL_GRABBAG
(SDRATTR_TABLE_FIRST+5); // 1241
+constexpr sal_uInt16 SDRATTR_TABLE_LAST
(SDRATTR_TABLE_CELL_GRABBAG); // 1241
constexpr sal_uInt16 SDRATTR_GLOW_FIRST
(SDRATTR_TABLE_LAST+1); // 1242
constexpr TypedWhichId<SdrMetricItem>
SDRATTR_GLOW_RADIUS(SDRATTR_GLOW_FIRST+0); // 1242
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 4cc184246159..9ed199d34586 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -333,7 +333,7 @@ SdrItemPool::SdrItemPool(
rPoolDefaults[ SDRATTR_TABLE_BORDER_TLBR - SDRATTR_START ] = new
SvxLineItem( SDRATTR_TABLE_BORDER_TLBR );
rPoolDefaults[ SDRATTR_TABLE_BORDER_BLTR - SDRATTR_START ] = new
SvxLineItem( SDRATTR_TABLE_BORDER_BLTR );
rPoolDefaults[ SDRATTR_TABLE_TEXT_ROTATION - SDRATTR_START ] = new
SvxTextRotateItem(0_deg10, SDRATTR_TABLE_TEXT_ROTATION);
- rPoolDefaults[ SDRATTR_TABLE_GRABBAG - SDRATTR_START ] = new
SfxGrabBagItem(SDRATTR_TABLE_GRABBAG);
+ rPoolDefaults[ SDRATTR_TABLE_CELL_GRABBAG - SDRATTR_START ] = new
SfxGrabBagItem(SDRATTR_TABLE_CELL_GRABBAG);
rPoolDefaults[ SDRATTR_GLOW_RADIUS - SDRATTR_START ] = new
SdrMetricItem(SDRATTR_GLOW_RADIUS, 0);
rPoolDefaults[ SDRATTR_GLOW_COLOR - SDRATTR_START ] = new
XColorItem(SDRATTR_GLOW_COLOR, aNullCol);
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 432084a40b83..88381056e572 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -98,7 +98,7 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet()
{ u"LeftBorder", SDRATTR_TABLE_BORDER,
cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER },
{ u"RightBorder", SDRATTR_TABLE_BORDER,
cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER },
{ u"RotateAngle", SDRATTR_TABLE_TEXT_ROTATION,
cppu::UnoType<sal_Int32>::get(), 0, 0 },
- { u"CellInteropGrabBag", SDRATTR_TABLE_GRABBAG,
cppu::UnoType<css::uno::Sequence<css::beans::PropertyValue>>::get(), 0, 0},
+ { u"CellInteropGrabBag", SDRATTR_TABLE_CELL_GRABBAG,
cppu::UnoType<css::uno::Sequence<css::beans::PropertyValue>>::get(), 0, 0 },
SVX_UNOEDIT_OUTLINER_PROPERTIES,
SVX_UNOEDIT_CHAR_PROPERTIES,
@@ -1056,7 +1056,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString&
rPropertyName, const Any&
mpProperties->SetObjectItem(SvxTextRotateItem(Degree10(nRotVal/10),
SDRATTR_TABLE_TEXT_ROTATION));
return;
}
- case SDRATTR_TABLE_GRABBAG:
+ case SDRATTR_TABLE_CELL_GRABBAG:
{
if (mpGrabBagItem == nullptr)
mpGrabBagItem.reset(new SfxGrabBagItem);
@@ -1184,7 +1184,7 @@ Any SAL_CALL Cell::getPropertyValue( const OUString&
PropertyName )
const SvxTextRotateItem& rTextRotate =
mpProperties->GetItem(SDRATTR_TABLE_TEXT_ROTATION);
return Any(sal_Int32(to<Degree100>(rTextRotate.GetValue())));
}
- case SDRATTR_TABLE_GRABBAG:
+ case SDRATTR_TABLE_CELL_GRABBAG:
{
if (mpGrabBagItem != nullptr)
{
