1 files changed, 12 insertions, 28 deletions

diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 0e874b0097fc..3078b11ca449 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -43,22 +43,6 @@ using namespace com::sun::star::uno;
 
 #define HELP_TIP_TIMEOUT 0xffff     // max. timeout setting to pretend a non-timeout
 
-namespace
-{
-    const char s_sAccessibility[] = "org.openoffice.Office.Common/Accessibility";
-    const char s_sIsForPagePreviews[] = "IsForPagePreviews";
-    const char s_sIsHelpTipsDisappear[] = "IsHelpTipsDisappear";
-    const char s_sHelpTipSeconds[] = "HelpTipSeconds";
-    const char s_sIsAllowAnimatedGraphics[] = "IsAllowAnimatedGraphics";
-    const char s_sIsAllowAnimatedText[] = "IsAllowAnimatedText";
-    const char s_sIsAutomaticFontColor[] = "IsAutomaticFontColor";
-    const char s_sIsSelectionInReadonly[] = "IsSelectionInReadonly";
-    const char s_sColorValueSetColumnCount[] = "ColorValueSetColumnCount";
-    const char s_sEdgeBlending[] = "EdgeBlending";
-    const char s_sListBoxMaximumLineCount[] = "ListBoxMaximumLineCount";
-    const char s_sPreviewUsesCheckeredBackground[]  = "PreviewUsesCheckeredBackground";
-}
-
 // class SvtAccessibilityOptions_Impl ---------------------------------------------
 
 class SvtAccessibilityOptions_Impl
@@ -105,7 +89,7 @@ SvtAccessibilityOptions_Impl::SvtAccessibilityOptions_Impl()
         m_xCfg.set(
             ::comphelper::ConfigurationHelper::openConfig(
                 comphelper::getProcessComponentContext(),
-                s_sAccessibility,
+                "org.openoffice.Office.Common/Accessibility",
                 ::comphelper::EConfigurationModes::Standard ),
             css::uno::UNO_QUERY);
     }
@@ -129,7 +113,7 @@ bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const
     try
     {
         if(xNode.is())
-            xNode->getPropertyValue(s_sIsForPagePreviews) >>= bRet;
+            xNode->getPropertyValue("IsForPagePreviews") >>= bRet;
     }
     catch(const css::uno::Exception& ex)
     {
@@ -146,7 +130,7 @@ bool SvtAccessibilityOptions_Impl::GetIsHelpTipsDisappear() const
     try
     {
         if(xNode.is())
-            xNode->getPropertyValue(s_sIsHelpTipsDisappear) >>= bRet;
+            xNode->getPropertyValue("IsHelpTipsDisappear") >>= bRet;
     }
     catch(const css::uno::Exception& ex)
     {
@@ -164,7 +148,7 @@ bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedGraphics() const
     try
     {
         if(xNode.is())
-            xNode->getPropertyValue(s_sIsAllowAnimatedGraphics) >>= bRet;
+            xNode->getPropertyValue("IsAllowAnimatedGraphics") >>= bRet;
     }
     catch(const css::uno::Exception& ex)
     {
@@ -182,7 +166,7 @@ bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedText() const
     try
     {
         if(xNode.is())
-            xNode->getPropertyValue(s_sIsAllowAnimatedText) >>= bRet;
+            xNode->getPropertyValue("IsAllowAnimatedText") >>= bRet;
     }
     catch(const css::uno::Exception& ex)
     {
@@ -200,7 +184,7 @@ bool SvtAccessibilityOptions_Impl::GetIsAutomaticFontColor() const
     try
     {
         if(xNode.is())
-            xNode->getPropertyValue(s_sIsAutomaticFontColor) >>= bRet;
+            xNode->getPropertyValue("IsAutomaticFontColor") >>= bRet;
     }
     catch(const css::uno::Exception& ex)
     {
@@ -218,7 +202,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetHelpTipSeconds() const
     try
     {
         if(xNode.is())
-            xNode->getPropertyValue(s_sHelpTipSeconds) >>= nRet;
+            xNode->getPropertyValue("HelpTipSeconds") >>= nRet;
     }
     catch(const css::uno::Exception& ex)
     {
@@ -236,7 +220,7 @@ bool SvtAccessibilityOptions_Impl::IsSelectionInReadonly() const
     try
     {
         if(xNode.is())
-            xNode->getPropertyValue(s_sIsSelectionInReadonly) >>= bRet;
+            xNode->getPropertyValue("IsSelectionInReadonly") >>= bRet;
     }
     catch(const css::uno::Exception& ex)
     {
@@ -254,7 +238,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetEdgeBlending() const
     try
     {
         if(xNode.is())
-            xNode->getPropertyValue(s_sEdgeBlending) >>= nRet;
+            xNode->getPropertyValue("EdgeBlending") >>= nRet;
     }
     catch(const css::uno::Exception& ex)
     {
@@ -272,7 +256,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetListBoxMaximumLineCount() const
     try
     {
         if(xNode.is())
-            xNode->getPropertyValue(s_sListBoxMaximumLineCount) >>= nRet;
+            xNode->getPropertyValue("ListBoxMaximumLineCount") >>= nRet;
     }
     catch(const css::uno::Exception& ex)
     {
@@ -290,7 +274,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() const
     try
     {
         if(xNode.is())
-            xNode->getPropertyValue(s_sColorValueSetColumnCount) >>= nRet;
+            xNode->getPropertyValue("ColorValueSetColumnCount") >>= nRet;
     }
     catch(const css::uno::Exception& ex)
     {
@@ -308,7 +292,7 @@ bool SvtAccessibilityOptions_Impl::GetPreviewUsesCheckeredBackground() const
     try
     {
         if(xNode.is())
-            xNode->getPropertyValue(s_sPreviewUsesCheckeredBackground) >>= bRet;
+            xNode->getPropertyValue("PreviewUsesCheckeredBackground") >>= bRet;
     }
     catch(const css::uno::Exception& ex)
     {