Appart from the by-design type-punned use in CreateWindowEx, m_uID is (only)
used in a call to MAKEWPARAM (to create a WPARAM to pass into a SendMessage
call), so the most realistic type to use seems to be WORD. And
CHatchWindow::Init is only called with a value of 2000 (from docholder.cxx),
anyway.
Change-Id: I4b6554d1ca9bb3926378c9e25a5473609f5951c5
...to return an ANY containing a 64-bit HYPER instead of a 32-bit LONG for
SYSTEM_WIN32 (which covers both 32-bit and 64-bit versions of Windows), so that
the HMENU value (which is effectively a void*) is not truncated for the 64-bit
build.
This should effectively be URE ABI compatible for the 32-bit build, as there the
HYPER value will fit into 32 bits, so extracting a LONG from the ANY should
still work.
Change-Id: Ief3de5924f672e8f6bbe6df08c15439456ca036f
Reviewed-on: https://gerrit.libreoffice.org/20045
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
...after a3ce60eb3c8bb5c69ab41556398efa8316286477 "We only support MSVC 2008
(_MSC_VER 1500) or later" removed the
&& (_MSC_VER > 1310)
part from the #if
Change-Id: I472461b29a37fcf996262c0a83cb10f4cb8443a9
Reviewed-on: https://gerrit.libreoffice.org/20042
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Idea originally from caolan.
Found using the following command:
find . -name *.cxx | xargs /opt/local/bin/grep -zlP '(?m)if\s*\(\s*\w+\s*\)\s*delete\s+\w+\;'
Change-Id: I3338f4e22193a6dfd6219c8c75835224a3392763
As suggested by comment 13 of the bug, the problem is caused
by commit b248624126c271c88381d3dad6e04fc954f65779 by Noel Grandin.
1. DocumentHolder::DocumentFrame(): XDesktop2 cannot be directly
queried for XFrame2. And in this case, simple XFrame is enough.
2. DocumentHolder::CloseFrame(): m_xFrame->dispose() violates an
assert because of NULL reference. Reverted to previous code.
3. Following commit debde4fdc443f522562ee29def4c27512d64609a by
Andras Timar (supposed to fix the bug), found two places where
previously used to be UNO_QUERY, but now UNO_QUERY_THROW is used.
These places are reverted to use UNO_QUERY.
Change-Id: Ifb9e74367d5dd99ba12166abdd443b29a8018aeb
Reviewed-on: https://gerrit.libreoffice.org/15607
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
ie.
void f(void);
becomes
void f();
I used the following command to make the changes:
git grep -lP '\(\s*void\s*\)' -- *.cxx \
| xargs perl -pi -w -e 's/(\w+)\s*\(\s*void\s*\)/$1\(\)/g;'
and ran it for both .cxx and .hxx files.
Change-Id: I314a1b56e9c14d10726e32841736b0ad5eef8ddd
... and remove the definitions in makefiles, except in fpicker, which
defines a different value for the Vista file picker.
The WINVER value is derived automatically from _WIN32_WINNT by SDK
header sdkddkver.h.
Change-Id: I73358a9bf5d070f71821654cae2a29335a754a21
Sadly cannot forward declare "struct {...} TimeValue;".
rtl/(u)?string.hxx still include sal/log.hxx but removing osl/diagnose.h
was painful enough for now...
Change-Id: Id41e17f3870c4f24c53ce7b11f2c40a3d14d1f05
Instead, atls.lib should be used also with code compiled to use the
debugging runtime. See
http://msdn.microsoft.com/en-us/library/bb531344.aspx which says
"Atls.lib no longer has character-set dependencies or code that's
specific for debug/release. Because it works the same for Unicode/ANSI
and debug/release, only one version of the library is required."
Change-Id: Ie39ea271513dec1084cae8d1bbf93afa286f357a
...since f059134fab0f91b7a15594ad06536a13fbfae034 "INTEGRATION: CWS
cppuhelpshrink: #i72766# save memory in cppuhelper, using a vector instead of a
hash_map" (but a dummy "void" default is left in place for backwards
compatibility).
Change-Id: I3bb0af8158f34737d41c344464f3cf944e2891ed