From 22a4c2db80f641277fd960d57776373fa3ae517a Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Thu, 14 Apr 2011 10:02:49 +0200 Subject: gnumake4: converted reportdesign [hg:e3de7a65caba] --- reportdesign/AllLangResTarget_rpt.mk | 47 ++++ reportdesign/AllLangResTarget_rptui.mk | 56 +++++ reportdesign/JunitTest_reportdesign_complex.mk | 48 ++++ reportdesign/Library_rpt.mk | 114 ++++++++++ reportdesign/Library_rptui.mk | 117 ++++++++++ reportdesign/Library_rptxml.mk | 99 ++++++++ reportdesign/Makefile | 38 ++++ reportdesign/Module_reportdesign.mk | 43 ++++ reportdesign/Package_uiconfig.mk | 45 ++++ reportdesign/Package_xml.mk | 29 +++ reportdesign/inc/makefile.mk | 47 ---- reportdesign/inc/pch/precompiled_reportdesign.hxx | 29 +++ reportdesign/inc/pch/precompiled_rptui.cxx | 29 +++ reportdesign/inc/pch/precompiled_rptui.hxx | 74 ++++++ reportdesign/inc/pch/precompiled_rptxml.cxx | 29 +++ reportdesign/inc/pch/precompiled_rptxml.hxx | 74 ++++++ reportdesign/prj/build.lst | 18 +- reportdesign/prj/d.lst | 24 -- reportdesign/prj/makefile.mk | 40 ++++ reportdesign/qa/complex/reportdesign/makefile.mk | 62 ----- reportdesign/source/core/api/FixedLine.cxx | 1 + reportdesign/source/core/api/FixedText.cxx | 1 + reportdesign/source/core/api/FormatCondition.cxx | 3 +- reportdesign/source/core/api/FormattedField.cxx | 1 + reportdesign/source/core/api/Function.cxx | 1 + reportdesign/source/core/api/Functions.cxx | 1 + reportdesign/source/core/api/Group.cxx | 1 + reportdesign/source/core/api/Groups.cxx | 1 + reportdesign/source/core/api/ImageControl.cxx | 5 +- reportdesign/source/core/api/ReportComponent.cxx | 3 +- .../source/core/api/ReportControlModel.cxx | 1 + reportdesign/source/core/api/ReportDefinition.cxx | 2 +- reportdesign/source/core/api/ReportEngineJFree.cxx | 1 + reportdesign/source/core/api/ReportVisitor.cxx | 1 + reportdesign/source/core/api/Section.cxx | 1 + reportdesign/source/core/api/Shape.cxx | 1 + reportdesign/source/core/api/Tools.cxx | 3 +- reportdesign/source/core/api/makefile.mk | 63 ----- reportdesign/source/core/api/services.cxx | 2 +- .../source/core/misc/conditionalexpression.cxx | 2 +- reportdesign/source/core/misc/conditionupdater.cxx | 2 +- reportdesign/source/core/misc/makefile.mk | 46 ---- .../source/core/resource/core_resource.cxx | 2 +- reportdesign/source/core/resource/makefile.mk | 48 ---- reportdesign/source/core/sdr/ModuleHelper.cxx | 1 + reportdesign/source/core/sdr/PropertyForward.cxx | 1 + reportdesign/source/core/sdr/ReportDrawPage.cxx | 2 +- reportdesign/source/core/sdr/ReportUndoFactory.cxx | 1 + reportdesign/source/core/sdr/RptModel.cxx | 2 +- reportdesign/source/core/sdr/RptObjectListener.cxx | 2 +- reportdesign/source/core/sdr/RptPage.cxx | 1 + reportdesign/source/core/sdr/UndoEnv.cxx | 2 +- reportdesign/source/core/sdr/makefile.mk | 52 ----- reportdesign/source/filter/xml/dbloader2.cxx | 2 +- reportdesign/source/filter/xml/makefile.mk | 70 ------ reportdesign/source/filter/xml/rptxml.component | 67 ++++++ reportdesign/source/filter/xml/xmlAutoStyle.cxx | 2 +- reportdesign/source/filter/xml/xmlCell.cxx | 2 +- reportdesign/source/filter/xml/xmlColumn.cxx | 2 +- reportdesign/source/filter/xml/xmlComponent.cxx | 2 +- reportdesign/source/filter/xml/xmlCondPrtExpr.cxx | 2 +- .../source/filter/xml/xmlControlProperty.cxx | 2 +- reportdesign/source/filter/xml/xmlExport.cxx | 2 +- .../source/filter/xml/xmlExportDocumentHandler.cxx | 2 +- reportdesign/source/filter/xml/xmlFixedContent.cxx | 2 +- .../source/filter/xml/xmlFormatCondition.cxx | 2 +- .../source/filter/xml/xmlFormattedField.cxx | 2 +- reportdesign/source/filter/xml/xmlFunction.cxx | 2 +- reportdesign/source/filter/xml/xmlGroup.cxx | 2 +- reportdesign/source/filter/xml/xmlHelper.cxx | 2 +- reportdesign/source/filter/xml/xmlImage.cxx | 2 +- .../source/filter/xml/xmlImportDocumentHandler.cxx | 2 +- reportdesign/source/filter/xml/xmlMasterFields.cxx | 2 +- .../source/filter/xml/xmlPropertyHandler.cxx | 2 +- reportdesign/source/filter/xml/xmlReport.cxx | 2 +- .../source/filter/xml/xmlReportElement.cxx | 2 +- .../source/filter/xml/xmlReportElementBase.cxx | 2 +- reportdesign/source/filter/xml/xmlRow.cxx | 2 +- reportdesign/source/filter/xml/xmlSection.cxx | 2 +- reportdesign/source/filter/xml/xmlStyleImport.cxx | 2 +- reportdesign/source/filter/xml/xmlSubDocument.cxx | 2 +- reportdesign/source/filter/xml/xmlTable.cxx | 2 +- reportdesign/source/filter/xml/xmlfilter.cxx | 2 +- reportdesign/source/filter/xml/xmlservices.cxx | 6 +- reportdesign/source/shared/makefile.mk | 67 ------ reportdesign/source/shared/uistrings.cxx | 3 +- reportdesign/source/shared/xmlstrings.cxx | 4 +- reportdesign/source/ui/dlg/AddField.cxx | 2 +- reportdesign/source/ui/dlg/CondFormat.cxx | 2 +- reportdesign/source/ui/dlg/Condition.cxx | 2 +- reportdesign/source/ui/dlg/DateTime.cxx | 2 +- reportdesign/source/ui/dlg/Formula.cxx | 2 +- reportdesign/source/ui/dlg/GroupExchange.cxx | 2 +- reportdesign/source/ui/dlg/GroupsSorting.cxx | 2 +- reportdesign/source/ui/dlg/Navigator.cxx | 2 +- reportdesign/source/ui/dlg/PageNumber.cxx | 2 +- reportdesign/source/ui/dlg/dlgpage.cxx | 2 +- reportdesign/source/ui/dlg/makefile.mk | 77 ------- .../source/ui/inspection/DataProviderHandler.cxx | 2 +- .../source/ui/inspection/DefaultInspection.cxx | 2 +- .../source/ui/inspection/GeometryHandler.cxx | 2 +- .../ui/inspection/ReportComponentHandler.cxx | 2 +- reportdesign/source/ui/inspection/makefile.mk | 53 ----- reportdesign/source/ui/inspection/metadata.cxx | 2 +- reportdesign/source/ui/misc/ColorListener.cxx | 2 +- reportdesign/source/ui/misc/FunctionHelper.cxx | 2 +- reportdesign/source/ui/misc/RptUndo.cxx | 2 +- reportdesign/source/ui/misc/UITools.cxx | 2 +- reportdesign/source/ui/misc/makefile.mk | 62 ----- reportdesign/source/ui/misc/rptuiservices.cxx | 2 +- .../source/ui/misc/statusbarcontroller.cxx | 2 +- reportdesign/source/ui/misc/toolboxcontroller.cxx | 2 +- reportdesign/source/ui/report/DesignView.cxx | 2 +- reportdesign/source/ui/report/EndMarker.cxx | 2 +- reportdesign/source/ui/report/FixedTextColor.cxx | 2 +- .../source/ui/report/FormattedFieldBeautifier.cxx | 2 +- reportdesign/source/ui/report/ReportController.cxx | 2 +- .../source/ui/report/ReportControllerObserver.cxx | 2 +- reportdesign/source/ui/report/ReportRuler.cxx | 2 +- reportdesign/source/ui/report/ReportSection.cxx | 2 +- reportdesign/source/ui/report/ReportWindow.cxx | 2 +- reportdesign/source/ui/report/ScrollHelper.cxx | 2 +- reportdesign/source/ui/report/SectionView.cxx | 2 +- reportdesign/source/ui/report/SectionWindow.cxx | 2 +- reportdesign/source/ui/report/StartMarker.cxx | 2 +- reportdesign/source/ui/report/ViewsWindow.cxx | 2 +- reportdesign/source/ui/report/dlgedclip.cxx | 2 +- reportdesign/source/ui/report/dlgedfac.cxx | 2 +- reportdesign/source/ui/report/dlgedfunc.cxx | 2 +- reportdesign/source/ui/report/makefile.mk | 72 ------ reportdesign/source/ui/report/propbrw.cxx | 2 +- reportdesign/util/makefile.mk | 253 --------------------- 132 files changed, 1083 insertions(+), 1106 deletions(-) create mode 100644 reportdesign/AllLangResTarget_rpt.mk create mode 100644 reportdesign/AllLangResTarget_rptui.mk create mode 100644 reportdesign/JunitTest_reportdesign_complex.mk create mode 100644 reportdesign/Library_rpt.mk create mode 100644 reportdesign/Library_rptui.mk create mode 100644 reportdesign/Library_rptxml.mk create mode 100644 reportdesign/Makefile create mode 100644 reportdesign/Module_reportdesign.mk create mode 100644 reportdesign/Package_uiconfig.mk create mode 100644 reportdesign/Package_xml.mk delete mode 100644 reportdesign/inc/makefile.mk create mode 100644 reportdesign/inc/pch/precompiled_rptui.cxx create mode 100644 reportdesign/inc/pch/precompiled_rptui.hxx create mode 100644 reportdesign/inc/pch/precompiled_rptxml.cxx create mode 100644 reportdesign/inc/pch/precompiled_rptxml.hxx create mode 100644 reportdesign/prj/makefile.mk delete mode 100755 reportdesign/qa/complex/reportdesign/makefile.mk delete mode 100644 reportdesign/source/core/api/makefile.mk delete mode 100644 reportdesign/source/core/misc/makefile.mk delete mode 100644 reportdesign/source/core/resource/makefile.mk delete mode 100644 reportdesign/source/core/sdr/makefile.mk delete mode 100644 reportdesign/source/filter/xml/makefile.mk create mode 100644 reportdesign/source/filter/xml/rptxml.component delete mode 100644 reportdesign/source/shared/makefile.mk delete mode 100644 reportdesign/source/ui/dlg/makefile.mk delete mode 100644 reportdesign/source/ui/inspection/makefile.mk delete mode 100644 reportdesign/source/ui/misc/makefile.mk delete mode 100644 reportdesign/source/ui/report/makefile.mk delete mode 100644 reportdesign/util/makefile.mk (limited to 'reportdesign') diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk new file mode 100644 index 000000000000..034e4cda93d8 --- /dev/null +++ b/reportdesign/AllLangResTarget_rpt.mk @@ -0,0 +1,47 @@ +#************************************************************************* +# +# 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 +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS dba A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 dba more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# dba a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,rpt)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,rpt,reportdesign)) + +$(eval $(call gb_AllLangResTarget_add_srs,rpt,reportdesign/rpt)) + +$(eval $(call gb_SrsTarget_SrsTarget,reportdesign/rpt)) + +$(eval $(call gb_SrsTarget_set_include,reportdesign/rpt,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(SRCDIR)/reportdesign/source/core/inc \ + -I$(SRCDIR)/reportdesign/inc \ +)) + +$(eval $(call gb_SrsTarget_add_files,reportdesign/rpt,\ + reportdesign/source/core/resource/strings.src \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk new file mode 100644 index 000000000000..ffc76e5092df --- /dev/null +++ b/reportdesign/AllLangResTarget_rptui.mk @@ -0,0 +1,56 @@ +#************************************************************************* +# +# 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 +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,rptui)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,rptui,reportdesign)) + +$(eval $(call gb_AllLangResTarget_add_srs,rptui,reportdesign/rptui)) + +$(eval $(call gb_SrsTarget_SrsTarget,reportdesign/rptui)) + +$(eval $(call gb_SrsTarget_set_include,reportdesign/rptui,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(WORKDIR)/inc/reportdesign \ + -I$(SRCDIR)/reportdesign/source/ui/inc \ + -I$(SRCDIR)/reportdesign/inc \ +)) + + +$(eval $(call gb_SrsTarget_add_files,reportdesign/rptui,\ + reportdesign/source/ui/dlg/dlgpage.src \ + reportdesign/source/ui/dlg/PageNumber.src \ + reportdesign/source/ui/dlg/DateTime.src \ + reportdesign/source/ui/dlg/CondFormat.src \ + reportdesign/source/ui/dlg/Navigator.src \ + reportdesign/source/ui/dlg/GroupsSorting.src \ + reportdesign/source/ui/inspection/inspection.src \ + reportdesign/source/ui/report/report.src \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/reportdesign/JunitTest_reportdesign_complex.mk b/reportdesign/JunitTest_reportdesign_complex.mk new file mode 100644 index 000000000000..a38f04f54dd0 --- /dev/null +++ b/reportdesign/JunitTest_reportdesign_complex.mk @@ -0,0 +1,48 @@ +#************************************************************************* +# +# 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 +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,reportdesign_complex)) + +$(eval $(call gb_JunitTest_add_sourcefiles,reportdesign_complex,\ + reportdesign/qa/complex/reportdesign/ReportDesignerTest \ + reportdesign/qa/complex/reportdesign/TestDocument \ + reportdesign/qa/complex/reportdesign/FileURL \ +)) + +$(eval $(call gb_JunitTest_add_jars,reportdesign_complex,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) + +$(eval $(call gb_JunitTest_add_classes,reportdesign_complex,\ + complex.reportdesign.ReportDesignerTest \ +)) + +# vim: set noet reportdesign=4 ts=4: diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk new file mode 100644 index 000000000000..1271ca63104e --- /dev/null +++ b/reportdesign/Library_rpt.mk @@ -0,0 +1,114 @@ +#************************************************************************* +# +# 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 +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,rpt)) +$(eval $(call gb_Library_add_package_headers,rpt,reportdesign_inc)) +$(eval $(call gb_Library_add_precompiled_header,rpt,$(SRCDIR)/reportdesign/inc/pch/precompiled_reportdesign)) + +$(eval $(call gb_Library_set_componentfile,rpt,reportdesign/util/rpt)) + +$(eval $(call gb_Library_set_include,rpt,\ + -I$(SRCDIR)/reportdesign/inc \ + -I$(SRCDIR)/reportdesign/source/core/inc \ + -I$(SRCDIR)/reportdesign/source/inc \ + -I$(SRCDIR)/reportdesign/inc/pch \ + $$(SOLARINC) \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,rpt,\ + $$(DEFS) \ + -DREPORTDESIGN_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,rpt,\ + editeng \ + sb \ + tl \ + svt \ + svl \ + cppuhelper \ + cppu \ + comphelper \ + dbtools \ + dbui \ + utl \ + vcl \ + sal \ + stl \ + i18nisolang1 \ + ucbhelper \ + sfx \ + salhelper \ + fwe \ + svx \ + svxcore \ + tk \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,rpt,\ + reportdesign/source/core/api/FormattedField \ + reportdesign/source/core/api/Groups \ + reportdesign/source/core/api/Group \ + reportdesign/source/core/api/Section \ + reportdesign/source/core/api/services \ + reportdesign/source/core/api/FixedText \ + reportdesign/source/core/api/ImageControl \ + reportdesign/source/core/api/ReportDefinition \ + reportdesign/source/core/api/ReportComponent \ + reportdesign/source/core/api/ReportEngineJFree \ + reportdesign/source/core/api/Tools \ + reportdesign/source/core/api/Function \ + reportdesign/source/core/api/Functions \ + reportdesign/source/core/api/ReportControlModel \ + reportdesign/source/core/api/FormatCondition \ + reportdesign/source/core/api/ReportVisitor \ + reportdesign/source/core/api/Shape \ + reportdesign/source/core/api/FixedLine \ + reportdesign/source/core/misc/conditionalexpression \ + reportdesign/source/core/misc/conditionupdater \ + reportdesign/source/core/misc/reportformula \ + reportdesign/source/core/resource/core_resource \ + reportdesign/source/core/sdr/RptModel \ + reportdesign/source/core/sdr/RptPage \ + reportdesign/source/core/sdr/UndoActions \ + reportdesign/source/core/sdr/RptObject \ + reportdesign/source/core/sdr/RptObjectListener \ + reportdesign/source/core/sdr/ModuleHelper \ + reportdesign/source/core/sdr/PropertyForward \ + reportdesign/source/core/sdr/ReportDrawPage \ + reportdesign/source/core/sdr/ReportUndoFactory \ + reportdesign/source/core/sdr/UndoEnv \ + reportdesign/source/core/sdr/formatnormalizer \ +)) + +$(eval $(call gb_Library_add_noexception_objects,rpt,\ + reportdesign/source/shared/corestrings \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk new file mode 100644 index 000000000000..5dcf8709f701 --- /dev/null +++ b/reportdesign/Library_rptui.mk @@ -0,0 +1,117 @@ +#************************************************************************* +# +# 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 +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(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)) + +$(eval $(call gb_Library_set_include,rptui,\ + -I$(SRCDIR)/reportdesign/inc \ + -I$(SRCDIR)/reportdesign/source/ui/inc \ + -I$(SRCDIR)/reportdesign/source/inc \ + -I$(SRCDIR)/reportdesign/inc/pch \ + $$(SOLARINC) \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_linked_libs,rptui,\ + editeng \ + comphelper \ + cppuhelper \ + cppu \ + dbtools \ + i18nisolang1 \ + fwe \ + sal \ + salhelper \ + sfx \ + svl \ + svt \ + stl \ + vcl \ + for \ + tl \ + utl \ + ucbhelper \ + svxcore \ + svx \ + tk \ + sot \ + dba \ + vos3 \ + forui \ + dbui \ + rpt \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,rptui,\ + reportdesign/source/ui/dlg/dlgpage \ + reportdesign/source/ui/dlg/Condition \ + reportdesign/source/ui/dlg/CondFormat \ + reportdesign/source/ui/dlg/GroupExchange \ + reportdesign/source/ui/dlg/PageNumber \ + reportdesign/source/ui/dlg/DateTime \ + reportdesign/source/ui/dlg/AddField \ + reportdesign/source/ui/dlg/Navigator \ + reportdesign/source/ui/dlg/GroupsSorting \ + reportdesign/source/ui/dlg/Formula \ + reportdesign/source/ui/inspection/DefaultInspection \ + reportdesign/source/ui/inspection/ReportComponentHandler \ + reportdesign/source/ui/inspection/GeometryHandler \ + reportdesign/source/ui/inspection/DataProviderHandler \ + reportdesign/source/ui/inspection/metadata \ + reportdesign/source/ui/misc/RptUndo \ + reportdesign/source/ui/misc/ColorListener \ + reportdesign/source/ui/misc/UITools \ + reportdesign/source/ui/misc/rptuiservices \ + reportdesign/source/ui/misc/toolboxcontroller \ + reportdesign/source/ui/misc/statusbarcontroller \ + reportdesign/source/ui/misc/FunctionHelper \ + reportdesign/source/ui/report/SectionWindow \ + reportdesign/source/ui/report/ReportController \ + reportdesign/source/ui/report/ReportControllerObserver \ + reportdesign/source/ui/report/FormattedFieldBeautifier \ + reportdesign/source/ui/report/FixedTextColor \ + reportdesign/source/ui/report/ReportSection \ + reportdesign/source/ui/report/SectionView \ + reportdesign/source/ui/report/ViewsWindow \ + reportdesign/source/ui/report/ScrollHelper \ + reportdesign/source/ui/report/StartMarker \ + reportdesign/source/ui/report/EndMarker \ + reportdesign/source/ui/report/dlgedfunc \ + reportdesign/source/ui/report/dlgedfac \ + reportdesign/source/ui/report/dlgedclip \ + reportdesign/source/ui/report/ReportWindow \ + reportdesign/source/ui/report/DesignView \ + reportdesign/source/ui/report/propbrw \ + reportdesign/source/shared/uistrings \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk new file mode 100644 index 000000000000..dcabec70dd07 --- /dev/null +++ b/reportdesign/Library_rptxml.mk @@ -0,0 +1,99 @@ +#************************************************************************* +# +# 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 +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(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)) + +$(eval $(call gb_Library_set_include,rptxml,\ + -I$(SRCDIR)/reportdesign/inc \ + -I$(SRCDIR)/reportdesign/source/filter/xml \ + -I$(SRCDIR)/reportdesign/source/inc \ + -I$(SRCDIR)/reportdesign/inc/pch \ + $$(SOLARINC) \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_linked_libs,rptxml,\ + tl \ + svl \ + cppuhelper \ + cppu \ + comphelper \ + utl \ + vcl \ + sal \ + sfx \ + dbtools \ + xo \ + sot \ + tk \ + dba \ + stl \ + editeng \ + rpt \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,rptxml,\ + reportdesign/source/filter/xml/xmlfilter \ + reportdesign/source/filter/xml/xmlReport \ + reportdesign/source/filter/xml/xmlMasterFields \ + reportdesign/source/filter/xml/xmlGroup \ + reportdesign/source/filter/xml/xmlHelper \ + reportdesign/source/filter/xml/xmlSection \ + reportdesign/source/filter/xml/xmlComponent \ + reportdesign/source/filter/xml/xmlControlProperty \ + reportdesign/source/filter/xml/xmlFormattedField \ + reportdesign/source/filter/xml/xmlReportElement \ + reportdesign/source/filter/xml/xmlReportElementBase \ + reportdesign/source/filter/xml/xmlCondPrtExpr \ + reportdesign/source/filter/xml/xmlImage \ + reportdesign/source/filter/xml/xmlFunction \ + reportdesign/source/filter/xml/xmlStyleImport \ + reportdesign/source/filter/xml/xmlAutoStyle \ + reportdesign/source/filter/xml/xmlExport \ + reportdesign/source/filter/xml/dbloader2 \ + reportdesign/source/filter/xml/xmlFormatCondition \ + reportdesign/source/filter/xml/xmlPropertyHandler \ + reportdesign/source/filter/xml/xmlColumn \ + reportdesign/source/filter/xml/xmlCell \ + reportdesign/source/filter/xml/xmlTable \ + reportdesign/source/filter/xml/xmlFixedContent \ + reportdesign/source/filter/xml/xmlSubDocument \ + reportdesign/source/filter/xml/xmlservices \ + reportdesign/source/filter/xml/xmlImportDocumentHandler \ + reportdesign/source/filter/xml/xmlExportDocumentHandler \ +)) + +$(eval $(call gb_Library_add_noexception_objects,rptxml, \ + reportdesign/source/shared/xmlstrings \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/reportdesign/Makefile b/reportdesign/Makefile new file mode 100644 index 000000000000..90947b2e5f48 --- /dev/null +++ b/reportdesign/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# 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 +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/reportdesign/Module_reportdesign.mk b/reportdesign/Module_reportdesign.mk new file mode 100644 index 000000000000..8089c23ddee3 --- /dev/null +++ b/reportdesign/Module_reportdesign.mk @@ -0,0 +1,43 @@ +#************************************************************************* +# +# 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 +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,reportdesign)) + +$(eval $(call gb_Module_add_targets,reportdesign,\ + AllLangResTarget_rpt\ + AllLangResTarget_rptui\ + Library_rpt\ + Library_rptxml\ + Library_rptui\ + Package_uiconfig \ + Package_xml \ +)) + +$(eval $(call gb_Module_add_subsequentcheck_targets,reportdesign,\ + JunitTest_reportdesign_complex \ +)) +# vim: set noet ts=4 sw=4: diff --git a/reportdesign/Package_uiconfig.mk b/reportdesign/Package_uiconfig.mk new file mode 100644 index 000000000000..0d867ee1cbcd --- /dev/null +++ b/reportdesign/Package_uiconfig.mk @@ -0,0 +1,45 @@ +#************************************************************************* +# +# 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 +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,reportdesign_uiconfig,$(SRCDIR)/reportdesign/uiconfig)) + +$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/menubar/menubar.xml,dbreport/menubar/menubar.xml)) +$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/statusbar/statusbar.xml,dbreport/statusbar/statusbar.xml)) +$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/toolbar.xml,dbreport/toolbar/toolbar.xml)) +$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/Formatting.xml,dbreport/toolbar/Formatting.xml)) +$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/alignmentbar.xml,dbreport/toolbar/alignmentbar.xml)) +$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/arrowshapes.xml,dbreport/toolbar/arrowshapes.xml)) +$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/basicshapes.xml,dbreport/toolbar/basicshapes.xml)) +$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/calloutshapes.xml,dbreport/toolbar/calloutshapes.xml)) +$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/drawbar.xml,dbreport/toolbar/drawbar.xml)) +$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/flowchartshapes.xml,dbreport/toolbar/flowchartshapes.xml)) +$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/reportcontrols.xml,dbreport/toolbar/reportcontrols.xml)) +$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/resizebar.xml,dbreport/toolbar/resizebar.xml)) +$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/sectionalignmentbar.xml,dbreport/toolbar/sectionalignmentbar.xml)) +$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/sectionshrinkbar.xml,dbreport/toolbar/sectionshrinkbar.xml)) +$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/starshapes.xml,dbreport/toolbar/starshapes.xml)) +$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/symbolshapes.xml,dbreport/toolbar/symbolshapes.xml)) diff --git a/reportdesign/Package_xml.mk b/reportdesign/Package_xml.mk new file mode 100644 index 000000000000..627223f60656 --- /dev/null +++ b/reportdesign/Package_xml.mk @@ -0,0 +1,29 @@ +#************************************************************************* +# +# 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 +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,reportdesign_xml,$(SRCDIR)/reportdesign/prj)) +$(eval $(call gb_Package_add_file,reportdesign_xml,prj/rpt.xml,rpt.xml)) diff --git a/reportdesign/inc/makefile.mk b/reportdesign/inc/makefile.mk deleted file mode 100644 index b24d73a7cd92..000000000000 --- a/reportdesign/inc/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=reportdesign -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/reportdesign/inc/pch/precompiled_reportdesign.hxx b/reportdesign/inc/pch/precompiled_reportdesign.hxx index aa6cd18038fe..6087563398a4 100644 --- a/reportdesign/inc/pch/precompiled_reportdesign.hxx +++ b/reportdesign/inc/pch/precompiled_reportdesign.hxx @@ -33,6 +33,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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "comphelper/sequence.hxx" #include "comphelper/sequenceashashmap.hxx" #include "comphelper/documentconstants.hxx" diff --git a/reportdesign/inc/pch/precompiled_rptui.cxx b/reportdesign/inc/pch/precompiled_rptui.cxx new file mode 100644 index 000000000000..37cdcd1885c9 --- /dev/null +++ b/reportdesign/inc/pch/precompiled_rptui.cxx @@ -0,0 +1,29 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "precompiled_rptui.hxx" + diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx new file mode 100644 index 000000000000..6087563398a4 --- /dev/null +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -0,0 +1,74 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:38.561560 + +#ifdef PRECOMPILED_HEADERS +#include "com/sun/star/sdb/CommandType.hpp" +//#include "com/sun/star/chart2/data/DatabaseDataProvider.hpp" +#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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "comphelper/sequence.hxx" +#include "comphelper/sequenceashashmap.hxx" +#include "comphelper/documentconstants.hxx" +#include "xmloff/attrlist.hxx" +#include "xmloff/xmltoken.hxx" +#include "xmloff/xmlement.hxx" +#include "xmloff/xmluconv.hxx" +#include "xmloff/xmltkmap.hxx" +#include "xmloff/xmlnmspe.hxx" +#endif diff --git a/reportdesign/inc/pch/precompiled_rptxml.cxx b/reportdesign/inc/pch/precompiled_rptxml.cxx new file mode 100644 index 000000000000..b5c8cc49aefa --- /dev/null +++ b/reportdesign/inc/pch/precompiled_rptxml.cxx @@ -0,0 +1,29 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "precompiled_rptxml.hxx" + diff --git a/reportdesign/inc/pch/precompiled_rptxml.hxx b/reportdesign/inc/pch/precompiled_rptxml.hxx new file mode 100644 index 000000000000..6087563398a4 --- /dev/null +++ b/reportdesign/inc/pch/precompiled_rptxml.hxx @@ -0,0 +1,74 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:38.561560 + +#ifdef PRECOMPILED_HEADERS +#include "com/sun/star/sdb/CommandType.hpp" +//#include "com/sun/star/chart2/data/DatabaseDataProvider.hpp" +#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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "comphelper/sequence.hxx" +#include "comphelper/sequenceashashmap.hxx" +#include "comphelper/documentconstants.hxx" +#include "xmloff/attrlist.hxx" +#include "xmloff/xmltoken.hxx" +#include "xmloff/xmlement.hxx" +#include "xmloff/xmluconv.hxx" +#include "xmloff/xmltkmap.hxx" +#include "xmloff/xmlnmspe.hxx" +#endif diff --git a/reportdesign/prj/build.lst b/reportdesign/prj/build.lst index 4a5667d2090a..ebbef11ac401 100644 --- a/reportdesign/prj/build.lst +++ b/reportdesign/prj/build.lst @@ -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 diff --git a/reportdesign/prj/d.lst b/reportdesign/prj/d.lst index d7cc5fad6396..e69de29bb2d1 100644 --- a/reportdesign/prj/d.lst +++ b/reportdesign/prj/d.lst @@ -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 diff --git a/reportdesign/prj/makefile.mk b/reportdesign/prj/makefile.mk new file mode 100644 index 000000000000..88cd9dfe08b8 --- /dev/null +++ b/reportdesign/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/reportdesign/qa/complex/reportdesign/makefile.mk b/reportdesign/qa/complex/reportdesign/makefile.mk deleted file mode 100755 index 4174eb02ce3a..000000000000 --- a/reportdesign/qa/complex/reportdesign/makefile.mk +++ /dev/null @@ -1,62 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = reportdesign -TARGET = qa_complex_reportdesign - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/reportdesign - -# here store only Files which contain a @Test -JAVATESTFILES = \ - ReportDesignerTest.java - -# put here all other files -JAVAFILES = $(JAVATESTFILES) \ - TestDocument.java \ - FileURL.java - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 6c24ed17955a..0346f637ca53 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "FixedLine.hxx" #include #ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx index 7e535f0ee40f..f92b3734aa32 100644 --- a/reportdesign/source/core/api/FixedText.cxx +++ b/reportdesign/source/core/api/FixedText.cxx @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "FixedText.hxx" #include #ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx index 95e6e4e87574..f2b85d3f0b49 100644 --- a/reportdesign/source/core/api/FormatCondition.cxx +++ b/reportdesign/source/core/api/FormatCondition.cxx @@ -24,11 +24,10 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "FormatCondition.hxx" #include -#ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC #include "corestrings.hrc" -#endif #include #include #include diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index ee94e7a97d10..1a98122a13af 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "FormattedField.hxx" #include #include diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx index 506d70e8adcc..4b1ad11e3204 100644 --- a/reportdesign/source/core/api/Function.cxx +++ b/reportdesign/source/core/api/Function.cxx @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Function.hxx" #include #ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx index 9ae266d254c3..b927034dea31 100644 --- a/reportdesign/source/core/api/Functions.cxx +++ b/reportdesign/source/core/api/Functions.cxx @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Functions.hxx" #include "Function.hxx" #include diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index 8f5200746191..d33571223a08 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Group.hxx" #include "Section.hxx" #include diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx index f180471de400..bf2e813ce648 100644 --- a/reportdesign/source/core/api/Groups.cxx +++ b/reportdesign/source/core/api/Groups.cxx @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Groups.hxx" #include "Group.hxx" #include diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index 131c5e372aa5..6028ac067b9a 100644 --- a/reportdesign/source/core/api/ImageControl.cxx +++ b/reportdesign/source/core/api/ImageControl.cxx @@ -24,15 +24,12 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "ImageControl.hxx" #include #include -#ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC #include "corestrings.hrc" -#endif -#ifndef REPORTDESIGN_CORE_RESOURCE_HRC_ #include "core_resource.hrc" -#endif #include "core_resource.hxx" #include #include "Tools.hxx" diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index f9ab9471ce3b..e8afe1569643 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -24,11 +24,10 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "ReportComponent.hxx" -#ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC #include "corestrings.hrc" -#endif #include #include #include diff --git a/reportdesign/source/core/api/ReportControlModel.cxx b/reportdesign/source/core/api/ReportControlModel.cxx index 8d97f7abada0..2165a7978d1f 100644 --- a/reportdesign/source/core/api/ReportControlModel.cxx +++ b/reportdesign/source/core/api/ReportControlModel.cxx @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "ReportControlModel.hxx" #include #include diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 6b8414ad60a3..f3cac81e8ade 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "ReportDefinition.hxx" #include "FixedLine.hxx" diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 0a39b12455a5..1f81138136c0 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include #include "ReportEngineJFree.hxx" #include diff --git a/reportdesign/source/core/api/ReportVisitor.cxx b/reportdesign/source/core/api/ReportVisitor.cxx index ea1ef11b239f..5ca790b831c0 100644 --- a/reportdesign/source/core/api/ReportVisitor.cxx +++ b/reportdesign/source/core/api/ReportVisitor.cxx @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "ReportVisitor.hxx" namespace reportdesign { diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 65040676e6d6..cd7ef3636cb3 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Section.hxx" #include #include diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index 5b1baf53f5f8..132fbab8772d 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Shape.hxx" #include diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx index 2c72f9e9c3c0..82890d438697 100644 --- a/reportdesign/source/core/api/Tools.cxx +++ b/reportdesign/source/core/api/Tools.cxx @@ -24,10 +24,9 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Tools.hxx" -#ifndef REPORTDESIGN_CORE_RESOURCE_HRC_ #include "core_resource.hrc" -#endif #include "core_resource.hxx" #include diff --git a/reportdesign/source/core/api/makefile.mk b/reportdesign/source/core/api/makefile.mk deleted file mode 100644 index f19d7486a0cd..000000000000 --- a/reportdesign/source/core/api/makefile.mk +++ /dev/null @@ -1,63 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=reportdesign -TARGET=api - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/dll.pmk - -# --- Files ------------------------------------- -SLOFILES= \ - $(SLO)$/FormattedField.obj \ - $(SLO)$/Groups.obj \ - $(SLO)$/Group.obj \ - $(SLO)$/Section.obj \ - $(SLO)$/services.obj \ - $(SLO)$/FixedText.obj \ - $(SLO)$/ImageControl.obj \ - $(SLO)$/ReportDefinition.obj \ - $(SLO)$/ReportComponent.obj \ - $(SLO)$/ReportEngineJFree.obj \ - $(SLO)$/Tools.obj \ - $(SLO)$/Function.obj \ - $(SLO)$/Functions.obj \ - $(SLO)$/ReportControlModel.obj \ - $(SLO)$/FormatCondition.obj \ - $(SLO)$/ReportVisitor.obj \ - $(SLO)$/Shape.obj \ - $(SLO)$/FixedLine.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx index 7598bc5d1ace..e9066d8a0428 100644 --- a/reportdesign/source/core/api/services.cxx +++ b/reportdesign/source/core/api/services.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "sal/types.h" #include #include diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx index 8537f6b81d50..cb056c4633e9 100644 --- a/reportdesign/source/core/misc/conditionalexpression.cxx +++ b/reportdesign/source/core/misc/conditionalexpression.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "conditionalexpression.hxx" /** === begin UNO includes === **/ diff --git a/reportdesign/source/core/misc/conditionupdater.cxx b/reportdesign/source/core/misc/conditionupdater.cxx index a3408e9d7d01..794d1bc18457 100644 --- a/reportdesign/source/core/misc/conditionupdater.cxx +++ b/reportdesign/source/core/misc/conditionupdater.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "conditionupdater.hxx" #include "reportformula.hxx" diff --git a/reportdesign/source/core/misc/makefile.mk b/reportdesign/source/core/misc/makefile.mk deleted file mode 100644 index 749eb8214125..000000000000 --- a/reportdesign/source/core/misc/makefile.mk +++ /dev/null @@ -1,46 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=reportdesign -TARGET=core_misc -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/dll.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/conditionalexpression.obj \ - $(SLO)$/conditionupdater.obj \ - $(SLO)$/reportformula.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx index eb0ad6b57d4f..88c8134cd98f 100644 --- a/reportdesign/source/core/resource/core_resource.cxx +++ b/reportdesign/source/core/resource/core_resource.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "core_resource.hxx" #include diff --git a/reportdesign/source/core/resource/makefile.mk b/reportdesign/source/core/resource/makefile.mk deleted file mode 100644 index d80adb525656..000000000000 --- a/reportdesign/source/core/resource/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=reportdesign -TARGET=core_resource -ENABLE_EXCEPTIONS=TRUE -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/dll.pmk - -# --- Files -------------------------------------------------------- - -SRS1NAME=core_strings -SRC1FILES= \ - strings.src \ - -SLOFILES= $(SLO)$/core_resource.obj \ - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx index 6337a28fcc46..bfdff08c09a9 100644 --- a/reportdesign/source/core/sdr/ModuleHelper.cxx +++ b/reportdesign/source/core/sdr/ModuleHelper.cxx @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "ModuleHelper.hxx" #include #include diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index dbd6d4da65a2..90e012caf603 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "PropertyForward.hxx" #include #include diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx index 1cfdfaf0e0f9..df151fc7051b 100644 --- a/reportdesign/source/core/sdr/ReportDrawPage.cxx +++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "ReportDrawPage.hxx" #include "RptObject.hxx" #include "RptModel.hxx" diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx index eb2fdcb893d8..056d3b77c43f 100644 --- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx +++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "ReportUndoFactory.hxx" #include "RptObject.hxx" #include "UndoActions.hxx" diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index 8e4ebad7712a..897e46bf4f3d 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "RptModel.hxx" #include "RptPage.hxx" diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx index 64cd9d3dc8a3..2e6a7e37e8d1 100644 --- a/reportdesign/source/core/sdr/RptObjectListener.cxx +++ b/reportdesign/source/core/sdr/RptObjectListener.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "RptObjectListener.hxx" #include "RptObject.hxx" #include "RptDef.hxx" diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index 3fe30aacaaaa..3273bb1ed5e1 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "RptPage.hxx" #include "RptModel.hxx" #include "Section.hxx" diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index 8db61ffe5583..8dcec22290ed 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "UndoActions.hxx" #include "UndoEnv.hxx" #include "formatnormalizer.hxx" diff --git a/reportdesign/source/core/sdr/makefile.mk b/reportdesign/source/core/sdr/makefile.mk deleted file mode 100644 index 5121b498b68d..000000000000 --- a/reportdesign/source/core/sdr/makefile.mk +++ /dev/null @@ -1,52 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=reportdesign -TARGET=core_sdr -ENABLE_EXCEPTIONS=TRUE -# --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/dll.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/RptModel.obj \ - $(SLO)$/RptPage.obj \ - $(SLO)$/UndoActions.obj \ - $(SLO)$/RptObject.obj \ - $(SLO)$/RptObjectListener.obj \ - $(SLO)$/ModuleHelper.obj \ - $(SLO)$/PropertyForward.obj \ - $(SLO)$/ReportDrawPage.obj \ - $(SLO)$/ReportUndoFactory.obj \ - $(SLO)$/UndoEnv.obj \ - $(SLO)$/formatnormalizer.obj -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index cd709789ca2c..5eff43d7e2b2 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "dbloader2.hxx" #include // ------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/makefile.mk b/reportdesign/source/filter/xml/makefile.mk deleted file mode 100644 index 41761d7a7822..000000000000 --- a/reportdesign/source/filter/xml/makefile.mk +++ /dev/null @@ -1,70 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=reportdesign -TARGET=rptxml - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- -.INCLUDE : settings.mk - -# --- Files ------------------------------------- -SLOFILES= $(SLO)$/xmlfilter.obj \ - $(SLO)$/xmlReport.obj \ - $(SLO)$/xmlMasterFields.obj \ - $(SLO)$/xmlGroup.obj \ - $(SLO)$/xmlHelper.obj \ - $(SLO)$/xmlSection.obj \ - $(SLO)$/xmlComponent.obj \ - $(SLO)$/xmlControlProperty.obj \ - $(SLO)$/xmlFormattedField.obj \ - $(SLO)$/xmlReportElement.obj \ - $(SLO)$/xmlReportElementBase.obj \ - $(SLO)$/xmlCondPrtExpr.obj \ - $(SLO)$/xmlImage.obj \ - $(SLO)$/xmlFunction.obj \ - $(SLO)$/xmlStyleImport.obj \ - $(SLO)$/xmlAutoStyle.obj \ - $(SLO)$/xmlExport.obj \ - $(SLO)$/dbloader2.obj \ - $(SLO)$/xmlFormatCondition.obj \ - $(SLO)$/xmlPropertyHandler.obj \ - $(SLO)$/xmlColumn.obj \ - $(SLO)$/xmlCell.obj \ - $(SLO)$/xmlTable.obj \ - $(SLO)$/xmlFixedContent.obj \ - $(SLO)$/xmlSubDocument.obj \ - $(SLO)$/xmlservices.obj \ - $(SLO)$/xmlImportDocumentHandler.obj \ - $(SLO)$/xmlExportDocumentHandler.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/reportdesign/source/filter/xml/rptxml.component b/reportdesign/source/filter/xml/rptxml.component new file mode 100644 index 000000000000..c34758d64dd9 --- /dev/null +++ b/reportdesign/source/filter/xml/rptxml.component @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx b/reportdesign/source/filter/xml/xmlAutoStyle.cxx index f802b3460684..847961035985 100644 --- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx +++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlAutoStyle.hxx" #include "xmlHelper.hxx" #include "xmlExport.hxx" diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index 6e0529a72bf0..dbae88b73910 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlCell.hxx" #include "xmlHelper.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx index 499c142a1385..412cd44eeca6 100644 --- a/reportdesign/source/filter/xml/xmlColumn.cxx +++ b/reportdesign/source/filter/xml/xmlColumn.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #ifndef RPT_XMLCOLUMN_HXX #include "xmlColumn.hxx" diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx index e2f80dc5d240..b20da5737a08 100644 --- a/reportdesign/source/filter/xml/xmlComponent.cxx +++ b/reportdesign/source/filter/xml/xmlComponent.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlComponent.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx index c54a031435fe..aed3ee4a73ac 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlCondPrtExpr.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index 115fb3bba2f1..5c7d2e39d2ec 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlControlProperty.hxx" #include #include "xmlfilter.hxx" diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index eec798af7f1f..c95759e2d9e9 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlExport.hxx" #include "xmlAutoStyle.hxx" diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index be664b5694e1..73b2243a1d86 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlExportDocumentHandler.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index 5c19db5c44d7..caf4bfafbbbd 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlFixedContent.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx index d9261ea72dd1..c8077f794393 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlFormatCondition.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx index 210d4bd7409b..c7921ece9073 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.cxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlFormattedField.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx index 02771159f0db..68f3ff22447e 100644 --- a/reportdesign/source/filter/xml/xmlFunction.cxx +++ b/reportdesign/source/filter/xml/xmlFunction.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlFunction.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx index 26d1b7f61252..d53bef939c7c 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlGroup.hxx" #include "xmlSection.hxx" #include "xmlFunction.hxx" diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index 0409ca67a067..1e3cf6f19a04 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlHelper.hxx" #include #include diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx index 1f489bc947fd..babbfbeae966 100644 --- a/reportdesign/source/filter/xml/xmlImage.cxx +++ b/reportdesign/source/filter/xml/xmlImage.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlImage.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index 92ee79509dea..bad7adb464fb 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlImportDocumentHandler.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx index 2067aec4ee7e..106bfb562c91 100644 --- a/reportdesign/source/filter/xml/xmlMasterFields.cxx +++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlMasterFields.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx index 0310edf0830a..022d9dae8b57 100644 --- a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx +++ b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlPropertyHandler.hxx" #include "xmlfilter.hxx" diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx index e2bfa0deee8c..d91813bcf785 100644 --- a/reportdesign/source/filter/xml/xmlReport.cxx +++ b/reportdesign/source/filter/xml/xmlReport.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlReport.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx index 5cd4e3800047..7b356c2de8a1 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.cxx +++ b/reportdesign/source/filter/xml/xmlReportElement.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlReportElement.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx index cbc9c6d7f739..c783400c449a 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlReportElementBase.hxx" #include "xmlfilter.hxx" #include "xmlControlProperty.hxx" diff --git a/reportdesign/source/filter/xml/xmlRow.cxx b/reportdesign/source/filter/xml/xmlRow.cxx index 66ef1ee51054..610a001b63e2 100644 --- a/reportdesign/source/filter/xml/xmlRow.cxx +++ b/reportdesign/source/filter/xml/xmlRow.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #ifndef RPT_XMLCOLUMN_HXX #include "xmlColumn.hxx" diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx index d888ed5f9cf4..26a8016c1151 100644 --- a/reportdesign/source/filter/xml/xmlSection.cxx +++ b/reportdesign/source/filter/xml/xmlSection.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlSection.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index c406694e04d5..6b7e967074f5 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlStyleImport.hxx" #include #include diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx index a999a0376cbb..1a0215a81d38 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.cxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlSubDocument.hxx" #include "xmlCell.hxx" #include "xmlfilter.hxx" diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx index c693daa98eba..125271e90085 100644 --- a/reportdesign/source/filter/xml/xmlTable.cxx +++ b/reportdesign/source/filter/xml/xmlTable.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlTable.hxx" #include "xmlfilter.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 463c2bfa6066..c9f3051e4cff 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include #include #include diff --git a/reportdesign/source/filter/xml/xmlservices.cxx b/reportdesign/source/filter/xml/xmlservices.cxx index 3d7a36c3ffaf..a2964ad2459e 100644 --- a/reportdesign/source/filter/xml/xmlservices.cxx +++ b/reportdesign/source/filter/xml/xmlservices.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include #include #include @@ -80,14 +80,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; diff --git a/reportdesign/source/shared/makefile.mk b/reportdesign/source/shared/makefile.mk deleted file mode 100644 index e399649bc825..000000000000 --- a/reportdesign/source/shared/makefile.mk +++ /dev/null @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=reportdesign -LIBTARGET=NO -TARGET=shared -LIB1TARGET=$(SLB)$/coreshared.lib -LIB2TARGET=$(SLB)$/xmlshared.lib -LIB3TARGET=$(SLB)$/uishared.lib - -#ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Types ------------------------------------- - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/corestrings.obj \ - $(SLO)$/uistrings.obj \ - $(SLO)$/xmlstrings.obj \ - - -LIB1OBJFILES= \ - $(SLO)$/corestrings.obj - - -LIB2OBJFILES= \ - $(SLO)$/xmlstrings.obj - -LIB3OBJFILES= \ - $(SLO)$/uistrings.obj - - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - diff --git a/reportdesign/source/shared/uistrings.cxx b/reportdesign/source/shared/uistrings.cxx index 4a8cdf37ab1a..a11868ca91bf 100644 --- a/reportdesign/source/shared/uistrings.cxx +++ b/reportdesign/source/shared/uistrings.cxx @@ -24,12 +24,13 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#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"); diff --git a/reportdesign/source/shared/xmlstrings.cxx b/reportdesign/source/shared/xmlstrings.cxx index 9c6ef829b95a..cfda7a9f3ef4 100644 --- a/reportdesign/source/shared/xmlstrings.cxx +++ b/reportdesign/source/shared/xmlstrings.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlstrings.hrc" @@ -34,7 +34,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"); diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 9a7c1d8086e2..4c42761a46f5 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "AddField.hxx" #include "UITools.hxx" #include diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index 1e428b081c0d..e14d363441b1 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "CondFormat.hxx" #include "CondFormat.hrc" diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 0e4d7dbcad82..ed8b87c8c4ae 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "Condition.hxx" #include "UITools.hxx" diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index e2180098af0c..e159866aa092 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "DateTime.hxx" #ifndef RPTUI_DATETIME_HRC #include "DateTime.hrc" diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 6f741698268c..7d73faab4cdf 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -26,7 +26,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" //---------------------------------------------------------------------------- diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx index b5ba9534a9ad..8519a378ebb9 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.cxx +++ b/reportdesign/source/ui/dlg/GroupExchange.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "GroupExchange.hxx" #include #include diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 2a93c374ca15..5353b462cdaf 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "GroupsSorting.hxx" #include "GroupsSorting.hrc" #include diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 215e5145889f..f2400ec0ac99 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "Navigator.hxx" diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index dba4a7648aaf..635938552f4e 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "PageNumber.hxx" #ifndef RPTUI_PAGENUMBER_HRC #include "PageNumber.hrc" diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index ac373c4c24ae..e8d603809e76 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include diff --git a/reportdesign/source/ui/dlg/makefile.mk b/reportdesign/source/ui/dlg/makefile.mk deleted file mode 100644 index a2c7756213fc..000000000000 --- a/reportdesign/source/ui/dlg/makefile.mk +++ /dev/null @@ -1,77 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=reportdesign -TARGET=uidlg -IMGLST_SRS=$(SRS)$/$(TARGET).srs -BMP_IN=$(PRJ)$/res - -VISIBILITY_HIDDEN=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk -# .INCLUDE : $(PRJ)$/util$/dll.pmk - -# --- Files ------------------------------------- - -# ... resource files ............................ - -SRS1NAME=$(TARGET) -SRC1FILES = \ - dlgpage.src \ - PageNumber.src \ - DateTime.src \ - CondFormat.src \ - Navigator.src \ - GroupsSorting.src - - -# ... object files ............................ - -EXCEPTIONSFILES= \ - $(SLO)$/dlgpage.obj \ - $(SLO)$/Condition.obj \ - $(SLO)$/CondFormat.obj \ - $(SLO)$/GroupExchange.obj \ - $(SLO)$/PageNumber.obj \ - $(SLO)$/DateTime.obj \ - $(SLO)$/AddField.obj \ - $(SLO)$/Navigator.obj \ - $(SLO)$/GroupsSorting.obj \ - $(SLO)$/Formula.obj - -SLOFILES= \ - $(EXCEPTIONSFILES) \ - - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index dcc327060806..59cee2e16559 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "DataProviderHandler.hxx" #include #include diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index c5b2df1d3589..666b87000418 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "DefaultInspection.hxx" #include #include diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index aee0a824c34b..80eaeaf03663 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "GeometryHandler.hxx" #include diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index d992206b6f54..022f815ced4e 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "ReportComponentHandler.hxx" #include #include diff --git a/reportdesign/source/ui/inspection/makefile.mk b/reportdesign/source/ui/inspection/makefile.mk deleted file mode 100644 index cd2c6e9e52cd..000000000000 --- a/reportdesign/source/ui/inspection/makefile.mk +++ /dev/null @@ -1,53 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=reportdesign -TARGET=ui_inspection -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/DefaultInspection.obj \ - $(SLO)$/ReportComponentHandler.obj \ - $(SLO)$/GeometryHandler.obj \ - $(SLO)$/DataProviderHandler.obj \ - $(SLO)$/metadata.obj - - -SRS1NAME=$(TARGET) -SRC1FILES = inspection.src -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index 419a161741d2..65017ff7349d 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "metadata.hxx" #include #include "com/sun/star/inspection/XPropertyHandler.hpp" diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx index 78d7b8dba0fb..c48f31cd02d9 100644 --- a/reportdesign/source/ui/misc/ColorListener.cxx +++ b/reportdesign/source/ui/misc/ColorListener.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "ColorListener.hxx" #include #ifndef REPORTDESIGN_SHARED_UISTRINGS_HRC diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index e6c92f0cbb0d..3fc410919548 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -26,7 +26,7 @@ ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "FunctionHelper.hxx" #include diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index 4244987b717a..ef3cdad3f331 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "RptUndo.hxx" #include "uistrings.hrc" diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 8c531d15e0fb..0b550481bc2f 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include diff --git a/reportdesign/source/ui/misc/makefile.mk b/reportdesign/source/ui/misc/makefile.mk deleted file mode 100644 index 494b68023d62..000000000000 --- a/reportdesign/source/ui/misc/makefile.mk +++ /dev/null @@ -1,62 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=reportdesign -TARGET=uimisc - -VISIBILITY_HIDDEN=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk -# .INCLUDE : $(PRJ)$/util$/dll.pmk - -# --- Files ------------------------------------- - -# ... resource files ............................ - -# ... object files ............................ - -EXCEPTIONSFILES= \ - $(SLO)$/RptUndo.obj \ - $(SLO)$/ColorListener.obj \ - $(SLO)$/UITools.obj \ - $(SLO)$/rptuiservices.obj \ - $(SLO)$/toolboxcontroller.obj \ - $(SLO)$/statusbarcontroller.obj \ - $(SLO)$/FunctionHelper.obj - - -SLOFILES= \ - $(EXCEPTIONSFILES) - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - diff --git a/reportdesign/source/ui/misc/rptuiservices.cxx b/reportdesign/source/ui/misc/rptuiservices.cxx index 312abfbddd5f..6fa50956bc8f 100644 --- a/reportdesign/source/ui/misc/rptuiservices.cxx +++ b/reportdesign/source/ui/misc/rptuiservices.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include #include #include diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index 2e815d90f81f..f166e3759378 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -26,7 +26,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "statusbarcontroller.hxx" #include diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index e89cc5c6297e..5d34c159c84e 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "toolboxcontroller.hxx" #include #include diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 48ec9dc626ca..9b0d171aa6a1 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "DesignView.hxx" #include diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index c8c508d3ddaa..e8fb14a0eeb7 100644 --- a/reportdesign/source/ui/report/EndMarker.cxx +++ b/reportdesign/source/ui/report/EndMarker.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "EndMarker.hxx" #include "ColorChanger.hxx" #include "SectionWindow.hxx" diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx index d80a79dde0f7..f938fcda0a36 100644 --- a/reportdesign/source/ui/report/FixedTextColor.cxx +++ b/reportdesign/source/ui/report/FixedTextColor.cxx @@ -26,7 +26,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include #include diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index 4a56a4392262..95b8f0e1a2bc 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -26,7 +26,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index f3b733e4d9cd..c50a388922f3 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #define RPTUI_ID_LRSPACE 1 #define RPTUI_ID_ULSPACE 2 diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 7c0f3a572be8..c853cf2e607f 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -26,7 +26,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include #include diff --git a/reportdesign/source/ui/report/ReportRuler.cxx b/reportdesign/source/ui/report/ReportRuler.cxx index e0bc9751ec49..68db02519afd 100644 --- a/reportdesign/source/ui/report/ReportRuler.cxx +++ b/reportdesign/source/ui/report/ReportRuler.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "ReportRuler.hxx" #include "ReportSection.hxx" #include "ReportWindow.hxx" diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 020f7e24ca22..e011dfc515de 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "ReportSection.hxx" #include "ReportWindow.hxx" #include "DesignView.hxx" diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index 35ef356005f5..65ead602daab 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "ReportWindow.hxx" #include "ReportSection.hxx" #include "SectionView.hxx" diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index 13c65882e6c0..8c8f6b01a6dc 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "ScrollHelper.hxx" #include "DesignView.hxx" #include "ReportController.hxx" diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx index 6ea459d71470..6cf1f2fe6d2d 100644 --- a/reportdesign/source/ui/report/SectionView.cxx +++ b/reportdesign/source/ui/report/SectionView.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "SectionView.hxx" #include "DesignView.hxx" #include diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index ab08c11e0753..8020d8b32793 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "SectionWindow.hxx" #include "ReportWindow.hxx" #include "ReportRuler.hxx" diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 8e00e6654f98..d40bc4632f0f 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "StartMarker.hxx" #include #include diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index bd6171cf9112..0a7db5af9590 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "ViewsWindow.hxx" #include "ScrollHelper.hxx" diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx index d0c1b03bda11..9e068bb41a6d 100644 --- a/reportdesign/source/ui/report/dlgedclip.cxx +++ b/reportdesign/source/ui/report/dlgedclip.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "dlgedclip.hxx" #include #include diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index 7e6bd00d0091..bb5fde88a91c 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "dlgedfac.hxx" #ifndef REPORTDESIGN_SHARED_UISTRINGS_HRC #include "uistrings.hrc" diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 6001e2909937..e85c8f921e7e 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include #include #include diff --git a/reportdesign/source/ui/report/makefile.mk b/reportdesign/source/ui/report/makefile.mk deleted file mode 100644 index 3c19923f4c19..000000000000 --- a/reportdesign/source/ui/report/makefile.mk +++ /dev/null @@ -1,72 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=reportdesign -TARGET=report - -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -# .INCLUDE : $(PRJ)$/util$/dll.pmk - -IMGLST_SRS=$(SRS)$/$(TARGET).srs -# --- Files -------------------------------------------------------- - -SLOFILES =\ - $(SLO)$/SectionWindow.obj \ - $(SLO)$/ReportController.obj \ - $(SLO)$/ReportControllerObserver.obj \ - $(SLO)$/FormattedFieldBeautifier.obj \ - $(SLO)$/FixedTextColor.obj \ - $(SLO)$/ReportSection.obj \ - $(SLO)$/SectionView.obj \ - $(SLO)$/ViewsWindow.obj \ - $(SLO)$/ScrollHelper.obj \ - $(SLO)$/StartMarker.obj \ - $(SLO)$/EndMarker.obj \ - $(SLO)$/dlgedfunc.obj \ - $(SLO)$/dlgedfac.obj \ - $(SLO)$/dlgedclip.obj \ - $(SLO)$/ReportWindow.obj \ - $(SLO)$/DesignView.obj \ - $(SLO)$/propbrw.obj - - -SRS1NAME=$(TARGET) -SRC1FILES = report.src - -# --- Targets ------------------------------------------------------- - - -.INCLUDE : target.mk - -$(SRS)$/$(TARGET).srs: $(SOLARINCDIR)$/svx$/globlmn.hrc diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index c737ce5c3f34..9e11d65fa427 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "propbrw.hxx" #include "RptObject.hxx" #include "ReportController.hxx" diff --git a/reportdesign/util/makefile.mk b/reportdesign/util/makefile.mk deleted file mode 100644 index 4f09018437e3..000000000000 --- a/reportdesign/util/makefile.mk +++ /dev/null @@ -1,253 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. -PRJNAME=reportdesign -TARGET=rpt -TARGET2=$(TARGET)ui -# USE_DEFFILE=TRUE -GEN_HID=TRUE -GEN_HID_OTHER=TRUE - -# --- Settings ---------------------------------- -.INCLUDE : settings.mk - -.IF "$(L10N_framework)"=="" - -# ------------------------------------------------------------------ -# --- reportdesign core (rpt) ----------------------------------- - -LIB1TARGET=$(SLB)$/$(TARGET).lib -LIB1FILES=\ - $(SLB)$/api.lib \ - $(SLB)$/coreshared.lib \ - $(SLB)$/core_resource.lib \ - $(SLB)$/core_sdr.lib \ - $(SLB)$/core_misc.lib - -SHL1TARGET=$(TARGET)$(DLLPOSTFIX) - -SHL1STDLIBS= \ - $(EDITENGLIB) \ - $(SVXCORELIB) \ - $(SVXLIB) \ - $(FWELIB) \ - $(SFXLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(SVLLIB) \ - $(SVTOOLLIB) \ - $(UNOTOOLSLIB) \ - $(DBTOOLSLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(VCLLIB) \ - $(TKLIB) \ - $(VOSLIB) \ - $(SALLIB) - -.IF "$(GUI)"=="OS2" -SHL1STDLIBS+= \ - idbu.lib -.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC" -SHL1STDLIBS+= \ - -ldbu$(DLLPOSTFIX) -.ELSE -SHL1STDLIBS+= \ - idbu.lib -.ENDIF - -SHL1IMPLIB=i$(TARGET) -SHL1USE_EXPORTS=name -SHL1LIBS=$(LIB1TARGET) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -DEFLIB1NAME=$(TARGET) -.ENDIF -# --- .res file ---------------------------------------------------------- - -RES1FILELIST=\ - $(SRS)$/core_strings.srs - -RESLIB1NAME=$(TARGET) -RESLIB1IMAGES=$(PRJ)$/res -RESLIB1SRSFILES=$(RES1FILELIST) - -.IF "$(L10N_framework)"=="" -# --- reportdesign UI core (rptui) ----------------------------------- -LIB2TARGET=$(SLB)$/$(TARGET2).lib -LIB2FILES=\ - $(SLB)$/uimisc.lib \ - $(SLB)$/uidlg.lib \ - $(SLB)$/uishared.lib \ - $(SLB)$/ui_inspection.lib \ - $(SLB)$/report.lib - -SHL2TARGET=$(TARGET2)$(DLLPOSTFIX) - -SHL2STDLIBS= \ - $(EDITENGLIB) \ - $(SVXCORELIB) \ - $(SVXLIB) \ - $(SFXLIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(SOTLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(DBTOOLSLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(FWELIB) \ - $(SO2LIB) \ - $(I18NISOLANGLIB) \ - $(SALLIB) -.IF "$(GUI)"=="OS2" -SHL2STDLIBS+= \ - idbu.lib \ - i$(TARGET).lib -.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC" -SHL2STDLIBS+= \ - -ldbu$(DLLPOSTFIX) \ - -l$(TARGET)$(DLLPOSTFIX) -.ELSE -SHL2STDLIBS+= \ - idbu.lib \ - i$(TARGET).lib -.ENDIF - -.IF "$(GUI)"=="OS2" -SHL2STDLIBS+= \ - ifor.lib \ - iforui.lib -.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC" -SHL2STDLIBS+= \ - -lfor$(DLLPOSTFIX) \ - -lforui$(DLLPOSTFIX) -.ELSE -SHL2STDLIBS+= \ - ifor.lib \ - iforui.lib -.ENDIF - - -SHL2DEPN=$(SHL1TARGETN) -SHL2LIBS=$(LIB2TARGET) -SHL2DEF=$(MISC)$/$(SHL2TARGET).def -DEF2NAME=$(SHL2TARGET) -SHL2VERSIONMAP=$(SOLARENV)/src/component.map -.ENDIF -# --- .res file ---------------------------------------------------------- -RES2FILELIST=\ - $(SRS)$/uidlg.srs \ - $(SRS)$/ui_inspection.srs \ - $(SRS)$/report.srs - -RESLIB2NAME=$(TARGET2) -RESLIB2IMAGES=$(PRJ)$/res -RESLIB2SRSFILES=$(RES2FILELIST) -.IF "$(L10N_framework)"=="" - -# ------------------- rptxml ------------------- -TARGET3=rptxml -# --- Library ----------------------------------- -LIB3TARGET=$(SLB)$/rpt_flt.lib -LIB3FILES=\ - $(SLB)$/xmlshared.lib \ - $(SLB)$/$(TARGET3).lib - -SHL3TARGET=$(TARGET3)$(DLLPOSTFIX) - -SHL3STDLIBS=\ - $(EDITENGLIB) \ - $(SVXCORELIB) \ - $(XMLOFFLIB) \ - $(VCLLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(DBTOOLSLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(UCBHELPERLIB) \ - $(SFXLIB) \ - $(SVLLIB) \ - $(SOTLIB) \ - $(SO2LIB) \ - $(SALLIB) -.IF "$(GUI)"=="OS2" -SHL3STDLIBS+= \ - irpt.lib -.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC" -SHL3STDLIBS+= \ - -l$(TARGET)$(DLLPOSTFIX) -.ELSE -SHL3STDLIBS+= \ - irpt.lib -.ENDIF - - -SHL3DEPN=$(SHL1TARGETN) -SHL3LIBS=$(LIB3TARGET) -SHL3IMPLIB= i$(SHL3TARGET) -SHL3VERSIONMAP=$(SOLARENV)/src/component.map -SHL3DEF= $(MISC)$/$(SHL3TARGET).def - -DEF3NAME=$(SHL3TARGET) - -.ENDIF - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - - - -ALLTAR : $(MISC)/rpt.component $(MISC)/rptui.component $(MISC)/rptxml.component - -$(MISC)/rpt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - rpt.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt rpt.component - -$(MISC)/rptui.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - rptui.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt rptui.component - -$(MISC)/rptxml.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - rptxml.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL3TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt rptxml.component -- cgit