[Libreoffice-commits] core.git: basic/source connectivity/source cui/source extensions/source filter/source reportdesign/source sfx2/source sw/source vcl/qt5 vcl/source xmloff/source
basic/source/classes/sbunoobj.cxx |2 +-
basic/source/comp/buffer.cxx |2 +-
connectivity/source/drivers/mysql_jdbc/YTable.cxx |2 +-
cui/source/customize/SvxConfigPageHelper.cxx |2 +-
extensions/source/bibliography/bibconfig.cxx |4 ++--
filter/source/svg/svgexport.cxx|2 +-
filter/source/svg/svgwriter.cxx|2 +-
reportdesign/source/filter/xml/xmlCell.cxx |4 ++--
reportdesign/source/filter/xml/xmlFixedContent.cxx |4 ++--
sfx2/source/appl/sfxhelp.cxx |2 +-
sfx2/source/doc/SfxDocumentMetaData.cxx|2 +-
sw/source/core/fields/reffld.cxx |2 +-
sw/source/filter/html/htmlfld.cxx |2 +-
sw/source/filter/ww8/wrtw8nds.cxx |2 +-
sw/source/filter/ww8/ww8scan.cxx |2 +-
sw/source/uibase/dbui/mmconfigitem.cxx |2 +-
vcl/qt5/Qt5Instance.cxx|4 ++--
vcl/source/window/mnemonic.cxx |2 +-
xmloff/source/text/txtfldi.cxx |4 ++--
19 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit b08a2b299418db84a71fe625f127f0484746010e
Author: Noel Grandin
AuthorDate: Tue Apr 20 09:51:16 2021 +0200
Commit: Noel Grandin
CommitDate: Tue Apr 20 13:34:43 2021 +0200
use OUString::Concat here, not OUStringLiteral
Change-Id: Ia2172bcab60f32c9d9d4f6ca0230484343eef69b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114321
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index fcd491462528..6b0451b01a1d 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -4840,7 +4840,7 @@ void SbUnoStructRefObject::Notify( SfxBroadcaster& rBC,
const SfxHint& rHint )
// Id == -1: Display implemented interfaces according the
ClassProvider
if( nId == -1 ) // Property ID_DBG_SUPPORTEDINTERFACES"
{
-OUString aRet = OUStringLiteral(
ID_DBG_SUPPORTEDINTERFACES )
+OUString aRet = OUString::Concat(
ID_DBG_SUPPORTEDINTERFACES )
+ " not available.\n(TypeClass is not
TypeClass_INTERFACE)\n";
pVar->PutString( aRet );
diff --git a/basic/source/comp/buffer.cxx b/basic/source/comp/buffer.cxx
index ca7af7dd4090..07d1d85e53ee 100644
--- a/basic/source/comp/buffer.cxx
+++ b/basic/source/comp/buffer.cxx
@@ -82,7 +82,7 @@ void SbiBuffer::Chain( sal_uInt32 off )
if ((i + sizeof(sal_uInt32)) > GetSize())
{
m_aErrCode = ERRCODE_BASIC_INTERNAL_ERROR;
-m_sErrMsg = OUStringLiteral(u"BACKCHAIN");
+m_sErrMsg = "BACKCHAIN";
break;
}
auto ip = m_aBuf.begin() + i;
diff --git a/connectivity/source/drivers/mysql_jdbc/YTable.cxx
b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
index 7e08f896fddb..26e0fde19632 100644
--- a/connectivity/source/drivers/mysql_jdbc/YTable.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
@@ -198,7 +198,7 @@ void SAL_CALL OMySQLTable::alterColumnByName(const
OUString& colName,
{
if (sTypeName.indexOf(s_sAutoIncrement) == -1)
{
-sTypeName += OUStringLiteral(u" ") + s_sAutoIncrement;
+sTypeName += OUString::Concat(" ") + s_sAutoIncrement;
descriptor->setPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPENAME),
makeAny(sTypeName));
}
diff --git a/cui/source/customize/SvxConfigPageHelper.cxx
b/cui/source/customize/SvxConfigPageHelper.cxx
index 527754d5cf5f..39044173b8ed 100644
--- a/cui/source/customize/SvxConfigPageHelper.cxx
+++ b/cui/source/customize/SvxConfigPageHelper.cxx
@@ -177,7 +177,7 @@ sal_uInt32 SvxConfigPageHelper::generateRandomValue()
OUString SvxConfigPageHelper::generateCustomURL(SvxEntries* entries)
{
-OUString url = OUStringLiteral(ITEM_TOOLBAR_URL) + CUSTOM_TOOLBAR_STR +
+OUString url = OUString::Concat(ITEM_TOOLBAR_URL) + CUSTOM_TOOLBAR_STR +
// use a random number to minimize possible clash with
existing custom toolbars
OUString::number(generateRandomValue(), 16);
diff --git a/extensions/source/bibliography/bibconfig.cxx
b/extensions/source/bibliography/bibconfig.cxx
index f5a68212922d..fcfaf5608293 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -123,7 +123,7 @@ BibConfig::BibConfig()
Sequence aHistoryNames(3);
OUString* pHistoryNames = aHistoryNames.getArray();
-OUString sPrefix = OUStringLiteral(cDataSourceHis
[Libreoffice-commits] core.git: basic/source connectivity/source cui/source drawinglayer/source editeng/source embeddedobj/source emfio/source extensions/source filter/source forms/source include/tool
basic/source/basmgr/basmgr.cxx |6 +- basic/source/runtime/methods.cxx |4 - connectivity/source/drivers/dbase/DTable.cxx |9 +-- connectivity/source/drivers/dbase/dindexnode.cxx |2 cui/source/dialogs/insdlg.cxx |2 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |4 - editeng/source/editeng/eeobj.cxx |8 --- embeddedobj/source/msole/graphconvert.cxx |4 - emfio/source/reader/mtftools.cxx |2 emfio/source/reader/wmfreader.cxx |2 extensions/source/scanner/sane.cxx |3 - extensions/source/scanner/scanunx.cxx | 10 +--- filter/source/flash/swfwriter.cxx |3 - filter/source/flash/swfwriter1.cxx |8 +-- filter/source/flash/swfwriter2.cxx |3 - filter/source/graphicfilter/eps/eps.cxx|3 - filter/source/msfilter/escherex.cxx|9 +-- filter/source/msfilter/msdffimp.cxx|6 -- filter/source/svg/svgfilter.cxx|5 -- forms/source/component/DatabaseForm.cxx|2 include/tools/stream.hxx |1 lotuswordpro/source/filter/bencont.cxx | 14 - lotuswordpro/source/filter/lwpgrfobj.cxx |5 -- sc/source/filter/excel/xiescher.cxx|3 - sc/source/filter/excel/xistream.cxx|3 - sc/source/filter/ftools/fprogressbar.cxx |6 -- sc/source/filter/lotus/filter.cxx |3 - sc/source/ui/docshell/impex.cxx|7 -- sc/source/ui/unoobj/confuno.cxx|8 --- sc/source/ui/unoobj/exceldetect.cxx|6 -- sc/source/ui/unoobj/scdetect.cxx |3 - sd/source/filter/eppt/eppt.cxx |3 - sd/source/filter/eppt/epptso.cxx |3 - sd/source/filter/eppt/escherex.cxx |3 - sd/source/filter/ppt/pptatom.cxx |5 -- sd/source/filter/ppt/propread.cxx |5 -- sd/source/ui/app/sdxfer.cxx|2 sd/source/ui/unoidl/UnoDocumentSettings.cxx|8 --- sfx2/source/bastyp/sfxhtml.cxx |6 -- sfx2/source/doc/docinf.cxx |9 --- sfx2/source/doc/graphhelp.cxx |2 sfx2/source/doc/sfxbasemodel.cxx | 15 ++ sot/source/sdstor/stg.cxx |6 +- sot/source/sdstor/stgcache.cxx |6 -- sot/source/sdstor/stgdir.cxx |4 - sot/source/sdstor/stgstrms.cxx |4 - sot/source/sdstor/storage.cxx |5 -- sot/source/sdstor/ucbstorage.cxx | 15 +- starmath/source/unomodel.cxx |3 - svtools/source/misc/embedtransfer.cxx |4 - svtools/source/misc/transfer.cxx | 10 ++-- svx/qa/unit/xoutdev.cxx|4 - svx/source/dialog/compressgraphicdialog.cxx|6 -- svx/source/gallery2/codec.cxx |3 - svx/source/xml/xmlgrhlp.cxx|9 +-- svx/source/xoutdev/_xoutbmp.cxx|3 - sw/qa/extras/htmlexport/htmlexport.cxx | 32 +++-- sw/source/core/doc/swserv.cxx |2 sw/source/filter/ascii/parasc.cxx |4 - sw/source/filter/html/htmlcss1.cxx |3 - sw/source/filter/html/htmlreqifreader.cxx |3 - sw/source/filter/ww8/rtfattributeoutput.cxx| 18 ++- sw/source/filter/ww8/rtfsdrexport.cxx |3 - sw/source/filter/ww8/wrtww8.cxx|6 -- sw/source/filter/ww8/ww8par.cxx| 10 +--- sw/source/filter/ww8/ww8scan.cxx |8 --- sw/source/uibase/dbui/mailmergehelper.cxx |3 - sw/source/uibase/uno/SwXDocumentSettings.cxx |3 - unotools/source/streaming/streamwrap.cxx | 18 +-- unotools/source/ucbhelper/xtempfile.cxx|9 --- vcl/source/edit/textview.cxx |3 - vcl/source/filter/graphicf
[Libreoffice-commits] core.git: basic/source connectivity/source cui/source filter/source framework/inc framework/qa framework/source include/svtools include/xmloff odk/examples sc/source sfx2/source
basic/source/comp/parser.cxx |2 +-
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |2 +-
cui/source/inc/acccfg.hxx |4 ++--
filter/source/config/cache/filtercache.cxx |6 +++---
filter/source/config/cache/filtercache.hxx |6 +++---
filter/source/config/cache/typedetection.cxx |4 ++--
framework/inc/classes/framecontainer.hxx |2 +-
framework/qa/complex/framework/autosave/Protocol.java |2 +-
framework/source/helper/persistentwindowstate.cxx |2 +-
framework/source/services/frame.cxx|2 +-
include/svtools/transfer.hxx |2 +-
include/xmloff/xmlnume.hxx |2 +-
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx |2 +-
sc/source/ui/vba/vbaborders.cxx|2 +-
sc/source/ui/vba/vbapagebreaks.cxx |4 ++--
sc/source/ui/vba/vbarange.cxx |2 +-
sfx2/source/doc/objcont.cxx|8
sw/source/core/unocore/unodraw.cxx |4 ++--
sw/source/core/view/printdata.cxx |2 +-
sw/source/filter/ww8/ww8scan.cxx |2 +-
sw/source/ui/vba/vbaborders.cxx|2 +-
vcl/headless/svpinst.cxx |2 +-
22 files changed, 33 insertions(+), 33 deletions(-)
New commits:
commit d0222ba1fd7617b793e1e513247b11a82eb22f4e
Author: Andrea Gelmini
Date: Fri Dec 29 00:31:05 2017 +0100
Fix typos
Change-Id: I3d16dc162e5fa2e08134d848a835eb392e64056e
Reviewed-on: https://gerrit.libreoffice.org/47126
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 7d08a99b511e..ff16b016f154 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -605,7 +605,7 @@ void SbiParser::Set()
// It's a good idea to distinguish between
// set something = another &
// something = another
-// ( its necessary for vba objects where set is object
+// ( it's necessary for vba objects where set is object
// specific and also doesn't involve processing default params )
if( pDef->GetTypeId() )
{
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 7c440d7eb334..906ce288c1bb 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1314,7 +1314,7 @@ sal_Int32 typeNameToDataType( const OUString &typeName,
const OUString &typtype
// the user is better of with interpreting arrays as strings !
// if( typeName.getLength() && '_' == typeName[0] )
// {
-// its just a naming convention, but as long as we don't have
anything better,
+// it's just a naming convention, but as long as we don't have
anything better,
// we take it as granted
// ret = css::sdbc::DataType::ARRAY;
// }
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 34414c09f559..20e37f0ce1bb 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -80,8 +80,8 @@ struct TAccInfo
const vcl::KeyCode& aKey )
: m_nKeyPos(nKeyPos )
, m_nListPos (nListPos )
-, m_bIsConfigurable(true ) /**< its important to set sal_True as
default -
-because only fix entries will
be disabled later ... */
+, m_bIsConfigurable(true ) /**< it's important to set true as
default -
+because only fix entries will
be disabled later... */
, m_sCommand ( )
, m_aKey (aKey )
{}
diff --git a/filter/source/config/cache/filtercache.cxx
b/filter/source/config/cache/filtercache.cxx
index 6b97bda29bb2..79af348702e0 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1579,10 +1579,10 @@ CacheItem FilterCache::impl_loadItem(const
css::uno::Reference< css::container::
css::uno::Reference<
css::uno::XInterface >());
}
-// set too. Of course its already used as key into the e.g. outside
-// used hash map ... but some of our API methods provide
+// set too. Of course it's already used as key into the e.g. outside
+// used hash map... but some of our API methods p
[Libreoffice-commits] core.git: basic/source connectivity/source cui/source dbaccess/source desktop/source include/basegfx include/connectivity include/sfx2 include/toolkit lotuswordpro/source
basic/source/uno/scriptcont.cxx |1 -
connectivity/source/drivers/evoab2/NPreparedStatement.hxx |2 +-
connectivity/source/drivers/mork/MPreparedStatement.hxx |2 +-
cui/source/dialogs/cuigaldlg.cxx|1 -
cui/source/dialogs/scriptdlg.cxx|1 -
dbaccess/source/core/api/KeySet.hxx |1 -
dbaccess/source/core/api/OptimisticSet.hxx |1 -
dbaccess/source/core/api/RowSetCache.hxx|2 --
dbaccess/source/core/inc/TableDeco.hxx |1 -
dbaccess/source/core/inc/table.hxx |1 -
dbaccess/source/core/misc/DatabaseDataProvider.cxx |1 -
dbaccess/source/core/recovery/storagexmlstream.cxx |1 -
dbaccess/source/ext/macromigration/macromigrationdialog.cxx |1 -
dbaccess/source/filter/xml/xmlExport.hxx|2 --
dbaccess/source/filter/xml/xmlfilter.hxx|2 --
dbaccess/source/ui/browser/genericcontroller.cxx|1 -
dbaccess/source/ui/browser/unodatbr.cxx |1 -
dbaccess/source/ui/inc/TableRowExchange.hxx |1 -
dbaccess/source/ui/inc/dbexchange.hxx |1 -
dbaccess/source/ui/inc/exsrcbrw.hxx |1 -
desktop/source/deployment/gui/dp_gui.h |1 -
desktop/source/deployment/gui/license_dialog.cxx|1 -
desktop/source/deployment/inc/dp_xml.h |1 -
desktop/source/deployment/manager/dp_manager.cxx|1 -
desktop/source/deployment/misc/dp_resource.cxx |1 -
desktop/source/deployment/registry/executable/dp_executable.cxx |1 -
desktop/source/migration/services/jvmfwk.hxx|1 -
include/basegfx/tools/unotools.hxx |1 -
include/connectivity/sdbcx/VIndex.hxx |1 -
include/sfx2/sidebar/ControllerItem.hxx |1 -
include/toolkit/awt/vclxaccessiblecomponent.hxx |1 -
lotuswordpro/source/filter/xfilter/xfsaxstream.cxx |2 --
lotuswordpro/source/filter/xfilter/xfsaxstream.hxx |2 --
33 files changed, 2 insertions(+), 38 deletions(-)
New commits:
commit 0c6c37cb01c242ad9324bc91ac15c974529086c5
Author: Jochen Nitschke
Date: Tue Dec 6 15:49:59 2016 +0100
cleanup unused includes (related to tdf#88206)
cppuhelper/compbase*.hxx and cppuhelper/implbase*.hxx
compbase*.hxx includes implbase*.hxx replace compbase*.hxx if only
implbase*.hxx stuff is used.
Change-Id: I631a20aee411c6a32ffcf470f6e392621755f995
Reviewed-on: https://gerrit.libreoffice.org/31686
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 7e17ba9..e08e1e6 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -57,7 +57,6 @@
#include
#include
#include
-#include
#include
namespace basic
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
index dc002b2..2c64888 100644
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
@@ -29,7 +29,7 @@
#include
#include
#include
-#include
+#include
namespace connectivity
{
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx
b/connectivity/source/drivers/mork/MPreparedStatement.hxx
index eeed5fd..3fa14ef 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx
@@ -23,7 +23,7 @@
#include "MResultSet.hxx"
#include
#include
-#include
+#include
namespace connectivity
{
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index a4946e4..e7d5631 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -35,7 +35,6 @@
#include "cuigaldlg.hxx"
#include "helpid.hrc"
#include
-#include
#include
#include
#include
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 11ef281..855a5be 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -48,7 +48,6 @@
#include
#include
-#include
#include
#include
#include
diff --git a/dbaccess/source/core/api/KeySet.hxx
b/dbaccess/source/core/api/KeySet.hxx
index cd18b33..d9d0808 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -22,7 +22,6 @@
#include "CacheSet.hxx"
-#include
#include
#include
#include
diff --git a/dbaccess/so
[Libreoffice-commits] core.git: basic/source connectivity/source cui/source
basic/source/classes/sbunoobj.cxx |2 +-
basic/source/inc/scriptcont.hxx |2 +-
connectivity/source/drivers/postgresql/pq_statics.hxx |3 +--
cui/source/inc/macropg.hxx|2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 362ab03eb276fd7cf73a6882faa4e4f14fcab2a4
Author: tymyjan
Date: Sun Apr 3 14:41:58 2016 +0200
tdf#97499 Fixed containers parameters clearing #2
Change-Id: I2e77c3b33ae3b8a49a7890cac77be566391972f2
Reviewed-on: https://gerrit.libreoffice.org/23751
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index e98b0d0..610622c 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -3269,7 +3269,7 @@ Reference< XTypeDescriptionEnumeration >
getTypeDescriptorEnumeration( const OUS
return xEnum;
}
-typedef std::unordered_map< OUString, Any, OUStringHash, ::std::equal_to<
OUString > > VBAConstantsHash;
+typedef std::unordered_map< OUString, Any, OUStringHash > VBAConstantsHash;
VBAConstantHelper&
VBAConstantHelper::instance()
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index ef93b4a..0411527 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -120,7 +120,7 @@ public:
};
-typedef std::unordered_map< OUString, css::script::ModuleInfo, OUStringHash,
::std::equal_to< OUString > > ModuleInfoMap;
+typedef std::unordered_map< OUString, css::script::ModuleInfo, OUStringHash >
ModuleInfoMap;
typedef ::cppu::ImplHelper1< css::script::vba::XVBAModuleInfo >
SfxScriptLibrary_BASE;
diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx
b/connectivity/source/drivers/postgresql/pq_statics.hxx
index 3592502..afc2a56 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.hxx
@@ -92,8 +92,7 @@ typedef std::unordered_map
<
OUString,
sal_Int32,
- OUStringHash,
- ::std::equal_to< OUString >
+ OUStringHash
> BaseTypeMap;
struct ImplementationStatics
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 74eb46e..5036d4b 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -36,7 +36,7 @@
class SvTreeListBox;
typedef std::unordered_map< OUString, std::pair< OUString, OUString >,
-OUStringHash, std::equal_to< OUString > >
EventsHash;
+OUStringHash > EventsHash;
struct EventDisplayName
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
