diff options
| author | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-04-14 10:02:49 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 14:32:44 +0200 |
| commit | 22a4c2db80f641277fd960d57776373fa3ae517a (patch) | |
| tree | a53c5a46b86a657eee5e3ca10d34af2761e977da /reportdesign/source | |
| parent | 1ba7b7c30f13bc3764a338a5a90c2fc7ff09afa6 (diff) | |
gnumake4: converted reportdesign [hg:e3de7a65caba]
Diffstat (limited to 'reportdesign/source')
111 files changed, 171 insertions, 703 deletions
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 <com/sun/star/beans/PropertyAttribute.hpp> #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 <com/sun/star/beans/PropertyAttribute.hpp> #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 <com/sun/star/beans/PropertyAttribute.hpp> -#ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC #include "corestrings.hrc" -#endif #include <tools/debug.hxx> #include <connectivity/dbtools.hxx> #include <comphelper/sequence.hxx> 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 <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertyState.hpp> 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 <com/sun/star/beans/PropertyAttribute.hpp> #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 <tools/debug.hxx> 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 <com/sun/star/beans/PropertyAttribute.hpp> 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 <tools/debug.hxx> 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 <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertyState.hpp> -#ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC #include "corestrings.hrc" -#endif -#ifndef REPORTDESIGN_CORE_RESOURCE_HRC_ #include "core_resource.hrc" -#endif #include "core_resource.hxx" #include <comphelper/sequence.hxx> #include "Tools.hxx" 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 <vcl/svapp.hxx> #include <vcl/outdev.hxx> #include <toolkit/helper/vclunohelper.hxx> 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 <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> 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 <com/sun/star/beans/PropertyValue.hpp> #include "ReportEngineJFree.hxx" #include <comphelper/enumhelper.hxx> 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 <comphelper/enumhelper.hxx> #include <connectivity/dbtools.hxx> 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 <com/sun/star/beans/NamedValue.hpp> 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 <comphelper/property.hxx> 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 -# <http://www.openoffice.org/license.html> -# 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 <cppuhelper/factory.hxx> #include <osl/diagnose.h> 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 -# <http://www.openoffice.org/license.html> -# 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 <tools/simplerm.hxx> 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 -# <http://www.openoffice.org/license.html> -# 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 <comphelper/configurationhelper.hxx> #include <comphelper/processfactory.hxx> 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 <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> 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 -# <http://www.openoffice.org/license.html> -# 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 <comphelper/sequence.hxx> // ------------------------------------------------------------------------- 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 -# <http://www.openoffice.org/license.html> -# 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 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.report.XMLSettingsExporter"> + <service name="com.sun.star.document.ExportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.report.XMLContentExporter"> + <service name="com.sun.star.document.ExportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.report.XMLStylesExporter"> + <service name="com.sun.star.document.ExportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.report.XMLMetaExporter"> + <service name="com.sun.star.document.ExportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.report.XMLFullExporter"> + <service name="com.sun.star.document.ExportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.report.ExportFilter"> + <service name="com.sun.star.document.ExportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.report.ORptTypeDetection"> + <service name="com.sun.star.document.ExtendedTypeDetection"/> + </implementation> + <implementation name="com.sun.star.comp.Report.XMLOasisSettingsImporter"> + <service name="com.sun.star.document.ImportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.Report.XMLOasisStylesImporter"> + <service name="com.sun.star.document.ImportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.Report.XMLOasisContentImporter"> + <service name="com.sun.star.document.ImportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.Report.XMLOasisMetaImporter"> + <service name="com.sun.star.document.ImportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.report.OReportFilter"> + <service name="com.sun.star.document.ImportFilter"/> + </implementation> +</component> 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 <xmloff/xmluconv.hxx> 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 <xmloff/xmltoken.hxx> 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 <xmloff/xmltoken.hxx> 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 <xmloff/xmluconv.hxx> #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 <com/sun/star/sdb/CommandType.hpp> 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 <xmloff/xmltoken.hxx> 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 <xmloff/xmltoken.hxx> 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 <xmloff/xmltoken.hxx> 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 <xmloff/xmltoken.hxx> 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 <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> 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 <xmloff/xmltoken.hxx> 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 <com/sun/star/sdb/CommandType.hpp> 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 <xmloff/xmltoken.hxx> 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 <xmloff/xmltoken.hxx> 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 <xmloff/xmltoken.hxx> 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 <xmloff/xmltoken.hxx> 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 <xmloff/nmspmap.hxx> #include <xmloff/xmlnmspe.hxx> 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 <xmloff/xmltoken.hxx> 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 <com/sun/star/packages/zip/ZipIOException.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/beans/NamedValue.hpp> 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 <cppuhelper/factory.hxx> #include <osl/diagnose.h> #include <cppuhelper/implementationentry.hxx> @@ -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 -# <http://www.openoffice.org/license.html> -# 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 <svx/dbaexchange.hxx> 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 <sot/formats.hxx> #include <sot/storage.hxx> 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 <connectivity/dbtools.hxx> 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 <svx/dialogs.hrc> 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 -# <http://www.openoffice.org/license.html> -# 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 <com/sun/star/lang/XInitialization.hpp> #include <comphelper/namedvaluecollection.hxx> 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 <comphelper/sequence.hxx> #include <com/sun/star/ucb/AlreadyInitializedException.hpp> 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 <comphelper/sequence.hxx> 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 <com/sun/star/lang/XInitialization.hpp> #include <comphelper/sequence.hxx> 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 -# <http://www.openoffice.org/license.html> -# 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 <svtools/localresaccess.hxx> #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 <svl/smplhint.hxx> #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 <tools/debug.hxx> 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 <toolkit/helper/convert.hxx> 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 -# <http://www.openoffice.org/license.html> -# 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 <cppuhelper/factory.hxx> #include <osl/diagnose.h> #include <cppuhelper/implementationentry.hxx> 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 <svx/zoomsliderctrl.hxx> 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 <com/sun/star/ui/ImageType.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> 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 <tools/debug.hxx> 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 <FixedTextColor.hxx> #include <com/sun/star/report/XFixedText.hpp> 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 <FormattedFieldBeautifier.hxx> 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 <ReportControllerObserver.hxx> #include <ReportController.hxx> 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 <RptPage.hxx> 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 <vcl/image.hxx> #include <vcl/svapp.hxx> 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 <comphelper/processfactory.hxx> #include <com/sun/star/datatransfer/XMimeContentType.hpp> 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 <vcl/scrbar.hxx> #include <vcl/svapp.hxx> #include <vcl/seleng.hxx> 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 -# <http://www.openoffice.org/license.html> -# 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" |