diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-08 13:13:42 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-08 13:16:15 +0100 |
commit | a58f6d2744fde88f2034987208124e5b2505c641 (patch) | |
tree | 167d94743e2854bae544e9a09b59b0fb47b5e3ee /cui | |
parent | 43635b474cdce65e64fa9ca9d27a3cee6d96d50b (diff) |
loplugin:indentation in cppu..cui
Change-Id: If625e5bf38ca8e1f12686038c7c9be8d0303b6f6
Reviewed-on: https://gerrit.libreoffice.org/67536
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/customize/SvxToolbarConfigPage.cxx | 2 | ||||
-rw-r--r-- | cui/source/customize/cfg.cxx | 14 | ||||
-rw-r--r-- | cui/source/dialogs/SpellDialog.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 14 | ||||
-rw-r--r-- | cui/source/dialogs/hldocntp.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/hldoctp.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/insdlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/scriptdlg.cxx | 46 | ||||
-rw-r--r-- | cui/source/options/connpoolconfig.cxx | 4 | ||||
-rw-r--r-- | cui/source/options/optaboutconfig.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optgenrl.cxx | 10 | ||||
-rw-r--r-- | cui/source/options/optopencl.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/numpages.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/swpossizetabpage.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/tpline.cxx | 6 |
17 files changed, 59 insertions, 59 deletions
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index 01746d0c10e5..174cf7f458ae 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -1002,7 +1002,7 @@ void SvxToolbarEntriesListBox::ChangeVisibility( SvTreeListEntry* pEntry ) ToolbarSaveInData* pToolbarSaveInData = static_cast<ToolbarSaveInData*>( pPage->GetSaveInData() ); - pToolbarSaveInData->ApplyToolbar( pToolbar ); + pToolbarSaveInData->ApplyToolbar( pToolbar ); SetCheckButtonState( pEntry, pEntryData->IsVisible() ? SvButtonState::Checked : SvButtonState::Unchecked ); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index c8b2e76af427..cb5b083dddc4 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -3382,9 +3382,9 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) uno::Any a = props->getPropertyValue("SizePixel"); - xGraphic = m_xGraphProvider->queryGraphic( aMediaProps ); - if ( xGraphic.is() ) - { + xGraphic = m_xGraphProvider->queryGraphic( aMediaProps ); + if ( xGraphic.is() ) + { bool bOK = true; a >>= aSize; @@ -3426,11 +3426,11 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) { SAL_WARN("cui.customize", "could not create Image from XGraphic"); } - } - else - { + } + else + { SAL_WARN("cui.customize", "could not get query XGraphic"); - } + } } catch( uno::Exception& e ) { diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index f586f0eaf212..567006f0d492 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -766,7 +766,7 @@ IMPL_LINK(SpellDialog, LanguageSelectHdl, ListBox&, rBox, void) SpellContinue_Impl(); } - m_pSentenceED->AddUndoAction(std::make_unique<SpellUndoAction_Impl>(SPELLUNDO_CHANGE_LANGUAGE, aDialogUndoLink)); + m_pSentenceED->AddUndoAction(std::make_unique<SpellUndoAction_Impl>(SPELLUNDO_CHANGE_LANGUAGE, aDialogUndoLink)); } SpellDialog::UpdateBoxes_Impl(true); } diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 1413ba0f211e..06bba88c874a 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -292,17 +292,17 @@ void ColorFieldControl::UpdateBitmap() sal_uInt8* pRGB_Vert = maRGB_Vert.data(); sal_uInt16* pPercent_Vert = maPercent_Vert.data(); - Color aBitmapColor(maColor); + Color aBitmapColor(maColor); - sal_uInt16 nHue, nSat, nBri; - maColor.RGBtoHSB(nHue, nSat, nBri); + sal_uInt16 nHue, nSat, nBri; + maColor.RGBtoHSB(nHue, nSat, nBri); // this has been unlooped for performance reason, please do not merge back! - sal_uInt16 y = nHeight,x; + sal_uInt16 y = nHeight,x; - switch(meMode) - { + switch(meMode) + { case HUE: while (y--) { @@ -375,7 +375,7 @@ void ColorFieldControl::UpdateBitmap() } } break; - } + } } void ColorFieldControl::ShowPosition( const Point& rPos, bool bUpdate ) diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index b60de28efffb..eba5f9c7bd69 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -179,7 +179,7 @@ void SvxHyperlinkNewDocTp::FillDocumentList () OUString aDocumentUrl, aTitle, aImageId, aTargetName; - for ( int e = 0; e < rDynamicMenuEntry.getLength(); e++ ) + for ( int e = 0; e < rDynamicMenuEntry.getLength(); e++ ) { if ( rDynamicMenuEntry[ e ].Name == DYNAMICMENU_PROPERTYNAME_URL ) rDynamicMenuEntry[ e ].Value >>= aDocumentUrl; diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 17597ab9dd27..e492703ab3a0 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -101,7 +101,7 @@ void SvxHyperlinkDocTp::FillDlgFields(const OUString& rStrURL) OUString aStrMark; if ( nPos != -1 && nPos < rStrURL.getLength()-1 ) aStrMark = rStrURL.copy( nPos+1 ); - m_pEdTarget->SetText ( aStrMark ); + m_pEdTarget->SetText ( aStrMark ); ModifiedPathHdl_Impl ( *m_pCbbPath ); } diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index cbf7c0e4eeba..1e7410fe6670 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -276,8 +276,8 @@ short SvInsertOleDlg::run() uno::Reference< task::XInteractionHandler2 > xInteraction( task::InteractionHandler::createWithParent(xContext, nullptr) ); - aMedium[1].Name = "InteractionHandler"; - aMedium[1].Value <<= xInteraction; + aMedium[1].Name = "InteractionHandler"; + aMedium[1].Value <<= xInteraction; // create object from media descriptor if ( bLink ) diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index d70a3671c30f..99c7b96140bf 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -371,7 +371,7 @@ SvTreeListEntry * SFTreeListBox::insertEntry( SvTreeListEntry * p = InsertEntry( rText, aImage, aImage, pParent, bChildrenOnDemand, TREELIST_APPEND, aUserData.release()); // XXX possible leak - return p; + return p; } void SFTreeListBox::RequestingChildren( SvTreeListEntry* pEntry ) @@ -610,7 +610,7 @@ IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox, void ) Reference< browse::XBrowseNode > node; if ( userData ) { - node = userData->GetNode(); + node = userData->GetNode(); CheckButtons( node ); } } @@ -1220,29 +1220,29 @@ OUString GetErrorMessage( OUString type = ""; OUString message = eScriptError.Message; - if ( !eScriptError.language.isEmpty() ) - { - language = eScriptError.language; - } + if ( !eScriptError.language.isEmpty() ) + { + language = eScriptError.language; + } - if ( !eScriptError.scriptName.isEmpty() ) - { - script = eScriptError.scriptName; - } + if ( !eScriptError.scriptName.isEmpty() ) + { + script = eScriptError.scriptName; + } - if ( !eScriptError.Message.isEmpty() ) - { - message = eScriptError.Message; - } - if ( eScriptError.lineNum != -1 ) - { - line = OUString::number( eScriptError.lineNum ); - unformatted = CuiResId( RID_SVXSTR_ERROR_AT_LINE ); - } - else - { - unformatted = CuiResId( RID_SVXSTR_ERROR_RUNNING ); - } + if ( !eScriptError.Message.isEmpty() ) + { + message = eScriptError.Message; + } + if ( eScriptError.lineNum != -1 ) + { + line = OUString::number( eScriptError.lineNum ); + unformatted = CuiResId( RID_SVXSTR_ERROR_AT_LINE ); + } + else + { + unformatted = CuiResId( RID_SVXSTR_ERROR_RUNNING ); + } return FormatErrorString( unformatted, language, script, line, type, message ); diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx index 434a81c27051..8d28a1e84c8e 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -107,8 +107,8 @@ namespace offapp // look if we (resp. the driver manager) know this driver // doing O(n) search here, which is expensive, but this doesn't matter in this small case ... - DriverPoolingSettings::iterator aLookup; - for ( aLookup = aSettings.begin(); + DriverPoolingSettings::iterator aLookup; + for ( aLookup = aSettings.begin(); aLookup != aSettings.end(); ++aLookup ) diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index f203320bd0c9..2cde3cdc3f6b 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -679,7 +679,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) float nFloat = sNewValue.toFloat(); if( ( nFloat ==0 && sNewValue.getLength()!=1 ) || nFloat >= SAL_MAX_INT32 || nFloat <= SAL_MIN_INT32) throw uno::Exception("out of range float", nullptr); - pProperty->Value <<= nFloat; + pProperty->Value <<= nFloat; } else if( sPropertyType == "string" ) { diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index cabc9003fd5b..ad218734162c 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -323,15 +323,15 @@ void SvxGeneralTabPage::InitCryptography() } //tdf#115015: wrap checkbox text and listboxes if necessary - Size aPrefSize(m_pEncryptToSelfCB->get_preferred_size()); - Size aSize(m_pEncryptToSelfCB->CalcMinimumSize(40*approximate_char_width())); - if (aPrefSize.Width() > aSize.Width()) - { + Size aPrefSize(m_pEncryptToSelfCB->get_preferred_size()); + Size aSize(m_pEncryptToSelfCB->CalcMinimumSize(40*approximate_char_width())); + if (aPrefSize.Width() > aSize.Width()) + { m_pSigningKeyLB->set_width_request(aSize.Width()); m_pEncryptionKeyLB->set_width_request(aSize.Width()); m_pEncryptToSelfCB->set_width_request(aSize.Width()); m_pEncryptToSelfCB->set_height_request(aSize.Height()); - } + } } } diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index 6a568903ae89..b8b30b7e0229 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -78,7 +78,7 @@ VclPtr<SfxTabPage> SvxOpenCLTabPage::Create( TabPageParent pParent, const SfxIte bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* ) { - bool bModified = false; + bool bModified = false; std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create()); if (mpUseOpenCL->IsValueChangedFromSaved()) diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index f18d7dc5c120..03494f6d17f0 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2228,7 +2228,7 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, ClickHdl, weld::Button&, void) uno::Reference< smarttags::XSmartTagRecognizer > xRec = pUserData->mxRec; const sal_Int32 nSmartTagIdx = pUserData->mnSmartTagIdx; - const lang::Locale aLocale( LanguageTag::convertToLocale( eLastDialogLanguage ) ); + const lang::Locale aLocale( LanguageTag::convertToLocale( eLastDialogLanguage ) ); if ( xRec->hasPropertyPage( nSmartTagIdx, aLocale ) ) xRec->displayPropertyPage( nSmartTagIdx, aLocale ); } diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 6a9c23bb3ef2..b260ed85db00 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -401,7 +401,7 @@ const FontList* SvxCharNamePage::GetFontList() const { DBG_ASSERT(nullptr != static_cast<const SvxFontListItem*>(pItem)->GetFontList(), "Where is the font list?"); - m_pImpl->m_pFontList = static_cast<const SvxFontListItem*>(pItem )->GetFontList()->Clone(); + m_pImpl->m_pFontList = static_cast<const SvxFontListItem*>(pItem )->GetFontList()->Clone(); } } if(!m_pImpl->m_pFontList) diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index ee91b820911f..a4f8c281158f 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -981,7 +981,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, weld::Button&, voi { xSimpleFileAccess->copy( aUserImageURL, aUserGalleryURL ); INetURLObject gURL( aUserGalleryURL ); - std::unique_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream( + std::unique_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream( gURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), StreamMode::READ )); if ( pIn ) { diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index d5c536d4bdc7..388b801500ab 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1110,7 +1110,7 @@ RndStdIds SvxSwPosSizeTabPage::GetAnchorType(bool* pbHasChanged) else *pbHasChanged = false; } - return nRet; + return nRet; } IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyClickHdl, weld::ToggleButton&, void) diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 1fb061467e77..db35461472b6 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -336,13 +336,13 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) } // ColorList - if( *m_pnColorListState != ChangeType::NONE ) - { + if( *m_pnColorListState != ChangeType::NONE ) + { if( *m_pnColorListState & ChangeType::CHANGED ) m_pColorList = static_cast<SvxLineTabDialog*>(GetDialogController())->GetNewColorList(); ChangePreviewHdl_Impl( nullptr ); - } + } m_nPageType = PageType::Area; } |