extensions/source/propctrlr/controlfontdialog.cxx | 2
extensions/source/propctrlr/editpropertyhandler.cxx | 62 ++++++++++----------
extensions/source/propctrlr/formcontroller.cxx | 28 +++++----
extensions/source/propctrlr/inspectormodelbase.cxx | 27 ++++----
extensions/source/propctrlr/pcrcommon.hxx | 12 ++-
extensions/source/propctrlr/pcrunodialogs.cxx | 4 -
6 files changed, 76 insertions(+), 59 deletions(-)
New commits:
commit 63a9b0bed08a68f3619cadf7b7cef0a087154c10
Author: Venetia Furtado <venetiaros...@gmail.com>
AuthorDate: Tue Jul 4 20:01:41 2023 -0600
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Tue Jul 18 17:51:18 2023 +0200
tdf#145614 Convert #define to enum
Change-Id: I4e0aa0b167a8e54c1ba85f2b4c86f3f198672553
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154075
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx
b/extensions/source/propctrlr/controlfontdialog.cxx
index 08088e074f76..9c3eddf4d1e2 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -39,7 +39,7 @@ namespace pcr
:OGenericUnoDialog( _rxContext )
,m_pItemPoolDefaults(nullptr)
{
- registerProperty(PROPERTY_INTROSPECTEDOBJECT,
OWN_PROPERTY_ID_INTROSPECTEDOBJECT,
+ registerProperty(PROPERTY_INTROSPECTEDOBJECT,
static_cast<sal_Int32>(OwnPropertyId::INTROSPECTEDOBJECT),
PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT,
&m_xControlModel, cppu::UnoType<decltype(m_xControlModel)>::get());
}
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx
b/extensions/source/propctrlr/editpropertyhandler.cxx
index 8629abb82590..f063489e642c 100644
--- a/extensions/source/propctrlr/editpropertyhandler.cxx
+++ b/extensions/source/propctrlr/editpropertyhandler.cxx
@@ -25,11 +25,15 @@
#include <com/sun/star/lang/NullPointerException.hpp>
#include <comphelper/diagnose_ex.hxx>
-#define TEXTTYPE_SINGLELINE 0
-#define TEXTTYPE_MULTILINE 1
-#define TEXTTYPE_RICHTEXT 2
-
-
+namespace
+{
+ enum class TextType
+ {
+ SINGLELINE = 0,
+ MULTILINE = 1,
+ RICHTEXT = 2
+ };
+};
namespace pcr
{
@@ -91,21 +95,21 @@ namespace pcr
case PROPERTY_ID_TEXTTYPE:
{
- sal_Int32 nTextType = TEXTTYPE_SINGLELINE;
+ TextType nTextType = TextType::SINGLELINE;
bool bRichText = false;
OSL_VERIFY( m_xComponent->getPropertyValue( PROPERTY_RICHTEXT
) >>= bRichText );
if ( bRichText )
- nTextType = TEXTTYPE_RICHTEXT;
+ nTextType = TextType::RICHTEXT;
else
{
bool bMultiLine = false;
OSL_VERIFY( m_xComponent->getPropertyValue(
PROPERTY_MULTILINE ) >>= bMultiLine );
if ( bMultiLine )
- nTextType = TEXTTYPE_MULTILINE;
+ nTextType = TextType::MULTILINE;
else
- nTextType = TEXTTYPE_SINGLELINE;
+ nTextType = TextType::SINGLELINE;
}
- aReturn <<= nTextType;
+ aReturn <<= static_cast<sal_Int32>(nTextType);
}
break;
@@ -150,13 +154,13 @@ namespace pcr
{
bool bMultiLine = false;
bool bRichText = false;
- sal_Int32 nTextType = TEXTTYPE_SINGLELINE;
+ sal_Int32 nTextType =
static_cast<sal_Int32>(TextType::SINGLELINE);
OSL_VERIFY( _rValue >>= nTextType );
- switch ( nTextType )
+ switch ( static_cast<TextType>(nTextType) )
{
- case TEXTTYPE_SINGLELINE: bMultiLine = bRichText = false;
break;
- case TEXTTYPE_MULTILINE: bMultiLine = true; bRichText =
false; break;
- case TEXTTYPE_RICHTEXT: bMultiLine = true; bRichText = true;
break;
+ case TextType::SINGLELINE: bMultiLine = bRichText = false;
break;
+ case TextType::MULTILINE: bMultiLine = true; bRichText =
false; break;
+ case TextType::RICHTEXT: bMultiLine = true; bRichText =
true; break;
default:
OSL_FAIL( "EditPropertyHandler::setPropertyValue: invalid
text type!" );
}
@@ -261,21 +265,23 @@ namespace pcr
{
case PROPERTY_ID_TEXTTYPE:
{
- sal_Int32 nTextType = TEXTTYPE_SINGLELINE;
- getPropertyValue( PROPERTY_TEXTTYPE ) >>= nTextType;
+ sal_Int32 nTextTypeInt =
static_cast<sal_Int32>(TextType::SINGLELINE);
+ getPropertyValue( PROPERTY_TEXTTYPE ) >>= nTextTypeInt;
+
+ TextType nTextType = static_cast<TextType>(nTextTypeInt);
if ( impl_isSupportedProperty_nothrow( PROPERTY_ID_WORDBREAK ) )
- _rxInspectorUI->enablePropertyUI( PROPERTY_WORDBREAK,
nTextType == TEXTTYPE_RICHTEXT );
- _rxInspectorUI->enablePropertyUI( PROPERTY_MAXTEXTLEN,
nTextType != TEXTTYPE_RICHTEXT );
- _rxInspectorUI->enablePropertyUI( PROPERTY_ECHO_CHAR,
nTextType == TEXTTYPE_SINGLELINE );
- _rxInspectorUI->enablePropertyUI( PROPERTY_FONT,
nTextType != TEXTTYPE_RICHTEXT );
- _rxInspectorUI->enablePropertyUI( PROPERTY_ALIGN,
nTextType != TEXTTYPE_RICHTEXT );
- _rxInspectorUI->enablePropertyUI( PROPERTY_DEFAULT_TEXT,
nTextType != TEXTTYPE_RICHTEXT );
- _rxInspectorUI->enablePropertyUI( PROPERTY_SHOW_SCROLLBARS,
nTextType != TEXTTYPE_SINGLELINE );
- _rxInspectorUI->enablePropertyUI( PROPERTY_LINEEND_FORMAT,
nTextType != TEXTTYPE_SINGLELINE );
- _rxInspectorUI->enablePropertyUI( PROPERTY_VERTICAL_ALIGN,
nTextType == TEXTTYPE_SINGLELINE );
-
- _rxInspectorUI->showCategory( "Data", nTextType !=
TEXTTYPE_RICHTEXT );
+ _rxInspectorUI->enablePropertyUI( PROPERTY_WORDBREAK,
nTextType == TextType::RICHTEXT );
+ _rxInspectorUI->enablePropertyUI( PROPERTY_MAXTEXTLEN,
nTextType != TextType::RICHTEXT );
+ _rxInspectorUI->enablePropertyUI( PROPERTY_ECHO_CHAR,
nTextType == TextType::SINGLELINE );
+ _rxInspectorUI->enablePropertyUI( PROPERTY_FONT,
nTextType != TextType::RICHTEXT );
+ _rxInspectorUI->enablePropertyUI( PROPERTY_ALIGN,
nTextType != TextType::RICHTEXT );
+ _rxInspectorUI->enablePropertyUI( PROPERTY_DEFAULT_TEXT,
nTextType != TextType::RICHTEXT );
+ _rxInspectorUI->enablePropertyUI( PROPERTY_SHOW_SCROLLBARS,
nTextType != TextType::SINGLELINE );
+ _rxInspectorUI->enablePropertyUI( PROPERTY_LINEEND_FORMAT,
nTextType != TextType::SINGLELINE );
+ _rxInspectorUI->enablePropertyUI( PROPERTY_VERTICAL_ALIGN,
nTextType == TextType::SINGLELINE );
+
+ _rxInspectorUI->showCategory( "Data", nTextType !=
TextType::RICHTEXT );
}
break;
diff --git a/extensions/source/propctrlr/formcontroller.cxx
b/extensions/source/propctrlr/formcontroller.cxx
index f4bcf3cfe523..f2daf2dbd329 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -131,13 +131,13 @@ namespace pcr
Sequence< Property > aProps{
Property(
PROPERTY_CURRENTPAGE,
- OWN_PROPERTY_ID_CURRENTPAGE,
+ static_cast<sal_Int32>(OwnPropertyId::CURRENTPAGE),
::cppu::UnoType<OUString>::get(),
PropertyAttribute::TRANSIENT
),
Property(
PROPERTY_INTROSPECTEDOBJECT,
- OWN_PROPERTY_ID_INTROSPECTEDOBJECT,
+ static_cast<sal_Int32>(OwnPropertyId::INTROSPECTEDOBJECT),
cppu::UnoType<XPropertySet>::get(),
PropertyAttribute::TRANSIENT | PropertyAttribute::CONSTRAINED
)
@@ -148,16 +148,18 @@ namespace pcr
sal_Bool SAL_CALL FormController::convertFastPropertyValue( Any &
rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue )
{
- switch ( nHandle )
+ switch ( static_cast<OwnPropertyId>(nHandle) )
{
- case OWN_PROPERTY_ID_INTROSPECTEDOBJECT:
+ case OwnPropertyId::INTROSPECTEDOBJECT:
if ( rValue.getValueTypeClass() != TypeClass_INTERFACE )
throw IllegalArgumentException();
break;
- case OWN_PROPERTY_ID_CURRENTPAGE:
+ case OwnPropertyId::CURRENTPAGE:
if ( rValue.getValueTypeClass() != TypeClass_STRING )
throw IllegalArgumentException();
break;
+ default:
+ break;
}
getFastPropertyValue( rOldValue, nHandle );
@@ -168,9 +170,9 @@ namespace pcr
void SAL_CALL FormController::setFastPropertyValue_NoBroadcast(sal_Int32
_nHandle, const Any& _rValue)
{
- switch ( _nHandle )
+ switch ( static_cast<OwnPropertyId>(_nHandle) )
{
- case OWN_PROPERTY_ID_INTROSPECTEDOBJECT:
+ case OwnPropertyId::INTROSPECTEDOBJECT:
{
Reference< XObjectInspectorModel > xModel( getInspectorModel() );
if ( xModel.is() )
@@ -194,24 +196,28 @@ namespace pcr
}
}
break;
- case OWN_PROPERTY_ID_CURRENTPAGE:
+ case OwnPropertyId::CURRENTPAGE:
restoreViewData( _rValue );
break;
+ default:
+ break;
}
}
void SAL_CALL FormController::getFastPropertyValue( css::uno::Any& rValue,
sal_Int32 nHandle ) const
{
- switch ( nHandle )
+ switch ( static_cast<OwnPropertyId>(nHandle) )
{
- case OWN_PROPERTY_ID_INTROSPECTEDOBJECT:
+ case OwnPropertyId::INTROSPECTEDOBJECT:
rValue <<= m_xCurrentInspectee;
break;
- case OWN_PROPERTY_ID_CURRENTPAGE:
+ case OwnPropertyId::CURRENTPAGE:
rValue = const_cast< FormController* >( this )->getViewData();
break;
+ default:
+ break;
}
}
diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx
b/extensions/source/propctrlr/inspectormodelbase.cxx
index f8780ff996cf..aaa994e94abd 100644
--- a/extensions/source/propctrlr/inspectormodelbase.cxx
+++ b/extensions/source/propctrlr/inspectormodelbase.cxx
@@ -28,13 +28,16 @@
namespace pcr
{
-
-
-#define MODEL_PROPERTY_ID_HAS_HELP_SECTION 2000
-#define MODEL_PROPERTY_ID_MIN_HELP_TEXT_LINES 2001
-#define MODEL_PROPERTY_ID_MAX_HELP_TEXT_LINES 2002
-#define MODEL_PROPERTY_ID_IS_READ_ONLY 2003
-
+ namespace
+ {
+ enum class ModelPropertyId
+ {
+ HAS_HELP_SECTION = 2000,
+ MIN_HELP_TEXT_LINES = 2001,
+ MAX_HELP_TEXT_LINES = 2002,
+ IS_READ_ONLY = 2003
+ };
+ };
using ::com::sun::star::uno::Reference;
using ::com::sun::star::beans::XPropertySetInfo;
using ::com::sun::star::uno::Any;
@@ -94,25 +97,25 @@ namespace pcr
{
registerProperty(
"HasHelpSection",
- MODEL_PROPERTY_ID_HAS_HELP_SECTION,
+ static_cast<sal_Int32>(ModelPropertyId::HAS_HELP_SECTION),
PropertyAttribute::READONLY,
&m_bHasHelpSection,
cppu::UnoType<decltype(m_bHasHelpSection)>::get()
);
registerProperty(
"MinHelpTextLines",
- MODEL_PROPERTY_ID_MIN_HELP_TEXT_LINES,
+ static_cast<sal_Int32>(ModelPropertyId::MIN_HELP_TEXT_LINES),
PropertyAttribute::READONLY,
&m_nMinHelpTextLines,
cppu::UnoType<decltype(m_nMinHelpTextLines)>::get()
);
registerProperty(
"MaxHelpTextLines",
- MODEL_PROPERTY_ID_MAX_HELP_TEXT_LINES,
+ static_cast<sal_Int32>(ModelPropertyId::MAX_HELP_TEXT_LINES),
PropertyAttribute::READONLY,
&m_nMaxHelpTextLines,
cppu::UnoType<decltype(m_nMaxHelpTextLines)>::get()
);
registerProperty(
"IsReadOnly",
- MODEL_PROPERTY_ID_IS_READ_ONLY,
+ static_cast<sal_Int32>(ModelPropertyId::IS_READ_ONLY),
PropertyAttribute::BOUND,
&m_bIsReadOnly, cppu::UnoType<decltype(m_bIsReadOnly)>::get()
);
@@ -225,7 +228,7 @@ namespace pcr
void SAL_CALL ImplInspectorModel::setIsReadOnly( sal_Bool IsReadOnly )
{
- setFastPropertyValue( MODEL_PROPERTY_ID_IS_READ_ONLY, Any( IsReadOnly
) );
+ setFastPropertyValue(
static_cast<sal_Int32>(ModelPropertyId::IS_READ_ONLY), Any( IsReadOnly ) );
}
sal_Bool SAL_CALL ImplInspectorModel::supportsService( const OUString&
ServiceName )
diff --git a/extensions/source/propctrlr/pcrcommon.hxx
b/extensions/source/propctrlr/pcrcommon.hxx
index a9705188906a..f2a8b847c000 100644
--- a/extensions/source/propctrlr/pcrcommon.hxx
+++ b/extensions/source/propctrlr/pcrcommon.hxx
@@ -31,11 +31,13 @@
namespace pcr
{
-
- #define OWN_PROPERTY_ID_INTROSPECTEDOBJECT 0x0010
- #define OWN_PROPERTY_ID_CURRENTPAGE 0x0011
- #define OWN_PROPERTY_ID_CONTROLCONTEXT 0x0012
- #define OWN_PROPERTY_ID_TABBINGMODEL 0x0013
+ enum class OwnPropertyId
+ {
+ INTROSPECTEDOBJECT = 0x0010,
+ CURRENTPAGE = 0x0011,
+ CONTROLCONTEXT = 0x0012,
+ TABBINGMODEL = 0x0013
+ };
//= types
diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx
b/extensions/source/propctrlr/pcrunodialogs.cxx
index 9083cb284cef..a6c7703a8d15 100644
--- a/extensions/source/propctrlr/pcrunodialogs.cxx
+++ b/extensions/source/propctrlr/pcrunodialogs.cxx
@@ -45,11 +45,11 @@ namespace pcr
OTabOrderDialog::OTabOrderDialog( const Reference< XComponentContext >&
_rxContext )
:OGenericUnoDialog( _rxContext )
{
- registerProperty( PROPERTY_CONTROLCONTEXT,
OWN_PROPERTY_ID_CONTROLCONTEXT,
+ registerProperty( PROPERTY_CONTROLCONTEXT,
static_cast<sal_Int32>(OwnPropertyId::CONTROLCONTEXT),
PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT,
&m_xControlContext,
cppu::UnoType<decltype(m_xControlContext)>::get() );
- registerProperty( PROPERTY_TABBINGMODEL, OWN_PROPERTY_ID_TABBINGMODEL,
+ registerProperty( PROPERTY_TABBINGMODEL,
static_cast<sal_Int32>(OwnPropertyId::TABBINGMODEL),
PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT,
&m_xTabbingModel, cppu::UnoType<decltype(m_xTabbingModel)>::get()
);
}
