Date: prev next · Thread: first prev next last
2012 Archives by date, by thread · List index


On 08/20/2012 01:41 PM, Caolán McNamara wrote:
On Sun, 2012-08-19 at 03:44 -0500, Timothy Pearson wrote:
This patch restores the TDE VCL and filepicker interfaces to full
functionality in LO 3.6.0:
http://git.trinitydesktop.org/cgit/tde/plain/main/thirdparty/libreoffice/3.6.0/patches/libreoffice-fix-tde-vcl.diff

This patch does not affect the KDE3 plugin and should be committed to
LO
GIT.  The LO code currently in GIT both does not display widgets and
also
hangs when used under TDE; this patch resolves these issues.

Fair enough, pushed to master now.

That commit
<http://cgit.freedesktop.org/libreoffice/core/commit/?id=af4ca5a8c6e2848cb855a15986d5c4c9991140bf>
"Fix TDE VCL interface" makes my build start to fail:

[ build CXX ] CustomTarget/vcl/unx/kde/fpicker/kdefilepicker.moc.cxx
/home/sbergman/lo/core/workdir/unxlngx6/CustomTarget/vcl/unx/kde/fpicker/kdefilepicker.moc.cxx:
In member function ‘virtual bool KDEFileDialog::qt_invoke(int,
QUObject*)’:
/home/sbergman/lo/core/workdir/unxlngx6/CustomTarget/vcl/unx/kde/fpicker/kdefilepicker.moc.cxx:92:43:
error: ISO C++ forbids declaration of ‘type name’ with no type
[-fpermissive]
/home/sbergman/lo/core/workdir/unxlngx6/CustomTarget/vcl/unx/kde/fpicker/kdefilepicker.moc.cxx:92:43:
error: ISO C++ forbids declaration of ‘type name’ with no type
[-fpermissive]
/home/sbergman/lo/core/workdir/unxlngx6/CustomTarget/vcl/unx/kde/fpicker/kdefilepicker.moc.cxx:92:37:
error: expected primary-expression before ‘const’
/home/sbergman/lo/core/workdir/unxlngx6/CustomTarget/vcl/unx/kde/fpicker/kdefilepicker.moc.cxx:92:37:
error: expected ‘)’ before ‘const’

and kdefilepicker.moc.cxx:92 is

    case 0: fileHighlightedCommand((const TQString&)*((const
TQString*)static_QUType_ptr.get(_o+1))); break;

(so 92:43 is that first mention of "TQString").  Anybody any insight
what's broken there for me?

Stephan


Can you please post the generated kdefilepicker.moc.cxx file?  I am
somewhat surprised that moc is failing to generate valid code in this
case.

To anyone monitoring with an eye toward reverting the patch, the portion
of the patch causing this error should be limited to the changes in
/vcl/unx/kde/fpicker/kdefilepicker.hxx.

Thanks!

Tim


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.