[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sc/inc sc/Library_scfilt.mk sc/Library_scui.mk sc/Library_vbaobj.mk sc/source

Damjan Jovanovic damjan at apache.org
Mon Jan 16 16:09:06 UTC 2017 

 sc/Library_scfilt.mk                     |    4 ----
 sc/Library_scui.mk                       |    4 ----
 sc/Library_vbaobj.mk                     |    5 +----
 sc/inc/pch/precompiled_scfilt.hxx        |    3 +++
 sc/source/filter/excel/xiescher.cxx      |    2 +-
 sc/source/ui/attrdlg/attrdlg.cxx         |    2 --
 sc/source/ui/attrdlg/scdlgfact.cxx       |    1 -
 sc/source/ui/attrdlg/scuiexp.cxx         |    1 -
 sc/source/ui/attrdlg/tabpages.cxx        |    1 -
 sc/source/ui/cctrl/editfield.cxx         |    3 ---
 sc/source/ui/dbgui/dapidata.cxx          |    1 -
 sc/source/ui/dbgui/dapitype.cxx          |    1 -
 sc/source/ui/dbgui/dpgroupdlg.cxx        |    3 ---
 sc/source/ui/dbgui/pfiltdlg.cxx          |    1 -
 sc/source/ui/dbgui/pvfundlg.cxx          |    1 -
 sc/source/ui/dbgui/scendlg.cxx           |    1 -
 sc/source/ui/dbgui/scuiasciiopt.cxx      |    1 -
 sc/source/ui/dbgui/scuiimoptdlg.cxx      |    1 -
 sc/source/ui/dbgui/sortdlg.cxx           |    1 -
 sc/source/ui/dbgui/subtdlg.cxx           |    1 -
 sc/source/ui/dbgui/textimportoptions.cxx |    1 -
 sc/source/ui/dbgui/tpsort.cxx            |    1 -
 sc/source/ui/dbgui/tpsubt.cxx            |    1 -
 sc/source/ui/dbgui/validate.cxx          |    3 ---
 sc/source/ui/docshell/tpstat.cxx         |    1 -
 sc/source/ui/miscdlgs/crdlg.cxx          |    3 +--
 sc/source/ui/miscdlgs/delcldlg.cxx       |    1 -
 sc/source/ui/miscdlgs/delcodlg.cxx       |    1 -
 sc/source/ui/miscdlgs/filldlg.cxx        |    1 -
 sc/source/ui/miscdlgs/groupdlg.cxx       |    1 -
 sc/source/ui/miscdlgs/inscldlg.cxx       |    1 -
 sc/source/ui/miscdlgs/inscodlg.cxx       |    1 -
 sc/source/ui/miscdlgs/instbdlg.cxx       |    1 -
 sc/source/ui/miscdlgs/lbseldlg.cxx       |    1 -
 sc/source/ui/miscdlgs/linkarea.cxx       |    1 -
 sc/source/ui/miscdlgs/mtrindlg.cxx       |    1 -
 sc/source/ui/miscdlgs/mvtabdlg.cxx       |    1 -
 sc/source/ui/miscdlgs/namecrea.cxx       |    1 -
 sc/source/ui/miscdlgs/namepast.cxx       |    1 -
 sc/source/ui/miscdlgs/scuiautofmt.cxx    |    1 -
 sc/source/ui/miscdlgs/shtabdlg.cxx       |    1 -
 sc/source/ui/miscdlgs/strindlg.cxx       |    1 -
 sc/source/ui/miscdlgs/tabbgcolordlg.cxx  |    1 -
 sc/source/ui/miscdlgs/textdlgs.cxx       |    1 -
 sc/source/ui/optdlg/opredlin.cxx         |    1 -
 sc/source/ui/optdlg/tpcalc.cxx           |    1 -
 sc/source/ui/optdlg/tpprint.cxx          |    1 -
 sc/source/ui/optdlg/tpusrlst.cxx         |    1 -
 sc/source/ui/optdlg/tpview.cxx           |    1 -
 sc/source/ui/pagedlg/hfedtdlg.cxx        |    1 -
 sc/source/ui/pagedlg/scuitphfedit.cxx    |    1 -
 sc/source/ui/pagedlg/tphf.cxx            |    1 -
 sc/source/ui/pagedlg/tptable.cxx         |    1 -
 sc/source/ui/styleui/styledlg.cxx        |    1 -
 54 files changed, 6 insertions(+), 70 deletions(-)

New commits:
commit b1870b5253d796fc2adaec0a863356e014d70423
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Mon Jan 16 05:04:34 2017 +0000

    Build fixes for vbaobj on Windows.
    
    Don't use SC_DLLIMPLEMENTATION, and link to sot.
    With this, main/sc finally builds on Windows.
    
    Patch by: me

diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 0049ab9..287ff8d 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -34,10 +34,6 @@ $(eval $(call gb_Library_set_include,vbaobj,\
 	-I$(SRCDIR)/sc/source/filter/inc \
 ))
 
-$(eval $(call gb_Library_add_defs,vbaobj,\
-	-DSC_DLLIMPLEMENTATION \
-))
-
 $(eval $(call gb_Library_add_api,vbaobj,\
 	offapi \
 	oovbaapi \
@@ -56,6 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,vbaobj,\
 	sb \
 	sc \
 	sfx \
+	sot \
 	stl \
 	svl \
 	svt \
commit d3ecadc0670334f1b09f7d9f03e896ff365a3255
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Mon Jan 16 03:02:57 2017 +0000

    Fix symbol visibility problems with main/sc modules.
    
    SC_DLLIMPLEMENTATION must only be defined for sc itself, not for scui or
    scfilt, as that stops them from importing sc's symbols.
    
    Should fix building main/sc on Windows.
    
    Patch by: me

diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index de82e71..b2a0804 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -34,10 +34,6 @@ $(eval $(call gb_Library_set_include,scfilt,\
 	-I$(SRCDIR)/sc/source/filter/inc \
 ))
 
-$(eval $(call gb_Library_add_defs,scfilt,\
-	-DSC_DLLIMPLEMENTATION \
-))
-
 $(eval $(call gb_Library_add_api,scfilt,\
 	offapi \
 	udkapi \
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index 4a18c82..c0ea6d2 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -34,10 +34,6 @@ $(eval $(call gb_Library_set_include,scui,\
 	-I$(SRCDIR)/sc/source/filter/inc \
 ))
 
-$(eval $(call gb_Library_add_defs,scui,\
-	-DSC_DLLIMPLEMENTATION \
-))
-
 $(eval $(call gb_Library_add_api,scui,\
 	offapi \
 	udkapi \
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index bc845d7..306e970 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -24,8 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
-
 
 
 #include "scitems.hxx"
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index af852d8..9b85630 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -28,7 +28,6 @@
 #undef ENABLE_LAYOUT
 #endif
 
-#undef SC_DLLIMPLEMENTATION
 
 #include "scdlgfact.hxx"
 
diff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxx
index 22967e9..c176cdf 100644
--- a/sc/source/ui/attrdlg/scuiexp.cxx
+++ b/sc/source/ui/attrdlg/scuiexp.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 #include "scdlgfact.hxx"
 #include "sal/types.h"
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index 1a30385..48e29f81 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx
index d277857..064f427 100644
--- a/sc/source/ui/cctrl/editfield.cxx
+++ b/sc/source/ui/cctrl/editfield.cxx
@@ -24,9 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#ifdef SC_DLLIMPLEMENTATION
-#undef SC_DLLIMPLEMENTATION
-#endif
 #include "editfield.hxx"
 #include <rtl/math.hxx>
 #include <unotools/localedatawrapper.hxx>
diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index 76b4c92..88e5bbc 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index 38d6a57..f91ab96 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx
index 395f645..1827b81 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -24,9 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#ifdef SC_DLLIMPLEMENTATION
-#undef SC_DLLIMPLEMENTATION
-#endif
 
 
 #include "dpgroupdlg.hxx"
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 8c29c78..2afd322 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 07bf9a2..e3e68a3 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 #include "pvfundlg.hxx"
 
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index 98b6cd6..4d1e7db 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 1cf4472..2b18d79 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 #include "global.hxx"
 #include "scresid.hxx"
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 495f5a7..8d35af6 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index 051c820..a1d251d 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 #include <vcl/msgbox.hxx>
diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx
index e173bcb..4c25a20 100644
--- a/sc/source/ui/dbgui/subtdlg.cxx
+++ b/sc/source/ui/dbgui/subtdlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx
index e2ab7a1..d743570 100644
--- a/sc/source/ui/dbgui/textimportoptions.cxx
+++ b/sc/source/ui/dbgui/textimportoptions.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 //------------------------------------------------------------------------
 
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index ef1eb43..62833ba 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 949f0d4..4cf1e9b 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index f66cd07..e2cf2d5 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -24,9 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#ifdef SC_DLLIMPLEMENTATION
-#undef SC_DLLIMPLEMENTATION
-#endif
 
 #include <vcl/svapp.hxx>
 #include <svl/aeitem.hxx>
diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx
index aeb1321..ecadd84 100644
--- a/sc/source/ui/docshell/tpstat.cxx
+++ b/sc/source/ui/docshell/tpstat.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx
index 474fcda..436d5c6 100644
--- a/sc/source/ui/miscdlgs/crdlg.cxx
+++ b/sc/source/ui/miscdlgs/crdlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx
index d7b50d2..f585183 100644
--- a/sc/source/ui/miscdlgs/delcldlg.cxx
+++ b/sc/source/ui/miscdlgs/delcldlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx
index 607088f..4045b0a 100644
--- a/sc/source/ui/miscdlgs/delcodlg.cxx
+++ b/sc/source/ui/miscdlgs/delcodlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index 9f49cdd..5ca8a16 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx
index 8f7aec7..c75f67d 100644
--- a/sc/source/ui/miscdlgs/groupdlg.cxx
+++ b/sc/source/ui/miscdlgs/groupdlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx
index 5a79332..c26ff45 100644
--- a/sc/source/ui/miscdlgs/inscldlg.cxx
+++ b/sc/source/ui/miscdlgs/inscldlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx
index 5f6d15c..18406c1 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index a11ce20..f4f2e74 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx
index 0c7bdc9..e931cef 100644
--- a/sc/source/ui/miscdlgs/lbseldlg.cxx
+++ b/sc/source/ui/miscdlgs/lbseldlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx
index 131910d..667a76d 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx
index 356bdb6..6adbcbc 100644
--- a/sc/source/ui/miscdlgs/mtrindlg.cxx
+++ b/sc/source/ui/miscdlgs/mtrindlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index 819ad1e..50385f1 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/miscdlgs/namecrea.cxx b/sc/source/ui/miscdlgs/namecrea.cxx
index d2392d2..a23d5d5 100644
--- a/sc/source/ui/miscdlgs/namecrea.cxx
+++ b/sc/source/ui/miscdlgs/namecrea.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/miscdlgs/namepast.cxx b/sc/source/ui/miscdlgs/namepast.cxx
index 21c06760..b99ca70 100644
--- a/sc/source/ui/miscdlgs/namepast.cxx
+++ b/sc/source/ui/miscdlgs/namepast.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index 55e2cf5..137f603 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx
index dbebab0..2212e3f 100644
--- a/sc/source/ui/miscdlgs/shtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/shtabdlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx
index ac7d623..34d6ddf 100644
--- a/sc/source/ui/miscdlgs/strindlg.cxx
+++ b/sc/source/ui/miscdlgs/strindlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index f8deb3e..56960b2 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 //------------------------------------------------------------------
 
diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx
index 8c79933..0978031 100644
--- a/sc/source/ui/miscdlgs/textdlgs.cxx
+++ b/sc/source/ui/miscdlgs/textdlgs.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 //      ohne precompiled Headers uebersetzen !!!
 
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index b5e543f..65ba297 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 01e57d2..6351b82 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx
index 7f5904d..266bbd7 100644
--- a/sc/source/ui/optdlg/tpprint.cxx
+++ b/sc/source/ui/optdlg/tpprint.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 #include <svl/eitem.hxx>
 
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 2f0184e..9a21d2d 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index dfb1a09..8a7726b 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx
index 098e72b..64530ad 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index d1464c2..5331542 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index badc105..4c87b3c 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index f83269f..2d0da15 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx
index a7886ff..8a5dd30 100644
--- a/sc/source/ui/styleui/styledlg.cxx
+++ b/sc/source/ui/styleui/styledlg.cxx
@@ -24,7 +24,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scui.hxx"
 
-#undef SC_DLLIMPLEMENTATION
 
 
 
commit 3bfb9cabc8a248e4b93be0ce6ecff0771ea1e692
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Sun Jan 15 14:36:31 2017 +0000

    Fix some initial main/sc build issues on Windows caused by the
    
    port to gbuild.
    
    Note that it still doesn't build on Windows. Work is ongoing.
    
    Patch by: me

diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx
index 3ac930f..1dcd993 100644
--- a/sc/inc/pch/precompiled_scfilt.hxx
+++ b/sc/inc/pch/precompiled_scfilt.hxx
@@ -137,11 +137,13 @@
 #include <osl/interlck.h>
 #include <osl/mutex.hxx>
 #include <rtl/alloc.h>
+#include <rtl/random.h>
 #include <rtl/string.h>
 #include <rtl/ustrbuf.h>
 #include <rtl/ustring.h>
 #include <sal/mathconf.h>
 #include <sal/types.h>
+#include <sax/fshelper.hxx>
 #include <sot/exchange.hxx>
 #include <sot/factory.hxx>
 #include <sot/storage.hxx>
@@ -205,6 +207,7 @@
 #include <uno/any2.h>
 #include <uno/lbnames.h>
 #include <uno/sequence2.h>
+#include <unotools/streamwrap.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 
 #include <vcl/apptypes.hxx>
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 1941807..23fa6dd 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sc.hxx"
+#include "precompiled_scfilt.hxx"
 
 #include "xiescher.hxx"
 
diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx
index 6eefe46..474fcda 100644
--- a/sc/source/ui/miscdlgs/crdlg.cxx
+++ b/sc/source/ui/miscdlgs/crdlg.cxx
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sc.hxx"
+#include "precompiled_scui.hxx"
 
 #undef SC_DLLIMPLEMENTATION

More information about the Libreoffice-commits mailing list