loplugin:oncevar in svl..svx

Change-Id: I80b11a7b698de4b84d7a2f4c7dc62b2e4fd8bb01
Reviewed-on: https://gerrit.libreoffice.org/30438
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

16 files changed, 88 insertions, 185 deletions

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 7fc7f8c079fd..e04272a847b8 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -616,11 +616,6 @@ short ImpSvNumberInputScan::GetLogical( const OUString& rString )
  */
 short ImpSvNumberInputScan::GetMonth( const OUString& rString, sal_Int32& nPos )
 {
-    // #102136# The correct English form of month September abbreviated is
-    // SEPT, but almost every data contains SEP instead.
-    static const char aSeptCorrect[] = "SEPT";
-    static const char aSepShortened[] = "SEP";
-
     short res = 0; // no month found
 
     if (rString.getLength() > nPos) // only if needed
@@ -668,10 +663,11 @@ short ImpSvNumberInputScan::GetMonth( const OUString& rString, sal_Int32& nPos )
                 res = sal::static_int_cast< short >(-(i+1)); // negative
                 break;  // for
             }
-            else if ( i == 8 && pUpperAbbrevMonthText[i] == aSeptCorrect &&
-                    StringContainsWord( aSepShortened, rString, nPos ) )
-            {   // #102136# SEPT/SEP
-                nPos = nPos + strlen(aSepShortened);
+            else if ( i == 8 && pUpperAbbrevMonthText[i] == "SEPT" &&
+                    StringContainsWord( "SEP", rString, nPos ) )
+            {   // #102136# The correct English form of month September abbreviated is
+                // SEPT, but almost every data contains SEP instead.
+                nPos = nPos + 3;
                 res = sal::static_int_cast< short >(-(i+1)); // negative
                 break;  // for
             }
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)
     {
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 5546f90499bb..d48f7cca6eee 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -52,8 +52,6 @@ static const char g_sIsVisible[] = "/IsVisible";
 namespace svtools
 {
 
-static const sal_Char cColor[] = "/Color";
-static const sal_Char cColorSchemes[] = "ColorSchemes/";
 sal_Int32            nColorRefCount_Impl = 0;
 namespace
 {
@@ -165,7 +163,7 @@ uno::Sequence< OUString> GetPropertyNames(const OUString& rScheme)
         { RTL_CONSTASCII_USTRINGPARAM("/SQLComment"),  false }
     };
     int nIndex = 0;
-    OUString sBase = cColorSchemes
+    OUString sBase = "ColorSchemes/"
                    + utl::wrapConfigurationElementName(rScheme);
     const int nCount = ColorConfigEntryCount;
     for(sal_Int32 i = 0; i < 4 * nCount; i+= 4)
@@ -174,7 +172,7 @@ uno::Sequence< OUString> GetPropertyNames(const OUString& rScheme)
         OUString sBaseName = sBase
                            + OUString(cNames[nPos].cName, cNames[nPos].nLength, cNames[nPos].eEncoding);
         pNames[nIndex] += sBaseName;
-        pNames[nIndex++] += cColor;
+        pNames[nIndex++] += "/Color";
         if(cNames[nPos].bCanBeVisible)
         {
             pNames[nIndex] += sBaseName;
diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx
index efbd8b6e2dc8..8846171c1475 100644
--- a/svtools/source/misc/openfiledroptargetlistener.cxx
+++ b/svtools/source/misc/openfiledroptargetlistener.cxx
@@ -33,9 +33,6 @@
 #include <osl/file.hxx>
 #include <vcl/svapp.hxx>
 
-// Create a new task or recycle an existing one
-const char SPECIALTARGET_DEFAULT[] = "_default";
-
 OpenFileDropTargetListener::OpenFileDropTargetListener( const css::uno::Reference< css::uno::XComponentContext >& xContext,
                                         const css::uno::Reference< css::frame::XFrame >&          xFrame  )
         : m_xContext      ( xContext                      )
@@ -209,7 +206,8 @@ void OpenFileDropTargetListener::implts_OpenFile( const OUString& rFilePath )
         xParser->parseStrict(aURL);
 
         css::uno::Reference < css::frame::XDispatchProvider > xProvider( xTargetFrame, css::uno::UNO_QUERY );
-        css::uno::Reference< css::frame::XDispatch > xDispatcher = xProvider->queryDispatch( aURL, SPECIALTARGET_DEFAULT, 0 );
+        // Create a new task or recycle an existing one
+        css::uno::Reference< css::frame::XDispatch > xDispatcher = xProvider->queryDispatch( aURL, "_default", 0 );
         if ( xDispatcher.is() )
             xDispatcher->dispatch( aURL, css::uno::Sequence < css::beans::PropertyValue >() );
     }
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index ce3ab34dc636..c8a6a061b59b 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -35,12 +35,10 @@ using css::beans::PropertyValue;
 
 
 static const char sAPI_ServiceName[] = "com.sun.star.container.XNameReplace";
-static const char sAPI_SvDetachedEventDescriptor[] = "SvDetachedEventDescriptor";
 static const char sEventType[] = "EventType";
 static const char sMacroName[] = "MacroName";
 static const char sLibrary[] = "Library";
 static const char sStarBasic[] = "StarBasic";
-static const char sJavaScript[] = "JavaScript";
 static const char sScript[] = "Script";
 static const char sNone[] = "None";
 
@@ -165,7 +163,7 @@ void getMacroFromAny(
                 eType = STARBASIC;
                 bTypeOK = true;
             }
-            else if (sTmp == sJavaScript)
+            else if (sTmp == "JavaScript")
             {
                 eType = JAVASCRIPT;
                 bTypeOK = true;
@@ -414,7 +412,7 @@ void SvEventDescriptor::getByName(
 SvDetachedEventDescriptor::SvDetachedEventDescriptor(
     const SvEventDescription* pSupportedMacroItems) :
     SvBaseEventDescriptor(pSupportedMacroItems),
-    sImplName(sAPI_SvDetachedEventDescriptor)
+    sImplName("SvDetachedEventDescriptor")
 {
     // allocate aMacros
     aMacros = new SvxMacro*[mnMacroItems];
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index d6c5ba71bff8..74fb7e481c4e 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -657,13 +657,9 @@ void SAL_CALL
         const document::EventObject& rEventObject)
     throw (uno::RuntimeException, std::exception)
 {
-    static const char sShapeInserted[] = "ShapeInserted";
-    static const char sShapeRemoved[] = "ShapeRemoved";
-
-
-    if (rEventObject.EventName == sShapeInserted)
+    if (rEventObject.EventName == "ShapeInserted")
         AddShape (Reference<drawing::XShape>(rEventObject.Source, uno::UNO_QUERY));
-    else if (rEventObject.EventName == sShapeRemoved)
+    else if (rEventObject.EventName == "ShapeRemoved")
         RemoveShape (Reference<drawing::XShape>(rEventObject.Source, uno::UNO_QUERY));
     // else ignore unknown event.
 }
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index e8c744fc0acb..a38df223f934 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -60,12 +60,9 @@ namespace
 
 static const sal_Char cRubyBaseText[] = "RubyBaseText";
 static const sal_Char cRubyText[] = "RubyText";
-static const sal_Char cCharacterStyles[] = "CharacterStyles";
 static const sal_Char cRubyAdjust[] = "RubyAdjust";
 static const sal_Char cRubyIsAbove[] = "RubyIsAbove";
-static const sal_Char cDisplayName[] = "DisplayName";
 static const sal_Char cRubyCharStyleName[] = "RubyCharStyleName";
-static const sal_Char cRubies[] = "Rubies";
 
 } // end anonymous namespace
 
@@ -346,13 +343,13 @@ void SvxRubyDialog::Activate()
                 try
                 {
                     Reference<XNameAccess> xFam = xSupplier->getStyleFamilies();
-                    Any aChar = xFam->getByName(cCharacterStyles);
+                    Any aChar = xFam->getByName("CharacterStyles");
                     Reference<XNameContainer> xChar;
                     aChar >>= xChar;
                     Reference<XIndexAccess> xCharIdx(xChar, UNO_QUERY);
                     if (xCharIdx.is())
                     {
-                        OUString sUIName(cDisplayName);
+                        OUString sUIName("DisplayName");
                         for (sal_Int32 nStyle = 0; nStyle < xCharIdx->getCount(); nStyle++)
                         {
                             Any aStyle = xCharIdx->getByIndex(nStyle);
@@ -512,7 +509,7 @@ void SvxRubyDialog::Update()
     if (nPosition > -1)
         m_pPositionLB->SelectEntryPos(nPosition ? 1 : 0);
     if (!nLen || (bCharStyleEqual && sCharStyleName.isEmpty()))
-        sCharStyleName = cRubies;
+        sCharStyleName = "Rubies";
     if (!sCharStyleName.isEmpty())
     {
         for (sal_Int32 i = 0; i < m_pCharStyleLB->GetEntryCount(); i++)
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 02fb2e535f26..3c696d7a281b 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -64,13 +64,6 @@ using namespace com::sun::star::text;
 using namespace com::sun::star::container;
 using namespace com::sun::star::style;
 
-static const sal_Char cNumberingType[] = "NumberingType";
-static const sal_Char cValue[] = "Value";
-static const sal_Char cParentNumbering[] = "ParentNumbering";
-static const sal_Char cPrefix[] = "Prefix";
-static const sal_Char cSuffix[] = "Suffix";
-static const sal_Char cBulletChar[] = "BulletChar";
-static const sal_Char cBulletFontName[] = "BulletFontName";
 
 // The selection of bullets from the star symbol
 static const sal_Unicode aBulletTypes[] =
@@ -200,7 +193,7 @@ void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
                         aOrgRect.TopLeft(), aRectSize,
                         *pVDev );
     // Now comes the text
-    const OUString sValue(cValue);
+    const OUString sValue("Value");
     if( NumberingPageType::SINGLENUM == ePageType ||
            NumberingPageType::BULLET == ePageType )
     {
@@ -280,17 +273,17 @@ void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
                     aParentNumberings[i] = 0;
                     for(sal_Int32 nProperty = 0; nProperty < aLevel.getLength() - 1; nProperty++)
                     {
-                        if ( pValues[nProperty].Name == cNumberingType )
+                        if ( pValues[nProperty].Name == "NumberingType" )
                             pValues[nProperty].Value >>= aNumberingTypes[i];
-                        else if ( pValues[nProperty].Name == cBulletFontName )
+                        else if ( pValues[nProperty].Name == "BulletFontName" )
                             pValues[nProperty].Value >>= sFontNames[i];
-                        else if ( pValues[nProperty].Name == cBulletChar )
+                        else if ( pValues[nProperty].Name == "BulletChar" )
                             pValues[nProperty].Value >>= sBulletChars[i];
-                        else if ( pValues[nProperty].Name == cPrefix )
+                        else if ( pValues[nProperty].Name == "Prefix" )
                             pValues[nProperty].Value >>= sPrefixes[i];
-                        else if ( pValues[nProperty].Name == cSuffix )
+                        else if ( pValues[nProperty].Name == "Suffix" )
                             pValues[nProperty].Value >>= sSuffixes[i];
-                        else if ( pValues[nProperty].Name == cParentNumbering )
+                        else if ( pValues[nProperty].Name == "ParentNumbering" )
                             pValues[nProperty].Value >>= aParentNumberings[i];
                     }
                     Sequence< PropertyValue > aProperties(2);
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 0b1a0eba7339..74e32c97bd1d 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -725,11 +725,11 @@ namespace svxform
 
     void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) throw (RuntimeException, std::exception)
     {
-        ::osl::ClearableMutexGuard aGuard( m_aMutex );
-       static const char vbaInterOp[] = "VBAInterop";
-       if ( _rEvent.ScriptType == vbaInterOp )
+       if ( _rEvent.ScriptType == "VBAInterop" )
            return; // not handled here
 
+        ::osl::ClearableMutexGuard aGuard( m_aMutex );
+
         if ( impl_isDisposed_nothrow() )
             return;
 
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index d9b5ce52477e..f623c2f9170f 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -287,8 +287,6 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbDirIsReadO
             {
                 static const char s_sTitle[] = "Title";
                 static const char s_sIsReadOnly[] = "IsReadOnly";
-                static const char s_sSDG_EXT[] = "sdg";
-                static const char s_sSDV_EXT[] = "sdv";
 
                 while( xResultSet->next() )
                 {
@@ -296,8 +294,8 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbDirIsReadO
 
                     if(aThmURL.GetExtension().equalsIgnoreAsciiCase("thm"))
                     {
-                        INetURLObject   aSdgURL( aThmURL); aSdgURL.SetExtension( s_sSDG_EXT );
-                        INetURLObject   aSdvURL( aThmURL ); aSdvURL.SetExtension( s_sSDV_EXT );
+                        INetURLObject   aSdgURL( aThmURL); aSdgURL.SetExtension( "sdg" );
+                        INetURLObject   aSdvURL( aThmURL ); aSdvURL.SetExtension( "sdv" );
                         OUString        aTitle;
 
                         try
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 21c485f19f7a..ed22fa0331c1 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -41,9 +41,6 @@
 using namespace css;
 using namespace css::uno;
 
-const char UNO_FLIPHORIZONTAL[] = ".uno:FlipHorizontal";
-const char UNO_FLIPVERTICAL[]   = ".uno:FlipVertical";
-
 const char USERITEM_NAME[]      = "FitItem";
 
 namespace svx { namespace sidebar {
@@ -489,13 +486,13 @@ IMPL_LINK( PosSizePropertyPanel, FlipHdl, ToolBox*, pBox, void )
 {
     const OUString aCommand(pBox->GetItemCommand(pBox->GetCurItemId()));
 
-    if(aCommand == UNO_FLIPHORIZONTAL)
+    if(aCommand == ".uno:FlipHorizontal")
     {
         SfxVoidItem aHoriItem(SID_FLIP_HORIZONTAL);
         GetBindings()->GetDispatcher()->ExecuteList(SID_FLIP_HORIZONTAL,
                 SfxCallMode::RECORD, { &aHoriItem });
     }
-    else if(aCommand == UNO_FLIPVERTICAL)
+    else if(aCommand == ".uno:FlipVertical")
     {
         SfxVoidItem aVertItem(SID_FLIP_VERTICAL);
         GetBindings()->GetDispatcher()->ExecuteList(SID_FLIP_VERTICAL,
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 20744f2bfa2b..314b4ba319c6 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -3147,29 +3147,24 @@ sdr::contact::ViewContact* SdrObjCustomShape::CreateObjectSpecificViewContact()
 bool SdrObjCustomShape::doConstructOrthogonal(const OUString& rName)
 {
     bool bRetval(false);
-    static const char Imps_sNameASOrtho_quadrat[] = "quadrat";
-    static const char Imps_sNameASOrtho_round_quadrat[] = "round-quadrat";
-    static const char Imps_sNameASOrtho_circle[] = "circle";
-    static const char Imps_sNameASOrtho_circle_pie[] = "circle-pie";
-    static const char Imps_sNameASOrtho_ring[] = "ring";
 
-    if(rName.equalsIgnoreAsciiCase(Imps_sNameASOrtho_quadrat))
+    if(rName.equalsIgnoreAsciiCase("quadrat"))
     {
         bRetval = true;
     }
-    else if(rName.equalsIgnoreAsciiCase(Imps_sNameASOrtho_round_quadrat))
+    else if(rName.equalsIgnoreAsciiCase("round-quadrat"))
     {
         bRetval = true;
     }
-    else if(rName.equalsIgnoreAsciiCase(Imps_sNameASOrtho_circle))
+    else if(rName.equalsIgnoreAsciiCase("circle"))
     {
         bRetval = true;
     }
-    else if(rName.equalsIgnoreAsciiCase(Imps_sNameASOrtho_circle_pie))
+    else if(rName.equalsIgnoreAsciiCase("circle-pie"))
     {
         bRetval = true;
     }
-    else if(rName.equalsIgnoreAsciiCase(Imps_sNameASOrtho_ring))
+    else if(rName.equalsIgnoreAsciiCase("ring"))
     {
         bRetval = true;
     }
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 8916c5ffbe66..9628b8b952e6 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -52,22 +52,11 @@ using namespace css;
 
 namespace {
 
-static const char SEARCHITEM_COMMAND[] = "SearchItem.Command";
-static const char SEARCHITEM_SEARCHSTRING[] = "SearchItem.SearchString";
-static const char SEARCHITEM_SEARCHBACKWARD[] = "SearchItem.Backward";
-static const char SEARCHITEM_SEARCHFORMATTED[] = "SearchItem.SearchFormatted";
-static const char SEARCHITEM_SEARCHFLAGS[] = "SearchItem.SearchFlags";
-static const char SEARCHITEM_TRANSLITERATEFLAGS[] = "SearchItem.TransliterateFlags";
-static const char SEARCHITEM_ALGORITHMTYPE[] = "SearchItem.AlgorithmType";
-
-static const char COMMAND_EXECUTESEARCH[] = ".uno:ExecuteSearch";
 static const char COMMAND_FINDTEXT[] = ".uno:FindText";
 static const char COMMAND_DOWNSEARCH[] = ".uno:DownSearch";
 static const char COMMAND_UPSEARCH[] = ".uno:UpSearch";
-static const char COMMAND_EXITSEARCH[] = ".uno:ExitSearch";
 static const char COMMAND_MATCHCASE[] = ".uno:MatchCase";
 static const char COMMAND_SEARCHFORMATTED[] = ".uno:SearchFormattedDisplayString";
-static const char COMMAND_APPENDSEARCHHISTORY[] = "AppendSearchHistory";
 
 static const sal_Int32       REMEMBER_SIZE = 10;
 
@@ -79,7 +68,7 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext
 {
     css::uno::Reference< css::util::XURLTransformer > xURLTransformer( css::util::URLTransformer::create( rxContext ) );
     css::util::URL aURL;
-    aURL.Complete = COMMAND_EXECUTESEARCH;
+    aURL.Complete = ".uno:ExecuteSearch";
     xURLTransformer->parseStrict(aURL);
 
     OUString sFindText;
@@ -111,25 +100,25 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext
     }
 
     css::uno::Sequence< css::beans::PropertyValue > lArgs(7);
-    lArgs[0].Name = SEARCHITEM_SEARCHSTRING;
+    lArgs[0].Name = "SearchItem.SearchString";
     lArgs[0].Value <<= sFindText;
-    lArgs[1].Name = SEARCHITEM_SEARCHBACKWARD;
+    lArgs[1].Name = "SearchItem.Backward";
     lArgs[1].Value <<= aSearchBackwards;
-    lArgs[2].Name = SEARCHITEM_SEARCHFLAGS;
+    lArgs[2].Name = "SearchItem.SearchFlags";
     lArgs[2].Value <<= (sal_Int32)0;
-    lArgs[3].Name = SEARCHITEM_TRANSLITERATEFLAGS;
+    lArgs[3].Name = "SearchItem.TransliterateFlags";
     SvtCTLOptions aCTLOptions;
     sal_Int32 nFlags = 0;
     nFlags |= (!aMatchCase ? static_cast<int>(css::i18n::TransliterationModules_IGNORE_CASE) : 0);
     nFlags |= (aCTLOptions.IsCTLFontEnabled() ? css::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL:0 );
     nFlags |= (aCTLOptions.IsCTLFontEnabled() ? css::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL:0 );
     lArgs[3].Value <<= nFlags;
-    lArgs[4].Name = SEARCHITEM_COMMAND;
+    lArgs[4].Name = "SearchItem.Command";
     lArgs[4].Value <<= (sal_Int16)(aFindAll ?
         SvxSearchCmd::FIND_ALL : SvxSearchCmd::FIND );
-    lArgs[5].Name = SEARCHITEM_ALGORITHMTYPE;
+    lArgs[5].Name = "SearchItem.AlgorithmType";
     lArgs[5].Value <<= (sal_Int16)0;  // 0 == SearchAlgorithms_ABSOLUTE
-    lArgs[6].Name = SEARCHITEM_SEARCHFORMATTED;
+    lArgs[6].Name = "SearchItem.SearchFormatted";
     lArgs[6].Value <<= bSearchFormatted;
 
     css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider(xFrame, css::uno::UNO_QUERY);
@@ -592,7 +581,7 @@ void SAL_CALL UpDownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/
     impl_executeSearch(m_xContext, m_xFrame, pToolBox, meType == UP );
 
     css::frame::FeatureStateEvent aEvent;
-    aEvent.FeatureURL.Complete = COMMAND_APPENDSEARCHHISTORY;
+    aEvent.FeatureURL.Complete = "AppendSearchHistory";
     css::uno::Reference< css::frame::XStatusListener > xStatusListener = SearchToolbarControllersManager::createControllersManager().findController(m_xFrame, COMMAND_FINDTEXT);
     if (xStatusListener.is())
         xStatusListener->statusChanged( aEvent );
@@ -873,7 +862,7 @@ void SAL_CALL FindAllToolboxController::statusChanged( const css::frame::Feature
 ExitSearchToolboxController::ExitSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext )
     : svt::ToolboxController( rxContext,
             css::uno::Reference< css::frame::XFrame >(),
-            OUString( COMMAND_EXITSEARCH ) )
+            OUString( ".uno:ExitSearch" ) )
 {
 }
 
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index b956061ab902..4f25576861c4 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -114,12 +114,7 @@ void getLightingDirectionDefaults( const Direction3D **pLighting1Defaults, const
 static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj )
 {
     static const char sExtrusion[] = "Extrusion";
-    static const char sProjectionMode[] = "ProjectionMode";
     static const char sRotateAngle[] = "RotateAngle";
-    static const char sViewPoint[] = "ViewPoint";
-    static const char sOrigin[] = "Origin";
-    static const char sSkew[] = "Skew";
-    static const char sDepth[] = "Depth";
 
     sal_uInt16 nSID = rReq.GetSlot();
     switch( nSID )
@@ -237,7 +232,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
 
             css::beans::PropertyValue aPropValue;
 
-            aPropValue.Name = sViewPoint;
+            aPropValue.Name = "ViewPoint";
             aPropValue.Value <<= aViewPoint;
             rGeometryItem.SetPropertyValue( sExtrusion,  aPropValue );
 
@@ -247,7 +242,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
             aOriginPropPair.First.Type = EnhancedCustomShapeParameterType::NORMAL;
             aOriginPropPair.Second.Value <<= fOriginY;
             aOriginPropPair.Second.Type = EnhancedCustomShapeParameterType::NORMAL;
-            aPropValue.Name = sOrigin;
+            aPropValue.Name = "Origin";
             aPropValue.Value <<= aOriginPropPair;
             rGeometryItem.SetPropertyValue( sExtrusion,  aPropValue );
 
@@ -256,7 +251,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
             aSkewPropPair.First.Type = EnhancedCustomShapeParameterType::NORMAL;
             aSkewPropPair.Second.Value <<= fSkewAngle;
             aSkewPropPair.Second.Type = EnhancedCustomShapeParameterType::NORMAL;
-            aPropValue.Name = sSkew;
+            aPropValue.Name = "Skew";
             aPropValue.Value <<= aSkewPropPair;
             rGeometryItem.SetPropertyValue( sExtrusion, aPropValue );
         }
@@ -269,7 +264,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
             sal_Int32 nProjection = static_cast<const SfxInt32Item*>(rReq.GetArgs()->GetItem(SID_EXTRUSION_PROJECTION))->GetValue();
             ProjectionMode eProjectionMode = nProjection == 1 ? ProjectionMode_PARALLEL : ProjectionMode_PERSPECTIVE;
             css::beans::PropertyValue aPropValue;
-            aPropValue.Name = sProjectionMode;
+            aPropValue.Name = "ProjectionMode";
             aPropValue.Value <<= eProjectionMode;
             rGeometryItem.SetPropertyValue( sExtrusion,  aPropValue );
         }
@@ -288,7 +283,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
             aDepthPropPair.Second.Type = EnhancedCustomShapeParameterType::NORMAL;
 
             css::beans::PropertyValue aPropValue;
-            aPropValue.Name = sDepth;
+            aPropValue.Name = "Depth";
             aPropValue.Value <<= aDepthPropPair;
             rGeometryItem.SetPropertyValue( sExtrusion,  aPropValue );
         }
@@ -296,8 +291,6 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
     break;
     case SID_EXTRUSION_3D_COLOR:
     {
-        static const char sExtrusionColor[] = "Color";
-
         if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_3D_COLOR ) == SfxItemState::SET)
         {
             Color aColor( static_cast<const SvxColorItem&>(rReq.GetArgs()->Get(SID_EXTRUSION_3D_COLOR)).GetValue() );
@@ -305,7 +298,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
             const bool bAuto = aColor == COL_AUTO;
 
             css::beans::PropertyValue aPropValue;
-            aPropValue.Name = sExtrusionColor;
+            aPropValue.Name = "Color";
             aPropValue.Value <<= !bAuto;
             rGeometryItem.SetPropertyValue( sExtrusion,  aPropValue );
 
@@ -323,11 +316,6 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
     break;
     case SID_EXTRUSION_SURFACE:
     {
-        static const char sShadeMode[] = "ShadeMode";
-        static const char sSpecularity[] = "Specularity";
-        static const char sDiffusion[] = "Diffusion";
-        static const char sMetal[] = "Metal";
-
         if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_SURFACE ) == SfxItemState::SET)
         {
             sal_Int32 nSurface = static_cast<const SfxInt32Item*>(rReq.GetArgs()->GetItem(SID_EXTRUSION_SURFACE))->GetValue();
@@ -355,19 +343,19 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
             }
 
             css::beans::PropertyValue aPropValue;
-            aPropValue.Name = sShadeMode;
+            aPropValue.Name = "ShadeMode";
             aPropValue.Value <<= eShadeMode;
             rGeometryItem.SetPropertyValue( sExtrusion, aPropValue );
 
-            aPropValue.Name = sMetal;
+            aPropValue.Name = "Metal";
             aPropValue.Value <<= bMetal;
             rGeometryItem.SetPropertyValue( sExtrusion,  aPropValue );
 
-            aPropValue.Name = sSpecularity;
+            aPropValue.Name = "Specularity";
             aPropValue.Value <<= fSpecularity;
             rGeometryItem.SetPropertyValue( sExtrusion,  aPropValue );
 
-            aPropValue.Name = sDiffusion;
+            aPropValue.Name = "Diffusion";
             aPropValue.Value <<= fDiffusion;
             rGeometryItem.SetPropertyValue( sExtrusion,  aPropValue );
         }
@@ -375,13 +363,6 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
     break;
     case SID_EXTRUSION_LIGHTING_INTENSITY:
     {
-        static const char sBrightness[] = "Brightness";
-        static const char sLightFace[] = "LightFace";
-        static const char sFirstLightHarsh[] = "FirstLightHarsh";
-        static const char sSecondLightHarsh[] = "SecondLightHarsh";
-        static const char sFirstLightLevel[] = "FirstLightLevel";
-        static const char sSecondLightLevel[] = "SecondLightLevel";
-
         if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_LIGHTING_INTENSITY ) == SfxItemState::SET)
         {
             sal_Int32 nLevel = static_cast<const SfxInt32Item*>(rReq.GetArgs()->GetItem(SID_EXTRUSION_LIGHTING_INTENSITY))->GetValue();
@@ -414,27 +395,27 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
             }
 
             css::beans::PropertyValue aPropValue;
-            aPropValue.Name = sBrightness;
+            aPropValue.Name = "Brightness";
             aPropValue.Value <<= fBrightness;
             rGeometryItem.SetPropertyValue( sExtrusion,  aPropValue );
 
-            aPropValue.Name = sLightFace;
+            aPropValue.Name = "LightFace";
             aPropValue.Value <<= true;
             rGeometryItem.SetPropertyValue( sExtrusion,  aPropValue );
 
-            aPropValue.Name = sFirstLightHarsh;
+            aPropValue.Name = "FirstLightHarsh";
             aPropValue.Value <<= true;
             rGeometryItem.SetPropertyValue( sExtrusion,  aPropValue );
 
-            aPropValue.Name = sSecondLightHarsh;
+            aPropValue.Name = "SecondLightHarsh";
             aPropValue.Value <<= bHarsh2;
             rGeometryItem.SetPropertyValue( sExtrusion,  aPropValue );
 
-            aPropValue.Name = sFirstLightLevel;
+            aPropValue.Name = "FirstLightLevel";
             aPropValue.Value <<= fLevel1;
             rGeometryItem.SetPropertyValue( sExtrusion,  aPropValue );
 
-            aPropValue.Name = sSecondLightLevel;
+            aPropValue.Name = "SecondLightLevel";
             aPropValue.Value <<= fLevel2;
             rGeometryItem.SetPropertyValue( sExtrusion,  aPropValue );
         }
@@ -634,10 +615,6 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
     const size_t nCount = rMarkList.GetMarkCount();
 
     static const char  sExtrusion[] = "Extrusion";
-    static const char  sViewPoint[] = "ViewPoint";
-    static const char  sOrigin[] = "Origin";
-    static const char  sSkew[] = "Skew";
-    static const char  sProjectionMode[] = "ProjectionMode";
 
     const css::uno::Any* pAny;
 
@@ -666,7 +643,7 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
             Position3D  aViewPoint( 3472, -3472, 25000 );
             double      fSkewAngle = -135;
 
-            pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sProjectionMode );
+            pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, "ProjectionMode" );
             sal_Int16 nProjectionMode = sal_Int16();
             if( pAny && ( *pAny >>= nProjectionMode ) )
                 bParallel = nProjectionMode == ProjectionMode_PARALLEL;
@@ -675,7 +652,7 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
             {
                 double      fSkew = 50.0;
                 EnhancedCustomShapeParameterPair aSkewPropPair;
-                pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sSkew );
+                pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, "Skew" );
                 if( pAny && ( *pAny >>= aSkewPropPair ) )
                 {
                     aSkewPropPair.First.Value >>= fSkew;
@@ -690,12 +667,12 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
             {
                 double      fOriginX = 0.50;
                 double      fOriginY = -0.50;
-                pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sViewPoint );
+                pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, "ViewPoint" );
                 if( pAny )
                     *pAny >>= aViewPoint;
 
                 EnhancedCustomShapeParameterPair aOriginPropPair;
-                pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sOrigin );
+                pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, "Origin" );
                 if( pAny && ( *pAny >>= aOriginPropPair ) )
                 {
                     aOriginPropPair.First.Value >>= fOriginX;
@@ -785,7 +762,6 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet )
     const size_t nCount = rMarkList.GetMarkCount();
 
     static const char  sExtrusion[] = "Extrusion";
-    static const char  sProjectionMode[] = "ProjectionMode";
 
     const css::uno::Any* pAny;
 
@@ -812,7 +788,7 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet )
             const SdrCustomShapeGeometryItem aGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )) );
 
             bool    bParallel = true;
-            pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sProjectionMode );
+            pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, "ProjectionMode" );
             ProjectionMode eProjectionMode;
             if( pAny && ( *pAny >>= eProjectionMode ) )
                 bParallel = eProjectionMode == ProjectionMode_PARALLEL;
@@ -841,9 +817,6 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet )
     const size_t nCount = rMarkList.GetMarkCount();
 
     static const char  sExtrusion[] = "Extrusion";
-    static const char  sShadeMode[] = "ShadeMode";
-    static const char  sSpecularity[] = "Specularity";
-    static const char  sMetal[] = "Metal";
 
     const css::uno::Any* pAny;
 
@@ -871,14 +844,14 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet )
             sal_Int32 nSurface = 0; // wire frame
 
             ShadeMode eShadeMode( ShadeMode_FLAT );
-            pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sShadeMode );
+            pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, "ShadeMode" );
             if( pAny )
                 *pAny >>= eShadeMode;
 
             if( eShadeMode == ShadeMode_FLAT )
             {
                 bool bMetal = false;
-                pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sMetal );
+                pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, "Metal" );
                 if( pAny )
                     *pAny >>= bMetal;
 
@@ -889,7 +862,7 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet )
                 else
                 {
                     double fSpecularity = 0;
-                    pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sSpecularity );
+                    pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, "Specularity" );
                     if( pAny )
                         *pAny >>= fSpecularity;
 
@@ -929,7 +902,6 @@ void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet )
     const size_t nCount = rMarkList.GetMarkCount();
 
     static const char  sExtrusion[] = "Extrusion";
-    static const char  sDepth[] = "Depth";
 
     const css::uno::Any* pAny;
 
@@ -955,7 +927,7 @@ void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet )
             }
 
             double fDepth = 1270.0;
-            pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sDepth );
+            pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, "Depth" );
             if( pAny )
             {
                 EnhancedCustomShapeParameterPair aDepthPropPair;
@@ -1009,8 +981,6 @@ void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
     const size_t nCount = rMarkList.GetMarkCount();
 
     static const char  sExtrusion[] = "Extrusion";
-    static const char  sFirstLightDirection[] = "FirstLightDirection";
-    static const char  sSecondLightDirection[] = "SecondLightDirection";
 
     const Direction3D * pLighting1Defaults;
     const Direction3D * pLighting2Defaults;
@@ -1043,11 +1013,11 @@ void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
             Direction3D aFirstLightDirection( 50000, 0, 10000 );
             Direction3D aSecondLightDirection( -50000, 0, 10000 );
 
-            pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sFirstLightDirection );
+            pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, "FirstLightDirection" );
             if( pAny )
                 *pAny >>= aFirstLightDirection;
 
-            pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sSecondLightDirection );
+            pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, "SecondLightDirection" );
             if( pAny )
                 *pAny >>= aSecondLightDirection;
 
@@ -1090,7 +1060,6 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet )
     const size_t nCount = rMarkList.GetMarkCount();
 
     static const char  sExtrusion[] = "Extrusion";
-    static const char  sBrightness[] = "Brightness";
 
     const css::uno::Any* pAny;
 
@@ -1116,7 +1085,7 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet )
             }
 
             double fBrightness = 22178.0 / 655.36;
-            pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sBrightness );
+            pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, "Brightness" );
             if( pAny )
                 *pAny >>= fBrightness;
 
@@ -1158,7 +1127,6 @@ void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet )
     const size_t nCount = rMarkList.GetMarkCount();
 
     static const char  sExtrusion[] = "Extrusion";
-    static const char  sExtrusionColor[] = "Color";
 
     const css::uno::Any* pAny;
 
@@ -1188,7 +1156,7 @@ void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet )
             Color aColor;
 
             bool bUseColor = false;
-            pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sExtrusionColor );
+            pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, "Color" );
             if( pAny )
                 *pAny >>= bUseColor;
 
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 0dcad4f989a2..d075c31be641 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -245,15 +245,12 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus )
 
 static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj )
 {
-    static const char  sTextPath[] = "TextPath";
-    static const char  sSameLetterHeights[] = "SameLetterHeights";
-
     sal_uInt16 nSID = rReq.GetSlot();
     switch( nSID )
     {
         case SID_FONTWORK_SAME_LETTER_HEIGHTS:
         {
-            css::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sSameLetterHeights );
+            css::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( "TextPath", "SameLetterHeights" );
             if( pAny )
             {
                 bool bOn = false;
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index c7a577bb293c..167d6a65c5eb 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -691,7 +691,6 @@ void SAL_CALL SvxUnoDrawPagesAccess::remove( const uno::Reference< drawing::XDra
 }
 
 // XServiceInfo
-const char pSvxUnoDrawPagesAccessService[] = "com.sun.star.drawing.DrawPages";
 
 OUString SAL_CALL SvxUnoDrawPagesAccess::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
 {
@@ -705,7 +704,7 @@ sal_Bool SAL_CALL SvxUnoDrawPagesAccess::supportsService( const OUString& Servic
 
 uno::Sequence< OUString > SAL_CALL SvxUnoDrawPagesAccess::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
 {
-    OUString aService( pSvxUnoDrawPagesAccessService );
+    OUString aService( "com.sun.star.drawing.DrawPages" );
     uno::Sequence< OUString > aSeq( &aService, 1 );
     return aSeq;
 }