[Libreoffice-commits] core.git: sc/source

Stephan Bergmann sbergman at redhat.com
Wed Nov 29 12:48:52 UTC 2017


 sc/source/core/data/dpobject.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit e1131556a8485c10af8224e29dbecbfb5c608353
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 29 13:47:44 2017 +0100

    Avoid ambiguities
    
    ...when sc/source/ui/inc/tabvwsh.hxx happens to be also (indirectly) included
    (as happens with Windows --enable-pch?)
    
    Change-Id: I252af03524c0d8f354a2f64a2073c2b085b3cedc

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index f86a608b156e..8486df51d431 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1308,8 +1308,6 @@ long ScDPObject::GetDimCount()
 
 void ScDPObject::GetHeaderPositionData(const ScAddress& rPos, DataPilotTableHeaderData& rData)
 {
-    using namespace ::com::sun::star::sheet::DataPilotTablePositionType;
-
     CreateOutput();             // create xSource and pOutput if not already done
 
     // Reset member values to invalid state.
@@ -1319,7 +1317,7 @@ void ScDPObject::GetHeaderPositionData(const ScAddress& rPos, DataPilotTableHead
     DataPilotTablePositionData aPosData;
     pOutput->GetPositionData(rPos, aPosData);
     const sal_Int32 nPosType = aPosData.PositionType;
-    if (nPosType == COLUMN_HEADER || nPosType == ROW_HEADER)
+    if (nPosType == css::sheet::DataPilotTablePositionType::COLUMN_HEADER || nPosType == css::sheet::DataPilotTablePositionType::ROW_HEADER)
         aPosData.PositionData >>= rData;
 }
 


More information about the Libreoffice-commits mailing list