[Libreoffice-commits] core.git: vcl/unx
Stephan Bergmann
sbergman at redhat.com
Tue Feb 12 00:34:10 PST 2013
vcl/unx/kde/UnxFilePicker.cxx | 3 ++-
vcl/unx/kde4/KDE4FilePicker.cxx | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit fbb33267627efdf8053700a0581eb9568ff17cef
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Feb 12 09:33:30 2013 +0100
Fix compilation of kde/kde4
...broken by 4b51374a7021d52f7f1be1861e2ee6a011b30ecd "fdo#46808,
Adapt ui::dialogs::FilePicker UNO service to new style."
Change-Id: I5fa8130507222b8588c15bdb9efd86daba7c0f38
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index 1692555..422e00d 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -87,10 +87,11 @@ namespace
//////////////////////////////////////////////////////////////////////////
UnxFilePicker::UnxFilePicker( const uno::Reference<uno::XComponentContext>& )
- : cppu::WeakComponentImplHelper3<
+ : cppu::WeakComponentImplHelper4<
// TODO XFilePreview,
XFilePicker2,
XFilePicker3,
+ XFilePickerControlAccess,
lang::XServiceInfo>( m_rbHelperMtx ),
m_nFilePickerPid( -1 ),
m_nFilePickerWrite( -1 ),
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 3365991..951ea8b 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -105,9 +105,10 @@ QString toQString(const rtl::OUString& s)
//////////////////////////////////////////////////////////////////////////
KDE4FilePicker::KDE4FilePicker( const uno::Reference<uno::XComponentContext>& )
- : cppu::WeakComponentImplHelper3<
+ : cppu::WeakComponentImplHelper4<
XFilePicker2,
XFilePicker3,
+ XFilePickerControlAccess,
lang::XServiceInfo>( _helperMutex ),
_resMgr( ResMgr::CreateResMgr("fps_office") )
{
More information about the Libreoffice-commits
mailing list