summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorJoseph Powers <jpowers27@cox.net>2010-11-05 19:24:42 -0700
committerNorbert Thiebaud <nthiebaud@gmail.com>2010-11-06 10:09:11 -0500
commit858a431c25f7c8616c97bbe79b7cfb5913e59353 (patch)
tree35b1fd6adb1fd753a58f823eee90fde5b9a6df3a /svx
parent3247591e5cfa6b258e50c53673c3700b023c5088 (diff)
High-Contrast Cleanup Phase #1
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/fontworkgallery.hrc12
-rw-r--r--svx/inc/gallery.hrc4
-rw-r--r--svx/inc/imapdlg.hxx3
-rw-r--r--svx/inc/svx/bmpmask.hxx3
-rwxr-xr-xsvx/inc/svx/dialogs.hrc88
-rw-r--r--svx/inc/svx/fontwork.hxx3
-rw-r--r--svx/inc/svx/langbox.hxx9
-rw-r--r--svx/source/dialog/_bmpmask.cxx9
-rw-r--r--svx/source/dialog/_contdlg.cxx11
-rw-r--r--svx/source/dialog/bmpmask.hrc5
-rw-r--r--svx/source/dialog/bmpmask.src7
-rw-r--r--svx/source/dialog/contdlg.hrc3
-rw-r--r--svx/source/dialog/contdlg.src13
-rw-r--r--svx/source/dialog/contimp.hxx3
-rw-r--r--svx/source/dialog/docrecovery.cxx13
-rw-r--r--svx/source/dialog/docrecovery.hrc5
-rw-r--r--svx/source/dialog/docrecovery.src14
-rw-r--r--svx/source/dialog/fontwork.cxx23
-rw-r--r--svx/source/dialog/fontwork.hrc3
-rw-r--r--svx/source/dialog/fontwork.src57
-rw-r--r--svx/source/dialog/frmsel.cxx2
-rw-r--r--svx/source/dialog/hyprlink.cxx2
-rw-r--r--svx/source/dialog/imapdlg.cxx7
-rw-r--r--svx/source/dialog/imapdlg.hrc3
-rw-r--r--svx/source/dialog/imapdlg.src9
-rw-r--r--svx/source/dialog/langbox.cxx17
-rw-r--r--svx/source/dialog/langbox.src8
-rw-r--r--svx/source/form/datanavi.cxx21
-rw-r--r--svx/source/form/datanavi.src14
-rw-r--r--svx/source/form/filtnav.cxx62
-rw-r--r--svx/source/form/fmexpl.cxx31
-rw-r--r--svx/source/form/fmexpl.src9
-rw-r--r--svx/source/form/fmshimp.cxx10
-rw-r--r--svx/source/form/navigatortree.cxx35
-rw-r--r--svx/source/form/navigatortreemodel.cxx26
-rw-r--r--svx/source/gallery2/galbrws2.cxx6
-rw-r--r--svx/source/gallery2/gallery.src15
-rw-r--r--svx/source/inc/datanavi.hrc12
-rw-r--r--svx/source/inc/datanavi.hxx5
-rw-r--r--svx/source/inc/docrecovery.hxx5
-rw-r--r--svx/source/inc/fmexpl.hxx13
-rw-r--r--svx/source/inc/fmresids.hrc3
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrpage.cxx40
-rw-r--r--svx/source/src/app.src16
-rw-r--r--svx/source/stbctrls/stbctrls.src51
-rw-r--r--svx/source/stbctrls/xmlsecctrl.cxx15
-rw-r--r--svx/source/stbctrls/zoomsliderctrl.cxx9
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx279
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.hrc27
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.hxx34
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.src278
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx58
-rw-r--r--svx/source/tbxctrls/fontworkgallery.src70
-rw-r--r--svx/source/tbxctrls/itemwin.cxx13
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx13
-rw-r--r--svx/source/tbxctrls/tbcontrl.src9
-rw-r--r--svx/source/tbxctrls/tbxcolorupdate.cxx2
57 files changed, 415 insertions, 1102 deletions
diff --git a/svx/inc/fontworkgallery.hrc b/svx/inc/fontworkgallery.hrc
index 13912923c1..6288c7beea 100644
--- a/svx/inc/fontworkgallery.hrc
+++ b/svx/inc/fontworkgallery.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -51,22 +51,12 @@
#define STR_CHARS_SPACING_KERN_PAIRS 12
#define IMG_FONTWORK_ALIGN_LEFT_16 1
-#define IMG_FONTWORK_ALIGN_LEFT_16_H 2
#define IMG_FONTWORK_ALIGN_LEFT_26 3
-#define IMG_FONTWORK_ALIGN_LEFT_26_H 4
#define IMG_FONTWORK_ALIGN_CENTER_16 5
-#define IMG_FONTWORK_ALIGN_CENTER_16_H 6
#define IMG_FONTWORK_ALIGN_CENTER_26 7
-#define IMG_FONTWORK_ALIGN_CENTER_26_H 8
#define IMG_FONTWORK_ALIGN_RIGHT_16 9
-#define IMG_FONTWORK_ALIGN_RIGHT_16_H 10
#define IMG_FONTWORK_ALIGN_RIGHT_26 11
-#define IMG_FONTWORK_ALIGN_RIGHT_26_H 12
#define IMG_FONTWORK_ALIGN_WORD_16 13
-#define IMG_FONTWORK_ALIGN_WORD_16_H 14
#define IMG_FONTWORK_ALIGN_WORD_26 15
-#define IMG_FONTWORK_ALIGN_WORD_26_H 16
#define IMG_FONTWORK_ALIGN_STRETCH_16 17
-#define IMG_FONTWORK_ALIGN_STRETCH_16_H 18
#define IMG_FONTWORK_ALIGN_STRETCH_26 19
-#define IMG_FONTWORK_ALIGN_STRETCH_26_H 20
diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc
index a22cce8e3a..2a02de4ccb 100644
--- a/svx/inc/gallery.hrc
+++ b/svx/inc/gallery.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -81,8 +81,6 @@
#define RID_SVXBMP_THEME_DEFAULT (RID_SVX_GALLERY_START + 54)
#define RID_SVXIMG_GALLERY_VIEW_ICON (RID_SVX_GALLERY_START + 56)
#define RID_SVXIMG_GALLERY_VIEW_LIST (RID_SVX_GALLERY_START + 57)
-#define RID_SVXIMG_GALLERY_VIEW_ICON_HC (RID_SVX_GALLERY_START + 58)
-#define RID_SVXIMG_GALLERY_VIEW_LIST_HC (RID_SVX_GALLERY_START + 59)
// Gallery-Bitmaps fuer Sounds
#define RID_SVXBMP_GALLERY_SOUND_0 (RID_SVX_GALLERY_START + 61)
diff --git a/svx/inc/imapdlg.hxx b/svx/inc/imapdlg.hxx
index 71e1258a46..ccd77d8ba1 100644
--- a/svx/inc/imapdlg.hxx
+++ b/svx/inc/imapdlg.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -126,7 +126,6 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
ComboBox maCbbTarget;
StatusBar aStbStatus;
ImageList maImageList;
- ImageList maImageListH;
Size aLastSize;
IMapWindow* pIMapWnd;
diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx
index 8eb8d9bffd..d6b0b0c66b 100644
--- a/svx/inc/svx/bmpmask.hxx
+++ b/svx/inc/svx/bmpmask.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -128,7 +128,6 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
SvxBmpMaskSelectItem aSelItem;
Image maImgPipette;
- Image maImgPipetteH;
virtual BOOL Close();
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index ff371f3458..3a3b39116b 100755
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -155,8 +155,8 @@
#define SID_SD_TP_CONTENTS (RID_OFA_START + 225)
#define SID_SD_TP_SNAP (RID_OFA_START + 227)
#define SID_SD_TP_MISC (RID_OFA_START + 231)
-#define RID_OFA_TP_INTERNATIONAL_SD (RID_OFA_START + 253)
-#define RID_OFA_TP_INTERNATIONAL_IMPR (RID_OFA_START + 254)
+#define RID_OFA_TP_INTERNATIONAL_SD (RID_OFA_START + 253)
+#define RID_OFA_TP_INTERNATIONAL_IMPR (RID_OFA_START + 254)
#define RID_OFA_TP_INTERNATIONAL (RID_OFA_START + 252) // calc
//---------------------------------------------------------------------
@@ -180,7 +180,6 @@
#define RID_SVXSW_FRAMEPOSITIONS (RID_SVX_START + 289)
#define RID_SVXIL_FRAME (RID_SVX_START + 65)
-#define RID_SVXIL_FRAME_HC (RID_SVX_START + 66)
#define RID_SVXDLG_3D (RID_SVX_START + 70)
#define RID_SVXPAGE_LIGHT3D (RID_SVX_START + 71)
@@ -225,18 +224,12 @@
#define RID_SVXBMP_SIZE (RID_SVX_START + 86)
#define RID_SVXBMP_SIGNET (RID_SVX_START + 87)
-#define RID_SVXBMP_SIGNET_H (RID_SVX_START + 88)
#define RID_SVXBMP_SIGNET_BROKEN (RID_SVX_START + 89)
-#define RID_SVXBMP_SIGNET_BROKEN_H (RID_SVX_START + 90)
#define RID_SVXBMP_SIGNET_NOTVALIDATED (RID_SVX_START + 91)
-#define RID_SVXBMP_SIGNET_NOTVALIDATED_H (RID_SVX_START + 92)
-#define RID_SVXBMP_SLIDERBUTTON (RID_SVX_START + 67)
-#define RID_SVXBMP_SLIDERDECREASE (RID_SVX_START + 68)
-#define RID_SVXBMP_SLIDERINCREASE (RID_SVX_START + 69)
-#define RID_SVXBMP_SLIDERBUTTON_HC (RID_SVX_START + 70)
-#define RID_SVXBMP_SLIDERDECREASE_HC (RID_SVX_START + 71)
-#define RID_SVXBMP_SLIDERINCREASE_HC (RID_SVX_START + 72)
+#define RID_SVXBMP_SLIDERBUTTON (RID_SVX_START + 67)
+#define RID_SVXBMP_SLIDERDECREASE (RID_SVX_START + 68)
+#define RID_SVXBMP_SLIDERINCREASE (RID_SVX_START + 69)
// Resource with bitmaps for the CheckListBox
#define RID_CHECKLISTBOX_BITMAPS (RID_SVX_START + 91)
@@ -354,18 +347,6 @@
#define RID_SVXDLG_RUBY (RID_SVX_START + 247)
-#define RID_SVXBMP_FONTWORK_FORM1_H (RID_SVX_START + 260)
-#define RID_SVXBMP_FONTWORK_FORM2_H (RID_SVX_START + 261)
-#define RID_SVXBMP_FONTWORK_FORM3_H (RID_SVX_START + 262)
-#define RID_SVXBMP_FONTWORK_FORM4_H (RID_SVX_START + 263)
-#define RID_SVXBMP_FONTWORK_FORM5_H (RID_SVX_START + 264)
-#define RID_SVXBMP_FONTWORK_FORM6_H (RID_SVX_START + 265)
-#define RID_SVXBMP_FONTWORK_FORM7_H (RID_SVX_START + 266)
-#define RID_SVXBMP_FONTWORK_FORM8_H (RID_SVX_START + 267)
-#define RID_SVXBMP_FONTWORK_FORM9_H (RID_SVX_START + 268)
-#define RID_SVXBMP_FONTWORK_FORM10_H (RID_SVX_START + 269)
-#define RID_SVXBMP_FONTWORK_FORM11_H (RID_SVX_START + 270)
-#define RID_SVXBMP_FONTWORK_FORM12_H (RID_SVX_START + 271)
#define RID_SVXIMG_GRAF_RED_H (RID_SVX_START + 276)
#define RID_SVXIMG_GRAF_GREEN_H (RID_SVX_START + 277)
#define RID_SVXIMG_GRAF_BLUE_H (RID_SVX_START + 278)
@@ -373,7 +354,6 @@
#define RID_SVXIMG_GRAF_CONTRAST_H (RID_SVX_START + 280)
#define RID_SVXIMG_GRAF_GAMMA_H (RID_SVX_START + 281)
#define RID_SVXIMG_GRAF_TRANSPARENCE_H (RID_SVX_START + 282)
-#define RID_SVXIMG_CHECKED_H (RID_SVX_START + 285)
#define RID_SVXDLG_TEXTCONTROL_CHARATTR (RID_SVX_START + 286)
#define RID_SVXDLG_TEXTCONTROL_PARAATTR (RID_SVX_START + 287)
@@ -575,7 +555,7 @@
#define RID_STR_FULLNUMS_6 (RID_STR_FULLNUMS_START + 5)//?
#define RID_STR_FULLNUMS_7 (RID_STR_FULLNUMS_START + 6)//?
#define RID_STR_FULLNUMS_8 (RID_STR_FULLNUMS_START + 7)//?
-#define RID_STR_FULLNUMS_7_HTML (RID_SVX_START + 510)//?
+#define RID_STR_FULLNUMS_7_HTML (RID_SVX_START + 510)//?
#define RID_STR_BULLET_THEME (RID_SVX_START + 508)
@@ -924,33 +904,33 @@
#define RID_SVXSTR_STYLEFAMILY_TABLEDESIGN (RID_SVX_START + 1168)
// if you add here, remember to adjust RID_SVXSTR_NEXTFREE
-#define RID_SVXSTR_BULLET_DESCRIPTIONS (RID_SVX_START + 1138)//?
-#define RID_SVXSTR_SINGLENUM_DESCRIPTIONS (RID_SVX_START + 1146)//?
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTIONS (RID_SVX_START + 1154)//?
-#define RID_SVXSTR_BULLET_DESCRIPTION_0 (RID_SVXSTR_BULLET_DESCRIPTIONS + 0)//?
-#define RID_SVXSTR_BULLET_DESCRIPTION_1 (RID_SVXSTR_BULLET_DESCRIPTIONS + 1)//?
-#define RID_SVXSTR_BULLET_DESCRIPTION_2 (RID_SVXSTR_BULLET_DESCRIPTIONS + 2)//?
-#define RID_SVXSTR_BULLET_DESCRIPTION_3 (RID_SVXSTR_BULLET_DESCRIPTIONS + 3)//?
-#define RID_SVXSTR_BULLET_DESCRIPTION_4 (RID_SVXSTR_BULLET_DESCRIPTIONS + 4)//?
-#define RID_SVXSTR_BULLET_DESCRIPTION_5 (RID_SVXSTR_BULLET_DESCRIPTIONS + 5)//?
-#define RID_SVXSTR_BULLET_DESCRIPTION_6 (RID_SVXSTR_BULLET_DESCRIPTIONS + 6)//?
-#define RID_SVXSTR_BULLET_DESCRIPTION_7 (RID_SVXSTR_BULLET_DESCRIPTIONS + 7)//?
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 0)//?
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 1)//?
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_2 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 2)//?
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_3 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 3)//?
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_4 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 4)//?
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_5 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 5)//?
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_6 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 6)//?
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_7 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 7)//?
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_0 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 0)//?
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_1 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 1)//?
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_2 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 2)//?
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_3 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 3)//?
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_4 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 4)//?
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 5)//?
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 6)//?
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 7)//?
+#define RID_SVXSTR_BULLET_DESCRIPTIONS (RID_SVX_START + 1138)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTIONS (RID_SVX_START + 1146)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTIONS (RID_SVX_START + 1154)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_0 (RID_SVXSTR_BULLET_DESCRIPTIONS + 0)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_1 (RID_SVXSTR_BULLET_DESCRIPTIONS + 1)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_2 (RID_SVXSTR_BULLET_DESCRIPTIONS + 2)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_3 (RID_SVXSTR_BULLET_DESCRIPTIONS + 3)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_4 (RID_SVXSTR_BULLET_DESCRIPTIONS + 4)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_5 (RID_SVXSTR_BULLET_DESCRIPTIONS + 5)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_6 (RID_SVXSTR_BULLET_DESCRIPTIONS + 6)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_7 (RID_SVXSTR_BULLET_DESCRIPTIONS + 7)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 0)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 1)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_2 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 2)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_3 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 3)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_4 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 4)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_5 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 5)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_6 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 6)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_7 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 7)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_0 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 0)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_1 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 1)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_2 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 2)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_3 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 3)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_4 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 4)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 5)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 6)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 7)//?
#define RID_SVXSTR_FINDBAR_FIND (RID_SVX_START + 1190)
diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx
index 98df97fc3c..0eb718bf4c 100644
--- a/svx/inc/svx/fontwork.hxx
+++ b/svx/inc/svx/fontwork.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -134,7 +134,6 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
long nSaveShadowSize;
ImageList maImageList;
- ImageList maImageListH;
const XColorTable* pColorTable;
diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx
index 02958e1a7d..a57524e170 100644
--- a/svx/inc/svx/langbox.hxx
+++ b/svx/inc/svx/langbox.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -52,9 +52,9 @@ class SvtLanguageTable;
#define LANG_LIST_SPELL_USED 0x0200
#define LANG_LIST_HYPH_USED 0x0400
#define LANG_LIST_THES_USED 0x0800
-#define LANG_LIST_ALSO_PRIMARY_ONLY 0x1000 // Do not exclude primary-only
- // languages that do not form a
- // locale, such as Arabic as
+#define LANG_LIST_ALSO_PRIMARY_ONLY 0x1000 // Do not exclude primary-only
+ // languages that do not form a
+ // locale, such as Arabic as
// opposed to Arabic-Egypt.
@@ -68,7 +68,6 @@ public:
private:
Image m_aNotCheckedImage;
Image m_aCheckedImage;
- Image m_aCheckedImageHC;
String m_aAllString;
com::sun::star::uno::Sequence< INT16 > *m_pSpellUsedLang;
SvtLanguageTable* m_pLangTable;
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 40c00320ec..f27de94d8f 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -447,8 +447,7 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx,
pColTab ( NULL ),
aPipetteColor ( COL_WHITE ),
aSelItem ( SID_BMPMASK_EXEC, *this, *pBindinx ),
- maImgPipette ( BMP_RESID ( IMG_PIPETTE ) ),
- maImgPipetteH ( BMP_RESID ( IMG_PIPETTE_H ) )
+ maImgPipette ( BMP_RESID ( IMG_PIPETTE ) )
{
FreeResource();
@@ -1210,9 +1209,7 @@ void SvxBmpMask::DataChanged( const DataChangedEvent& rDCEvt )
void SvxBmpMask::ApplyStyle()
{
- bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
- aTbxPipette.SetItemImage( TBI_PIPETTE, bHighContrast ? maImgPipetteH : maImgPipette );
+ aTbxPipette.SetItemImage( TBI_PIPETTE, maImgPipette );
}
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 3d4fecd285..1c40f82e62 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -397,8 +397,7 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow
nGrfChanged ( 0UL ),
bExecState ( FALSE ),
bGraphicLinked ( FALSE ),
- maImageList ( SVX_RES( CD_IMAPDLG ) ),
- maImageListH ( SVX_RES( CDH_IMAPDLG ) )
+ maImageList ( SVX_RES( CD_IMAPDLG ) )
{
ApplyImageList();
@@ -1129,9 +1128,7 @@ IMPL_LINK( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow*, pWnd )
void SvxSuperContourDlg::ApplyImageList()
{
- bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
- ImageList& rImgLst = bHighContrast ? maImageListH : maImageList;
+ ImageList& rImgLst = maImageList;
aTbx1.SetImageList( rImgLst );
}
@@ -1152,7 +1149,7 @@ void SvxSuperContourDlg::DataChanged( const DataChangedEvent& rDCEvt )
IMPL_LINK( SvxSuperContourDlg, MiscHdl, void*, EMPTYARG )
{
- SvtMiscOptions aMiscOptions;
+ SvtMiscOptions aMiscOptions;
aTbx1.SetOutStyle( aMiscOptions.GetToolboxStyle() );
return 0L;
diff --git a/svx/source/dialog/bmpmask.hrc b/svx/source/dialog/bmpmask.hrc
index 79c9b60d3a..eaad8ea459 100644
--- a/svx/source/dialog/bmpmask.hrc
+++ b/svx/source/dialog/bmpmask.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -57,6 +57,3 @@
#define FT_2 2
#define FT_3 3
#define IMG_PIPETTE 11
-#define IMG_PIPETTE_H 12
-
-
diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src
index 4b93fe924c..b92a3626a7 100644
--- a/svx/source/dialog/bmpmask.src
+++ b/svx/source/dialog/bmpmask.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -293,11 +293,6 @@ DockingWindow RID_SVXDLG_BMPMASK
MASKCOLOR
};
- Image IMG_PIPETTE_H
- {
- ImageBitmap = Bitmap { File = "sc10350_h.bmp" ; };
- MASKCOLOR
- };
};
String RID_SVXDLG_BMPMASK_STR_TRANSP
diff --git a/svx/source/dialog/contdlg.hrc b/svx/source/dialog/contdlg.hrc
index bf3bc84267..b4eae2db6e 100644
--- a/svx/source/dialog/contdlg.hrc
+++ b/svx/source/dialog/contdlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -65,7 +65,6 @@
#define STB_STATUS 1
#define CD_IMAPDLG 1300
-#define CDH_IMAPDLG 1301
/******************************************************************************/
diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src
index df5805daa6..a5d9599aef 100644
--- a/svx/source/dialog/contdlg.src
+++ b/svx/source/dialog/contdlg.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -223,30 +223,29 @@ FloatingWindow RID_SVXDLG_CONTOUR
MASKCOLOR
CONTOURDLG_IDLIST
};
- ImageList CDH_IMAPDLG
- {
- Prefix = "cdh";
- MASKCOLOR
- CONTOURDLG_IDLIST
- };
};
+
/******************************************************************************/
String STR_CONTOURDLG_MODIFY
{
Text [ en-US ] = "The contour has been modified.\nDo you want to save the changes?" ;
};
+
String STR_CONTOURDLG_NEWPIPETTE
{
Text [ en-US ] = "Do you want to create a new contour?" ;
};
+
String STR_CONTOURDLG_WORKPLACE
{
Text [ en-US ] = "Setting a new workspace will\ncause the contour to be deleted.\nAre you sure you want to continue?" ;
};
+
String STR_CONTOURDLG_LINKED
{
Text [ en-US ] = "This graphic object is linked to the document. Do you want to unlink the graphics in order to edit it?" ;
};
+
/******************************************************************************/
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 5824d6fc7f..314fef7e0b 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -67,7 +67,6 @@ class SvxSuperContourDlg : public SvxContourDlg
BOOL bUpdateGraphicLinked;
BOOL bGraphicLinked;
ImageList maImageList;
- ImageList maImageListH;
virtual void Resize();
virtual BOOL Close();
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 67de10233f..3818f94993 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -913,16 +913,12 @@ void RecovDocListEntry::Paint(const Point& aPos ,
const String* pTxt = 0;
RecovDocList* pList = static_cast< RecovDocList* >(&aDevice);
- BOOL bHC = aDevice.GetSettings().GetStyleSettings().GetHighContrastMode();
-
TURLInfo* pInfo = (TURLInfo*)pEntry->GetUserData();
switch(pInfo->RecoveryState)
{
case E_SUCCESSFULLY_RECOVERED :
{
pImg = &pList->m_aGreenCheckImg;
- if (bHC)
- pImg = &pList->m_aGreenCheckImgHC;
pTxt = &pList->m_aSuccessRecovStr;
}
break;
@@ -930,8 +926,6 @@ void RecovDocListEntry::Paint(const Point& aPos ,
case E_ORIGINAL_DOCUMENT_RECOVERED : // TODO must be renamed into ORIGINAL DOCUMENT recovered! Because its marked as yellow
{
pImg = &pList->m_aYellowCheckImg;
- if (bHC)
- pImg = &pList->m_aYellowCheckImgHC;
pTxt = &pList->m_aOrigDocRecovStr;
}
break;
@@ -939,8 +933,6 @@ void RecovDocListEntry::Paint(const Point& aPos ,
case E_RECOVERY_FAILED :
{
pImg = &pList->m_aRedCrossImg;
- if (bHC)
- pImg = &pList->m_aRedCrossImgHC;
pTxt = &pList->m_aRecovFailedStr;
}
break;
@@ -980,9 +972,6 @@ RecovDocList::RecovDocList( Window* pParent,
, m_aGreenCheckImg ( ResId(IMG_GREENCHECK,*rResId.GetResMgr() ) )
, m_aYellowCheckImg ( ResId(IMG_YELLOWCHECK,*rResId.GetResMgr() ) )
, m_aRedCrossImg ( ResId(IMG_REDCROSS,*rResId.GetResMgr() ) )
- , m_aGreenCheckImgHC ( ResId(IMG_GREENCHECK_HC,*rResId.GetResMgr() ) )
- , m_aYellowCheckImgHC ( ResId(IMG_YELLOWCHECK_HC,*rResId.GetResMgr() ) )
- , m_aRedCrossImgHC ( ResId(IMG_REDCROSS_HC,*rResId.GetResMgr() ) )
, m_aSuccessRecovStr ( ResId(STR_SUCCESSRECOV,*rResId.GetResMgr() ) )
, m_aOrigDocRecovStr ( ResId(STR_ORIGDOCRECOV,*rResId.GetResMgr() ) )
, m_aRecovFailedStr ( ResId(STR_RECOVFAILED,*rResId.GetResMgr() ) )
diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc
index 851321bc6a..2e4d03981d 100644
--- a/svx/source/dialog/docrecovery.hrc
+++ b/svx/source/dialog/docrecovery.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -105,9 +105,6 @@
#define IMG_GREENCHECK 14
#define IMG_YELLOWCHECK 15
#define IMG_REDCROSS 16
-#define IMG_GREENCHECK_HC 17
-#define IMG_YELLOWCHECK_HC 18
-#define IMG_REDCROSS_HC 19
#define STR_SUCCESSRECOV 20
#define STR_ORIGDOCRECOV 21
#define STR_RECOVFAILED 22
diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src
index 32c3560031..2da85bc8c5 100644
--- a/svx/source/dialog/docrecovery.src
+++ b/svx/source/dialog/docrecovery.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -211,26 +211,14 @@ TabPage RID_SVXPAGE_DOCRECOVERY_RECOVER
{
ImageBitmap = Bitmap { File = "nu01.png"; };
};
- Image IMG_GREENCHECK_HC
- {
- ImageBitmap = Bitmap { File = "nuh01.png"; };
- };
Image IMG_YELLOWCHECK
{
ImageBitmap = Bitmap { File = "nu04.png"; };
};
- Image IMG_YELLOWCHECK_HC
- {
- ImageBitmap = Bitmap { File = "nuh04.png"; };
- };
Image IMG_REDCROSS
{
ImageBitmap = Bitmap { File = "nu02.png"; };
};
- Image IMG_REDCROSS_HC
- {
- ImageBitmap = Bitmap { File = "nuh02.png"; };
- };
String STR_SUCCESSRECOV
{
Text[ en-US ] = "Successfully recovered";
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index e29b1a27ac..fd5d5ba616 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -249,7 +249,6 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
nSaveShadowSize (100),
maImageList (ResId(IL_FONTWORK,*rResId.GetResMgr())),
- maImageListH (ResId(ILH_FONTWORK,*rResId.GetResMgr())),
pColorTable (NULL)
{
@@ -711,7 +710,7 @@ void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem)
{
// #i19251#
// INT32 nValue = pItem->GetValue();
-
+
// #i19251#
// The two involved fields/items are used double and contain/give different
// values regarding to the access method. Thus, here we need to separate the access
@@ -1008,7 +1007,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
//-/ rOldObj.TakeAttributes(aAttr, TRUE, FALSE);
aAttr.Put(rOldObj.GetMergedItemSet());
-
+
const XFormTextStdFormItem& rOldForm = (const XFormTextStdFormItem&)
aAttr.Get(XATTR_FORMTXTSTDFORM);
@@ -1226,25 +1225,13 @@ void SvxFontWorkDialog::DataChanged( const DataChangedEvent& rDCEvt )
---------------------------------------------------------------------------*/
void SvxFontWorkDialog::ApplyImageList()
{
- bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
ResMgr* _pMgr = &DIALOG_MGR();
- USHORT nBitmapResId = bHighContrast ? RID_SVXBMP_FONTWORK_FORM1_H : RID_SVXBMP_FONTWORK_FORM1;
+ USHORT nBitmapResId = RID_SVXBMP_FONTWORK_FORM1;
USHORT nTextResId = RID_SVXSTR_FONTWORK_FORM1;
bool bInit = aFormSet.GetItemCount() == 0;
- if( bInit )
- {
-/*
- Size aSize( aTbxStyle.CalcWindowSizePixel() );
- Bitmap aBmp(ResId(RID_SVXBMP_FONTWORK_FORM1,_pMgr));
- aSize.Height() = aFormSet.CalcWindowSizePixel(aBmp.GetSizePixel()).Height() + 2;
- aFormSet.SetSizePixel(aSize);
-*/
- }
-
USHORT i;
for( i = 1; i < 13; i++, nTextResId++, nBitmapResId++ )
{
@@ -1259,7 +1246,7 @@ void SvxFontWorkDialog::ApplyImageList()
}
}
- ImageList& rImgLst = bHighContrast ? maImageListH : maImageList;
+ ImageList& rImgLst = maImageList;
aTbxStyle.SetImageList( rImgLst );
aTbxAdjust.SetImageList( rImgLst );
diff --git a/svx/source/dialog/fontwork.hrc b/svx/source/dialog/fontwork.hrc
index a664dd3ce6..085c9f1324 100644
--- a/svx/source/dialog/fontwork.hrc
+++ b/svx/source/dialog/fontwork.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,6 @@
#define CLB_SHADOW_COLOR 1
#define IL_FONTWORK 1200
-#define ILH_FONTWORK 1201
// the following ids are also used to identify the
// bitmaps for the image list
diff --git a/svx/source/dialog/fontwork.src b/svx/source/dialog/fontwork.src
index 667ab90f96..893674bf02 100644
--- a/svx/source/dialog/fontwork.src
+++ b/svx/source/dialog/fontwork.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -345,12 +345,6 @@ DockingWindow RID_SVXDLG_FONTWORK
MaskColor = IMAGE_STDBTN_COLOR ;
FONTWORK_IDLIST
};
- ImageList ILH_FONTWORK
- {
- Prefix = "fwh";
- MaskColor = IMAGE_STDBTN_COLOR ;
- FONTWORK_IDLIST
- };
};
// Bitmaps ---------------------------------------------------------------
Bitmap RID_SVXBMP_FONTWORK_FORM1
@@ -402,55 +396,6 @@ Bitmap RID_SVXBMP_FONTWORK_FORM12
File = "fwbuttn4.bmp" ;
};
-Bitmap RID_SVXBMP_FONTWORK_FORM1_H
-{
- File = "fwthcirc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM2_H
-{
- File = "fwbhcirc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM3_H
-{
- File = "fwlhcirc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM4_H
-{
- File = "fwrhcirc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM5_H
-{
- File = "fwtoparc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM6_H
-{
- File = "fwbotarc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM7_H
-{
- File = "fwlftarc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM8_H
-{
- File = "fwrgtarc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM9_H
-{
- File = "fwbuttn1_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM10_H
-{
- File = "fwbuttn2_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM11_H
-{
- File = "fwbuttn3_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM12_H
-{
- File = "fwbuttn4_h.bmp" ;
-};
-
// Strings ---------------------------------------------------------------
String RID_SVXSTR_FONTWORK_FORM1
{
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 867ef9a593..cc26be12c9 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx
index b1d799f76d..2023c5d941 100644
--- a/svx/source/dialog/hyprlink.cxx
+++ b/svx/source/dialog/hyprlink.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 43a2735d14..ead58ff7c5 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -198,7 +198,6 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW,
maCbbTarget ( this, SVX_RES( RID_SVXCTL_CBB_TARGET ) ),
aStbStatus ( this, WB_BORDER | WB_3DLOOK | WB_LEFT ),
maImageList ( SVX_RES( IL_IMAPDLG ) ),
- maImageListH ( SVX_RES( ILH_IMAPDLG ) ),
pCheckObj ( NULL ),
aIMapItem ( SID_IMAP_EXEC, *this, *_pBindings )
{
@@ -1034,9 +1033,7 @@ IMPL_LINK( SvxIMapDlg, MiscHdl, void*, EMPTYARG )
void SvxIMapDlg::ApplyImageList()
{
- bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
- ImageList& rImgLst = bHighContrast ? maImageListH : maImageList;
+ ImageList& rImgLst = maImageList;
aTbxIMapDlg1.SetImageList( rImgLst );
}
diff --git a/svx/source/dialog/imapdlg.hrc b/svx/source/dialog/imapdlg.hrc
index 5247836d25..5e372fa999 100644
--- a/svx/source/dialog/imapdlg.hrc
+++ b/svx/source/dialog/imapdlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -71,7 +71,6 @@
#define STB_STATUS 1
#define IL_IMAPDLG 1024
-#define ILH_IMAPDLG 1025
/******************************************************************************/
diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src
index 6c4facd2f0..f71ac40484 100644
--- a/svx/source/dialog/imapdlg.src
+++ b/svx/source/dialog/imapdlg.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -265,13 +265,8 @@ ModelessDialog RID_SVXDLG_IMAP
MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ;
IMAPDLG_IDLIST
};
- ImageList ILH_IMAPDLG
- {
- Prefix = "idh";
- MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ;
- IMAPDLG_IDLIST
- };
};
+
Control RID_SVXCTL_IMAP
{
Border = TRUE ;
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 35aa62c3a5..8edde7bdc4 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -156,7 +156,6 @@ void SvxLanguageBox::Init()
m_pLangTable = new SvtLanguageTable;
m_aNotCheckedImage = Image( SVX_RES( RID_SVXIMG_NOTCHECKED ) );
m_aCheckedImage = Image( SVX_RES( RID_SVXIMG_CHECKED ) );
- m_aCheckedImageHC = Image( SVX_RES( RID_SVXIMG_CHECKED_H ) );
m_aAllString = String( SVX_RESSTR( RID_SVXSTR_LANGUAGE_ALL ) );
m_nLangList = LANG_LIST_EMPTY;
m_bHasLangNone = FALSE;
@@ -202,8 +201,6 @@ USHORT SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, USHORT nPos, bo
USHORT nRet = 0;
if( !bChecked )
nRet = InsertEntry( rEntry, m_aNotCheckedImage, nPos );
- else if( GetSettings().GetStyleSettings().GetHighContrastMode() )
- nRet = InsertEntry( rEntry, m_aCheckedImageHC, nPos );
else
nRet = InsertEntry( rEntry, m_aCheckedImage, nPos );
return nRet;
@@ -299,7 +296,7 @@ void SvxLanguageBox::SetLanguageList( INT16 nLangList,
nLangType != LANGUAGE_SYSTEM &&
nLangType != LANGUAGE_NONE &&
(nLangType < LANGUAGE_USER1 || nLangType > LANGUAGE_USER9) &&
- (MsLangId::getSubLanguage( nLangType) != 0 ||
+ (MsLangId::getSubLanguage( nLangType) != 0 ||
(nLangList & LANG_LIST_ALSO_PRIMARY_ONLY)) &&
((nLangList & LANG_LIST_ALL) != 0 ||
((nLangList & LANG_LIST_WESTERN) != 0 &&
@@ -345,8 +342,8 @@ USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType, USHORT nPos
USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT nPos, sal_Int16 nType )
{
LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType);
- // For obsolete and to be replaced languages check whether an entry of the
- // replacement already exists and if so don't add an entry with identical
+ // For obsolete and to be replaced languages check whether an entry of the
+ // replacement already exists and if so don't add an entry with identical
// string as would be returned by SvtLanguageTable::GetString().
if (nLang != nLangType)
{
@@ -405,8 +402,8 @@ USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
BOOL bCheckEntry, USHORT nPos )
{
LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType);
- // For obsolete and to be replaced languages check whether an entry of the
- // replacement already exists and if so don't add an entry with identical
+ // For obsolete and to be replaced languages check whether an entry of the
+ // replacement already exists and if so don't add an entry with identical
// string as would be returned by SvtLanguageTable::GetString().
if (nLang != nLangType)
{
@@ -451,7 +448,7 @@ LanguageType SvxLanguageBox::GetSelectLanguage() const
void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, BOOL bSelect )
{
- // If the core uses a LangID of an imported MS document and wants to select
+ // If the core uses a LangID of an imported MS document and wants to select
// a language that is replaced, we need to select the replacement instead.
LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( eLangType);
diff --git a/svx/source/dialog/langbox.src b/svx/source/dialog/langbox.src
index 8bd1987d2d..b7cc9c40fc 100644
--- a/svx/source/dialog/langbox.src
+++ b/svx/source/dialog/langbox.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -34,16 +34,12 @@ Image RID_SVXIMG_NOTCHECKED
ImageBitmap = Bitmap { File = "notcheck.bmp" ; } ;
MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
};
+
Image RID_SVXIMG_CHECKED
{
ImageBitmap = Bitmap { File = "lngcheck.bmp" ; } ;
MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
};
-Image RID_SVXIMG_CHECKED_H
-{
- ImageBitmap = Bitmap { File = "lngcheck_h.bmp" ; } ;
- MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-};
// ********************************************************************** EOF
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 4d202f7978..dbfb62e59f 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -306,14 +306,12 @@ namespace svxform
m_pNaviWin ( _pNaviWin ),
m_bHasModel ( false ),
m_eGroup ( _eGroup ),
- m_TbxImageList ( SVX_RES( IL_TBX_BMPS ) ),
- m_TbxHCImageList( SVX_RES( IL_TBX_BMPS_HC ) )
+ m_TbxImageList ( SVX_RES( IL_TBX_BMPS ) )
{
FreeResource();
- const ImageList& rImageList =
- GetBackground().GetColor().IsDark() ? m_TbxHCImageList : m_TbxImageList;
+ const ImageList& rImageList = m_TbxImageList;
m_aToolBox.SetItemImage( TBI_ITEM_ADD, rImageList.GetImage( IID_ITEM_ADD ) );
m_aToolBox.SetItemImage( TBI_ITEM_ADD_ELEMENT, rImageList.GetImage( IID_ITEM_ADD_ELEMENT ) );
m_aToolBox.SetItemImage( TBI_ITEM_ADD_ATTRIBUTE, rImageList.GetImage( IID_ITEM_ADD_ATTRIBUTE ) );
@@ -777,9 +775,7 @@ namespace svxform
SvLBoxEntry* XFormsPage::AddEntry( ItemNode* _pNewNode, bool _bIsElement )
{
SvLBoxEntry* pParent = m_aItemList.FirstSelected();
- const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode()
- ? m_pNaviWin->GetItemHCImageList()
- : m_pNaviWin->GetItemImageList();
+ const ImageList& rImageList = m_pNaviWin->GetItemImageList();
USHORT nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE;
Image aImage = rImageList.GetImage( nImageID );
::rtl::OUString sName;
@@ -987,9 +983,7 @@ namespace svxform
SvLBoxEntry* XFormsPage::AddEntry( const Reference< XPropertySet >& _rEntry )
{
SvLBoxEntry* pEntry = NULL;
- const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode()
- ? m_pNaviWin->GetItemHCImageList()
- : m_pNaviWin->GetItemImageList();
+ const ImageList& rImageList = m_pNaviWin->GetItemImageList();
Image aImage = rImageList.GetImage( IID_ELEMENT );
ItemNode* pNode = new ItemNode( _rEntry );
@@ -1243,9 +1237,7 @@ namespace svxform
m_xUIHelper = Reference< css::xforms::XFormsUIHelper1 >( _xModel, UNO_QUERY );
String sRet;
m_bHasModel = true;
- const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode()
- ? m_pNaviWin->GetItemHCImageList()
- : m_pNaviWin->GetItemImageList();
+ const ImageList& rImageList = m_pNaviWin->GetItemImageList();
switch ( m_eGroup )
{
@@ -1561,7 +1553,6 @@ namespace svxform
m_bIsNotifyDisabled ( false ),
m_aItemImageList ( SVX_RES( IL_ITEM_BMPS ) ),
- m_aItemHCImageList ( SVX_RES( IL_ITEM_BMPS_HC ) ),
m_xDataListener ( new DataListener( this ) )
{
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 5d4aaf69b2..904d2fefb9 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -105,12 +105,6 @@ IdCount = { 5 ; } ;
MASKCOLOR
IMG_LST
};
- ImageList IL_TBX_BMPS_HC
- {
- Prefix = "tbh";
- MASKCOLOR
- IMG_LST
- };
#undef IMG_LST
};
@@ -246,12 +240,6 @@ IdCount = { 6 ; } ;
MASKCOLOR
IMG_LST2
};
- ImageList IL_ITEM_BMPS_HC
- {
- Prefix = "dah";
- MASKCOLOR
- IMG_LST2
- };
};
QueryBox RID_QRY_REMOVE_MODEL
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 5176265d77..682011de77 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -164,20 +164,16 @@ FmParentData::~FmParentData()
//========================================================================
TYPEINIT1(FmFormItem, FmParentData);
//------------------------------------------------------------------------
-Image FmFormItem::GetImage( BmpColorMode _eMode ) const
+Image FmFormItem::GetImage( BmpColorMode /* _eMode */) const
{
static Image aImage;
- static Image aImage_HC;
if (!aImage)
{
ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
- ImageList aNavigatorImages_HC( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) );
-
aImage = aNavigatorImages.GetImage( RID_SVXIMG_FORM );
- aImage_HC = aNavigatorImages_HC.GetImage( RID_SVXIMG_FORM );
}
- return ( BMP_COLOR_HIGHCONTRAST == _eMode ) ? aImage_HC : aImage;
+ return aImage;
}
//========================================================================
@@ -199,20 +195,16 @@ FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) co
}
//------------------------------------------------------------------------
-Image FmFilterItems::GetImage( BmpColorMode _eMode ) const
+Image FmFilterItems::GetImage( BmpColorMode /* _eMode */ ) const
{
static Image aImage;
- static Image aImage_HC;
if (!aImage)
{
ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
- ImageList aNavigatorImages_HC( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) );
-
aImage = aNavigatorImages.GetImage( RID_SVXIMG_FILTER );
- aImage_HC = aNavigatorImages_HC.GetImage( RID_SVXIMG_FILTER );
}
- return ( BMP_COLOR_HIGHCONTRAST == _eMode ) ? aImage_HC : aImage;
+ return aImage;
}
//========================================================================
@@ -230,20 +222,16 @@ FmFilterItem::FmFilterItem( const Reference< XMultiServiceFactory >& _rxFactory,
}
//------------------------------------------------------------------------
-Image FmFilterItem::GetImage( BmpColorMode _eMode ) const
+Image FmFilterItem::GetImage( BmpColorMode /* _eMode */ ) const
{
static Image aImage;
- static Image aImage_HC;
if (!aImage)
{
ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
- ImageList aNavigatorImages_HC( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) );
-
aImage = aNavigatorImages.GetImage( RID_SVXIMG_FIELD );
- aImage_HC = aNavigatorImages_HC.GetImage( RID_SVXIMG_FIELD );
}
- return ( BMP_COLOR_HIGHCONTRAST == _eMode ) ? aImage_HC : aImage;
+ return aImage;
}
//========================================================================
@@ -1172,22 +1160,12 @@ FmFilterNavigator::FmFilterNavigator( Window* pParent )
SetHelpId( HID_FILTER_NAVIGATOR );
{
- {
- ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
- SetNodeBitmaps(
- aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
- aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ),
- BMP_COLOR_NORMAL
- );
- }
- {
- ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) );
- SetNodeBitmaps(
- aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
- aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ),
- BMP_COLOR_HIGHCONTRAST
- );
- }
+ ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
+ SetNodeBitmaps(
+ aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
+ aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ),
+ BMP_COLOR_NORMAL
+ );
}
m_pModel = new FmFilterModel(comphelper::getProcessServiceFactory());
@@ -1235,7 +1213,7 @@ void FmFilterNavigator::UpdateContent(const Reference< XIndexAccess > & xControl
if (pEntry)
{
if (!IsExpanded(pEntry))
- Expand(pEntry);
+ Expand(pEntry);
Select(pEntry, sal_True);
}
}
@@ -1435,19 +1413,19 @@ sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt )
return rEvt.mnAction;
}
// -----------------------------------------------------------------------------
-namespace
+namespace
{
FmFilterItems* getTargetItems(SvLBoxEntry* _pTarget)
{
FmFilterData* pData = static_cast<FmFilterData*>(_pTarget->GetUserData());
- FmFilterItems* pTargetItems = pData->ISA(FmFilterItems)
- ?
+ FmFilterItems* pTargetItems = pData->ISA(FmFilterItems)
+ ?
PTR_CAST(FmFilterItems,pData)
- :
+ :
PTR_CAST(FmFilterItems,pData->GetParent());
return pTargetItems;
}
-}
+}
//------------------------------------------------------------------------
sal_Int8 FmFilterNavigator::ExecuteDrop( const ExecuteDropEvent& rEvt )
{
@@ -1473,7 +1451,7 @@ sal_Int8 FmFilterNavigator::ExecuteDrop( const ExecuteDropEvent& rEvt )
SetCurEntry(pEntry);
insertFilterItem(m_aControlExchange->getDraggedEntries(),pTargetItems,DND_ACTION_COPY == rEvt.mnAction);
-
+
return sal_True;
}
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 82fc2d2241..e1407718f0 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -252,7 +252,6 @@ FmEntryData::FmEntryData( const FmEntryData& rEntryData )
pChildList = new FmEntryDataList();
aText = rEntryData.GetText();
m_aNormalImage = rEntryData.GetNormalImage();
- m_aHCImage = rEntryData.GetHCImage();
pParent = rEntryData.GetParent();
FmEntryData* pChildData;
@@ -317,16 +316,19 @@ sal_Bool FmEntryData::IsEqualWithoutChilds( FmEntryData* pEntryData )
TYPEINIT1( FmFormData, FmEntryData );
DBG_NAME(FmFormData);
//------------------------------------------------------------------------
-FmFormData::FmFormData( const Reference< XForm >& _rxForm, const ImageList& _rNormalImages, const ImageList& _rHCImages, FmFormData* _pParent )
- :FmEntryData( _pParent, _rxForm )
- ,m_xForm( _rxForm )
+FmFormData::FmFormData(
+ const Reference< XForm >& _rxForm,
+ const ImageList& _rNormalImages,
+ FmFormData* _pParent
+)
+: FmEntryData( _pParent, _rxForm ),
+ m_xForm( _rxForm )
{
DBG_CTOR(FmEntryData,NULL);
//////////////////////////////////////////////////////////////////////
// Images setzen
m_aNormalImage = _rNormalImages.GetImage( RID_SVXIMG_FORM );
- m_aHCImage = _rHCImages.GetImage( RID_SVXIMG_FORM );
//////////////////////////////////////////////////////////////////////
// Titel setzen
@@ -384,16 +386,19 @@ sal_Bool FmFormData::IsEqualWithoutChilds( FmEntryData* pEntryData )
TYPEINIT1( FmControlData, FmEntryData );
DBG_NAME(FmControlData);
//------------------------------------------------------------------------
-FmControlData::FmControlData( const Reference< XFormComponent >& _rxComponent, const ImageList& _rNormalImages, const ImageList& _rHCImages, FmFormData* _pParent )
- :FmEntryData( _pParent, _rxComponent )
- ,m_xFormComponent( _rxComponent )
+FmControlData::FmControlData(
+ const Reference< XFormComponent >& _rxComponent,
+ const ImageList& _rNormalImages,
+ FmFormData* _pParent
+)
+: FmEntryData( _pParent, _rxComponent ),
+ m_xFormComponent( _rxComponent )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmControlData::FmControlData" );
DBG_CTOR(FmControlData,NULL);
//////////////////////////////////////////////////////////////////////
// Images setzen
m_aNormalImage = GetImage( _rNormalImages );
- m_aHCImage = GetImage( _rHCImages );
//////////////////////////////////////////////////////////////////////
// Titel setzen
@@ -554,7 +559,10 @@ sal_Bool FmControlData::IsEqualWithoutChilds( FmEntryData* pEntryData )
}
//------------------------------------------------------------------------
-void FmControlData::ModelReplaced( const Reference< XFormComponent >& _rxNew, const ImageList& _rNormalImages, const ImageList& _rHCImages )
+void FmControlData::ModelReplaced(
+ const Reference< XFormComponent >& _rxNew,
+ const ImageList& _rNormalImages
+)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmControlData::ModelReplaced" );
m_xFormComponent = _rxNew;
@@ -562,7 +570,6 @@ void FmControlData::ModelReplaced( const Reference< XFormComponent >& _rxNew, co
// Images neu setzen
m_aNormalImage = GetImage( _rNormalImages );
- m_aHCImage = GetImage( _rHCImages );
}
//............................................................................
diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src
index 218df02f07..fb7ea13d99 100644
--- a/svx/source/form/fmexpl.src
+++ b/svx/source/form/fmexpl.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -295,13 +295,6 @@ ImageList RID_SVXIMGLIST_FMEXPL
NAVIGATOR_IMAGEIDS;
};
-ImageList RID_SVXIMGLIST_FMEXPL_HC
-{
- Prefix = "sxh";
- MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
- NAVIGATOR_IMAGEIDS;
-};
-
ModalDialog RID_SVXDLG_SETFORM
{
OutputSize = TRUE ;
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 743c735869..404ffb39f6 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -1134,12 +1134,10 @@ void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation)
PopupMenu* FmXFormShell::GetConversionMenu()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::GetConversionMenu" );
- const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- BOOL bIsHiContrastMode = rSettings.GetHighContrastMode();
PopupMenu* pNewMenu = new PopupMenu(SVX_RES( RID_FMSHELL_CONVERSIONMENU ));
- ImageList aImageList( SVX_RES( bIsHiContrastMode ? RID_SVXIMGLIST_FMEXPL_HC : RID_SVXIMGLIST_FMEXPL) );
+ ImageList aImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL) );
for ( size_t i = 0; i < SAL_N_ELEMENTS( nConvertSlots ); ++i )
{
// das entsprechende Image dran
@@ -1886,7 +1884,7 @@ namespace
{
return ( _nWhich == SID_FM_RECORD_FIRST )
|| ( _nWhich == SID_FM_RECORD_PREV )
- || ( _nWhich == SID_FM_RECORD_NEXT )
+ || ( _nWhich == SID_FM_RECORD_NEXT )
|| ( _nWhich == SID_FM_RECORD_LAST )
|| ( _nWhich == SID_FM_RECORD_NEW );
}
@@ -2037,7 +2035,7 @@ void FmXFormShell::setActiveController( const Reference< runtime::XFormControlle
stopListening();
- impl_switchActiveControllerListening( false );
+ impl_switchActiveControllerListening( false );
m_aActiveControllerFeatures.dispose();
m_xActiveController = xController;
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 518f2f2a6b..9c40b13cf6 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -204,24 +204,18 @@ namespace svxform
SetHelpId( HID_FORM_NAVIGATOR );
m_aNavigatorImages = ImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
- m_aNavigatorImagesHC = ImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) );
SetNodeBitmaps(
m_aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
m_aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ),
BMP_COLOR_NORMAL
);
- SetNodeBitmaps(
- m_aNavigatorImagesHC.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
- m_aNavigatorImagesHC.GetImage( RID_SVXIMG_EXPANDEDNODE ),
- BMP_COLOR_HIGHCONTRAST
- );
SetDragDropMode(0xFFFF);
EnableInplaceEditing( sal_True );
SetSelectionMode(MULTIPLE_SELECTION);
- m_pNavModel = new NavigatorTreeModel( m_aNavigatorImages, m_aNavigatorImagesHC );
+ m_pNavModel = new NavigatorTreeModel( m_aNavigatorImages );
Clear();
StartListening( *m_pNavModel );
@@ -692,13 +686,6 @@ namespace svxform
Image aRootImage( m_aNavigatorImages.GetImage( RID_SVXIMG_FORMS ) );
m_pRootEntry = InsertEntry( SVX_RES(RID_STR_FORMS), aRootImage, aRootImage,
NULL, sal_False, 0, NULL );
-
- if ( m_pRootEntry )
- {
- Image aHCRootImage( m_aNavigatorImagesHC.GetImage( RID_SVXIMG_FORMS ) );
- SetExpandedEntryBmp( m_pRootEntry, aHCRootImage, BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp( m_pRootEntry, aHCRootImage, BMP_COLOR_HIGHCONTRAST );
- }
}
else if (!m_bMarkingObjects && rHint.ISA(FmNavRequestSelectHint))
{ // wenn m_bMarkingObjects sal_True ist, markiere ich gerade selber Objekte, und da der ganze Mechanismus dahinter synchron ist,
@@ -1464,7 +1451,7 @@ namespace svxform
if (!xNewForm.is())
return;
- FmFormData* pNewFormData = new FmFormData( xNewForm, m_aNavigatorImages, m_aNavigatorImagesHC, pParentFormData );
+ FmFormData* pNewFormData = new FmFormData( xNewForm, m_aNavigatorImages, pParentFormData );
//////////////////////////////////////////////////////////////////////
// Namen setzen
@@ -1529,7 +1516,7 @@ namespace svxform
if (!xNewComponent.is())
return NULL;
- FmControlData* pNewFormControlData = new FmControlData( xNewComponent, m_aNavigatorImages, m_aNavigatorImagesHC, pParentFormData );
+ FmControlData* pNewFormControlData = new FmControlData( xNewComponent, m_aNavigatorImages, pParentFormData );
//////////////////////////////////////////////////////////////////////
// Namen setzen
@@ -2196,9 +2183,9 @@ namespace svxform
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::MarkViewObjects" );
FmFormShell* pFormShell = GetNavModel()->GetFormShell();
- if( !pFormShell )
+ if( !pFormShell )
return;
-
+
// first collect all sdrobjects
::std::set< Reference< XFormComponent > > aObjects;
CollectObjects(pFormData,bDeep,aObjects);
@@ -2223,7 +2210,7 @@ namespace svxform
{
// unfortunately, the writer doesn't like marking an already-marked object, again, so reset the mark first
pFormView->MarkObj( pSdrObject, pPageView, !bMark, sal_False );
- }
+ }
} // while ( aIter.IsMore() )
if ( bMark )
{
@@ -2254,7 +2241,7 @@ namespace svxform
{
pControlData = (FmControlData*)pEntryData;
_rObjects.insert(pControlData->GetFormComponent());
- } // if( pEntryData->ISA(FmControlData) )
+ } // if( pEntryData->ISA(FmControlData) )
else if (bDeep && (pEntryData->ISA(FmFormData)))
CollectObjects((FmFormData*)pEntryData,bDeep,_rObjects);
} // for( sal_uInt32 i=0; i<pChildList->Count(); i++ )
@@ -2263,10 +2250,10 @@ namespace svxform
void NavigatorTree::MarkViewObj( FmControlData* pControlData, sal_Bool bMarkHandles, sal_Bool bMark)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::MarkViewObj" );
- if( !pControlData )
+ if( !pControlData )
return;
FmFormShell* pFormShell = GetNavModel()->GetFormShell();
- if( !pFormShell )
+ if( !pFormShell )
return;
//////////////////////////////////////////////////////////////////////
@@ -2298,7 +2285,7 @@ namespace svxform
continue;
bPaint = true;
-
+
} // while ( aIter.IsMore() )
if ( bPaint )
{
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 0979606aaa..4967941b71 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -216,12 +216,11 @@ namespace svxform
//========================================================================
//------------------------------------------------------------------------
- NavigatorTreeModel::NavigatorTreeModel( const ImageList& _rNormalImages, const ImageList& _rHCImages )
+ NavigatorTreeModel::NavigatorTreeModel( const ImageList& _rNormalImages )
:m_pFormShell(NULL)
,m_pFormPage(NULL)
,m_pFormModel(NULL)
,m_aNormalImages( _rNormalImages )
- ,m_aHCImages( _rHCImages )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::NavigatorTreeModel" );
m_pPropChangeList = new OFormComponentObserver(this);
@@ -578,7 +577,7 @@ namespace svxform
"NavigatorTreeModel::FillBranch : the root container should supply only elements of type XForm");
xForms->getByIndex(i) >>= xSubForm;
- pSubFormData = new FmFormData( xSubForm, m_aNormalImages, m_aHCImages, pFormData );
+ pSubFormData = new FmFormData( xSubForm, m_aNormalImages, pFormData );
Insert( pSubFormData, LIST_APPEND );
//////////////////////////////////////////////////////////////
@@ -608,7 +607,7 @@ namespace svxform
if (xSubForm.is())
{ // die aktuelle Component ist eine Form
- pSubFormData = new FmFormData(xSubForm, m_aNormalImages, m_aHCImages, pFormData);
+ pSubFormData = new FmFormData(xSubForm, m_aNormalImages, pFormData);
Insert(pSubFormData, LIST_APPEND);
//////////////////////////////////////////////////////////////
@@ -617,7 +616,7 @@ namespace svxform
}
else
{
- pNewControlData = new FmControlData(xCurrentComponent, m_aNormalImages, m_aHCImages, pFormData);
+ pNewControlData = new FmControlData(xCurrentComponent, m_aNormalImages, pFormData);
Insert(pNewControlData, LIST_APPEND);
}
}
@@ -640,7 +639,7 @@ namespace svxform
if (xParentForm.is())
pParentData = (FmFormData*)FindData( xParentForm, GetRootList() );
- pFormData = new FmFormData( xForm, m_aNormalImages, m_aHCImages, pParentData );
+ pFormData = new FmFormData( xForm, m_aNormalImages, pParentData );
Insert( pFormData, nRelPos );
}
@@ -658,7 +657,7 @@ namespace svxform
FmFormData* pParentData = (FmFormData*)FindData( xForm, GetRootList() );
if( !pParentData )
{
- pParentData = new FmFormData( xForm, m_aNormalImages, m_aHCImages, NULL );
+ pParentData = new FmFormData( xForm, m_aNormalImages, NULL );
Insert( pParentData, LIST_APPEND );
}
@@ -666,7 +665,7 @@ namespace svxform
{
//////////////////////////////////////////////////////////
// Neue EntryData setzen
- FmEntryData* pNewEntryData = new FmControlData( xComp, m_aNormalImages, m_aHCImages, pParentData );
+ FmEntryData* pNewEntryData = new FmControlData( xComp, m_aNormalImages, pParentData );
//////////////////////////////////////////////////////////
// Neue EntryData einfuegen
@@ -675,12 +674,15 @@ namespace svxform
}
//------------------------------------------------------------------------
- void NavigatorTreeModel::ReplaceFormComponent(const Reference< XFormComponent > & xOld, const Reference< XFormComponent > & xNew)
+ void NavigatorTreeModel::ReplaceFormComponent(
+ const Reference< XFormComponent > & xOld,
+ const Reference< XFormComponent > & xNew
+ )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::ReplaceFormComponent" );
FmEntryData* pData = FindData(xOld, GetRootList(), sal_True);
DBG_ASSERT(pData && pData->ISA(FmControlData), "NavigatorTreeModel::ReplaceFormComponent : invalid argument !");
- ((FmControlData*)pData)->ModelReplaced( xNew, m_aNormalImages, m_aHCImages );
+ ((FmControlData*)pData)->ModelReplaced( xNew, m_aNormalImages );
FmNavModelReplacedHint aReplacedHint( pData );
Broadcast( aReplacedHint );
@@ -1000,7 +1002,7 @@ namespace svxform
&& (pEntryData!=pChildData)
)
{
-
+
SQLContext aError;
aError.Message = String(SVX_RES(RID_ERR_CONTEXT_ADDFORM));
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 0b941558d2..3c3460d211 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -1228,12 +1228,10 @@ IMPL_LINK( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox )
IMPL_LINK( GalleryBrowser2, MiscHdl, void*, EMPTYARG )
{
- const sal_Bool bHC = maViewBox.GetSettings().GetStyleSettings().GetHighContrastMode();
-
maViewBox.SetOutStyle( maMiscOptions.GetToolboxStyle() );
- BitmapEx aIconBmpEx = BitmapEx( Image( GAL_RESID( bHC? RID_SVXIMG_GALLERY_VIEW_ICON_HC : RID_SVXIMG_GALLERY_VIEW_ICON ) ).GetBitmapEx() );
- BitmapEx aListBmpEx = BitmapEx( Image( GAL_RESID( bHC? RID_SVXIMG_GALLERY_VIEW_LIST_HC : RID_SVXIMG_GALLERY_VIEW_LIST ) ).GetBitmapEx() );
+ BitmapEx aIconBmpEx = BitmapEx( Image( GAL_RESID( RID_SVXIMG_GALLERY_VIEW_ICON ) ).GetBitmapEx() );
+ BitmapEx aListBmpEx = BitmapEx( Image( GAL_RESID( RID_SVXIMG_GALLERY_VIEW_LIST ) ).GetBitmapEx() );
if( maMiscOptions.AreCurrentSymbolsLarge() )
{
diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src
index 4fe6116fec..6ac9839b0f 100644
--- a/svx/source/gallery2/gallery.src
+++ b/svx/source/gallery2/gallery.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -257,19 +257,6 @@ Image RID_SVXIMG_GALLERY_VIEW_LIST
MASKCOLOR
};
-Image RID_SVXIMG_GALLERY_VIEW_ICON_HC
-{
- ImageBitmap = Bitmap { File = "galicon_h.bmp"; };
- MASKCOLOR
-};
-
-Image RID_SVXIMG_GALLERY_VIEW_LIST_HC
-{
- ImageBitmap = Bitmap { File = "gallist_h.bmp"; };
- MASKCOLOR
-};
-
-
/******************************************************************************/
Menu RID_SVXMN_GALLERY1
diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc
index fac792e7d1..b4bdc3b6e7 100644
--- a/svx/source/inc/datanavi.hrc
+++ b/svx/source/inc/datanavi.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -38,17 +38,20 @@
// Controls
#define TB_ITEMS 10
#define LB_ITEMS 11
+
// Menu items
#define MID_INSERT_CONTROL 100
+
// ToolBox items
#define TBI_ITEM_ADD 10
#define TBI_ITEM_ADD_ELEMENT 11
#define TBI_ITEM_ADD_ATTRIBUTE 12
#define TBI_ITEM_EDIT 13
#define TBI_ITEM_REMOVE 14
+
// ImageLists
#define IL_TBX_BMPS 20
-#define IL_TBX_BMPS_HC 21
+
// ImageIndexes
#define IID_ITEM_ADD 1
#define IID_ITEM_ADD_ELEMENT 2
@@ -62,6 +65,7 @@
#define MB_MODELS 11
#define TC_ITEMS 12
#define MB_INSTANCES 13
+
// MenuItems
#define MID_MODELS_ADD 10
#define MID_MODELS_EDIT 11
@@ -70,13 +74,15 @@
#define MID_INSTANCES_EDIT 21
#define MID_INSTANCES_REMOVE 22
#define MID_SHOW_DETAILS 30
+
// TabPage Ids
#define TID_SUBMISSION 10
#define TID_BINDINGS 11
#define TID_INSTANCE 12
+
// ImageLists
#define IL_ITEM_BMPS 30
-#define IL_ITEM_BMPS_HC 31
+
// ImageIndexes
#define IID_GROUP_CLOSED 1
#define IID_GROUP_OPEN 2
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 18aad9bfd6..033b11ecbf 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -152,7 +152,6 @@ namespace svxform
bool m_bHasModel;
DataGroupType m_eGroup;
ImageList m_TbxImageList;
- ImageList m_TbxHCImageList;
// these strings are not valid on the Submission and Binding Page
// mb: furthermore these are properties of an instance, thus
// it would be much better to get/set them through the UIHelper
@@ -234,7 +233,6 @@ namespace svxform
Size m_a2Size;
Size m_a3Size;
ImageList m_aItemImageList;
- ImageList m_aItemHCImageList;
PageList m_aPageList;
ContainerList m_aContainerList;
EventTargetList m_aEventTargetList;
@@ -274,7 +272,6 @@ namespace svxform
void RemoveBroadcaster();
inline const ImageList& GetItemImageList() const { return m_aItemImageList; }
- inline const ImageList& GetItemHCImageList() const { return m_aItemHCImageList; }
inline bool IsShowDetails() const { return m_bShowDetails; }
inline void DisableNotify( bool _bDisable ) { m_bIsNotifyDisabled = _bDisable; }
};
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index bd6f44002b..4f1f25632a 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -609,9 +609,6 @@ class RecovDocList : public SvxSimpleTable
Image m_aGreenCheckImg;
Image m_aYellowCheckImg;
Image m_aRedCrossImg;
- Image m_aGreenCheckImgHC;
- Image m_aYellowCheckImgHC;
- Image m_aRedCrossImgHC;
String m_aSuccessRecovStr;
String m_aOrigDocRecovStr;
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index fe0ea08531..160f3e09eb 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -249,7 +249,6 @@ public:
FmFormData(
const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm,
const ImageList& _rNormalImages,
- const ImageList& _rHCImages,
FmFormData* _pParent = NULL
);
@@ -284,7 +283,6 @@ public:
FmControlData(
const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxComponent,
const ImageList& _rNormalImages,
- const ImageList& _rHCImages,
FmFormData* _pParent
);
FmControlData( const FmControlData& rControlData );
@@ -296,8 +294,7 @@ public:
void ModelReplaced(
const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxNew,
- const ImageList& _rNormalImages,
- const ImageList& _rHCImages
+ const ImageList& _rNormalImages
);
};
@@ -362,7 +359,6 @@ namespace svxform
OFormComponentObserver* m_pPropChangeList;
ImageList m_aNormalImages;
- ImageList m_aHCImages;
void UpdateContent( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xForms );
FmControlData* CreateControlData( ::com::sun::star::form::XFormComponent* pFormComponent );
@@ -384,7 +380,7 @@ namespace svxform
// Rueckgabe sal_True, wenn das Objekt eine FormComponent ist (oder rekursiv nur aus solchen besteht)
public:
- NavigatorTreeModel( const ImageList& _rNormalImages, const ImageList& _rHCImages );
+ NavigatorTreeModel( const ImageList& _rNormalImages );
virtual ~NavigatorTreeModel();
void FillBranch( FmFormData* pParentData );
@@ -432,7 +428,6 @@ namespace svxform
ListBoxEntrySet m_aCutEntries;
// die Images, die ich brauche (und an FormDatas und EntryDatas weiterreiche)
ImageList m_aNavigatorImages;
- ImageList m_aNavigatorImagesHC;
::svxform::OControlExchangeHelper m_aControlExchange;
@@ -451,7 +446,7 @@ namespace svxform
sal_uInt16 m_nFormsSelected;
sal_uInt16 m_nControlsSelected;
sal_uInt16 m_nHiddenControls; // (die Zahl geht in m_nControlsSelected mit ein)
-
+
unsigned short m_aTimerCounter;
sal_Bool m_bDragDataDirty : 1; // dito
diff --git a/svx/source/inc/fmresids.hrc b/svx/source/inc/fmresids.hrc
index 08982d8444..07e994bb62 100644
--- a/svx/source/inc/fmresids.hrc
+++ b/svx/source/inc/fmresids.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,6 @@
// ImageList-Id's -----------------------------------------------------------
#define RID_SVXIMGLIST_FMEXPL (RID_FORMS_START + 0)
-#define RID_SVXIMGLIST_FMEXPL_HC (RID_FORMS_START + 2)
// Image-Id's -----------------------------------------------------------
//#define SID_FMSLOTS_START (SID_SVX_START + 592) -> svxids.hrc
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index 13235d7775..1e754d5db4 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -221,17 +221,17 @@ namespace sdr
{
// direct model data is the page size, get and use it
const basegfx::B2DRange aInnerRange(
- rPage.GetLftBorder(), rPage.GetUppBorder(),
+ rPage.GetLftBorder(), rPage.GetUppBorder(),
rPage.GetWdt() - rPage.GetRgtBorder(), rPage.GetHgt() - rPage.GetLwrBorder());
const basegfx::B2DPolygon aInnerPolgon(basegfx::tools::createPolygonFromRect(aInnerRange));
const basegfx::B2DHomMatrix aEmptyTransform;
const drawinglayer::primitive2d::Primitive2DReference xReference(
drawinglayer::primitive2d::createPolyPolygonFillPrimitive(
- basegfx::B2DPolyPolygon(aInnerPolgon),
- aEmptyTransform,
+ basegfx::B2DPolyPolygon(aInnerPolgon),
+ aEmptyTransform,
aFill,
drawinglayer::attribute::FillGradientAttribute()));
-
+
xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
}
}
@@ -313,7 +313,7 @@ namespace sdr
drawinglayer::primitive2d::Primitive2DSequence xRetval;
const SdrPage& rPage = getPage();
const basegfx::B2DRange aPageBorderRange(0.0, 0.0, (double)rPage.GetWdt(), (double)rPage.GetHgt());
-
+
// We have only the page information, not the view information. Use the
// svtools::FONTCOLOR color for initialisation
const svtools::ColorConfig aColorConfig;
@@ -328,10 +328,10 @@ namespace sdr
aLeft.append(basegfx::B2DPoint(aPageBorderRange.getMinX(), aPageBorderRange.getMinY()));
aLeft.append(basegfx::B2DPoint(aPageBorderRange.getMinX(), aPageBorderRange.getMaxY()));
-
+
aRight.append(basegfx::B2DPoint(aPageBorderRange.getMaxX(), aPageBorderRange.getMinY()));
aRight.append(basegfx::B2DPoint(aPageBorderRange.getMaxX(), aPageBorderRange.getMaxY()));
-
+
xRetval.realloc(2);
xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(aLeft, aRGBBorderColor));
xRetval[1] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(aRight, aRGBBorderColor));
@@ -375,7 +375,7 @@ namespace sdr
{
const SdrPage& rPage = getPage();
const basegfx::B2DRange aPageBorderRange(
- (double)rPage.GetLftBorder(), (double)rPage.GetUppBorder(),
+ (double)rPage.GetLftBorder(), (double)rPage.GetUppBorder(),
(double)(rPage.GetWdt() - rPage.GetRgtBorder()), (double)(rPage.GetHgt() - rPage.GetLwrBorder()));
const basegfx::B2DPolygon aPageBorderPolygon(basegfx::tools::createPolygonFromRect(aPageBorderRange));
@@ -436,7 +436,7 @@ namespace sdr
{
const ViewContact& rCandidate(GetViewContact(a));
const drawinglayer::primitive2d::Primitive2DSequence aCandSeq(rCandidate.getViewIndependentPrimitive2DSequence());
-
+
drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, aCandSeq);
}
@@ -572,9 +572,9 @@ namespace sdr
// Access to possible sub-hierarchy
sal_uInt32 ViewContactOfSdrPage::GetObjectCount() const
{
- // Fixed count of content. It contains PageBackground (Wiese), PageShadow, PageFill,
+ // Fixed count of content. It contains PageBackground (Wiese), PageShadow, PageFill,
// then - depending on if the page has a MasterPage - either MasterPage Hierarchy
- // or MPBGO. Also OuterPageBorder, InnerPageBorder and two pairs of Grid and Helplines
+ // or MPBGO. Also OuterPageBorder, InnerPageBorder and two pairs of Grid and Helplines
// (for front and back) which internally are visible or not depending on the current
// front/back setting for those.
return 11;
@@ -587,7 +587,7 @@ namespace sdr
case 0: return (ViewContact&)maViewContactOfPageBackground;
case 1: return (ViewContact&)maViewContactOfPageShadow;
case 2: return (ViewContact&)maViewContactOfPageFill;
- case 3:
+ case 3:
{
const SdrPage& rPage = GetSdrPage();
@@ -621,7 +621,7 @@ namespace sdr
maViewContactOfPageBackground.ActionChanged();
maViewContactOfPageShadow.ActionChanged();
maViewContactOfPageFill.ActionChanged();
-
+
const SdrPage& rPage = GetSdrPage();
if(rPage.TRG_HasMasterPage())
@@ -632,7 +632,7 @@ namespace sdr
{
maViewContactOfMasterPage.ActionChanged();
}
-
+
maViewContactOfOuterPageBorder.ActionChanged();
maViewContactOfInnerPageBorder.ActionChanged();
maViewContactOfGridBack.ActionChanged();
@@ -655,26 +655,26 @@ namespace sdr
drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfPageBackground.getViewIndependentPrimitive2DSequence());
drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfPageShadow.getViewIndependentPrimitive2DSequence());
drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfPageFill.getViewIndependentPrimitive2DSequence());
-
+
const SdrPage& rPage = GetSdrPage();
if(rPage.TRG_HasMasterPage())
{
- drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval,
+ drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval,
rPage.TRG_GetMasterPageDescriptorViewContact().getViewIndependentPrimitive2DSequence());
}
else if(rPage.IsMasterPage())
{
- drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval,
+ drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval,
maViewContactOfMasterPage.getViewIndependentPrimitive2DSequence());
}
-
+
drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfOuterPageBorder.getViewIndependentPrimitive2DSequence());
drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfInnerPageBorder.getViewIndependentPrimitive2DSequence());
drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, maViewContactOfPageHierarchy.getViewIndependentPrimitive2DSequence());
// Only add front versions of grid and helplines since no visibility test is done,
- // so adding the back incarnations is not necessary. This makes the Front
+ // so adding the back incarnations is not necessary. This makes the Front
// visualisation the default when no visibility tests are done.
//
// Since we have no view here, no grid and helpline definitions are available currently. The used
diff --git a/svx/source/src/app.src b/svx/source/src/app.src
index f0a7891465..a5ffd7ecfb 100644
--- a/svx/source/src/app.src
+++ b/svx/source/src/app.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -63,20 +63,6 @@ ImageList RID_DEFAULTIMAGELIST_LC
IMAGE_ID_LIST
};
-ImageList RID_DEFAULTIMAGELIST_SCH
-{
- Prefix = "sch";
- MASKCOLOR
- IMAGE_ID_LIST
-};
-
-ImageList RID_DEFAULTIMAGELIST_LCH
-{
- Prefix = "lch";
- MASKCOLOR
- IMAGE_ID_LIST
-};
-
// Strings ---------------------------------------------------------------
String RID_DESKTOP
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 80f150a615..f4ecdc0027 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -260,30 +260,6 @@ Image RID_SVXBMP_SIGNET_NOTVALIDATED
};
MaskColor = STD_MASKCOLOR;
};
-Image RID_SVXBMP_SIGNET_H
-{
- ImageBitmap = Bitmap
- {
- File = "signet_11x16_h.png" ;
- };
- MaskColor = STD_MASKCOLOR;
-};
-Image RID_SVXBMP_SIGNET_BROKEN_H
-{
- ImageBitmap = Bitmap
- {
- File = "caution_11x16_h.png" ;
- };
- MaskColor = STD_MASKCOLOR;
-};
-Image RID_SVXBMP_SIGNET_NOTVALIDATED_H
-{
- ImageBitmap = Bitmap
- {
- File = "notcertificate_16_h.png" ;
- };
- MaskColor = STD_MASKCOLOR;
-};
Image RID_SVXBMP_SLIDERBUTTON
@@ -310,31 +286,6 @@ Image RID_SVXBMP_SLIDERINCREASE
};
MaskColor = STD_MASKCOLOR;
};
-Image RID_SVXBMP_SLIDERBUTTON_HC
-{
- ImageBitmap = Bitmap
- {
- File = "navigationball_10_h.png" ;
- };
- MaskColor = STD_MASKCOLOR;
-};
-Image RID_SVXBMP_SLIDERDECREASE_HC
-{
- ImageBitmap = Bitmap
- {
- File = "slidezoomout_11_h.png" ;
- };
- MaskColor = STD_MASKCOLOR;
-};
-Image RID_SVXBMP_SLIDERINCREASE_HC
-{
- ImageBitmap = Bitmap
- {
- File = "slidezoomin_11_h.png" ;
- };
- MaskColor = STD_MASKCOLOR;
-};
-
Image RID_SVXBMP_DOC_MODIFIED_YES
{
ImageBitmap = Bitmap
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 402a589c85..4667d17b37 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -67,17 +67,13 @@ struct XmlSecStatusBarControl::XmlSecStatusBarControl_Impl
XmlSecStatusBarControl::XmlSecStatusBarControl( USHORT _nSlotId, USHORT _nId, StatusBar& _rStb )
:SfxStatusBarControl( _nSlotId, _nId, _rStb )
-
,mpImpl( new XmlSecStatusBarControl_Impl )
{
mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN;
- sal_Bool bHC = GetStatusBar().GetSettings().GetStyleSettings().GetHighContrastMode();
- mpImpl->maImage = Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_H : RID_SVXBMP_SIGNET ) );
- mpImpl->maImageBroken =
- Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_BROKEN_H : RID_SVXBMP_SIGNET_BROKEN ) );
- mpImpl->maImageNotValidated =
- Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_NOTVALIDATED_H : RID_SVXBMP_SIGNET_NOTVALIDATED ) );
+ mpImpl->maImage = Image( SVX_RES( RID_SVXBMP_SIGNET ) );
+ mpImpl->maImageBroken = Image( SVX_RES( RID_SVXBMP_SIGNET_BROKEN ) );
+ mpImpl->maImageNotValidated = Image( SVX_RES( RID_SVXBMP_SIGNET_NOTVALIDATED ) );
}
XmlSecStatusBarControl::~XmlSecStatusBarControl()
@@ -97,7 +93,6 @@ void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, con
}
else if( pState->ISA( SfxUInt16Item ) )
{
-// mpImpl->mbSigned = ( ( SfxUInt16Item* ) pState )->GetValue() == 1 /* SIGNED*/ ;
mpImpl->mnState = ( ( SfxUInt16Item* ) pState )->GetValue();
}
else
@@ -170,7 +165,7 @@ void XmlSecStatusBarControl::Paint( const UserDrawEvent& rUsrEvt )
++aRect.Top();
pDev->DrawImage( aRect.TopLeft(), mpImpl->maImageBroken );
}
- else if( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_NOTVALIDATED
+ else if( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_NOTVALIDATED
|| mpImpl->mnState == SIGNATURESTATE_SIGNATURES_PARTIAL_OK)
{
++aRect.Top();
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index bf1e93046b..5b9298a0b1 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -182,10 +182,9 @@ SvxZoomSliderControl::SvxZoomSliderControl( USHORT _nSlotId, USHORT _nId, Statu
SfxStatusBarControl( _nSlotId, _nId, _rStb ),
mpImpl( new SvxZoomSliderControl_Impl )
{
- const sal_Bool bHC = GetStatusBar().GetSettings().GetStyleSettings().GetHighContrastMode();
- mpImpl->maSliderButton = Image( SVX_RES( bHC ? RID_SVXBMP_SLIDERBUTTON_HC : RID_SVXBMP_SLIDERBUTTON ) );
- mpImpl->maIncreaseButton = Image( SVX_RES( bHC ? RID_SVXBMP_SLIDERINCREASE_HC : RID_SVXBMP_SLIDERINCREASE ) );
- mpImpl->maDecreaseButton = Image( SVX_RES( bHC ? RID_SVXBMP_SLIDERDECREASE_HC : RID_SVXBMP_SLIDERDECREASE ) );
+ mpImpl->maSliderButton = Image( SVX_RES( RID_SVXBMP_SLIDERBUTTON ) );
+ mpImpl->maIncreaseButton = Image( SVX_RES( RID_SVXBMP_SLIDERINCREASE ) );
+ mpImpl->maDecreaseButton = Image( SVX_RES( RID_SVXBMP_SLIDERDECREASE ) );
}
// -----------------------------------------------------------------------
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 72958e2cc0..3da165a28d 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
-#include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/awt/MenuItemStyle.hpp>
#include <com/sun/star/awt/XPopupMenuExtended.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
@@ -83,15 +83,17 @@ namespace svx
static sal_Int32 gSkewList[] = { 135, 90, 45, 180, 0, -360, -135, -90, -45 };
-ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow )
-: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DIRECTION ))
-, mrController( rController )
-, maImgPerspective( SVX_RES( IMG_PERSPECTIVE ) )
-, maImgPerspectiveH( SVX_RES( IMG_PERSPECTIVE_H ) )
-, maImgParallel( SVX_RES( IMG_PARALLEL ) )
-, maImgParallelH( SVX_RES( IMG_PARALLEL_H ) )
-, msExtrusionDirection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirection" ) )
-, msExtrusionProjection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionProjection" ) )
+ExtrusionDirectionWindow::ExtrusionDirectionWindow(
+ svt::ToolboxController& rController,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ Window* pParentWindow
+)
+: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DIRECTION )) ,
+ mrController( rController ) ,
+ maImgPerspective( SVX_RES( IMG_PERSPECTIVE ) ) ,
+ maImgParallel( SVX_RES( IMG_PARALLEL ) ) ,
+ msExtrusionDirection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirection" ) ) ,
+ msExtrusionProjection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionProjection" ) )
{
SetHelpId( HID_MENU_EXTRUSION_DIRECTION );
@@ -99,7 +101,6 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rCon
for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
{
maImgDirection[i] = Image( SVX_RES( IMG_DIRECTION + i ) );
- maImgDirectionH[i] = Image( SVX_RES( IMG_DIRECTION_H + i ) );
}
SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) );
@@ -110,20 +111,18 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rCon
mpDirectionSet->SetColCount( 3 );
mpDirectionSet->EnableFullItemMode( FALSE );
- bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
{
String aText( SVX_RES( STR_DIRECTION + i ) );
- mpDirectionSet->InsertItem( i+1, bHighContrast ? maImgDirectionH[ i ] : maImgDirection[ i ], aText );
+ mpDirectionSet->InsertItem( i+1, maImgDirection[ i ], aText );
}
mpDirectionSet->SetOutputSizePixel( Size( 72, 72 ) );
appendEntry( 2, mpDirectionSet );
appendSeparator();
- appendEntry( 0, String( SVX_RES( STR_PERSPECTIVE ) ), bHighContrast ? maImgPerspectiveH : maImgPerspective );
- appendEntry( 1, String( SVX_RES( STR_PARALLEL ) ), bHighContrast ? maImgParallelH : maImgParallel );
+ appendEntry( 0, String( SVX_RES( STR_PERSPECTIVE ) ), maImgPerspective );
+ appendEntry( 1, String( SVX_RES( STR_PARALLEL ) ), maImgParallel );
SetOutputSizePixel( getMenuSize() );
@@ -139,15 +138,13 @@ void ExtrusionDirectionWindow::DataChanged( const DataChangedEvent& rDCEvt )
if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
{
- bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
for( USHORT i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
{
- mpDirectionSet->SetItemImage( i+1, bHighContrast ? maImgDirectionH[ i ] : maImgDirection[ i ] );
+ mpDirectionSet->SetItemImage( i+1, maImgDirection[ i ] );
}
- setEntryImage( 0, bHighContrast ? maImgPerspectiveH : maImgPerspective );
- setEntryImage( 1, bHighContrast ? maImgParallelH : maImgParallel );
+ setEntryImage( 0, maImgPerspective );
+ setEntryImage( 1, maImgParallel );
}
}
@@ -188,7 +185,9 @@ void ExtrusionDirectionWindow::implSetProjection( sal_Int32 nProjection, bool bE
// -----------------------------------------------------------------------
-void SAL_CALL ExtrusionDirectionWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL ExtrusionDirectionWindow::statusChanged(
+ const ::com::sun::star::frame::FeatureStateEvent& Event
+) throw ( ::com::sun::star::uno::RuntimeException )
{
if( Event.FeatureURL.Main.equals( msExtrusionDirection ) )
{
@@ -237,7 +236,7 @@ IMPL_LINK( ExtrusionDirectionWindow, SelectHdl, void *, pControl )
{
int nProjection = getSelectedEntryId();
if( (nProjection >= 0) && (nProjection < 2 ) )
- {
+ {
Sequence< PropertyValue > aArgs( 1 );
aArgs[0].Name = msExtrusionProjection.copy(5);
aArgs[0].Value <<= (sal_Int32)nProjection;
@@ -254,8 +253,13 @@ IMPL_LINK( ExtrusionDirectionWindow, SelectHdl, void *, pControl )
// ExtrusionDirectionControl
// =======================================================================
-ExtrusionDirectionControl::ExtrusionDirectionControl( const Reference< lang::XMultiServiceFactory >& rServiceManager )
-: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) ) )
+ExtrusionDirectionControl::ExtrusionDirectionControl(
+ const Reference< lang::XMultiServiceFactory >& rServiceManager
+) : svt::PopupWindowController(
+ rServiceManager,
+ Reference< frame::XFrame >(),
+ OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) )
+ )
{
}
@@ -286,7 +290,9 @@ Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames
// --------------------------------------------------------------------
-Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
+Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstance(
+ const Reference< XMultiServiceFactory >& rSMgr
+) throw( RuntimeException )
{
return *new ExtrusionDirectionControl( rSMgr );
}
@@ -314,7 +320,7 @@ ExtrusionDepthDialog::ExtrusionDepthDialog( Window* pParent, double fDepth, Fiel
maOKButton( this, SVX_RES( BTN_OK ) ),
maCancelButton( this, SVX_RES( BTN_CANCEL ) ),
maHelpButton( this, SVX_RES( BTN_HELP ) )
-{
+{
bool bMetric = IsMetric( eDefaultUnit );
maMtrDepth.SetUnit( bMetric ? FUNIT_CM : FUNIT_INCH );
maMtrDepth.SetValue( (int) fDepth * 100, FUNIT_100TH_MM );
@@ -328,8 +334,7 @@ ExtrusionDepthDialog::~ExtrusionDepthDialog()
double ExtrusionDepthDialog::getDepth() const
{
-// bool bMetric = IsMetric( meDefaultUnit );
- return (double)( maMtrDepth.GetValue( FUNIT_100TH_MM ) ) / 100.0;
+ return (double)( maMtrDepth.GetValue( FUNIT_100TH_MM ) ) / 100.0;
}
// ####################################################################
@@ -337,38 +342,33 @@ double ExtrusionDepthDialog::getDepth() const
double aDepthListInch[] = { 0, 1270,2540,5080,10160 };
double aDepthListMM[] = { 0, 1000, 2500, 5000, 10000 };
-ExtrusionDepthWindow::ExtrusionDepthWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow )
-: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DEPTH ))
-, mrController( rController )
-, maImgDepth0( SVX_RES( IMG_DEPTH_0 ) )
-, maImgDepth1( SVX_RES( IMG_DEPTH_1 ) )
-, maImgDepth2( SVX_RES( IMG_DEPTH_2 ) )
-, maImgDepth3( SVX_RES( IMG_DEPTH_3 ) )
-, maImgDepth4( SVX_RES( IMG_DEPTH_4 ) )
-, maImgDepthInfinity( SVX_RES( IMG_DEPTH_INFINITY ) )
-, maImgDepth0h( SVX_RES( IMG_DEPTH_0_H ) )
-, maImgDepth1h( SVX_RES( IMG_DEPTH_1_H ) )
-, maImgDepth2h( SVX_RES( IMG_DEPTH_2_H ) )
-, maImgDepth3h( SVX_RES( IMG_DEPTH_3_H ) )
-, maImgDepth4h( SVX_RES( IMG_DEPTH_4_H ) )
-, maImgDepthInfinityh( SVX_RES( IMG_DEPTH_INFINITY_H ) )
-, mfDepth( -1.0 )
-, msExtrusionDepth( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepth" ) )
-, msMetricUnit( RTL_CONSTASCII_USTRINGPARAM( ".uno:MetricUnit" ) )
+ExtrusionDepthWindow::ExtrusionDepthWindow(
+ svt::ToolboxController& rController,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ Window* pParentWindow
+) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DEPTH ))
+ , mrController( rController )
+ , maImgDepth0( SVX_RES( IMG_DEPTH_0 ) )
+ , maImgDepth1( SVX_RES( IMG_DEPTH_1 ) )
+ , maImgDepth2( SVX_RES( IMG_DEPTH_2 ) )
+ , maImgDepth3( SVX_RES( IMG_DEPTH_3 ) )
+ , maImgDepth4( SVX_RES( IMG_DEPTH_4 ) )
+ , maImgDepthInfinity( SVX_RES( IMG_DEPTH_INFINITY ) )
+ , mfDepth( -1.0 )
+ , msExtrusionDepth( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepth" ) )
+ , msMetricUnit( RTL_CONSTASCII_USTRINGPARAM( ".uno:MetricUnit" ) )
{
SetHelpId( HID_MENU_EXTRUSION_DEPTH );
SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) );
- bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
String aEmpty;
- appendEntry( 0, aEmpty, bHighContrast ? maImgDepth0h : maImgDepth0 );
- appendEntry( 1, aEmpty, bHighContrast ? maImgDepth1h : maImgDepth1 );
- appendEntry( 2, aEmpty, bHighContrast ? maImgDepth2h : maImgDepth2 );
- appendEntry( 3, aEmpty, bHighContrast ? maImgDepth3h : maImgDepth3 );
- appendEntry( 4, aEmpty, bHighContrast ? maImgDepth4h : maImgDepth4 );
- appendEntry( 5, String( SVX_RES( STR_INFINITY ) ), bHighContrast ? maImgDepthInfinityh : maImgDepthInfinity );
+ appendEntry( 0, aEmpty, maImgDepth0 );
+ appendEntry( 1, aEmpty, maImgDepth1 );
+ appendEntry( 2, aEmpty, maImgDepth2 );
+ appendEntry( 3, aEmpty, maImgDepth3 );
+ appendEntry( 4, aEmpty, maImgDepth4 );
+ appendEntry( 5, String( SVX_RES( STR_INFINITY ) ), maImgDepthInfinity );
appendEntry( 6, String( SVX_RES( STR_CUSTOM ) ) );
SetOutputSizePixel( getMenuSize() );
@@ -414,7 +414,9 @@ void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit )
// -----------------------------------------------------------------------
-void SAL_CALL ExtrusionDepthWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL ExtrusionDepthWindow::statusChanged(
+ const ::com::sun::star::frame::FeatureStateEvent& Event
+) throw ( ::com::sun::star::uno::RuntimeException )
{
if( Event.FeatureURL.Main.equals( msExtrusionDepth ) )
{
@@ -452,14 +454,12 @@ void ExtrusionDepthWindow::DataChanged( const DataChangedEvent& rDCEvt )
if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
{
- bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
- setEntryImage( 0, bHighContrast ? maImgDepth0h : maImgDepth0 );
- setEntryImage( 1, bHighContrast ? maImgDepth1h : maImgDepth1 );
- setEntryImage( 2, bHighContrast ? maImgDepth2h : maImgDepth2 );
- setEntryImage( 3, bHighContrast ? maImgDepth3h : maImgDepth3 );
- setEntryImage( 4, bHighContrast ? maImgDepth4h : maImgDepth4 );
- setEntryImage( 5, bHighContrast ? maImgDepthInfinityh : maImgDepthInfinity );
+ setEntryImage( 0, maImgDepth0 );
+ setEntryImage( 1, maImgDepth1 );
+ setEntryImage( 2, maImgDepth2 );
+ setEntryImage( 3, maImgDepth3 );
+ setEntryImage( 4, maImgDepth4 );
+ setEntryImage( 5, maImgDepthInfinity );
}
}
@@ -477,7 +477,7 @@ IMPL_LINK( ExtrusionDepthWindow, SelectHdl, void *, EMPTYARG )
EndPopupMode();
const rtl::OUString aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepthDialog" ));
-
+
Any a;
Sequence< PropertyValue > aArgs( 2 );
aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Depth" ));
@@ -499,7 +499,7 @@ IMPL_LINK( ExtrusionDepthWindow, SelectHdl, void *, EMPTYARG )
{
fDepth = IsMetric( meUnit ) ? aDepthListMM[nSelected] : aDepthListInch[nSelected];
}
-
+
Sequence< PropertyValue > aArgs( 1 );
aArgs[0].Name = msExtrusionDepth.copy(5);
aArgs[0].Value <<= fDepth;
@@ -518,8 +518,13 @@ IMPL_LINK( ExtrusionDepthWindow, SelectHdl, void *, EMPTYARG )
// ExtrusionDirectionControl
// =======================================================================
-ExtrusionDepthController::ExtrusionDepthController( const Reference< lang::XMultiServiceFactory >& rServiceManager )
-: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepthFloater" ) ) )
+ExtrusionDepthController::ExtrusionDepthController(
+ const Reference< lang::XMultiServiceFactory >& rServiceManager
+) : svt::PopupWindowController(
+ rServiceManager,
+ Reference< frame::XFrame >(),
+ OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepthFloater" ) )
+ )
{
}
@@ -580,10 +585,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr
, mrController( rController )
, maImgBright( SVX_RES( IMG_LIGHTING_BRIGHT ) )
, maImgNormal( SVX_RES( IMG_LIGHTING_NORMAL ) )
-, maImgDim( SVX_RES( IMG_LIGHTING_DIM ) )
-, maImgBrighth( SVX_RES( IMG_LIGHTING_BRIGHT_H ) )
-, maImgNormalh( SVX_RES( IMG_LIGHTING_NORMAL_H ) )
-, maImgDimh( SVX_RES( IMG_LIGHTING_DIM_H ) )
+, maImgDim( SVX_RES( IMG_LIGHTING_DIM ) )
, mnLevel( 0 )
, mbLevelEnabled( false )
, mnDirection( FROM_FRONT )
@@ -596,13 +598,10 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr
{
if( i != FROM_FRONT )
{
- maImgLightingOff[i] = Image( SVX_RES( IMG_LIGHT_OFF + i ) );
- maImgLightingOn[i] = Image( SVX_RES( IMG_LIGHT_ON + i ) );
- maImgLightingOffh[i] = Image( SVX_RES( IMG_LIGHT_OFF_H + i ) );
- maImgLightingOnh[i] = Image( SVX_RES( IMG_LIGHT_ON_H + i ) );
+ maImgLightingOff[ i ] = Image( SVX_RES( IMG_LIGHT_OFF + i ) );
+ maImgLightingOn[ i ] = Image( SVX_RES( IMG_LIGHT_ON + i ) );
}
maImgLightingPreview[i] = Image( SVX_RES( IMG_LIGHT_PREVIEW + i ) );
- maImgLightingPreviewh[i] = Image( SVX_RES( IMG_LIGHT_PREVIEW_H + i ) );
}
SetHelpId( HID_MENU_EXTRUSION_LIGHTING );
@@ -615,26 +614,24 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr
mpLightingSet->SetColCount( 3 );
mpLightingSet->EnableFullItemMode( FALSE );
- bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ )
{
if( i != FROM_FRONT )
{
- mpLightingSet->InsertItem( i+1, bHighContrast ? maImgLightingOffh[i] : maImgLightingOff[i] );
+ mpLightingSet->InsertItem( i+1, maImgLightingOff[i] );
}
else
{
- mpLightingSet->InsertItem( 5, bHighContrast ? maImgLightingPreviewh[FROM_FRONT] : maImgLightingPreview[FROM_FRONT] );
+ mpLightingSet->InsertItem( 5, maImgLightingPreview[FROM_FRONT] );
}
}
mpLightingSet->SetOutputSizePixel( Size( 72, 72 ) );
appendEntry( 3, mpLightingSet );
appendSeparator();
- appendEntry( 0, String( SVX_RES( STR_BRIGHT ) ), bHighContrast ? maImgBrighth : maImgBright );
- appendEntry( 1, String( SVX_RES( STR_NORMAL ) ), bHighContrast ? maImgNormalh : maImgNormal );
- appendEntry( 2, String( SVX_RES( STR_DIM ) ), bHighContrast ? maImgDimh : maImgDim );
+ appendEntry( 0, String( SVX_RES( STR_BRIGHT ) ), maImgBright );
+ appendEntry( 1, String( SVX_RES( STR_NORMAL ) ), maImgNormal );
+ appendEntry( 2, String( SVX_RES( STR_DIM ) ), maImgDim );
SetOutputSizePixel( getMenuSize() );
@@ -665,8 +662,6 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled )
mnDirection = nDirection;
mbDirectionEnabled = bEnabled;
- bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
if( !bEnabled )
nDirection = FROM_FRONT;
@@ -675,18 +670,14 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled )
{
if( nItemId == FROM_FRONT )
{
- mpLightingSet->SetItemImage( nItemId + 1, bHighContrast ? maImgLightingPreviewh[ nDirection ] : maImgLightingPreview[ nDirection ] );
+ mpLightingSet->SetItemImage( nItemId + 1, maImgLightingPreview[ nDirection ] );
}
else
{
- if( bHighContrast )
- {
- mpLightingSet->SetItemImage( nItemId + 1, (USHORT)nDirection == nItemId ? maImgLightingOnh[nItemId] : maImgLightingOffh[nItemId] );
- }
- else
- {
- mpLightingSet->SetItemImage( nItemId + 1, (USHORT)nDirection == nItemId ? maImgLightingOn[nItemId] : maImgLightingOff[nItemId] );
- }
+ mpLightingSet->SetItemImage(
+ nItemId + 1,
+ (USHORT)nDirection == nItemId ? maImgLightingOn[nItemId] : maImgLightingOff[nItemId]
+ );
}
}
@@ -695,7 +686,9 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled )
// -----------------------------------------------------------------------
-void SAL_CALL ExtrusionLightingWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL ExtrusionLightingWindow::statusChanged(
+ const ::com::sun::star::frame::FeatureStateEvent& Event
+) throw ( ::com::sun::star::uno::RuntimeException )
{
if( Event.FeatureURL.Main.equals( msExtrusionLightingIntensity ) )
{
@@ -733,12 +726,10 @@ void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt )
if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
{
- bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
implSetDirection( mnDirection, mbDirectionEnabled );
- setEntryImage( 0, bHighContrast ? maImgBrighth : maImgBright );
- setEntryImage( 1, bHighContrast ? maImgNormalh : maImgNormal );
- setEntryImage( 2, bHighContrast ? maImgDimh : maImgDim );
+ setEntryImage( 0, maImgBright );
+ setEntryImage( 1, maImgNormal );
+ setEntryImage( 2, maImgDim );
}
}
@@ -790,8 +781,12 @@ IMPL_LINK( ExtrusionLightingWindow, SelectHdl, void *, pControl )
// ========================================================================
-ExtrusionLightingControl::ExtrusionLightingControl( const Reference< lang::XMultiServiceFactory >& rServiceManager )
-: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) ) )
+ExtrusionLightingControl::ExtrusionLightingControl(
+ const Reference< lang::XMultiServiceFactory >& rServiceManager
+) : svt::PopupWindowController( rServiceManager,
+ Reference< frame::XFrame >(),
+ OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) )
+ )
{
}
@@ -822,7 +817,9 @@ Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames(
// --------------------------------------------------------------------
-Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
+Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstance(
+ const Reference< XMultiServiceFactory >& rSMgr
+) throw( RuntimeException )
{
return *new ExtrusionLightingControl( rSMgr );
}
@@ -843,33 +840,30 @@ Sequence< OUString > SAL_CALL ExtrusionLightingControl::getSupportedServiceNames
// ####################################################################
-ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow )
-: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_SURFACE ))
-, mrController( rController )
-, maImgSurface1( SVX_RES( IMG_WIRE_FRAME ) )
-, maImgSurface2( SVX_RES( IMG_MATTE ) )
-, maImgSurface3( SVX_RES( IMG_PLASTIC ) )
-, maImgSurface4( SVX_RES( IMG_METAL ) )
-, maImgSurface1h( SVX_RES( IMG_WIRE_FRAME_H ) )
-, maImgSurface2h( SVX_RES( IMG_MATTE_H ) )
-, maImgSurface3h( SVX_RES( IMG_PLASTIC_H ) )
-, maImgSurface4h( SVX_RES( IMG_METAL_H ) )
-, msExtrusionSurface( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurface" ))
+ExtrusionSurfaceWindow::ExtrusionSurfaceWindow(
+ svt::ToolboxController& rController,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ Window* pParentWindow
+) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_SURFACE ) )
+ , mrController( rController )
+ , maImgSurface1( SVX_RES( IMG_WIRE_FRAME ) )
+ , maImgSurface2( SVX_RES( IMG_MATTE ) )
+ , maImgSurface3( SVX_RES( IMG_PLASTIC ) )
+ , maImgSurface4( SVX_RES( IMG_METAL ) )
+ , msExtrusionSurface( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurface" ) )
{
- bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
SetHelpId( HID_MENU_EXTRUSION_SURFACE );
SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) );
- appendEntry( 0, String( SVX_RES( STR_WIREFRAME ) ), bHighContrast ? maImgSurface1h : maImgSurface1 );
- appendEntry( 1, String( SVX_RES( STR_MATTE ) ), bHighContrast ? maImgSurface2h : maImgSurface2 );
- appendEntry( 2, String( SVX_RES( STR_PLASTIC ) ), bHighContrast ? maImgSurface3h : maImgSurface3 );
- appendEntry( 3, String( SVX_RES( STR_METAL ) ), bHighContrast ? maImgSurface4h : maImgSurface4 );
+ appendEntry( 0, String( SVX_RES( STR_WIREFRAME ) ), maImgSurface1 );
+ appendEntry( 1, String( SVX_RES( STR_MATTE ) ), maImgSurface2 );
+ appendEntry( 2, String( SVX_RES( STR_PLASTIC ) ), maImgSurface3 );
+ appendEntry( 3, String( SVX_RES( STR_METAL ) ), maImgSurface4 );
SetOutputSizePixel( getMenuSize() );
FreeResource();
-
+
AddStatusListener( msExtrusionSurface );
}
@@ -877,20 +871,19 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( svt::ToolboxController& rControl
void ExtrusionSurfaceWindow::implSetSurface( int nSurface, bool bEnabled )
{
-// if( mpMenu )
+ int i;
+ for( i = 0; i < 4; i++ )
{
- int i;
- for( i = 0; i < 4; i++ )
- {
- checkEntry( i, (i == nSurface) && bEnabled );
- enableEntry( i, bEnabled );
- }
+ checkEntry( i, (i == nSurface) && bEnabled );
+ enableEntry( i, bEnabled );
}
}
// -----------------------------------------------------------------------
-void SAL_CALL ExtrusionSurfaceWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL ExtrusionSurfaceWindow::statusChanged(
+ const ::com::sun::star::frame::FeatureStateEvent& Event
+) throw ( ::com::sun::star::uno::RuntimeException )
{
if( Event.FeatureURL.Main.equals( msExtrusionSurface ) )
{
@@ -931,8 +924,14 @@ IMPL_LINK( ExtrusionSurfaceWindow, SelectHdl, void *, EMPTYARG )
// ========================================================================
-ExtrusionSurfaceControl::ExtrusionSurfaceControl( const Reference< lang::XMultiServiceFactory >& rServiceManager )
-: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurfaceFloater" ) ) )
+ExtrusionSurfaceControl::ExtrusionSurfaceControl(
+ const Reference< lang::XMultiServiceFactory >& rServiceManager
+)
+: svt::PopupWindowController(
+ rServiceManager,
+ Reference< frame::XFrame >(),
+ OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurfaceFloater" ) )
+ )
{
}
@@ -963,7 +962,9 @@ Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames()
// --------------------------------------------------------------------
-Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
+Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance(
+ const Reference< XMultiServiceFactory >& rSMgr
+) throw( RuntimeException )
{
return *new ExtrusionSurfaceControl( rSMgr );
}
@@ -986,7 +987,7 @@ Sequence< OUString > SAL_CALL ExtrusionSurfaceControl::getSupportedServiceNames(
SFX_IMPL_TOOLBOX_CONTROL( ExtrusionColorControl, SvxColorItem );
-ExtrusionColorControl::ExtrusionColorControl(
+ExtrusionColorControl::ExtrusionColorControl(
USHORT nSlotId, USHORT nId, ToolBox& rTbx )
: SfxToolBoxControl ( nSlotId, nId, rTbx )
{
@@ -1012,10 +1013,10 @@ SfxPopupWindowType ExtrusionColorControl::GetPopupWindowType() const
SfxPopupWindow* ExtrusionColorControl::CreatePopupWindow()
{
- SvxColorWindow_Impl* pColorWin = new SvxColorWindow_Impl(
+ SvxColorWindow_Impl* pColorWin = new SvxColorWindow_Impl(
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Extrusion3DColor" )),
- SID_EXTRUSION_3D_COLOR,
- m_xFrame,
+ SID_EXTRUSION_3D_COLOR,
+ m_xFrame,
SVX_RESSTR( RID_SVXSTR_EXTRUSION_COLOR ),
&GetToolBox() );
pColorWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
diff --git a/svx/source/tbxctrls/extrusioncontrols.hrc b/svx/source/tbxctrls/extrusioncontrols.hrc
index c406d5c683..0ff7e0ddc2 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hrc
+++ b/svx/source/tbxctrls/extrusioncontrols.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -64,7 +64,6 @@
#define STR_DIRECTION 30 // needs 10 resource ids
#define IMG_DIRECTION 1 // needs 10 resource ids
-#define IMG_DIRECTION_H 10 // needs 10 resource ids
#define IMG_DEPTH_0 19
#define IMG_DEPTH_1 20
@@ -73,48 +72,24 @@
#define IMG_DEPTH_4 23
#define IMG_DEPTH_INFINITY 24
-#define IMG_DEPTH_0_H 25
-#define IMG_DEPTH_1_H 26
-#define IMG_DEPTH_2_H 27
-#define IMG_DEPTH_3_H 28
-#define IMG_DEPTH_4_H 29
-#define IMG_DEPTH_INFINITY_H 30
-
#define IMG_PERSPECTIVE 31
-#define IMG_PERSPECTIVE_H 32
#define IMG_PARALLEL 33
-#define IMG_PARALLEL_H 34
#define IMG_WIRE_FRAME 35
#define IMG_MATTE 36
#define IMG_PLASTIC 37
#define IMG_METAL 38
-#define IMG_WIRE_FRAME_H 39
-#define IMG_MATTE_H 40
-#define IMG_PLASTIC_H 41
-#define IMG_METAL_H 42
-
#define IMG_LIGHT_OFF 50 // needs 10 resource ids
#define IMG_LIGHT_ON 60 // needs 10 resource ids
#define IMG_LIGHT_PREVIEW 70 // needs 10 resource ids
-#define IMG_LIGHT_OFF_H 80 // needs 10 resource ids
-#define IMG_LIGHT_ON_H 90 // needs 10 resource ids
-#define IMG_LIGHT_PREVIEW_H 100 // needs 10 resource ids
-
#define IMG_LIGHTING_BRIGHT 110
#define IMG_LIGHTING_NORMAL 111
#define IMG_LIGHTING_DIM 112
-#define IMG_LIGHTING_BRIGHT_H 113
-#define IMG_LIGHTING_NORMAL_H 114
-#define IMG_LIGHTING_DIM_H 115
-
#define FL_DEPTH 1
#define MTR_DEPTH 2
#define BTN_OK 3
#define BTN_CANCEL 4
#define BTN_HELP 5
-
-//
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index 3fcf2bd693..2279095aa9 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -63,12 +63,8 @@ private:
ValueSet* mpDirectionSet;
Image maImgDirection[9];
- Image maImgDirectionH[9];
-
Image maImgPerspective;
- Image maImgPerspectiveH;
Image maImgParallel;
- Image maImgParallelH;
const rtl::OUString msExtrusionDirection;
const rtl::OUString msExtrusionProjection;
@@ -92,7 +88,7 @@ public:
// XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
using svt::PopupWindowController::createPopupWindow;
};
@@ -111,13 +107,6 @@ private:
Image maImgDepth4;
Image maImgDepthInfinity;
- Image maImgDepth0h;
- Image maImgDepth1h;
- Image maImgDepth2h;
- Image maImgDepth3h;
- Image maImgDepth4h;
- Image maImgDepthInfinityh;
-
FieldUnit meUnit;
double mfDepth;
@@ -147,7 +136,7 @@ public:
// XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
using svt::PopupWindowController::createPopupWindow;
};
@@ -164,16 +153,9 @@ private:
Image maImgLightingOn[9];
Image maImgLightingPreview[9];
- Image maImgLightingOffh[9];
- Image maImgLightingOnh[9];
- Image maImgLightingPreviewh[9];
-
Image maImgBright;
Image maImgNormal;
Image maImgDim;
- Image maImgBrighth;
- Image maImgNormalh;
- Image maImgDimh;
int mnLevel;
bool mbLevelEnabled;
@@ -205,8 +187,8 @@ public:
// XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
-
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
+
using svt::PopupWindowController::createPopupWindow;
};
@@ -221,10 +203,6 @@ private:
Image maImgSurface2;
Image maImgSurface3;
Image maImgSurface4;
- Image maImgSurface1h;
- Image maImgSurface2h;
- Image maImgSurface3h;
- Image maImgSurface4h;
const rtl::OUString msExtrusionSurface;
@@ -249,7 +227,7 @@ public:
// XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
using svt::PopupWindowController::createPopupWindow;
};
diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src
index 8262348890..4d3d1f5d4f 100644
--- a/svx/source/tbxctrls/extrusioncontrols.src
+++ b/svx/source/tbxctrls/extrusioncontrols.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -47,117 +47,62 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
ImageBitmap = Bitmap { File = "directionnorthwest_22.bmp" ; };
MASKCOLOR
};
- Image IMG_DIRECTION_H + DIRECTION_NW
- {
- ImageBitmap = Bitmap { File = "directionnorthwest_22_h.bmp" ; };
- MASKCOLOR
- };
Image IMG_DIRECTION + DIRECTION_N
{
ImageBitmap = Bitmap { File = "directionnorth_22.bmp" ; };
MASKCOLOR
};
- Image IMG_DIRECTION_H + DIRECTION_N
- {
- ImageBitmap = Bitmap { File = "directionnorth_22_h.bmp"; };
- MASKCOLOR
- };
Image IMG_DIRECTION + DIRECTION_NE
{
ImageBitmap = Bitmap { File = "directionnortheast_22.bmp"; };
MASKCOLOR
};
- Image IMG_DIRECTION_H + DIRECTION_NE
- {
- ImageBitmap = Bitmap { File = "directionnortheast_22_h.bmp"; };
- MASKCOLOR
- };
Image IMG_DIRECTION + DIRECTION_W
{
ImageBitmap = Bitmap { File = "directionwest_22.bmp"; };
MASKCOLOR
};
- Image IMG_DIRECTION_H + DIRECTION_W
- {
- ImageBitmap = Bitmap { File = "directionwest_22_h.bmp"; };
- MASKCOLOR
- };
Image IMG_DIRECTION + DIRECTION_NONE
{
ImageBitmap = Bitmap { File = "directionstraight_22.bmp"; };
MASKCOLOR
};
- Image IMG_DIRECTION_H + DIRECTION_NONE
- {
- ImageBitmap = Bitmap { File = "directionstraight_22_h.bmp"; };
- MASKCOLOR
- };
Image IMG_DIRECTION + DIRECTION_E
{
ImageBitmap = Bitmap { File = "directioneast_22.bmp"; };
MASKCOLOR
};
- Image IMG_DIRECTION_H + DIRECTION_E
- {
- ImageBitmap = Bitmap { File = "directioneast_22_h.bmp"; };
- MASKCOLOR
- };
Image IMG_DIRECTION + DIRECTION_SW
{
ImageBitmap = Bitmap { File = "directionsouthwest_22.bmp"; };
MASKCOLOR
};
- Image IMG_DIRECTION_H + DIRECTION_SW
- {
- ImageBitmap = Bitmap { File = "directionsouthwest_22_h.bmp"; };
- MASKCOLOR
- };
Image IMG_DIRECTION + DIRECTION_S
{
ImageBitmap = Bitmap { File = "directionsouth_22.bmp"; };
MASKCOLOR
};
- Image IMG_DIRECTION_H + DIRECTION_S
- {
- ImageBitmap = Bitmap { File = "directionsouth_22_h.bmp"; };
- MASKCOLOR
- };
Image IMG_DIRECTION + DIRECTION_SE
{
ImageBitmap = Bitmap { File = "directionsoutheast_22.bmp"; };
MASKCOLOR
};
- Image IMG_DIRECTION_H + DIRECTION_SE
- {
- ImageBitmap = Bitmap { File = "directionsoutheast_22_h.bmp"; };
- MASKCOLOR
- };
Image IMG_PERSPECTIVE
{
ImageBitmap = Bitmap { File = "perspective_16.bmp"; };
MASKCOLOR
};
- Image IMG_PERSPECTIVE_H
- {
- ImageBitmap = Bitmap { File = "perspective_16_h.bmp"; };
- MASKCOLOR
- };
Image IMG_PARALLEL
{
ImageBitmap = Bitmap { File = "parallel_16.bmp"; };
MASKCOLOR
};
- Image IMG_PARALLEL_H
- {
- ImageBitmap = Bitmap { File = "parallel_16_h.bmp"; };
- MASKCOLOR
- };
-
+
String STR_PERSPECTIVE
{
Text [ en-US ] = "~Perspective" ;
};
-
+
String STR_PARALLEL
{
Text [ en-US ] = "P~arallel" ;
@@ -199,7 +144,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
Text [ en-US ] = "Extrusion South-East";
};
};
-
+
DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
{
Border = FALSE ;
@@ -211,12 +156,12 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
Zoomable = TRUE ;
Text [ en-US ] = "Extrusion Depth" ;
-
+
String STR_CUSTOM
{
Text [ en-US ] = "~Custom...";
};
-
+
String STR_INFINITY
{
Text [ en-US ] = "~Infinity";
@@ -227,65 +172,35 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
ImageBitmap = Bitmap { File = "extrusion0inch_16.bmp"; };
MASKCOLOR
};
- Image IMG_DEPTH_0_H
- {
- ImageBitmap = Bitmap { File = "extrusion0inch_16_h.bmp"; };
- MASKCOLOR
- };
Image IMG_DEPTH_1
{
ImageBitmap = Bitmap { File = "extrusion05inch_16.bmp"; };
MASKCOLOR
};
- Image IMG_DEPTH_1_H
- {
- ImageBitmap = Bitmap { File = "extrusion05inch_16_h.bmp"; };
- MASKCOLOR
- };
Image IMG_DEPTH_2
{
ImageBitmap = Bitmap { File = "extrusion1inch_16.bmp"; };
MASKCOLOR
};
- Image IMG_DEPTH_2_H
- {
- ImageBitmap = Bitmap { File = "extrusion1inch_16_h.bmp"; };
- MASKCOLOR
- };
Image IMG_DEPTH_3
{
ImageBitmap = Bitmap { File = "extrusion2inch_16.bmp"; };
MASKCOLOR
};
- Image IMG_DEPTH_3_H
- {
- ImageBitmap = Bitmap { File = "extrusion2inch_16_h.bmp"; };
- MASKCOLOR
- };
Image IMG_DEPTH_4
{
ImageBitmap = Bitmap { File = "extrusion4inch_16.bmp"; };
MASKCOLOR
};
- Image IMG_DEPTH_4_H
- {
- ImageBitmap = Bitmap { File = "extrusion4inch_16_h.bmp"; };
- MASKCOLOR
- };
Image IMG_DEPTH_INFINITY
{
ImageBitmap = Bitmap { File = "extrusioninfinity_16.bmp"; };
MASKCOLOR
- };
- Image IMG_DEPTH_INFINITY_H
- {
- ImageBitmap = Bitmap { File = "extrusioninfinity_16_h.bmp"; };
- MASKCOLOR
};
};
@@ -301,7 +216,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
Zoomable = TRUE ;
Text [ en-US ] = "Extrusion Lighting" ;
-
+
Image IMG_LIGHT_OFF + FROM_TOP_LEFT
{
ImageBitmap = Bitmap { File = "lightofffromtopleft_22.bmp"; };
@@ -343,47 +258,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
MASKCOLOR
};
- Image IMG_LIGHT_OFF_H + FROM_TOP_LEFT
- {
- ImageBitmap = Bitmap { File = "lightofffromtopleft_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_OFF_H + FROM_TOP
- {
- ImageBitmap = Bitmap { File = "lightofffromtop_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_OFF_H + FROM_TOP_RIGHT
- {
- ImageBitmap = Bitmap { File = "lightofffromtopright_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_OFF_H + FROM_LEFT
- {
- ImageBitmap = Bitmap { File = "lightofffromleft_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_OFF_H + FROM_RIGHT
- {
- ImageBitmap = Bitmap { File = "lightofffromright_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_OFF_H + FROM_BOTTOM_LEFT
- {
- ImageBitmap = Bitmap { File = "lightofffrombottomleft_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_OFF_H + FROM_BOTTOM
- {
- ImageBitmap = Bitmap { File = "lightofffrombottom_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_OFF_H + FROM_BOTTOM_RIGHT
- {
- ImageBitmap = Bitmap { File = "lightofffrombottomright_22_h.bmp"; };
- MASKCOLOR
- };
-
Image IMG_LIGHT_ON + FROM_TOP_LEFT
{
ImageBitmap = Bitmap { File = "lightonfromtopleft_22.bmp"; };
@@ -425,47 +299,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
MASKCOLOR
};
- Image IMG_LIGHT_ON_H + FROM_TOP_LEFT
- {
- ImageBitmap = Bitmap { File = "lightonfromtopleft_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_ON_H + FROM_TOP
- {
- ImageBitmap = Bitmap { File = "lightonfromtop_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_ON_H + FROM_TOP_RIGHT
- {
- ImageBitmap = Bitmap { File = "lightonfromtopright_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_ON_H + FROM_LEFT
- {
- ImageBitmap = Bitmap { File = "lightonfromleft_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_ON_H + FROM_RIGHT
- {
- ImageBitmap = Bitmap { File = "lightonfromright_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_ON_H + FROM_BOTTOM_LEFT
- {
- ImageBitmap = Bitmap { File = "lightonfrombottomleft_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_ON_H + FROM_BOTTOM
- {
- ImageBitmap = Bitmap { File = "lightonfrombottom_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_ON_H + FROM_BOTTOM_RIGHT
- {
- ImageBitmap = Bitmap { File = "lightonfrombottomright_22_h.bmp"; };
- MASKCOLOR
- };
-
Image IMG_LIGHT_PREVIEW + FROM_TOP_LEFT
{
ImageBitmap = Bitmap { File = "lightfromtopleft_22.bmp"; };
@@ -512,52 +345,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
MASKCOLOR
};
- Image IMG_LIGHT_PREVIEW_H + FROM_TOP_LEFT
- {
- ImageBitmap = Bitmap { File = "lightfromtopleft_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_PREVIEW_H + FROM_TOP
- {
- ImageBitmap = Bitmap { File = "lightfromtop_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_PREVIEW_H + FROM_TOP_RIGHT
- {
- ImageBitmap = Bitmap { File = "lightfromtopright_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_PREVIEW_H + FROM_LEFT
- {
- ImageBitmap = Bitmap { File = "lightfromleft_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_PREVIEW_H + FROM_RIGHT
- {
- ImageBitmap = Bitmap { File = "lightfromright_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_PREVIEW_H + FROM_FRONT
- {
- ImageBitmap = Bitmap { File = "lightfromfront_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_PREVIEW_H + FROM_BOTTOM_LEFT
- {
- ImageBitmap = Bitmap { File = "lightfrombottomleft_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_PREVIEW_H + FROM_BOTTOM
- {
- ImageBitmap = Bitmap { File = "lightfrombottom_22_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHT_PREVIEW_H + FROM_BOTTOM_RIGHT
- {
- ImageBitmap = Bitmap { File = "lightfrombottomright_22_h.bmp"; };
- MASKCOLOR
- };
-
Image IMG_LIGHTING_BRIGHT
{
ImageBitmap = Bitmap { File = "brightlit_16.bmp"; };
@@ -574,22 +361,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
MASKCOLOR
};
- Image IMG_LIGHTING_BRIGHT_H
- {
- ImageBitmap = Bitmap { File = "brightlit_16_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHTING_NORMAL_H
- {
- ImageBitmap = Bitmap { File = "normallit_16_h.bmp"; };
- MASKCOLOR
- };
- Image IMG_LIGHTING_DIM_H
- {
- ImageBitmap = Bitmap { File = "dimlit_16_h.bmp"; };
- MASKCOLOR
- };
-
String STR_BRIGHT
{
Text [ en-US ] = "~Bright";
@@ -617,7 +388,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE
Zoomable = TRUE ;
Text [ en-US ] = "Extrusion Surface" ;
-
+
String STR_WIREFRAME
{
Text [ en-US ] = "~Wire Frame";
@@ -642,43 +413,25 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE
{
ImageBitmap = Bitmap { File = "wireframe_16.bmp"; };
MASKCOLOR
- };
- Image IMG_WIRE_FRAME_H
- {
- ImageBitmap = Bitmap { File = "wireframe_16_h.bmp"; };
- MASKCOLOR
- };
+ };
+
Image IMG_MATTE
{
ImageBitmap = Bitmap { File = "matte_16.bmp"; };
MASKCOLOR
- };
- Image IMG_MATTE_H
- {
- ImageBitmap = Bitmap { File = "matte_16_h.bmp"; };
- MASKCOLOR
- };
+ };
+
Image IMG_PLASTIC
{
ImageBitmap = Bitmap { File = "plastic_16.bmp"; };
MASKCOLOR
- };
- Image IMG_PLASTIC_H
- {
- ImageBitmap = Bitmap { File = "plastic_16_h.bmp"; };
- MASKCOLOR
- };
+ };
+
Image IMG_METAL
{
ImageBitmap = Bitmap { File = "metal_16.bmp"; };
MASKCOLOR
- };
- Image IMG_METAL_H
- {
- ImageBitmap = Bitmap { File = "metal_16_h.bmp"; };
- MASKCOLOR
- };
-
+ };
};
#define WIDTH 140
@@ -703,7 +456,6 @@ ModalDialog RID_SVX_MDLG_EXTRUSION_DEPTH
};
MetricField MTR_DEPTH
{
- //HelpId = HID_SD_CTL_FAVORITES ;
Border = FALSE ;
Pos = MAP_APPFONT ( 3 , 14 ) ;
Size = MAP_APPFONT ( WIDTH - 50 - 12, 12 ) ;
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 199626d6dc..6b7256757f 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -364,11 +364,6 @@ private:
Image maImgAlgin3;
Image maImgAlgin4;
Image maImgAlgin5;
- Image maImgAlgin1h;
- Image maImgAlgin2h;
- Image maImgAlgin3h;
- Image maImgAlgin4h;
- Image maImgAlgin5h;
const rtl::OUString msFontworkAlignment;
@@ -380,16 +375,11 @@ private:
FontWorkAlignmentWindow::FontWorkAlignmentWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow )
: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_FONTWORK_ALIGNMENT ))
, mrController( rController )
-, maImgAlgin1( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16 ) )
-, maImgAlgin2( SVX_RES( IMG_FONTWORK_ALIGN_CENTER_16 ) )
-, maImgAlgin3( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16 ) )
-, maImgAlgin4( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16 ) )
+, maImgAlgin1( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16 ) )
+, maImgAlgin2( SVX_RES( IMG_FONTWORK_ALIGN_CENTER_16 ) )
+, maImgAlgin3( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16 ) )
+, maImgAlgin4( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16 ) )
, maImgAlgin5( SVX_RES( IMG_FONTWORK_ALIGN_STRETCH_16 ) )
-, maImgAlgin1h( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16_H ) )
-, maImgAlgin2h( SVX_RES( IMG_FONTWORK_ALIGN_CENTER_16_H ) )
-, maImgAlgin3h( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16_H ) )
-, maImgAlgin4h( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16_H ) )
-, maImgAlgin5h( SVX_RES( IMG_FONTWORK_ALIGN_STRETCH_16_H ) )
, msFontworkAlignment( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkAlignment" ) )
{
bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
@@ -397,11 +387,11 @@ FontWorkAlignmentWindow::FontWorkAlignmentWindow( svt::ToolboxController& rContr
SetHelpId( HID_POPUP_FONTWORK_ALIGN );
SetSelectHdl( LINK( this, FontWorkAlignmentWindow, SelectHdl ) );
- appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), bHighContrast ? maImgAlgin1h : maImgAlgin1 );
- appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), bHighContrast ? maImgAlgin2h : maImgAlgin2 );
- appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), bHighContrast ? maImgAlgin3h : maImgAlgin3 );
- appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), bHighContrast ? maImgAlgin4h : maImgAlgin4 );
- appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), bHighContrast ? maImgAlgin5h : maImgAlgin5 );
+ appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), maImgAlgin1 );
+ appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), maImgAlgin2 );
+ appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), maImgAlgin3 );
+ appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), maImgAlgin4 );
+ appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), maImgAlgin5 );
SetOutputSizePixel( getMenuSize() );
@@ -451,11 +441,11 @@ void FontWorkAlignmentWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
- appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), bHighContrast ? maImgAlgin1h : maImgAlgin1 );
- appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), bHighContrast ? maImgAlgin2h : maImgAlgin2 );
- appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), bHighContrast ? maImgAlgin3h : maImgAlgin3 );
- appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), bHighContrast ? maImgAlgin4h : maImgAlgin4 );
- appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), bHighContrast ? maImgAlgin5h : maImgAlgin5 );
+ appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), maImgAlgin1 );
+ appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), maImgAlgin2 );
+ appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), maImgAlgin3 );
+ appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), maImgAlgin4 );
+ appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), maImgAlgin5 );
}
}
@@ -494,7 +484,7 @@ public:
// XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
using svt::PopupWindowController::createPopupWindow;
};
@@ -587,13 +577,13 @@ FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow( svt::ToolboxCont
SetSelectHdl( LINK( this, FontWorkCharacterSpacingWindow, SelectHdl ) );
appendEntry( 0, String( SVX_RES( STR_CHARS_SPACING_VERY_TIGHT ) ), MIB_RADIOCHECK );
- appendEntry( 1, String( SVX_RES( STR_CHARS_SPACING_TIGHT ) ), MIB_RADIOCHECK );
- appendEntry( 2, String( SVX_RES( STR_CHARS_SPACING_NORMAL ) ), MIB_RADIOCHECK );
- appendEntry( 3, String( SVX_RES( STR_CHARS_SPACING_LOOSE ) ), MIB_RADIOCHECK );
+ appendEntry( 1, String( SVX_RES( STR_CHARS_SPACING_TIGHT ) ), MIB_RADIOCHECK );
+ appendEntry( 2, String( SVX_RES( STR_CHARS_SPACING_NORMAL ) ), MIB_RADIOCHECK );
+ appendEntry( 3, String( SVX_RES( STR_CHARS_SPACING_LOOSE ) ), MIB_RADIOCHECK );
appendEntry( 4, String( SVX_RES( STR_CHARS_SPACING_VERY_LOOSE ) ), MIB_RADIOCHECK );
- appendEntry( 5, String( SVX_RES( STR_CHARS_SPACING_CUSTOM ) ), MIB_RADIOCHECK );
+ appendEntry( 5, String( SVX_RES( STR_CHARS_SPACING_CUSTOM ) ), MIB_RADIOCHECK );
appendSeparator();
- appendEntry( 6, String( SVX_RES( STR_CHARS_SPACING_KERN_PAIRS ) ), MIB_CHECKABLE );
+ appendEntry( 6, String( SVX_RES( STR_CHARS_SPACING_KERN_PAIRS ) ), MIB_CHECKABLE );
SetOutputSizePixel( getMenuSize() );
@@ -698,7 +688,7 @@ IMPL_LINK( FontWorkCharacterSpacingWindow, SelectHdl, void *, EMPTYARG )
else if ( nSelection == 6 ) // KernCharacterPairs
{
rtl::OUString aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkKernCharacterPairs" ));
-
+
Sequence< PropertyValue > aArgs( 1 );
aArgs[0].Name = msFontworkKernCharacterPairs.copy(5);
aArgs[0].Value <<= (sal_Bool) sal_True;
@@ -708,7 +698,7 @@ IMPL_LINK( FontWorkCharacterSpacingWindow, SelectHdl, void *, EMPTYARG )
implSetKernCharacterPairs( sal_True, true );
}
else if( nSelection >= 0 )
- {
+ {
Sequence< PropertyValue > aArgs( 1 );
aArgs[0].Name = msFontworkCharacterSpacing.copy(5);
aArgs[0].Value <<=( sal_Int32)nCharacterSpacing;
@@ -734,7 +724,7 @@ public:
// XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
using svt::PopupWindowController::createPopupWindow;
};
diff --git a/svx/source/tbxctrls/fontworkgallery.src b/svx/source/tbxctrls/fontworkgallery.src
index f4d5e421bc..34164876e1 100644
--- a/svx/source/tbxctrls/fontworkgallery.src
+++ b/svx/source/tbxctrls/fontworkgallery.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -103,7 +103,7 @@ DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
Zoomable = TRUE ;
Text [ en-US ] = "Fontwork Alignment" ;
-
+
String STR_ALIGN_LEFT
{
Text [ en-US ] = "~Left Align";
@@ -129,102 +129,52 @@ DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
{
ImageBitmap = Bitmap { File = "fontworkalignleft_16.png"; };
MASKCOLOR
- };
- Image IMG_FONTWORK_ALIGN_LEFT_16_H
- {
- ImageBitmap = Bitmap { File = "fontworkalignleft_16_h.png"; };
- MASKCOLOR
- };
+ };
Image IMG_FONTWORK_ALIGN_LEFT_26
{
ImageBitmap = Bitmap { File = "fontworkalignleft_26.png"; };
MASKCOLOR
- };
- Image IMG_FONTWORK_ALIGN_LEFT_26_H
- {
- ImageBitmap = Bitmap { File = "fontworkalignleft_26_h.png"; };
- MASKCOLOR
- };
+ };
Image IMG_FONTWORK_ALIGN_CENTER_16
{
ImageBitmap = Bitmap { File = "fontworkaligncentered_16.png"; };
MASKCOLOR
- };
- Image IMG_FONTWORK_ALIGN_CENTER_16_H
- {
- ImageBitmap = Bitmap { File = "fontworkaligncentered_16_h.png"; };
- MASKCOLOR
- };
+ };
Image IMG_FONTWORK_ALIGN_CENTER_26
{
ImageBitmap = Bitmap { File = "fontworkaligncentered_26.png"; };
MASKCOLOR
- };
- Image IMG_FONTWORK_ALIGN_CENTER_26_H
- {
- ImageBitmap = Bitmap { File = "fontworkaligncentered_26_h.png"; };
- MASKCOLOR
};
Image IMG_FONTWORK_ALIGN_RIGHT_16
{
ImageBitmap = Bitmap { File = "fontworkalignright_16.png"; };
MASKCOLOR
- };
- Image IMG_FONTWORK_ALIGN_RIGHT_16_H
- {
- ImageBitmap = Bitmap { File = "fontworkalignright_16_h.png"; };
- MASKCOLOR
- };
+ };
Image IMG_FONTWORK_ALIGN_RIGHT_26
{
ImageBitmap = Bitmap { File = "fontworkalignright_26.png"; };
MASKCOLOR
- };
- Image IMG_FONTWORK_ALIGN_RIGHT_26_H
- {
- ImageBitmap = Bitmap { File = "fontworkalignright_26_h.png"; };
- MASKCOLOR
- };
+ };
Image IMG_FONTWORK_ALIGN_WORD_16
{
ImageBitmap = Bitmap { File = "fontworkalignjustified_16.png"; };
MASKCOLOR
- };
- Image IMG_FONTWORK_ALIGN_WORD_16_H
- {
- ImageBitmap = Bitmap { File = "fontworkalignjustified_16_h.png"; };
- MASKCOLOR
- };
+ };
Image IMG_FONTWORK_ALIGN_WORD_26
{
ImageBitmap = Bitmap { File = "fontworkalignjustified_26.png"; };
MASKCOLOR
- };
- Image IMG_FONTWORK_ALIGN_WORD_26_H
- {
- ImageBitmap = Bitmap { File = "fontworkalignjustified_26_h.png"; };
- MASKCOLOR
- };
+ };
Image IMG_FONTWORK_ALIGN_STRETCH_16
{
ImageBitmap = Bitmap { File = "fontworkalignstretch_16.png"; };
MASKCOLOR
};
- Image IMG_FONTWORK_ALIGN_STRETCH_16_H
- {
- ImageBitmap = Bitmap { File = "fontworkalignstretch_16_h.png"; };
- MASKCOLOR
- };
Image IMG_FONTWORK_ALIGN_STRETCH_26
{
ImageBitmap = Bitmap { File = "fontworkalignstretch_26.png"; };
MASKCOLOR
};
- Image IMG_FONTWORK_ALIGN_STRETCH_26_H
- {
- ImageBitmap = Bitmap { File = "fontworkalignstretch_26_h.png"; };
- MASKCOLOR
- };
};
DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING
@@ -238,7 +188,7 @@ DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING
Zoomable = TRUE ;
Text [ en-US ] = "Fontwork Character Spacing" ;
-
+
String STR_CHARS_SPACING_VERY_TIGHT
{
Text [ en-US ] = "~Very Tight";
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 4a1bbd49f1..09e144b746 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -116,8 +116,6 @@ void SvxLineBox::Select()
{
XLineStyle eXLS;
USHORT nPos = GetSelectEntryPos();
-// SfxDispatcher* pDisp = rBindings.GetDispatcher();
- //DBG_ASSERT( pDisp, "invalid Dispatcher" );
switch ( nPos )
{
@@ -152,7 +150,6 @@ void SvxLineBox::Select()
SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ),
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineDash" )),
aArgs );
-// pDisp->Execute( SID_ATTR_LINE_DASH, SFX_CALLMODE_RECORD, &aLineDashItem, 0L );
}
}
break;
@@ -167,7 +164,6 @@ void SvxLineBox::Select()
SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ),
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:XLineStyle" )),
aArgs );
-// pDisp->Execute( SID_ATTR_LINE_STYLE, SFX_CALLMODE_RECORD, &aLineStyleItem, 0L );
nCurPos = GetSelectEntryPos();
ReleaseFocus_Impl();
@@ -287,10 +283,8 @@ void SvxLineBox::FillControl()
if ( pItem )
Fill( pItem->GetDashList() );
}
-
-
-// rBindings.Invalidate( SID_ATTR_LINE_DASH );
}
+
//========================================================================
// SvxColorBox
//========================================================================
@@ -332,7 +326,6 @@ IMPL_LINK( SvxColorBox, DelayHdl_Impl, Timer *, EMPTYARG )
const SvxColorTableItem* pItem = (const SvxColorTableItem*)( pSh->GetItem( SID_COLOR_TABLE ) );
if ( pItem )
Fill( pItem->GetColorTable() );
-// rBindings.Invalidate( nId );
}
return 0;
}
@@ -373,7 +366,6 @@ void SvxColorBox::Select()
SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ),
maCommand,
aArgs );
-// rBindings.GetDispatcher()->Execute( nId, SFX_CALLMODE_RECORD, &aLineColorItem, 0L );
nCurPos = GetSelectEntryPos();
ReleaseFocus_Impl();
@@ -532,7 +524,6 @@ void SvxMetricField::Modify()
SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ),
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineWidth" )),
aArgs );
-// rBindings.GetDispatcher()->Execute( SID_ATTR_LINE_WIDTH, SFX_CALLMODE_RECORD, &aLineWidthItem, 0L );
}
// -----------------------------------------------------------------------
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 3c6eb57b11..40a8b14899 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -276,15 +276,8 @@ public:
const SfxPoolItem* pState );
virtual SfxPopupWindow* Clone() const;
virtual void DataChanged( const DataChangedEvent& rDCEvt );
-
- inline BOOL IsHighContrast( void ) const;
};
-inline BOOL SvxFrameWindow_Impl::IsHighContrast( void ) const
-{
- return GetSettings().GetStyleSettings().GetHighContrastMode();
-}
-
//========================================================================
// class SvxLineWindow_Impl ---------------------------------------------------
//========================================================================
@@ -1066,7 +1059,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >&
BindListener();
String sCommand(String::CreateFromAscii( ".uno:BorderReducedMode" ));
AddStatusListener( sCommand );
- aImgList = ImageList( SVX_RES( IsHighContrast()? RID_SVXIL_FRAME_HC : RID_SVXIL_FRAME ) );
+ aImgList = ImageList( SVX_RES( RID_SVXIL_FRAME ) );
/*
* 1 2 3 4
@@ -1127,7 +1120,7 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
{
- aImgList = ImageList( SVX_RES( IsHighContrast()? RID_SVXIL_FRAME_HC : RID_SVXIL_FRAME ) );
+ aImgList = ImageList( SVX_RES( RID_SVXIL_FRAME ) );
USHORT nNumOfItems = aFrameSet.GetItemCount();
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index 67cff9ac45..f43e6ab957 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -52,13 +52,6 @@ ImageList RID_SVXIL_FRAME
IdCount = { 12 ; };
MASKCOLOR
};
-ImageList RID_SVXIL_FRAME_HC
-{
- Prefix = "frh";
- IdList = { 1 ; 2 ; 3 ; 4 ; 5 ; 6 ; 7 ; 8 ; 9 ; 10 ; 11 ; 12 ; };
- IdCount = { 12 ; };
- MASKCOLOR
-};
String RID_SVXSTR_TRANSPARENT
{
Text [ en-US ] = "No Fill" ;
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 80d1b46ed6..4780a9d36d 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite