Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableFieldControl.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableFieldControl.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableFieldControl.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableFieldControl.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_TABLEFIELDCONTROL_HXX #include "TableFieldControl.hxx" #endif
Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_TABLEFIELDDESCRIPTION_HXX #include "TableFieldDescWin.hxx" Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableRow.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableRow.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableRow.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableRow.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_TABLEROW_HXX #include "TableRow.hxx" #endif Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableRowExchange.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableRowExchange.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableRowExchange.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableRowExchange.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_TABLEROW_EXCHANGE_HXX #include "TableRowExchange.hxx" #endif Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableUndo.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableUndo.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableUndo.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableUndo.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_TABLEUNDO_HXX #include "TableUndo.hxx" #endif Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBU_REGHELPER_HXX_ #include "dbu_reghelper.hxx" Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "unoadmin.hxx" #include "dbu_reghelper.hxx" Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/ColumnControl.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/ColumnControl.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/ColumnControl.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/ColumnControl.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_COLUMNCONTROL_HXX #include "ColumnControl.hxx" #endif Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/ColumnModel.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/ColumnModel.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/ColumnModel.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/ColumnModel.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_COLUMNMODEL_HXX #include "ColumnModel.hxx" Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/ColumnPeer.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/ColumnPeer.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/ColumnPeer.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/ColumnPeer.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_COLUMNPEER_HXX #include "ColumnPeer.hxx" #endif Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/DBTypeWizDlg.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/DBTypeWizDlg.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/DBTypeWizDlg.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/DBTypeWizDlg.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBU_REGHELPER_HXX_ #include "dbu_reghelper.hxx" Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBU_REGHELPER_HXX_ #include "dbu_reghelper.hxx" Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/TableFilterDlg.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/TableFilterDlg.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/TableFilterDlg.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/TableFilterDlg.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBU_REGHELPER_HXX_ #include "dbu_reghelper.hxx" Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/UserSettingsDlg.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/UserSettingsDlg.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/UserSettingsDlg.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/UserSettingsDlg.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBU_REGHELPER_HXX_ #include "dbu_reghelper.hxx" Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/admindlg.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/admindlg.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/admindlg.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/admindlg.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBU_REGHELPER_HXX_ #include "dbu_reghelper.hxx" Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/composerdialogs.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/composerdialogs.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/composerdialogs.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/composerdialogs.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBACCESS_SOURCE_UI_UNO_COMPOSERDIALOGS_HXX #include "composerdialogs.hxx" Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/copytablewizard.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/copytablewizard.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/copytablewizard.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/copytablewizard.cxx Mon Mar 14 01:49:48 2016 @@ -20,6 +20,8 @@ *************************************************************/ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_dbui.hxx" #include "dbu_reghelper.hxx" #include "dbu_resource.hrc" Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/dbinteraction.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/dbinteraction.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/dbinteraction.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/dbinteraction.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_INTERACTION_HXX_ #include "dbinteraction.hxx" Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "textconnectionsettings.hxx" #include "dbu_reghelper.hxx" Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/unoDirectSql.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/unoDirectSql.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/unoDirectSql.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/unoDirectSql.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_UNODIRECTSQL_HXX #include "unoDirectSql.hxx" Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/unoadmin.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/unoadmin.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/unoadmin.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/unoadmin.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/unosqlmessage.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/unosqlmessage.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/unosqlmessage.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/unosqlmessage.cxx Mon Mar 14 01:49:48 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_SQLMESSAGE_HXX_ #include "sqlmessage.hxx" Modified: openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk (original) +++ openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk Mon Mar 14 01:49:48 2016 @@ -54,7 +54,6 @@ my_components = \ textoutstream \ uuresolver \ abp \ - adabasui \ analysis \ animcore \ avmedia \ @@ -73,12 +72,21 @@ my_components = \ component/comphelper/util/comphelp \ component/cui/util/cui \ component/drawinglayer/drawinglayer \ + component/dbaccess/source/ext/adabas/adabasui \ + component/dbaccess/source/ext/macromigration/dbmm \ + component/dbaccess/source/filter/xml/dbaxml \ + component/dbaccess/util/dba \ + component/dbaccess/util/dbu \ + component/dbaccess/util/sdbt \ component/formula/util/for \ component/framework/util/fwk \ component/framework/util/fwl \ component/framework/util/fwm \ component/linguistic/source/lng \ component/oox/util/oox \ + component/reportdesign/source/filter/xml/rptxml \ + component/reportdesign/util/rpt \ + component/reportdesign/util/rptui \ component/vbahelper/util/msforms \ component/sax/source/expatwrap/expwrap \ component/sax/source/fastparser/fastsax \ @@ -110,14 +118,10 @@ my_components = \ configmgr \ ctl \ date \ - dba \ dbase \ - dbaxml \ - dbmm \ dbp \ dbpool2 \ dbtools \ - dbu \ deployment \ deploymentgui \ dlgprov \ @@ -153,9 +157,6 @@ my_components = \ pythonloader \ pythonscript \ res \ - rpt \ - rptui \ - rptxml \ sb \ sc \ scd \ @@ -163,7 +164,6 @@ my_components = \ scriptframe \ sd \ sdbc2 \ - sdbt \ sdd \ slideshow \ spl \ Copied: openoffice/branches/gbuild-reintegration/main/reportdesign/AllLangResTarget_rpt.mk (from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/AllLangResTarget_rpt.mk) URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/AllLangResTarget_rpt.mk?p2=openoffice/branches/gbuild-reintegration/main/reportdesign/AllLangResTarget_rpt.mk&p1=incubator/ooo/branches/gbuild/main/reportdesign/AllLangResTarget_rpt.mk&r1=1409571&r2=1734873&rev=1734873&view=diff ============================================================================== --- incubator/ooo/branches/gbuild/main/reportdesign/AllLangResTarget_rpt.mk (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/AllLangResTarget_rpt.mk Mon Mar 14 01:49:48 2016 @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platdbam office productivity suite Copied: openoffice/branches/gbuild-reintegration/main/reportdesign/JunitTest_reportdesign_complex.mk (from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/JunitTest_reportdesign_complex.mk) URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/JunitTest_reportdesign_complex.mk?p2=openoffice/branches/gbuild-reintegration/main/reportdesign/JunitTest_reportdesign_complex.mk&p1=incubator/ooo/branches/gbuild/main/reportdesign/JunitTest_reportdesign_complex.mk&r1=1409571&r2=1734873&rev=1734873&view=diff ============================================================================== --- incubator/ooo/branches/gbuild/main/reportdesign/JunitTest_reportdesign_complex.mk (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/JunitTest_reportdesign_complex.mk Mon Mar 14 01:49:48 2016 @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -25,7 +25,12 @@ # #************************************************************************* -$(eval $(call gb_JunitTest_JunitTest,reportdesign_complex)) +$(eval $(call gb_JunitTest_JunitTest,reportdesign_complex,SRCDIR)) + +$(eval $(call gb_JunitTest_set_defs,reportdesign_complex,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/reportdesign/qa/complex/reportdesign/test_documents \ +)) $(eval $(call gb_JunitTest_add_sourcefiles,reportdesign_complex,\ reportdesign/qa/complex/reportdesign/ReportDesignerTest \ @@ -45,4 +50,4 @@ $(eval $(call gb_JunitTest_add_classes,r complex.reportdesign.ReportDesignerTest \ )) -# vim: set noet reportdesign=4 ts=4: +# vim: set noet sw=4 ts=4: Copied: openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rpt.mk (from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/Library_rpt.mk) URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rpt.mk?p2=openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rpt.mk&p1=incubator/ooo/branches/gbuild/main/reportdesign/Library_rpt.mk&r1=1409571&r2=1734873&rev=1734873&view=diff ============================================================================== --- incubator/ooo/branches/gbuild/main/reportdesign/Library_rpt.mk (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rpt.mk Mon Mar 14 01:49:48 2016 @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -44,8 +44,7 @@ $(eval $(call gb_Library_set_include,rpt $$(INCLUDE) \ )) -$(eval $(call gb_Library_set_defs,rpt,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,rpt,\ -DREPORTDESIGN_DLLIMPLEMENTATION \ )) @@ -71,7 +70,7 @@ $(eval $(call gb_Library_add_linked_libs fwe \ svx \ svxcore \ - tk \ + ootk \ $(gb_STDLIBS) \ )) Copied: openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rptui.mk (from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/Library_rptui.mk) URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rptui.mk?p2=openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rptui.mk&p1=incubator/ooo/branches/gbuild/main/reportdesign/Library_rptui.mk&r1=1409571&r2=1734873&rev=1734873&view=diff ============================================================================== --- incubator/ooo/branches/gbuild/main/reportdesign/Library_rptui.mk (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rptui.mk Mon Mar 14 01:49:48 2016 @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,6 @@ #************************************************************************* $(eval $(call gb_Library_Library,rptui)) -$(eval $(call gb_Library_add_package_headers,rptui,reportdesign_inc)) $(eval $(call gb_Library_add_precompiled_header,rptui,$(SRCDIR)/reportdesign/inc/pch/precompiled_rptui)) $(eval $(call gb_Library_set_componentfile,rptui,reportdesign/util/rptui)) @@ -65,7 +64,7 @@ $(eval $(call gb_Library_add_linked_libs ucbhelper \ svxcore \ svx \ - tk \ + ootk \ sot \ dba \ vos3 \ Copied: openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rptxml.mk (from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/Library_rptxml.mk) URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rptxml.mk?p2=openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rptxml.mk&p1=incubator/ooo/branches/gbuild/main/reportdesign/Library_rptxml.mk&r1=1409571&r2=1734873&rev=1734873&view=diff ============================================================================== --- incubator/ooo/branches/gbuild/main/reportdesign/Library_rptxml.mk (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rptxml.mk Mon Mar 14 01:49:48 2016 @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,6 @@ #************************************************************************* $(eval $(call gb_Library_Library,rptxml)) -$(eval $(call gb_Library_add_package_headers,rptxml,reportdesign_inc)) $(eval $(call gb_Library_add_precompiled_header,rptxml,$(SRCDIR)/reportdesign/inc/pch/precompiled_rptxml)) $(eval $(call gb_Library_set_componentfile,rptxml,reportdesign/source/filter/xml/rptxml)) @@ -57,7 +56,7 @@ $(eval $(call gb_Library_add_linked_libs dbtools \ xo \ sot \ - tk \ + ootk \ dba \ stl \ editeng \ Copied: openoffice/branches/gbuild-reintegration/main/reportdesign/Module_reportdesign.mk (from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/Module_reportdesign.mk) URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/Module_reportdesign.mk?p2=openoffice/branches/gbuild-reintegration/main/reportdesign/Module_reportdesign.mk&p1=incubator/ooo/branches/gbuild/main/reportdesign/Module_reportdesign.mk&r1=1409571&r2=1734873&rev=1734873&view=diff ============================================================================== --- incubator/ooo/branches/gbuild/main/reportdesign/Module_reportdesign.mk (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/Module_reportdesign.mk Mon Mar 14 01:49:48 2016 @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,10 @@ $(eval $(call gb_Module_add_targets,repo Package_xml \ )) -$(eval $(call gb_Module_add_subsequentcheck_targets,reportdesign,\ +# deactivated since sb123; +# apparently fails because OOo does not find JVM? +#$(eval $(call gb_Module_add_subsequentcheck_targets,reportdesign,\ JunitTest_reportdesign_complex \ )) + # vim: set noet ts=4 sw=4: Copied: openoffice/branches/gbuild-reintegration/main/reportdesign/Package_uiconfig.mk (from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/Package_uiconfig.mk) URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/Package_uiconfig.mk?p2=openoffice/branches/gbuild-reintegration/main/reportdesign/Package_uiconfig.mk&p1=incubator/ooo/branches/gbuild/main/reportdesign/Package_uiconfig.mk&r1=1409571&r2=1734873&rev=1734873&view=diff ============================================================================== --- incubator/ooo/branches/gbuild/main/reportdesign/Package_uiconfig.mk (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/Package_uiconfig.mk Mon Mar 14 01:49:48 2016 @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite Copied: openoffice/branches/gbuild-reintegration/main/reportdesign/Package_xml.mk (from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/Package_xml.mk) URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/Package_xml.mk?p2=openoffice/branches/gbuild-reintegration/main/reportdesign/Package_xml.mk&p1=incubator/ooo/branches/gbuild/main/reportdesign/Package_xml.mk&r1=1409571&r2=1734873&rev=1734873&view=diff ============================================================================== --- incubator/ooo/branches/gbuild/main/reportdesign/Package_xml.mk (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/Package_xml.mk Mon Mar 14 01:49:48 2016 @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/inc/pch/precompiled_reportdesign.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/inc/pch/precompiled_reportdesign.hxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/inc/pch/precompiled_reportdesign.hxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/inc/pch/precompiled_reportdesign.hxx Mon Mar 14 01:49:48 2016 @@ -29,6 +29,35 @@ #include "com/sun/star/chart2/data/XDataReceiver.hpp" #include "com/sun/star/reflection/XProxyFactory.hpp" #include "com/sun/star/sdb/CommandType.hpp" +#include "com/sun/star/report/XFormatCondition.hpp" +#include "com/sun/star/report/XFunction.hpp" +#include "com/sun/star/report/XReportComponent.hpp" +#include <com/sun/star/report/ForceNewPage.hpp> +#include <com/sun/star/report/GroupKeepTogether.hpp> +#include <com/sun/star/report/GroupOn.hpp> +#include <com/sun/star/report/KeepTogether.hpp> +#include <com/sun/star/report/ReportPrintOption.hpp> +#include <com/sun/star/report/XFixedLine.hpp> +#include <com/sun/star/report/XFixedText.hpp> +#include <com/sun/star/report/XFormatCondition.hpp> +#include <com/sun/star/report/XFormattedField.hpp> +#include <com/sun/star/report/XFunction.hpp> +#include <com/sun/star/report/XFunctions.hpp> +#include <com/sun/star/report/XFunctionsSupplier.hpp> +#include <com/sun/star/report/XGroup.hpp> +#include <com/sun/star/report/XGroups.hpp> +#include <com/sun/star/report/XImageControl.hpp> +#include <com/sun/star/report/XReportComponent.hpp> +#include <com/sun/star/report/XReportControlFormat.hpp> +#include <com/sun/star/report/XReportControlModel.hpp> +#include <com/sun/star/report/XReportDefinition.hpp> +#include <com/sun/star/report/XReportEngine.hpp> +#include <com/sun/star/report/XSection.hpp> +#include <com/sun/star/report/XShape.hpp> +#include <com/sun/star/report/meta/XFormulaParser.hpp> +#include <com/sun/star/report/meta/XFunctionCategory.hpp> +#include <com/sun/star/report/meta/XFunctionDescription.hpp> +#include <com/sun/star/report/meta/XFunctionManager.hpp> #include "comphelper/sequence.hxx" #include "comphelper/sequenceashashmap.hxx" #include "comphelper/documentconstants.hxx" Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/prj/build.lst?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/prj/build.lst (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/prj/build.lst Mon Mar 14 01:49:48 2016 @@ -1,18 +1,2 @@ rd reportdesign : L10N:l10n BOOST:boost comphelper dbaccess formula LIBXSLT:libxslt NULL -rd reportdesign usr1 - all rd_mkout NULL -rd reportdesign\inc nmake - all rd_inc NULL -rd reportdesign\source\core\api nmake - all rd_api rd_inc NULL -rd reportdesign\source\core\resource nmake - all rd_res rd_inc NULL -rd reportdesign\source\core\sdr nmake - all rd_sdr rd_inc NULL -rd reportdesign\source\core\misc nmake - all rd_misc rd_inc NULL -rd reportdesign\source\shared nmake - all rd_shared rd_inc NULL -rd reportdesign\source\ui\misc nmake - all rd_uimisc rd_inc NULL -rd reportdesign\source\ui\dlg nmake - all rd_uidlg rd_inc NULL -rd reportdesign\source\ui\report nmake - all rd_uireport rd_inc NULL -rd reportdesign\source\ui\inspection nmake - all rd_uiinspection rd_inc NULL -rd reportdesign\source\filter\xml nmake - all rd_filter_xml rd_inc NULL -rd reportdesign\util nmake - all rd_util rd_api rd_res rd_shared rd_uimisc rd_uidlg rd_uireport rd_uiinspection rd_sdr rd_misc rd_filter_xml NULL - -# has problems in m78, in m83 also -# rd reportdesign\qa\complex\reportdesign nmake - all rd_qa_complex NULL - +rd reportdesign\prj nmake - all rd_prj NULL Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/prj/d.lst URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/prj/d.lst?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/prj/d.lst (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/prj/d.lst Mon Mar 14 01:49:48 2016 @@ -1,24 +0,0 @@ -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\statusbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\toolbar - -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid - -dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" - -# Libraries -..\%__SRC%\bin\rpt*.dll %_DEST%\bin%_EXT%\rpt*.dll -..\%__SRC%\lib\librpt*.so %_DEST%\lib%_EXT%\librpt*.so -# ..\%__SRC%\lib\irpt*.lib %_DEST%\lib%_EXT%\irpt*.lib -..\%__SRC%\lib\librpt*.dylib %_DEST%\lib%_EXT%\librpt*.dylib - -# Resources -..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res - -..\uiconfig\dbreport\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\menubar\*.xml -..\uiconfig\dbreport\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\statusbar\*.xml -..\uiconfig\dbreport\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\toolbar\*.xml - -..\%__SRC%\misc\rpt.component %_DEST%\xml%_EXT%\rpt.component -..\%__SRC%\misc\rptui.component %_DEST%\xml%_EXT%\rptui.component -..\%__SRC%\misc\rptxml.component %_DEST%\xml%_EXT%\rptxml.component Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/qa/complex/reportdesign/TestDocument.java URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/qa/complex/reportdesign/TestDocument.java?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/qa/complex/reportdesign/TestDocument.java (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/qa/complex/reportdesign/TestDocument.java Mon Mar 14 01:49:48 2016 @@ -25,13 +25,14 @@ package complex.reportdesign; import java.io.File; import org.openoffice.test.OfficeFileUrl; +import org.openoffice.test.Argument; final class TestDocument { - public static String getUrl(String name) - { - return OfficeFileUrl.getAbsolute(new File("test_documents", name)); - } + public static String getUrl(String name) + { + return OfficeFileUrl.getAbsolute(new File(Argument.get("tdoc"), name)); + } private TestDocument() {} } Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FixedLine.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FixedLine.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FixedLine.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FixedLine.cxx Mon Mar 14 01:49:48 2016 @@ -20,6 +20,7 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include "FixedLine.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FixedText.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FixedText.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FixedText.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FixedText.cxx Mon Mar 14 01:49:48 2016 @@ -20,6 +20,7 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include "FixedText.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FormatCondition.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FormatCondition.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FormatCondition.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FormatCondition.cxx Mon Mar 14 01:49:48 2016 @@ -20,11 +20,10 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include "FormatCondition.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> -#ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC #include "corestrings.hrc" -#endif #include <tools/debug.hxx> #include <connectivity/dbtools.hxx> #include <comphelper/sequence.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FormattedField.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FormattedField.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FormattedField.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FormattedField.cxx Mon Mar 14 01:49:48 2016 @@ -20,6 +20,7 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include "FormattedField.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertyState.hpp> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Function.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Function.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Function.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Function.cxx Mon Mar 14 01:49:48 2016 @@ -20,6 +20,7 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Function.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Functions.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Functions.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Functions.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Functions.cxx Mon Mar 14 01:49:48 2016 @@ -20,6 +20,7 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Functions.hxx" #include "Function.hxx" #include <tools/debug.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Group.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Group.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Group.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Group.cxx Mon Mar 14 01:49:48 2016 @@ -20,6 +20,7 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Group.hxx" #include "Section.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Groups.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Groups.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Groups.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Groups.cxx Mon Mar 14 01:49:48 2016 @@ -20,6 +20,7 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Groups.hxx" #include "Group.hxx" #include <tools/debug.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ImageControl.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ImageControl.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ImageControl.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ImageControl.cxx Mon Mar 14 01:49:48 2016 @@ -20,15 +20,12 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include "ImageControl.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertyState.hpp> -#ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC #include "corestrings.hrc" -#endif -#ifndef REPORTDESIGN_CORE_RESOURCE_HRC_ #include "core_resource.hrc" -#endif #include "core_resource.hxx" #include <comphelper/sequence.hxx> #include "Tools.hxx" Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportComponent.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportComponent.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportComponent.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportComponent.cxx Mon Mar 14 01:49:48 2016 @@ -20,11 +20,10 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include "ReportComponent.hxx" -#ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC #include "corestrings.hrc" -#endif #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> #include <toolkit/helper/vclunohelper.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportControlModel.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportControlModel.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportControlModel.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportControlModel.cxx Mon Mar 14 01:49:48 2016 @@ -20,6 +20,7 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include "ReportControlModel.hxx" #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportDefinition.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportDefinition.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportDefinition.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportDefinition.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "ReportDefinition.hxx" #include "FixedLine.hxx" Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportEngineJFree.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportEngineJFree.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportEngineJFree.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportEngineJFree.cxx Mon Mar 14 01:49:48 2016 @@ -20,6 +20,7 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include <com/sun/star/beans/PropertyValue.hpp> #include "ReportEngineJFree.hxx" #include <comphelper/enumhelper.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportVisitor.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportVisitor.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportVisitor.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportVisitor.cxx Mon Mar 14 01:49:48 2016 @@ -20,6 +20,7 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include "ReportVisitor.hxx" namespace reportdesign { Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Section.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Section.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Section.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Section.cxx Mon Mar 14 01:49:48 2016 @@ -20,6 +20,7 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Section.hxx" #include <comphelper/enumhelper.hxx> #include <connectivity/dbtools.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Shape.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Shape.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Shape.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Shape.cxx Mon Mar 14 01:49:48 2016 @@ -20,6 +20,7 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Shape.hxx" #include <com/sun/star/beans/NamedValue.hpp> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Tools.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Tools.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Tools.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Tools.cxx Mon Mar 14 01:49:48 2016 @@ -20,10 +20,9 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Tools.hxx" -#ifndef REPORTDESIGN_CORE_RESOURCE_HRC_ #include "core_resource.hrc" -#endif #include "core_resource.hxx" #include <comphelper/property.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/services.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/services.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/services.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/services.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "sal/types.h" #include <cppuhelper/factory.hxx> #include <osl/diagnose.h> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/misc/conditionalexpression.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/misc/conditionalexpression.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/misc/conditionalexpression.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/misc/conditionalexpression.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "conditionalexpression.hxx" /** === begin UNO includes === **/ Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/misc/conditionupdater.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/misc/conditionupdater.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/misc/conditionupdater.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/misc/conditionupdater.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "conditionupdater.hxx" #include "reportformula.hxx" Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/resource/core_resource.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/resource/core_resource.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/resource/core_resource.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/resource/core_resource.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "core_resource.hxx" #include <tools/simplerm.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/ModuleHelper.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/ModuleHelper.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/ModuleHelper.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/ModuleHelper.cxx Mon Mar 14 01:49:48 2016 @@ -20,6 +20,7 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include "ModuleHelper.hxx" #include <comphelper/configurationhelper.hxx> #include <comphelper/processfactory.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/PropertyForward.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/PropertyForward.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/PropertyForward.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/PropertyForward.cxx Mon Mar 14 01:49:48 2016 @@ -20,6 +20,7 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include "PropertyForward.hxx" #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/ReportDrawPage.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/ReportDrawPage.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/ReportDrawPage.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/ReportDrawPage.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "ReportDrawPage.hxx" #include "RptObject.hxx" #include "RptModel.hxx" Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/ReportUndoFactory.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/ReportUndoFactory.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/ReportUndoFactory.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/ReportUndoFactory.cxx Mon Mar 14 01:49:48 2016 @@ -20,6 +20,7 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include "ReportUndoFactory.hxx" #include "RptObject.hxx" #include "UndoActions.hxx" Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/RptModel.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/RptModel.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/RptModel.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/RptModel.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "RptModel.hxx" #include "RptPage.hxx" Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/RptObjectListener.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/RptObjectListener.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/RptObjectListener.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/RptObjectListener.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "RptObjectListener.hxx" #include "RptObject.hxx" #include "RptDef.hxx" Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/RptPage.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/RptPage.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/RptPage.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/RptPage.cxx Mon Mar 14 01:49:48 2016 @@ -20,6 +20,7 @@ *************************************************************/ +#include "precompiled_reportdesign.hxx" #include "RptPage.hxx" #include "RptModel.hxx" #include "Section.hxx" Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/UndoEnv.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/UndoEnv.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/UndoEnv.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/UndoEnv.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "UndoActions.hxx" #include "UndoEnv.hxx" #include "formatnormalizer.hxx" Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/dbloader2.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/dbloader2.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/dbloader2.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/dbloader2.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "dbloader2.hxx" #include <comphelper/sequence.hxx> // ------------------------------------------------------------------------- Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlAutoStyle.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlAutoStyle.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlAutoStyle.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlAutoStyle.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlAutoStyle.hxx" #include "xmlHelper.hxx" #include "xmlExport.hxx" Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlCell.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlCell.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlCell.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlCell.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlCell.hxx" #include "xmlHelper.hxx" #include <xmloff/xmluconv.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlColumn.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlColumn.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlColumn.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlColumn.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #ifndef RPT_XMLCOLUMN_HXX #include "xmlColumn.hxx" Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlComponent.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlComponent.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlComponent.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlComponent.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlComponent.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlCondPrtExpr.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlControlProperty.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlControlProperty.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlControlProperty.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlControlProperty.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlControlProperty.hxx" #include <xmloff/xmluconv.hxx> #include "xmlfilter.hxx" Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlExport.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlExport.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlExport.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlExport.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlExport.hxx" #include "xmlAutoStyle.hxx" Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlExportDocumentHandler.hxx" #include <com/sun/star/sdb/CommandType.hpp> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFixedContent.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFixedContent.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFixedContent.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFixedContent.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlFixedContent.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFormatCondition.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFormatCondition.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFormatCondition.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFormatCondition.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlFormatCondition.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFormattedField.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFormattedField.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFormattedField.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFormattedField.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlFormattedField.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFunction.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFunction.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFunction.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFunction.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlFunction.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlGroup.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlGroup.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlGroup.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlGroup.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlGroup.hxx" #include "xmlSection.hxx" #include "xmlFunction.hxx" Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlHelper.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlHelper.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlHelper.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlHelper.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlHelper.hxx" #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlImage.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlImage.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlImage.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlImage.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlImage.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlImportDocumentHandler.hxx" #include <com/sun/star/sdb/CommandType.hpp> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlMasterFields.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlMasterFields.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlMasterFields.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlMasterFields.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlMasterFields.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlPropertyHandler.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlPropertyHandler.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlPropertyHandler.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlPropertyHandler.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlPropertyHandler.hxx" #include "xmlfilter.hxx" Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlReport.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlReport.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlReport.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlReport.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlReport.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlReportElement.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlReportElement.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlReportElement.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlReportElement.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlReportElement.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlReportElementBase.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlReportElementBase.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlReportElementBase.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlReportElementBase.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlReportElementBase.hxx" #include "xmlfilter.hxx" #include "xmlControlProperty.hxx" Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlRow.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlRow.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlRow.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlRow.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #ifndef RPT_XMLCOLUMN_HXX #include "xmlColumn.hxx" Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlSection.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlSection.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlSection.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlSection.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlSection.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlStyleImport.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlStyleImport.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlStyleImport.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlStyleImport.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlStyleImport.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmlnmspe.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlSubDocument.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlSubDocument.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlSubDocument.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlSubDocument.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlSubDocument.hxx" #include "xmlCell.hxx" #include "xmlfilter.hxx" Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlTable.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlTable.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlTable.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlTable.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlTable.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlfilter.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlfilter.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlfilter.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlfilter.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include <com/sun/star/packages/zip/ZipIOException.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/beans/NamedValue.hpp> Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlservices.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlservices.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlservices.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlservices.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include <cppuhelper/factory.hxx> #include <osl/diagnose.h> #include <cppuhelper/implementationentry.hxx> @@ -76,14 +76,14 @@ cppu::ImplementationEntry entries[] = { }; } -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( char const * implName, void * serviceManager, void * registryKey) { return cppu::component_getFactoryHelper( implName, serviceManager, registryKey, entries); } -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( char const ** envTypeName, uno_Environment **) { *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/shared/uistrings.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/shared/uistrings.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/shared/uistrings.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/shared/uistrings.cxx Mon Mar 14 01:49:48 2016 @@ -20,12 +20,13 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "uistrings.hrc" namespace rptui { + #include "stringconstants.cxx" IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTNAME , "ReportName"); IMPLEMENT_CONSTASCII_USTRING(CFG_REPORTDESIGNER , "SunReportBuilder"); Modified: openoffice/branches/gbuild-reintegration/main/reportdesign/source/shared/xmlstrings.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/reportdesign/source/shared/xmlstrings.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/reportdesign/source/shared/xmlstrings.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/reportdesign/source/shared/xmlstrings.cxx Mon Mar 14 01:49:48 2016 @@ -20,7 +20,7 @@ *************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlstrings.hrc" @@ -30,7 +30,7 @@ namespace rptxml IMPLEMENT_CONSTASCII_USTRING(SERVICE_SETTINGSIMPORTER , "com.sun.star.comp.Report.XMLOasisSettingsImporter"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_STYLESIMPORTER , "com.sun.star.comp.Report.XMLOasisStylesImporter"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_CONTENTIMPORTER , "com.sun.star.comp.Report.XMLOasisContentImporter"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_IMPORTFILTER , "com.sun.star.comp.document.ImportFilter"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_IMPORTFILTER , "com.sun.star.document.ImportFilter"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_METAIMPORTER , "com.sun.star.comp.Report.XMLOasisMetaImporter"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERLEFT , "BorderLeft");
