diff options
| author | Thomas Benisch <tbe@openoffice.org> | 2010-03-01 12:22:02 +0100 |
|---|---|---|
| committer | Thomas Benisch <tbe@openoffice.org> | 2010-03-01 12:22:02 +0100 |
| commit | 568a8725aec92ee9aac36d690ef068c458b303c2 (patch) | |
| tree | 0e2269be1d4fec29ca458ee665f73c0acbd3c917 /chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | |
| parent | chartshapes: #i12587# line styles are not saved (diff) | |
| parent | CWS-TOOLING: integrate CWS changefileheader2 (diff) | |
| download | core-568a8725aec92ee9aac36d690ef068c458b303c2.tar.gz core-568a8725aec92ee9aac36d690ef068c458b303c2.zip | |
chartshapes: merge with DEV300_m72
Diffstat (limited to 'chart2/source/controller/dialogs/dlg_ObjectProperties.cxx')
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index d095d54d1e07..285464dc90ff 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dlg_ObjectProperties.cxx,v $ - * $Revision: 1.23.42.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -34,7 +31,7 @@ #ifndef _ZFORLIST_DECLARE_TABLE #define _ZFORLIST_DECLARE_TABLE #endif -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #endif #include "dlg_ObjectProperties.hxx" @@ -66,8 +63,8 @@ #include <com/sun/star/chart2/XAxis.hpp> #include <com/sun/star/chart2/XChartType.hpp> #include <com/sun/star/chart2/XDataSeries.hpp> -#include <svtools/intitem.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/intitem.hxx> +#include <svl/languageoptions.hxx> #include <svx/svxids.hrc> @@ -76,13 +73,13 @@ #include <svx/svxgrahicitem.hxx> #include <svx/dialogs.hrc> -#include <svx/flstitem.hxx> +#include <editeng/flstitem.hxx> #include <svx/tabline.hxx> #include <svx/flagsdef.hxx> #include <svx/numinf.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> //............................................................................. namespace chart |