chartpositioning: merge with DEV300_m75 (part2)

4 files changed, 9 insertions, 21 deletions

diff --git a/chart2/source/controller/dialogs/tp_DiagramPosition.cxx b/chart2/source/controller/dialogs/tp_DiagramPosition.cxx
index ff9b6e23cfd7..68150dceeb22 100644
--- a/chart2/source/controller/dialogs/tp_DiagramPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_DiagramPosition.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: tp_DiagramPosition.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,8 +38,8 @@
 #include <svx/svdview.hxx>
 //GetModuleFieldUnit
 #include <svx/dlgutil.hxx>
-#include <svtools/rectitem.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/rectitem.hxx>
+#include <svl/aeitem.hxx>
 // header for class SvxDoubleItem
 #include <svx/chrtitem.hxx>
 
@@ -132,7 +129,7 @@ DiagramPositionTabPage::DiagramPositionTabPage( Window* pParent, const SfxItemSe
 void DiagramPositionTabPage::Construct()
 {
     // get range and work area
-    meDlgUnit = GetModuleFieldUnit( &GetItemSet() );
+    meDlgUnit = GetModuleFieldUnit( GetItemSet() );
     SetFieldUnit( maMtrPosX, meDlgUnit, TRUE );
     SetFieldUnit( maMtrPosY, meDlgUnit, TRUE );
     SetFieldUnit( maMtrWidth, meDlgUnit, TRUE );
diff --git a/chart2/source/controller/dialogs/tp_DiagramPosition.hxx b/chart2/source/controller/dialogs/tp_DiagramPosition.hxx
index 153c9d26ca75..90825b97ba15 100644
--- a/chart2/source/controller/dialogs/tp_DiagramPosition.hxx
+++ b/chart2/source/controller/dialogs/tp_DiagramPosition.hxx
@@ -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: tp_DiagramPosition.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/chart2/source/controller/inc/DiagramItemConverter.hxx b/chart2/source/controller/inc/DiagramItemConverter.hxx
index 9df7b093d573..280b9cffb45b 100644
--- a/chart2/source/controller/inc/DiagramItemConverter.hxx
+++ b/chart2/source/controller/inc/DiagramItemConverter.hxx
@@ -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: AxisItemConverter.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/chart2/source/controller/itemsetwrapper/DiagramItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DiagramItemConverter.cxx
index 00f1fb664739..bc1cd71ed338 100644
--- a/chart2/source/controller/itemsetwrapper/DiagramItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DiagramItemConverter.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: DiagramItemConverter.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,11 +34,11 @@
 #include "macros.hxx"
 #include "servicenames.hxx"
 #include "chartview/ExplicitValueProvider.hxx"
-#include <svtools/rectitem.hxx>
+#include <svl/rectitem.hxx>
 #include "ItemPropertyMap.hxx"
 #include "GraphicPropertyItemConverter.hxx"
 #include <svx/chrtitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 #include <functional>
 #include <algorithm>