summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/svx/DescriptionGenerator.hxx10
-rw-r--r--sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx6
-rw-r--r--svx/source/accessibility/AccessibleControlShape.cxx4
-rw-r--r--svx/source/accessibility/AccessibleShape.cxx4
-rw-r--r--svx/source/accessibility/DescriptionGenerator.cxx30
5 files changed, 27 insertions, 27 deletions
diff --git a/include/svx/DescriptionGenerator.hxx b/include/svx/DescriptionGenerator.hxx
index 91a963241876..77e537abfd7a 100644
--- a/include/svx/DescriptionGenerator.hxx
+++ b/include/svx/DescriptionGenerator.hxx
@@ -39,11 +39,11 @@ namespace accessibility {
class SVX_DLLPUBLIC DescriptionGenerator
{
public:
- enum PropertyType {
- COLOR,
- INTEGER,
- STRING,
- FILL_STYLE
+ enum class PropertyType {
+ Color,
+ Integer,
+ String,
+ FillStyle
};
/** Creates a new description generator with an empty description
diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
index 8abed0243758..2a341a20af48 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
@@ -92,17 +92,17 @@ OUString
case PRESENTATION_OLE:
aDG.Initialize ("PresentationOLEShape");
//SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE));
- aDG.AddProperty ("CLSID" ,DescriptionGenerator::STRING);
+ aDG.AddProperty ("CLSID" ,DescriptionGenerator::PropertyType::String);
break;
case PRESENTATION_CHART:
aDG.Initialize ("PresentationChartShape");
//SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE));
- aDG.AddProperty ( "CLSID" , DescriptionGenerator::STRING);
+ aDG.AddProperty ( "CLSID" , DescriptionGenerator::PropertyType::String);
break;
case PRESENTATION_TABLE:
aDG.Initialize ("PresentationTableShape");
//SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE));
- aDG.AddProperty ("CLSID" , DescriptionGenerator::STRING);
+ aDG.AddProperty ("CLSID" , DescriptionGenerator::PropertyType::String);
break;
default:
aDG.Initialize ("Unknown accessible presentation OLE shape");
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index a71dfe66b787..2f68661a3af3 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -339,8 +339,8 @@ OUString
if ( sDesc.isEmpty() )
{ // no -> use the default
aDG.Initialize (STR_ObjNameSingulUno);
- aDG.AddProperty ("ControlBackground", DescriptionGenerator::COLOR, "");
- aDG.AddProperty ( "ControlBorder", DescriptionGenerator::INTEGER, "");
+ aDG.AddProperty ("ControlBackground", DescriptionGenerator::PropertyType::Color, "");
+ aDG.AddProperty ( "ControlBorder", DescriptionGenerator::PropertyType::Integer, "");
}
// ensure that we are listening to the Name property
m_bListeningForDesc = ensureListeningState( m_bListeningForDesc, true, lcl_getDescPropertyName() );
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 260af70fa91d..ca132f96520f 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -1198,8 +1198,8 @@ OUString
break;
case DRAWING_CONTROL:
- aDG.AddProperty ("ControlBackground", DescriptionGenerator::COLOR, "");
- aDG.AddProperty ("ControlBorder", DescriptionGenerator::INTEGER, "");
+ aDG.AddProperty ("ControlBackground", DescriptionGenerator::PropertyType::Color, "");
+ aDG.AddProperty ("ControlBorder", DescriptionGenerator::PropertyType::Integer, "");
break;
case DRAWING_TEXT:
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index 518a7961ea09..7f9ec19db36e 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -163,16 +163,16 @@ void DescriptionGenerator::AddProperty (const OUString& sPropertyName,
// Delegate to type specific property handling.
switch (aType)
{
- case COLOR:
+ case PropertyType::Color:
AddColor (sPropertyName, sLocalizedName);
break;
- case INTEGER:
+ case PropertyType::Integer:
AddInteger (sPropertyName, sLocalizedName);
break;
- case STRING:
+ case PropertyType::String:
AddString (sPropertyName, sLocalizedName, nWhichId);
break;
- case FILL_STYLE:
+ case PropertyType::FillStyle:
AddFillStyle (sPropertyName, sLocalizedName);
break;
}
@@ -188,10 +188,10 @@ void DescriptionGenerator::AppendString (const OUString& sString)
void DescriptionGenerator::AddLineProperties()
{
- AddProperty ("LineColor", DescriptionGenerator::COLOR, SIP_XA_LINECOLOR);
- AddProperty ("LineDashName", DescriptionGenerator::STRING,
+ AddProperty ("LineColor", DescriptionGenerator::PropertyType::Color, SIP_XA_LINECOLOR);
+ AddProperty ("LineDashName", DescriptionGenerator::PropertyType::String,
SIP_XA_LINEDASH, XATTR_LINEDASH);
- AddProperty ("LineWidth", DescriptionGenerator::INTEGER, SIP_XA_LINEWIDTH);
+ AddProperty ("LineWidth", DescriptionGenerator::PropertyType::Integer, SIP_XA_LINEWIDTH);
}
@@ -200,13 +200,13 @@ void DescriptionGenerator::AddLineProperties()
*/
void DescriptionGenerator::AddFillProperties()
{
- AddProperty ("FillStyle", DescriptionGenerator::FILL_STYLE, SIP_XA_FILLSTYLE);
+ AddProperty ("FillStyle", DescriptionGenerator::PropertyType::FillStyle, SIP_XA_FILLSTYLE);
}
void DescriptionGenerator::Add3DProperties()
{
- AddProperty ("D3DMaterialColor", DescriptionGenerator::COLOR,
+ AddProperty ("D3DMaterialColor", DescriptionGenerator::PropertyType::Color,
RID_SVXSTR_A11Y_3D_MATERIAL_COLOR);
AddLineProperties ();
AddFillProperties ();
@@ -215,7 +215,7 @@ void DescriptionGenerator::Add3DProperties()
void DescriptionGenerator::AddTextProperties()
{
- AddProperty ("CharColor", DescriptionGenerator::COLOR);
+ AddProperty ("CharColor", DescriptionGenerator::PropertyType::Color);
AddFillProperties ();
}
@@ -351,19 +351,19 @@ void DescriptionGenerator::AddFillStyle (const OUString& sPropertyName,
case drawing::FillStyle_NONE:
break;
case drawing::FillStyle_SOLID:
- AddProperty ("FillColor", COLOR, SIP_XA_FILLCOLOR);
+ AddProperty ("FillColor", PropertyType::Color, SIP_XA_FILLCOLOR);
break;
case drawing::FillStyle_GRADIENT:
- AddProperty ("FillGradientName", STRING, SIP_XA_FILLGRADIENT,
+ AddProperty ("FillGradientName", PropertyType::String, SIP_XA_FILLGRADIENT,
XATTR_FILLGRADIENT);
break;
case drawing::FillStyle_HATCH:
- AddProperty ("FillColor", COLOR, SIP_XA_FILLCOLOR);
- AddProperty ("FillHatchName", STRING, SIP_XA_FILLHATCH,
+ AddProperty ("FillColor", PropertyType::Color, SIP_XA_FILLCOLOR);
+ AddProperty ("FillHatchName", PropertyType::String, SIP_XA_FILLHATCH,
XATTR_FILLHATCH);
break;
case drawing::FillStyle_BITMAP:
- AddProperty ("FillBitmapName", STRING, SIP_XA_FILLBITMAP,
+ AddProperty ("FillBitmapName", PropertyType::String, SIP_XA_FILLBITMAP,
XATTR_FILLBITMAP);
break;
case drawing::FillStyle_MAKE_FIXED_SIZE:
generated by cgit (git 2.34.1) at 2025-01-28 16:25:59 +0000