[Libreoffice-commits] core.git: sc/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Tue Aug 11 10:06:40 UTC 2020
sc/source/filter/xml/XMLStylesExportHelper.cxx | 36 ++++++++++++-------------
sc/source/filter/xml/XMLStylesExportHelper.hxx | 6 ++--
sc/source/filter/xml/xmlcelli.cxx | 4 +-
sc/source/filter/xml/xmlcvali.cxx | 6 ++--
sc/source/filter/xml/xmlimprt.hxx | 6 ++--
5 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit 43151592e89c26b451de4ecdfd71b3be385052d7
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Aug 11 11:02:06 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Aug 11 12:05:51 2020 +0200
Imput -> Input
Change-Id: I957448ecef97738c917b5691fc9f844041fa578c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100467
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index b21f2dea976e..202c9bd37f60 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -44,8 +44,8 @@ ScMyValidation::ScMyValidation()
: sName(),
sErrorMessage(),
sErrorTitle(),
- sImputMessage(),
- sImputTitle(),
+ sInputMessage(),
+ sInputTitle(),
sFormula1(),
sFormula2(),
aAlertStyle(sheet::ValidationAlertStyle_STOP),
@@ -53,7 +53,7 @@ ScMyValidation::ScMyValidation()
aOperator(sheet::ConditionOperator_NONE),
nShowList(0),
bShowErrorMessage(false),
- bShowImputMessage(false),
+ bShowInputMessage(false),
bIgnoreBlanks(false)
{
}
@@ -61,16 +61,16 @@ ScMyValidation::ScMyValidation()
bool ScMyValidation::IsEqual(const ScMyValidation& aVal) const
{
return aVal.bIgnoreBlanks == bIgnoreBlanks &&
- aVal.bShowImputMessage == bShowImputMessage &&
+ aVal.bShowInputMessage == bShowInputMessage &&
aVal.bShowErrorMessage == bShowErrorMessage &&
aVal.aBaseCell == aBaseCell &&
aVal.aAlertStyle == aAlertStyle &&
aVal.aValidationType == aValidationType &&
aVal.aOperator == aOperator &&
aVal.sErrorTitle == sErrorTitle &&
- aVal.sImputTitle == sImputTitle &&
+ aVal.sInputTitle == sInputTitle &&
aVal.sErrorMessage == sErrorMessage &&
- aVal.sImputMessage == sImputMessage &&
+ aVal.sInputMessage == sInputMessage &&
aVal.sFormula1 == sFormula1 &&
aVal.sFormula2 == sFormula2;
}
@@ -106,25 +106,25 @@ void ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny,
xPropertySet->getPropertyValue(gsERRMESS) >>= sErrorMessage;
OUString sErrorTitle;
xPropertySet->getPropertyValue(gsERRTITLE) >>= sErrorTitle;
- OUString sImputMessage;
- xPropertySet->getPropertyValue(gsINPMESS) >>= sImputMessage;
- OUString sImputTitle;
- xPropertySet->getPropertyValue(gsINPTITLE) >>= sImputTitle;
+ OUString sInputMessage;
+ xPropertySet->getPropertyValue(gsINPMESS) >>= sInputMessage;
+ OUString sInputTitle;
+ xPropertySet->getPropertyValue(gsINPTITLE) >>= sInputTitle;
bool bShowErrorMessage = ::cppu::any2bool(xPropertySet->getPropertyValue(gsSHOWERR));
- bool bShowImputMessage = ::cppu::any2bool(xPropertySet->getPropertyValue(gsSHOWINP));
+ bool bShowInputMessage = ::cppu::any2bool(xPropertySet->getPropertyValue(gsSHOWINP));
sheet::ValidationType aValidationType;
xPropertySet->getPropertyValue(gsTYPE) >>= aValidationType;
- if (!(bShowErrorMessage || bShowImputMessage || aValidationType != sheet::ValidationType_ANY ||
- !sErrorMessage.isEmpty() || !sErrorTitle.isEmpty() || !sImputMessage.isEmpty() || !sImputTitle.isEmpty()))
+ if (!(bShowErrorMessage || bShowInputMessage || aValidationType != sheet::ValidationType_ANY ||
+ !sErrorMessage.isEmpty() || !sErrorTitle.isEmpty() || !sInputMessage.isEmpty() || !sInputTitle.isEmpty()))
return;
ScMyValidation aValidation;
aValidation.sErrorMessage = sErrorMessage;
aValidation.sErrorTitle = sErrorTitle;
- aValidation.sImputMessage = sImputMessage;
- aValidation.sImputTitle = sImputTitle;
+ aValidation.sInputMessage = sInputMessage;
+ aValidation.sInputTitle = sInputTitle;
aValidation.bShowErrorMessage = bShowErrorMessage;
- aValidation.bShowImputMessage = bShowImputMessage;
+ aValidation.bShowInputMessage = bShowInputMessage;
aValidation.aValidationType = aValidationType;
aValidation.bIgnoreBlanks = ::cppu::any2bool(xPropertySet->getPropertyValue(gsIGNOREBL));
xPropertySet->getPropertyValue(gsSHOWLIST) >>= aValidation.nShowList;
@@ -360,9 +360,9 @@ void ScMyValidationsContainer::WriteValidations(ScXMLExport& rExport)
}
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, GetBaseCellAddress(rExport.GetDocument(), rValidation.aBaseCell));
SvXMLElementExport aElemV(rExport, XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, true, true);
- if (rValidation.bShowImputMessage || !rValidation.sImputMessage.isEmpty() || !rValidation.sImputTitle.isEmpty())
+ if (rValidation.bShowInputMessage || !rValidation.sInputMessage.isEmpty() || !rValidation.sInputTitle.isEmpty())
{
- WriteMessage(rExport, rValidation.sImputTitle, rValidation.sImputMessage, rValidation.bShowImputMessage, true);
+ WriteMessage(rExport, rValidation.sInputTitle, rValidation.sInputMessage, rValidation.bShowInputMessage, true);
}
if (rValidation.bShowErrorMessage || !rValidation.sErrorMessage.isEmpty() || !rValidation.sErrorTitle.isEmpty())
{
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx
index 40cca729b4f5..9aafa2441c6a 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx
@@ -40,8 +40,8 @@ struct ScMyValidation
OUString sName;
OUString sErrorMessage;
OUString sErrorTitle;
- OUString sImputMessage;
- OUString sImputTitle;
+ OUString sInputMessage;
+ OUString sInputTitle;
OUString sFormula1;
OUString sFormula2;
ScAddress aBaseCell;
@@ -50,7 +50,7 @@ struct ScMyValidation
css::sheet::ConditionOperator aOperator;
sal_Int16 nShowList;
bool bShowErrorMessage;
- bool bShowImputMessage;
+ bool bShowInputMessage;
bool bIgnoreBlanks;
ScMyValidation();
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 590db3a8224c..5f129907bf5b 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -801,8 +801,8 @@ void ScXMLTableRowCellContext::SetContentValidation( const ScRange& rScRange )
aScValidationData.SetListType( aValidation.nShowList );
// set strings for error / input even if disabled (and disable afterwards)
- aScValidationData.SetInput( aValidation.sImputTitle, aValidation.sImputMessage );
- if( !aValidation.bShowImputMessage )
+ aScValidationData.SetInput( aValidation.sInputTitle, aValidation.sInputMessage );
+ if( !aValidation.bShowInputMessage )
aScValidationData.ResetInput();
aScValidationData.SetError( aValidation.sErrorTitle, aValidation.sErrorMessage, validAlertToValidError(aValidation.aAlertStyle) );
if( !aValidation.bShowErrorMessage )
diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx
index 2be3f74c1be7..1ecb05a33188 100644
--- a/sc/source/filter/xml/xmlcvali.cxx
+++ b/sc/source/filter/xml/xmlcvali.cxx
@@ -374,14 +374,14 @@ void SAL_CALL ScXMLContentValidationContext::endFastElement( sal_Int32 /*nElemen
aValidation.eGrammar1 = aValidation.eGrammar2 = GetScImport().GetDocument()->GetStorageGrammar();
aValidation.sName = sName;
aValidation.sBaseCellAddress = sBaseCellAddress;
- aValidation.sImputTitle = sHelpTitle;
- aValidation.sImputMessage = sHelpMessage;
+ aValidation.sInputTitle = sHelpTitle;
+ aValidation.sInputMessage = sHelpMessage;
aValidation.sErrorTitle = sErrorTitle;
aValidation.sErrorMessage = sErrorMessage;
GetCondition( aValidation );
aValidation.aAlertStyle = GetAlertStyle();
aValidation.bShowErrorMessage = bDisplayError;
- aValidation.bShowImputMessage = bDisplayHelp;
+ aValidation.bShowInputMessage = bDisplayHelp;
aValidation.bIgnoreBlanks = bAllowEmptyCell;
aValidation.nShowList = nShowList;
GetScImport().AddValidation(aValidation);
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 56a3386d914d..0a5d2e7f815d 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -170,8 +170,8 @@ typedef std::list< std::unique_ptr<const ScMyLabelRange> > ScMyLabelRanges;
struct ScMyImportValidation
{
OUString sName;
- OUString sImputTitle;
- OUString sImputMessage;
+ OUString sInputTitle;
+ OUString sInputMessage;
OUString sErrorTitle;
OUString sErrorMessage;
OUString sFormula1;
@@ -186,7 +186,7 @@ struct ScMyImportValidation
formula::FormulaGrammar::Grammar eGrammar2;
sal_Int16 nShowList;
bool bShowErrorMessage;
- bool bShowImputMessage;
+ bool bShowInputMessage;
bool bIgnoreBlanks;
};
More information about the Libreoffice-commits
mailing list