This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push: new a6c9da1 Fixed typos, removed whitespace a6c9da1 is described below commit a6c9da1f594bff216e44f0716493904db5a8054f Author: mseidel <msei...@apache.org> AuthorDate: Thu Nov 11 18:58:43 2021 +0100 Fixed typos, removed whitespace --- main/svx/source/toolbars/extrusionbar.cxx | 58 ++++++++++++++----------------- main/svx/source/toolbars/extrusionbar.src | 38 +++++++++++--------- main/svx/source/toolbars/fontworkbar.cxx | 24 +++++-------- main/svx/source/toolbars/fontworkbar.src | 10 +++--- 4 files changed, 62 insertions(+), 68 deletions(-) diff --git a/main/svx/source/toolbars/extrusionbar.cxx b/main/svx/source/toolbars/extrusionbar.cxx index e9631f6..892e60d 100644 --- a/main/svx/source/toolbars/extrusionbar.cxx +++ b/main/svx/source/toolbars/extrusionbar.cxx @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,16 +7,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ @@ -60,10 +60,8 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::uno; /************************************************************************* -|* |* Standardinterface deklarieren (Die Slotmap darf nicht leer sein, also |* tragen wir etwas ein, was hier (hoffentlich) nie vorkommt). -|* \************************************************************************/ #define ShellClass ExtrusionBar @@ -82,9 +80,7 @@ TYPEINIT1( ExtrusionBar, SfxShell ); /************************************************************************* -|* |* Standard-Konstruktor -|* \************************************************************************/ ExtrusionBar::ExtrusionBar(SfxViewShell* pViewShell ) @@ -100,9 +96,7 @@ ExtrusionBar::ExtrusionBar(SfxViewShell* pViewShell ) /************************************************************************* -|* |* Destruktor -|* \************************************************************************/ ExtrusionBar::~ExtrusionBar() @@ -151,7 +145,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem static const rtl::OUString sViewPoint( RTL_CONSTASCII_USTRINGPARAM ( "ViewPoint" ) ); static const rtl::OUString sOrigin( RTL_CONSTASCII_USTRINGPARAM ( "Origin" ) ); static const rtl::OUString sSkew( RTL_CONSTASCII_USTRINGPARAM ( "Skew" ) ); - static const rtl::OUString sDepth( RTL_CONSTASCII_USTRINGPARAM ( "Depth" ) ); + static const rtl::OUString sDepth( RTL_CONSTASCII_USTRINGPARAM ( "Depth" ) ); sal_uInt16 nSID = rReq.GetSlot(); switch( nSID ) @@ -273,7 +267,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem aPropValue.Value <<= aViewPoint; rGeometryItem.SetPropertyValue( sExtrusion, aPropValue ); - + EnhancedCustomShapeParameterPair aOriginPropPair; aOriginPropPair.First.Value <<= fOriginX; aOriginPropPair.First.Type = EnhancedCustomShapeParameterType::NORMAL; @@ -328,7 +322,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; case SID_EXTRUSION_3D_COLOR: { - static const rtl::OUString sExtrusionColor( RTL_CONSTASCII_USTRINGPARAM ( "Color" ) ); + static const rtl::OUString sExtrusionColor( RTL_CONSTASCII_USTRINGPARAM ( "Color" ) ); if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_3D_COLOR ) == SFX_ITEM_SET) { @@ -417,7 +411,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_LIGHTING_INTENSITY ) == SFX_ITEM_SET) { sal_Int32 nLevel = ((const SfxInt32Item*)rReq.GetArgs()->GetItem(SID_EXTRUSION_LIGHTING_INTENSITY))->GetValue(); - + double fBrightness; sal_Bool bHarsh2; double fLevel1; @@ -594,17 +588,17 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB if( bUndo ) pSdrView->EndUndo(); - // simulate a context change: - // force SelectionHasChanged() being called - // so that extrusion bar will be visible/hidden - pSdrView->MarkListHasChanged(); + // simulate a context change: + // force SelectionHasChanged() being called + // so that extrusion bar will be visible/hidden + pSdrView->MarkListHasChanged(); } } } break; case SID_EXTRUSION_DEPTH_DIALOG: - if( rReq.GetArgs() && + if( rReq.GetArgs() && (rReq.GetArgs()->GetItemState( SID_EXTRUSION_DEPTH ) == SFX_ITEM_SET) && (rReq.GetArgs()->GetItemState( SID_ATTR_METRIC ) == SFX_ITEM_SET)) { @@ -628,7 +622,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB if( nSID == SID_EXTRUSION_TOOGLE ) { static sal_uInt16 SidArray[] = { - SID_EXTRUSION_TILT_DOWN, + SID_EXTRUSION_TILT_DOWN, SID_EXTRUSION_TILT_UP, SID_EXTRUSION_TILT_LEFT, SID_EXTRUSION_TILT_RIGHT, @@ -659,7 +653,7 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) static const rtl::OUString sOrigin( RTL_CONSTASCII_USTRINGPARAM ( "Origin" ) ); static const rtl::OUString sSkew( RTL_CONSTASCII_USTRINGPARAM ( "Skew" ) ); static const rtl::OUString sProjectionMode( RTL_CONSTASCII_USTRINGPARAM ( "ProjectionMode" ) ); - + com::sun::star::uno::Any* pAny; double fFinalSkewAngle = -1; @@ -807,7 +801,7 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet ) static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); static const rtl::OUString sProjectionMode( RTL_CONSTASCII_USTRINGPARAM ( "ProjectionMode" ) ); - + com::sun::star::uno::Any* pAny; sal_Int32 nFinalProjection = -1; @@ -866,7 +860,7 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet ) static const rtl::OUString sSpecularity( RTL_CONSTASCII_USTRINGPARAM ( "Specularity" ) ); static const rtl::OUString sDiffusion( RTL_CONSTASCII_USTRINGPARAM ( "Diffusion" ) ); static const rtl::OUString sMetal( RTL_CONSTASCII_USTRINGPARAM ( "Metal" ) ); - + com::sun::star::uno::Any* pAny; sal_Int32 nFinalSurface = -1; @@ -890,7 +884,7 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet ) continue; } - sal_Int32 nSurface = 0; // wire frame + sal_Int32 nSurface = 0; // wireframe ShadeMode eShadeMode( ShadeMode_FLAT ); pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sShadeMode ); @@ -909,7 +903,7 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet ) nSurface = 3; // metal } else - { + { double fSpecularity = 0; pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sSpecularity ); if( pAny ) @@ -952,7 +946,7 @@ void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet ) static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); static const rtl::OUString sDepth( RTL_CONSTASCII_USTRINGPARAM ( "Depth" ) ); - + com::sun::star::uno::Any* pAny; double fFinalDepth = -1; @@ -1113,7 +1107,7 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet ) static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); static const rtl::OUString sBrightness( RTL_CONSTASCII_USTRINGPARAM ( "Brightness" ) ); - + com::sun::star::uno::Any* pAny; int nFinalLevel = -1; @@ -1149,7 +1143,7 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet ) } else if( fBrightness >= 10.0 ) { - nLevel = 1; // Noraml; + nLevel = 1; // Normal } else { @@ -1180,7 +1174,7 @@ void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet ) sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); - static const rtl::OUString sExtrusionColor( RTL_CONSTASCII_USTRINGPARAM ( "Color" ) ); + static const rtl::OUString sExtrusionColor( RTL_CONSTASCII_USTRINGPARAM ( "Color" ) ); com::sun::star::uno::Any* pAny; @@ -1288,8 +1282,8 @@ void ExtrusionBar::getState( SdrView* pSdrView, SfxItemSet& rSet ) { getExtrusionProjectionState( pSdrView, rSet ); } - const bool bOnlyExtrudedCustomShapes = - checkForSelectedCustomShapes( pSdrView, true ); + const bool bOnlyExtrudedCustomShapes = + checkForSelectedCustomShapes( pSdrView, true ); if (rSet.GetItemState(SID_EXTRUSION_TILT_DOWN) != SFX_ITEM_UNKNOWN) { if (! bOnlyExtrudedCustomShapes) @@ -1322,7 +1316,7 @@ void ExtrusionBar::getState( SdrView* pSdrView, SfxItemSet& rSet ) } if (rSet.GetItemState(SID_EXTRUSION_DEPTH_FLOATER) != SFX_ITEM_UNKNOWN) { - if (! bOnlyExtrudedCustomShapes) + if (! bOnlyExtrudedCustomShapes) rSet.DisableItem( SID_EXTRUSION_DEPTH_FLOATER ); } if (rSet.GetItemState(SID_EXTRUSION_DIRECTION_FLOATER) != SFX_ITEM_UNKNOWN) diff --git a/main/svx/source/toolbars/extrusionbar.src b/main/svx/source/toolbars/extrusionbar.src index 2624bb0..db138f9 100644 --- a/main/svx/source/toolbars/extrusionbar.src +++ b/main/svx/source/toolbars/extrusionbar.src @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,71 +7,75 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ + + #include <svx/svxids.hrc> #include <svx/dialogs.hrc> String RID_SVX_EXTRUSION_BAR { - Text [ en-US ] = "Extrusion"; + Text [ en-US ] = "Extrusion" ; }; String RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF { - Text [ en-US ] = "Apply Extrusion On/Off"; + Text [ en-US ] = "Apply Extrusion On/Off" ; }; String RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_DOWN { - Text [ en-US ] = "Tilt Down"; + Text [ en-US ] = "Tilt Down" ; }; String RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_UP { - Text [ en-US ] = "Tilt Up"; + Text [ en-US ] = "Tilt Up" ; }; String RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_LEFT { - Text [ en-US ] = "Tilt Left"; + Text [ en-US ] = "Tilt Left" ; }; String RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_RIGHT { - Text [ en-US ] = "Tilt Right"; + Text [ en-US ] = "Tilt Right" ; }; String RID_SVXSTR_UNDO_APPLY_EXTRUSION_DEPTH { - Text [ en-US ] = "Change Extrusion Depth"; + Text [ en-US ] = "Change Extrusion Depth" ; }; String RID_SVXSTR_UNDO_APPLY_EXTRUSION_ORIENTATION { - Text [ en-US ] = "Change Orientation"; + Text [ en-US ] = "Change Orientation" ; }; String RID_SVXSTR_UNDO_APPLY_EXTRUSION_PROJECTION { - Text [ en-US ] = "Change Projection Type"; + Text [ en-US ] = "Change Projection Type" ; }; String RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING { - Text [ en-US ] = "Change Lighting"; + Text [ en-US ] = "Change Lighting" ; }; String RID_SVXSTR_UNDO_APPLY_EXTRUSION_BRIGHTNESS { - Text [ en-US ] = "Change Brightness"; + Text [ en-US ] = "Change Brightness" ; }; String RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE { - Text [ en-US ] = "Change Extrusion Surface"; + Text [ en-US ] = "Change Extrusion Surface" ; }; String RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR { - Text [ en-US ] = "Change Extrusion Color"; + Text [ en-US ] = "Change Extrusion Color" ; }; + +// ********************************************************************** EOF diff --git a/main/svx/source/toolbars/fontworkbar.cxx b/main/svx/source/toolbars/fontworkbar.cxx index 015bb3f..a78d99c 100644 --- a/main/svx/source/toolbars/fontworkbar.cxx +++ b/main/svx/source/toolbars/fontworkbar.cxx @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,16 +7,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ @@ -176,10 +176,8 @@ void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet ) } /************************************************************************* -|* |* Standardinterface deklarieren (Die Slotmap darf nicht leer sein, also |* tragen wir etwas ein, was hier (hoffentlich) nie vorkommt). -|* \************************************************************************/ #define ShellClass FontworkBar @@ -198,9 +196,7 @@ TYPEINIT1( FontworkBar, SfxShell ); /************************************************************************* -|* |* Standard-Konstruktor -|* \************************************************************************/ FontworkBar::FontworkBar(SfxViewShell* pViewShell ) @@ -216,9 +212,7 @@ FontworkBar::FontworkBar(SfxViewShell* pViewShell ) /************************************************************************* -|* |* Destruktor -|* \************************************************************************/ FontworkBar::~FontworkBar() @@ -231,11 +225,11 @@ static Window* ImpGetViewWin(SdrView* pView) if( pView ) { const sal_uInt32 nAnz(pView->PaintWindowCount()); - for(sal_uInt32 nNum(0L); nNum < nAnz; nNum++) + for(sal_uInt32 nNum(0L); nNum < nAnz; nNum++) { OutputDevice* pOut = &(pView->GetPaintWindow(nNum)->GetOutputDevice()); - if(OUTDEV_WINDOW == pOut->GetOutDevType()) + if(OUTDEV_WINDOW == pOut->GetOutDevType()) { return (Window*)pOut; } @@ -373,7 +367,7 @@ void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const rGeometryItem.ClearPropertyValue( sPath ); /* SJ: CustomShapes that are available in the gallery are having the highest - priority, so we will take a look there before taking the internal default */ + priority, so we will take a look there before taking the internal default */ if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) ) { @@ -508,7 +502,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi pObj->BroadcastObjectChange(); if( bUndo ) pSdrView->EndUndo(); - pSdrView->AdjustMarkHdl(); //HMH sal_True ); + pSdrView->AdjustMarkHdl(); // HMH sal_True ); rBindings.Invalidate( SID_FONTWORK_SHAPE_TYPE ); } } @@ -629,7 +623,7 @@ void FontworkBar::getState( SdrView* pSdrView, SfxItemSet& rSet ) } if ( rSet.GetItemState( SID_FONTWORK_SHAPE_TYPE ) != SFX_ITEM_UNKNOWN ) { - if ( !checkForSelectedFontWork( pSdrView, nCheckStatus ) ) + if ( !checkForSelectedFontWork( pSdrView, nCheckStatus ) ) rSet.DisableItem( SID_FONTWORK_SHAPE_TYPE ); else SetFontWorkShapeTypeState( pSdrView, rSet ); diff --git a/main/svx/source/toolbars/fontworkbar.src b/main/svx/source/toolbars/fontworkbar.src index e278d3b..cc7d2fb 100644 --- a/main/svx/source/toolbars/fontworkbar.src +++ b/main/svx/source/toolbars/fontworkbar.src @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,16 +7,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ @@ -47,3 +47,5 @@ String RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING { Text [ en-US ] = "Apply Fontwork Character Spacing"; }; + +// ********************************************************************** EOF