svtools/source/brwbox/datwin.cxx | 3 +-- svtools/source/config/printoptions.cxx | 6 ++---- svtools/source/contnr/fileview.cxx | 6 +++--- svtools/source/control/inettbc.cxx | 6 ++---- svtools/source/control/toolbarmenuacc.cxx | 4 ++-- svtools/source/dialogs/addresstemplate.cxx | 8 ++------ svtools/source/misc/imagemgr.cxx | 7 ++----- vcl/unx/generic/gdi/salbmp.cxx | 2 +- 8 files changed, 15 insertions(+), 27 deletions(-)
New commits: commit fe3d9961e32fd7230e21716793adaddffdf2463e Author: Noel Grandin <[email protected]> AuthorDate: Tue Oct 1 18:22:21 2019 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Oct 2 08:01:19 2019 +0200 loplugin:stringadd in svtools Change-Id: Ic085990173051f421d1ffc7914574cb63a7ae21d Reviewed-on: https://gerrit.libreoffice.org/79982 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index 33ba6eaf1d5c..c40b9142892c 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -667,8 +667,7 @@ void BrowserScrollBar::Tracking( const TrackingEvent& rTEvt ) sal_uLong nPos = GetThumbPos(); if ( nPos != _nLastPos ) { - OUString aTip( OUString::number(nPos) ); - aTip += "/"; + OUString aTip = OUString::number(nPos) + "/"; if ( !_pDataWin->GetRealRowCount().isEmpty() ) aTip += _pDataWin->GetRealRowCount(); else diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx index c866a0af8d17..c7d3353911dc 100644 --- a/svtools/source/config/printoptions.cxx +++ b/svtools/source/config/printoptions.cxx @@ -696,8 +696,7 @@ SvtPrinterOptions::SvtPrinterOptions() // ... and initialize our data container only if it not already! if( m_pStaticDataContainer == nullptr ) { - OUString aRootPath( ROOTNODE_START ); - aRootPath += "/Printer"; + OUString aRootPath = ROOTNODE_START "/Printer"; m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath ); pPrinterOptionsDataContainer = m_pStaticDataContainer; svtools::ItemHolder2::holdConfigItem(EItem::PrintOptions); @@ -731,8 +730,7 @@ SvtPrintFileOptions::SvtPrintFileOptions() // ... and initialize our data container only if it not already! if( m_pStaticDataContainer == nullptr ) { - OUString aRootPath( ROOTNODE_START ); - aRootPath += "/File"; + OUString aRootPath = ROOTNODE_START "/File"; m_pStaticDataContainer = new SvtPrintOptions_Impl( aRootPath ); pPrintFileOptionsDataContainer = m_pStaticDataContainer; diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 96303b749b35..40df91d555ff 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -1863,9 +1863,9 @@ OUString SvtFileView_Impl::FolderInserted( const OUString& rURL, const OUString& // title, type, size, date aValue = pData->GetTitle(); ReplaceTabWithString( aValue ); - aValue += aTab + pData->maType + aTab; - // folders don't have a size - aValue += aTab; + aValue += aTab + pData->maType + aTab + + // folders don't have a size + aTab; // set the date SvtSysLocale aSysLocale; const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData(); diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index b64d9ba12ff4..7f1a940f1981 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -338,8 +338,7 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL, { // a home that refers to / - OUString aNewText( aText ); - aNewText += "/"; + OUString aNewText = aText + "/"; Insert( aNewText, rURL, true ); return; @@ -642,8 +641,7 @@ void MatchContext_Impl::ReadFolder( const OUString& rURL, { // a home that refers to / - OUString aNewText( aText ); - aNewText += "/"; + OUString aNewText = aText + "/"; Insert( aNewText, rURL, true ); return; diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index 32a9169dedc6..b3d97a9ecbb4 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -651,8 +651,8 @@ OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName() if( aRet.isEmpty() ) { - aRet = "Item "; - aRet += OUString::number( mpParent->mnEntryId ); + aRet = "Item " + + OUString::number( mpParent->mnEntryId ); } } diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index b2c730ff47f0..ef6401ba6ebf 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -297,9 +297,7 @@ void AssignmentPersistentData::ImplCommit() OUString sAssignment; if (hasFieldAssignment(_rLogicalName)) { - OUString sFieldPath("Fields/"); - sFieldPath += _rLogicalName; - sFieldPath += "/AssignedFieldName"; + OUString sFieldPath = "Fields/" + _rLogicalName + "/AssignedFieldName"; sAssignment = getStringProperty(sFieldPath); } return sAssignment; @@ -356,9 +354,7 @@ void AssignmentPersistentData::ImplCommit() OUString sDescriptionNodePath("Fields"); // Fields/<field> - OUString sFieldElementNodePath(sDescriptionNodePath); - sFieldElementNodePath += "/"; - sFieldElementNodePath += _rLogicalName; + OUString sFieldElementNodePath = sDescriptionNodePath + "/" + _rLogicalName; Sequence< PropertyValue > aNewFieldDescription(2); // Fields/<field>/ProgrammaticFieldName diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 03132e258926..bd16300c5ced 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -734,8 +734,7 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb { bShowExt = false; sExtension = sExtension.toAsciiUpperCase(); - sDescription = sExtension; - sDescription += "-"; + sDescription = sExtension + "-"; } sDescription += SvtResId(pResId); } @@ -744,9 +743,7 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb if ( bShowExt ) { - sDescription += " ("; - sDescription += sExtension; - sDescription += ")"; + sDescription += " (" + sExtension + ")"; } return sDescription; commit 5da08d7b14b03459070228bad1b42dc5d1746b9f Author: Noel Grandin <[email protected]> AuthorDate: Tue Oct 1 11:51:59 2019 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Oct 2 08:01:09 2019 +0200 tdf#127858 Assertion when trying to edit a form (gen backend) regression from commit 78b9dac2ee77bf6efc1298962cbeca284db5b00a remove internal use of 16-bit packed formats we are trying to create a 32-bit image in drawinglayer::primitive2d::createDefaultCross_3x3 Change-Id: Iaf19326b1e2c11c5d535dd8f317086bebbaaebec Reviewed-on: https://gerrit.libreoffice.org/79948 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 0a96048ae21f..a81eb608ec21 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -149,7 +149,7 @@ std::unique_ptr<BitmapBuffer> X11SalBitmap::ImplCreateDIB( case 8: pDIB->mnFormat |= ScanlineFormat::N8BitPal; break; case 24: pDIB->mnFormat |= ScanlineFormat::N24BitTcBgr; break; default: - assert(false); + SAL_WARN("vcl.gdi", "32-bit images not supported, converting to 24-bit"); nBitCount = 24; pDIB->mnFormat |= ScanlineFormat::N24BitTcBgr; break; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
