diff options
author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-01-06 11:11:47 +0100 |
---|---|---|
committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-01-06 11:11:47 +0100 |
commit | bbbe82cbcf46409d3efa342e155f09d38483c337 (patch) | |
tree | 6da2f1813719f2b6e02d71fb9dbbc3a12d9ba376 /svtools/source/config | |
parent | 90caa1cd9c39fdaf4a94880cafbb7f242925e8a6 (diff) | |
parent | 7997ab5bac6fbdfe3b3427c322507a993d33acbc (diff) |
rebase to DEV300_m96
Diffstat (limited to 'svtools/source/config')
-rw-r--r-- | svtools/source/config/apearcfg.cxx | 2 | ||||
-rw-r--r-- | svtools/source/config/extcolorcfg.cxx | 2 | ||||
-rw-r--r-- | svtools/source/config/fontsubstconfig.cxx | 2 | ||||
-rw-r--r-- | svtools/source/config/itemholder2.cxx | 4 | ||||
-rw-r--r-- | svtools/source/config/makefile.mk | 58 | ||||
-rw-r--r-- | svtools/source/config/miscopt.cxx | 2 | ||||
-rw-r--r-- | svtools/source/config/test/makefile.mk | 62 |
7 files changed, 6 insertions, 126 deletions
diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx index bb8087fc53be..4a95d0c03dcd 100644 --- a/svtools/source/config/apearcfg.cxx +++ b/svtools/source/config/apearcfg.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "apearcfg.hxx" +#include <svtools/apearcfg.hxx> #include "com/sun/star/uno/Any.hxx" #include "tools/debug.hxx" diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 993025b22884..35d0276144ec 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "extcolorcfg.hxx" +#include <svtools/extcolorcfg.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/lang/Locale.hpp> diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx index 7bcbc1e4be82..bf372902fb6f 100644 --- a/svtools/source/config/fontsubstconfig.cxx +++ b/svtools/source/config/fontsubstconfig.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "fontsubstconfig.hxx" +#include <svtools/fontsubstconfig.hxx> #include <svl/svarray.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Any.hxx> diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index 8e971a1629bf..2382bf3ad7a3 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -36,10 +36,10 @@ #include <com/sun/star/lang/XComponent.hpp> #include <svtools/accessibilityoptions.hxx> -#include <apearcfg.hxx> +#include <svtools/apearcfg.hxx> #include <svtools/menuoptions.hxx> #include <svtools/colorcfg.hxx> -#include <fontsubstconfig.hxx> +#include <svtools/fontsubstconfig.hxx> #include <svtools/helpopt.hxx> #include <svtools/printoptions.hxx> #include <unotools/options.hxx> diff --git a/svtools/source/config/makefile.mk b/svtools/source/config/makefile.mk deleted file mode 100644 index d3ba43de68ef..000000000000 --- a/svtools/source/config/makefile.mk +++ /dev/null @@ -1,58 +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=..$/.. - -PRJNAME=svtools -TARGET=config - -ENABLE_EXCEPTIONS := TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/svt.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/accessibilityoptions.obj \ - $(SLO)$/apearcfg.obj \ - $(SLO)$/colorcfg.obj \ - $(SLO)$/extcolorcfg.obj \ - $(SLO)$/fontsubstconfig.obj \ - $(SLO)$/helpopt.obj \ - $(SLO)$/htmlcfg.obj \ - $(SLO)$/itemholder2.obj \ - $(SLO)$/menuoptions.obj \ - $(SLO)$/miscopt.obj \ - $(SLO)$/optionsdrawinglayer.obj \ - $(SLO)$/printoptions.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index 7b04b56104e0..2f455734a01d 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -45,7 +45,7 @@ #include <rtl/logfile.hxx> #include "itemholder2.hxx" -#include <imgdef.hxx> +#include <svtools/imgdef.hxx> #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ diff --git a/svtools/source/config/test/makefile.mk b/svtools/source/config/test/makefile.mk deleted file mode 100644 index 71bea788d8de..000000000000 --- a/svtools/source/config/test/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=..$/..$/.. - -PRJNAME= svtools -TARGET= test_configitems -LIBTARGET= NO -ENABLE_EXCEPTIONS= TRUE -USE_DEFFILE= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- application: "test" -------------------------------------------------- - -APP1TARGET= test - -APP1OBJS= $(SLO)$/test.obj \ - $(SLO)$/dynamicmenuoptions.obj - -DEPOBJFILES=$(APP1OBJS) - -APP1STDLIBS= $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(COMPHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(SALLIB) \ - $(VOSLIB) \ - $(TOOLSLIB) \ - $(VCLLIB) - -APP1DEPN= $(SLO)$/dynamicmenuoptions.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - |