wangxin/loongoffice
1
0
Fork 0
forked from amazingfate/loongoffice
Code Pull Requests Activity
419,897 Commits 5 Branches 0 Tags
ff6def51db86ea2a516739f2dd67f24fa024af4e
Commit Graph

515 Commits

Author SHA1 Message Date
Mike Kaganski
acb3eeb6c2 cli_ure: MSVC: pragma warning: make more specific, remove obsolete 
Change-Id: I63e12a22a46de27a8bd010e4d21bf36d3a7e9178
Reviewed-on: https://gerrit.libreoffice.org/48967
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
 2018-02-01 06:45:58 +01:00
Andrea Gelmini
624f84c07e Fix typos 
Change-Id: I078626eaa3155cc429320cc8c1532003b382b22a
Reviewed-on: https://gerrit.libreoffice.org/47855
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
 2018-01-16 12:40:51 +01:00
Michael Stahl
9673dbf3a1 tdf#113787: always require version file with config for CLI assemblies 
The CliUnoApi_oootypes does not use the same version file as everything
else, so pass that in as a parameter.
 2017-11-24 01:27:37 +01:00
Andrea Gelmini
7bcb66baec Fix typos 
Change-Id: Id2f90d4798ded8f10ef559f434977870e2eab07a
Reviewed-on: https://gerrit.libreoffice.org/44709
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
 2017-11-14 20:26:54 +01:00
Noel Grandin
2c05d758b2 add << operator for css::uno::Exception 
Change-Id: Ia23dafd07133779144965682df3b7125a3214235
Reviewed-on: https://gerrit.libreoffice.org/43046
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
 2017-10-04 15:18:00 +02:00
Andrea Gelmini
e44c188a73 Fix typos 
Change-Id: I879a52820d78d9151ef64dd21612379f617f66e2
Reviewed-on: https://gerrit.libreoffice.org/42726
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
 2017-09-25 12:20:56 +02:00
Mike Kaganski
eef4c133e9 Windows: avoid dependence on UNICODE define; prefer W functions 
Change-Id: I95b90128e93f0d88ed73601bcc5a7ca9279d4cf1
Reviewed-on: https://gerrit.libreoffice.org/42560
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
 2017-09-22 20:53:30 +02:00
Mike Kaganski
aaa26a58ba Some more WIN32_LEAN_AND_MEAN 
Change-Id: Iadb0ebb66809c192fb817b8c7cf2f8cdb4d0b874
Reviewed-on: https://gerrit.libreoffice.org/42419
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
 2017-09-18 19:24:31 +02:00
Andrea Gelmini
64a3124d92 Fix typos 
Change-Id: Iaa9c0aea3ea1a239e378bd714ba335f91bb1faf3
Reviewed-on: https://gerrit.libreoffice.org/41194
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
 2017-08-17 21:53:28 +02:00
Michael Stahl
17192ce558 tdf#108709 cli_ure,unoil: bump CLI assembly versions for 5.4 
perl cli_ure/source/scripts/increment_version.pl cli_ure/version/version.txt cli_ure/version/incversions.txt temp.txt && mv temp.txt cli_ure/version/version.txt

perl cli_ure/source/scripts/increment_version.pl unoil/climaker/version.txt unoil/climaker/incversions.txt temp.txt && mv temp.txt unoil/climaker/version.txt

Change-Id: Iaea028fc345d090317f7ebf128b683b4643a1093
 2017-08-16 15:35:09 +02:00
Michael Stahl
e0487a1129 cli_ure,unoil: always increment all CLI assembly version numbers 
There is a increment_version.pl, which uses the incversions.txt
to increment the CLI version numbers.

But it first checks that there are new published UNO types,
and exits if there are none. Not sure where the input for that
is supposed to come from.

But the OOo docs claim that all version numbers have to be
incresed for every release to work around some MSI issue,
so change the script to do that and add an incversion.txt
in unoil too.

http://www.openoffice.org/udk/common/man/spec/assemblyversioning.html
https://support.microsoft.com/en-us/help/905238/an-assembly-in-the-global-assembly-cache-or-sxs-is-missing-after-you-p

Change-Id: I6190b53d1a3ff00b9fe014f86f7ec8cddef9904e
 2017-08-16 15:35:09 +02:00
Noel Grandin
5e028ad5dc simplify some string handling in tracing calls 
Change-Id: I0fb76562429e691400a02216019c7f96791cf9b3
Reviewed-on: https://gerrit.libreoffice.org/39159
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
 2017-06-23 14:38:14 +02:00
Jochen Nitschke
a5dba7dbec remove unused osl/mutex.hxx includes 
Change-Id: I3b50e45fdb99e9cd8bfda07356ee3ddb4dd0f8bb
Reviewed-on: https://gerrit.libreoffice.org/38905
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
 2017-06-18 13:38:25 +02:00
Johnny_M
2c3f58eff2 Translate German comments and debug strings (leftovers in dirs a... to c...) 
Translates all (leftovers) found using a custom regex, in directories not
shown by /bin/find-german-comments and beginning with "a" to "c".

Change-Id: I3b0152ee78ad80a29d714cbd98bf888f31be4763
Reviewed-on: https://gerrit.libreoffice.org/37573
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
 2017-05-15 15:27:52 +02:00
Noel Grandin
68e213319f remove empty comments 
found with:
   git ls-files | xargs grep -Pzl '/\*\*
(\*|\s|
)*\*/'

Change-Id: I1f47bcb94d5a7b290a6c622c6941195fbb578597
Reviewed-on: https://gerrit.libreoffice.org/37159
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
 2017-05-03 09:07:36 +02:00
Chris Sherlock
da64d198ec tools: svstream.hxx needs only errcode.hxx & not errinf.hxx 
Change-Id: Ia28e35ae5af4f601e9a586a3deffbcd61702b0ca
Reviewed-on: https://gerrit.libreoffice.org/36896
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
 2017-04-25 09:31:31 +02:00
David Ostrovsky
de030cd7a2 gbuild: Remove MSVC 2013 legacy code 
Uwinapi is discontinued.

Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01
Reviewed-on: https://gerrit.libreoffice.org/23198
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
 2017-04-21 18:18:44 +02:00
Stephan Bergmann
de82b32c4a Clean up uses of SAL_U/SAL_W: cli_ure 
Change-Id: I198be4023710206d66135c33fe01e1d9bb859272
 2017-04-10 10:14:11 +02:00
Stephan Bergmann
9ac98e6e34 Finally switch MSVC to sal_Unicode = char16_t, too 
There is lots of (Windows-only) code that relied on sal_Unicode being the same
as wchar_t, and the best change may be different in each case (and doing the
changes may be somewhat error prone).  So for now add SAL_U/SAL_W scaffolding
functions to sal/types.h, remove their uses one by one again, and finally drop
those functions again.

Change-Id: I2cc791bd941d089901abb5f6fc2f05fbc49e65ea
Reviewed-on: https://gerrit.libreoffice.org/36077
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
 2017-04-04 16:12:11 +00:00
Michael Stahl
cfaba15c58 cli_ure: fix another bad _WIN64 check (related tdf#94265) 
Same problem as commit 2aa20cfb7a11dd8d86372af4065a5887a0b752ca

Change-Id: I02160c53870a021c742babf358e0d6172557ef21
 2017-03-29 12:56:59 +02:00
ComputingDwarf
3b2863596f tdf#94265: Correct the error 
Always _WIN32 is defined, even in Win64. So the check must be to _WIN64 and then to _WIN32.
Hope no more lines like this in code.
Can you test programs with SDK 64 Bit?
 2017-03-22 11:20:24 +01:00
Andrea Gelmini
6fab286b2a Fix typos 
Change-Id: I4f16ba5fc32cbfd6a5b01e495f3ad905da193524
Reviewed-on: https://gerrit.libreoffice.org/34808
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
 2017-03-03 07:42:39 +00:00
Stephan Bergmann
0a99b5a1b7 When building with clang-cl on Windows, build CLR code with MSVC 
...as clang-cl doesn't support the /clr switch.

* In configure.ac, capture the MSCV version (that would be used if CC hadn't
  been overridden to use clang-cl) into MSVC_CXX.

* The logic which flags to pass into gb_CObject__command_pattern is coded into
  the platform-agnostic LinkTarget.mk, so it's too late to try and filter all
  relevant flags in com_GCC_class.mk, depending on whether a given .cxx file is
  a normal one built with the normal $CXX or a special /clr one built with
  $MSVC_CXX.  Thus, a new CxxClrObject class had to be introduced that captures
  this information early.

* When building with clang-cl, the generated config_host/config_*.h files
  contain values suitable for clang-cl, but not for MSVC.  But the .cxx files
  compiled with MSVC happen to include config_global.h, and would fail.  Hack
  around that problem for now by introducing a hard-coded, minimal
  solenv/clang-cl/config_global.h that is found first when buliding such a
  CxxClrObject.  Needs cleaning-up properly.

Change-Id: Iff8aac51c0b4fa906b14503c692640dda0996d33
Reviewed-on: https://gerrit.libreoffice.org/34509
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
 2017-02-21 10:18:58 +00:00
Tor Lillqvist
6de3688cc6 Drop :: prefix from std in c*/ 
Change-Id: If078cda95fa6ccd37270a5e9d81cfa0b84e71155
Reviewed-on: https://gerrit.libreoffice.org/34324
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
 2017-02-15 23:01:23 +00:00
Stephan Bergmann
22f96dad08 Some simplifications, using UNO_QUERY_THROW 
Change-Id: I3d29240b7a3aa1d8941ca97f3c3e941e884cbf8b
Reviewed-on: https://gerrit.libreoffice.org/34272
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
 2017-02-15 14:19:23 +00:00
Jochen Nitschke
a29bd2dabb cleanup tailing backslashes 
Change-Id: Idb4bfc97e7d758c58118742affd9a9345c7a99f2
Reviewed-on: https://gerrit.libreoffice.org/32491
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
 2016-12-30 18:48:24 +00:00
Noel Grandin
c3586b684c OSL_TRACE->SAL in chart2..oox 
Change-Id: I133a6441824bfbefcfcda130119b5c5d706f86b2
Reviewed-on: https://gerrit.libreoffice.org/31907
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
 2016-12-13 06:12:00 +00:00
Stephan Bergmann
6b51e526b7 "// not impl" -> "= delete" 
Change-Id: Ide848d53564a4c4f822ae3875102ee09f03e3ce5
Reviewed-on: https://gerrit.libreoffice.org/29232
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
 2016-09-23 16:29:08 +00:00
Markus Mohrhard
62c047ffb3 switch to EHs on windows 
This seems to be a good idea based on several discussions
in the project. In the end catching SEH exceptions is just
going to cause strange platform dependent bahavior.

This patch is based on on
http://thread.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/39102/focus=55516
and includes some additional cleanup of the sal signal code.

Change-Id: Iedc998e37e6495afec445eccb60fa1c2b1a7defd
Reviewed-on: https://gerrit.libreoffice.org/26497
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
 2016-06-20 15:18:45 +00:00
Andrea Gelmini
d15163eceb Fix typos 
Change-Id: Ideafa411b53fe4a5f2e6559be10c4cb82b58a256
Reviewed-on: https://gerrit.libreoffice.org/24543
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
 2016-05-01 09:46:27 +00:00
Noel Grandin
2087484c65 use consistent #define checks for the Windows platform 
stage 2 of replacing usage of various checks for the windows platform
with the compiler-defined '_WIN32' macro

In this stage we focus on replacing usage of the WIN macro

Change-Id: Ie8a4a63198a6de96bd158ecd707dadafb9c8ea84
Reviewed-on: https://gerrit.libreoffice.org/22393
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
 2016-02-17 11:33:57 +00:00
Chris Sherlock
a238b1f8d3 Remove excess newlines 
A ridiculously fast way of doing this is:

for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
  --exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
    perl -0777 -i -pe 's/^
{3,}/

/gm' $i
done

Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
 2016-02-09 08:18:05 +00:00
Andrea Gelmini
64d624b651 Fix typos 
Change-Id: I9a5940027423ff0791fa7da0b79b617412ce6b86
Reviewed-on: https://gerrit.libreoffice.org/21209
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-01-10 14:17:20 +00:00
Andrea Gelmini
597e694e7e Fix typos 
Change-Id: I90b04b8eda6fc3d530c9db72052720cbe9de0343
Reviewed-on: https://gerrit.libreoffice.org/21197
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
 2016-01-07 12:29:04 +00:00
Michael Stahl
867ead5fc7 cli_ure: fix build 
Change-Id: Ib35a951ea813151ca330c3eb2286cbada91bd972
 2015-11-02 23:59:43 +01:00
Benjamin Ni
be729e7721 tdf#94269: Replace "n" prefix for bool variables with "b" 
Change-Id: I178545792c7354a362658ac7ef8b1d4cf0865797
Signed-off-by: Michael Stahl <mstahl@redhat.com>
 2015-11-02 23:40:57 +01:00
Noel Grandin
1716b3a338 remove some useless comments 
found with git grep '// /'

Change-Id: I948cf9ae61bbbf2ec706ca5b0572c4f27c58c745
 2015-10-13 10:07:49 +02:00
Michael Stahl
01518d3aa0 cli_ure: climaker should open keyfile read-only 
This should fix build failures due to file locking preventing concurrent
access to cli_ure/source/cliuno.snk.

Change-Id: Iefd16ed83a01523b3612844c2f777516dc4e44c6
 2015-10-06 21:12:24 +02:00
Andrea Gelmini
ce343470c3 Fix typos 
Change-Id: Iaff7e38dd5beac48e1643e369e4240aa736c35ea
Reviewed-on: https://gerrit.libreoffice.org/18941
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
 2015-09-30 06:00:18 +00:00
David Ostrovsky
5e86f24392 uno bridge: Prevent collision between cli::array and std::array 
Change-Id: I23b0c0c6ec58dc2ff9ca266dd7f5ba00d1f8efab
Reviewed-on: https://gerrit.libreoffice.org/18519
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
 2015-09-13 05:35:12 +00:00
David Ostrovsky
fd27553f38 climaker: Fix std::array and cli::array collision 
Change-Id: I7b4815b4b7e8f016ce7a9047c77a6dde46b1ee0a
Reviewed-on: https://gerrit.libreoffice.org/18320
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
 2015-09-03 21:26:13 +00:00
Stephan Bergmann
cbce40e965 Make content of OSL_ASSERT, DBG_ASSERT, etc. visiblie in non-debug builds 
...to avoid lots of loplugin:staticmethods warnings.  Also enables DBG_ASSERT
etc. also for --enable-debug builds in addition to --enable-dbgutil builds.

Change-Id: Ib89ecd9ab8ce7abb2c64790ace248b31f9d2b64d
 2015-07-13 18:14:11 +02:00
Andrea Gelmini
ffa8892c5a Fix typos 
Change-Id: I75b4ad61785bf0ba1cb07735d938c0977356b8cc
Reviewed-on: https://gerrit.libreoffice.org/16705
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
 2015-07-04 10:23:17 +00:00
Andrea Gelmini
c3c45ff7ef Fix typos 
Change-Id: Id05ea8cf8aed878bedfe73c274df3c67b64bad37
Reviewed-on: https://gerrit.libreoffice.org/16263
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
 2015-06-15 06:53:19 +00:00
Andrea Gelmini
5b1337f7b2 tdf#62475: partial handmade fixes 
Change-Id: Ib9af202c43b916b9af4b4e18db35d470a8692fe4
Reviewed-on: https://gerrit.libreoffice.org/15712
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
 2015-05-15 17:55:15 +00:00
Stephan Bergmann
2fc4a8c811 Add support for cppu::UnoType<void> 
Change-Id: I88259ffaffc73979c240721d2db166c79d3085f1
 2015-04-01 12:48:44 +02:00
Stephan Bergmann
916f88f085 Replace remaining getCppuType et al with cppu::UnoType 
Change-Id: Iadbbc005ee8bdbf3f33fd291deef376c8adab806
 2015-04-01 08:35:48 +02:00
Stephan Bergmann
50b02731ca Replace scary reinterpret_casts with OUString::unacquired 
...and actually fix some of them

Change-Id: I3493ceb65f305466d167304bd77058adb042067c
 2015-03-30 12:55:22 +02:00
Krisztian Pinter
f863d2602f fdo#57950 Replace chained append() with operator+ 
Replaced all in cli_ure

Change-Id: I144542f386fe26444c290edd9e23b26cb07941a6
Reviewed-on: https://gerrit.libreoffice.org/15040
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
 2015-03-30 09:55:37 +00:00
Julien Nabet
b33788cb6b Typos 
Change-Id: I665a56fcad10e136e949a10497f6ab8813af9968
 2015-03-25 21:19:59 +01:00