[Libreoffice-commits] .: 5 commits - cui/source officecfg/registry svtools/inc svtools/source
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Mon Aug 22 05:37:19 PDT 2011
cui/source/inc/helpid.hrc | 26 +++++--
cui/source/options/optcolor.cxx | 61 ++++++++---------
cui/source/options/optcolor.src | 2
officecfg/registry/data/org/openoffice/Office/UI.xcu | 27 -------
officecfg/registry/schema/org/openoffice/Office/UI.xcs | 58 +---------------
svtools/inc/svtools/colorcfg.hxx | 3
svtools/source/config/colorcfg.cxx | 18 -----
7 files changed, 58 insertions(+), 137 deletions(-)
New commits:
commit d39a1d4de93e0242dee84d4d298232da1986ebec
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date: Mon Aug 22 14:34:50 2011 +0200
Default color for writer page break from blue to red: was barely visible
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index b496093..8e915c8 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -434,7 +434,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
COL_GREEN, //WRITERSCRIPTINDICATOR
0xc0c0c0, //WRITERSECTIONBOUNDARIES
0x0369a3, //WRITERHEADERFOOTERMARK,
- COL_BLUE, //WRITERPAGEBREAKS,
+ 0xff1a00, //WRITERPAGEBREAKS,
COL_LIGHTBLUE, // HTMLSGML
COL_LIGHTGREEN, // HTMLCOMMENT
COL_LIGHTRED, // HTMLKEYWORD
commit 9813a2ec35b86c1e0fcf27d5ce9893efe146eb2b
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date: Mon Aug 22 14:25:43 2011 +0200
Color config cleanup: last bits remaining removed
diff --git a/officecfg/registry/data/org/openoffice/Office/UI.xcu b/officecfg/registry/data/org/openoffice/Office/UI.xcu
index da14893..a79e8a3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI.xcu
@@ -403,12 +403,12 @@
<value xsi:nil="true"/>
</prop>
</node>
- <node oor:name="WriterPageBreaks">
+ <node oor:name="WriterHeaderFooterMark">
<prop oor:name="Color">
<value xsi:nil="true"/>
</prop>
</node>
- <node oor:name="WriterHeaderFooterMark">
+ <node oor:name="WriterPageBreaks">
<prop oor:name="Color">
<value xsi:nil="true"/>
</prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI.xcs b/officecfg/registry/schema/org/openoffice/Office/UI.xcs
index e89b391..434ec5c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI.xcs
@@ -283,23 +283,23 @@
</info>
</prop>
</group>
- <group oor:name="WriterPageBreaks">
+ <group oor:name="WriterHeaderFooterMark">
<info>
- <desc>Specifies the settings for the page break mark in Writer.</desc>
+ <desc>Specifies the settings for the header/footer mark in Writer.</desc>
</info>
<prop oor:name="Color" oor:type="xs:int">
<info>
- <desc>Specifies the color used for the page break mark.</desc>
+ <desc>Specifies the color used for the header/footer mark.</desc>
</info>
</prop>
</group>
- <group oor:name="WriterHeaderFooterMark">
+ <group oor:name="WriterPageBreaks">
<info>
- <desc>Specifies the settings for the header/footer mark in Writer.</desc>
+ <desc>Specifies the settings for the page break mark in Writer.</desc>
</info>
<prop oor:name="Color" oor:type="xs:int">
<info>
- <desc>Specifies the color used for the header/footer mark.</desc>
+ <desc>Specifies the color used for the page break mark.</desc>
</info>
</prop>
</group>
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 4b6cd0d..b496093 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -134,7 +134,6 @@ uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString&
{ RTL_CONSTASCII_USTRINGPARAM("/FontColor") ,sal_False },
{ RTL_CONSTASCII_USTRINGPARAM("/Links") ,sal_True },
{ RTL_CONSTASCII_USTRINGPARAM("/LinksVisited") ,sal_True },
- { RTL_CONSTASCII_USTRINGPARAM("/Anchor") ,sal_False },
{ RTL_CONSTASCII_USTRINGPARAM("/Spell") ,sal_False },
{ RTL_CONSTASCII_USTRINGPARAM("/SmartTags") ,sal_False },
{ RTL_CONSTASCII_USTRINGPARAM("/Shadow") , sal_True },
@@ -159,8 +158,6 @@ uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString&
{ RTL_CONSTASCII_USTRINGPARAM("/CalcReference") ,sal_False },
{ RTL_CONSTASCII_USTRINGPARAM("/CalcNotesBackground") ,sal_False },
{ RTL_CONSTASCII_USTRINGPARAM("/DrawGrid") ,sal_True },
- { RTL_CONSTASCII_USTRINGPARAM("/DrawDrawing") ,sal_False },
- { RTL_CONSTASCII_USTRINGPARAM("/DrawFill") ,sal_False },
{ RTL_CONSTASCII_USTRINGPARAM("/BASICIdentifier"), sal_False },
{ RTL_CONSTASCII_USTRINGPARAM("/BASICComment") , sal_False },
{ RTL_CONSTASCII_USTRINGPARAM("/BASICNumber") , sal_False },
commit 5d8e27d74c713f2f041c5a5668c8ffb4ad05026a
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date: Fri Aug 19 19:56:18 2011 +0200
Fixed color config schemas after clean-up
diff --git a/officecfg/registry/data/org/openoffice/Office/UI.xcu b/officecfg/registry/data/org/openoffice/Office/UI.xcu
index a9b0b7d..da14893 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI.xcu
@@ -343,14 +343,6 @@
<value xsi:nil="true"/>
</prop>
</node>
- <node oor:name="Anchor">
- <prop oor:name="IsVisible">
- <value>true</value>
- </prop>
- <prop oor:name="Color">
- <value xsi:nil="true"/>
- </prop>
- </node>
<node oor:name="Spell">
<prop oor:name="Color">
<value xsi:nil="true"/>
@@ -398,11 +390,6 @@
<value xsi:nil="true"/>
</prop>
</node>
- <node oor:name="WriterNotesIndicator">
- <prop oor:name="Color">
- <value xsi:nil="true"/>
- </prop>
- </node>
<node oor:name="WriterScriptIndicator">
<prop oor:name="Color">
<value xsi:nil="true"/>
@@ -494,16 +481,6 @@
<value xsi:nil="true"/>
</prop>
</node>
- <node oor:name="DrawDrawing">
- <prop oor:name="Color">
- <value xsi:nil="true"/>
- </prop>
- </node>
- <node oor:name="DrawFill">
- <prop oor:name="Color">
- <value xsi:nil="true"/>
- </prop>
- </node>
<node oor:name="BASICIdentifier">
<prop oor:name="Color" oor:type="xs:int">
<value xsi:nil="true"/>
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI.xcs b/officecfg/registry/schema/org/openoffice/Office/UI.xcs
index e62ea8f..e89b391 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI.xcs
@@ -163,22 +163,6 @@
</info>
</prop>
</group>
- <group oor:name="Anchor">
- <info>
- <desc>Specifies the settings for anchors.</desc>
- </info>
- <prop oor:name="IsVisible" oor:type="xs:boolean">
- <info>
- <desc>Specifies the visibility of anchors (true = visible).</desc>
- </info>
- <value>true</value>
- </prop>
- <prop oor:name="Color" oor:type="xs:int">
- <info>
- <desc>Specifies the color used for anchors.</desc>
- </info>
- </prop>
- </group>
<group oor:name="Spell">
<info>
<desc>Specifies the settings for incorrect text found with spellchecking.</desc>
@@ -273,16 +257,6 @@
</info>
</prop>
</group>
- <group oor:name="WriterNotesIndicator">
- <info>
- <desc>Specifies the settings for note indicators in Writer.</desc>
- </info>
- <prop oor:name="Color" oor:type="xs:int">
- <info>
- <desc>Specifies the color used for note indicators.</desc>
- </info>
- </prop>
- </group>
<group oor:name="WriterScriptIndicator">
<info>
<desc>Specifies the settings for script indicators in Writer.</desc>
@@ -465,26 +439,6 @@
</info>
</prop>
</group>
- <group oor:name="DrawDrawing">
- <info>
- <desc>Specifies the settings for the default drawing color in Draw/Impress.</desc>
- </info>
- <prop oor:name="Color" oor:type="xs:int">
- <info>
- <desc>Specifies the default drawing color.</desc>
- </info>
- </prop>
- </group>
- <group oor:name="DrawFill">
- <info>
- <desc>Specifies the settings for the default fill color in Draw/Impress.</desc>
- </info>
- <prop oor:name="Color" oor:type="xs:int">
- <info>
- <desc>Specifies the default fill color.</desc>
- </info>
- </prop>
- </group>
<group oor:name="BASICIdentifier">
<info>
<desc>Specifies the settings for identifiers in BASIC source code.</desc>
commit 62fb135cde7bde7ff48acfdec5da3c88a2201998
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date: Fri Aug 19 18:17:30 2011 +0200
Appearance dialog: fixed rendering of groups headings
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index ca80a8c..bb7cd15 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -485,7 +485,7 @@ sal_Int16 lcl_getGroup( sal_Int32 _nFeature )
ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rResId) :
Window(pParent, rResId),
aGeneralBackWN(this),
- aGeneralFT(&aGeneralBackWN, ResId( FT_GENERAL, *rResId.GetResMgr() )),
+ aGeneralFT(this, ResId( FT_GENERAL, *rResId.GetResMgr() )),
aDocColorFT(this, ResId( FT_DOCCOLOR, *rResId.GetResMgr())),
aDocColorLB(this, ResId( LB_DOCCOLOR, *rResId.GetResMgr())),
aDocColorWN(this, ResId( WN_DOCCOLOR, *rResId.GetResMgr())),
@@ -870,8 +870,11 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
Font aFont = aChapters[i]->GetFont();
aFont.SetWeight(WEIGHT_BOLD);
aChapters[i]->SetFont(aFont);
- aChapters[i]->SetBackground(aTransparentWall);
- aChapterWins[i]->SetPosSizePixel( Point(0, aChapters[i]->GetPosPixel().Y()),
+ aChapters[i]->SetBackground(Wallpaper(aBackColor));
+
+ long x = aChapters[i]->GetPosPixel().X() + aChapters[i]->GetSizePixel().Width();
+
+ aChapterWins[i]->SetPosSizePixel( Point(x, aChapters[i]->GetPosPixel().Y() ),
Size(nWinWidth, nFTHeight));
aChapterWins[i]->SetBackground(Wallpaper(aBackColor));
aChapterWins[i]->Show();
diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src
index 284be8a..e058e27 100644
--- a/cui/source/options/optcolor.src
+++ b/cui/source/options/optcolor.src
@@ -124,7 +124,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
#define POS_SIZE( POSX, LINENUM, CONTRL_SIZE ) Pos = MAP_APPFONT ( POSX , LINENUM * _LINE_HEIGHT ) ; CONTRL_SIZE
// ... for special types
-#define FT_SEP_POS_SIZE( LINENUM ) POS_SIZE( 14, LINENUM, FT_SEP_SIZE )
+#define FT_SEP_POS_SIZE( LINENUM ) POS_SIZE( 0, LINENUM, FT_SEP_SIZE )
#define FT_POS_SIZE( LINENUM ) POS_SIZE( _FT_XPOS, LINENUM, FT_SIZE )
#define LB_POS_SIZE( LINENUM ) POS_SIZE( _LB_XPOS, LINENUM, LB_SIZE )
#define WN_POS_SIZE( LINENUM ) POS_SIZE( _WN_XPOS, LINENUM, WN_SIZE )
commit 3a8f89bc2fa6aea91ee6c17fa29eaa09575813d6
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date: Fri Aug 19 14:43:38 2011 +0200
Cleaned up the HIDs in the color config
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index e0415de..ea1bcd1 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -95,13 +95,13 @@
#define HID_COLORPAGE_FONTCOLOR_LB "CUI_HID_COLORPAGE_FONTCOLOR_LB"
#define HID_COLORPAGE_LINKS_LB "CUI_HID_COLORPAGE_LINKS_LB"
#define HID_COLORPAGE_LINKSVISITED_LB "CUI_HID_COLORPAGE_LINKSVISITED_LB"
-#define HID_COLORPAGE_ANCHOR_LB "CUI_HID_COLORPAGE_ANCHOR_LB"
#define HID_COLORPAGE_SPELL_LB "CUI_HID_COLORPAGE_SPELL_LB"
+#define HID_COLORPAGE_SMARTTAGS_LB "CUI_HID_COLORPAGE_SMARTTAGS_LB"
+#define HID_COLORPAGE_SHADOWCOLOR_LB "CUI_HID_COLORPAGE_SHADOWCOLOR_LB"
#define HID_COLORPAGE_WRITERTEXTGRID_LB "CUI_HID_COLORPAGE_WRITERTEXTGRID_LB"
#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB "CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_LB"
#define HID_COLORPAGE_WRITERIDXSHADINGS_LB "CUI_HID_COLORPAGE_WRITERIDXSHADINGS_LB"
#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB "CUI_HID_COLORPAGE_WRITERDIRECTCURSOR_LB"
-#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB "CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_LB"
#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB"
#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB"
#define HID_COLORPAGE_WRITERHEADERFOOTERMARK_LB "CUI_HID_COLORPAGE_WRITERHEADERFOOTERMARK_LB"
@@ -119,8 +119,6 @@
#define HID_COLORPAGE_CALCREFERENCE_LB "CUI_HID_COLORPAGE_CALCREFERENCE_LB"
#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB "CUI_HID_COLORPAGE_CALCNOTESBACKGROUND_LB"
#define HID_COLORPAGE_DRAWGRID_LB "CUI_HID_COLORPAGE_DRAWGRID_LB"
-#define HID_COLORPAGE_DRAWDRAWING_LB "CUI_HID_COLORPAGE_DRAWDRAWING_LB"
-#define HID_COLORPAGE_DRAWFILL_LB "CUI_HID_COLORPAGE_DRAWFILL_LB"
#define HID_COLORPAGE_BASICIDENTIFIER_LB "CUI_HID_COLORPAGE_BASICIDENTIFIER_LB"
#define HID_COLORPAGE_BASICCOMMENT_LB "CUI_HID_COLORPAGE_BASICCOMMENT_LB"
#define HID_COLORPAGE_BASICNUMBER_LB "CUI_HID_COLORPAGE_BASICNUMBER_LB"
@@ -128,6 +126,13 @@
#define HID_COLORPAGE_BASICOPERATOR_LB "CUI_HID_COLORPAGE_BASICOPERATOR_LB"
#define HID_COLORPAGE_BASICKEYWORD_LB "CUI_HID_COLORPAGE_BASICKEYWORD_LB"
#define HID_COLORPAGE_BASICERROR_LB "CUI_HID_COLORPAGE_BASICERROR_LB"
+#define HID_COLORPAGE_SQLIDENTIFIER_LB "CUI_HID_COLORPAGE_SQLIDENTIFIER_LB"
+#define HID_COLORPAGE_SQLNUMBER_LB "CUI_HID_COLORPAGE_SQLNUMBER_LB"
+#define HID_COLORPAGE_SQLSTRING_LB "CUI_HID_COLORPAGE_SQLSTRING_LB"
+#define HID_COLORPAGE_SQLOPERATOR_LB "CUI_HID_COLORPAGE_SQLOPERATOR_LB"
+#define HID_COLORPAGE_SQLKEYWORD_LB "CUI_HID_COLORPAGE_SQLKEYWORD_LB"
+#define HID_COLORPAGE_SQLPARAMETER_LB "CUI_HID_COLORPAGE_SQLPARAMETER_LB"
+#define HID_COLORPAGE_SQLCOMMENT_LB "CUI_HID_COLORPAGE_SQLCOMMENT_LB"
#define HID_COLORPAGE_CHECKBOX_START "CUI_HID_COLORPAGE_CHECKBOX_START"
#define HID_COLORPAGE_DOCCOLOR_CB "CUI_HID_COLORPAGE_DOCCOLOR_CB"
#define HID_COLORPAGE_DOCBOUNDARIES_CB "CUI_HID_COLORPAGE_DOCBOUNDARIES_CB"
@@ -137,13 +142,13 @@
#define HID_COLORPAGE_FONTCOLOR_CB "CUI_HID_COLORPAGE_FONTCOLOR_CB"
#define HID_COLORPAGE_LINKS_CB "CUI_HID_COLORPAGE_LINKS_CB"
#define HID_COLORPAGE_LINKSVISITED_CB "CUI_HID_COLORPAGE_LINKSVISITED_CB"
-#define HID_COLORPAGE_ANCHOR_CB "CUI_HID_COLORPAGE_ANCHOR_CB"
#define HID_COLORPAGE_SPELL_CB "CUI_HID_COLORPAGE_SPELL_CB"
+#define HID_COLORPAGE_SMARTTAGS_CB "CUI_HID_COLORPAGE_SMARTTAGS_CB"
+#define HID_COLORPAGE_SHADOWCOLOR_CB "CUI_HID_COLORPAGE_SHADOWCOLOR_CB"
#define HID_COLORPAGE_WRITERTEXTGRID_CB "CUI_HID_COLORPAGE_WRITERTEXTGRID_CB"
#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB "CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_CB"
#define HID_COLORPAGE_WRITERIDXSHADINGS_CB "CUI_HID_COLORPAGE_WRITERIDXSHADINGS_CB"
#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB "CUI_HID_COLORPAGE_WRITERDIRECTCURSOR_CB"
-#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB "CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_CB"
#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB"
#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB"
#define HID_COLORPAGE_WRITERHEADERFOOTERMARK_CB "CUI_HID_COLORPAGE_WRITERHEADERFOOTERMARK_CB"
@@ -161,8 +166,6 @@
#define HID_COLORPAGE_CALCREFERENCE_CB "CUI_HID_COLORPAGE_CALCREFERENCE_CB"
#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB "CUI_HID_COLORPAGE_CALCNOTESBACKGROUND_CB"
#define HID_COLORPAGE_DRAWGRID_CB "CUI_HID_COLORPAGE_DRAWGRID_CB"
-#define HID_COLORPAGE_DRAWDRAWING_CB "CUI_HID_COLORPAGE_DRAWDRAWING_CB"
-#define HID_COLORPAGE_DRAWFILL_CB "CUI_HID_COLORPAGE_DRAWFILL_CB"
#define HID_COLORPAGE_BASICIDENTIFIER_CB "CUI_HID_COLORPAGE_BASICIDENTIFIER_CB"
#define HID_COLORPAGE_BASICCOMMENT_CB "CUI_HID_COLORPAGE_BASICCOMMENT_CB"
#define HID_COLORPAGE_BASICNUMBER_CB "CUI_HID_COLORPAGE_BASICNUMBER_CB"
@@ -170,6 +173,13 @@
#define HID_COLORPAGE_BASICOPERATOR_CB "CUI_HID_COLORPAGE_BASICOPERATOR_CB"
#define HID_COLORPAGE_BASICKEYWORD_CB "CUI_HID_COLORPAGE_BASICKEYWORD_CB"
#define HID_COLORPAGE_BASICERROR_CB "CUI_HID_COLORPAGE_BASICERROR_CB"
+#define HID_COLORPAGE_SQLIDENTIFIER_CB "CUI_HID_COLORPAGE_SQLIDENTIFIER_CB"
+#define HID_COLORPAGE_SQLNUMBER_CB "CUI_HID_COLORPAGE_SQLNUMBER_CB"
+#define HID_COLORPAGE_SQLSTRING_CB "CUI_HID_COLORPAGE_SQLSTRING_CB"
+#define HID_COLORPAGE_SQLOPERATOR_CB "CUI_HID_COLORPAGE_SQLOPERATOR_CB"
+#define HID_COLORPAGE_SQLKEYWORD_CB "CUI_HID_COLORPAGE_SQLKEYWORD_CB"
+#define HID_COLORPAGE_SQLPARAMETER_CB "CUI_HID_COLORPAGE_SQLPARAMETER_CB"
+#define HID_COLORPAGE_SQLCOMMENT_CB "CUI_HID_COLORPAGE_SQLCOMMENT_CB"
#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE "CUI_HID_NUMBERINGOPT_SEL_GRF_FROM_FILE"
#define HID_SVX_MACRO_LB_EVENT "CUI_HID_SVX_MACRO_LB_EVENT"
#define HID_SVX_CONFIG_EVENT "CUI_HID_SVX_CONFIG_EVENT"
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 7199c22..ca80a8c 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -68,13 +68,13 @@ const char* aColorLBHids[] =
HID_COLORPAGE_FONTCOLOR_LB,
HID_COLORPAGE_LINKS_LB,
HID_COLORPAGE_LINKSVISITED_LB,
- HID_COLORPAGE_ANCHOR_LB,
HID_COLORPAGE_SPELL_LB,
+ HID_COLORPAGE_SMARTTAGS_LB,
+ HID_COLORPAGE_SHADOWCOLOR_LB,
HID_COLORPAGE_WRITERTEXTGRID_LB,
HID_COLORPAGE_WRITERFIELDSHADINGS_LB,
HID_COLORPAGE_WRITERIDXSHADINGS_LB,
HID_COLORPAGE_WRITERDIRECTCURSOR_LB,
- HID_COLORPAGE_WRITERNOTESINDICATOR_LB,
HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB,
HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB,
HID_COLORPAGE_WRITERHEADERFOOTERMARK_LB,
@@ -92,15 +92,20 @@ const char* aColorLBHids[] =
HID_COLORPAGE_CALCREFERENCE_LB,
HID_COLORPAGE_CALCNOTESBACKGROUND_LB,
HID_COLORPAGE_DRAWGRID_LB,
- HID_COLORPAGE_DRAWDRAWING_LB,
- HID_COLORPAGE_DRAWFILL_LB,
HID_COLORPAGE_BASICIDENTIFIER_LB,
HID_COLORPAGE_BASICCOMMENT_LB,
HID_COLORPAGE_BASICNUMBER_LB,
HID_COLORPAGE_BASICSTRING_LB,
HID_COLORPAGE_BASICOPERATOR_LB,
HID_COLORPAGE_BASICKEYWORD_LB,
- HID_COLORPAGE_BASICERROR_LB
+ HID_COLORPAGE_BASICERROR_LB,
+ HID_COLORPAGE_SQLIDENTIFIER_LB,
+ HID_COLORPAGE_SQLNUMBER_LB,
+ HID_COLORPAGE_SQLSTRING_LB,
+ HID_COLORPAGE_SQLOPERATOR_LB,
+ HID_COLORPAGE_SQLKEYWORD_LB,
+ HID_COLORPAGE_SQLPARAMETER_LB,
+ HID_COLORPAGE_SQLCOMMENT_LB
};
const char* aColorCBHids[] =
@@ -113,13 +118,13 @@ const char* aColorCBHids[] =
HID_COLORPAGE_FONTCOLOR_CB,
HID_COLORPAGE_LINKS_CB,
HID_COLORPAGE_LINKSVISITED_CB,
- HID_COLORPAGE_ANCHOR_CB,
HID_COLORPAGE_SPELL_CB,
+ HID_COLORPAGE_SMARTTAGS_CB,
+ HID_COLORPAGE_SHADOWCOLOR_CB,
HID_COLORPAGE_WRITERTEXTGRID_CB,
HID_COLORPAGE_WRITERFIELDSHADINGS_CB,
HID_COLORPAGE_WRITERIDXSHADINGS_CB,
HID_COLORPAGE_WRITERDIRECTCURSOR_CB,
- HID_COLORPAGE_WRITERNOTESINDICATOR_CB,
HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB,
HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB,
HID_COLORPAGE_WRITERHEADERFOOTERMARK_CB,
@@ -137,15 +142,20 @@ const char* aColorCBHids[] =
HID_COLORPAGE_CALCREFERENCE_CB,
HID_COLORPAGE_CALCNOTESBACKGROUND_CB,
HID_COLORPAGE_DRAWGRID_CB,
- HID_COLORPAGE_DRAWDRAWING_CB,
- HID_COLORPAGE_DRAWFILL_CB,
HID_COLORPAGE_BASICIDENTIFIER_CB,
HID_COLORPAGE_BASICCOMMENT_CB,
HID_COLORPAGE_BASICNUMBER_CB,
HID_COLORPAGE_BASICSTRING_CB,
HID_COLORPAGE_BASICOPERATOR_CB,
HID_COLORPAGE_BASICKEYWORD_CB,
- HID_COLORPAGE_BASICERROR_CB
+ HID_COLORPAGE_BASICERROR_CB,
+ HID_COLORPAGE_SQLIDENTIFIER_CB,
+ HID_COLORPAGE_SQLNUMBER_CB,
+ HID_COLORPAGE_SQLSTRING_CB,
+ HID_COLORPAGE_SQLOPERATOR_CB,
+ HID_COLORPAGE_SQLKEYWORD_CB,
+ HID_COLORPAGE_SQLPARAMETER_CB,
+ HID_COLORPAGE_SQLCOMMENT_CB
};
class SvxExtFixedText_Impl : public FixedText
@@ -398,7 +408,6 @@ sal_Int16 lcl_getGroup( sal_Int32 _nFeature )
case FONTCOLOR :
case LINKS :
case LINKSVISITED :
- case ANCHOR :
case SPELL :
case SMARTTAGS :
case SHADOWCOLOR :
@@ -414,6 +423,7 @@ sal_Int16 lcl_getGroup( sal_Int32 _nFeature )
case WRITERSCRIPTINDICATOR :
case WRITERSECTIONBOUNDARIES :
case WRITERPAGEBREAKS :
+ case WRITERHEADERFOOTERMARK:
{
nRet = GROUP_WRITER;
break;
@@ -442,10 +452,7 @@ sal_Int16 lcl_getGroup( sal_Int32 _nFeature )
}
case DRAWGRID :
- case DRAWDRAWING :
- case DRAWFILL :
{
- nRet = GROUP_DRAW;
break;
}
@@ -706,8 +713,8 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
aColorBoxes[WRITERDIRECTCURSOR ] = &aWrtDirectCrsrLB ;
aColorBoxes[WRITERSCRIPTINDICATOR ] = &aWrtScriptIndicatorLB ;
aColorBoxes[WRITERSECTIONBOUNDARIES ] = &aWrtSectionBoundLB ;
- aColorBoxes[WRITERPAGEBREAKS] = &aWrtPageBreaksLB;
aColorBoxes[WRITERHEADERFOOTERMARK] = &aWrtHeaderFooterMarkLB;
+ aColorBoxes[WRITERPAGEBREAKS] = &aWrtPageBreaksLB;
aColorBoxes[HTMLSGML ] = &aHTMLSGMLLB ;
aColorBoxes[HTMLCOMMENT ] = &aHTMLCommentLB ;
aColorBoxes[HTMLKEYWORD ] = &aHTMLKeywdLB ;
@@ -892,8 +899,6 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
sal_Int16 nGroup = GROUP_UNKNOWN;
for( sal_Int32 i = 0; i < nCount; i++ )
{
- if(ANCHOR == i)
- continue;
sal_Int16 nNewGroup = lcl_getGroup(i);
sal_Bool bShow = lcl_isGroupVisible( nNewGroup, m_aModuleOptions );
@@ -954,7 +959,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
aColorBoxes[0]->SetHelpId( aColorLBHids[0] );
- OSL_ENSURE( nCount < sal_Int32(sizeof(aColorLBHids)/sizeof(aColorLBHids[0])), "too few helpIDs for color listboxes" );
+ OSL_ENSURE( nCount <= sal_Int32(sizeof(aColorLBHids)/sizeof(aColorLBHids[0])), "too few helpIDs for color listboxes" );
for( sal_Int32 i = 1; i < nCount; i++ )
{
if(aColorBoxes[i])
@@ -1139,16 +1144,13 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(
sal_Int32 nVisibleEntries = aScrollWindow.GetSizePixel().Height() / nScrollOffset;
aVScroll.SetRangeMax(aScrollWindow.aCheckBoxes.size() + aScrollWindow.aChapters.size() );
- // static: minus three for ANCHOR, DRAWFILL and DRAWDRAWING
- aVScroll.SetRangeMax( aVScroll.GetRangeMax() - 3 );
+ aVScroll.SetRangeMax( aVScroll.GetRangeMax() );
// dynamic: calculate the hidden lines
long nInvisibleLines = 0;
sal_Int16 nGroup = GROUP_UNKNOWN;
sal_Int32 nCount = aScrollWindow.aCheckBoxes.size();
for ( sal_Int32 i = 0; i < nCount; i++ )
{
- if ( ANCHOR == i || DRAWFILL == i || DRAWDRAWING == i ) // not used at the moment
- continue;
sal_Int16 nNewGroup = lcl_getGroup(i);
sal_Bool bVisible = lcl_isGroupVisible( nNewGroup, aScrollWindow.GetModuleOptions() );
if ( !bVisible )
@@ -1196,8 +1198,6 @@ void ColorConfigCtrl_Impl::Update()
sal_Int32 i;
for( i = 0; i < ColorConfigEntryCount; i++ )
{
- if(ANCHOR == i)
- continue;
const ColorConfigValue& rColorEntry = pColorConfig->GetColorValue(ColorConfigEntry(i));
if(COL_AUTO == (sal_uInt32)rColorEntry.nColor)
{
@@ -1282,8 +1282,6 @@ IMPL_LINK(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar)
sal_Int32 nCount = aScrollWindow.aFixedTexts.size();
for( i = 0; i < nCount; i++ )
{
- if(ANCHOR == i)
- continue;
Point aPos;
//controls outside of the view need to be hidden to speed up accessibility tools
sal_Bool bShowCtrl = ( lcl_isGroupVisible(
@@ -1404,8 +1402,6 @@ IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, CheckBox*, pBox)
for( sal_Int32 i = 0; i < ColorConfigEntryCount; i++ )
{
- if(ANCHOR == i)
- continue;
if(aScrollWindow.aCheckBoxes[i] == pBox )
{
ColorConfigValue aBoundCol = pColorConfig->GetColorValue(ColorConfigEntry(i));
diff --git a/svtools/inc/svtools/colorcfg.hxx b/svtools/inc/svtools/colorcfg.hxx
index 847aeca..c3810bf 100644
--- a/svtools/inc/svtools/colorcfg.hxx
+++ b/svtools/inc/svtools/colorcfg.hxx
@@ -48,7 +48,6 @@ enum ColorConfigEntry
FONTCOLOR ,
LINKS ,
LINKSVISITED ,
- ANCHOR ,
SPELL ,
SMARTTAGS ,
SHADOWCOLOR ,
@@ -73,8 +72,6 @@ enum ColorConfigEntry
CALCREFERENCE ,
CALCNOTESBACKGROUND ,
DRAWGRID ,
- DRAWDRAWING ,
- DRAWFILL ,
BASICIDENTIFIER,
BASICCOMMENT ,
BASICNUMBER ,
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index d6a2aff..4b6cd0d 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -427,7 +427,6 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
0, // FONTCOLOR
0xcc, // LINKS
0x80, // LINKSVISITED
- 0, // ANCHOR
0xff0000, // SPELL
COL_LIGHTMAGENTA,// SMARTTAGS
COL_GRAY, // SHADOWCOLOR
@@ -452,8 +451,6 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
COL_LIGHTRED, // CALCREFERENCE
0xffffc0, // CALCNOTESBACKGROUND
0xc0c0c0, // DRAWGRID
- 0, // DRAWDRAWING
- 0xb8ff, // DRAWFILL
COL_GREEN, // BASICIDENTIFIER,
COL_GRAY,// BASICCOMMENT ,
COL_LIGHTRED,// BASICNUMBER ,
@@ -480,16 +477,6 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
aRet = Application::GetSettings().GetStyleSettings().GetWorkspaceColor();
break;
- case SPELL :
- case DRAWDRAWING :
- case SMARTTAGS :
- aRet = aAutoColors[eEntry];
- break;
-
- case DRAWFILL :
- aRet = aAutoColors[eEntry];
- break;
-
case FONTCOLOR :
aRet = Application::GetSettings().GetStyleSettings().GetWindowTextColor();
break;
More information about the Libreoffice-commits
mailing list