Author: damjan
Date: Sun Mar 6 15:03:08 2016
New Revision: 1733807
URL: http://svn.apache.org/viewvc?rev=1733807&view=rev
Log:
Merge r1409500 from branches/gbuild:
remove annoying dependency of sfx2 on setup_native.
Build updates by: me
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/setup_native/prj/build.lst
openoffice/branches/gbuild-reintegration/main/setup_native/prj/d.lst
openoffice/branches/gbuild-reintegration/main/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
openoffice/branches/gbuild-reintegration/main/sfx2/inc/pch/precompiled_sfx2.hxx
openoffice/branches/gbuild-reintegration/main/sfx2/prj/build.lst
openoffice/branches/gbuild-reintegration/main/sfx2/source/appl/shutdowniconw32.cxx
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 6 15:03:08 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409495,1409499
+/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409500
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified:
openoffice/branches/gbuild-reintegration/main/setup_native/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/setup_native/prj/build.lst?rev=1733807&r1=1733806&r2=1733807&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/setup_native/prj/build.lst
(original)
+++ openoffice/branches/gbuild-reintegration/main/setup_native/prj/build.lst
Sun Mar 6 15:03:08 2016
@@ -1,4 +1,4 @@
-pk setup_native : L10N:l10n l10ntools soltools sal xml2cmp NULL
+pk setup_native : L10N:l10n l10ntools sfx2 soltools sal xml2cmp
NULL
pk setup_native usr1 - all
sn_mkout NULL
pk setup_native\scripts\source nmake - u
sn_source NULL
pk setup_native\scripts nmake - u
sn_scripts sn_source.u NULL
Modified: openoffice/branches/gbuild-reintegration/main/setup_native/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/setup_native/prj/d.lst?rev=1733807&r1=1733806&r2=1733807&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/setup_native/prj/d.lst
(original)
+++ openoffice/branches/gbuild-reintegration/main/setup_native/prj/d.lst Sun
Mar 6 15:03:08 2016
@@ -64,5 +64,3 @@ mkdir: %_DEST%\bin%_EXT%\osolsmf
..\%__SRC%\lib\getuid.so %_DEST%\bin%_EXT%\getuid.so
-..\inc\setup_native\qswin32.h %_DEST%\inc%_EXT%\setup_native\qswin32.h
-
Modified:
openoffice/branches/gbuild-reintegration/main/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx?rev=1733807&r1=1733806&r2=1733807&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
Sun Mar 6 15:03:08 2016
@@ -22,7 +22,7 @@
#include "quickstarter.hxx"
-#include <setup_native/qswin32.h>
+#include <sfx2/qswin32.h>
static BOOL CALLBACK EnumWindowsProc( HWND hWnd, LPARAM lParam )
{
Modified:
openoffice/branches/gbuild-reintegration/main/sfx2/inc/pch/precompiled_sfx2.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sfx2/inc/pch/precompiled_sfx2.hxx?rev=1733807&r1=1733806&r2=1733807&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/sfx2/inc/pch/precompiled_sfx2.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/sfx2/inc/pch/precompiled_sfx2.hxx
Sun Mar 6 15:03:08 2016
@@ -474,7 +474,6 @@
#include "rtl/ustring.hxx"
#include "sal/config.h"
#include "sal/types.h"
-#include "setup_native/qswin32.h"
#include "sot/clsids.hxx"
#include "sot/exchange.hxx"
#include "sot/factory.hxx"
Modified: openoffice/branches/gbuild-reintegration/main/sfx2/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sfx2/prj/build.lst?rev=1733807&r1=1733806&r2=1733807&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sfx2/prj/build.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/sfx2/prj/build.lst Sun Mar 6
15:03:08 2016
@@ -1,3 +1,3 @@
-sf sfx2 : L10N:l10n idl basic xmlscript framework readlicense_oo
shell setup_native sax LIBXML2:libxml2 LIBXSLT:libxslt NULL
+sf sfx2 : L10N:l10n idl basic xmlscript framework readlicense_oo
shell sax LIBXML2:libxml2 LIBXSLT:libxslt NULL
sf sfx2\prj
nmake - all sf_prj NULL
Modified:
openoffice/branches/gbuild-reintegration/main/sfx2/source/appl/shutdowniconw32.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sfx2/source/appl/shutdowniconw32.cxx?rev=1733807&r1=1733806&r2=1733807&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/sfx2/source/appl/shutdowniconw32.cxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/sfx2/source/appl/shutdowniconw32.cxx
Sun Mar 6 15:03:08 2016
@@ -49,7 +49,7 @@
#include <stdio.h>
#include <io.h>
#include <osl/thread.h>
-#include <setup_native/qswin32.h>
+#include <sfx2/qswin32.h>
#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/uno/Reference.h>
