[Libreoffice-commits] core.git: cpputools/source
cpputools/source/sp2bv/sp2bv.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4726801b3f4fb26373a0cbcb3c0e437449fa3baa Author: Stephan Bergmann AuthorDate: Wed Nov 8 08:45:43 2023 +0100 Commit: Stephan Bergmann CommitDate: Wed Nov 8 22:49:47 2023 +0100 loplugin:external -> loplugin:conststringvar -> loplugin:redundantstatic Change-Id: If5705fdf626ea9096e1d80b614d1907ec6b66bb7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159110 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/cpputools/source/sp2bv/sp2bv.cxx b/cpputools/source/sp2bv/sp2bv.cxx index 7e525f7fefcd..9d502c9b4e42 100644 --- a/cpputools/source/sp2bv/sp2bv.cxx +++ b/cpputools/source/sp2bv/sp2bv.cxx @@ -24,7 +24,7 @@ static bool hasOption(char const * szOption, int argc, char** argv); -const char* HELP_TEXT = +const char* const HELP_TEXT = "SYNOPSIS \n\n" "\tsp2bv [-h] [-?] string \n\n" "DESCRIPTION\n\n"
[Libreoffice-commits] core.git: cpputools/source
cpputools/source/sp2bv/sp2bv.cxx | 35 +--
1 file changed, 17 insertions(+), 18 deletions(-)
New commits:
commit 7c5188cbd483c1aab8c7bb55a29efcd935196fa1
Author: Arnaud VERSINI
AuthorDate: Sun Mar 19 17:20:44 2023 +0100
Commit: Noel Grandin
CommitDate: Mon Aug 14 15:01:16 2023 +0200
sp2bv : no need to use fprintf without any formating
Change-Id: Ieb276dcbd91873bd5121ae7534f0e120c88a88d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149114
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cpputools/source/sp2bv/sp2bv.cxx b/cpputools/source/sp2bv/sp2bv.cxx
index 9998e7cdb7c4..7e525f7fefcd 100644
--- a/cpputools/source/sp2bv/sp2bv.cxx
+++ b/cpputools/source/sp2bv/sp2bv.cxx
@@ -24,35 +24,34 @@
static bool hasOption(char const * szOption, int argc, char** argv);
-
-#define HELP_TEXT\
-"SYNOPSIS \n\n" \
-"\tsp2bv [-h] [-?] string \n\n" \
-"DESCRIPTION\n\n" \
-"\tsp2bv stands for \"system path to bootstrap variable\"." \
-" First the system path is converted into a file URL. Then all " \
-"characters which have a special meaning in bootstrap variables, " \
-"such as \'$\' are escaped. The resulting string is written to " \
-"stdout and can be assigned to a bootstrap variable.\n" \
-"\n\n" \
-"OPTIONS \n\n" \
-"\tThe following options are supported: \n" \
-"-?\n " \
-"--help" \
-"Display help information.\n"
+const char* HELP_TEXT =
+"SYNOPSIS \n\n"
+"\tsp2bv [-h] [-?] string \n\n"
+"DESCRIPTION\n\n"
+"\tsp2bv stands for \"system path to bootstrap variable\"."
+" First the system path is converted into a file URL. Then all "
+"characters which have a special meaning in bootstrap variables, "
+"such as \'$\' are escaped. The resulting string is written to "
+"stdout and can be assigned to a bootstrap variable.\n"
+"\n\n"
+"OPTIONS \n\n"
+"\tThe following options are supported: \n"
+"-?\n "
+"--help"
+"Display help information.\n";
int main(int argc, char **argv)
{
if( hasOption("--help",argc, argv) || hasOption("-h", argc, argv))
{
-fprintf(stdout, HELP_TEXT);// default
+fputs(HELP_TEXT, stdout);// default
return 0;
}
if (argc != 2)
{
-fprintf(stdout, HELP_TEXT);
+fputs(HELP_TEXT, stdout);
return -1;
}
[Libreoffice-commits] core.git: cpputools/source emfio/source eventattacher/source hwpfilter/source include/opencl include/unotest include/xmlscript lingucomponent/source opencl/inc pyuno/source regis
cpputools/source/unoexe/unoexe.cxx | 15 +++---
emfio/source/emfuno/xemfparser.cxx |7 +++---
eventattacher/source/eventattacher.cxx | 13 ++--
hwpfilter/source/attributes.cxx |5 ++--
include/opencl/openclconfig.hxx | 21 ++--
include/unotest/macros_test.hxx |5 ++--
include/xmlscript/xml_helper.hxx|5 ++--
lingucomponent/source/thesaurus/libnth/nthesdta.cxx |8 ++-
lingucomponent/source/thesaurus/libnth/nthesdta.hxx |2 -
opencl/inc/opencl_device_selection.h|5 ++--
pyuno/source/module/pyuno_adapter.cxx |5 ++--
pyuno/source/module/pyuno_impl.hxx |2 -
registry/source/keyimpl.cxx |5 ++--
registry/source/keyimpl.hxx |2 -
smoketest/smoketest.cxx | 10 -
store/source/storbase.hxx | 12 +--
testtools/source/bridgetest/multi.cxx |3 +-
17 files changed, 67 insertions(+), 58 deletions(-)
New commits:
commit 1743d74e87745a26043642a06dc8a57b1af29740
Author: Noel Grandin
AuthorDate: Tue May 17 10:50:59 2022 +0200
Commit: Noel Grandin
CommitDate: Sat Aug 13 19:11:49 2022 +0200
clang-tidy modernize-pass-by-value in various
Change-Id: Ie091b22bd77d4e1fbff46545bc86c12f1dbafcfe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138171
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cpputools/source/unoexe/unoexe.cxx
b/cpputools/source/unoexe/unoexe.cxx
index f8e5aa12d492..d4c51e2f40c3 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -46,6 +46,7 @@
#include
#include
#include
+#include
using namespace osl;
using namespace cppu;
@@ -246,16 +247,16 @@ class OInstanceProvider
public:
OInstanceProvider( const Reference< XComponentContext > & xContext,
- const OUString & rImplName, const OUString & rLocation,
- const OUString & rServiceName, const Sequence< Any > &
rInitParams,
- bool bSingleInstance, const OUString & rInstanceName )
+ OUString aImplName, OUString aLocation,
+ OUString aServiceName, const Sequence< Any > &
rInitParams,
+ bool bSingleInstance, OUString aInstanceName )
: _xContext( xContext )
, _bSingleInstance( bSingleInstance )
-, _aImplName( rImplName )
-, _aLocation( rLocation )
-, _aServiceName( rServiceName )
+, _aImplName(std::move( aImplName ))
+, _aLocation(std::move( aLocation ))
+, _aServiceName(std::move( aServiceName ))
, _aInitParams( rInitParams )
-, _aInstanceName( rInstanceName )
+, _aInstanceName(std::move( aInstanceName ))
{}
// XInstanceProvider
diff --git a/emfio/source/emfuno/xemfparser.cxx
b/emfio/source/emfuno/xemfparser.cxx
index d5342edf747f..55b96e31c222 100644
--- a/emfio/source/emfuno/xemfparser.cxx
+++ b/emfio/source/emfuno/xemfparser.cxx
@@ -24,6 +24,7 @@
#include
#include
+#include
#include
#include
#include
@@ -50,7 +51,7 @@ namespace emfio::emfreader
public:
explicit XEmfParser(
-uno::Reference< uno::XComponentContext > const & context);
+uno::Reference< uno::XComponentContext > context);
XEmfParser(const XEmfParser&) = delete;
XEmfParser& operator=(const XEmfParser&) = delete;
@@ -70,8 +71,8 @@ namespace emfio::emfreader
}
XEmfParser::XEmfParser(
-uno::Reference< uno::XComponentContext > const & context):
-context_(context)
+uno::Reference< uno::XComponentContext > context):
+context_(std::move(context))
{
}
diff --git a/eventattacher/source/eventattacher.cxx
b/eventattacher/source/eventattacher.cxx
index 33c41a0f9d03..f344e0cccb0d 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -40,6 +40,7 @@
#include
#include
+#include
namespace com::sun::star::lang { class XMultiServiceFactory; }
@@ -65,7 +66,7 @@ class InvocationToAllListenerMapper : public WeakImplHelper<
XInvocation >
{
public:
InvocationToAllListenerMapper( const Reference< XIdlClass >& ListenerType,
-const Reference< XAllListener >& AllListener, const Any& Helper );
+const Reference< XAllListener >& AllListener, Any Helper );
// XInvocation
virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection()
override;
@@ -107,10 +108,10 @@ static Reference< XInterface > createAllListenerAdapter
// InvocationToAllListenerMapper
InvocationToAllListenerMapper::InvocationToAllListenerMapper
[Libreoffice-commits] core.git: cpputools/source
cpputools/source/unoexe/unoexe.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 8fa40be492f4ae85eb3f0db363bd8d2cf7c214a6
Author: Arnaud Versini
AuthorDate: Wed Mar 30 11:00:10 2022 +0200
Commit: Noel Grandin
CommitDate: Fri Apr 1 10:07:55 2022 +0200
cpputools : use std::mutex instead of osl::Mutex
Change-Id: I75879a0f03d8212ac9392c04fb76113cf24d510e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132300
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cpputools/source/unoexe/unoexe.cxx
b/cpputools/source/unoexe/unoexe.cxx
index b9dca78b67ce..31d6d6bdfac2 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -18,6 +18,7 @@
*/
#include
+#include
#include
#include
@@ -229,7 +230,7 @@ class OInstanceProvider
{
Reference< XComponentContext > _xContext;
-Mutex _aSingleInstanceMutex;
+std::mutex_aSingleInstanceMutex;
Reference< XInterface > _xSingleInstance;
bool _bSingleInstance;
@@ -296,7 +297,7 @@ Reference< XInterface > OInstanceProvider::getInstance(
const OUString & rName )
{
if (! _xSingleInstance.is())
{
-MutexGuard aGuard( _aSingleInstanceMutex );
+std::lock_guard aGuard( _aSingleInstanceMutex );
if (! _xSingleInstance.is())
{
_xSingleInstance = createInstance();
[Libreoffice-commits] core.git: cpputools/source
cpputools/source/unoexe/unoexe.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 77b23d1b5979ce65058f845f73cb48894ba68325
Author: Stephan Bergmann
AuthorDate: Thu Sep 23 07:31:09 2021 +0200
Commit: Stephan Bergmann
CommitDate: Thu Sep 23 10:15:31 2021 +0200
Extend loplugin:stringviewparam to starts/endsWith: cpputools
Change-Id: I016ca2ecf63d62d7799db1098ba0455e337aa3eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122507
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/cpputools/source/unoexe/unoexe.cxx
b/cpputools/source/unoexe/unoexe.cxx
index 2181e850d7fe..34be8e964ca8 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -22,6 +22,7 @@
#include
#include
+#include
#include
#include
#include
@@ -126,11 +127,11 @@ static bool readOption( OUString * pValue, const char *
pOpt,
}
static bool readOption( bool * pbOpt, const char * pOpt,
-sal_uInt32 * pnIndex, const OUString & aArg)
+sal_uInt32 * pnIndex, std::u16string_view aArg)
{
OUString aOpt = OUString::createFromAscii(pOpt);
-if(aArg.startsWith("--") && aOpt == aArg.subView(2))
+if(o3tl::starts_with(aArg, u"--") && aOpt == aArg.substr(2))
{
++(*pnIndex);
*pbOpt = true;
[Libreoffice-commits] core.git: cpputools/source
cpputools/source/unoexe/unoexe.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 057191fb50ea2ae9cca42ef84329581094047db8
Author: Arnaud Versini
AuthorDate: Sun Jul 18 18:04:44 2021 +0200
Commit: Noel Grandin
CommitDate: Mon Jul 26 13:45:34 2021 +0200
cpputools : no need to use fprintf for putting a string
Change-Id: Icb7f0930713d7c9fe2553913dbdc5e36617f856a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119128
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cpputools/source/unoexe/unoexe.cxx
b/cpputools/source/unoexe/unoexe.cxx
index add2d0e4a192..2181e850d7fe 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -67,7 +67,7 @@ static bool s_quiet = false;
static void out( const char * pText )
{
if (! s_quiet)
-fprintf( stderr, "%s", pText );
+fputs( pText, stderr );
}
static void out( std::u16string_view rText )
@@ -75,7 +75,7 @@ static void out( std::u16string_view rText )
if (! s_quiet)
{
OString aText( OUStringToOString( rText, RTL_TEXTENCODING_ASCII_US ) );
-fprintf( stderr, "%s", aText.getStr() );
+fputs( aText.getStr(), stderr );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cpputools/source
cpputools/source/unoexe/unoexe.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1992978aba82cfea23d0dcf79d57676100b1a0d4 Author: Stephan Bergmann AuthorDate: Tue Jun 30 23:00:45 2020 +0200 Commit: Stephan Bergmann CommitDate: Wed Jul 1 07:07:26 2020 +0200 Upcoming improved loplugin:staticanonymous -> redundantstatic: cpputools Change-Id: I301e5008316fcc714b7ce955f8c262a8cbed3f65 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97550 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx index 70a05803902a..e5f6cc927c23 100644 --- a/cpputools/source/unoexe/unoexe.cxx +++ b/cpputools/source/unoexe/unoexe.cxx @@ -77,7 +77,7 @@ static void out( const OUString & rText ) } } -static const char arUsingText[] = +const char arUsingText[] = "\nusing:\n\n" "uno [-c ComponentImplementationName -l LocationUrl | -s ServiceName]\n" "[-u uno:(socket[,host=HostName][,port=nnn]|pipe[,name=PipeName]);;Name\n" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cpputools/source
cpputools/source/sp2bv/sp2bv.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b14fcbba8a7fdc1423209628700ff37d8ff9fb29 Author: Andrea Gelmini AuthorDate: Wed Apr 10 16:04:52 2019 + Commit: Julien Nabet CommitDate: Sat Apr 20 07:53:38 2019 +0200 Fix typo Change-Id: I1032065e6b4dd14ea9aa426375080da416abb180 Reviewed-on: https://gerrit.libreoffice.org/70993 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/cpputools/source/sp2bv/sp2bv.cxx b/cpputools/source/sp2bv/sp2bv.cxx index 27fcbb62297f..5af582002432 100644 --- a/cpputools/source/sp2bv/sp2bv.cxx +++ b/cpputools/source/sp2bv/sp2bv.cxx @@ -35,7 +35,7 @@ static bool hasOption(char const * szOption, int argc, char** argv); " First the system path is converted into a file URL. Then all " \ "characters which have a special meaning in bootstrap variables, " \ "such as \'$\' are escaped. The resulting string is written to " \ -"stdout an can be assigned to a bootstrap variable.\n" \ +"stdout and can be assigned to a bootstrap variable.\n" \ "\n\n" \ "OPTIONS \n\n" \ "\tThe following options are supported: \n" \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cpputools/source
cpputools/source/unoexe/unoexe.cxx | 24 +++-
1 file changed, 15 insertions(+), 9 deletions(-)
New commits:
commit da096e3b0ab93b43c5d33aeed0b90d7fb151f6dc
Author: Matteo Casalin
AuthorDate: Fri Dec 21 18:23:34 2018 +0100
Commit: Matteo Casalin
CommitDate: Fri Dec 28 17:10:16 2018 +0100
Reduce OUString operations and use indexed getToken
Change-Id: I41bc361cbbbf1a446138354eb7bf80729a79bc1f
Reviewed-on: https://gerrit.libreoffice.org/65673
Tested-by: Jenkins
Reviewed-by: Matteo Casalin
diff --git a/cpputools/source/unoexe/unoexe.cxx
b/cpputools/source/unoexe/unoexe.cxx
index c6db2c891db2..8392ace881d0 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -427,16 +427,24 @@ SAL_IMPLEMENT_MAIN()
if (!aUnoUrl.isEmpty()) // accepting connections
{
-sal_Int32 nIndex = 0, nTokens = 0;
-do { aUnoUrl.getToken( 0, ';', nIndex ); nTokens++; } while(
nIndex != -1 );
-if (nTokens != 3 || aUnoUrl.getLength() < 10 ||
-!aUnoUrl.copy( 0, 4 ).equalsIgnoreAsciiCase( "uno:" ))
+if (aUnoUrl.getLength() < 10 ||
!aUnoUrl.startsWithIgnoreAsciiCase( "uno:" ))
+{
+throw RuntimeException("illegal uno url given!" );
+}
+
+sal_Int32 nIndex = 4; // skip initial "uno:"
+bool bTooFewTokens {false};
+const OUString aConnectDescr{ aUnoUrl.getToken( 0, ';', nIndex )
}; // uno:CONNECTDESCR;iiop;InstanceName
+if (nIndex<0) bTooFewTokens = true;
+const OUString aUnoUrlToken{ aUnoUrl.getToken( 0, ';', nIndex ) };
+if (nIndex<0) bTooFewTokens = true;
+const OUString aInstanceName{ aUnoUrl.getToken( 0, ';', nIndex ) };
+
+// Exactly 3 tokens are required
+if (bTooFewTokens || nIndex>0)
{
throw RuntimeException("illegal uno url given!" );
}
-nIndex = 0;
-OUString aConnectDescr( aUnoUrl.getToken( 0, ';', nIndex ).copy( 4
) ); // uno:CONNECTDESCR;iiop;InstanceName
-OUString aInstanceName( aUnoUrl.getToken( 1, ';', nIndex ) );
Reference< XAcceptor > xAcceptor = Acceptor::create(xContext);
@@ -454,8 +462,6 @@ SAL_IMPLEMENT_MAIN()
xContext, aImplName, aLocation, aServiceName, aInitParams,
bSingleInstance, aInstanceName ) );
-nIndex = 0;
-OUString aUnoUrlToken( aUnoUrl.getToken( 1, ';', nIndex ) );
// coverity[loop_top] - not really an infinite loop, we can be
instructed to exit via the connection
for (;;)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cpputools/source framework/inc framework/source hwpfilter/source i18nlangtag/source include/cppuhelper include/ucbhelper jurt/com l10ntools/source odk/examples offapi/c
cpputools/source/unoexe/unoexe.cxx|2 +-
framework/inc/jobs/configaccess.hxx |2 +-
framework/inc/macros/registration.hxx |2 +-
framework/inc/threadhelp/transactionbase.hxx |2 +-
framework/source/classes/taskcreator.cxx |2 +-
framework/source/helper/oframes.cxx |2 +-
framework/source/uielement/menubarmanager.cxx |2 +-
hwpfilter/source/hwpreader.hxx|2 +-
i18nlangtag/source/languagetag/languagetag.cxx|2 +-
include/cppuhelper/component_context.hxx |2 +-
include/cppuhelper/factory.hxx|2 +-
include/ucbhelper/registerucb.hxx |6 +++---
jurt/com/sun/star/comp/servicemanager/ServiceManager.java |4 ++--
l10ntools/source/xrmmerge.cxx |2 +-
odk/examples/DevelopersGuide/Drawing/CustomShowDemo.java |4 ++--
odk/examples/java/ConverterServlet/ConverterServlet.java |2 +-
odk/examples/java/Inspector/TestInspector.java|2 +-
odk/examples/java/NotesAccess/NotesAccess.java|2 +-
odk/examples/java/Spreadsheet/ChartTypeChange.java|4 ++--
odk/examples/java/Text/GraphicsInserter.java |2 +-
offapi/com/sun/star/script/vba/VBAScriptEventId.idl |2 +-
oox/source/vml/vmldrawing.cxx |2 +-
qadevOOo/tests/java/ifc/awt/_XTopWindow.java |2 +-
qadevOOo/tests/java/ifc/uno/_XComponentContext.java |2 +-
sfx2/source/appl/appserv.cxx |2 +-
ucb/source/core/ucbcmds.cxx |6 +++---
ucb/source/ucp/hierarchy/hierarchycontent.cxx |2 +-
ucb/source/ucp/hierarchy/hierarchydatasource.cxx |4 ++--
ucb/source/ucp/package/pkgcontent.cxx |2 +-
ucb/source/ucp/tdoc/tdoc_content.cxx |4 ++--
ucb/source/ucp/tdoc/tdoc_docmgr.cxx |2 +-
uui/source/iahndl.cxx |2 +-
uui/source/iahndl.hxx |2 +-
vcl/unx/gtk/a11y/atkfactory.cxx |4 ++--
wizards/com/sun/star/wizards/common/FileAccess.java |2 +-
wizards/com/sun/star/wizards/common/FileAccess.py |2 +-
36 files changed, 46 insertions(+), 46 deletions(-)
New commits:
commit 146033f5da8ee588c9a4dda93aba64477e174541
Author: Noel Grandin
Date: Mon Jun 5 09:17:37 2017 +0200
spelling instanciate -> instantiate
Change-Id: Ic1393da64328c0dc7e2860334b204139bf537d81
Reviewed-on: https://gerrit.libreoffice.org/38401
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/cpputools/source/unoexe/unoexe.cxx
b/cpputools/source/unoexe/unoexe.cxx
index dc7cb5d8cabc..855dea236836 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -427,7 +427,7 @@ SAL_IMPLEMENT_MAIN()
xContext = defaultBootstrap_InitialComponentContext();
-// accept, instanciate, etc.
+// accept, instantiate, etc.
if (!aUnoUrl.isEmpty()) // accepting connections
{
diff --git a/framework/inc/jobs/configaccess.hxx
b/framework/inc/jobs/configaccess.hxx
index b705b910d652..54fb27285782 100644
--- a/framework/inc/jobs/configaccess.hxx
+++ b/framework/inc/jobs/configaccess.hxx
@@ -59,7 +59,7 @@ class FWI_DLLPUBLIC ConfigAccess final
/**
reference to the uno service manager
-It's necessary to instanciate own needed services.
+It's necessary to instantiate own needed services.
*/
css::uno::Reference< css::uno::XComponentContext > m_xContext;
diff --git a/framework/inc/macros/registration.hxx
b/framework/inc/macros/registration.hxx
index 0e072e27a9d9..d65d8d12e305 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -49,7 +49,7 @@
}
// public
-// define method to instanciate new services
+// define method to instantiate new services
#define COMPONENTGETFACTORY( LIB, IFFACTORIES )
\
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL LIB##_component_getFactory(
const sal_Char* pImplementationName, \
diff --git a/framework/inc/threadhelp/transactionbase.hxx
b/framework/inc/threadhelp/transactionbase.hxx
index 5ebaf770a0f8..71e4195dedd4 100644
--- a/framework/inc/threadhelp/transactionbase.hxx
+++ b/framework/inc/threadhelp/transactionbase.hxx
@@ -25,7 +25,7 @@
namespace framework{
/*-
[Libreoffice-commits] core.git: cpputools/source include/sal
cpputools/source/unoexe/unoexe.cxx | 24 +++-
include/sal/log-areas.dox |5 +
2 files changed, 8 insertions(+), 21 deletions(-)
New commits:
commit 2e0c1e03e85ef6a20ca362f263c60b141741f698
Author: Rohan Kumar
Date: Fri Mar 11 18:25:32 2016 +0530
tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals
I replaced OSL_DEBUG_LEVEL > 1 with OSL_DEBUG_LEVEL > 0
and made sure that it doesn't break the build
Change-Id: I9febeed949a24d7bc5afb13dedde03fd812b5b20
Reviewed-on: https://gerrit.libreoffice.org/23077
Reviewed-by: Björn Michaelsen
Tested-by: Björn Michaelsen
diff --git a/cpputools/source/unoexe/unoexe.cxx
b/cpputools/source/unoexe/unoexe.cxx
index 806e7a1..a8ddbdf 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -109,13 +109,7 @@ static bool readOption( OUString * pValue, const sal_Char
* pOpt,
}
else
{
-#if OSL_DEBUG_LEVEL > 1
-out( "\n> identified option -" );
-out( pOpt );
-out( " = " );
-OString tmp = OUStringToOString(aArg, RTL_TEXTENCODING_ASCII_US);
- out( tmp.getStr() );
-#endif
+SAL_INFO("cpputools.unoexe", "> identified option -" << pOpt << "
= " << aArg);
++(*pnIndex);
return true;
}
@@ -123,13 +117,7 @@ static bool readOption( OUString * pValue, const sal_Char
* pOpt,
else if (aArg.indexOf(aOpt) == 1)
{
*pValue = aArg.copy(1 + aOpt.getLength());
-#if OSL_DEBUG_LEVEL > 1
-out( "\n> identified option -" );
-out( pOpt );
-out( " = " );
-OString tmp = OUStringToOString(aArg.copy(aOpt.getLength()),
RTL_TEXTENCODING_ASCII_US);
-out( tmp.getStr() );
-#endif
+SAL_INFO("cpputools.unoexe", "> identified option -" << pOpt << " = "
<< aArg);
++(*pnIndex);
return true;
@@ -146,10 +134,7 @@ static bool readOption( bool * pbOpt, const sal_Char *
pOpt,
{
++(*pnIndex);
*pbOpt = true;
-#if OSL_DEBUG_LEVEL > 1
-out( "\n> identified option --" );
-out( pOpt );
-#endif
+SAL_INFO("cpputools.unoexe", "> identified option --" << pOpt);
return true;
}
return false;
@@ -557,9 +542,6 @@ SAL_IMPLEMENT_MAIN()
if (xComp.is())
xComp->dispose();
-#if OSL_DEBUG_LEVEL > 1
-out( "\n" );
-#endif
return nRet;
}
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 207f843..e76e948 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -100,6 +100,11 @@ certain functionality.
@li @c cppuhelper
@li @c cppuhelper.shlib
+@section cpputools
+
+@li @c cpputools
+@li @c cpputools.unoexe
+
@section cui
@li @c cui.customize
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
