vs2012 express does not have atl so one need to
--disable-atl and --disable-activex
but then the packaging still try to include a few _x64.dll
that are not built.
Change-Id: I88ca5b9d23febd5a714fb48321dde5424cafceb6
...to avoid confusion with the URE uno ini-file (Linux: ure/lib/unorc).
It might even work to get rid of the louno ini-file altogether and fold its
contents into the fundamental ini-file, but at least
desktop/source/deployment/misc/dp_misc.cxx accesses the louno ini-file directly,
so would need some inspection to avoid potential regressions.
Change-Id: Ib49bbc4c814d677c22e68d2dd0f11af6d8423bb6
This removes ENABLE_NPAPI_INTO_BROWSER while it should keep
ENABLE_NPAPI_FROM_BROWSER (embed flash in LO) intact.
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Conflicts:
extensions/source/nsplugin/source/npshell.cxx
Change-Id: I80a9159a75653c74423d8fdc7c188568d3188e04
In other words, only executable files go in the MacOS folder. Dynamic
libraries and bundled frameworks (i.e., LibreOfficePython), and
nothing else, go in the Frameworks folder, and all other files go in
the Resources folder.
Especially, note that Java class files and rc (.ini) files also go in
Resources.
Such an app bundle structure is what Apple strongly suggests one
should use, and it has been hinted that future versions of code
signing and/or Gatekeeper will require such a structure.
There is still some ugliness thanks to traces of the historical
separation of URE from "the office". Like there are two separate
"unorc" files, one for URE, one for the LibreOffice application. IMHO,
this should be cleaned up, but is probably controversial.
(Eek! I now see there are actually *three* unorc files in the app
bundle. Not intentional. Need to fix that later.)
Change-Id: Idcf235038deb5b8e1d061734993e9f31869b7606
The new code signing is more strict and enforces bundle structure
harder, it seems.
When ENABLE_MACOSX_MACLIKE_APP_STRUCTURE bypass the unoinfo and python
shell scripts. If they actually are needed, will have to put them
somewhere under Resources.
Change-Id: I14a34936b78195746d2b88d25603952ce5309380
This was effectively omitted from the installation set since commit
26c142ca5f2b405b02ab5701dfaeab7bf281a727, and is apparently related to
the obsolete StarOffice patch mechanism.
Change-Id: I9a4c113e19e5b2b751e3da64b4dde53320132a35
They were added in libreoffice-4-1 branch but not anywhere else.
See 2158e8bf85e139fd3cf59d00059ed2e2026f6a4a
Change-Id: I2dcec7898590b526161be7eec1afe4610e6fe534
When compiling 32-bit OS X code, the code will use the "legacy
Objective-C runtime", which means that instance variables of an
Objective-C class must be declared in the @interface block, not in the
@implementation.
CGRect and NSRect are not the same for 32-bit code.
Also, use boost::unordered_map.
Change-Id: Icc56ff298203565a7568714b0e9f42c7c6b89737