Kaydet (Commit) d028c1be authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:sequentialassign in accessiblity..canvas

Change-Id: I984717138ac85c1af5fc363fda06f5c2b5497965
Reviewed-on: https://gerrit.libreoffice.org/70641
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 11e381c5
...@@ -186,10 +186,7 @@ namespace accessibility ...@@ -186,10 +186,7 @@ namespace accessibility
Locale AccessibleIconChoiceCtrlEntry::implGetLocale() Locale AccessibleIconChoiceCtrlEntry::implGetLocale()
{ {
Locale aLocale; return Application::GetSettings().GetUILanguageTag().getLocale();
aLocale = Application::GetSettings().GetUILanguageTag().getLocale();
return aLocale;
} }
void AccessibleIconChoiceCtrlEntry::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) void AccessibleIconChoiceCtrlEntry::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
{ {
......
...@@ -199,10 +199,7 @@ namespace accessibility ...@@ -199,10 +199,7 @@ namespace accessibility
Locale AccessibleListBoxEntry::implGetLocale() Locale AccessibleListBoxEntry::implGetLocale()
{ {
Locale aLocale; return Application::GetSettings().GetUILanguageTag().getLocale();
aLocale = Application::GetSettings().GetUILanguageTag().getLocale();
return aLocale;
} }
void AccessibleListBoxEntry::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) void AccessibleListBoxEntry::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
{ {
......
...@@ -998,8 +998,7 @@ bool implImportDialog(weld::Window* pWin, const OUString& rCurPath, const Script ...@@ -998,8 +998,7 @@ bool implImportDialog(weld::Window* pWin, const OUString& rCurPath, const Script
{ {
const std::shared_ptr<LocalizationMgr>& pCurMgr = pShell->GetCurLocalizationMgr(); const std::shared_ptr<LocalizationMgr>& pCurMgr = pShell->GetCurLocalizationMgr();
lang::Locale aFirstLocale; lang::Locale aFirstLocale = aOnlyInImportLanguages[0];
aFirstLocale = aOnlyInImportLanguages[0];
if( nOnlyInImportLanguageCount > 1 ) if( nOnlyInImportLanguageCount > 1 )
{ {
// Check if import default belongs to only import languages and use it then // Check if import default belongs to only import languages and use it then
...@@ -1244,8 +1243,7 @@ void DialogWindow::InitSettings() ...@@ -1244,8 +1243,7 @@ void DialogWindow::InitSettings()
{ {
// FIXME RenderContext // FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
vcl::Font aFont; vcl::Font aFont = rStyleSettings.GetFieldFont();
aFont = rStyleSettings.GetFieldFont();
SetPointFont(*this, aFont); SetPointFont(*this, aFont);
SetTextColor( rStyleSettings.GetFieldTextColor() ); SetTextColor( rStyleSettings.GetFieldTextColor() );
......
...@@ -697,8 +697,7 @@ void LibPage::InsertLib() ...@@ -697,8 +697,7 @@ void LibPage::InsertLib()
// filter // filter
OUString aTitle(IDEResId(RID_STR_BASIC)); OUString aTitle(IDEResId(RID_STR_BASIC));
OUString aFilter; OUString aFilter = "*.sbl;*.xlc;*.xlb" // library files
aFilter = "*.sbl;*.xlc;*.xlb" // library files
";*.sdw;*.sxw;*.odt" // text ";*.sdw;*.sxw;*.odt" // text
";*.vor;*.stw;*.ott" // text template ";*.vor;*.stw;*.ott" // text template
";*.sgl;*.sxg;*.odm" // master document ";*.sgl;*.sxg;*.odm" // master document
...@@ -1159,8 +1158,7 @@ void LibPage::ExportAsPackage( const OUString& aLibName ) ...@@ -1159,8 +1158,7 @@ void LibPage::ExportAsPackage( const OUString& aLibName )
// filter // filter
OUString aTitle(IDEResId(RID_STR_PACKAGE_BUNDLE)); OUString aTitle(IDEResId(RID_STR_PACKAGE_BUNDLE));
OUString aFilter; OUString aFilter = "*.oxt" ; // library files
aFilter = "*.oxt" ; // library files
xFP->appendFilter( aTitle, aFilter ); xFP->appendFilter( aTitle, aFilter );
// set display directory and filter // set display directory and filter
......
...@@ -453,7 +453,6 @@ namespace basegfx ...@@ -453,7 +453,6 @@ namespace basegfx
} }
// area clipping // area clipping
B2DPolyPolygon aMergePolyPolygonA(rClip);
// First solve all polygon-self and polygon-polygon intersections. // First solve all polygon-self and polygon-polygon intersections.
// Also get rid of some not-needed polygons (neutral, no area -> when // Also get rid of some not-needed polygons (neutral, no area -> when
...@@ -461,7 +460,7 @@ namespace basegfx ...@@ -461,7 +460,7 @@ namespace basegfx
// Now it is possible to correct the orientations in the cut-free // Now it is possible to correct the orientations in the cut-free
// polygons to values corresponding to painting the utils::PolyPolygon with // polygons to values corresponding to painting the utils::PolyPolygon with
// a XOR-WindingRule. // a XOR-WindingRule.
aMergePolyPolygonA = solveCrossovers(aMergePolyPolygonA); B2DPolyPolygon aMergePolyPolygonA = solveCrossovers(rClip);
aMergePolyPolygonA = stripNeutralPolygons(aMergePolyPolygonA); aMergePolyPolygonA = stripNeutralPolygons(aMergePolyPolygonA);
aMergePolyPolygonA = correctOrientations(aMergePolyPolygonA); aMergePolyPolygonA = correctOrientations(aMergePolyPolygonA);
...@@ -472,10 +471,9 @@ namespace basegfx ...@@ -472,10 +471,9 @@ namespace basegfx
aMergePolyPolygonA.flip(); aMergePolyPolygonA.flip();
} }
B2DPolyPolygon aMergePolyPolygonB(rCandidate);
// prepare 2nd source polygon in same way // prepare 2nd source polygon in same way
aMergePolyPolygonB = solveCrossovers(aMergePolyPolygonB); B2DPolyPolygon aMergePolyPolygonB = solveCrossovers(rCandidate);
aMergePolyPolygonB = stripNeutralPolygons(aMergePolyPolygonB); aMergePolyPolygonB = stripNeutralPolygons(aMergePolyPolygonB);
aMergePolyPolygonB = correctOrientations(aMergePolyPolygonB); aMergePolyPolygonB = correctOrientations(aMergePolyPolygonB);
......
...@@ -38,8 +38,7 @@ namespace basegfx { namespace utils ...@@ -38,8 +38,7 @@ namespace basegfx { namespace utils
sal_Int32(0)) * (1.0+fSpace); sal_Int32(0)) * (1.0+fSpace);
for( sal_Int32 i=0; i<aNum.getLength(); ++i ) for( sal_Int32 i=0; i<aNum.getLength(); ++i )
{ {
B2DPolyPolygon aCurr; B2DPolyPolygon aCurr=createSevenSegmentPolyPolygon(aNum[i],
aCurr=createSevenSegmentPolyPolygon(aNum[i],
bLitSegments); bLitSegments);
aMat.identity(); aMat.identity();
......
...@@ -48,8 +48,7 @@ namespace basegfx ...@@ -48,8 +48,7 @@ namespace basegfx
B3DVector B3DVector::getPerpendicular(const B3DVector& rNormalizedVec) const B3DVector B3DVector::getPerpendicular(const B3DVector& rNormalizedVec) const
{ {
B3DVector aNew(*this); B3DVector aNew = cross(*this, rNormalizedVec);
aNew = cross(aNew, rNormalizedVec);
aNew.normalize(); aNew.normalize();
return aNew; return aNew;
} }
......
...@@ -3328,8 +3328,7 @@ SbxVariable* SbUnoClass::Find( const OUString& rName, SbxClassType ) ...@@ -3328,8 +3328,7 @@ SbxVariable* SbUnoClass::Find( const OUString& rName, SbxClassType )
{ {
try try
{ {
Any aAny; Any aAny = xField->get( aAny );
aAny = xField->get( aAny );
// Convert to Sbx // Convert to Sbx
pRes = new SbxVariable( SbxVARIANT ); pRes = new SbxVariable( SbxVARIANT );
...@@ -3788,8 +3787,7 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet ...@@ -3788,8 +3787,7 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet
if( xSbxObj.is() ) if( xSbxObj.is() )
{ {
OUString aMethodName = aPrefixName; OUString aMethodName = aPrefixName + Event.MethodName;
aMethodName = aMethodName + Event.MethodName;
SbxVariable * pP = xSbxObj.get(); SbxVariable * pP = xSbxObj.get();
while( pP->GetParent() ) while( pP->GetParent() )
......
...@@ -2967,9 +2967,7 @@ void SfxLibrary::implSetModified( bool _bIsModified ) ...@@ -2967,9 +2967,7 @@ void SfxLibrary::implSetModified( bool _bIsModified )
// Methods XInterface // Methods XInterface
Any SAL_CALL SfxLibrary::queryInterface( const Type& rType ) Any SAL_CALL SfxLibrary::queryInterface( const Type& rType )
{ {
Any aRet; Any aRet =
aRet =
::cppu::queryInterface( ::cppu::queryInterface(
rType, rType,
static_cast< XContainer * >( this ), static_cast< XContainer * >( this ),
......
...@@ -332,8 +332,7 @@ namespace canvas ...@@ -332,8 +332,7 @@ namespace canvas
// be transformed by the overall transform and uv coordinates will // be transformed by the overall transform and uv coordinates will
// be calculated from the result, and this is why we need to use // be calculated from the result, and this is why we need to use
// integer coordinates here... // integer coordinates here...
basegfx::B2DHomMatrix aTransform; basegfx::B2DHomMatrix aTransform = rTransform;
aTransform = aTransform * rTransform;
aTransform.translate(::basegfx::fround(rPos.getX()), aTransform.translate(::basegfx::fround(rPos.getX()),
::basegfx::fround(rPos.getY())); ::basegfx::fround(rPos.getY()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment