core.git: Branch 'libreoffice-24-8' - dbaccess/inc dbaccess/source

[Xisco Fauli (via logerrit)]

 dbaccess/inc/strings.hxx               |    2 +-
 dbaccess/source/ui/uno/ColumnModel.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 789bc2e858f1ed5c05e4b83b41399289d481bddb
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Jul 24 17:16:38 2024 +0200
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Thu Jul 25 07:32:55 2024 +0200

    related tdf#161865: fix another ODR violation
    
    Change-Id: I082ad91c0c060e7231d0af15868960cb2399b088
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170971
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    (cherry picked from commit e22dfeef0c0bfb4ed11ae08b2331a0103384f3f5)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170952
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/dbaccess/inc/strings.hxx b/dbaccess/inc/strings.hxx
index 9783f9e41030..d1668dd24517 100644
--- a/dbaccess/inc/strings.hxx
+++ b/dbaccess/inc/strings.hxx
@@ -256,7 +256,7 @@ inline constexpr OUString SERVICE_CONTROLDEFAULT = 
u"com.sun.star.comp.dbu.OColu
 // other DBU properties
 
 inline constexpr OUString 
PROPERTY_ENABLEOUTERJOIN(u"EnableOuterJoinEscape"_ustr);
-inline constexpr OUString PROPERTY_TABSTOP(u"TabStop"_ustr);
+inline constexpr OUString PROPERTY_TABSTOP2(u"TabStop"_ustr);
 inline constexpr OUString PROPERTY_DEFAULTCONTROL(u"DefaultControl"_ustr);
 inline constexpr OUString PROPERTY_ENABLED(u"Enabled"_ustr);
 inline constexpr OUString 
PROPERTY_MOUSE_WHEEL_BEHAVIOR(u"MouseWheelBehavior"_ustr);
diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx 
b/dbaccess/source/ui/uno/ColumnModel.cxx
index 4b40cf69e04f..5ba3ce8a7e47 100644
--- a/dbaccess/source/ui/uno/ColumnModel.cxx
+++ b/dbaccess/source/ui/uno/ColumnModel.cxx
@@ -82,7 +82,7 @@ void OColumnControlModel::registerProperties()
     registerProperty( PROPERTY_COLUMN, PROPERTY_ID_COLUMN, 
PropertyAttribute::TRANSIENT | PropertyAttribute::BOUND,
             &m_xColumn, cppu::UnoType<decltype(m_xColumn)>::get() );
 
-    registerMayBeVoidProperty( PROPERTY_TABSTOP, PROPERTY_ID_TABSTOP, 
PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID,
+    registerMayBeVoidProperty( PROPERTY_TABSTOP2, PROPERTY_ID_TABSTOP, 
PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID,
             &m_aTabStop, ::cppu::UnoType<sal_Int16>::get() );
     registerProperty( PROPERTY_DEFAULTCONTROL, PROPERTY_ID_DEFAULTCONTROL, 
PropertyAttribute::BOUND,
             &m_sDefaultControl, 
cppu::UnoType<decltype(m_sDefaultControl)>::get() );