[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - distro-configs/CPWin32.conf distro-configs/CPWin32-MPL.conf sc/source

[Andras Timar]

 distro-configs/CPWin32-MPL.conf  |    1 -
 distro-configs/CPWin32.conf      |    1 -
 sc/source/core/data/dpobject.cxx |    4 +---
 3 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 1581e3e6a04fb8c1f367eaac802f1a2eb0dcad47
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sat Mar 31 23:58:58 2018 -0700

    remove obsoleted --enable-activex from configs
    
    Change-Id: Ifae3732df56e63c577cdcf19073c8cc3b9d2d1c5

diff --git a/distro-configs/CPWin32-MPL.conf b/distro-configs/CPWin32-MPL.conf
index 60cd5d9acd58..ae1a17aab9f6 100644
--- a/distro-configs/CPWin32-MPL.conf
+++ b/distro-configs/CPWin32-MPL.conf
@@ -8,7 +8,6 @@
 --without-junit
 --without-helppack-integration
 --enable-extension-integration
---enable-activex
 --disable-online-update
 --disable-odk
 --disable-gtk
diff --git a/distro-configs/CPWin32.conf b/distro-configs/CPWin32.conf
index d99422d9f511..834a3555917e 100644
--- a/distro-configs/CPWin32.conf
+++ b/distro-configs/CPWin32.conf
@@ -4,7 +4,6 @@
 --without-junit
 --without-helppack-integration
 --enable-extension-integration
---enable-activex
 --disable-online-update
 --disable-odk
 --disable-gtk
commit 9d581c9fa85a018f755b3711f4be6558e51f9032
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
    (cherry picked from commit e1131556a8485c10af8224e29dbecbfb5c608353)

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;
 }