summaryrefslogtreecommitdiff
path: root/svx/inc/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/inc/svx')
-rw-r--r--svx/inc/svx/bmpmask.hxx7
-rw-r--r--svx/inc/svx/chrtitem.hxx34
-rwxr-xr-xsvx/inc/svx/dialogs.hrc16
-rw-r--r--svx/inc/svx/float3d.hxx26
-rw-r--r--svx/inc/svx/fontworkgallery.hxx2
-rw-r--r--svx/inc/svx/hdft.hxx2
-rw-r--r--svx/inc/svx/svdstr.hrc8
7 files changed, 41 insertions, 54 deletions
diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx
index 39ae551db3dd..ae0ac7b9d630 100644
--- a/svx/inc/svx/bmpmask.hxx
+++ b/svx/inc/svx/bmpmask.hxx
@@ -96,6 +96,9 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
PushButton aBtnExec;
FixedLine aGrpQ;
+ FixedText aFt1;
+ FixedText aFt2;
+ FixedText aFt3;
CheckBox aCbx1;
MaskSet* pQSet1;
MetricField aSp1;
@@ -119,9 +122,7 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
MaskData* pData;
CheckBox aCbxTrans;
ColorLB aLbColorTrans;
- FixedText aFt1;
- FixedText aFt2;
- FixedText aFt3;
+
const XColorTable* pColTab;
Color aPipetteColor;
SvxBmpMaskSelectItem aSelItem;
diff --git a/svx/inc/svx/chrtitem.hxx b/svx/inc/svx/chrtitem.hxx
index bc68bf1df705..ce1f5ea0753f 100644
--- a/svx/inc/svx/chrtitem.hxx
+++ b/svx/inc/svx/chrtitem.hxx
@@ -114,21 +114,6 @@ enum SvxChartDataDescr
#define CHDESCR_COUNT (CHDESCR_TEXTANDVALUE + 1)
-enum SvxChartLegendPos
-{
- CHLEGEND_NONE,
- CHLEGEND_LEFT,
- CHLEGEND_TOP,
- CHLEGEND_RIGHT,
- CHLEGEND_BOTTOM,
- CHLEGEND_NONE_TOP,
- CHLEGEND_NONE_LEFT,
- CHLEGEND_NONE_RIGHT,
- CHLEGEND_NONE_BOTTOM
-};
-
-#define CHLEGEND_COUNT (CHLEGEND_BOTTOM + 1)
-
enum SvxChartTextOrder
{
CHTXTORDER_SIDEBYSIDE,
@@ -243,25 +228,6 @@ public:
//------------------------------------------------------------------
-class SVX_DLLPUBLIC SvxChartLegendPosItem : public SfxEnumItem
-{
-public:
- TYPEINFO();
- SvxChartLegendPosItem(SvxChartLegendPos eLegendPos /*= CHLEGEND_NONE*/,
- sal_uInt16 nId );
- SvxChartLegendPosItem(SvStream& rIn,
- sal_uInt16 nId );
-
- virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
-
- sal_uInt16 GetValueCount() const { return CHLEGEND_COUNT; }
- SvxChartLegendPos GetValue() const
- { return (SvxChartLegendPos)SfxEnumItem::GetValue(); }
-};
-
-//------------------------------------------------------------------
-
class SVX_DLLPUBLIC SvxChartTextOrderItem : public SfxEnumItem
{
public:
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index b28b150bd487..3bca44105edd 100755
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -52,6 +52,14 @@
#define RID_SVXSTR_LINESTYLE (RID_SVX_START + 173)
#define RID_SVXSTR_FIELDUNIT_TABLE (RID_SVX_START + 311)
#define RID_SVXSTR_COLOR_USER (RID_SVX_START + 250)
+//IAccessibility2 Implementation 2009-----
+#define RID_SVXSTR_GALLERYPROPS_GALTHEME (RID_SVX_START + 251)
+#define RID_SVXSTR_GALLERY_THEMEITEMS (RID_SVX_START + 252)
+#define RID_SVXSTR_GALLERY_THEMENAME (RID_SVX_START + 253)
+#define RID_SVXSTR_GALLERY_FILESFOUND (RID_SVX_START + 254)
+#define RID_SVXSTR_GALLERY_PREVIEW (RID_SVX_START + 255)
+//-----IAccessibility2 Implementation 2009
+
// factory IDs of tabpages implemented in CUI
#define RID_SVXPAGE_CHAR_TWOLINES (RID_SVX_START + 242)
@@ -956,6 +964,9 @@
#define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1191)
+//IAccessibility2 Implementation 2009-----
+#define RID_SVXSTR_TEXTCOLOR (RID_SVX_START + 1178)
+//-----IAccessibility2 Implementation 2009
// ----------------------------------------------------------------------------
// if we have _a_lot_ time, we should group the resource ids by type, instead
// of grouping them by semantics. The reason is that resource ids have to be
@@ -1049,5 +1060,10 @@
#define OFA_TP_TABPROPERTIES_TEXT (RID_OFA_START + 245)
#define OFA_TP_HELPERPROG (RID_OFA_START + 249)
+// IAccessibility2 implementation 2009. ------
+#define STR_COLORTABLE (RID_OFA_START + 257)
+#define STR_SWITCH (RID_OFA_START + 258)
+// ------ IAccessibility2 implementation 2009.
+
#endif
diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx
index 13eb8a697de0..8ad3d618d271 100644
--- a/svx/inc/svx/float3d.hxx
+++ b/svx/inc/svx/float3d.hxx
@@ -84,6 +84,7 @@ private:
ImageButton aBtnUpdate;
ImageButton aBtnAssign;
+ FixedLine aFLGeometrie;
// Geometrie
FixedText aFtPercentDiagonal;
MetricField aMtrPercentDiagonal;
@@ -93,36 +94,35 @@ private:
MetricField aMtrEndAngle;
FixedText aFtDepth;
MetricField aMtrDepth;
- FixedLine aFLGeometrie;
+ FixedLine aFLSegments;
FixedText aFtHorizontal;
NumericField aNumHorizontal;
FixedText aFtVertical;
NumericField aNumVertical;
- FixedLine aFLSegments;
+ FixedLine aFLNormals;
ImageButton aBtnNormalsObj;
ImageButton aBtnNormalsFlat;
ImageButton aBtnNormalsSphere;
ImageButton aBtnNormalsInvert;
ImageButton aBtnTwoSidedLighting;
- FixedLine aFLNormals;
ImageButton aBtnDoubleSided;
-
+ FixedLine aFLRepresentation;
// Darstellung
FixedText aFtShademode;
ListBox aLbShademode;
+ FixedLine aFLShadow;
ImageButton aBtnShadow3d;
FixedText aFtSlant;
MetricField aMtrSlant;
- FixedLine aFLShadow;
FixedText aFtDistance;
MetricField aMtrDistance;
FixedText aFtFocalLeng;
MetricField aMtrFocalLength;
FixedLine aFLCamera;
- FixedLine aFLRepresentation;
+ FixedLine aFLLight;
// Beleuchtung
ImageButton aBtnLight1;
@@ -133,6 +133,7 @@ private:
ImageButton aBtnLight6;
ImageButton aBtnLight7;
ImageButton aBtnLight8;
+ FixedText aFTLightsource;
ColorLB aLbLight1;
ColorLB aLbLight2;
ColorLB aLbLight3;
@@ -143,7 +144,6 @@ private:
ColorLB aLbLight8;
ImageButton aBtnLightColor;
- FixedText aFTLightsource;
// #99694# Keyboard shortcuts activate the next control, so the
// order needed to be changed here
@@ -151,7 +151,7 @@ private:
ColorLB aLbAmbientlight; // ListBox
ImageButton aBtnAmbientColor; // color button
- FixedLine aFLLight;
+ FixedLine aFLTexture;
// Texturen
FixedText aFtTexKind;
@@ -171,9 +171,9 @@ private:
ImageButton aBtnTexCircleY;
FixedText aFtTexFilter;
ImageButton aBtnTexFilter;
- FixedLine aFLTexture;
// Material
+ FixedLine aFLMaterial;
// Materialeditor
FixedText aFtMatFavorites;
ListBox aLbMatFavorites;
@@ -183,20 +183,20 @@ private:
FixedText aFtMatEmission;
ColorLB aLbMatEmission;
ImageButton aBtnEmissionColor;
+ FixedLine aFLMatSpecular;
FixedText aFtMatSpecular;
ColorLB aLbMatSpecular;
ImageButton aBtnSpecularColor;
FixedText aFtMatSpecularIntensity;
MetricField aMtrMatSpecularIntensity;
- FixedLine aFLMatSpecular;
- FixedLine aFLMaterial;
+
+ Svx3DPreviewControl aCtlPreview;
+ SvxLightCtl3D aCtlLightPreview;
// Unterer Teil
ImageButton aBtnConvertTo3D;
ImageButton aBtnLatheObject;
ImageButton aBtnPerspective;
- Svx3DPreviewControl aCtlPreview;
- SvxLightCtl3D aCtlLightPreview;
// der Rest ...
Image aImgLightOn;
diff --git a/svx/inc/svx/fontworkgallery.hxx b/svx/inc/svx/fontworkgallery.hxx
index 36502ccecca5..53c5b9b7bf38 100644
--- a/svx/inc/svx/fontworkgallery.hxx
+++ b/svx/inc/svx/fontworkgallery.hxx
@@ -91,8 +91,8 @@ public:
class SVX_DLLPUBLIC FontWorkGalleryDialog : public ModalDialog
{
- ValueSet maCtlFavorites;
FixedLine maFLFavorites;
+ ValueSet maCtlFavorites;
OKButton maOKButton;
CancelButton maCancelButton;
HelpButton maHelpButton;
diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx
index adc4745ace83..d30189ce81a0 100644
--- a/svx/inc/svx/hdft.hxx
+++ b/svx/inc/svx/hdft.hxx
@@ -70,6 +70,7 @@ protected:
SvxHFPage( Window* pParent, sal_uInt16 nResId, const SfxItemSet& rSet,
sal_uInt16 nSetId );
+ FixedLine aFrm;
CheckBox aTurnOnBox;
CheckBox aCntSharedBox;
FixedText aLMLbl;
@@ -82,7 +83,6 @@ protected:
FixedText aHeightFT;
MetricField aHeightEdit;
CheckBox aHeightDynBtn;
- FixedLine aFrm;
SvxPageWindow aBspWin;
PushButton aBackgroundBtn;
diff --git a/svx/inc/svx/svdstr.hrc b/svx/inc/svx/svdstr.hrc
index d778bf40326b..2049bc4c3fdc 100644
--- a/svx/inc/svx/svdstr.hrc
+++ b/svx/inc/svx/svdstr.hrc
@@ -185,8 +185,12 @@
#define STR_ObjNameSingulMEDIA (STR_ObjNameBegin + 143)
#define STR_ObjNamePluralMEDIA (STR_ObjNameBegin + 144)
-#define STR_ObjNameEnd (STR_ObjNamePluralMEDIA)
-
+//#define STR_ObjNameEnd (STR_ObjNamePluralMEDIA)
+//IAccessibility2 Implementation 2009-----
+#define STR_ObjNameSingulFONTWORK (STR_ObjNameBegin+145)
+#define STR_ObjNamePluralFONTWORK (STR_ObjNameBegin+146)
+#define STR_ObjNameEnd (STR_ObjNamePluralFONTWORK)
+//-----IAccessibility2 Implementation 2009
#define STR_EditBegin (STR_ObjNameEnd+1)
#define STR_EditWithCopy (STR_EditBegin + 0)
#define STR_EditPosSize (STR_EditBegin + 1)
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-12 17:30:57 +0000