sc/source/ui/unoobj/celllistsource.cxx | 6 +++---
sc/source/ui/unoobj/cellvaluebinding.cxx | 4 ++--
sc/source/ui/vba/vbarange.cxx | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 8a73799d12f0d2dc04890b96bd0adf0ffcf50d17
Author: Jens Carl <j.car...@gmx.de>
Date: Wed Jan 24 02:10:35 2018 +0000
Change property value to get CellContentType in sc/
Change the name of property value to get the CellContentType and
rename variables to reflect change of the meaning. Follow up from
commit cceaece18a42405190941865908636522e0ee4cb.
Change-Id: I35c58174cef8ab44bd37b37fd18876ef912e16be
Reviewed-on: https://gerrit.libreoffice.org/48476
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Jens Carl <j.car...@gmx.de>
diff --git a/sc/source/ui/unoobj/celllistsource.cxx
b/sc/source/ui/unoobj/celllistsource.cxx
index 6d3cdc49c5c9..5cbe67624f3a 100644
--- a/sc/source/ui/unoobj/celllistsource.cxx
+++ b/sc/source/ui/unoobj/celllistsource.cxx
@@ -200,9 +200,9 @@ namespace calc
Reference< XPropertySet > xProp( xCell, UNO_QUERY);
if (xProp.is())
{
- CellContentType eResultType;
- if ((xProp->getPropertyValue("FormulaResultType")
>>= eResultType) &&
- eResultType == CellContentType_VALUE)
+ CellContentType eContentType;
+ if ((xProp->getPropertyValue("CellContentType")
>>= eContentType) &&
+ eContentType == CellContentType_VALUE)
*pAny <<= xCell->getValue();
else
*pAny <<= sText;
diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx
b/sc/source/ui/unoobj/cellvaluebinding.cxx
index 29cb35a199a5..65aae5c2c4c4 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.cxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.cxx
@@ -203,8 +203,8 @@ namespace calc
Reference<XPropertySet> xProp( m_xCell, UNO_QUERY );
if ( xProp.is() )
{
- CellContentType eResultType;
- if ( (xProp->getPropertyValue("FormulaResultType")
>>= eResultType) && eResultType == CellContentType_VALUE )
+ CellContentType eContentType;
+ if ( (xProp->getPropertyValue("CellContentType")
>>= eContentType) && eContentType == CellContentType_VALUE )
bHasValue = true;
}
}
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 21ac5d79635f..24de46dba614 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -825,11 +825,11 @@ void CellValueGetter::visitNode( sal_Int32 x, sal_Int32
y, const uno::Reference<
{
uno::Reference< beans::XPropertySet > xProp( xCell,
uno::UNO_QUERY_THROW );
- table::CellContentType eFormulaType =
table::CellContentType_VALUE;
+ table::CellContentType eContentType =
table::CellContentType_VALUE;
// some formulas give textual results
- xProp->getPropertyValue( "FormulaResultType" ) >>=
eFormulaType;
+ xProp->getPropertyValue( "CellContentType" ) >>= eContentType;
- if ( eFormulaType == table::CellContentType_TEXT )
+ if ( eContentType == table::CellContentType_TEXT )
{
uno::Reference< text::XTextRange > xTextRange(xCell,
::uno::UNO_QUERY_THROW);
aValue <<= xTextRange->getString();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
