Commit Graph

27 Commits

Author SHA1 Message Date
c32c11fbd4 MPLv2 subset improvements. 2013-06-04 17:45:42 +01:00
1946794ae0 mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 14:23:11 +02:00
5a68d2cbe2 Fix member variables not initialized in constructor
Change-Id: I17275e7e17f76da967d2fa798f5ee88b50fd6d72
Reviewed-on: https://gerrit.libreoffice.org/2121
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2013-02-12 15:30:01 +00:00
e103887c8c QUARTZ is equivalent to MACOSX
So just check MACOSX in the sources, and don't pass any -DQUARTZ to
compilations.

Change-Id: Ia1de6024810f81f1eea01b8eb0b885d9d1ee8e20
2013-01-11 11:16:59 +02:00
ab4a0f1165 Add note that these files are unused
Change-Id: I7fd226bf61d9983d843453919a0406442daaea70
2013-01-10 23:59:06 +02:00
b51d0ec93d Make the OpenGL transition code buildable for Windows
Whether it works at run-time is another question;)

Use the same source files as for X11, with relevant conditional
coding.

The Windows OpenGL import library corresponds to OpenGL 1.2, so we
can't directly use APIs from OpenGL 1.3 or newer. (Even if they as
such are present in the "Mesa" headers we use.) So look up also
glActivetexture() dynamically.

Change-Id: I2280e2ad7e190356e9409cc28142fa9fc33e078b
2013-01-10 23:53:41 +02:00
6312695ad6 The "unx" and "win" OGLTrans_Shaders.cxx files were effectively identical
Just some OSL_TRACE/SAL_INFO changes in the "unx" one. And it isn't
like the "win" one would actually compile for Windows as is anyway, as
it unconditionally uses glX stuff. So certainly it is better to have
just one copy, and if we want to make the OpenGL transitions build on
Windows then add ifdefs for Windows to it.

Change-Id: If6887e24a0fc03c7e0e77f003d08feb51c264f30
2013-01-10 14:59:40 +02:00
a4c7ded1fd Cleanup: #include <tools/gen.hxx>
Change-Id: Ic547b4a59102afc8bdbc85ec95ac312e32ef2530
Reviewed-on: https://gerrit.libreoffice.org/1484
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2013-01-07 13:14:57 +00:00
a1ff0ec108 Fix 'Primitive::operator=' should return 'Primitive &
I applied the same for Windows part, hope there won't be any building pb

Change-Id: Id62c8c5f60e7a525d82c36ced944b71cc5c28b78
2012-12-27 20:36:21 +01:00
ab4eb0e332 SetPosSizePixel->setPosSizePixel
Change-Id: Id1cab5b27776180cd8403af848c1294858384b4a
2012-09-28 09:18:09 +01:00
80fe015a86 Add COMPHELPER_SERVICEDECL_EXPORTS* back in, after libmerge changes
Did I mention I hate boilerplate copied all over the place? ;)
2012-03-16 17:02:23 +01:00
8963cc01f5 EasyHack: Removed gcc conditionals 2012-02-13 17:33:15 +00:00
be6a8677a6 OSL_TRACE: Remove trailing newlines
Done with perl regex:
s/(\n\s*OSL_TRACE\(\s*\"[^\n]+?)\s*(\\n)+(\"[^\n]*\)\;\n)/$1$3/gs;

- removed trailing whitespaces and (multiple) newlines
2011-09-21 09:28:39 +02:00
8231574526 unused variable in Windows build
according cppchecker, small cleaning
2011-08-14 11:40:57 -05:00
7e5b4be4cf add prefixes for component_getFactory 2011-07-28 14:37:59 +02:00
285422ff1e Drop OS2 2011-05-21 15:54:49 +03:00
ca648de248 gbuildize slideshow 2011-04-21 20:56:05 +02:00
ab5c7e87cf Wholesale prewin.h/postwin.h removal 2011-03-25 18:50:27 +01:00
d2b23dfdfc mis-merge clean-up tools types 2011-03-12 19:01:54 -06:00
c61cd1a5a2 Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
0f12f8b23b add mode lines to new files 2011-02-14 09:28:38 +00:00
28f55d0d5e Adapt to move of prewin.h and postwin.h 2011-02-08 14:00:38 +02:00
37806a5199 Remove old RCS lines. 2011-01-21 14:49:25 +01:00
57a95b2d6f cppcheck: unused variable 2010-12-06 20:19:45 +00:00
c8f58bc85e some caretaker code cleanup in impress 2010-12-06 10:43:55 +00:00
7738ad37a0 do not include OS in the filenames
In unx the code is not LINUX only, it's mesa.
On other platforms there is no point in using the OS name in the
filenames either.
This unbreaks unx builds on non-linux.
2010-12-05 11:44:23 -06:00
0a86184eed Make --with-opengl work on MacOS
Now that --with-opengl is enabled by default, merge the patch
dev300/transogl-crossplatform.diff.
2010-12-03 05:16:06 -06:00