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

[Andras Timar]

 distro-configs/CPWin32-MPL.conf                 |   32 ++++++++++++++++++++++++
 ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx   |    2 -
 ucb/source/ucp/webdav/SerfUnlockReqProcImpl.hxx |    2 -
 3 files changed, 34 insertions(+), 2 deletions(-)

New commits:
commit b570bcb28c0f34e5f3d3f5213ec017143551ce01
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Feb 20 12:14:13 2015 -0800

    LOfC MPL-only config
    
    Change-Id: Ib680097315e59b1c31ba75352619f33151e176c2

diff --git a/distro-configs/CPWin32-MPL.conf b/distro-configs/CPWin32-MPL.conf
new file mode 100644
index 0000000..4420244
--- /dev/null
+++ b/distro-configs/CPWin32-MPL.conf
@@ -0,0 +1,32 @@
+--enable-mpl-subset
+--with-vendor=Collabora
+--with-branding=icon-themes/galaxy/brand_cp
+--with-theme=tango
+--without-help
+--with-myspell-dicts
+--without-system-mesa-headers
+--without-system-postgresql
+--without-junit
+--without-helppack-integration
+--enable-extension-integration
+--enable-activex
+--disable-online-update
+--disable-odk
+--disable-gtk
+--enable-ext-wiki-publisher
+--disable-report-builder
+--disable-ext-nlpsolver
+--disable-ext-numbertext
+--disable-ext-ct2n
+--disable-ext-languagetool
+--disable-postgresql-sdbc
+--disable-lotuswordpro
+--disable-lpsolve
+--with-webdav=serf
+--enable-release-build
+--enable-win-mozab-driver
+--with-package-format=msi
+--with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW
+--enable-windows-build-signing
+--without-java
+--disable-pdfimport
commit 481e20cfb961cd34ea68bb29a46897f611c0ced7
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Apr 18 04:33:39 2014 -0700

    webdav serf: remove SAL_OVERRIDE from destructors
    
    Change-Id: Id55b972dda34623eeb3e046a70757277377d3871

diff --git a/ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx
index 275e5e9..4df88af 100644
--- a/ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx
+++ b/ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx
@@ -40,7 +40,7 @@ public:
                          const css::ucb::Lock& rLock,
                          sal_Int32* plastChanceToSendRefreshRequest = 0 );
 
-    virtual ~SerfLockReqProcImpl() SAL_OVERRIDE;
+    virtual ~SerfLockReqProcImpl();
 
     virtual
     serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) SAL_OVERRIDE;
diff --git a/ucb/source/ucp/webdav/SerfUnlockReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfUnlockReqProcImpl.hxx
index a6e9115..5758839 100644
--- a/ucb/source/ucp/webdav/SerfUnlockReqProcImpl.hxx
+++ b/ucb/source/ucp/webdav/SerfUnlockReqProcImpl.hxx
@@ -32,7 +32,7 @@ public:
                            const DAVRequestHeaders& inRequestHeaders,
                            const OUString& sToken);
 
-    virtual ~SerfUnlockReqProcImpl() SAL_OVERRIDE;
+    virtual ~SerfUnlockReqProcImpl();
 
     virtual serf_bucket_t *createSerfRequestBucket(
             serf_request_t * inSerfRequest ) SAL_OVERRIDE;