diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-01-11 11:15:25 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-03-24 22:40:32 +0100 |
| commit | 4ba9bf6ad0e7383e0af421a5fea79e3b9d34fce6 (patch) | |
| tree | 575194112c43f41b4565c6424cb1475126e1fba7 /sw/ooxmlexport_setup.mk | |
| parent | e7fb8dc9a3c2f40823b2b0c12c7962dc408092cc (diff) | |
Revert "tdf93236 N-UP printing in combination 1/4"
Whole subject was: "tdf93236 N-UP printing in with mailmerge broken
file-print 1/4"
This reverts all dbmgr.cxx changes, which were a result of this
commit. This patch merges the reverts for the following patches:
* "sw: remove include of sw/source/inc/uibase/dbui.hxx from dbmgr.hxx"
commit 4b01af28e6fee1ec3096ed713d1db832b3508420
* "coverity#1346891 Unused value"
commit 1876d9a807ee0b3480ab108273930897cc697d88
* "tdf93236 N-UP printing in combination with mailmerge broken file-print 1/4"
commit d8ff907197037045fd0cb173e341f515968b65b1
Change-Id: Ic51230c484fb9ee5dba2331c51ced1d20a787afa
Diffstat (limited to 'sw/ooxmlexport_setup.mk')
| -rw-r--r-- | sw/ooxmlexport_setup.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk index 94cee426e2fb..84a9d0dc3588 100644 --- a/sw/ooxmlexport_setup.mk +++ b/sw/ooxmlexport_setup.mk @@ -98,7 +98,6 @@ $(eval $(call gb_CppunitTest_set_include,sw_ooxmlexport$(1),\ -I$(SRCDIR)/sw/inc \ -I$(SRCDIR)/sw/source/core/inc \ -I$(SRCDIR)/sw/qa/extras/inc \ - -I$(SRCDIR)/sw/source/uibase/inc \ $$(INCLUDE) \ )) |