diff options
author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-06-03 18:53:52 +0200 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-06-03 18:53:52 +0200 |
commit | ac7956251708f163ef56ad98bbc184e3709e219f (patch) | |
tree | 093f29c1fdfd26f99dab58a4f6148b7aac4d9573 /svl/source/items | |
parent | 77bd1e8dc393ca5919101400f700d35c09470627 (diff) | |
parent | 4d1c1eae73df67c115f532b7078deaf7caf4cde8 (diff) |
slidecopy: merge after copying in CWS renaissance2
Diffstat (limited to 'svl/source/items')
-rw-r--r-- | svl/source/items/cstitem.src | 2 | ||||
-rw-r--r-- | svl/source/items/dateitem.cxx | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/svl/source/items/cstitem.src b/svl/source/items/cstitem.src index b3511ffb302b..009fcb19e3c6 100644 --- a/svl/source/items/cstitem.src +++ b/svl/source/items/cstitem.src @@ -25,7 +25,7 @@ * ************************************************************************/ -#include <svl/svtools.hrc> +#include <svl/svl.hrc> String STR_COLUM_DT_AUTO { Text [ en-US ] = "automatic" ; diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx index 3c8e85c461f2..27170c1d4f6e 100644 --- a/svl/source/items/dateitem.cxx +++ b/svl/source/items/dateitem.cxx @@ -33,7 +33,7 @@ #define _DATETIMEITEM_CXX #include <svl/dateitem.hxx> #include <svl/svldata.hxx> -#include <svl/svtools.hrc> +#include <svl/svl.hrc> #include <unotools/intlwrapper.hxx> #include <comphelper/processfactory.hxx> @@ -45,7 +45,6 @@ #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/lang/Locale.hpp> - // STATIC DATA ----------------------------------------------------------- DBG_NAME(SfxDateTimeItem) |