diff options
-rw-r--r-- | accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 5 | ||||
-rw-r--r-- | accessibility/source/extended/accessiblelistboxentry.cxx | 5 | ||||
-rw-r--r-- | basctl/source/basicide/baside3.cxx | 6 | ||||
-rw-r--r-- | basctl/source/basicide/moduldl2.cxx | 6 | ||||
-rw-r--r-- | basegfx/source/polygon/b2dpolygonclipper.cxx | 6 | ||||
-rw-r--r-- | basegfx/source/tools/numbertools.cxx | 3 | ||||
-rw-r--r-- | basegfx/source/vector/b3dvector.cxx | 3 | ||||
-rw-r--r-- | basic/source/classes/sbunoobj.cxx | 6 | ||||
-rw-r--r-- | basic/source/uno/namecont.cxx | 4 | ||||
-rw-r--r-- | canvas/source/tools/surface.cxx | 3 |
10 files changed, 14 insertions, 33 deletions
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 14bbbb7a2b35..2c891f0c4816 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -186,10 +186,7 @@ namespace accessibility Locale AccessibleIconChoiceCtrlEntry::implGetLocale() { - Locale aLocale; - aLocale = Application::GetSettings().GetUILanguageTag().getLocale(); - - return aLocale; + return Application::GetSettings().GetUILanguageTag().getLocale(); } void AccessibleIconChoiceCtrlEntry::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) { diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index d093a6a0481b..b3257345a822 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -199,10 +199,7 @@ namespace accessibility Locale AccessibleListBoxEntry::implGetLocale() { - Locale aLocale; - aLocale = Application::GetSettings().GetUILanguageTag().getLocale(); - - return aLocale; + return Application::GetSettings().GetUILanguageTag().getLocale(); } void AccessibleListBoxEntry::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) { diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 4d32da54f77a..c0409fe8b924 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -998,8 +998,7 @@ bool implImportDialog(weld::Window* pWin, const OUString& rCurPath, const Script { const std::shared_ptr<LocalizationMgr>& pCurMgr = pShell->GetCurLocalizationMgr(); - lang::Locale aFirstLocale; - aFirstLocale = aOnlyInImportLanguages[0]; + lang::Locale aFirstLocale = aOnlyInImportLanguages[0]; if( nOnlyInImportLanguageCount > 1 ) { // Check if import default belongs to only import languages and use it then @@ -1244,8 +1243,7 @@ void DialogWindow::InitSettings() { // FIXME RenderContext const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - vcl::Font aFont; - aFont = rStyleSettings.GetFieldFont(); + vcl::Font aFont = rStyleSettings.GetFieldFont(); SetPointFont(*this, aFont); SetTextColor( rStyleSettings.GetFieldTextColor() ); diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 9356357aa55f..30d593301b3b 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -697,8 +697,7 @@ void LibPage::InsertLib() // filter OUString aTitle(IDEResId(RID_STR_BASIC)); - OUString aFilter; - aFilter = "*.sbl;*.xlc;*.xlb" // library files + OUString aFilter = "*.sbl;*.xlc;*.xlb" // library files ";*.sdw;*.sxw;*.odt" // text ";*.vor;*.stw;*.ott" // text template ";*.sgl;*.sxg;*.odm" // master document @@ -1159,8 +1158,7 @@ void LibPage::ExportAsPackage( const OUString& aLibName ) // filter OUString aTitle(IDEResId(RID_STR_PACKAGE_BUNDLE)); - OUString aFilter; - aFilter = "*.oxt" ; // library files + OUString aFilter = "*.oxt" ; // library files xFP->appendFilter( aTitle, aFilter ); // set display directory and filter diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx index f734a4594382..d21ce300ee87 100644 --- a/basegfx/source/polygon/b2dpolygonclipper.cxx +++ b/basegfx/source/polygon/b2dpolygonclipper.cxx @@ -453,7 +453,6 @@ namespace basegfx } // area clipping - B2DPolyPolygon aMergePolyPolygonA(rClip); // First solve all polygon-self and polygon-polygon intersections. // Also get rid of some not-needed polygons (neutral, no area -> when @@ -461,7 +460,7 @@ namespace basegfx // Now it is possible to correct the orientations in the cut-free // polygons to values corresponding to painting the utils::PolyPolygon with // a XOR-WindingRule. - aMergePolyPolygonA = solveCrossovers(aMergePolyPolygonA); + B2DPolyPolygon aMergePolyPolygonA = solveCrossovers(rClip); aMergePolyPolygonA = stripNeutralPolygons(aMergePolyPolygonA); aMergePolyPolygonA = correctOrientations(aMergePolyPolygonA); @@ -472,10 +471,9 @@ namespace basegfx aMergePolyPolygonA.flip(); } - B2DPolyPolygon aMergePolyPolygonB(rCandidate); // prepare 2nd source polygon in same way - aMergePolyPolygonB = solveCrossovers(aMergePolyPolygonB); + B2DPolyPolygon aMergePolyPolygonB = solveCrossovers(rCandidate); aMergePolyPolygonB = stripNeutralPolygons(aMergePolyPolygonB); aMergePolyPolygonB = correctOrientations(aMergePolyPolygonB); diff --git a/basegfx/source/tools/numbertools.cxx b/basegfx/source/tools/numbertools.cxx index 2fb7ca8c898d..031bef3ba6e1 100644 --- a/basegfx/source/tools/numbertools.cxx +++ b/basegfx/source/tools/numbertools.cxx @@ -38,8 +38,7 @@ namespace basegfx { namespace utils sal_Int32(0)) * (1.0+fSpace); for( sal_Int32 i=0; i<aNum.getLength(); ++i ) { - B2DPolyPolygon aCurr; - aCurr=createSevenSegmentPolyPolygon(aNum[i], + B2DPolyPolygon aCurr=createSevenSegmentPolyPolygon(aNum[i], bLitSegments); aMat.identity(); diff --git a/basegfx/source/vector/b3dvector.cxx b/basegfx/source/vector/b3dvector.cxx index fc20d37494b3..22a7c6220960 100644 --- a/basegfx/source/vector/b3dvector.cxx +++ b/basegfx/source/vector/b3dvector.cxx @@ -48,8 +48,7 @@ namespace basegfx B3DVector B3DVector::getPerpendicular(const B3DVector& rNormalizedVec) const { - B3DVector aNew(*this); - aNew = cross(aNew, rNormalizedVec); + B3DVector aNew = cross(*this, rNormalizedVec); aNew.normalize(); return aNew; } diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 9d7f8daddae5..3e150ebf0307 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -3328,8 +3328,7 @@ SbxVariable* SbUnoClass::Find( const OUString& rName, SbxClassType ) { try { - Any aAny; - aAny = xField->get( aAny ); + Any aAny = xField->get( aAny ); // Convert to Sbx pRes = new SbxVariable( SbxVARIANT ); @@ -3788,8 +3787,7 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet if( xSbxObj.is() ) { - OUString aMethodName = aPrefixName; - aMethodName = aMethodName + Event.MethodName; + OUString aMethodName = aPrefixName + Event.MethodName; SbxVariable * pP = xSbxObj.get(); while( pP->GetParent() ) diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 821bf5d06fbf..192da2b017ab 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -2967,9 +2967,7 @@ void SfxLibrary::implSetModified( bool _bIsModified ) // Methods XInterface Any SAL_CALL SfxLibrary::queryInterface( const Type& rType ) { - Any aRet; - - aRet = + Any aRet = ::cppu::queryInterface( rType, static_cast< XContainer * >( this ), diff --git a/canvas/source/tools/surface.cxx b/canvas/source/tools/surface.cxx index 80c300a22751..10c2d4655343 100644 --- a/canvas/source/tools/surface.cxx +++ b/canvas/source/tools/surface.cxx @@ -332,8 +332,7 @@ namespace canvas // be transformed by the overall transform and uv coordinates will // be calculated from the result, and this is why we need to use // integer coordinates here... - basegfx::B2DHomMatrix aTransform; - aTransform = aTransform * rTransform; + basegfx::B2DHomMatrix aTransform = rTransform; aTransform.translate(::basegfx::fround(rPos.getX()), ::basegfx::fround(rPos.getY())); |