Commit Graph

5249 Commits

Author SHA1 Message Date
5397b49f4d Towards a working instdir for Mac OS X
Introduced gb_INSTROOT, which is the same as $(INSTDIR) except for Mac OS X,
where it is $(INSTDIR)/LibreOffice.app/Contents.  Most stuff ends up there (so
most occurrences of $(INSTDIR) have been replaced with $(gb_INSTROOT)), but SDK-
related stuff goes to $(INSTDIR)/$(gb_Package_SDKDIRNAME).  (And
GeneratedPackage needed to be made more flexible, to allow for packages that go
into either of those two places.)

For Android and iOS, gb_INSTROOT probably still needs to be set.

The most obvious missing thing yet to make instdir work for Mac OS X is the
instdir/*/LibreOffice.app/Contents/ure/ vs.
instdir/*/LibreOffice.app/Contents/ure-link/ split.

Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5
2013-09-11 00:50:54 +02:00
7323bc3405 WaE: warning C4100: 'aEvent' : unreferenced formal parameter
I thought SAL_WARN_IF etc worked in such a way that any variables used
in the condition would be "used" from the compiler's point of view,
even in an optimising build case where SAL_DETAIL_ENABLE_LOG_WARN is
false and SAL_WARN_IF should optimise away?

Change-Id: I728e1eeb8559e1299abf403afceb0e2748d08857
2013-09-09 22:25:50 +03:00
f500b2d7d9 Remove dead code
...merged in via d02f75a8c36705924ddd6a5921fe3012fafce812 "Resolves: #i121420#
merge sidebar feature," but apparently already unused in the original AOO
commit.

Change-Id: I12e4ff05769d95a847881934eab6da722bb1950e
2013-09-09 14:16:52 +02:00
c31d3ed99c One more case of explicit OUString construction needed for return statement
Change-Id: I577aa609179cdb83124b004ff9ef5aa2123e1e5b
2013-09-09 01:52:09 +03:00
2f750d86cf Try to keep older(?) gcc versions happy
Change-Id: Id563e644356a9265ded66cf08a711078c804ac84
2013-09-09 01:42:07 +03:00
a3474bab69 Try to make the Gentoo tinderbox happy with explicit OUString() values
Change-Id: If73a84a09ad54072e1251ed2db8aacc307ff32d2
2013-09-09 01:23:18 +03:00
2b3e225853 Bin some uses of the stupid DECLARE_ASCII macro
Change-Id: I076eef8069e848ec3cf9c69f1b489ad44586324e
2013-09-09 00:58:15 +03:00
84e9818658 Bin now unused U2B macro
Change-Id: Ic8f3b11fac527bfe8d6643be758c85bf53e496ef
2013-09-09 00:31:38 +03:00
1817936b28 Bin unused remains of framework's own "debug framework"
Change-Id: I71937debf674ff11173d7d8fa5aa43dc12234ce6
2013-09-09 00:29:23 +03:00
895885652e Fix non-debug build
Change-Id: I5446c7fec62c1a934b1ffb21fefa1279b932ca09
2013-09-09 00:13:01 +03:00
44d19e119e Bin the fairly pointless LOG_REGISTRATION_GETFACTORY
Change-Id: Ia73eed753d1c4adc847a190449a18498710c8b40
2013-09-09 00:04:56 +03:00
5bb0c9d790 Use SAL_INFO instead of framework's own "event logging"
That "event logging" consisted of two macros, both used in a single place.

Change-Id: I8faffd9756399f1902e52aa41968b71a964a4324
2013-09-08 23:51:41 +03:00
04c3f9d185 Use SAL_INFO instead of framework's own WRITE_LOGFILE
Change-Id: Ieb1a45ca75c7a475d02535cd176396a0aeb68510
2013-09-08 23:51:41 +03:00
9a8e2d09bc Use SAL_WARN_IF instead of framework's home-grown LOG_ASSERT(2)
Also remove declarations for debug function that don't exist (have been
removed (misguidedly?) as unused perhaps).

Change-Id: I0bc3320c52b3d50dc851a07fdc30b593cc4856b1
2013-09-08 23:51:41 +03:00
b022cfb6ca Get rid of some pointless SAL_INFO calls
Change-Id: I451cacc550972a6a61e3e325936ce950bbf87475
2013-09-08 23:51:41 +03:00
6aa0698828 Use SAL_INFO instead of framework's own LOG_WARNING
Change-Id: Ief44fceaf03d2567f4aacd9ff74d361436e5e05b
2013-09-08 23:51:41 +03:00
c5ab14cbaf Use SAL_INFO instead of framework's own LOG_EXCEPTION
Change-Id: If1976d235f82267a85598d5d59d8ed332a39c792
2013-09-08 23:51:40 +03:00
6ea6a422fb s/wiki.services.openoffice.org/wiki.openoffice.org/g
Change-Id: I059fbee385a109069c70f3869021c8e2ee48fee1
2013-09-07 14:21:22 +02:00
286d04a96e update pch
Change-Id: I6d5e8d3fd69189935a3338fee19b60022f70a7eb
2013-09-05 20:00:43 +02:00
791a8b96f7 Revert "fdo#68552: Don't (attempt to) do run-time expansion of build-time parameters"
This reverts commit ac4e19f9085dbd0103c7336a5318aa1e55b3e3e0.

Unfortunately does not work if BUILDDIR is different from SRCDIR.
2013-09-05 18:17:00 +02:00
ac4e19f908 fdo#68552: Don't (attempt to) do run-time expansion of build-time parameters
The $(share_subdir_name) things in the filter fragment .xcu files didn't
actually work it seems. But anyway, it's a bit silly to do expansion at
run-time of $(foo) things known at build-time anyway. Thanks to sberg for
pointing this out.

So just use the normal configury .in mechanism for these. Simpler.

Change-Id: I14b3e5cc5169b34df8a1d7ff07cc28452c67bcc8
2013-09-05 13:34:25 +03:00
3945267d67 was convertIsoStringToLanguage(), use convertToLanguageTypeWithFallback()
Change-Id: Ic08b09824cffdc9b633ba13ec3050cc109f671cd
2013-09-03 20:35:42 +02:00
3c48673ff7 Delete wrong comment
This indicates that there should follow the private methods in this class.
However, the visibility constraint "private" was never in this code since it
was added in 2009. So I delete it.

See:
$> git log -u -- framework/source/uiconfiguration/imagemanagerimpl.hxx
ca00697e3dae9a03573d11281fc8d9a4ee391d3d (Sep 8th 2009)

Change-Id: Iac82b79d8cf6cc0c796a5ee97be25d2d24f4fa48
2013-09-02 22:09:04 +02:00
bf42b6f9f5 fdo#62475 - remove visual noise
This is a follow up commit to
 - 22d1beb78a475e4846af945afde1c4d6c263b5d6
 - 1c7af455ab9345304a7ac48ce2e0310de2ac8a75

Change-Id: I102685391125f3b4f7bdf838f8bd17a2283d558d
2013-08-31 22:41:10 +02:00
6a419ad8f2 Bin intermediate iterator
Change-Id: I49e6cd7bc6e4db95163d0b0b8c81bb4330ead081
2013-08-27 06:57:44 +02:00
932dbfd2d1 Bin intermediate iterator + rename parameter function
Change-Id: Ic1055af502918ee754673a6e3ad704c55ef09a36
2013-08-27 06:32:16 +02:00
a2791f9745 Bin intermediate iterator again
Change-Id: I6c3410e4043f6a10474f955434e8c855f60ecc80
2013-08-27 06:30:54 +02:00
6ef19375b2 Bin intermediate iterator
Change-Id: I6401adb29fc3fe4c8b7d420fc9bc325827ec4f21
2013-08-27 06:29:40 +02:00
c6040d9bd4 Bin intermediate iterator + rename parameter function
(see example of http://www.cplusplus.com/reference/vector/vector/erase/)

Change-Id: I8c0ee334abd91ea99b80a43581a04cbbf9a91fa3
2013-08-27 06:11:07 +02:00
b9fa1e20f3 build on higher debug levels
Change-Id: I7f4d85f3e26ab8b19dae05c6907840b97a8af1d6
2013-08-24 14:02:48 +01:00
063b32804c Don't use lock files when sandboxed on OS X
We won't be allowed to create such files anyway.

Change-Id: Iaba652b9ae3f1d8c7cfeaae493e962d58ad1fb7f
2013-08-24 12:26:00 +03:00
64b993e046 finish deprecation of O(U)String::valueOf()
Compiler plugin to replace with matching number(), boolean() or OUString ctor,
ran it, few manual tweaks, mark as really deprecated.

Change-Id: I4a79bdbcf4c460d21e73b635d2bd3725c22876b2
2013-08-21 15:10:35 +02:00
1c7af455ab Re-work 8bit characters in source code, or remove them.
Change-Id: I93e14d4936c0ffbe03425d4a54bb0e09bc62b3e3
Reviewed-on: https://gerrit.libreoffice.org/5550
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-08-20 19:30:59 +00:00
2d2337eb74 Improve some debug output
Change-Id: I1008822ba8592ea43f87805bf00adbfdaf4f02fc
2013-08-20 17:58:44 +02:00
058a3d1c46 Further work on the "Mac-like app structure" option
Lots of stuff still either ended up in the wrong place, or was looked up from
the wrong place, or both. Fix most cases.

Change-Id: I06ebbce207c219f3cd82b4387dd9b3fdb83420d4
2013-08-18 21:11:16 +03:00
c6a7300974 Use subfolder names from <config_folders.h>
Change all instances of hardcoded "program", "share" etc subfolder names to
use those from <config_folders.h> instead. In normal builds, the end result
will not change.

Change-Id: I91c95cd8e482818be67307e889ae6df887763f53
2013-08-18 21:11:16 +03:00
d69d6f4dc8 Related: fdo#38838 ToInt64 and a EqualsIgnoreCaseAscii variant are now unused
Change-Id: I2a2cc56cf005f564c798b8d43ef7e8c4b7f9eeff
2013-08-16 13:59:30 +01:00
df58d4a925 Typo: controling => controlling
Change-Id: Ie5bb34d2000be74bad7f18808f49f389ab9373d8
2013-08-12 21:40:22 +02:00
9dd40c656f XubString->OUString
Change-Id: I04c7da143425a9d8cc4fae155ad45a469df953c1
2013-08-12 08:32:59 +01:00
03eb15938e vcl, sw: fix the inheritance of SwComboBox from ComboBox a bit
Remove the silly overloading, and introduce virtual methods.

Change-Id: If54a6a3fb7464283f80d3387ae23db234690f8a3
2013-08-08 23:25:28 +02:00
c958a35bef Move startcenter.ui from framework to sfx2
In a previos move BackingWindow was moved, but startcenter.ui was left
behind by accident.

Change-Id: I7d9669df9b2b65311e119640ba2a7a331b6336e9
Reviewed-on: https://gerrit.libreoffice.org/5316
Reviewed-by: Jan Holesovsky <kendy@suse.cz>
Tested-by: Jan Holesovsky <kendy@suse.cz>
2013-08-08 16:23:17 +00:00
cb021fcafb fdo#46037: remove 1 comphelper/configurationhelper in framework
Change-Id: I7c958347297f17875aded7a64526b1673a439ecf
Reviewed-on: https://gerrit.libreoffice.org/5271
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-07 08:20:02 +00:00
9281fc72e7 startcenter: Rename DropTargetListener to OpenFileTargetListener, ...
...move it to svtools, and kill the cut'n'pasted version.

Change-Id: Ifacf110ff08b359bd0f611dff20b3c5142e6bcc8
2013-08-06 19:56:30 +02:00
b60f6da2e1 startcenter: Move BackingComp & BackingWindow to sfx2
BackingWindow will use ThumbnailView from sfx2 and it had to be moved
to avoid a circular dependency

Change-Id: I33a5982ed9e51307476c837f3f534ded7ed38ee0
2013-08-06 19:56:29 +02:00
8ee69b0ba1 fdo#67235 adapt form control code to time nanosecond API change, step 3
Change-Id: I4899c89ee5b2a54c9c05b531ab284365f1558e3d
Reviewed-on: https://gerrit.libreoffice.org/5270
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
2013-08-04 06:51:31 +00:00
e2e15148fc Mark as const/static
Change-Id: I54a7daee7345e7c0c5c3f866d5c365722b567eff
2013-08-04 00:54:12 +09:00
f89637e329 Revert "convert vcl/menu.hxx from XubString to OUString"
This reverts commit 43b1ac3651732a1ceb193268ab72b4aaa90dee65.
2013-07-31 14:09:15 -04:00
43b1ac3651 convert vcl/menu.hxx from XubString to OUString
Change-Id: I9469363c09e4cc863ad4d8ddddf8d923fe444e25
2013-07-31 13:36:52 +02:00
d798d26bc4 Remove some occurrences of RTL_CONSTASCII_STRINGPARAM and equalsAsciiL
Change-Id: I7acc31f819be6552344073fa032085d01622fca3
2013-07-29 01:35:35 +02:00
5efc15f000 reduce use of UniString from ResID ctor
Change-Id: I8d7619e7807ff2d400ec5c7fd181375130245728
2013-07-28 16:45:48 +01:00