sc/source/core/data/dpoutput.cxx | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
New commits: commit a524a5b0ef7b7ab19e39d74fba268a825e5fa87c Author: Tomaž Vajngerl <[email protected]> AuthorDate: Sun Nov 16 22:55:19 2025 +0900 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Mon Nov 17 14:53:51 2025 +0100 sc: remove using statements for UNO tapes in ScDPOutput Change-Id: I4797e6b5b012d13c25de69600b2420f7aa2bcad7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194088 Reviewed-by: Tomaž Vajngerl <[email protected]> Tested-by: Jenkins diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index 4cdf3d6f834f..3db976df0e52 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -71,12 +71,6 @@ #include <iostream> using namespace com::sun::star; -using ::com::sun::star::beans::XPropertySet; -using ::com::sun::star::uno::Sequence; -using ::com::sun::star::uno::UNO_QUERY; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::sheet::DataPilotTablePositionData; -using ::com::sun::star::sheet::DataPilotTableResultData; #define SC_DP_FRAME_INNER_BOLD 20 #define SC_DP_FRAME_OUTER_BOLD 40 @@ -444,7 +438,7 @@ uno::Sequence<sheet::MemberResult> getVisiblePageMembersAsResults( const uno::Re if (!xLevel.is()) return uno::Sequence<sheet::MemberResult>(); - uno::Reference<sheet::XMembersSupplier> xMSupplier(xLevel, UNO_QUERY); + uno::Reference<sheet::XMembersSupplier> xMSupplier(xLevel, uno::UNO_QUERY); if (!xMSupplier.is()) return uno::Sequence<sheet::MemberResult>(); @@ -458,7 +452,7 @@ uno::Sequence<sheet::MemberResult> getVisiblePageMembersAsResults( const uno::Re { xNA->getByName(rName); - uno::Reference<beans::XPropertySet> xMemPS(xNA->getByName(rName), UNO_QUERY); + uno::Reference<beans::XPropertySet> xMemPS(xNA->getByName(rName), uno::UNO_QUERY); if (!xMemPS.is()) continue; @@ -564,7 +558,7 @@ ScDPOutput::ScDPOutput(ScDocument* pDocument, uno::Reference<sheet::XDimensionsS if ( xLevNam.is() && xLevRes.is() ) { OUString aName = xLevNam->getName(); - Reference<XPropertySet> xPropSet(xLevel, UNO_QUERY); + uno::Reference<beans::XPropertySet> xPropSet(xLevel, uno::UNO_QUERY); // Caption equals the field name by default. // #i108948# use ScUnoHelpFunctions::GetStringProperty, because // LayoutName is new and may not be present in external implementation @@ -1488,7 +1482,7 @@ sal_Int32 ScDPOutput::GetRowFieldCompact(SCCOL nColQuery, SCROW nRowQuery) const return -1; } -void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionData& rPosData) +void ScDPOutput::GetPositionData(const ScAddress& rPos, sheet::DataPilotTablePositionData& rPosData) { using namespace ::com::sun::star::sheet; @@ -1510,10 +1504,10 @@ void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionDa std::vector<DataPilotFieldFilter> aFilters; GetDataResultPositionData(aFilters, rPos); - DataPilotTableResultData aResData; + sheet::DataPilotTableResultData aResData; aResData.FieldFilters = comphelper::containerToSequence(aFilters); aResData.DataFieldIndex = 0; - Reference<beans::XPropertySet> xPropSet(mxSource, UNO_QUERY); + uno::Reference<beans::XPropertySet> xPropSet(mxSource, uno::UNO_QUERY); if (xPropSet.is()) { sal_Int32 nDataFieldCount = ScUnoHelpFunctions::GetLongProperty( xPropSet, @@ -1598,7 +1592,7 @@ void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionDa bool ScDPOutput::GetDataResultPositionData(std::vector<sheet::DataPilotFieldFilter>& rFilters, const ScAddress& rPos) { // Check to make sure there is at least one data field. - Reference<beans::XPropertySet> xPropSet(mxSource, UNO_QUERY); + uno::Reference<beans::XPropertySet> xPropSet(mxSource, uno::UNO_QUERY); if (!xPropSet.is()) return false;
