diff options
author | Noel Grandin <noel@peralex.com> | 2014-11-03 14:03:54 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-11-05 08:44:19 +0200 |
commit | 705c48d32eec0aa5180e60ca157daca4b154e4a3 (patch) | |
tree | 97f43496f4b429a2b8d03b1e71cb2a1c33142a15 /svx | |
parent | b7d8a58ff2698ffc6e22943f64aa97c5ea253bd9 (diff) |
fdo#38835 strip out OUString globals
they are largely unnecessary these days, since our OUString infrastructure
gained optimised handling for static char constants.
Change-Id: I07f73484f82d0582252cb4324d4107c998432c37
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/accessibility/AccessibleControlShape.cxx | 22 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleGraphicShape.cxx | 3 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleOLEShape.cxx | 3 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleShape.cxx | 9 | ||||
-rw-r--r-- | svx/source/accessibility/ChildrenManagerImpl.cxx | 4 | ||||
-rw-r--r-- | svx/source/fmcomp/fmgridcl.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmobj.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmscriptingenv.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/fmundo.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/formcontroller.cxx | 2 | ||||
-rw-r--r-- | svx/source/gallery2/gallery1.cxx | 8 | ||||
-rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 3 | ||||
-rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 20 | ||||
-rw-r--r-- | svx/source/svdraw/svdoole2.cxx | 2 | ||||
-rw-r--r-- | svx/source/table/accessiblecell.cxx | 3 | ||||
-rw-r--r-- | svx/source/toolbars/extrusionbar.cxx | 78 | ||||
-rw-r--r-- | svx/source/toolbars/fontworkbar.cxx | 6 | ||||
-rw-r--r-- | svx/source/unodraw/unoshape.cxx | 6 |
18 files changed, 84 insertions, 95 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 06042560a02f..a6cb01783966 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -57,28 +57,24 @@ using namespace ::com::sun::star::container; namespace { - const OUString& lcl_getNamePropertyName( ) + static OUString lcl_getNamePropertyName( ) { - static OUString s_sNamePropertyName( "Name" ); - return s_sNamePropertyName; + return OUString( "Name" ); } - const OUString& lcl_getDescPropertyName( ) + static OUString lcl_getDescPropertyName( ) { - static OUString s_sDescPropertyDesc( "HelpText" ); - return s_sDescPropertyDesc; + return OUString( "HelpText" ); } - const OUString& lcl_getLabelPropertyName( ) + static OUString lcl_getLabelPropertyName( ) { - static OUString s_sLabelPropertyLabel( "Label" ); - return s_sLabelPropertyLabel; + return OUString( "Label" ); } - const OUString& lcl_getLabelControlPropertyName( ) + static OUString lcl_getLabelControlPropertyName( ) { - static OUString s_sLabelControlPropertyLabel("LabelControl"); - return s_sLabelControlPropertyLabel; + return OUString("LabelControl"); } // return the property which should be used as AccessibleName - const OUString& lcl_getPreferredAccNameProperty( const Reference< XPropertySetInfo >& _rxPSI ) + const OUString lcl_getPreferredAccNameProperty( const Reference< XPropertySetInfo >& _rxPSI ) { if ( _rxPSI.is() && _rxPSI->hasPropertyByName( lcl_getLabelPropertyName() ) ) return lcl_getLabelPropertyName(); diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index 49f65837068b..30b463815003 100644 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx @@ -123,8 +123,7 @@ OUString SAL_CALL // ...and add additional names. aServiceNames.realloc (nCount + 1); - static const OUString sAdditionalServiceName ("com.sun.star.drawing.AccessibleGraphicShape"); - aServiceNames[nCount] = sAdditionalServiceName; + aServiceNames[nCount] = "com.sun.star.drawing.AccessibleGraphicShape"; return aServiceNames; } diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 050746f4c611..dc57aec9cc17 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -132,8 +132,7 @@ OUString SAL_CALL // ...and add additional names. aServiceNames.realloc (nCount + 1); - static const OUString sAdditionalServiceName ("com.sun.star.drawing.AccessibleOLEShape"); - aServiceNames[nCount] = sAdditionalServiceName; + aServiceNames[nCount] = "com.sun.star.drawing.AccessibleOLEShape"; return aServiceNames; } diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index a3d18ea32ce2..01cfa5538ba1 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -563,8 +563,8 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds (void) if ( mxShape.is() ) { - static const OUString sBoundRectName ("BoundRect"); - static const OUString sAnchorPositionName ("AnchorPosition"); + static const char sBoundRectName[] = "BoundRect"; + static const char sAnchorPositionName[] = "AnchorPosition"; // Get the shape's bounding box in internal coordinates (in 100th of // mm). Use the property BoundRect. Only if that is not supported ask @@ -986,8 +986,7 @@ uno::Sequence<OUString> SAL_CALL // ...and add additional names. aServiceNames.realloc (nCount + 1); - static const OUString sAdditionalServiceName ("com.sun.star.drawing.AccessibleShape"); - aServiceNames[nCount] = sAdditionalServiceName; + aServiceNames[nCount] = "com.sun.star.drawing.AccessibleShape"; return aServiceNames; } @@ -1060,7 +1059,7 @@ void SAL_CALL AccessibleShape::notifyEvent (const document::EventObject& rEventObject) throw (uno::RuntimeException, std::exception) { - static const OUString sShapeModified ("ShapeModified"); + static const char sShapeModified[] = "ShapeModified"; // First check if the event is for us. uno::Reference<drawing::XShape> xShape ( diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 6ce00e7f88a9..12e4054e900c 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -691,8 +691,8 @@ void SAL_CALL const document::EventObject& rEventObject) throw (uno::RuntimeException, std::exception) { - static const OUString sShapeInserted ("ShapeInserted"); - static const OUString sShapeRemoved ("ShapeRemoved"); + static const char sShapeInserted[] = "ShapeInserted"; + static const char sShapeRemoved[] = "ShapeRemoved"; if (rEventObject.EventName == sShapeInserted) diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index c49be04290ee..f7e6e56a3a8d 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1660,7 +1660,7 @@ void FmGridControl::InitColumnByField( } // the control type is determined by the ColumnServiceName - static OUString s_sPropColumnServiceName( "ColumnServiceName" ); + static const char s_sPropColumnServiceName[] = "ColumnServiceName"; if ( !::comphelper::hasProperty( s_sPropColumnServiceName, _rxColumnModel ) ) return; diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 7a42951c65f4..483c12cf85e6 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -128,7 +128,7 @@ void FmFormObj::impl_checkRefDevice_nothrow( bool _force ) Reference< XPropertySet > xModelProps( GetUnoControlModel(), UNO_QUERY_THROW ); Reference< XPropertySetInfo > xPropertyInfo( xModelProps->getPropertySetInfo(), UNO_SET_THROW ); - static const OUString sRefDevicePropName( "ReferenceDevice" ); + static const char sRefDevicePropName[] = "ReferenceDevice"; if ( xPropertyInfo->hasPropertyByName( sRefDevicePropName ) ) { VCLXDevice* pUnoRefDevice = new VCLXDevice; diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index a36cb1e3526a..e69d9974a3fb 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -727,8 +727,8 @@ namespace svxform void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) throw (RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); - static const OUString vbaInterOp("VBAInterop"); - if ( _rEvent.ScriptType.equals(vbaInterOp) ) + static const char vbaInterOp[] = "VBAInterop"; + if ( _rEvent.ScriptType == vbaInterOp ) return; // not handled here if ( impl_isDisposed_nothrow() ) diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index eeaa5330c8de..4c641587962f 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -678,7 +678,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) // TODO: we should cache all those things, else this might be too expensive. // However, this requires we're notified of changes in the value binding - static const OUString s_sExternalData( "ExternalData" ); + static const char s_sExternalData[] = "ExternalData"; if ( xBindingPropsPSI.is() && xBindingPropsPSI->hasPropertyByName( s_sExternalData ) ) { bool bExternalData = true; diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 91330e11ea81..b464f06a745b 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -3633,7 +3633,7 @@ namespace { try { - static OUString s_sFormsCheckRequiredFields( "FormsCheckRequiredFields" ); + static const char s_sFormsCheckRequiredFields[] = "FormsCheckRequiredFields"; // first, check whether the form has a property telling us the answer // this allows people to use the XPropertyContainer interface of a form to control diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index c1a1ef9fd11f..5992a0658ed8 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -291,10 +291,10 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbDirIsReadO if( xContentAccess.is() ) { - static const OUString s_sTitle("Title"); - static const OUString s_sIsReadOnly("IsReadOnly"); - static const OUString s_sSDG_EXT("sdg"); - static const OUString s_sSDV_EXT("sdv"); + 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() ) { diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 096da89be126..1bc65c29f519 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -1307,8 +1307,7 @@ namespace sdr { namespace contact { try { Reference< XPropertySet > xModelProperties( pUnoObject->GetUnoControlModel(), UNO_QUERY_THROW ); - static const OUString s_sPrintablePropertyName( "Printable" ); - OSL_VERIFY( xModelProperties->getPropertyValue( s_sPrintablePropertyName ) >>= bIsPrintable ); + OSL_VERIFY( xModelProperties->getPropertyValue( "Printable" ) >>= bIsPrintable ); } catch( const Exception& ) { diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 1814c0061392..d7efb5de2998 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -3202,29 +3202,29 @@ sdr::contact::ViewContact* SdrObjCustomShape::CreateObjectSpecificViewContact() bool SdrObjCustomShape::doConstructOrthogonal(const OUString& rName) { bool bRetval(false); - static OUString Imps_sNameASOrtho_quadrat( "quadrat" ); - static OUString Imps_sNameASOrtho_round_quadrat( "round-quadrat" ); - static OUString Imps_sNameASOrtho_circle( "circle" ); - static OUString Imps_sNameASOrtho_circle_pie( "circle-pie" ); - static OUString Imps_sNameASOrtho_ring( "ring" ); + 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(Imps_sNameASOrtho_quadrat.equalsIgnoreAsciiCase(rName)) + if(rName.equalsIgnoreAsciiCase(Imps_sNameASOrtho_quadrat)) { bRetval = true; } - else if(Imps_sNameASOrtho_round_quadrat.equalsIgnoreAsciiCase(rName)) + else if(rName.equalsIgnoreAsciiCase(Imps_sNameASOrtho_round_quadrat)) { bRetval = true; } - else if(Imps_sNameASOrtho_circle.equalsIgnoreAsciiCase(rName)) + else if(rName.equalsIgnoreAsciiCase(Imps_sNameASOrtho_circle)) { bRetval = true; } - else if(Imps_sNameASOrtho_circle_pie.equalsIgnoreAsciiCase(rName)) + else if(rName.equalsIgnoreAsciiCase(Imps_sNameASOrtho_circle_pie)) { bRetval = true; } - else if(Imps_sNameASOrtho_ring.equalsIgnoreAsciiCase(rName)) + else if(rName.equalsIgnoreAsciiCase(Imps_sNameASOrtho_ring)) { bRetval = true; } diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index e26129f58db9..3595305051de 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -433,7 +433,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI() com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager(getLayoutManager()); if ( xLayoutManager.is() ) { - const static OUString aMenuBarURL( "private:resource/menubar/menubar" ); + static const char aMenuBarURL[] = "private:resource/menubar/menubar"; if ( !xLayoutManager->isElementVisible( aMenuBarURL ) ) xLayoutManager->createElement( aMenuBarURL ); } diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 60b25c76cd55..e04614eb363e 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -521,8 +521,7 @@ Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames(void) throw // ...and add additional names. aServiceNames.realloc (nCount + 1); - static const OUString sAdditionalServiceName ("com.sun.star.drawing.AccessibleCell"); - aServiceNames[nCount] = sAdditionalServiceName; + aServiceNames[nCount] = "com.sun.star.drawing.AccessibleCell"; return aServiceNames; } diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index ca940763b05c..d26311e4b595 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -114,13 +114,13 @@ void getLightingDirectionDefaults( const Direction3D **pLighting1Defaults, const static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj ) { - static const OUString sExtrusion( "Extrusion" ); - static const OUString sProjectionMode( "ProjectionMode" ); - static const OUString sRotateAngle( "RotateAngle" ); - static const OUString sViewPoint( "ViewPoint" ); - static const OUString sOrigin( "Origin" ); - static const OUString sSkew( "Skew" ); - static const OUString sDepth( "Depth" ); + 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 ) @@ -297,7 +297,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; case SID_EXTRUSION_3D_COLOR: { - static const OUString sExtrusionColor( "Color" ); + static const char sExtrusionColor[] = "Color"; if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_3D_COLOR ) == SfxItemState::SET) { @@ -324,10 +324,10 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; case SID_EXTRUSION_SURFACE: { - static const OUString sShadeMode( "ShadeMode" ); - static const OUString sSpecularity( "Specularity" ); - static const OUString sDiffusion( "Diffusion" ); - static const OUString sMetal( "Metal" ); + 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) { @@ -376,12 +376,12 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; case SID_EXTRUSION_LIGHTING_INTENSITY: { - static const OUString sBrightness( "Brightness" ); - static const OUString sLightFace( "LightFace" ); - static const OUString sFirstLightHarsh( "FirstLightHarsh" ); - static const OUString sSecondLightHarsh( "SecondLightHarsh" ); - static const OUString sFirstLightLevel( "FirstLightLevel" ); - static const OUString sSecondLightLevel( "SecondLightLevel" ); + 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) { @@ -626,11 +626,11 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); - static const OUString sExtrusion( "Extrusion" ); - static const OUString sViewPoint( "ViewPoint" ); - static const OUString sOrigin( "Origin" ); - static const OUString sSkew( "Skew" ); - static const OUString sProjectionMode( "ProjectionMode" ); + 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 com::sun::star::uno::Any* pAny; @@ -777,8 +777,8 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); - static const OUString sExtrusion( "Extrusion" ); - static const OUString sProjectionMode( "ProjectionMode" ); + static const char sExtrusion[] = "Extrusion"; + static const char sProjectionMode[] = "ProjectionMode"; const com::sun::star::uno::Any* pAny; @@ -833,10 +833,10 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); - static const OUString sExtrusion( "Extrusion" ); - static const OUString sShadeMode( "ShadeMode" ); - static const OUString sSpecularity( "Specularity" ); - static const OUString sMetal( "Metal" ); + static const char sExtrusion[] = "Extrusion"; + static const char sShadeMode[] = "ShadeMode"; + static const char sSpecularity[] = "Specularity"; + static const char sMetal[] = "Metal"; const com::sun::star::uno::Any* pAny; @@ -921,8 +921,8 @@ void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); - static const OUString sExtrusion( "Extrusion" ); - static const OUString sDepth( "Depth" ); + static const char sExtrusion[] = "Extrusion"; + static const char sDepth[] = "Depth"; const com::sun::star::uno::Any* pAny; @@ -1001,9 +1001,9 @@ void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); - static const OUString sExtrusion( "Extrusion" ); - static const OUString sFirstLightDirection( "FirstLightDirection" ); - static const OUString sSecondLightDirection( "SecondLightDirection" ); + static const char sExtrusion[] = "Extrusion"; + static const char sFirstLightDirection[] = "FirstLightDirection"; + static const char sSecondLightDirection[] = "SecondLightDirection"; const Direction3D * pLighting1Defaults; const Direction3D * pLighting2Defaults; @@ -1082,8 +1082,8 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); - static const OUString sExtrusion( "Extrusion" ); - static const OUString sBrightness( "Brightness" ); + static const char sExtrusion[] = "Extrusion"; + static const char sBrightness[] = "Brightness"; const com::sun::star::uno::Any* pAny; @@ -1150,8 +1150,8 @@ void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); - static const OUString sExtrusion( "Extrusion" ); - static const OUString sExtrusionColor( "Color" ); + static const char sExtrusion[] = "Extrusion"; + static const char sExtrusionColor[] = "Color"; const com::sun::star::uno::Any* pAny; @@ -1220,7 +1220,7 @@ void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet ) namespace svx { bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyExtruded ) { - static const OUString sExtrusion( "Extrusion" ); + static const char sExtrusion[] = "Extrusion"; const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index e4646f6db9f5..63e0cf3558ba 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -222,7 +222,7 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus ) if ( nCheckStatus & 2 ) return ( nCheckStatus & 1 ) != 0; - static const OUString sTextPath( "TextPath" ); + static const char sTextPath[] = "TextPath"; const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -247,8 +247,8 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus ) static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj ) { - static const OUString sTextPath( "TextPath" ); - static const OUString sSameLetterHeights( "SameLetterHeights" ); + static const char sTextPath[] = "TextPath"; + static const char sSameLetterHeights[] = "SameLetterHeights"; sal_uInt16 nSID = rReq.GetSlot(); switch( nSID ) diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index f6fab38d5ef2..9c6df3a99b0b 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -3146,8 +3146,7 @@ uno::Sequence<uno::Any> SvxShape::getPropertyDefaults( OUString SAL_CALL SvxShape::getImplementationName() throw(uno::RuntimeException, std::exception) { - static OUString aServiceName("SvxShape"); - return aServiceName; + return OUString("SvxShape"); } #define STAR_NAMESPACE "com.sun.star." @@ -4007,8 +4006,7 @@ void SAL_CALL SvxShapeText::release() throw() OUString SAL_CALL SvxShapeText::getImplementationName() throw( uno::RuntimeException, std::exception ) { - static OUString aServiceName("SvxShapeText"); - return aServiceName; + return OUString("SvxShapeText"); } |