Makefile.top | 3 ++-
sc/source/ui/collab/contacts.cxx | 7 ++++++-
svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx | 1 -
svx/inc/svx/sdr/attribute/sdrtextattribute.hxx | 1 -
svx/source/sdr/attribute/sdrformtextattribute.cxx | 5 -----
svx/source/sdr/attribute/sdrtextattribute.cxx | 5 -----
tubes/inc/tubes/contact-list.hxx | 6 ++++++
tubes/source/contact-list.cxx | 15 +++++++++++++++
unusedcode.easy | 2 --
9 files changed, 29 insertions(+), 16 deletions(-)
New commits:
commit 8348b2a7a0772e3fb28be9475e38eb394976b9a5
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Tue Jul 24 21:56:55 2012 +0200
clean also WORKDIR for --with-solver-and-workdir-root
Change-Id: Ie2b369b6f372a99dbc4af5045639b2ff8425568f
diff --git a/Makefile.top b/Makefile.top
index 1c7b400..11468c5 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -320,7 +320,8 @@ clean: clean-host clean-build
clean-host:
rm -fr $(DEVINSTALLDIR)
- rm -fr $(SOLARVER)/$(INPATH) # not necessarily below SRCDIR
+ rm -fr $(OUTDIR)
+ rm -fr $(WORKDIR)
rm -fr $(SRCDIR)/*/$(INPATH)
rm -fr install
commit 9c6a6ec047261aab6b0e4b9ac4f3206aebc0d192
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Tue Jul 24 13:56:51 2012 +0200
tubes: keep contacts dialog updated on contacts' presence changes
- make the dialog - TubeContacts static pointer, so there is only one
Change-Id: I12f256bebc27ba31a82082d7107066de8079893c
diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx
index 5ade483..80cb756 100644
--- a/sc/source/ui/collab/contacts.cxx
+++ b/sc/source/ui/collab/contacts.cxx
@@ -190,6 +190,9 @@ public:
sHeader += String( ScResId( STR_HEADER_NAME ) );
sHeader += '\t';
maList.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_LEFT );
+
+ mpManager->getContactList()->sigContactListChanged.connect(
+ boost::bind( &TubeContacts::Populate, this ) );
}
virtual ~TubeContacts()
{
@@ -204,6 +207,8 @@ public:
void Populate()
{
+ SAL_INFO( "sc.tubes", "Populating contact list dialog" );
+ maList.Clear();
ContactList *pContacts = mpManager->getContactList();
if ( pContacts )
{
@@ -272,7 +277,7 @@ namespace tubes {
void createContacts()
{
#ifdef CONTACTS_DLG
- TubeContacts *pContacts = new TubeContacts();
+ static TubeContacts *pContacts = new TubeContacts();
pContacts->Populate();
#endif
}
diff --git a/tubes/inc/tubes/contact-list.hxx b/tubes/inc/tubes/contact-list.hxx
index 9c48ab7..bb504dc 100644
--- a/tubes/inc/tubes/contact-list.hxx
+++ b/tubes/inc/tubes/contact-list.hxx
@@ -29,10 +29,12 @@
#ifndef INCLUDED_TUBES_CONTACT_LIST_HXX
#define INCLUDED_TUBES_CONTACT_LIST_HXX
+#include <set>
#include <utility>
#include <vector>
#include "tubes/tubesdllapi.h"
+#include <tubes/warnings_guard_boost_signals2.hpp>
typedef struct _TpAccount TpAccount;
typedef struct _TpContact TpContact;
@@ -49,8 +51,12 @@ public:
AccountContactPairV getContacts();
+ /** Emitted when a contact changes its presence. */
+ boost::signals2::signal<void ()> sigContactListChanged;
+
private:
TpAccountManager* mpAccountManager;
+ std::set< TpContact* > maRegistered;
};
diff --git a/tubes/source/contact-list.cxx b/tubes/source/contact-list.cxx
index 0d46803..78f84b5 100644
--- a/tubes/source/contact-list.cxx
+++ b/tubes/source/contact-list.cxx
@@ -92,6 +92,15 @@ tb_contact_is_online (TpContact *contact)
}
}
+static void presence_changed_cb( TpContact* /* contact */,
+ guint /* type */,
+ gchar* /* status */,
+ gchar* /* message */,
+ gpointer pContactList )
+{
+ reinterpret_cast<ContactList*> (pContactList)->sigContactListChanged();
+}
+
AccountContactPairV ContactList::getContacts()
{
GList *accounts;
@@ -121,6 +130,12 @@ AccountContactPairV ContactList::getContacts()
{
TpContact *contact =
reinterpret_cast<TpContact *>(g_ptr_array_index (contacts, i));
+ if (maRegistered.find (contact) == maRegistered.end())
+ {
+ maRegistered.insert (contact);
+ g_signal_connect (contact, "presence-changed",
+ G_CALLBACK (presence_changed_cb), this );
+ }
if (contact != self &&
tb_contact_is_online (contact))
commit 5800c9aa3052aaa1429edb110e9b0291aa642cd7
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Tue Jul 24 16:38:27 2012 +0200
unusedcode: svx: remove unused methods
Change-Id: I50af310bef92f8f36c31b5b4f343639e89c628ac
diff --git a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx
b/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx
index cae7723..2d42088 100644
--- a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx
@@ -64,7 +64,6 @@ namespace drawinglayer
sal_Int32 getFormTextStart() const;
sal_Int32 getFormTextShdwXVal() const;
sal_Int32 getFormTextShdwYVal() const;
- sal_uInt16 getFormTextShdwTransp() const;
XFormTextStyle getFormTextStyle() const;
XFormTextAdjust getFormTextAdjust() const;
XFormTextShadow getFormTextShadow() const;
diff --git a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
index e3d4220..132d2e5 100644
--- a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
@@ -105,7 +105,6 @@ namespace drawinglayer
bool isScroll() const;
bool isInEditMode() const;
bool isFixedCellHeight() const;
- bool isWrongSpell() const;
const SdrFormTextAttribute& getSdrFormTextAttribute() const;
sal_Int32 getTextLeftDistance() const;
sal_Int32 getTextUpperDistance() const;
diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx
b/svx/source/sdr/attribute/sdrformtextattribute.cxx
index d18e64a..fd22876 100644
--- a/svx/source/sdr/attribute/sdrformtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx
@@ -372,11 +372,6 @@ namespace drawinglayer
return mpSdrFormTextAttribute->getFormTextShdwYVal();
}
- sal_uInt16 SdrFormTextAttribute::getFormTextShdwTransp() const
- {
- return mpSdrFormTextAttribute->getFormTextShdwTransp();
- }
-
XFormTextStyle SdrFormTextAttribute::getFormTextStyle() const
{
return mpSdrFormTextAttribute->getFormTextStyle();
diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx
b/svx/source/sdr/attribute/sdrtextattribute.cxx
index 022829f..8f73736 100644
--- a/svx/source/sdr/attribute/sdrtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrtextattribute.cxx
@@ -406,11 +406,6 @@ namespace drawinglayer
return mpSdrTextAttribute->isFixedCellHeight();
}
- bool SdrTextAttribute::isWrongSpell() const
- {
- return mpSdrTextAttribute->isWrongSpell();
- }
-
const SdrFormTextAttribute&
SdrTextAttribute::getSdrFormTextAttribute() const
{
return mpSdrTextAttribute->getSdrFormTextAttribute();
diff --git a/unusedcode.easy b/unusedcode.easy
index d3fa93e..29b66c0 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -240,8 +240,6 @@ connectivity::sdbcx::OGroup::OGroup(unsigned char)
connectivity::toString(com::sun::star::uno::Any const&)
cppcanvas::internal::ImplSprite::ImplSprite(com::sun::star::uno::Reference<com::sun::star::rendering::XSpriteCanvas>
const&,
com::sun::star::uno::Reference<com::sun::star::rendering::XAnimatedSprite>
const&,
boost::shared_ptr<cppcanvas::internal::ImplSpriteCanvas::TransformationArbiter>
const&)
dbtools::getConnection(rtl::OUString const&, rtl::OUString const&,
rtl::OUString const&,
com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>
const&)
-drawinglayer::attribute::SdrFormTextAttribute::getFormTextShdwTransp() const
-drawinglayer::attribute::SdrTextAttribute::isWrongSpell() const
formula::FormulaTokenIterator::First()
jfw_plugin::VendorBase::createInstance()
nullcanvas::SpriteCanvasHelper::backgroundPaint(basegfx::B2DRange const&)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
