sfx2/inc/dinfdlg.hrc | 30 ++++++++++++-----------
sfx2/source/dialog/dinfdlg.cxx | 53 ++++++++++++++++++++---------------------
2 files changed, 43 insertions(+), 40 deletions(-)
New commits:
commit ae6b3cf568157ec37574fdc8491e5d385a88cd94
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Tue Nov 23 22:12:53 2021 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Wed Nov 24 21:28:33 2021 +0100
Convert sal_IntPtr into int + use constexpr int in sfx2/dinfdlg
Change-Id: I39ab8370f0d01441d59e12fa120bbef4d767c2fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125747
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/sfx2/inc/dinfdlg.hrc b/sfx2/inc/dinfdlg.hrc
index 5b838ce56652..819892da6d5a 100644
--- a/sfx2/inc/dinfdlg.hrc
+++ b/sfx2/inc/dinfdlg.hrc
@@ -56,22 +56,24 @@ const TranslateId SFX_CB_PROPERTY_STRINGARRAY[] =
NC_("SFX_CB_PROPERTY_STRINGARRAY", "URL")
};
-#define CUSTOM_TYPE_UNKNOWN 0
-#define CUSTOM_TYPE_TEXT 1
-#define CUSTOM_TYPE_NUMBER 2
-#define CUSTOM_TYPE_DATE 3
-#define CUSTOM_TYPE_BOOLEAN 4
-#define CUSTOM_TYPE_DURATION 5
-#define CUSTOM_TYPE_DATETIME 6
+enum CustomProperties : sal_Int32 {
+ Custom_Type_Unknown = 0,
+ Custom_Type_Text = 1,
+ Custom_Type_Number = 2,
+ Custom_Type_Date = 3,
+ Custom_Type_Boolean = 4,
+ Custom_Type_Duration = 5,
+ Custom_Type_Datetime = 6
+};
-const std::pair<TranslateId, int> SFX_LB_PROPERTY_STRINGARRAY[] =
+const std::pair<TranslateId, CustomProperties> SFX_LB_PROPERTY_STRINGARRAY[] =
{
- { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Text") , CUSTOM_TYPE_TEXT },
- { NC_("SFX_CB_PROPERTY_STRINGARRAY", "DateTime") , CUSTOM_TYPE_DATETIME
},
- { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Date") , CUSTOM_TYPE_DATE },
- { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Duration") , CUSTOM_TYPE_DURATION
},
- { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Number") , CUSTOM_TYPE_NUMBER },
- { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Yes or no") , CUSTOM_TYPE_BOOLEAN }
+ { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Text") , Custom_Type_Text },
+ { NC_("SFX_CB_PROPERTY_STRINGARRAY", "DateTime") , Custom_Type_Datetime
},
+ { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Date") , Custom_Type_Date },
+ { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Duration") , Custom_Type_Duration
},
+ { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Number") , Custom_Type_Number },
+ { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Yes or no") , Custom_Type_Boolean }
};
#endif
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index e702c7c9457f..04d70eadc0b8 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1323,13 +1323,13 @@ CustomPropertiesWindow::~CustomPropertiesWindow()
void CustomPropertyLine::DoTypeHdl(const weld::ComboBox& rBox)
{
auto nType = rBox.get_active_id().toInt32();
- m_xValueEdit->set_visible( (CUSTOM_TYPE_TEXT == nType) ||
(CUSTOM_TYPE_NUMBER == nType) );
- m_xDateTimeBox->set_visible( (CUSTOM_TYPE_DATE == nType) ||
(CUSTOM_TYPE_DATETIME == nType) );
- m_xDateField->set_visible( (CUSTOM_TYPE_DATE == nType) ||
(CUSTOM_TYPE_DATETIME == nType) );
- m_xTimeField->set_visible( CUSTOM_TYPE_DATETIME == nType );
- m_xDurationBox->set_visible( CUSTOM_TYPE_DURATION == nType );
- m_xDurationField->set_visible( CUSTOM_TYPE_DURATION == nType );
- m_xYesNoButton->set_visible( CUSTOM_TYPE_BOOLEAN == nType );
+ m_xValueEdit->set_visible( (Custom_Type_Text == nType) ||
(Custom_Type_Number == nType) );
+ m_xDateTimeBox->set_visible( (Custom_Type_Date == nType) ||
(Custom_Type_Datetime == nType) );
+ m_xDateField->set_visible( (Custom_Type_Date == nType) ||
(Custom_Type_Datetime == nType) );
+ m_xTimeField->set_visible( Custom_Type_Datetime == nType );
+ m_xDurationBox->set_visible( Custom_Type_Duration == nType );
+ m_xDurationField->set_visible( Custom_Type_Duration == nType );
+ m_xYesNoButton->set_visible( Custom_Type_Boolean == nType );
}
IMPL_LINK(CustomPropertyLine, TypeHdl, weld::ComboBox&, rBox, void)
@@ -1405,11 +1405,11 @@ bool CustomPropertiesWindow::IsLineValid(
CustomPropertyLine* pLine ) const
return true;
sal_uInt32 nIndex = NUMBERFORMAT_ENTRY_NOT_FOUND;
- if ( CUSTOM_TYPE_NUMBER == nType )
+ if ( Custom_Type_Number == nType )
// tdf#116214 Scientific format allows to use also standard numbers
nIndex = const_cast< SvNumberFormatter& >(
m_aNumberFormatter ).GetFormatIndex( NF_SCIENTIFIC_000E00 );
- else if ( CUSTOM_TYPE_DATE == nType )
+ else if ( Custom_Type_Date == nType )
nIndex = const_cast< SvNumberFormatter& >(
m_aNumberFormatter).GetFormatIndex( NF_DATE_SYS_DDMMYYYY );
@@ -1436,7 +1436,7 @@ void CustomPropertiesWindow::ValidateLine(
CustomPropertyLine* pLine, bool bIsFr
std::unique_ptr<weld::MessageDialog>
xMessageBox(Application::CreateMessageDialog(&m_rBody,
VclMessageType::Question, VclButtonsType::OkCancel,
SfxResId(STR_SFX_QUERY_WRONG_TYPE)));
if (xMessageBox->run() == RET_OK)
-
pLine->m_xTypeBox->set_active_id(OUString::number(CUSTOM_TYPE_TEXT));
+
pLine->m_xTypeBox->set_active_id(OUString::number(Custom_Type_Text));
else
pLine->m_xValueEdit->grab_focus();
}
@@ -1589,7 +1589,7 @@ void CustomPropertiesWindow::StoreCustomProperties()
{
m_aCustomProperties[nDataModelPos + i]->m_sName = sPropertyName;
auto nType = pLine->m_xTypeBox->get_active_id().toInt32();
- if (CUSTOM_TYPE_NUMBER == nType)
+ if (Custom_Type_Number == nType)
{
double nValue = 0;
sal_uInt32 nIndex =
m_aNumberFormatter.GetFormatIndex(NF_NUMBER_SYSTEM);
@@ -1598,12 +1598,12 @@ void CustomPropertiesWindow::StoreCustomProperties()
if (bIsNum)
m_aCustomProperties[nDataModelPos + i]->m_aValue <<=
nValue;
}
- else if (CUSTOM_TYPE_BOOLEAN == nType)
+ else if (Custom_Type_Boolean == nType)
{
bool bValue = pLine->m_xYesNoButton->IsYesChecked();
m_aCustomProperties[nDataModelPos + i]->m_aValue <<= bValue;
}
- else if (CUSTOM_TYPE_DATETIME == nType)
+ else if (Custom_Type_Datetime == nType)
{
Date aTmpDate = pLine->m_xDateField->get_date();
tools::Time aTmpTime = pLine->m_xTimeField->get_value();
@@ -1621,7 +1621,7 @@ void CustomPropertiesWindow::StoreCustomProperties()
m_aCustomProperties[nDataModelPos + i]->m_aValue <<=
aDateTime;
}
}
- else if (CUSTOM_TYPE_DATE == nType)
+ else if (Custom_Type_Date == nType)
{
Date aTmpDate = pLine->m_xDateField->get_date();
util::Date const aDate(aTmpDate.GetDay(), aTmpDate.GetMonth(),
@@ -1636,7 +1636,7 @@ void CustomPropertiesWindow::StoreCustomProperties()
m_aCustomProperties[nDataModelPos + i]->m_aValue <<= aDate;
}
}
- else if (CUSTOM_TYPE_DURATION == nType)
+ else if (Custom_Type_Duration == nType)
{
m_aCustomProperties[nDataModelPos + i]->m_aValue <<=
pLine->m_xDurationField->GetDuration();
}
@@ -1667,7 +1667,7 @@ void CustomPropertiesWindow::ReloadLinesContent()
util::Duration aTmpDuration;
SvtSysLocale aSysLocale;
const LocaleDataWrapper& rLocaleWrapper = aSysLocale.GetLocaleData();
- sal_IntPtr nType = CUSTOM_TYPE_UNKNOWN;
+ CustomProperties nType = Custom_Type_Unknown;
OUString sValue;
sal_uInt32 nDataModelPos = GetCurrentDataModelPosition();
@@ -1693,37 +1693,38 @@ void CustomPropertiesWindow::ReloadLinesContent()
sal_uInt32 nIndex =
m_aNumberFormatter.GetFormatIndex(NF_NUMBER_SYSTEM);
m_aNumberFormatter.GetInputLineString(nTmpValue, nIndex, sValue);
pLine->m_xValueEdit->set_text(sValue);
- nType = CUSTOM_TYPE_NUMBER;
+ nType = Custom_Type_Number;
}
else if (rAny >>= bTmpValue)
{
sValue = (bTmpValue ? rLocaleWrapper.getTrueWord() :
rLocaleWrapper.getFalseWord());
- nType = CUSTOM_TYPE_BOOLEAN;
+ nType = Custom_Type_Boolean;
}
else if (rAny >>= sTmpValue)
{
pLine->m_xValueEdit->set_text(sTmpValue);
- nType = CUSTOM_TYPE_TEXT;
+ nType = Custom_Type_Text;
}
else if (rAny >>= aTmpDate)
{
pLine->m_xDateField->set_date(Date(aTmpDate));
- nType = CUSTOM_TYPE_DATE;
+ nType = Custom_Type_Date;
}
else if (rAny >>= aTmpDateTime)
{
pLine->m_xDateField->set_date(Date(aTmpDateTime));
pLine->m_xTimeField->set_value(tools::Time(aTmpDateTime));
pLine->m_xTimeField->m_isUTC = aTmpDateTime.IsUTC;
- nType = CUSTOM_TYPE_DATETIME;
+ nType = Custom_Type_Datetime;
}
else if (rAny >>= aTmpDateTZ)
{
pLine->m_xDateField->set_date(Date(aTmpDateTZ.DateInTZ.Day,
aTmpDateTZ.DateInTZ.Month, aTmpDateTZ.DateInTZ.Year));
pLine->m_xDateField->m_TZ = aTmpDateTZ.Timezone;
- nType = CUSTOM_TYPE_DATE;
+ nType = Custom_Type_Date;
}
+
else if (rAny >>= aTmpDateTimeTZ)
{
util::DateTime const& rDT(aTmpDateTimeTZ.DateTimeInTZ);
@@ -1731,17 +1732,17 @@ void CustomPropertiesWindow::ReloadLinesContent()
pLine->m_xTimeField->set_value(tools::Time(rDT));
pLine->m_xTimeField->m_isUTC = rDT.IsUTC;
pLine->m_xDateField->m_TZ = aTmpDateTimeTZ.Timezone;
- nType = CUSTOM_TYPE_DATETIME;
+ nType = Custom_Type_Datetime;
}
else if (rAny >>= aTmpDuration)
{
- nType = CUSTOM_TYPE_DURATION;
+ nType = Custom_Type_Duration;
pLine->m_xDurationField->SetDuration(aTmpDuration);
}
- if (nType != CUSTOM_TYPE_UNKNOWN)
+ if (nType != Custom_Type_Duration)
{
- if (CUSTOM_TYPE_BOOLEAN == nType)
+ if (Custom_Type_Boolean == nType)
{
if (bTmpValue)
pLine->m_xYesNoButton->CheckYes();
