summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>2011-08-22 14:25:43 +0200
committerCédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>2011-08-22 14:33:31 +0200
commit9813a2ec35b86c1e0fcf27d5ce9893efe146eb2b (patch)
tree70d28f382adb1218e1b542ddfcaf58a7e62a5551
parent5d8e27d74c713f2f041c5a5668c8ffb4ad05026a (diff)
Color config cleanup: last bits remaining removed
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI.xcu4
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/UI.xcs12
-rw-r--r--svtools/source/config/colorcfg.cxx3
3 files changed, 8 insertions, 11 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI.xcu b/officecfg/registry/data/org/openoffice/Office/UI.xcu
index da148936b9ca..a79e8a352581 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 e89b3914302d..434ec5c717c7 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 4b6cd0de3b46..b4960937a1b7 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 },