sc/source/ui/collab/sendfunc.cxx | 9 +--- sc/source/ui/collab/sendfunc.hxx | 6 -- tubes/Library_tubes.mk | 1 tubes/Package_inc.mk | 5 -- tubes/inc/tubes/conference.hxx | 21 +++------ tubes/inc/tubes/manager.hxx | 4 - tubes/inc/tubes/packet.hxx | 83 --------------------------------------- tubes/source/conference.cxx | 34 +++++++-------- tubes/source/manager.cxx | 14 ++++-- tubes/source/packet.cxx | 33 --------------- 10 files changed, 38 insertions(+), 172 deletions(-)
New commits: commit 1fe939da1dd34103a4259e072b78508bb15e5cfc Author: Matúš Kukan <matus.ku...@gmail.com> Date: Sat Jul 21 22:04:45 2012 +0200 tubes: small cleaning Change-Id: I15337276f21febba44b84d3618fedfc08013a3da diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx index 31ba48a..190f8b1 100644 --- a/sc/source/ui/collab/sendfunc.cxx +++ b/sc/source/ui/collab/sendfunc.cxx @@ -37,7 +37,6 @@ #include "sendfunc.hxx" #include <tubes/manager.hxx> #include <tubes/conference.hxx> -#include <tubes/contact-list.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <unotools/tempfile.hxx> diff --git a/sc/source/ui/collab/sendfunc.hxx b/sc/source/ui/collab/sendfunc.hxx index 2016b54..c6ca2f4 100644 --- a/sc/source/ui/collab/sendfunc.hxx +++ b/sc/source/ui/collab/sendfunc.hxx @@ -14,8 +14,7 @@ #include "cell.hxx" #include "docfunc.hxx" -#include <tubes/conference.hxx> -#include <tubes/manager.hxx> +class TeleConference; namespace { diff --git a/tubes/Package_inc.mk b/tubes/Package_inc.mk index 71f75f7..ff63f18 100644 --- a/tubes/Package_inc.mk +++ b/tubes/Package_inc.mk @@ -27,12 +27,9 @@ $(eval $(call gb_Package_Package,tubes_inc,$(SRCDIR)/tubes/inc)) $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/conference.hxx,tubes/conference.hxx)) -$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/constants.h,tubes/constants.h)) $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/contact-list.hxx,tubes/contact-list.hxx)) $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/manager.hxx,tubes/manager.hxx)) $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/tubesdllapi.h,tubes/tubesdllapi.h)) $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/warnings_guard_boost_signals2.hpp,tubes/warnings_guard_boost_signals2.hpp)) -#$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/,tubes/)) - # vim: set noet sw=4 ts=4: commit 389285178f58f6cb49075e22fbaa4d111a2af517 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Sat Jul 21 20:17:51 2012 +0200 tubes: do not include file-transfer-helper.h in public headers Change-Id: Ie66069a37c70b43cbee34130b5b63967a1c9f033 diff --git a/tubes/Package_inc.mk b/tubes/Package_inc.mk index a59ab3a..71f75f7 100644 --- a/tubes/Package_inc.mk +++ b/tubes/Package_inc.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Package_Package,tubes_inc,$(SRCDIR)/tubes/inc)) $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/conference.hxx,tubes/conference.hxx)) $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/constants.h,tubes/constants.h)) $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/contact-list.hxx,tubes/contact-list.hxx)) -$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/file-transfer-helper.h,tubes/file-transfer-helper.h)) $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/manager.hxx,tubes/manager.hxx)) $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/tubesdllapi.h,tubes/tubesdllapi.h)) $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/warnings_guard_boost_signals2.hpp,tubes/warnings_guard_boost_signals2.hpp)) diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx index 54638f2..ab6db92 100644 --- a/tubes/inc/tubes/conference.hxx +++ b/tubes/inc/tubes/conference.hxx @@ -31,7 +31,6 @@ #include <sal/config.h> #include "tubes/tubesdllapi.h" -#include "tubes/file-transfer-helper.h" #include <rtl/ustring.hxx> #include <telepathy-glib/telepathy-glib.h> #include <queue> @@ -89,7 +88,6 @@ public: static void TubeOfferedHandler(GObject* pSource, GAsyncResult* pResult, gpointer pUserData); static void TubeAcceptedHandler(GObject* pSource, GAsyncResult* pResult, gpointer pUserData); - static void FTReady( EmpathyFTHandler *handler, GError *error, gpointer user_data); static void methodCallHandler(GDBusConnection* pConnection, const gchar* pSender, diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index d51154e..c8e7b4a 100644 --- a/tubes/inc/tubes/manager.hxx +++ b/tubes/inc/tubes/manager.hxx @@ -134,6 +134,7 @@ public: /** True if there has been tube channel received and is still not used. */ TUBES_DLLPUBLIC static bool hasWaitingConference(); + static void setCurrentUuid( const OString& rUuid ); void disconnect(); @@ -192,8 +193,6 @@ public: TpAccount* getAccount( const rtl::OString& rAccountID ); /* Callbacks; not for use outside this class. */ - static void TransferDone( EmpathyFTHandler *handler, TpFileTransferChannel *, gpointer user_data); - static void DBusChannelHandler( TpSimpleHandler* /*handler*/, TpAccount* pAccount, diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx index fde9368..5cf1972 100644 --- a/tubes/source/conference.cxx +++ b/tubes/source/conference.cxx @@ -29,7 +29,7 @@ #include <tubes/conference.hxx> #include <tubes/manager.hxx> #include <tubes/constants.h> - +#include <tubes/file-transfer-helper.h> #if defined SAL_LOG_INFO namespace @@ -439,14 +439,10 @@ void TeleConference::invite( TpContact *pContact ) class SendFileRequest { public: - SendFileRequest( TeleConference *pSelf, - TeleConference::FileSentCallback pCallback, void* pUserData) - : mpSelf(pSelf) - , mpCallback(pCallback) + SendFileRequest( TeleConference::FileSentCallback pCallback, void* pUserData) + : mpCallback(pCallback) , mpUserData(pUserData) {}; - /* FIXME: make a shared pointer? */ - TeleConference* mpSelf; TeleConference::FileSentCallback mpCallback; void* mpUserData; }; @@ -471,7 +467,7 @@ static void TeleConference_TransferError( EmpathyFTHandler *handler, const GErro g_object_unref (handler); } -void TeleConference::FTReady( EmpathyFTHandler *handler, GError *error, gpointer user_data) +static void TeleConference_FTReady( EmpathyFTHandler *handler, GError *error, gpointer user_data) { SendFileRequest *request = reinterpret_cast<SendFileRequest *>(user_data); @@ -487,7 +483,7 @@ void TeleConference::FTReady( EmpathyFTHandler *handler, GError *error, gpointer G_CALLBACK (TeleConference_TransferDone), request); g_signal_connect(handler, "transfer-error", G_CALLBACK (TeleConference_TransferError), request); - empathy_ft_handler_set_service_name(handler, request->mpSelf->mpManager->getFullServiceName().getStr()); + empathy_ft_handler_set_service_name(handler, TeleManager::getFullServiceName().getStr()); empathy_ft_handler_start_transfer(handler); } } @@ -504,13 +500,13 @@ void TeleConference::sendFile( rtl::OUString &localUri, FileSentCallback pCallba GFile *pSource = g_file_new_for_uri( OUStringToOString( localUri, RTL_TEXTENCODING_UTF8).getStr() ); - SendFileRequest *pReq = new SendFileRequest( this, pCallback, pUserData); + SendFileRequest *pReq = new SendFileRequest( pCallback, pUserData); empathy_ft_handler_new_outgoing( mpAccount, tp_channel_get_target_contact( TP_CHANNEL( mpChannel)), pSource, 0, - &TeleConference::FTReady, pReq); + TeleConference_FTReady, pReq); } diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index 768492b..c771727 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -28,6 +28,7 @@ #include "tubes/manager.hxx" #include "tubes/constants.h" +#include "tubes/file-transfer-helper.h" #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/frame/XComponentLoader.hpp> @@ -180,6 +181,11 @@ bool TeleManager::hasWaitingConference() return !pImpl->msCurrentUUID.isEmpty(); } +void TeleManager::setCurrentUuid( const OString& rUuid ) +{ + pImpl->msCurrentUUID = rUuid; +} + // FIXME this is exported only because of ScDocFuncDemo SAL_DLLPUBLIC_EXPORT void TeleManager_fileReceived( const rtl::OUString &rStr ) { @@ -205,9 +211,9 @@ SAL_DLLPUBLIC_EXPORT void TeleManager_fileReceived( const rtl::OUString &rStr ) } } -void TeleManager::TransferDone( EmpathyFTHandler *handler, TpFileTransferChannel *, gpointer ) +void TeleManager_TransferDone( EmpathyFTHandler *handler, TpFileTransferChannel *, gpointer ) { - SAL_INFO( "tubes", "TeleManager::TransferDone: hooray!"); + SAL_INFO( "tubes", "TeleManager_TransferDone: hooray!"); GFile *gfile = empathy_ft_handler_get_gfile( handler); char *uri = g_file_get_uri( gfile); rtl::OUString aUri( uri, strlen( uri), RTL_TEXTENCODING_UTF8); @@ -217,7 +223,7 @@ void TeleManager::TransferDone( EmpathyFTHandler *handler, TpFileTransferChannel sal_Int32 last = aUri.lastIndexOf('_'); OString sUuid( OUStringToOString( aUri.copy( first + 1, last - first - 1), RTL_TEXTENCODING_UTF8)); - pImpl->msCurrentUUID = sUuid; + TeleManager::setCurrentUuid( sUuid ); TeleManager_fileReceived( aUri ); g_object_unref( handler); @@ -256,7 +262,7 @@ TeleManager_IncomingHandlerReady ( empathy_ft_handler_incoming_set_destination( pHandler, pDestination); g_object_unref( pDestination); - g_signal_connect( pHandler, "transfer-done", G_CALLBACK (&TeleManager::TransferDone), pManager); + g_signal_connect( pHandler, "transfer-done", G_CALLBACK (TeleManager_TransferDone), pManager); g_signal_connect( pHandler, "transfer-error", G_CALLBACK (TeleManager_TransferError), pManager); empathy_ft_handler_start_transfer( pHandler); } commit 4d8e800d05683434637ffc9610905a1b89427f1d Author: Matúš Kukan <matus.ku...@gmail.com> Date: Sat Jul 21 18:50:35 2012 +0200 tubes: remove TelePacket, it's just simple string Change-Id: Iabfb50454c573ac9c01aba1b309822c4ef6fcc73 diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx index d30b393..31ba48a 100644 --- a/sc/source/ui/collab/sendfunc.cxx +++ b/sc/source/ui/collab/sendfunc.cxx @@ -102,10 +102,9 @@ void ScDocFuncRecv::RecvMessage( const rtl::OString &rString ) } } -void ScDocFuncRecv::packetReceived( TelePacket &rPacket ) +void ScDocFuncRecv::packetReceived( const OString &rPacket ) { - rtl::OString aString( rPacket.getData(), rPacket.getSize() ); - RecvMessage( aString ); + RecvMessage( rPacket ); } /* @@ -152,8 +151,7 @@ void ScDocFuncSend::SendMessage( ScChangeOpWriter &rOp ) fprintf( stderr, "Op: '%s'\n", rOp.toString().getStr() ); if (mpConference) { - TelePacket aPacket( "sender", rOp.toString().getStr(), rOp.toString().getLength() ); - mpConference->sendPacket( aPacket ); + mpConference->sendPacket( rOp.toString() ); } else // local demo mode mpDirect->RecvMessage( rOp.toString() ); diff --git a/sc/source/ui/collab/sendfunc.hxx b/sc/source/ui/collab/sendfunc.hxx index dde1dae..2016b54 100644 --- a/sc/source/ui/collab/sendfunc.hxx +++ b/sc/source/ui/collab/sendfunc.hxx @@ -16,7 +16,6 @@ #include "docfunc.hxx" #include <tubes/conference.hxx> #include <tubes/manager.hxx> -#include <tubes/packet.hxx> namespace { @@ -217,7 +216,7 @@ public: ScDocFuncRecv( ScDocFuncDirect *pChain ); virtual ~ScDocFuncRecv(); - void packetReceived( TelePacket &rPacket ); + void packetReceived( const OString &rPacket ); virtual void RecvMessage( const rtl::OString &rString ); }; diff --git a/tubes/Library_tubes.mk b/tubes/Library_tubes.mk index a08760c..e101a71 100644 --- a/tubes/Library_tubes.mk +++ b/tubes/Library_tubes.mk @@ -53,7 +53,6 @@ $(eval $(call gb_Library_use_externals,tubes,\ $(eval $(call gb_Library_add_exception_objects,tubes,\ tubes/source/conference \ tubes/source/manager \ - tubes/source/packet \ tubes/source/contact-list \ )) diff --git a/tubes/Package_inc.mk b/tubes/Package_inc.mk index 2573c05..a59ab3a 100644 --- a/tubes/Package_inc.mk +++ b/tubes/Package_inc.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/constants.h,tubes/constant $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/contact-list.hxx,tubes/contact-list.hxx)) $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/file-transfer-helper.h,tubes/file-transfer-helper.h)) $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/manager.hxx,tubes/manager.hxx)) -$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/packet.hxx,tubes/packet.hxx)) $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/tubesdllapi.h,tubes/tubesdllapi.h)) $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/warnings_guard_boost_signals2.hpp,tubes/warnings_guard_boost_signals2.hpp)) diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx index 29d4cef..54638f2 100644 --- a/tubes/inc/tubes/conference.hxx +++ b/tubes/inc/tubes/conference.hxx @@ -31,15 +31,12 @@ #include <sal/config.h> #include "tubes/tubesdllapi.h" -#include "tubes/packet.hxx" #include "tubes/file-transfer-helper.h" #include <rtl/ustring.hxx> #include <telepathy-glib/telepathy-glib.h> #include <queue> #include <tubes/warnings_guard_boost_signals2.hpp> -typedef ::std::queue<TelePacket> TelePacketQueue; - class TeleManager; /** Conference setup by TeleManager */ @@ -58,22 +55,19 @@ public: TeleManager* getManager() const { return mpManager; } - /** @param rPacket - non-const on purpose, see TelePacket::getData() - */ - TUBES_DLLPUBLIC bool sendPacket( TelePacket& rPacket ); + TUBES_DLLPUBLIC bool sendPacket( const OString& rPacket ); /** Pop a received packet. */ - bool popPacket( TelePacket& rPacket ); + bool popPacket( OString& rPacket ); - /** Queue incoming data as TelePacket */ - void queue( const char* pDBusSender, const char* pPacket, int nSize ); - void queue( TelePacket &rPacket ); + /** Queue incoming data as OString */ + void queue( const char* pPacket, int nSize ); + void queue( const OString& rPacket ); TUBES_DLLPUBLIC void invite( TpContact *pContact ); /** Emitted when a packet is received. */ - boost::signals2::signal<void (TelePacket&)> sigPacketReceived; + boost::signals2::signal<void (const OString&)> sigPacketReceived; typedef void (*FileSentCallback)( bool aSuccess, void* pUserData); TUBES_DLLPUBLIC void sendFile( rtl::OUString &localUri, FileSentCallback pCallback, void* pUserData); @@ -107,6 +101,7 @@ public: void* pUserData); private: + typedef ::std::queue<OString> TelePacketQueue; bool spinUntilTubeEstablished(); bool setTube( GDBusConnection* pTube); diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index f495c24..d51154e 100644 --- a/tubes/inc/tubes/manager.hxx +++ b/tubes/inc/tubes/manager.hxx @@ -32,7 +32,6 @@ #include <sal/config.h> #include "tubes/tubesdllapi.h" #include "tubes/conference.hxx" -#include "tubes/packet.hxx" #include "tubes/contact-list.hxx" #include <rtl/ustring.hxx> #include <salhelper/thread.hxx> diff --git a/tubes/inc/tubes/packet.hxx b/tubes/inc/tubes/packet.hxx deleted file mode 100644 index 21136fb..0000000 --- a/tubes/inc/tubes/packet.hxx +++ /dev/null @@ -1,83 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * Version: MPL 1.1 / GPLv3+ / LGPLv3+ - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License or as specified alternatively below. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * Major Contributor(s): - * Copyright (C) 2012 Red Hat, Inc., Eike Rathke <er...@redhat.com> - * - * All Rights Reserved. - * - * For minor contributions see the git repository. - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 3 or later (the "GPLv3+"), or - * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), - * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable - * instead of those above. - */ - -#ifndef INCLUDED_TUBES_PACKET_HXX -#define INCLUDED_TUBES_PACKET_HXX - -#include <sal/config.h> -#include <rtl/string.hxx> -#include <rtl/byteseq.hxx> - - -class TelePacket -{ -public: - - TelePacket( const char* pSender, const char* pData, int nSize ) - : - maSender( pSender), - maData( reinterpret_cast<const sal_Int8*>(pData), static_cast<sal_Int32>(nSize) ) - { - } - - explicit TelePacket( const TelePacket& r ) - : - maSender( r.maSender), - maData( r.maData) - { - } - - TelePacket() {} - - /** Underlying getArray() ensures reference count is exactly one, hence - this method is non-const! */ - const char* getData() { return reinterpret_cast<const char*>( maData.getArray()); } - sal_Int32 getSize() const { return maData.getLength(); } - - bool operator==( const TelePacket& r ) const - { return maSender == r.maSender && maData == r.maData; } - - TelePacket& operator=( const TelePacket& r ) - { - if (this == &r) - return *this; - maSender = r.maSender; - maData = r.maData; - return *this; - } - -private: - - rtl::OString maSender; - rtl::ByteSequence maData; - -}; - -#endif // INCLUDED_TUBES_PACKET_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx index da18209..fde9368 100644 --- a/tubes/source/conference.cxx +++ b/tubes/source/conference.cxx @@ -110,7 +110,7 @@ void TeleConference::methodCallHandler( SAL_INFO( "tubes", "TeleConference::methodCallHandler: received packet from sender " << (pSender ? pSender : "(null)") << " with size " << nPacketSize); - pConference->queue( pSender, pPacketData, nPacketSize); + pConference->queue( pPacketData, nPacketSize ); g_dbus_method_invocation_return_value( pInvocation, 0 ); g_variant_unref( ay); @@ -376,7 +376,7 @@ void TeleConference::finalize() } -bool TeleConference::sendPacket( TelePacket& rPacket ) +bool TeleConference::sendPacket( const OString& rPacket ) { INFO_LOGGER( "TeleConference::sendPacket"); @@ -388,9 +388,9 @@ bool TeleConference::sendPacket( TelePacket& rPacket ) /* FIXME: in GLib 2.32 we can use g_variant_new_fixed_array(). It does * essentially this. */ - void* pData = g_memdup( rPacket.getData(), rPacket.getSize() ); + void* pData = g_memdup( rPacket.getStr(), rPacket.getLength() ); GVariant *pParameters = g_variant_new_from_data( G_VARIANT_TYPE("(ay)"), - pData, rPacket.getSize(), + pData, rPacket.getLength(), FALSE, g_free, pData); @@ -411,7 +411,7 @@ bool TeleConference::sendPacket( TelePacket& rPacket ) } -void TeleConference::queue( TelePacket &rPacket ) +void TeleConference::queue( const OString &rPacket ) { INFO_LOGGER( "TeleConference::queue"); @@ -421,9 +421,9 @@ void TeleConference::queue( TelePacket &rPacket ) } -void TeleConference::queue( const char* pDBusSender, const char* pPacketData, int nPacketSize ) +void TeleConference::queue( const char* pPacketData, int nPacketSize ) { - TelePacket aPacket( pDBusSender, pPacketData, nPacketSize ); + OString aPacket( pPacketData, nPacketSize ); queue( aPacket ); } @@ -514,7 +514,7 @@ void TeleConference::sendFile( rtl::OUString &localUri, FileSentCallback pCallba } -bool TeleConference::popPacket( TelePacket& rPacket ) +bool TeleConference::popPacket( OString& rPacket ) { INFO_LOGGER( "TeleConference::popPacket"); diff --git a/tubes/source/packet.cxx b/tubes/source/packet.cxx deleted file mode 100644 index 2793986..0000000 --- a/tubes/source/packet.cxx +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * Version: MPL 1.1 / GPLv3+ / LGPLv3+ - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License or as specified alternatively below. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * Major Contributor(s): - * Copyright (C) 2012 Red Hat, Inc., Eike Rathke <er...@redhat.com> - * - * All Rights Reserved. - * - * For minor contributions see the git repository. - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 3 or later (the "GPLv3+"), or - * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), - * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable - * instead of those above. - */ - -#include <tubes/packet.hxx> - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits