Age | Commit message (Collapse) | Author | Files | Lines |
|
(cherry picked from commit ccf0f7ef03bf98831a3e21b4b1327673a590b918)
Change-Id: I4985249110da93ba67881dcd1c8cd1dc66ae08e2
Reviewed-on: https://gerrit.libreoffice.org/8379
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: I98398a3cd7a86a5f31c711f7f1cff0d467a1d2e5
(cherry picked from commit eb07ab05c3b8774ab2b2059befef0eadf61c97d6)
Reviewed-on: https://gerrit.libreoffice.org/7901
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
3af99e4d59d89c343965a928681a30f36b1007d2 "convert equalsAsciiL calls to
startsWith calls" should rather have converted to oprator ==.
(cherry picked from commit a3f32769fc4bb23c64168b412dd10ec769a3854d)
Conflicts:
sc/source/ui/unoobj/nameuno.cxx
sc/source/ui/unoobj/styleuno.cxx
sfx2/source/appl/sfxhelp.cxx
stoc/source/security/permissions.cxx
sw/source/core/unocore/unocrsrhelper.cxx
(None of those bogus startsWith calls seem problematic enough to warrant
backporting also to libreoffice-4-2-0.)
Change-Id: Id4a8836c5d6d570e54661c40be7214632e202b21
Reviewed-on: https://gerrit.libreoffice.org/7578
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
It's the isCustom field that should be checked to see whether the
customAttribute field has been assigned or not.
Change-Id: I5d2af26b675ab0cbc0e1844eb98ebaf5145eb73d
Reviewed-on: https://gerrit.libreoffice.org/7417
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
make packageinfo target
add uiconfig file translations
add missing l10n config files
add missing help files in packageinfo
Reviewed-on: https://gerrit.libreoffice.org/6754
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Conflicts:
helpcontent2
translations
a2498a118e729276a78ef3a4eb43b5d0b302d326
9bb39bdd677af4be0da621370c51eb9e22ecc33f
a7e654cdeffd832f51016ff51aa180fe3924ff4e
4ee41fdb600cb3a89da387dffe64e6a30192761c
349fb24a388775c58be7a326832b3fc0ec38180f
8a2ca73c02fd6b04ce60e7701c51d2362ef7ec06
Change-Id: Id5f6f5c1f3e46df2d9033ccd5bbf2af6ab38a9e8
Reviewed-on: https://gerrit.libreoffice.org/6982
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
|
|
Change-Id: If37ef9f68711da3a0aa9a3ba59b111a8a23421df
|
|
In commit 363cc397172f2b0a94d9c4dc44fc8d95072795a3
"convert equalsAsciiL calls to startWith calls where possible"
I incorrectly converted equalsAsciiL calls to startsWith calls.
This commit fixes those places to use the == OUString operator.
Change-Id: If76993baf73e3d8fb3bbcf6e8314e59fdc1207b6
Reviewed-on: https://gerrit.libreoffice.org/7008
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
This reverts commit acebbee971136e6ee0a7bc75bd57d937d6e1c295.
I mistakenly converted OUString::equalsL calls to OUString::startsWith
calls.
|
|
* Windows XP SP2 is 0x0502, see
http://msdn.microsoft.com/en-us/library/aa383745.aspx
* If a module changes the Windows SDK version setting,
this is done module wide now. So the overall behavior
is as before. This seems to be the best compromise for
now.
* We need at least SP2 because of the bluetooth stuff
used in sd/source/ui/remotecontrol.
* Now, we require at least Internet Explorer 7.0. IE6
has been outdated for a long time.
* Leave StdAfx.h file definitions, as those are Microsoft
project specific precompiled header files.
* All local definitions of WINVER are removed, because
the global WINVER setting makes them obsolete now.
To the relation of the three macros:
Setting _WIN32_WINNT sets WINVER and NTDDI_VERSION
automatically to the same value as _WIN32_WINNT.
WINVER and NTDDI_VERSION can be set idenpendently each
for itself.
Change-Id: Ibcc12493aae4fcaf7bcfda88be99c1b61bc326cb
Reviewed-on: https://gerrit.libreoffice.org/6496
Reviewed-by: Thorsten Behrens <thb@documentfoundation.org>
Tested-by: Thorsten Behrens <thb@documentfoundation.org>
|
|
Convert code like:
if (aValue.matchL(RTL_CONSTASCII_STRINGPARAM("BOOL=")))
to:
if (aValue.startsWith("BOOL="))
Change-Id: I385d10fd486d6a3e5f81f4a28088d913fc2f0d26
|
|
Convert code like:
if (aByteStr.equalsL(RTL_CONSTASCII_STRINGPARAM("rem")))
to:
if (aByteStr.startsWith("rem"))
Change-Id: I09e40b3fdc87d59a8176c2a5f39cc6aa5cf5a576
|
|
Convert code like:
OStringBuffer aKeyName(RTL_CONSTASCII_STRINGPARAM("NDX"));
to:
OStringBuffer aKeyName("NDX");
which compiles down to the same code
Change-Id: If9c96a290bc18cc8285fb733f27be58c6958b63c
|
|
Convert code like:
OString aKeyName(RTL_CONSTASCII_STRINGPARAM("NDX"));
to:
OString aKeyName("NDX");
which compiles down to the same code
Change-Id: I1780264cae4484fc78f0586b0750c09f2dce135f
|
|
Convert code like:
aStrBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ln(x)" ));
to:
aStrBuf.append( "ln(x)" );
which compiles down to the same code.
Change-Id: I24c7cb45ceb32fd7cd6ec7ed203c2a5d746f1c5c
|
|
Convert code like:
aStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ActiveConnection" ) )
to
aStr.startsWith( "ActiveConnection" )
which compiles down to the same machine code.
Change-Id: Id4b0c5e0f9afe716a468d3afc70374699848dc33
|
|
Simplify code like:
aStr.equalsAsciiL( "%", 1 )
to
aStr.startsWith( "%" )
Change-Id: Iee0e4e60b0ae6d567fa8f72db5d616fffbec3c00
|
|
change code like
aStr = OUString("xxxx");
to
aStr = "xxxx";
Change-Id: Ib981a5cc735677ec5dba76ef9279a107d22e99d4
|
|
This is largely unnecessary when working with OUString
Change-Id: I3cf4d68357a43665d01162ef4a2d5346a45da9be
|
|
Change-Id: I9058044d13f696e07667dce706f6c311af6dbea0
|
|
- this renames the 'almost' module target to non-l10n
- and adds a l10n target which is intended to only build l10n parts of
the product
- packagers should then be able to build l10n and non-l10n parts of the
product independently, thus:
- enable quicker rebuilds
- distribution of load
- updates to l10n without a full rebuild
- security fixes to binaries without rebuilding all l10n
- the new targets are called build-l10n-only and build-non-l10n-only
- note this is not intended to move a concept of split packages
upstream -- while this exsists in distros, the number of test
scenarios for this would explode upstream
Change-Id: Ib8ccc9bc52718d9b0ebbfee76ad93dc29c260863
Conflicts:
filter/Module_filter.mk
|
|
Change-Id: Ie738ad2c055b0e380a67c4d199e006fb99155e7c
|
|
Change-Id: Ibf04062ca86ed866202d748c3b62a210d30ed6ec
|
|
Convert code like
aStr.compareToAscii("XXX") == 0
to
aStr.equalsAscii("XXX")
which is both easier to read and faster.
Change-Id: I448abf58f2fa0e7715dba53f8e8825ca0587c83f
|
|
Convert code like
if( ! aStr.compareToAscii("XXX") )
to
if( aStr.equalsAscii("XXX") )
which is both clearer and faster.
Change-Id: I267511bccab52f5225b291acbfa4e388b5a5302b
|
|
Convert code like:
0 == aStr.compareToAscii("XXX")
to
aStr.equalsAscii("XXX")
which is both clearer and faster.
Change-Id: I2e906d7d38494db38eb292702fadb781b1251e07
|
|
Change-Id: Idf73eb831f52d4d74e6fbb6ea27f59ebbfd13a8c
|
|
And use some templates inside include/com/sun/star/uno/Sequence.hxx
Change-Id: I48875fa1517751fc4cb0cf2b6c08b88975a29b47
Reviewed-on: https://gerrit.libreoffice.org/6599
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
|
|
Converts code that calls comphelper::string::getTokenCount() to
use sal_Int32 to store the return value.
Change-Id: I439605a39d29b1309649e30f3ff40dfa412efcde
|
|
Convert code like:
if( aStr == OUString("xxxx") )
to this:
if( aStr == "xxxx" )
Change-Id: I8d201f048477731eff590fb988259ef0935c080c
|
|
This also means that this code now gets bounds checked in debug builds.
Change-Id: Id777f85eaee6a737bbcb84625e6e110abe0e0f27
|
|
This is both an optimisation and a cleanup.
This converts code like
aStr.indexOf("XX") == 0
to
aStr.startsWith("XX")
and converts code like
aStr.lastIndexOf("XXX") == aStr.getLength() - 3
to
aStr.endsWith("XXX")
Note that in general
aStr.lastIndexOf("X") == aStr.getLength() - 1
converts to
aStr.isEmpty() || aStr.endsWith("X")
so I used the surrounding context to determine if aStr could be empty
when modifying the code.
Change-Id: I22cb8ca7c2a4d0288b001f72adb27fd63af87669
|
|
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
|
|
As the system gtk libraries may depend on later versions of libcairo.so.2 and
its bring-along libpixman-1.so.0 with the same SONAMEs. So if it would ever
happen at runtime that our bundled libcairo.so.2 and/or libpixman-1.so.0 get
loaded before the system ones, the system gtk would probably not work correctly.
Ultimately, the bundled cairo can probably go completely.
This reverts 122a137672d761418a549568ad8cad623dd2b4b5 "extensions: crude hack
for mysterious cairo link failure."
As discussed at #libreoffice-dev:
Oct 24 10:10:15 <mst__> sberg, caolan, dtardon any idea what the proper fix is
for pluginapp.bin? 122a137672d761418a549568ad8cad623dd2b4b5 breaks on RHEL5
tinderbox...
Oct 24 10:10:17 <IZBot> core - extensions: crude hack for mysterious cairo link
failure -
http://cgit.freedesktop.org/libreoffice/core/commit/?id=122a137672d761418a549568ad8cad623dd2b4b5
Oct 24 10:12:53 <dtardon> mst__, i'd try
gb_Executable_use_external,pluginapp.bin,cairo
Oct 24 10:13:58 <mst__> dtardon, i'm not sure if that is the intent - the
-lcairo comes from the gtk external so we should use same cairo as gtk i.e.
system one? but id on't understand why linker won't find the pixman library
Oct 24 10:16:35 <sberg> mst__, I get no build failures in "make
extensions.clean && make extensions" when I comment out that FIXME in
extensions/Executable_pluginapp.bin.mk
Oct 24 10:18:59 <mst__> sberg, it only started to fail for me when i removed
libcairo.so from solver, probably you still have a stale one
Oct 24 10:19:42 <sberg> mst__, in solver/*/lib/? no
Oct 24 10:20:48 <sberg> mst__, but turns out I'm using --with-system-cairo (as
required by --enable-gtk3), so ignore me
Oct 24 10:22:53 <mst__> sberg, so if i rm solver/unxlngx6/lib/*cairo*
solver/unxlngx6/lib/*pixman* it still fails for me, how could system-cairo
work then?
Oct 24 10:24:13 <sberg> mst__, in that /usr/lib64/libcairo.so has a DT_NEEDED on
libpixman-1.so.0 (which "our" libcairo.so is missing, I'd assume)
Oct 24 10:24:44 <sberg> mst__, erm
Oct 24 10:41:18 <mst__> sberg, so if i filter out -lcairo in
gb_LinkTarget__use_gtk then it magically works - are there any problems with
that approach?
Oct 24 10:47:19 <sberg> mst__, so the root of the problem is that there's two
different libcairo involved? (just doing a local build --wihtout-system-cairo
here, to see what's going on)
Oct 24 10:47:55 <mst__> sberg, i don't think so since i get same problem after
removing all cairo libs from solver
Oct 24 11:12:11 <sberg> mst__, so the link line for pluginapp.bin contains
-lcairo twice, apparently dragged in indirectly (via _use_externals gthread
and gtk, likely), and does not contain "our" -L.../cairo/src/.libs (as it
doesn't _use_externals cairo), but does contain -Lsolver/*/lib. Now,
/usr/lib64/libcairo.so needs libpixman-1.so.0 and there happens to be one in
solver/*/lib that lacks syms compared to /usr/lib64/libpixman-1.so.0
Oct 24 11:13:43 <sberg> mst__, so this was nicely hidden when all the external
libs were delivered to solver/*/lib, but in the end I think the bug is to
combine system gtk with non-system cairo and/or pixman
Oct 24 11:14:49 <sberg> mst__, as long as our cairo and/or pixman have the same
SONAMEs or exported symbol names as system ones, all hell can happen at
runtime anyway
Oct 24 11:15:32 <mst__> sberg, but... why then does it fail for me if i don't
have the cairo/pixman libs in solver?
Oct 24 11:15:57 <mst__> ahhh -Wl,-rpath-link,$S/instdir/unxlngx6/program <-
taht must be why
Oct 24 11:17:40 <mst__> is it normal that -Wl,--trace does not print out what
libraries were found via -Wl,-rpath-link? it only appears to print explicit
-lfoo
Oct 24 11:18:27 <sberg> mst__, because of -Linstdir/*/program
Oct 24 11:20:27 <mst__> sberg, so we need
-Wl,-rpath-link,$S/instdir/unxlngx6/program obviously;
Oct 24 11:22:08 <mst__> sberg, apparently everything builds successfully when
filtering out -lcairo from GTK_LIBS, do you think that is the best workaround
for this?
Oct 24 11:22:14 <sberg> mst__, no, we need to change configure.ac to disallow
--enable-gtk --without-system-{ciaro,pixman}
Oct 24 11:22:39 <sberg> mst__, similarly to how we already disallow
--enable-gtk3 --without-system-cairo
Oct 24 11:24:48 <mst__> sberg, that would be sort of pointless, since linux is
afaik the only platfrom where cairo is used at all - effectvely we could
remove bundled caior then?
Oct 24 11:27:04 <sberg> mst__, effectively yes, unless it would still be useful
for some --disable-gtk scenario
Oct 24 11:33:41 <mst__> caolan, cloph does RHEL5 have a sufficiently recent
system cairo?
Oct 24 11:34:43 <cloph> cairo 1.2.4 on the CentOS 5.9 (well, more like 5.10 now)
system
Oct 24 11:37:08 <jcorrius> my RHEL6 build uses internal cairo
Oct 24 11:37:47 <caolan> rhel-5 cairo is 1.2.4
Oct 24 11:37:54 <mst__> caolan, the other option i can see is to do $(call
gb_LinkTarget_add_libs,$(1),$(filter-out -lcairo,$(GTK_LIBS))) in
gb_LinkTarget__use_gtk which works-for-me(TM)
Oct 24 11:38:30 <sberg> jcorrius, not for very much longer ,) (it typically
happens to work by luck to combine system GTK with bundled cairo)
Oct 24 11:38:59 <mst__> thorsten, are you aware of any reason why we must bundle
cairo on linux?
Oct 24 11:40:05 <sberg> mst__, "<caolan> rhel-5 cairo is 1.2.4" and we only
check for "cairo >= 1.0.2" in cofingure.ac, so all should be good
Oct 24 11:40:35 <sberg> mst__, "works-for-me(TM)" just by luck
Oct 24 11:41:33 <mst__> sberg, well perhaps guess the real problem is that
pkg-config spits out a spurious -lcairo for gtk+-2.0 so...
Oct 24 11:42:19 <mst__> ... but of course if a sufficiently good cairo is
available everywhere we don't have reason to bundle it anyway
Oct 24 11:45:45 <sberg> mst__, at least my /usr/lib64/libgtk-x11-2.0.so.0 does
have a DT_NEEDED on libcairo.so.2, so even if pkg-config wouldn't spit it out
we would still be in trouble at runtime
Oct 24 11:47:05 <mst__> sberg, at runtime we have this problem for a lot more
libraries than just cairo
Oct 24 11:47:43 <sberg> mst__, but why refuse to fix the problem, at least for
cairo, where there is apparently no good reason to bundle it anyway?
Oct 24 11:48:36 <jcorrius> is cairo used on Windows for anything?
Oct 24 11:48:42 <mst__> sberg, since there is no good reason to bundle it anyway
i don't object to removing the bundled cairo
Oct 24 11:49:38 <mst__> sberg, ... but i can still hold the opinion that gtk
shouldn't put -lcairo in its pkgconfig :)
Oct 24 11:53:12 <sberg> mst__, since "pkg-config --cflags gtk+-2.0" includes
"-I/usr/include/cairo", one could argue that cairo is a "re-exported" part of
that, so should also appear in pkg-config --libs output; one could likely
argue either way
Oct 24 11:55:27 <mst__> sberg, well but if you're calling functions from cairo
then you're using cairo directly whereas if you just call gtk functions you
have no need to link cario
Oct 24 11:56:47 <sberg> mst__, sure, my argumentation depends on that
"re-exports" argument (which might be thin); anyway, are you going to remove
bundled cairo
Oct 24 11:56:54 <sberg> ?
Oct 24 11:57:34 <mst__> sberg, i'm going to force it to system in configure for
now
Oct 24 11:58:13 <sberg> mst__, I have a patch for exactly that already locally
here, so could push that if you've not done that too already anyway
Oct 24 11:59:00 <mst__> sberg, i havent' finished my freetype patch yet because
people always distract me on irc so you can push
Oct 24 11:59:01 <sberg> mst__, or, rather, my patch just errors out in the
--enable-gtk --without-system-cairo combination, so if you have a better one,
go ahead
Change-Id: I071e759a55f46338b36c3cf8ac7cd5591bd9e376
|
|
Why is /usr/lib64/libpixman-1.so not found automatically?
Change-Id: Ide3929b53d130aee44ff6b01dcf2f7491a61a09b
|
|
As now ::comphelper::existsValue is not used anymore, we're removing this too.
Change-Id: I9bd2544a9c378f5a18746255133f5684867e0114
Reviewed-on: https://gerrit.libreoffice.org/6378
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
|
|
Change-Id: I6e3e64a0e9a0510401f9b8ddbf9e18e2d6caba3e
Reviewed-on: https://gerrit.libreoffice.org/6400
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
They are practically always useless, often misleading or obsolete.
Change-Id: I2d32182a31349c9fb3b982498fd22d93e84c0c0c
|
|
Change-Id: I17ec25a836eda7bb023c440db1f40186b6156067
|
|
Change-Id: Iea98e52fd026d93f68ab9916ccb583b156d5c9a7
|
|
Change-Id: If59d7c75c89a102a573738d15d8593cb8ac5c486
|
|
hammer silver nails into coffin and bury in concrete
Change-Id: I3fda2ff47738bb33793adab97faba2d439ac9a28
|
|
Change-Id: I4278999b9b7d184c26036bbe9e3b98420f461e8c
|
|
As discussed in the bug report. I changed all occurrences, not only the one in the Calc menu.
Change-Id: Ia652cb10ec0123b0a79a719dda59e6d2f54f0680
Reviewed-on: https://gerrit.libreoffice.org/6123
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Ic046150605c599746ed3235c04bcbc981e18e589
|
|
Change-Id: Ide87f07a97a51d924947f7959016164b98ab43f9
|
|
Change-Id: I683c0d30c3286ed5d725d4eefe8b3977b82ee316
Reviewed-on: https://gerrit.libreoffice.org/6035
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
|
|
Change-Id: Icd07fba84735325408741ad10864c63ea32a6481
|
|
Change-Id: I3b701f47bbd4141127e209673a4ce9335d68ca2a
|
|
Change-Id: I6e52bfb34e7c4be0d17dfa7849d4a96248aa49b4
|
|
Change-Id: I63b1de195bf2f3f8bfd185181f48b1520cdd849f
|