summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-08-20 07:46:55 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-08-20 07:46:55 +0000
commitcf63851090191daea04d3c7948cb8d965a537f40 (patch)
tree554bb97faf2434150b5e39e2bb170b8c1991804c /chart2
parentde77a60aff7f3c768c50b9f470edf374d6849b24 (diff)
INTEGRATION: CWS sch03 (1.4.2); FILE MERGED
2004/08/17 09:15:47 dr 1.4.2.1: #i32576# new svx controls added in CWS dr14
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/dialogs/tp_TitleRotation.hxx24
1 files changed, 17 insertions, 7 deletions
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index b8c839da58b4..b3751e56b454 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tp_TitleRotation.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: dr $ $Date: 2004-08-04 14:14:26 $
+ * last change: $Author: rt $ $Date: 2004-08-20 08:46:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -72,10 +72,17 @@
#ifndef _SFXTABDLG_HXX
#include <sfx2/tabdlg.hxx>
#endif
-// header for SvxWinOrientation
-#ifndef SVX_ORIENTHELPER_HXX //autogen
+
+#ifndef SVX_DIALCONTROL_HXX
+#include <svx/dialcontrol.hxx>
+#endif
+#ifndef SVX_WRAPFIELD_HXX
+#include <svx/wrapfield.hxx>
+#endif
+#ifndef SVX_ORIENTHELPER_HXX
#include <svx/orienthelper.hxx>
#endif
+
/*
// header for class ValueSet
#ifndef _VALUESET_HXX
@@ -107,9 +114,12 @@ private:
//Seit 4/1998 koennen Texte frei gedreht werden: SID_ATTR_ALIGN_DEGREES
-#if 0 // DR: TODO new control types
- svx::OrientationHelper aWinOrient;
-#endif
+ FixedLine aFlAlign;
+ svx::DialControl aCtrlDial;
+ FixedText aFtRotate;
+ svx::WrapField aNfRotate;
+ TriStateBox aCbStacked;
+ svx::OrientationHelper aOrientHlp;
// CheckBox aCbxTextOverlap;