[Desktop-packages] [Bug 1373928]
(In reply to comment #24) You mean $(call gb_Library__get_name,cui) will expand to mergedlib (or something like that) in the --enable-mergedlib case? Sure, (e.g. to libmergedlo.so) and to libcuilo.so in --disable-mergelibs case. -- You received this bug notification because you are a member of Desktop Packages, which is subscribed to libreoffice in Ubuntu. https://bugs.launchpad.net/bugs/1373928 Title: Numeric values are not shown and displayed as 0 Status in LibreOffice Productivity Suite: Confirmed Status in “libreoffice” package in Ubuntu: Fix Released Bug description: See upstream bug for details: https://bugs.freedesktop.org/show_bug.cgi?id=84315 Numeric are not correctly display and either an empty field or 0 is shown. To manage notifications about this bug go to: https://bugs.launchpad.net/df-libreoffice/+bug/1373928/+subscriptions -- Mailing list: https://launchpad.net/~desktop-packages Post to : desktop-packages@lists.launchpad.net Unsubscribe : https://launchpad.net/~desktop-packages More help : https://help.launchpad.net/ListHelp
[Desktop-packages] [Bug 1373928]
Sorry, I was probably not clear enough in my first comment. :-/ (In reply to comment #22) So we should change the dlopen() mechanism in the mergedlibs case Ideally we would just kill this dlopen. Is there an #ifdef we can do to detect mergedlibs case? I guess it was removed because it's not necessary.. git grep CUI_DLL_NAME vcl/ shows -DCUI_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,cui))\ \ in makefile, and you can then use in source CUI_DLL_NAME instead of just cui without any #ifdefs It expands to the exact platform specific name, so no need for SVLIBRARY then. But really, we should kill that ugly createDataAccessToolsFactory mess and benefit. :-) -- You received this bug notification because you are a member of Desktop Packages, which is subscribed to libreoffice in Ubuntu. https://bugs.launchpad.net/bugs/1373928 Title: Numeric values are not shown and displayed as 0 Status in LibreOffice Productivity Suite: Confirmed Status in “libreoffice” package in Ubuntu: Fix Released Bug description: See upstream bug for details: https://bugs.freedesktop.org/show_bug.cgi?id=84315 Numeric are not correctly display and either an empty field or 0 is shown. To manage notifications about this bug go to: https://bugs.launchpad.net/df-libreoffice/+bug/1373928/+subscriptions -- Mailing list: https://launchpad.net/~desktop-packages Post to : desktop-packages@lists.launchpad.net Unsubscribe : https://launchpad.net/~desktop-packages More help : https://help.launchpad.net/ListHelp
[Bug 1373928]
(In reply to comment #24) You mean $(call gb_Library__get_name,cui) will expand to mergedlib (or something like that) in the --enable-mergedlib case? Sure, (e.g. to libmergedlo.so) and to libcuilo.so in --disable-mergelibs case. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1373928 Title: Numeric values are not shown and displayed as 0 To manage notifications about this bug go to: https://bugs.launchpad.net/df-libreoffice/+bug/1373928/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 1373928]
Sorry, I was probably not clear enough in my first comment. :-/ (In reply to comment #22) So we should change the dlopen() mechanism in the mergedlibs case Ideally we would just kill this dlopen. Is there an #ifdef we can do to detect mergedlibs case? I guess it was removed because it's not necessary.. git grep CUI_DLL_NAME vcl/ shows -DCUI_DLL_NAME=\$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,cui))\ \ in makefile, and you can then use in source CUI_DLL_NAME instead of just cui without any #ifdefs It expands to the exact platform specific name, so no need for SVLIBRARY then. But really, we should kill that ugly createDataAccessToolsFactory mess and benefit. :-) -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1373928 Title: Numeric values are not shown and displayed as 0 To manage notifications about this bug go to: https://bugs.launchpad.net/df-libreoffice/+bug/1373928/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Desktop-packages] [Bug 1373928]
Ah, in 8165fc23014c8044c131cb6e1fd0c5e06fd0da2d I've added dbtools to libmerged just to fix circular dependency without checking it's OK. git grep 'dbtools' finds svx/source/form/dbtoolsclient.cxx sw/source/uibase/dbui/swdbtoolsclient.cxx there might be more but hopefully this is all. One option is fix similar to 'git grep CUI_DLL_NAME vcl/' But in this case, since svxcore already links against dbtools, we either want to link also sw properly and fix those files. Or, get dbtools out of libmerged and create some hack for whatever was the reason to link against dbtools in 86bdb13704d9d85a247339071a86d301ce86cd7f fdo#67615 TextField in table should use same formatting as floating TextField I don't know what's in dbtools library. I would think it's not core functionality to be really needed and used in libmerged (svxcore) but maybe it is? It's also not the smallest one, 2.2MB This also could be an easy hack. -- You received this bug notification because you are a member of Desktop Packages, which is subscribed to libreoffice in Ubuntu. https://bugs.launchpad.net/bugs/1373928 Title: Numeric values are not shown and displayed as 0 Status in LibreOffice Productivity Suite: Confirmed Status in “libreoffice” package in Ubuntu: Confirmed Bug description: See upstream bug for details: https://bugs.freedesktop.org/show_bug.cgi?id=84315 Numeric are not correctly display and either an empty field or 0 is shown. To manage notifications about this bug go to: https://bugs.launchpad.net/df-libreoffice/+bug/1373928/+subscriptions -- Mailing list: https://launchpad.net/~desktop-packages Post to : desktop-packages@lists.launchpad.net Unsubscribe : https://launchpad.net/~desktop-packages More help : https://help.launchpad.net/ListHelp
[Desktop-packages] [Bug 1373928]
(In reply to comment #14) Another approach would be to tailor what's in dbtools. Maybe we can move stuff from it to another library if it helps? Ah, no, it's fine. Sorry, I should not ask that much. I am not really against dbtools in libmerged, it surely has its reasons. Main reason I've added you to cc was, just so that you know about this bug - which probably was not necessary :-) Thanks for explanations! -- You received this bug notification because you are a member of Desktop Packages, which is subscribed to libreoffice in Ubuntu. https://bugs.launchpad.net/bugs/1373928 Title: Numeric values are not shown and displayed as 0 Status in LibreOffice Productivity Suite: Confirmed Status in “libreoffice” package in Ubuntu: Confirmed Bug description: See upstream bug for details: https://bugs.freedesktop.org/show_bug.cgi?id=84315 Numeric are not correctly display and either an empty field or 0 is shown. To manage notifications about this bug go to: https://bugs.launchpad.net/df-libreoffice/+bug/1373928/+subscriptions -- Mailing list: https://launchpad.net/~desktop-packages Post to : desktop-packages@lists.launchpad.net Unsubscribe : https://launchpad.net/~desktop-packages More help : https://help.launchpad.net/ListHelp
[Bug 1373928]
Ah, in 8165fc23014c8044c131cb6e1fd0c5e06fd0da2d I've added dbtools to libmerged just to fix circular dependency without checking it's OK. git grep 'dbtools' finds svx/source/form/dbtoolsclient.cxx sw/source/uibase/dbui/swdbtoolsclient.cxx there might be more but hopefully this is all. One option is fix similar to 'git grep CUI_DLL_NAME vcl/' But in this case, since svxcore already links against dbtools, we either want to link also sw properly and fix those files. Or, get dbtools out of libmerged and create some hack for whatever was the reason to link against dbtools in 86bdb13704d9d85a247339071a86d301ce86cd7f fdo#67615 TextField in table should use same formatting as floating TextField I don't know what's in dbtools library. I would think it's not core functionality to be really needed and used in libmerged (svxcore) but maybe it is? It's also not the smallest one, 2.2MB This also could be an easy hack. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1373928 Title: Numeric values are not shown and displayed as 0 To manage notifications about this bug go to: https://bugs.launchpad.net/df-libreoffice/+bug/1373928/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 1373928]
(In reply to comment #14) Another approach would be to tailor what's in dbtools. Maybe we can move stuff from it to another library if it helps? Ah, no, it's fine. Sorry, I should not ask that much. I am not really against dbtools in libmerged, it surely has its reasons. Main reason I've added you to cc was, just so that you know about this bug - which probably was not necessary :-) Thanks for explanations! -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1373928 Title: Numeric values are not shown and displayed as 0 To manage notifications about this bug go to: https://bugs.launchpad.net/df-libreoffice/+bug/1373928/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Libreoffice-commits] .: 5 commits - tubes/CppunitTest_tubes_test.mk tubes/inc tubes/Library_tubes.mk tubes/qa tubes/source
tubes/CppunitTest_tubes_test.mk | 11 --
tubes/Library_tubes.mk |2
tubes/inc/tubes/contact-list.hxx |5
tubes/inc/tubes/manager.hxx | 41 +--
tubes/qa/test_manager.cxx| 175 +---
tubes/source/collaboration.cxx |6 -
tubes/source/contact-list.cxx| 23
tubes/source/contacts.cxx|3
tubes/source/manager.cxx | 213 ---
9 files changed, 165 insertions(+), 314 deletions(-)
New commits:
commit 4662df8a7561ce71ba00accbb5170e10818d6008
Author: Matúš Kukan matus.ku...@gmail.com
Date: Thu Aug 16 10:53:35 2012 +0200
tubes: simplify and make more readable, I believe
Change-Id: I83a4332d9947d03382b10ea050f26bf3ed544299
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index ce17fd9..032f539 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -132,11 +132,6 @@ public:
// Only for callbacks.
static void addConference( TeleConference* pConference );
-static void setChannelReadyHandlerInvoked( bool b );
-static bool isChannelReadyHandlerInvoked();
-static void setAccountManagerReady( bool bPrepared);
-static void setAccountManagerReadyHandlerInvoked( bool b );
-static bool isAccountManagerReadyHandlerInvoked();
/// LibreOfficeWhatEver
static rtl::OString getFullClientName();
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index f1548c5..d8884ee 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -87,9 +87,9 @@ public:
TpBaseClient* mpClient;
TpBaseClient* mpFileTransferClient;
TpAccountManager* mpAccountManager;
-boolmbAccountManagerReady : 1;
-boolmbAccountManagerReadyHandlerInvoked :
1;
-boolmbChannelReadyHandlerInvoked : 1;
+static bool mbAccountManagerReady;
+static bool mbAccountManagerReadyHandlerInvoked;
+static bool mbChannelReadyHandlerInvoked;
ContactList*mpContactList;
OString msCurrentUUID;
OString msNameSuffix;
@@ -102,9 +102,14 @@ public:
TeleManagerImpl();
~TeleManagerImpl();
+static void AccountManagerReadyHandler( GObject* pSourceObject,
GAsyncResult* pResult, gpointer pUserData );
+static void ChannelReadyHandler( GObject* pSourceObject, GAsyncResult*
pResult, gpointer pUserData );
};
TeleManagerImpl* TeleManager::pImpl = new TeleManagerImpl();
+bool TeleManagerImpl::mbAccountManagerReady;
+bool TeleManagerImpl::mbAccountManagerReadyHandlerInvoked;
+bool TeleManagerImpl::mbChannelReadyHandlerInvoked;
static void TeleManager_DBusChannelHandler(
TpSimpleHandler*/*handler*/,
@@ -307,14 +312,6 @@ static void TeleManager_TransferError( EmpathyFTHandler
*handler, const GError *
g_object_unref( handler);
}
-static void lcl_iterateLoop( bool (*pFunc)() )
-{
-while (!(*pFunc)())
-{
-g_main_context_iteration( NULL, TRUE );
-}
-}
-
static void lcl_IncomingHandlerReady (
EmpathyFTHandler* pHandler,
GError* pError,
@@ -389,20 +386,20 @@ static void TeleManager_FileTransferHandler(
}
}
-static void TeleManager_ChannelReadyHandler(
+void TeleManagerImpl::ChannelReadyHandler(
GObject*pSourceObject,
GAsyncResult* pResult,
gpointerpUserData
)
{
-INFO_LOGGER_F( TeleManager_ChannelReadyHandler);
+INFO_LOGGER_F( TeleManagerImpl::ChannelReadyHandler);
TeleConference* pConference = reinterpret_castTeleConference*(pUserData);
-SAL_WARN_IF( !pConference, tubes, TeleManager_ChannelReadyHandler: no
conference);
+SAL_WARN_IF( !pConference, tubes, TeleManagerImpl::ChannelReadyHandler:
no conference);
if (!pConference)
return;
-TeleManager::setChannelReadyHandlerInvoked( true );
+mbChannelReadyHandlerInvoked = true;
TpAccountChannelRequest* pChannelRequest = TP_ACCOUNT_CHANNEL_REQUEST(
pSourceObject);
GError* pError = NULL;
@@ -412,7 +409,7 @@ static void TeleManager_ChannelReadyHandler(
{
// account isn't Enabled means just that..
/* FIXME: detect and handle, domain=132, code=3 */
-SAL_WARN( tubes, TeleManager_ChannelReadyHandler: no channel:
pError-message);
+SAL_WARN( tubes, TeleManagerImpl::ChannelReadyHandler: no channel:
pError-message);
g_error_free( pError);
return;
}
@@ -421,25 +418,25 @@ static void TeleManager_ChannelReadyHandler(
pConference-offerTube();
}
[Libreoffice-commits] .: Makefile.top
Makefile.top | 20 +++- 1 file changed, 7 insertions(+), 13 deletions(-) New commits: commit af69e72e1d6c04e23f17c4d1e58aa891b95611ee Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Aug 16 18:25:16 2012 +0200 avoid defining gb_TAILBUILDMODULES, use the command only when necessary This enables to properly use make module.all for builds without dictionaries and hopefully also solves the problem behind 5133d3c48fd6d2a795e42b87a1e7b464946606a3 Change-Id: I43872864aa135014ea51d15b34ef4de151f14c3d diff --git a/Makefile.top b/Makefile.top index b23b5be..d08cd5e 100644 --- a/Makefile.top +++ b/Makefile.top @@ -247,10 +247,6 @@ xpdf\ xsltml\ zlib\ -ifneq ($(wildcard dictionaries/Module_dictionaries.mk),) -gb_TAILBUILDMODULES := $(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules) -endif - export gb_TAILBUILDTARGET=all slowcheck define gbuild_module_rules @@ -259,16 +255,14 @@ define gbuild_module_rules $(1): bootstrap fetch cd $(1) $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) gb_PARTIALBUILD=T -ifeq ($(filter $(1),$(gb_TAILBUILDMODULES)),) -$(1).all: bootstrap fetch - cd $(1) unset MAKEFLAGS \ -$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) -else $(1).all: bootstrap fetch - cd tail_build unset MAKEFLAGS \ - export gb_TAILBUILDTARGET=$(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1) \ -$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) -endif + $$(if $$(filter $(1),$$(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules)), \ + cd tail_build unset MAKEFLAGS \ + export gb_TAILBUILDTARGET=$(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1) \ + , \ + cd $(1) unset MAKEFLAGS \ + ) \ + $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) $(1).clean: cd $(1) $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean gb_PARTIALBUILD=T ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: comphelper/inc comphelper/source
comphelper/inc/comphelper/storagehelper.hxx | 177 -
comphelper/source/misc/storagehelper.cxx| 511 ++--
2 files changed, 356 insertions(+), 332 deletions(-)
New commits:
commit e3648d4ebc7378cc31b6ce73716328f48b8903e5
Author: Matúš Kukan matus.ku...@gmail.com
Date: Thu Aug 16 21:47:01 2012 +0200
Revert Cleanup comphelper::storagehelper
This reverts commit 72777a66bb8d9e71c4786c282c7971d7ededa729.
+using namespace com::sun::star::uno; in header is not a good idea
Fails to compile and is hard to parse and figure out what was the point,
so just reverting.
Also +using rtl::OUString; is automatic nowadays whenever possible and
RTL_CONSTASCII_USTRINGPARAM is obsoleted.
Change-Id: I24cb24b7f1a6007734d26cbba41d46323cb55b18
diff --git a/comphelper/inc/comphelper/storagehelper.hxx
b/comphelper/inc/comphelper/storagehelper.hxx
index 5e4916e..f255dc8 100644
--- a/comphelper/inc/comphelper/storagehelper.hxx
+++ b/comphelper/inc/comphelper/storagehelper.hxx
@@ -33,20 +33,14 @@
#include com/sun/star/io/XStream.hpp
#include comphelper/comphelperdllapi.h
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::embed;
-using namespace com::sun::star::io;
-using namespace com::sun::star::beans;
-using rtl::OUString;
-#define PACKAGE_STORAGE_FORMAT_STRING OUString( RTL_CONSTASCII_USTRINGPARAM(
PackageFormat ) )
-#define ZIP_STORAGE_FORMAT_STRING OUString( RTL_CONSTASCII_USTRINGPARAM(
ZipFormat ) )
-#define OFOPXML_STORAGE_FORMAT_STRING OUString( RTL_CONSTASCII_USTRINGPARAM(
OFOPXMLFormat ) )
+#define PACKAGE_STORAGE_FORMAT_STRING ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageFormat ) )
+#define ZIP_STORAGE_FORMAT_STRING ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ZipFormat ) )
+#define OFOPXML_STORAGE_FORMAT_STRING ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( OFOPXMLFormat ) )
-#define PACKAGE_ENCRYPTIONDATA_SHA256UTF8 OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA256UTF8EncryptionKey ) )
-#define PACKAGE_ENCRYPTIONDATA_SHA1UTF8 OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA1UTF8EncryptionKey ) )
-#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA1MS1252EncryptionKey ) )
+#define PACKAGE_ENCRYPTIONDATA_SHA256UTF8 ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA256UTF8EncryptionKey ) )
+#define PACKAGE_ENCRYPTIONDATA_SHA1UTF8 ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA1UTF8EncryptionKey ) )
+#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA1MS1252EncryptionKey ) )
namespace comphelper {
@@ -69,120 +63,131 @@ public:
class COMPHELPER_DLLPUBLIC OStorageHelper
{
public:
-static Reference XSingleServiceFactory
+static ::com::sun::star::uno::Reference
::com::sun::star::lang::XSingleServiceFactory
GetStorageFactory(
-const Reference XMultiServiceFactory xSF = Reference
XMultiServiceFactory () )
-throw ( Exception );
+const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xSF
+= ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory () )
+throw ( ::com::sun::star::uno::Exception );
-static Reference XSingleServiceFactory
+static ::com::sun::star::uno::Reference
::com::sun::star::lang::XSingleServiceFactory
GetFileSystemStorageFactory(
-const Reference XMultiServiceFactory xSF = Reference
XMultiServiceFactory () )
-throw ( Exception );
+const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xSF
+= ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory () )
+throw ( ::com::sun::star::uno::Exception );
-static Reference XStorage
+static ::com::sun::star::uno::Reference ::com::sun::star::embed::XStorage
GetTemporaryStorage(
-const Reference XMultiServiceFactory xFactory = Reference
XMultiServiceFactory () )
-throw ( Exception );
+const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xFactory
+= ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory () )
+throw ( ::com::sun::star::uno::Exception );
-// this one will only return Storage
-static Reference XStorage
+/// this one will only return Storage
+static ::com::sun::star::uno::Reference ::com::sun::star::embed::XStorage
GetStorageFromURL(
-const OUString aURL, sal_Int32 nStorageMode,
-const Reference XMultiServiceFactory xFactory = Reference
XMultiServiceFactory () )
-throw ( Exception );
+const ::rtl::OUString aURL,
+sal_Int32 nStorageMode,
+
[Libreoffice-commits] .: 4 commits - autodoc/Module_autodoc.mk cosv/Module_cosv.mk sc/source solenv/gbuild tubes/Executable_liboapprover.mk tubes/inc tubes/Library_tubes.mk tubes/source udm/Module_udm
autodoc/Module_autodoc.mk |2 -
cosv/Module_cosv.mk |4 ++
sc/source/ui/collab/sccollaboration.cxx |3 -
sc/source/ui/inc/sccollaboration.hxx|2 -
solenv/gbuild/Executable.mk |1
tubes/Executable_liboapprover.mk| 12 ++
tubes/Library_tubes.mk |1
tubes/inc/tubes/collaboration.hxx |2 -
tubes/inc/tubes/manager.hxx |1
tubes/source/conference.cxx | 32 -
tubes/source/contact-list.cxx |9 +---
tubes/source/manager.cxx| 60 +++-
udm/Module_udm.mk |4 ++
13 files changed, 57 insertions(+), 76 deletions(-)
New commits:
commit e9ed269c9ec985e1f4046addfab05c1c3795da68
Author: Matúš Kukan matus.ku...@gmail.com
Date: Mon Aug 13 13:03:08 2012 +0200
tubes: clean this makefile
Change-Id: Iaae75640e2daac0edce609a99f20056e12756ffc
diff --git a/tubes/Executable_liboapprover.mk b/tubes/Executable_liboapprover.mk
index 63f8177..feb9bca 100644
--- a/tubes/Executable_liboapprover.mk
+++ b/tubes/Executable_liboapprover.mk
@@ -26,18 +26,14 @@
$(eval $(call gb_Executable_Executable,liboapprover))
-$(eval $(call gb_Executable_set_targettype_gui,liboapprover,YES))
-
$(eval $(call gb_Executable_set_include,liboapprover,\
+-I$(SRCDIR)/tubes/inc \
$$(INCLUDE) \
-$(GTK_CFLAGS) \
-$(TELEPATHY_CFLAGS) \
--I$(realpath $(SRCDIR)/tubes/inc) \
))
-$(eval $(call gb_Executable_add_libs,liboapprover,\
-$(GTK_LIBS) \
-$(TELEPATHY_LIBS) \
+$(eval $(call gb_Executable_use_externals,liboapprover,\
+gtk \
+telepathy \
))
$(eval $(call gb_Executable_add_cobjects,liboapprover,\
commit 62f5fc1d2f14f8164c3dd6eca5494a8c1b01301b
Author: Matúš Kukan matus.ku...@gmail.com
Date: Mon Aug 13 12:56:50 2012 +0200
this line is wrong; removing
Change-Id: I5159f3f41c3e0d6ec775a7d1700cbe1272cdb059
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 9f56296..90dfc68 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -52,7 +52,6 @@ $(call
gb_Executable__Executable_impl,$(1),Executable/$(1)$(gb_Executable_EXT))
endef
define gb_Executable__Executable_impl
-$(call gb_Executable_set_targettype_gui,$(2))
$(call gb_LinkTarget_LinkTarget,$(2))
$(call gb_LinkTarget_set_targettype,$(2),Executable)
$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \
commit 540ac996fb1441f69a59c9e8bfacca64418b8b4f
Author: Matúš Kukan matus.ku...@gmail.com
Date: Mon Aug 13 19:46:54 2012 +0200
these are needed only for odk
Change-Id: I6d9ccf819f7f887fa17a2de72f39a456a56ace24
diff --git a/autodoc/Module_autodoc.mk b/autodoc/Module_autodoc.mk
index d10c946..80d6ce6 100644
--- a/autodoc/Module_autodoc.mk
+++ b/autodoc/Module_autodoc.mk
@@ -8,7 +8,7 @@
#
$(eval $(call gb_Module_Module,autodoc))
-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+ifneq (,$(filter ODK,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,autodoc,\
Executable_autodoc \
diff --git a/cosv/Module_cosv.mk b/cosv/Module_cosv.mk
index 729185a..333594a 100644
--- a/cosv/Module_cosv.mk
+++ b/cosv/Module_cosv.mk
@@ -8,9 +8,13 @@
#
$(eval $(call gb_Module_Module,cosv))
+ifneq (,$(filter ODK,$(BUILD_TYPE)))
+
$(eval $(call gb_Module_add_targets,cosv,\
Package_inc \
StaticLibrary_cosv \
))
+endif
+
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/udm/Module_udm.mk b/udm/Module_udm.mk
index e346c87..fc85a2c 100644
--- a/udm/Module_udm.mk
+++ b/udm/Module_udm.mk
@@ -8,9 +8,13 @@
#
$(eval $(call gb_Module_Module,udm))
+ifneq (,$(filter ODK,$(BUILD_TYPE)))
+
$(eval $(call gb_Module_add_targets,udm,\
Package_inc \
StaticLibrary_udm \
))
+endif
+
# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 7f6b2321a5adbf63fdd50989e58418db93e90454
Author: Matúš Kukan matus.ku...@gmail.com
Date: Thu Aug 9 23:37:32 2012 +0200
tubes: use channel's signal closed to know when end the collaboration
Change-Id: I11e0aa2db3b41a166e23c85fd040f883e0d3be08
diff --git a/sc/source/ui/collab/sccollaboration.cxx
b/sc/source/ui/collab/sccollaboration.cxx
index 74c067c..5dc527d 100644
--- a/sc/source/ui/collab/sccollaboration.cxx
+++ b/sc/source/ui/collab/sccollaboration.cxx
@@ -27,9 +27,8 @@ ScCollaboration::~ScCollaboration()
{
}
-void ScCollaboration::ContactLeft() const
+void ScCollaboration::EndCollaboration() const
{
-SAL_INFO( sc.tubes, Contact has left the collaboration );
ScDocFuncSend* pSender = GetScDocFuncSend();
if (pSender)
{
diff --git a/sc/source/ui/inc/sccollaboration.hxx
b/sc/source/ui/inc/sccollaboration.hxx
index ece2604..1303847 100644
--- a/sc/source/ui/inc/sccollaboration.hxx
+++ b/sc/source/ui/inc/sccollaboration.hxx
@@ -23,7 +23,7 @@ public:
ScCollaboration( ScDocShell* pScDocShell );
[Libreoffice-commits] .: 3 commits - android/experimental android/qa canvas/source fileaccess/source solenv/gbuild unusedcode.easy
android/experimental/DocumentLoader/Makefile |1
android/experimental/LibreOffice4Android/Makefile |1
android/qa/desktop/Makefile |1
android/qa/sc/Makefile|1
canvas/source/null/null_spritecanvashelper.cxx| 23 ---
canvas/source/null/null_spritecanvashelper.hxx| 32 --
fileaccess/source/FileAccess.cxx |6 ++--
solenv/gbuild/extensions/pre_MergedLibsList.mk| 10 +-
unusedcode.easy |4 --
9 files changed, 11 insertions(+), 68 deletions(-)
New commits:
commit d10b5d34a266f1e1793109a629804cd54f665258
Author: Matúš Kukan matus.ku...@gmail.com
Date: Sun Aug 12 14:56:36 2012 +0200
fileaccess: use anonymous namespace
Change-Id: I697850a43c9942833776c60752cf4639ec255768
diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx
index 710050b..d6f2b14 100644
--- a/fileaccess/source/FileAccess.cxx
+++ b/fileaccess/source/FileAccess.cxx
@@ -70,7 +70,7 @@ using namespace ::com::sun::star::container;
using ::std::vector;
-namespace io_FileAccess
+namespace
{
@@ -858,8 +858,8 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL
fileacc_component_getFactory(
Reference XSingleServiceFactory xFactory( cppu::createSingleFactory(
reinterpret_cast XMultiServiceFactory * ( pServiceManager ),
rtl::OUString::createFromAscii( pImplName ),
-io_FileAccess::FileAccess_CreateInstance,
-io_FileAccess::FileAccess_getSupportedServiceNames() ) );
+FileAccess_CreateInstance,
+FileAccess_getSupportedServiceNames() ) );
if (xFactory.is())
{
commit 5f9774ed5fccfc3971736d899b11e24a8081442d
Author: Matúš Kukan matus.ku...@gmail.com
Date: Fri May 18 09:54:55 2012 +0200
merge these libraries only for android
Change-Id: Ibbb97782f3ec6aa774c4a32d8798a9729aee494f
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index 279f6a4..c7901a7 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -65,7 +65,6 @@ copy-stuff:
evtattlo \
expwrap.uno \
fastsax.uno \
- fileacc \
forlo \
foruilo \
frmlo \
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index 1365407..3a49c7d 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -36,7 +36,6 @@ copy-stuff:
evtattlo \
expwrap.uno \
fastsax.uno \
- fileacc \
forlo \
foruilo \
frmlo \
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 799edc2..7ad9ac0 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -99,7 +99,6 @@ copy-stuff: buildrcs
cppcanvaslo \
embobj \
expwrap.uno \
- fileacc \
forlo \
foruilo \
fsstorage.uno \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 3b92d3b..f3e4795 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -65,7 +65,6 @@ copy-stuff:
datelo \
expwrap.uno \
fastsax.uno \
- fileacc \
forlo \
foruilo \
frmlo \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 7a05039..fe75c36 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -40,8 +40,6 @@ gb_MERGEDLIBS := \
fwe \
fwi \
fwk \
- fwl \
- fwm \
lng \
package2 \
sb \
@@ -60,6 +58,14 @@ gb_MERGEDLIBS := \
gb_MERGEDLIBS += $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes)
+ifeq ($(OS),ANDROID)
+gb_MERGEDLIBS += \
+ fileacc \
+ fwl \
+ fwm \
+
+endif
+
endif
# vim: set noet sw=4 ts=4:
commit 23461fcf801a8217e7eeefa93c44ec18c7a73088
Author: Matúš Kukan matus.ku...@gmail.com
Date: Sun Aug 12 13:26:58 2012 +0200
unusedcode: SpriteCanvasHelper's methods
Change-Id: I24021fa1495a9fb48c1cb5f107d119031a4d1e87
diff --git a/canvas/source/null/null_spritecanvashelper.cxx
b/canvas/source/null/null_spritecanvashelper.cxx
index 5edd364..80ef73a 100644
--- a/canvas/source/null/null_spritecanvashelper.cxx
+++ b/canvas/source/null/null_spritecanvashelper.cxx
@@ -95,29 +95,6 @@ namespace nullcanvas
// TODO
return sal_True;
}
-
-void
[Libreoffice-commits] .: sc/inc sc/source unusedcode.easy
sc/inc/compressedarray.hxx | 185
sc/source/core/data/compressedarray.cxx | 27
unusedcode.easy |9 -
3 files changed, 221 deletions(-)
New commits:
commit 07090cac4251e254b21676b77742c07f28cccaf4
Author: Matúš Kukan matus.ku...@gmail.com
Date: Fri Aug 10 22:50:25 2012 +0200
sc: this appears to be unused
Change-Id: I22a759ef55a46dc560ebe5f802c937f1d47bf645
diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx
index eb38a3d..a20963d 100644
--- a/sc/inc/compressedarray.hxx
+++ b/sc/inc/compressedarray.hxx
@@ -36,8 +36,6 @@
const size_t nScCompressedArrayDelta = 4;
-template typename A, typename D class ScCompressedArrayIterator;
-
/** Compressed array of row (or column) entries, e.g. heights, flags, ...
The array stores ranges of values such that consecutive values occupy only
@@ -102,13 +100,8 @@ public:
// methods public for the coupled array sum methods
/** Obtain index into entries for nPos */
SC_DLLPUBLIC size_t Search( A nPos ) const;
-/** Get number of entries */
-size_t GetEntryCount() const;
protected:
-
-friend class ScCompressedArrayIteratorA,D;
-
size_t nCount;
size_t nLimit;
size_t nDelta;
@@ -165,184 +158,6 @@ const D ScCompressedArrayA,D::GetNextValue( size_t
nIndex, A nEnd ) const
return pData[nEntry].aValue;
}
-
-template typename A, typename D
-size_t ScCompressedArrayA,D::GetEntryCount() const
-{
-return nCount;
-}
-
-
-// === ScCompressedArrayIterator =
-
-/** Iterator for ScCompressedArray.
-
-@ATTENTION: the iterator is not persistant if the underlying
-ScCompressedArray happens to be changed by any means, for example by
-setting new values or adding or removing or combining entries. If you do
-such things inside a loop you MUST resynchronize the iterator by calling
-methodResync()/method with the row where resynchronization should
-start. After doing so, methodGetRangeStart()/method and
-methodGetRangeEnd()/method may not point to the previous access points
-anymore. Use with care.
- */
-
-template typename A, typename D class ScCompressedArrayIterator
-{
-public:
-ScCompressedArrayIterator(
-const ScCompressedArrayA,D rArray,
-A nStart, A nEnd );
-/// Set new start and end, position on start.
-voidNewLimits( A nStart, A nEnd );
-A GetIterStart() const;
-A GetIterEnd() const;
-/// Advance by a single access point (e.g. row).
-booloperator ++();
-A GetPos() const;
-operator bool() const;
-const Doperator *() const;
-/// Advance an entire range, one entry of the array.
-boolNextRange();
-A GetRangeStart() const;
-A GetRangeEnd() const;
-/// Resync to underlying array, calling Search().
-voidResync( A nPos );
-/** Set position without resyncing, avoid calling Search() if possible.
-Position obtained from steering coupled iterator is NOT checked for
-iterator bounds. */
-template typename X
-voidFollow( const ScCompressedArrayIteratorA,X
);
-
-private:
-const ScCompressedArrayA,D rArray;
-size_t nIndex;
-A nIterStart;
-A nIterEnd;
-A nCurrent;
-boolbEnd;
-};
-
-
-template typename A, typename D
-ScCompressedArrayIteratorA,D::ScCompressedArrayIterator(
-const ScCompressedArrayA,D rArrayP, A nStart, A nEnd )
-: rArray( rArrayP )
-// other values set in NewLimits()
-{
-NewLimits( nStart, nEnd);
-}
-
-
-template typename A, typename D
-void ScCompressedArrayIteratorA,D::NewLimits( A nStart, A nEnd )
-{
-nIterStart = nStart;
-nIterEnd = nEnd;
-nIndex = rArray.Search( nStart);
-nCurrent = GetRangeStart();
-bEnd = (nIterEnd nIterStart);
-}
-
-
-template typename A, typename D
-A ScCompressedArrayIteratorA,D::GetIterStart() const
-{
-return nIterStart;
-}
-
-
-template typename A, typename D
-A ScCompressedArrayIteratorA,D::GetIterEnd() const
-{
-return nIterEnd;
-}
-
-
-template typename A, typename D
-bool ScCompressedArrayIteratorA,D::operator++()
-{
-if (nCurrent GetRangeEnd())
-{
-++nCurrent;
-return true;
-}
-else
-return NextRange();
-}
-
-
-template typename A, typename D
-A
[Libreoffice-commits] .: 5 commits - Library_merged.mk postprocess/packcomponents RepositoryExternal.mk scripting/Module_scripting.mk scripting/Rdb_scriptproviderforbeanshell.mk scripting/Rdb_scriptpr
Library_merged.mk |5 --- RepositoryExternal.mk |4 --- postprocess/packcomponents/makefile.mk | 33 - scripting/Module_scripting.mk | 12 ++--- scripting/Rdb_scriptproviderforbeanshell.mk| 16 scripting/Rdb_scriptproviderforjavascript.mk | 16 solenv/gbuild/ComponentTarget.mk |7 + solenv/gbuild/CppunitTest.mk | 25 -- solenv/gbuild/Rdb.mk | 16 +--- solenv/gbuild/extensions/pre_MergedLibsList.mk |2 + solenv/gbuild/platform/IOS_ARM_GCC.mk |3 -- solenv/gbuild/platform/solaris.mk |2 - solenv/gbuild/platform/unxgcc.mk |2 - solenv/gbuild/platform/windows.mk |2 - 14 files changed, 48 insertions(+), 97 deletions(-) New commits: commit fe32762e119221d3738056b096a4ef054cdffa52 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Aug 9 00:15:52 2012 +0200 tubes: add to libmerged to fix circular dependency Probably it belongs in there anyway. Change-Id: I3bf908de58e0e989e263323d2fdc432308c2cab8 diff --git a/Library_merged.mk b/Library_merged.mk index 68874e1..cc54e95 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_externals,merged,\ icuuc \ jpeg \ libxml2 \ + telepathy \ zlib \ )) @@ -88,8 +89,4 @@ $(eval $(call gb_Library_use_libraries,merged,\ )) endif -ifeq ($(ENABLE_TELEPATHY),TRUE) -$(eval $(call gb_Library_use_libraries,merged,tubes)) -endif - # vim: set noet sw=4 ts=4: diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 08b3aa6..a07bdff 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1166,9 +1166,7 @@ endef else # !ENABLE_TELEPATHY -define gb_LinkTarget__use_telepathy - -endef +gb_LinkTarget__use_telepathy := endif # ENABLE_TELEPATHY diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 7bbf699..7a05039 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -58,6 +58,8 @@ gb_MERGEDLIBS := \ xmlscript \ xo \ +gb_MERGEDLIBS += $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) + endif # vim: set noet sw=4 ts=4: commit 772d15fb8ccdaa46fab0961712177baf915ed70d Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Aug 8 21:21:48 2012 +0200 create these rdbs directly in scripting Change-Id: I8a44de06f9a16308a5ff82ad77d059e5dde544f9 diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 92139ec..4ced4c1 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -412,36 +412,3 @@ $(MISC)/services.input : makefile.mk 'list$(my_components:^filename:+.component/filename)/list' \ $@ -.IF $(ENABLE_SCRIPTING_BEANSHELL) == YES -ALLTAR : $(MISC)/scriptproviderforbeanshell.rdb - -$(MISC)/scriptproviderforbeanshell.rdb .ERRREMOVE : \ -$(SOLARENV)/bin/packcomponents.xslt \ -$(MISC)/scriptproviderforbeanshell.input \ - $(SOLARXMLDIR)/component/scripting/java/ScriptProviderForBeanShell.component -$(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \ -$(SOLARENV)/bin/packcomponents.xslt \ -$(MISC)/scriptproviderforbeanshell.input - -$(MISC)/scriptproviderforbeanshell.input : makefile.mk -echo \ - 'listfilenamecomponent/scripting/java/ScriptProviderForBeanShell.component/filename/list' \ - $@ -.END - -.IF $(ENABLE_SCRIPTING_JAVASCRIPT) == YES -ALLTAR : $(MISC)/scriptproviderforjavascript.rdb - -$(MISC)/scriptproviderforjavascript.rdb .ERRREMOVE : \ -$(SOLARENV)/bin/packcomponents.xslt \ -$(MISC)/scriptproviderforjavascript.input \ - $(SOLARXMLDIR)/component/scripting/java/ScriptProviderForJavaScript.component -$(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \ -$(SOLARENV)/bin/packcomponents.xslt \ -$(MISC)/scriptproviderforjavascript.input - -$(MISC)/scriptproviderforjavascript.input : makefile.mk -echo \ - 'listfilenamecomponent/scripting/java/ScriptProviderForJavaScript.component/filename/list' \ - $@ -.END diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk index 7312f51..bf385cd 100644 --- a/scripting/Module_scripting.mk +++ b/scripting/Module_scripting.mk @@ -36,11 +36,15 @@ $(eval $(call gb_Module_add_targets,scripting,\ Jar_Highlight \ Jar_MemoryUsage \ Jar_ScriptFramework \ -$(if $(filter $(ENABLE_SCRIPTING_BEANSHELL),YES),\ -Jar_ScriptProviderForBeanShell) \ + $(if $(filter $(ENABLE_SCRIPTING_BEANSHELL),YES),\ +
[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_MSC.mk |8 1 file changed, 8 insertions(+) New commits: commit 5eb068449b287d32fe73975a6313c626184414fd Author: Matúš Kukan matus.ku...@gmail.com Date: Sun Aug 5 21:29:20 2012 +0200 honour --enable-lto on windows too Change-Id: I78637034d9fdd4a5528fe1e9c9bc752086954526 diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 8b03099..5d3116e 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -236,6 +236,8 @@ define gb_create_deps endef endif +gb_COMPILER_LTOFLAGS := $(filter TRUE,$(ENABLE_LTO),-GL) + # Helper class gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin @@ -268,6 +270,7 @@ $(call gb_Helper_abbreviate_dirs,\ unset INCLUDE \ $(gb_CC) \ $(DEFS) \ + $(if $(filter Library,$(TARGETTYPE)),$(gb_COMPILER_LTOFLAGS)) \ $(T_CFLAGS) \ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \ -Fd$(PDBFILE) \ @@ -289,6 +292,7 @@ $(call gb_Helper_abbreviate_dirs,\ unset INCLUDE \ $(if $(filter YES,$(CXXOBJECT_X64)), $(CXX_X64_BINARY), $(gb_CXX)) \ $(DEFS) \ + $(if $(filter Library,$(TARGETTYPE)),$(gb_COMPILER_LTOFLAGS)) \ $(T_CXXFLAGS) \ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CXXFLAGS_WERROR)) \ -Fd$(PDBFILE) \ @@ -379,6 +383,10 @@ gb_Library_TARGETTYPEFLAGS := \ -DLL \ $(gb_Windows_PE_TARGETTYPEFLAGS) +ifeq ($(ENABLE_LTO),TRUE) +gb_Library_TARGETTYPEFLAGS += -LTCG +endif + gb_Library_get_rpath := gb_Library_SYSPRE := i ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 484920848b0fda115921a66104bfde4bcceca10e Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Aug 7 18:13:52 2012 +0200 fix typo in previous commit Change-Id: Icdb862929730a92b02e3c3753a077902abe66eba diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 5d3116e..978fcf4 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -236,7 +236,7 @@ define gb_create_deps endef endif -gb_COMPILER_LTOFLAGS := $(filter TRUE,$(ENABLE_LTO),-GL) +gb_COMPILER_LTOFLAGS := $(if $(filter TRUE,$(ENABLE_LTO)),-GL) # Helper class ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - 2 commits - comphelper/Library_comphelper.mk officecfg/Configuration_officecfg.mk writerfilter/CppunitTest_writerfilter_rtftok.mk
comphelper/Library_comphelper.mk|5 - officecfg/Configuration_officecfg.mk| 12 ++-- writerfilter/CppunitTest_writerfilter_rtftok.mk |4 3 files changed, 10 insertions(+), 11 deletions(-) New commits: commit 587ac17d51ded650ed72bb68a126587a9c2ca698 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Aug 6 10:22:56 2012 +0200 fix typo causing missing dependency Change-Id: I9ac316b0491d2c2c69308c0a78e1be0009bf2caf diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index 682a3e2..4ae5d5a 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -16,9 +16,9 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -$(eval $(call gb_Configuration_Configuration,registry)) +$(eval $(call gb_Configuration_Configuration,officecfg)) -$(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\ +$(eval $(call gb_Configuration_add_schemas,officecfg,officecfg/registry/schema,\ org/openoffice/LDAP.xcs \ org/openoffice/Inet.xcs \ org/openoffice/Setup.xcs \ @@ -119,7 +119,7 @@ $(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\ org/openoffice/ucb/Store.xcs \ )) -$(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\ +$(eval $(call gb_Configuration_add_datas,officecfg,officecfg/registry/data,\ org/openoffice/Inet.xcu \ org/openoffice/System.xcu \ org/openoffice/UserProfile.xcu \ @@ -149,7 +149,7 @@ $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\ org/openoffice/ucb/Configuration.xcu \ )) -$(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/data,\ +$(eval $(call gb_Configuration_add_spool_modules,officecfg,officecfg/registry/data,\ org/openoffice/Inet-macosx.xcu \ org/openoffice/Inet-unixdesktop.xcu \ org/openoffice/Inet-wnt.xcu \ @@ -210,11 +210,11 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat )) # perhaps this file should be moved 2 levels up? -$(eval $(call gb_Configuration_add_spool_langpack,registry,officecfg/registry/data/org/openoffice,\ +$(eval $(call gb_Configuration_add_spool_langpack,officecfg,officecfg/registry/data/org/openoffice,\ Langpack.xcu \ )) -$(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\ +$(eval $(call gb_Configuration_add_localized_datas,officecfg,officecfg/registry/data,\ org/openoffice/Setup.xcu \ org/openoffice/Office/Accelerators.xcu \ org/openoffice/Office/Common.xcu \ diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index 9b660d3..79d13e7 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -64,8 +64,4 @@ $(eval $(call gb_CppunitTest_use_components,writerfilter_rtftok,\ $(eval $(call gb_CppunitTest_use_configuration,writerfilter_rtftok)) -# we need to explicitly depend on library writerfilter because it is not implied -# by a link relation -$(call gb_CppunitTest_get_target,writerfilter_rtftok) : $(call gb_Library_get_target,writerfilter) - # vim: set noet sw=4 ts=4: commit 4e10bc77f9e6891980d8bb38aab78287a1aa6007 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Aug 6 00:40:31 2012 +0200 missing package dependency Change-Id: I4171de4ad24ac1bb9956171f3256cbcd766dae29 diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index 5a2074a..76c75f1 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -19,7 +19,10 @@ $(eval $(call gb_Library_Library,comphelper)) -$(eval $(call gb_Library_use_package,comphelper,comphelper_inc)) +$(eval $(call gb_Library_use_packages,comphelper,\ + comphelper_inc \ + officecfg_cppheader \ +)) $(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - solenv/gbuild
solenv/gbuild/CliLibrary.mk |5 +++-- solenv/gbuild/CliNativeLibrary.mk |2 +- solenv/gbuild/Helper.mk |5 + 3 files changed, 9 insertions(+), 3 deletions(-) New commits: commit 5fae3213d72702e38d00a501e4e91d1f163fc867 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Aug 6 16:40:24 2012 +0200 get cli_ure closer to successful build Change-Id: I28ba1f4e802b3736a9f82966a2c7908388df4a92 diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk index 62c9d78..bf2c88c 100644 --- a/solenv/gbuild/CliLibrary.mk +++ b/solenv/gbuild/CliLibrary.mk @@ -36,14 +36,15 @@ gb_CliLibraryTarget__get_generated_source = $(WORKDIR)/$(1).cs define gb_CliLibraryTarget__command $(call gb_Output_announce,$(2),$(true),CSC,3) $(call gb_Helper_abbreviate_dirs,\ - csc \ + csc $(call gb_Helper_windows_path, \ $(call gb_CliLibraryTarget__get_csflags) \ $(CLI_CSCFLAGS) \ -target:library \ -out:$(1) \ -reference:System.dll \ - $(foreach assembly,$(CLI_ASSEMBLIES),-reference:$(assembly).dll) \ + $(foreach assembly,$(CLI_ASSEMBLIES),-reference:$(assembly)) \ $(CLI_SOURCES) \ + ) \ ) endef diff --git a/solenv/gbuild/CliNativeLibrary.mk b/solenv/gbuild/CliNativeLibrary.mk index 5751cc8..a11c1d1 100644 --- a/solenv/gbuild/CliNativeLibrary.mk +++ b/solenv/gbuild/CliNativeLibrary.mk @@ -35,7 +35,7 @@ $(call gb_CliNativeLibraryTarget_get_target,%) : $(call gb_CliNativeLibraryTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),SN ,4) $(call gb_Helper_abbreviate_dirs,\ - rm -r $(call gb_CliNativeLibraryTarget_get_target,$*) \ + rm -rf $(call gb_CliNativeLibraryTarget_get_target,$*) \ ) define gb_CliNativeLibraryTarget_CliNativeLibraryTarget diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 93a0ad7..b83ecbe 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -55,6 +55,11 @@ define gb_Helper_native_path $(call gb_Output_error,gb_Helper_native_path: Do not use. Should not be necessary.) endef +# cygwin seems to eat one backslash when executing command, thus replace with '\\' +define gb_Helper_windows_path +$(subst /,\\,$(1)) +endef + define gb_Helper_make_clean_target gb_$(1)_get_clean_target = $(WORKDIR)/Clean/$(1)/$$(1) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - cli_ure/Library_cli_cppuhelper_native.mk
cli_ure/Library_cli_cppuhelper_native.mk |4 1 file changed, 4 insertions(+) New commits: commit f7f593dd299d11edbb85ba66b10ca1c47cf26ca4 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Aug 6 19:32:37 2012 +0200 cli_ure: another missing dep Change-Id: I3f7d0034500b52e363f5cc3e136b89a5d75aab64 diff --git a/cli_ure/Library_cli_cppuhelper_native.mk b/cli_ure/Library_cli_cppuhelper_native.mk index 3364803..2b6e419 100644 --- a/cli_ure/Library_cli_cppuhelper_native.mk +++ b/cli_ure/Library_cli_cppuhelper_native.mk @@ -28,6 +28,10 @@ $(eval $(call gb_Library_use_internal_bootstrap_api,cli_cppuhelper_native,\ udkapi \ )) +$(eval $(call gb_Library_use_packages,cli_cppuhelper_native,\ + cli_ure_cliuno \ +)) + $(eval $(call gb_Library_use_libraries,cli_cppuhelper_native,\ advapi32 \ cppu \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - cli_ure/CustomTarget_cli_ure_assemblies.mk cli_ure/source solenv/gbuild
cli_ure/CustomTarget_cli_ure_assemblies.mk |6 +++---
cli_ure/source/native/path.cxx |2 +-
solenv/gbuild/CliLibrary.mk|1 -
solenv/gbuild/platform/WNT_INTEL_MSC.mk|2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit d8fc82680dd530ed201cfa0eb4491c093469e191
Author: Matúš Kukan matus.ku...@gmail.com
Date: Mon Aug 6 23:21:49 2012 +0200
force cli_ure to build
- there is still missing dependency on cliuno.snk
- remove -warnaserror+ causing weird problem
- export random symbol so that we get icli_cppuhelper_native.lib file
created
Change-Id: Ifd3b4785f83496d2c9bff6b1ea2fd39b6978725c
diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk
b/cli_ure/CustomTarget_cli_ure_assemblies.mk
index 6773848..da66178 100644
--- a/cli_ure/CustomTarget_cli_ure_assemblies.mk
+++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk
@@ -43,20 +43,20 @@ $(call
gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs : \
$(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs :
$(GNUCOPY) $ $@.tmp \
echo '[assembly:System.Reflection.AssemblyVersion(
$(CLI_BASETYPES_NEW_VERSION) )]' $@.tmp \
- $(if $(cli_ure_CCNUMVER_GOOD),echo
'[assembly:System.Reflection.AssemblyKeyFile( @$(OUTDIR)/bin/cliuno.snk )]'
$@.tmp ) \
+ $(if $(cli_ure_CCNUMVER_GOOD),echo
'[assembly:System.Reflection.AssemblyKeyFile( @$(call
gb_Helper_windows_path,$(OUTDIR)/bin/cliuno.snk) )]' $@.tmp ) \
mv $@.tmp $@
# TODO use macros for this
$(call gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx :
$(GNUCOPY) $ $@.tmp \
echo '[assembly:System::Reflection::AssemblyVersion(
$(CLI_CPPUHELPER_NEW_VERSION) )];' $@.tmp \
- echo '[assembly:System::Reflection::AssemblyKeyFile(
$(OUTDIR)/bin/cliuno.snk )];' $@.tmp \
+ echo '[assembly:System::Reflection::AssemblyKeyFile( $(call
gb_Helper_windows_path,$(OUTDIR)/bin/cliuno.snk) )];' $@.tmp \
mv $@.tmp $@
$(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs :
$(GNUCOPY) $ $@.tmp \
echo '[assembly:System.Reflection.AssemblyVersion(
$(CLI_URE_NEW_VERSION) )]' $@.tmp \
- $(if $(cli_ure_CCNUMVER_GOOD),echo
'[assembly:System.Reflection.AssemblyKeyFile( @$(OUTDIR)/bin/cliuno.snk )]'
$@.tmp ) \
+ $(if $(cli_ure_CCNUMVER_GOOD),echo
'[assembly:System.Reflection.AssemblyKeyFile( @$(call
gb_Helper_windows_path,$(OUTDIR)/bin/cliuno.snk) )]' $@.tmp ) \
mv $@.tmp $@
# vim: set noet sw=4 ts=4:
diff --git a/cli_ure/source/native/path.cxx b/cli_ure/source/native/path.cxx
index 087e0cf..97c7f36 100644
--- a/cli_ure/source/native/path.cxx
+++ b/cli_ure/source/native/path.cxx
@@ -30,7 +30,7 @@
namespace cli_ure {
-WCHAR * filename(WCHAR * path) {
+SAL_DLLPUBLIC_EXPORT WCHAR * filename(WCHAR * path) {
WCHAR * f = path;
for (WCHAR * p = path;;) {
switch (*p++) {
diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index bf2c88c..9cf6bd5 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -13,7 +13,6 @@ gb_CliLibraryTarget_EXT := $(gb_CliAssembly_POLICYEXT)
gb_CliLibraryTarget_CSCFLAGS := \
-noconfig \
- -warnaserror+
gb_CliLibraryTarget_CSCFLAGS_DEBUG := \
-checked+ \
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index bf44b79..8b03099 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -738,7 +738,7 @@ gb_InstallScript_EXT := .inf
# CliAssemblyTarget class
gb_CliAssemblyTarget_POLICYEXT := $(gb_Library_DLLEXT)
-gb_CliAssemblyTarget_get_dll =
$(gb_Library_OUTDIRLOCATION)/$(1)$(gb_CliAssemblyTarget_POLICYEXT)
+gb_CliAssemblyTarget_get_dll =
$(OUTDIR)/bin/$(1)$(gb_CliAssemblyTarget_POLICYEXT)
# Python
gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path)
PYTHONHOME=$(OUTDIR_FOR_BUILD)/lib/python
PYTHONPATH=$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - solenv/gbuild
solenv/gbuild/UnoApiTarget.mk |1 + 1 file changed, 1 insertion(+) New commits: commit be91742ceaa09e18b788a79c46d45f754851c96c Author: Matúš Kukan matus.ku...@gmail.com Date: Sun Aug 5 15:17:52 2012 +0200 gbuild: add missing dependency on regmerge visible with 'make udkapi.all' Change-Id: I7fcd72e4d6849e3457551d85d507a15f6f72077b diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 64c49b6..49219a5 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -222,6 +222,7 @@ endef define gb_UnoApiTarget_add_idlfiles $(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(idl))) $(call gb_UnoApiTarget__add_idlfiles,$(1),$(2),$(3)) +$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGMERGETARGET) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 7 commits - sc/source tubes/inc tubes/Package_inc.mk tubes/qa tubes/source
sc/source/ui/collab/sccollaboration.cxx | 11 +-
sc/source/ui/collab/sendfunc.cxx | 101 ++
sc/source/ui/collab/sendfunc.hxx | 22
sc/source/ui/inc/sccollaboration.hxx |1
tubes/Package_inc.mk |1
tubes/inc/tubes/collaboration.hxx |1
tubes/inc/tubes/conference.hxx| 19
tubes/inc/tubes/manager.hxx | 19 ++--
tubes/inc/tubes/warnings_guard_boost_signals2.hpp | 44 -
tubes/qa/test_manager.cxx | 31 --
tubes/source/conference.cxx | 74
tubes/source/contacts.cxx | 24 +
tubes/source/contacts.hrc |1
tubes/source/contacts.src |6 +
tubes/source/manager.cxx | 95
15 files changed, 164 insertions(+), 286 deletions(-)
New commits:
commit c3c9ae052bd062c9057fd08675e0593d00ccd601
Author: Matúš Kukan matus.ku...@gmail.com
Date: Sat Aug 4 22:40:40 2012 +0200
tubes: do not queue incoming packets
Change-Id: Ida0f3b9ce7cebdb0517457900d2b0b2377e6c8ab
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx
index ad5ae1e..9222f0f 100644
--- a/tubes/inc/tubes/conference.hxx
+++ b/tubes/inc/tubes/conference.hxx
@@ -59,17 +59,14 @@ public:
TUBES_DLLPUBLIC boolsendPacket( const OString rPacket );
-/** Pop a received packet. */
-boolpopPacket( OString rPacket );
-
voidinvite( TpContact *pContact );
typedef void (*FileSentCallback)( bool aSuccess, void* pUserData);
TUBES_DLLPUBLIC voidsendFile( TpContact* pContact, rtl::OUString
localUri, FileSentCallback pCallback, void* pUserData);
const OString getUuid() const { return msUuid; }
-Collaboration* getCollaboration() const { return mpCollaboration;
}
-voidsetCollaboration( Collaboration* pCollaboration )
{ mpCollaboration = pCollaboration; }
+Collaboration* getCollaboration() const;
+voidsetCollaboration( Collaboration* pCollaboration );
// --- following only to be called only by manager's callbacks ---
// TODO: make friends instead
@@ -82,8 +79,6 @@ public:
voidsetTubeOfferedHandlerInvoked( bool b );
boolisTubeOfferedHandlerInvoked() const;
boolisMaster() const;
-/** Queue incoming data as OString */
-voidqueue( const OString rPacket );
voidsetUuid( const OString rUuid ) { msUuid = rUuid; }
private:
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx
index 89afd11..850d5d5 100644
--- a/tubes/qa/test_manager.cxx
+++ b/tubes/qa/test_manager.cxx
@@ -221,22 +221,7 @@ void TestTeleTubes::testReceivePacket()
* and extracting UUID from the name.
*/
-sal_uInt32 nReceivedPackets = 0;
-/* We expect to get every packet we send pushed
- * onto the queue to be echoed locally.
- */
-bool bOk;
-do
-{
-OString aReceived;
-bOk = mpConference1-popPacket( aReceived );
-if (bOk)
-{
-++nReceivedPackets;
-CPPUNIT_ASSERT( from 1 to 2 == aReceived );
-}
-} while (bOk);
-CPPUNIT_ASSERT( nReceivedPackets == mnSentPackets );
+// TODO implement me
}
void TestTeleTubes::FileSent( bool success, void * )
diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx
index 4eaaf8c..88109df 100644
--- a/tubes/source/conference.cxx
+++ b/tubes/source/conference.cxx
@@ -34,7 +34,6 @@
#include tubes/manager.hxx
#include telepathy-glib/telepathy-glib.h
-#include queue
#if defined SAL_LOG_INFO
namespace
@@ -65,11 +64,8 @@ struct InfoLogger
class TeleConferenceImpl
{
-typedef ::std::queueOString TelePacketQueue;
-
public:
guint maObjectRegistrationId;
-TelePacketQueue maPacketQueue;
GDBusConnection*mpTube;
boolmbTubeOfferedHandlerInvoked : 1;
@@ -129,7 +125,8 @@ static void TeleConference_MethodCallHandler(
SAL_INFO( tubes, TeleConference_MethodCallHandler: received packet from
sender
(pSender ? pSender : (null)) with size nPacketSize);
OString aPacket( pPacketData, nPacketSize );
-pConference-queue( aPacket );
+if (pConference-getCollaboration())
+pConference-getCollaboration()-PacketReceived( aPacket );
// Master needs to send the packet back to impose ordering,
// so the slave can execute his command.
if (pConference-isMaster())
@@ -447,8 +444,8 @@ bool TeleConference::sendPacket( const OString rPacket )
-1, NULL, NULL, NULL);
// If
[Libreoffice-commits] .: tubes/inc
tubes/inc/tubes/conference.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6c946727a87374366f66cb39861b0142bd148a54
Author: Matúš Kukan matus.ku...@gmail.com
Date: Sun Aug 5 00:27:04 2012 +0200
tubes: fix build
Change-Id: I3251d6282df132c3df0217187eb140beb95718e6
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx
index 9222f0f..3f600e0 100644
--- a/tubes/inc/tubes/conference.hxx
+++ b/tubes/inc/tubes/conference.hxx
@@ -66,7 +66,7 @@ public:
const OString getUuid() const { return msUuid; }
Collaboration* getCollaboration() const;
-voidsetCollaboration( Collaboration* pCollaboration );
+TUBES_DLLPUBLIC voidsetCollaboration( Collaboration* pCollaboration );
// --- following only to be called only by manager's callbacks ---
// TODO: make friends instead
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 11 commits - sc/source tubes/CppunitTest_tubes_test.mk tubes/inc tubes/Package_inc.mk tubes/source
sc/source/ui/collab/sccollaboration.cxx | 34 ++--
sc/source/ui/collab/sendfunc.cxx|8 ++--
sc/source/ui/docshell/docsh.cxx | 17 ++
sc/source/ui/inc/docsh.hxx |9 +
sc/source/ui/inc/sccollaboration.hxx| 10 --
sc/source/ui/view/cellsh3.cxx |2 -
tubes/CppunitTest_tubes_test.mk |5 +++
tubes/Package_inc.mk|1
tubes/inc/tubes/collaboration.hxx |4 +-
tubes/inc/tubes/conference.hxx |9 -
tubes/inc/tubes/contact-list.hxx|8
tubes/inc/tubes/manager.hxx | 16 -
tubes/source/contact-list.cxx | 22 ++---
tubes/source/contacts.cxx | 46 ++-
tubes/source/manager.cxx| 53 +++-
15 files changed, 185 insertions(+), 59 deletions(-)
New commits:
commit 769e2b59e605c2c882d2039ad89e0958ea7bb2f2
Author: Matúš Kukan matus.ku...@gmail.com
Date: Sat Aug 4 01:52:29 2012 +0200
tubes: stop collaborating when the account gets off-line
Change-Id: Ic6f1bc41bc212e0c36751168f1204c41ebe0ce61
diff --git a/tubes/source/contact-list.cxx b/tubes/source/contact-list.cxx
index 1b27af2..b238a2c 100644
--- a/tubes/source/contact-list.cxx
+++ b/tubes/source/contact-list.cxx
@@ -71,9 +71,9 @@ ContactList::~ContactList()
mpAccountManager = NULL;
}
-bool tb_contact_is_online( TpContact *contact )
+bool tb_presence_is_online( const TpConnectionPresenceType presence )
{
-switch (tp_contact_get_presence_type (contact))
+switch (presence)
{
case TP_CONNECTION_PRESENCE_TYPE_UNSET:
case TP_CONNECTION_PRESENCE_TYPE_OFFLINE:
@@ -91,6 +91,16 @@ bool tb_contact_is_online( TpContact *contact )
}
}
+bool tb_account_is_online( TpAccount *account )
+{
+return tb_presence_is_online (tp_account_get_current_presence (account,
NULL, NULL));
+}
+
+bool tb_contact_is_online( TpContact *contact )
+{
+return tb_presence_is_online (tp_contact_get_presence_type (contact));
+}
+
namespace tubes {
void reDrawAllContacts();
}
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index dd3dcd5..3a2fc1b 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -105,8 +105,24 @@ public:
~TeleManagerImpl();
};
+bool tb_account_is_online( TpAccount* pAccount );
bool tb_contact_is_online( TpContact* pContact );
+static void account_presence_changed_cb( TpAccount* pAccount,
+ guint /* type */,
+ gchar* /* status */,
+ gchar* /* message */,
+ gpointer pConference )
+{
+if (!tb_account_is_online( pAccount ))
+{
+Collaboration* pCollaboration =
+reinterpret_castTeleConference*
(pConference)-getCollaboration();
+if (pCollaboration)
+pCollaboration-ContactLeft();
+}
+}
+
static void contact_presence_changed_cb( TpContact* pContact,
guint /* type */,
gchar* /* status */,
@@ -157,6 +173,10 @@ void TeleManager_DBusChannelHandler(
TeleConference* pConference = new TeleConference( pManager,
pAccount, TP_DBUS_TUBE_CHANNEL( pChannel ) );
pConference-acceptTube();
pManager-addConference( pConference );
+
+g_signal_connect( pAccount, presence-changed,
+G_CALLBACK (account_presence_changed_cb), pConference );
+
TpContact* pContact = tp_channel_get_target_contact( pChannel );
if (pContact)
g_signal_connect( pContact, presence-changed,
@@ -636,6 +656,9 @@ TeleConference* TeleManager::startGroupSession( TpAccount
*pAccount,
if (!pConference-isReady())
return NULL;
+g_signal_connect( pAccount, presence-changed,
+G_CALLBACK (account_presence_changed_cb), pConference );
+
return pConference;
}
@@ -711,6 +734,9 @@ TeleConference* TeleManager::startBuddySession( TpAccount
*pAccount, TpContact *
if (!pConference-isReady())
return NULL;
+g_signal_connect( pAccount, presence-changed,
+G_CALLBACK (account_presence_changed_cb), pConference );
+
g_signal_connect( pBuddy, presence-changed,
G_CALLBACK (contact_presence_changed_cb), pConference );
commit 01839d6c7fbf2b32779c7c9037c0930b79c9e979
Author: Matúš Kukan matus.ku...@gmail.com
Date: Sat Aug 4 00:02:12 2012 +0200
tubes: fix build of unit test; set include path for now
Later we would want to move headers if they are not used outside.
Change-Id: I863f6f00254b335af563598a195aea01595f6c99
diff --git a/tubes/CppunitTest_tubes_test.mk b/tubes/CppunitTest_tubes_test.mk
[Libreoffice-commits] .: 3 commits - sc/AllLangResTarget_sc.mk sc/CppunitTest_sc_ucalc.mk sc/Library_sc.mk scp2/inc scp2/macros scp2/source sc/source tubes/AllLangResTarget_tubes.mk tubes/CppunitTest_
sc/AllLangResTarget_sc.mk|1 sc/CppunitTest_sc_ucalc.mk | 10 - sc/Library_sc.mk | 12 - sc/source/ui/collab/contacts.cxx | 290 --- sc/source/ui/collab/contacts.hrc | 11 - sc/source/ui/collab/contacts.hxx | 35 --- sc/source/ui/collab/contacts.src | 61 -- sc/source/ui/collab/sccollaboration.cxx | 62 ++ sc/source/ui/collab/sendfunc.cxx |7 sc/source/ui/inc/sccollaboration.hxx | 31 +++ sc/source/ui/view/cellsh3.cxx|7 scp2/inc/macros.inc |1 scp2/macros/macro.pl | 11 - scp2/source/ooo/file_resource_ooo.scp|3 scp2/source/ooo/module_lang_template.scp |1 tubes/AllLangResTarget_tubes.mk | 19 ++ tubes/CppunitTest_tubes_test.mk |4 tubes/Library_tubes.mk |8 tubes/Module_tubes.mk|1 tubes/Package_inc.mk |2 tubes/inc/tubes/collaboration.hxx| 34 +++ tubes/inc/tubes/conference.hxx |8 tubes/inc/tubes/contacts.hxx | 38 tubes/source/conference.cxx | 29 ++- tubes/source/contacts.cxx| 280 + tubes/source/contacts.hrc| 11 + tubes/source/contacts.src| 60 ++ tubes/source/manager.cxx |2 28 files changed, 592 insertions(+), 447 deletions(-) New commits: commit bc21b49a464ae153341ee8d836993ca89b1a6919 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Jul 30 11:49:10 2012 +0200 tubes: move sc/source/ui/collab/contacts.* to tubes - sc no longer directly links against telepathy - there is new class ScCollaboration derived from abstract Collaboration describing collaboration functionality for apps used in tubes/ - also added resource manager into tubes/ Change-Id: Ic89ae955f5b47490f4f4b8781bcee5dea5336bae diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index 90ff378..2d3c64c 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -83,7 +83,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ sc/source/ui/src/condformatdlg.src \ sc/source/ui/src/condformatmgr.src \ sc/source/ui/cctrl/checklistmenu.src \ - sc/source/ui/collab/contacts.src \ sc/source/ui/navipi/navipi.src \ sc/source/ui/docshell/tpstat.src \ sc/source/ui/optdlg/calcoptionsdlg.src \ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 8301416..2796242 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -44,15 +44,7 @@ $(call gb_CxxObject_get_target,sc/qa/unit/ucalc): \ $(WORKDIR)/AllLangRes/sc \ ifeq ($(ENABLE_TELEPATHY),TRUE) - -$(eval $(call gb_CppunitTest_use_libraries,sc_ucalc,\ - tubes \ -)) - -$(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\ - telepathy \ -)) - +$(eval $(call gb_CppunitTest_use_libraries,sc_ucalc,tubes)) endif $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 998ca60..1a68be6 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -43,24 +43,16 @@ $(eval $(call gb_Library_add_defs,sc,\ $(eval $(call gb_Library_use_sdk_api,sc)) ifeq ($(ENABLE_TELEPATHY),TRUE) - -$(eval $(call gb_Library_use_libraries,sc,\ - tubes \ -)) +$(eval $(call gb_Library_use_libraries,sc,tubes)) $(eval $(call gb_Library_add_defs,sc,\ -DENABLE_TELEPATHY \ )) -$(eval $(call gb_Library_use_externals,sc,\ - telepathy \ -)) - $(eval $(call gb_Library_add_exception_objects,sc,\ - sc/source/ui/collab/contacts \ + sc/source/ui/collab/sccollaboration \ sc/source/ui/collab/sendfunc \ )) - endif $(eval $(call gb_Library_use_libraries,sc,\ diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx deleted file mode 100644 index e6e2239..000 --- a/sc/source/ui/collab/contacts.cxx +++ /dev/null @@ -1,290 +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 Michael Meeks michael.me...@suse.com (initial developer) - * - * All Rights Reserved. - * - * For minor contributions see the git repository. - * -
[Libreoffice-commits] .: 6 commits - desktop/inc desktop/source Makefile Makefile.top sc/source tubes/inc tubes/qa tubes/source
Makefile |6 +-
Makefile.top | 10 ---
desktop/inc/app.hxx |3 -
desktop/source/app/app.cxx |9 ++-
sc/source/ui/collab/contacts.cxx |4 -
sc/source/ui/collab/sendfunc.cxx |4 -
tubes/inc/tubes/manager.hxx | 41 ++-
tubes/qa/test_manager.cxx|5 -
tubes/source/manager.cxx | 105 +--
9 files changed, 52 insertions(+), 135 deletions(-)
New commits:
commit a236141e4aec1046dab191abcdea226522127242
Author: Matúš Kukan matus.ku...@gmail.com
Date: Thu Jul 26 15:49:10 2012 +0200
move help target to Makefile; it doesn't need config_host.mk
Change-Id: Ib627bb0a12b5b055f8d6077c00cc8099473fa176
diff --git a/Makefile b/Makefile
index 8b27545..4d97e71 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ SRCDIR:=$(patsubst %/,%,$(dir $(realpath $(firstword
$(MAKEFILE_LIST)
.PHONY : $(filter-out $(SRCDIR)/config_host.mk,$(MAKECMDGOALS))
# recursively invoke Makefile.top, which includes config_host.mk
-$(firstword $(MAKECMDGOALS)) : $(SRCDIR)/config_host.mk
+$(filter-out help,$(firstword $(MAKECMDGOALS))) : $(SRCDIR)/config_host.mk
$(MAKE) -r -f $(SRCDIR)/Makefile.top $(MAKECMDGOALS)
# run configure in an environment not polluted by config_host.mk
@@ -34,4 +34,8 @@ $(SRCDIR)/config_host.mk : \
$(SRCDIR)/autogen.lastrun:
@true
+help:
+ @cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt
+ @true
+
# vim: set noet sw=4 ts=4:
diff --git a/Makefile.top b/Makefile.top
index 11468c5..4aaf832 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -527,14 +527,4 @@ debugrun:
endif # not clean or distclean
-
-#
-# help
-#
-.PHONY: help
-help:
- @cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt
- @true
-
-
# vim: set noet sw=4 ts=4:
commit 7f77377850537194ea634f0d2c81e8cc5cb90a1b
Author: Matúš Kukan matus.ku...@gmail.com
Date: Thu Jul 26 12:56:19 2012 +0200
tubes: clean this out
Change-Id: I7d4cafbe51695c0ff36480311858b9167344c119
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index 9938f6f..b5a68b2 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -30,13 +30,8 @@
#define INCLUDED_TUBES_MANAGER_HXX
#include sal/config.h
-#include tubes/tubesdllapi.h
-#include tubes/conference.hxx
-#include tubes/contact-list.hxx
+#include tubes/tubesdllapi.h
#include rtl/ustring.hxx
-#include salhelper/thread.hxx
-#include rtl/ref.hxx
-#include tools/link.hxx
// For testing purposes, we might need more in future.
#define LIBO_TUBES_DBUS_INTERFACE org.libreoffice.calc
@@ -44,11 +39,11 @@
#define LIBO_TUBES_DBUS_PATH /org/libreoffice/calc
namespace osl { class Mutex; }
+class ContactList;
+class TeleConference;
class TeleManagerImpl;
typedef struct _TpAccount TpAccount;
typedef struct _TpContact TpContact;
-typedef struct _GMainLoop GMainLoop;
-typedef struct _GMainContext GMainContext;
/** Interface to Telepathy DBus Tubes.
@@ -193,8 +188,6 @@ private:
static sal_uInt32 nRefCount;
static rtl::OString aNameSuffix;
-friend class TeleManagerImpl; // access to mutex
-
static ::osl::MutexGetMutex();
};
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index 9fe6d4f..9df5468 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -26,9 +26,11 @@
* instead of those above.
*/
-#include tubes/manager.hxx
-#include tubes/constants.h
-#include tubes/file-transfer-helper.h
+#include tubes/manager.hxx
+#include tubes/conference.hxx
+#include tubes/constants.h
+#include tubes/contact-list.hxx
+#include tubes/file-transfer-helper.h
#include com/sun/star/uno/Sequence.hxx
#include com/sun/star/frame/XComponentLoader.hpp
commit b70c2d352ddb6350ec366b055b28b3d892b54b1c
Author: Matúš Kukan matus.ku...@gmail.com
Date: Thu Jul 26 12:17:09 2012 +0200
tubes: avoid unnecessary re-building; move the include into source file
Change-Id: Ib45a5fab8d4dc118ac0ae5282d47f46f9f86edc2
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 09f0a4d..c31b953 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -41,8 +41,9 @@
#include com/sun/star/task/XStatusIndicator.hpp
#include com/sun/star/uno/Reference.h
#include osl/mutex.hxx
+
#ifdef ENABLE_TELEPATHY
-#include tubes/manager.hxx
+class TeleManager;
#endif
using namespace com::sun::star::task;
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 6d5ea30..4e76579 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -102,6 +102,10 @@
#include langselect.hxx
+#ifdef ENABLE_TELEPATHY
+#include tubes/manager.hxx
+#endif
+
#if defined MACOSX
#include errno.h
#include sys/wait.h
commit f86cc45d8795073e61d39edc469a4876085941b8
Author: Matúš Kukan matus.ku...@gmail.com
Date: Thu Jul 26 12:12:42 2012 +0200
tubes: move
[Libreoffice-commits] .: 2 commits - sc/source tubes/inc tubes/qa tubes/source
sc/source/ui/collab/contacts.cxx |6 +-
sc/source/ui/collab/sendfunc.cxx |8
sc/source/ui/collab/sendfunc.hxx |3 ++-
tubes/inc/tubes/conference.hxx |2 +-
tubes/qa/test_manager.cxx|2 +-
tubes/source/conference.cxx |4 ++--
tubes/source/manager.cxx |3 ++-
7 files changed, 17 insertions(+), 11 deletions(-)
New commits:
commit df2369657ebe36c3888bb032e693bf1fcb49bb51
Author: Matúš Kukan matus.ku...@gmail.com
Date: Thu Jul 26 17:56:12 2012 +0200
tubes: send file when inviting contact to MUC collaboration
- add UUID info to TeleConference
- let SendFile function take argument for contact instead of getting
contact from the channel info, what couldn't work for MUC channel
Change-Id: I4dc45c084966a030ff4b503e192d452797f0bfdd
diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx
index 72c29a0..e6e2239 100644
--- a/sc/source/ui/collab/contacts.cxx
+++ b/sc/source/ui/collab/contacts.cxx
@@ -107,6 +107,8 @@ class TubeContacts : public ModelessDialog
{
TpContact* pContact = pAC-mpContact;
pSender-GetConference()-invite( pContact );
+pSender-SendFile( pContact, OStringToOUString(
+pSender-GetConference()-getUuid(),
RTL_TEXTENCODING_UTF8 ) );
}
}
}
@@ -135,7 +137,7 @@ class TubeContacts : public ModelessDialog
{
ScDocFuncSend* pSender =
EnsureScDocFuncSendInCurrentSfxObjectShell();
pSender-SetCollaboration( pConference );
-pSender-SendFile( OStringToOUString(
+pSender-SendFile( pContact, OStringToOUString(
pConference-getUuid(), RTL_TEXTENCODING_UTF8 ) );
}
}
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index b78d34c..58af1ba 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -156,7 +156,7 @@ void ScDocFuncSend::SendMessage( ScChangeOpWriter rOp )
mpDirect-RecvMessage( rOp.toString() );
}
-void ScDocFuncSend::SendFile( const rtl::OUString sUuid )
+void ScDocFuncSend::SendFile( TpContact* pContact, const rtl::OUString sUuid )
{
String aTmpPath = utl::TempFile::CreateTempName();
aTmpPath.Append( OUString(_) );
@@ -182,8 +182,8 @@ void ScDocFuncSend::SendFile( const rtl::OUString sUuid )
fprintf( stderr, Temp file is '%s'\n,
rtl::OUStringToOString( aFileURL, RTL_TEXTENCODING_UTF8
).getStr() );
-if (mpConference)
-mpConference-sendFile( aFileURL, file_sent_cb, NULL );
+if (pContact)
+mpConference-sendFile( pContact, aFileURL, file_sent_cb, NULL );
else
TeleManager_fileReceived( aFileURL );
@@ -249,7 +249,7 @@ sal_Bool ScDocFuncSend::SetNormalString( bool
o_rbNumFmtSet, const ScAddress r
o_rbNumFmtSet = false;
if ( rtl::OUString( rText ) == saveme )
-SendFile( rText );
+SendFile( NULL, rText );
if ( rtl::OUString( rText ) == contacts )
tubes::createContacts();
diff --git a/sc/source/ui/collab/sendfunc.hxx b/sc/source/ui/collab/sendfunc.hxx
index 7299983..16f6e88 100644
--- a/sc/source/ui/collab/sendfunc.hxx
+++ b/sc/source/ui/collab/sendfunc.hxx
@@ -15,6 +15,7 @@
#include cell.hxx
#include docfunc.hxx
class TeleConference;
+typedef struct _TpContact TpContact;
namespace {
@@ -236,7 +237,7 @@ public:
voidSetCollaboration( TeleConference* pConference );
TeleConference* GetConference();
// TODO: I think this could be moved to TeleManager later.
-voidSendFile( const rtl::OUString rURL );
+voidSendFile( TpContact* pContact, const rtl::OUString
rURL );
virtual voidEnterListAction( sal_uInt16 nNameResId );
virtual voidEndListAction();
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx
index fc495e5..e5c5d37 100644
--- a/tubes/inc/tubes/conference.hxx
+++ b/tubes/inc/tubes/conference.hxx
@@ -66,7 +66,7 @@ public:
boost::signals2::signalvoid (const OString) sigPacketReceived;
typedef void (*FileSentCallback)( bool aSuccess, void* pUserData);
-TUBES_DLLPUBLIC voidsendFile( rtl::OUString localUri,
FileSentCallback pCallback, void* pUserData);
+TUBES_DLLPUBLIC voidsendFile( TpContact* pContact, rtl::OUString
localUri, FileSentCallback pCallback, void* pUserData);
TUBES_DLLPUBLIC const OString getUuid() const { return msUuid; }
// --- following only to be called only by manager's callbacks ---
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx
index f914b33..ca03bae 100644
--- a/tubes/qa/test_manager.cxx
+++ b/tubes/qa/test_manager.cxx
@@ -264,7 +264,7 @@ void TestTeleTubes::testSendFile()
/* This has to run after testContactList has run successfully. */
[Libreoffice-commits] .: 2 commits - Library_merged.mk tubes/CppunitTest_tubes_test.mk tubes/Library_tubes.mk tubes/Module_tubes.mk tubes/qa tubes/source
Library_merged.mk |4
tubes/CppunitTest_tubes_test.mk | 20 +-
tubes/Library_tubes.mk |1
tubes/Module_tubes.mk |6
tubes/qa/test_manager.cxx | 287 +---
tubes/source/manager.cxx|7
6 files changed, 118 insertions(+), 207 deletions(-)
New commits:
commit 19f92976d8612b9b70264cc33151e944c52124e1
Author: Matúš Kukan matus.ku...@gmail.com
Date: Wed Jul 25 22:48:42 2012 +0200
tubes: resurrect unit test to serve again
- make it subsequent test to be less annoying
- we again inherit from CppUnit::TestFixture
- currently there is no test that we've received the sent packet
- nor any test for received file
- to prevent exporting more symbols we link directly tubes' object files
Change-Id: I79edf0c701f8c46eb45d507266f6dafc0c8eeea2
diff --git a/tubes/CppunitTest_tubes_test.mk b/tubes/CppunitTest_tubes_test.mk
index b2c90d4..c229b2a 100644
--- a/tubes/CppunitTest_tubes_test.mk
+++ b/tubes/CppunitTest_tubes_test.mk
@@ -30,10 +30,15 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,tubes_test, \
tubes/qa/test_manager \
))
-$(eval $(call gb_CppunitTest_add_linked_libs,tubes_test, \
+$(eval $(call gb_CppunitTest_use_packages,tubes_test,tubes_inc))
+
+$(eval $(call gb_CppunitTest_use_library_objects,tubes_test,tubes))
+
+$(eval $(call gb_CppunitTest_use_libraries,tubes_test, \
+ comphelper \
+ cppu \
sal \
- tubes \
- unotest \
+ utl \
$(gb_STDLIBS) \
))
@@ -41,13 +46,6 @@ $(eval $(call gb_CppunitTest_use_externals,tubes_test,\
telepathy \
))
-$(eval $(call gb_CppunitTest_set_include,tubes_test,\
- -I$(SRCDIR)/tubes/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_add_api,tubes_test, \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_udk_api,tubes_test))
# vim: set noet sw=4 ts=4:
diff --git a/tubes/Library_tubes.mk b/tubes/Library_tubes.mk
index e101a71..0acd0a9 100644
--- a/tubes/Library_tubes.mk
+++ b/tubes/Library_tubes.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Library_use_libraries,tubes,\
comphelper \
cppu \
sal \
- salhelper \
))
$(eval $(call gb_Library_use_externals,tubes,\
diff --git a/tubes/Module_tubes.mk b/tubes/Module_tubes.mk
index 0fc35c4..bc54f18 100644
--- a/tubes/Module_tubes.mk
+++ b/tubes/Module_tubes.mk
@@ -35,9 +35,9 @@ $(eval $(call gb_Module_add_targets,tubes,\
Executable_liboapprover \
))
-# $(eval $(call gb_Module_add_check_targets,tubes,\
-#CppunitTest_tubes_test \
-# ))
+$(eval $(call gb_Module_add_subsequentcheck_targets,tubes,\
+ CppunitTest_tubes_test \
+))
endif
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx
index 6f9a7ba..81298d0 100644
--- a/tubes/qa/test_manager.cxx
+++ b/tubes/qa/test_manager.cxx
@@ -26,101 +26,75 @@
* instead of those above.
*/
-#include sal/precppunit.hxx
+#include sal/types.h
-#include tubes/contact-list.hxx
-#include tubes/manager.hxx
-
-#include cppunit/TestAssert.h
#include cppunit/TestFixture.h
#include cppunit/extensions/HelperMacros.h
#include cppunit/plugin/TestPlugIn.h
+
+#include rtl/bootstrap.hxx
#include rtl/string.hxx
#include rtl/ustring.hxx
-#include rtl/bootstrap.hxx
-#include unotest/bootstrapfixturebase.hxx
+#include tubes/conference.hxx
+#include tubes/contact-list.hxx
+#include tubes/manager.hxx
+#include unotools/localfilehelper.hxx
+
+#include telepathy-glib/telepathy-glib.h
namespace {
-class TestTeleTubes: public test::BootstrapFixtureBase
+class TestTeleTubes: public CppUnit::TestFixture
{
public:
-TestTeleTubes();
-~TestTeleTubes();
-void testSetupManager1();
-void testSetupManager2();
-void testCreateAccountManager1();
-void testCreateAccountManager2();
-void testRegisterClients1();
-void testRegisterClients2();
+TestTeleTubes() {}
+~TestTeleTubes() {}
+// This could happen in costructor wasn't there TestTeleTubes instance for
each test:
+void testInitialize();
+void testCreateAccountManager();
+void testRegisterClients();
void testContactList();
-void testPrepareAccountManager1();
-void testPrepareAccountManager2();
-void testStartBuddySession1();
-void testStartBuddySession2();
+void testPrepareAccountManager();
+void testStartBuddySession();
void testSendPacket();
void testReceivePacket();
void testSendFile();
-void testDestroyManager1();
-void testDestroyManager2();
-void testDestroyAccepterContact();
+void testDestroyTeleTubes();
void testFailAlways();
-void ReceiverCallback( TeleConference* pConference, const TelePacket
rPacket );
-
-GMainLoop* mpMainLoop;
-void spinMainLoop();
-
+void ReceiverCallback( const OString rPacket );
static void FileSent( bool success, void *user_data);
-void FileReceived( rtl::OUString aUri
[Libreoffice-commits] .: 3 commits - desktop/inc desktop/Library_sofficeapp.mk desktop/source sc/source tubes/inc tubes/source
desktop/Library_sofficeapp.mk|8 +++
desktop/inc/app.hxx |6 ++
desktop/source/app/app.cxx | 13 +
sc/source/ui/collab/contacts.cxx | 89 +--
sc/source/ui/collab/sendfunc.cxx |9 +--
sc/source/ui/collab/sendfunc.hxx |1
tubes/inc/tubes/manager.hxx |1
tubes/source/manager.cxx | 17 +++
8 files changed, 87 insertions(+), 57 deletions(-)
New commits:
commit da5220d7d2707dd87e3f322141edc5f3ccbe1df4
Author: Matúš Kukan matus.ku...@gmail.com
Date: Tue Jul 24 13:46:17 2012 +0200
tubes: fix crash: do not delete boost::shared_ptr's pointer
This prevents a crash on exit for INTERCEPT=demo but there is another:
Open more calc documents, close one, and then type something - crash.
I wonder if this was working in the past.
Change-Id: I599b1babb02488d317c6684aba7431b5de7af15b
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index a0bd1f2..a366956 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -205,7 +205,9 @@ ScDocFuncSend::~ScDocFuncSend()
fprintf( stderr, Sender destroyed !\n );
if (mpConference)
mpConference-close();
-delete mpDirect;
+
+if (!dynamic_castScDocFuncDemo* (mpDirect))
+delete mpDirect;
}
void ScDocFuncSend::SetCollaboration( TeleConference* pConference )
commit bbeb2ea423d106fd4e7f35fedc4ba9bf58362ab5
Author: Matúš Kukan matus.ku...@gmail.com
Date: Tue Jul 24 10:24:03 2012 +0200
tubes: remove unused method
Change-Id: I8657786fe64753a2e2a57febd1d56b39f83dec33
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index 190f8b1..a0bd1f2 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -221,11 +221,6 @@ TeleConference* ScDocFuncSend::GetConference()
return mpConference;
}
-ScDocFuncRecv* ScDocFuncSend::GetReceiver()
-{
-return mpDirect;
-}
-
void ScDocFuncSend::EnterListAction( sal_uInt16 nNameResId )
{
// Want to group these operations for the other side ...
diff --git a/sc/source/ui/collab/sendfunc.hxx b/sc/source/ui/collab/sendfunc.hxx
index c6ca2f4..7299983 100644
--- a/sc/source/ui/collab/sendfunc.hxx
+++ b/sc/source/ui/collab/sendfunc.hxx
@@ -235,7 +235,6 @@ public:
voidSetCollaboration( TeleConference* pConference );
TeleConference* GetConference();
-ScDocFuncRecv* GetReceiver();
// TODO: I think this could be moved to TeleManager later.
voidSendFile( const rtl::OUString rURL );
commit b12954531953fb8ad585847fe42677d714991ef1
Author: Matúš Kukan matus.ku...@gmail.com
Date: Fri Jul 20 21:31:30 2012 +0200
tubes: init TeleManager in desktop
- register clients when we run --invisible
- create ScDocFuncSend only if we are going to use it
Change-Id: I7e33cd5a2e42e34a055146dc6c2bdac3657d6529
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 9495883..607d751 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -88,6 +88,14 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
desktop/source/migration/migration \
))
+ifeq ($(ENABLE_TELEPATHY),TRUE)
+$(eval $(call gb_Library_use_libraries,sofficeapp,tubes))
+
+$(eval $(call gb_Library_add_defs,sofficeapp,\
+-DENABLE_TELEPATHY \
+))
+endif
+
#
# We need the lo_main symbol for our boostrap loader
#
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 06dc4c7..09f0a4d 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -41,6 +41,9 @@
#include com/sun/star/task/XStatusIndicator.hpp
#include com/sun/star/uno/Reference.h
#include osl/mutex.hxx
+#ifdef ENABLE_TELEPATHY
+#include tubes/manager.hxx
+#endif
using namespace com::sun::star::task;
using namespace com::sun::star::uno;
@@ -205,6 +208,9 @@ class Desktop : public Application
sal_uInt16 m_nAppEvents;
BootstrapError m_aBootstrapError;
BootstrapStatus m_aBootstrapStatus;
+#ifdef ENABLE_TELEPATHY
+TeleManager*m_pTeleManager;
+#endif
std::auto_ptr Lockfile m_pLockfile;
Timerm_firstRunTimer;
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 3ee805b..65dd453 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -614,12 +614,19 @@ throw()
Desktop::Desktop()
: m_bServicesRegistered( false )
, m_aBootstrapError( BE_OK )
+#ifdef ENABLE_TELEPATHY
+, m_pTeleManager( NULL )
+#endif
{
RTL_LOGFILE_TRACE( desktop (cd13) ::Desktop::Desktop );
}
Desktop::~Desktop()
{
+#ifdef ENABLE_TELEPATHY
+if (m_pTeleManager)
+m_pTeleManager-unref();
+#endif
}
void Desktop::Init()
@@ -1700,6 +1707,12 @@ int Desktop::Main()
aOptions.SetVCLSettings();
[Libreoffice-commits] .: 3 commits - Makefile.top sc/source svx/inc svx/source tubes/inc tubes/source unusedcode.easy
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::signalvoid () 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_castContactList* (pContactList)-sigContactListChanged();
+}
+
AccountContactPairV ContactList::getContacts()
{
GList *accounts;
@@ -121,6 +130,12 @@ AccountContactPairV ContactList::getContacts()
{
TpContact *contact =
reinterpret_castTpContact *(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
[Libreoffice-commits] .: Branch 'feature/mork' - connectivity/Executable_mork_helper.mk
connectivity/Executable_mork_helper.mk |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 8348d52377edfa8b9c5758205e098e795cdd3850 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Jul 25 00:18:32 2012 +0200 mork_helper: fix typo Change-Id: I55221edcc2e591b6545d17a397b908f89dd3a70e diff --git a/connectivity/Executable_mork_helper.mk b/connectivity/Executable_mork_helper.mk index 90c06e4..e26e6b6 100644 --- a/connectivity/Executable_mork_helper.mk +++ b/connectivity/Executable_mork_helper.mk @@ -9,14 +9,12 @@ $(eval $(call gb_Executable_Executable,mork_helper)) -# hack, how to do it right? $(eval $(call gb_Executable_set_include,mork_helper,\ -I$(SRCDIR)/connectivity/source/inc \ --I$(SRCDIR)/solver/unxlngx6.pro/inc/offapi \ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_use_sdk_api,mozbootstrap)) +$(eval $(call gb_Executable_use_sdk_api,mork_helper)) $(eval $(call gb_Executable_use_libraries,mork_helper,\ mork \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - sc/source tubes/inc tubes/prj tubes/source
sc/source/ui/collab/contacts.cxx |2
tubes/inc/tubes/conference.hxx | 53 +--
tubes/inc/tubes/contact-list.hxx |6 +
tubes/inc/tubes/manager.hxx | 18 +
tubes/prj/build.lst |2
tubes/source/conference.cxx | 131 ++-
tubes/source/manager.cxx | 16 ++--
7 files changed, 116 insertions(+), 112 deletions(-)
New commits:
commit db9630667061789106a5864300ca73d83d04aa73
Author: Matúš Kukan matus.ku...@gmail.com
Date: Mon Jul 23 20:48:47 2012 +0200
tubes: do not include telepathy-glib.h in public headers
Change-Id: Ib2c88f2f1fc1c9ebffbbdc9896045c3d1e5b719c
diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx
index 02240d9..84f73e1 100644
--- a/sc/source/ui/collab/contacts.cxx
+++ b/sc/source/ui/collab/contacts.cxx
@@ -39,6 +39,8 @@
#include vcl/dialog.hxx
#include svx/simptabl.hxx
+#include telepathy-glib/telepathy-glib.h
+
#define CONTACTS_DLG
#ifdef CONTACTS_DLG
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx
index a66d65b..fc495e5 100644
--- a/tubes/inc/tubes/conference.hxx
+++ b/tubes/inc/tubes/conference.hxx
@@ -32,11 +32,14 @@
#include sal/config.h
#include tubes/tubesdllapi.h
#include rtl/ustring.hxx
-#include telepathy-glib/telepathy-glib.h
#include tubes/warnings_guard_boost_signals2.hpp
class TeleManager;
class TeleConferenceImpl;
+typedef struct _TpAccount TpAccount;
+typedef struct _TpContact TpContact;
+typedef struct _TpDBusTubeChannel TpDBusTubeChannel;
+typedef struct _GDBusConnection GDBusConnection;
/** Conference setup by TeleManager */
class TeleConference
diff --git a/tubes/inc/tubes/contact-list.hxx b/tubes/inc/tubes/contact-list.hxx
index a17b110..9c48ab7 100644
--- a/tubes/inc/tubes/contact-list.hxx
+++ b/tubes/inc/tubes/contact-list.hxx
@@ -32,10 +32,12 @@
#include utility
#include vector
-#include telepathy-glib/telepathy-glib.h
-
#include tubes/tubesdllapi.h
+typedef struct _TpAccount TpAccount;
+typedef struct _TpContact TpContact;
+typedef struct _TpAccountManager TpAccountManager;
+
typedef ::std::pair TpAccount *, TpContact * AccountContactPair;
typedef ::std::vector AccountContactPair AccountContactPairV;
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index 8e39e65..a112b61 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -37,7 +37,6 @@
#include salhelper/thread.hxx
#include rtl/ref.hxx
#include tools/link.hxx
-#include telepathy-glib/telepathy-glib.h
// For testing purposes, we might need more in future.
#define LIBO_TUBES_DBUS_INTERFACE org.libreoffice.calc
@@ -46,6 +45,10 @@
namespace osl { class Mutex; }
class TeleManagerImpl;
+typedef struct _TpAccount TpAccount;
+typedef struct _TpContact TpContact;
+typedef struct _GMainLoop GMainLoop;
+typedef struct _GMainContext GMainContext;
/** Interface to Telepathy DBus Tubes.
diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx
index a2fafd2..d28ffc3 100644
--- a/tubes/source/conference.cxx
+++ b/tubes/source/conference.cxx
@@ -31,6 +31,7 @@
#include tubes/constants.h
#include tubes/file-transfer-helper.h
+#include telepathy-glib/telepathy-glib.h
#include queue
#if defined SAL_LOG_INFO
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index 4abed6b..d16422d 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -39,6 +39,8 @@
#include osl/mutex.hxx
#include rtl/strbuf.hxx
#include rtl/uuid.h
+
+#include telepathy-glib/telepathy-glib.h
#include map
namespace css = ::com::sun::star;
commit abeb02c02d6d2cf5ac48d75b04563d3376d71677
Author: Matúš Kukan matus.ku...@gmail.com
Date: Mon Jul 23 19:50:19 2012 +0200
tubes: create TeleConferenceImpl to hide more details from public
Change-Id: If1be001e336991218893e3bc455a16e73ecaab0f
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx
index 8954457..a66d65b 100644
--- a/tubes/inc/tubes/conference.hxx
+++ b/tubes/inc/tubes/conference.hxx
@@ -33,10 +33,10 @@
#include tubes/tubesdllapi.h
#include rtl/ustring.hxx
#include telepathy-glib/telepathy-glib.h
-#include queue
#include tubes/warnings_guard_boost_signals2.hpp
class TeleManager;
+class TeleConferenceImpl;
/** Conference setup by TeleManager */
class TeleConference
@@ -52,17 +52,11 @@ public:
/// Unrefs, unregisters from manager and calls dtor if last reference!
voidfinalize();
-TeleManager*getManager() const { return mpManager; }
-
TUBES_DLLPUBLIC boolsendPacket( const OString rPacket );
/** Pop a received packet. */
boolpopPacket( OString rPacket );
-/** Queue incoming data as OString */
-voidqueue( const char* pPacket, int nSize );
-voidqueue( const OString rPacket );
-
TUBES_DLLPUBLIC void
[Libreoffice-commits] .: 3 commits - sc/source tubes/inc tubes/Library_tubes.mk tubes/Package_inc.mk tubes/source
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
[Libreoffice-commits] .: tubes/source
tubes/source/manager.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2b2099cbd20d98caa16d8c08a3d94b8e5e34d264
Author: Matúš Kukan matus.ku...@gmail.com
Date: Sun Jul 22 00:32:10 2012 +0200
tubes: do not crash if there is no TeleManager yet
Change-Id: I042c773f071d336c7d402ed7bca2a33b3a998d50
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index c771727..49cda03 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -178,7 +178,7 @@ TeleConference* TeleManager::getConference()
bool TeleManager::hasWaitingConference()
{
-return !pImpl-msCurrentUUID.isEmpty();
+return pImpl !pImpl-msCurrentUUID.isEmpty();
}
void TeleManager::setCurrentUuid( const OString rUuid )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - idlc/README Repository.mk sc/source tubes/inc tubes/source
Repository.mk|1
idlc/README |2 -
sc/source/ui/collab/contacts.cxx |9 +++
sc/source/ui/collab/sendfunc.cxx | 28 ---
sc/source/ui/collab/sendfunc.hxx |3 +-
sc/source/ui/docshell/docsh.cxx |2 +
tubes/inc/tubes/conference.hxx |4 ++-
tubes/inc/tubes/constants.h |4 +++
tubes/inc/tubes/manager.hxx | 12 +++---
tubes/source/conference.cxx | 13 +--
tubes/source/manager.cxx | 46 ++-
11 files changed, 96 insertions(+), 28 deletions(-)
New commits:
commit 37c67a137882cc1a9e113552dcab42a7d6337358
Author: Matúš Kukan matus.ku...@gmail.com
Date: Fri Jul 20 00:12:19 2012 +0200
tubes: send a file for collaboration when buddy session starts
Channels for file and for tube are independent in telepathy,
so let sender create UUID and pass it to receiver, who then can
bind the document to the channel.
UUID for tube channel goes through telepathy.
UUID for file channel is encoded in the filename for now.
Tubes specific CreateDocFunc is re-introduced, so we could set
current UUID after file is received and when the document is being
constructed, get channel from TeleManager with this UUID.
This is not immune to constructing other documents in the middle of binding
proccess.
Change-Id: I57c7e57a5d7d3ccd7d94677a8cf2719c78baa2fd
diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx
index d81ff9a..c2cc8b6 100644
--- a/sc/source/ui/collab/contacts.cxx
+++ b/sc/source/ui/collab/contacts.cxx
@@ -98,11 +98,6 @@ class TubeContacts : public ModelessDialog
// Receiving file is not related to any document.
mpManager-sigFileReceived.connect( boost::bind(
ScDocFuncRecv::fileReceived, mpSender-GetReceiver(),
_1 ) );
-
-// TODO: It's still not clear to me who should take care of this
signal
-// and what exactly it is supposed to happen.
-mpManager-sigConferenceCreated.connect( boost::bind(
-ScDocFuncSend::SetCollaboration, mpSender, _1 ) );
}
}
@@ -124,7 +119,11 @@ class TubeContacts : public ModelessDialog
fprintf( stderr, could not start session with %s\n,
tp_contact_get_identifier( pContact ) );
else
+{
mpSender-SetCollaboration( pConference );
+mpSender-SendFile( OStringToOUString(
+pConference-getUuid(), RTL_TEXTENCODING_UTF8 ) );
+}
}
}
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index d22e4ba..4b3d1c9 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -39,6 +39,7 @@
#include tubes/manager.hxx
#include tubes/conference.hxx
#include tubes/contact-list.hxx
+#include tubes/constants.h
// new file send/recv fun ...
#include com/sun/star/uno/Sequence.hxx
@@ -232,12 +233,13 @@ void ScDocFuncSend::SendMessage( ScChangeOpWriter rOp )
mpDirect-RecvMessage( rOp.toString() );
}
-void ScDocFuncSend::SendFile( const rtl::OUString rURL )
+void ScDocFuncSend::SendFile( const rtl::OUString sUuid )
{
-(void)rURL;
-
String aTmpPath = utl::TempFile::CreateTempName();
-aTmpPath.Append( rtl::OUString( .ods ) );
+aTmpPath.Append( OUString(_) );
+aTmpPath.Append( sUuid );
+aTmpPath.Append( OUString(_) );
+aTmpPath.Append( OUString(.ods) );
rtl::OUString aFileURL;
::utl::LocalFileHelper::ConvertPhysicalNameToURL( aTmpPath, aFileURL );
@@ -416,22 +418,30 @@ sal_Bool ScDocFuncSend::MergeCells( const
ScCellMergeOption rOption, sal_Bool b
return ScDocFunc::MergeCells( rOption, bContents, bRecord, bApi );
}
-#ifdef INTERCEPT
-SC_DLLPRIVATE ScDocFunc *ScDocShell::CreateDocFunc()
+ScDocFunc *ScDocShell::CreateDocFunc()
{
if (getenv (INTERCEPT))
{
-boost::shared_ptrScDocFuncDirect pDirect( new ScDocFuncDirect( *this
) );
+ScDocFuncDirect* pDirect = new ScDocFuncDirect( *this );
boost::shared_ptrScDocFuncRecv pReceiver( new ScDocFuncRecv( pDirect
) );
static boost::shared_ptrScDocFuncDemo aDemoBus( new ScDocFuncDemo()
);
aDemoBus-add_client( pReceiver ); // a lifecycle horror no doubt.
-return new ScDocFuncSend( *this, boost::shared_ptrScDocFuncRecv(
aDemoBus.get() ) );
+return new ScDocFuncSend( *this, aDemoBus.get() );
+}
+else if (TeleManager::hasWaitingConference())
+{
+ScDocFuncDirect *pDirect = new ScDocFuncDirect( *this );
+ScDocFuncRecv *pReceiver = new ScDocFuncRecv( pDirect );
+ScDocFuncSend *pSender = new ScDocFuncSend( *this, pReceiver );
+TeleManager *pManager = TeleManager::get();
+pSender-SetCollaboration( pManager-getConference()
[Libreoffice-commits] .: 3 commits - sc/source tubes/inc tubes/Library_tubes.mk tubes/source
sc/source/ui/collab/contacts.cxx |8 ---
sc/source/ui/collab/sendfunc.cxx | 82 +--
sc/source/ui/collab/sendfunc.hxx |1
tubes/Library_tubes.mk |4 +
tubes/inc/tubes/manager.hxx |4 -
tubes/source/manager.cxx | 47 +++---
6 files changed, 48 insertions(+), 98 deletions(-)
New commits:
commit 6f606f8064d8dc7daa60960151da71943361d394
Author: Matúš Kukan matus.ku...@gmail.com
Date: Fri Jul 20 15:35:27 2012 +0200
tubes: remove unused parameters
Change-Id: Ia1c683f5b9245d1673a610901636921619f47406
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index e43612c..f6642f2 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -135,7 +135,7 @@ void TeleManager::DBusChannelHandler(
SAL_INFO( tubes, accepting);
aAccepted = true;
-TeleConference* pConference = new TeleConference( pManager,
pAccount, TP_DBUS_TUBE_CHANNEL( pChannel ), createUuid() );
+TeleConference* pConference = new TeleConference( pManager,
pAccount, TP_DBUS_TUBE_CHANNEL( pChannel ) );
pConference-acceptTube();
pManager-addConference( pConference );
}
@@ -207,10 +207,8 @@ SAL_DLLPUBLIC_EXPORT void TeleManager_fileReceived( const
rtl::OUString rStr )
}
}
-void TeleManager::TransferDone( EmpathyFTHandler *handler,
TpFileTransferChannel *, gpointer pUserData)
+void TeleManager::TransferDone( EmpathyFTHandler *handler,
TpFileTransferChannel *, gpointer )
{
-TeleManager* pManager = reinterpret_castTeleManager*(pUserData);
-
SAL_INFO( tubes, TeleManager::TransferDone: hooray!);
GFile *gfile = empathy_ft_handler_get_gfile( handler);
char *uri = g_file_get_uri( gfile);
@@ -538,7 +536,7 @@ bool TeleManager::registerClients()
getFullClientName().getStr(), // name
TRUE, // uniquify to get
a different bus name to the main client, above
TeleManager_FileTransferHandler,// callback
-this, // user_data
+this, // user_data,
unused
NULL// destroy
);
tp_base_client_take_handler_filter( pImpl-mpFileTransferClient,
commit baa7114906108b655f09fcd6d6c593d3212967bb
Author: Matúš Kukan matus.ku...@gmail.com
Date: Fri Jul 20 15:17:44 2012 +0200
tubes: clean up commented out code, headers
Change-Id: I5962fb38d2320199e9c45c6f339131755f817960
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index 21ee3c3..f495c24 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -39,7 +39,6 @@
#include rtl/ref.hxx
#include tools/link.hxx
#include telepathy-glib/telepathy-glib.h
-#include map
// For testing purposes, we might need more in future.
#define LIBO_TUBES_DBUS_INTERFACE org.libreoffice.calc
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index c7ef062..e43612c 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -28,24 +28,17 @@
#include tubes/manager.hxx
#include tubes/constants.h
-#include rtl/strbuf.hxx
-#include rtl/uuid.h
-#include osl/mutex.hxx
-#include cstring
-// new file send/recv fun ...
#include com/sun/star/uno/Sequence.hxx
-#include unotools/tempfile.hxx
-#include unotools/localfilehelper.hxx
-#include comphelper/mediadescriptor.hxx
-#include comphelper/processfactory.hxx
-#include comphelper/componentcontext.hxx
-#include com/sun/star/frame/XLoadable.hpp
#include com/sun/star/frame/XComponentLoader.hpp
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include com/sun/star/beans/PropertyValue.hpp
-#include com/sun/star/document/XDocumentRecovery.hpp
#include com/sun/star/util/XCloseable.hpp
+#include comphelper/processfactory.hxx
+#include osl/mutex.hxx
+#include rtl/strbuf.hxx
+#include rtl/uuid.h
+#include map
namespace css = ::com::sun::star;
@@ -193,42 +186,10 @@ SAL_DLLPUBLIC_EXPORT void TeleManager_fileReceived( const
rtl::OUString rStr )
fprintf( stderr, incoming file '%s'\n,
rtl::OUStringToOString( rStr, RTL_TEXTENCODING_UTF8 ).getStr() );
-// using the frame::XLoadable interface fails with a
DoubleInitializationException
-/*css::uno::Sequence css::beans::PropertyValue aLoadArgs(5);
-aLoadArgs[0].Name = rtl::OUString( URL );
-aLoadArgs[0].Value = rpStr;
-aLoadArgs[1].Name = rtl::OUString( FilterName );
-aLoadArgs[1].Value = rtl::OUString( calc8 );
-aLoadArgs[2].Name = rtl::OUString( Referer );
-aLoadArgs[2].Value = rtl::OUString( );
-// no interaction handler ?
-aLoadArgs[3].Name = rtl::OUString( MacroExecutionMode );
-aLoadArgs[3].Value = sal_Int32( 3 );
-aLoadArgs[4].Name = rtl::OUString( UpdateDocMode
[Libreoffice-commits] .: tubes/source
tubes/source/manager.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 179283359fe6167a6a499fe2abd4800ca142755a
Author: Matúš Kukan matus.ku...@gmail.com
Date: Fri Jul 20 22:12:19 2012 +0200
tubes: use SAL_WARN SAL_LOG
Change-Id: Ic0c291183c63bb5c4a0a7e54f80c3c8f23349a3d
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index f6642f2..768492b 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -183,8 +183,7 @@ bool TeleManager::hasWaitingConference()
// FIXME this is exported only because of ScDocFuncDemo
SAL_DLLPUBLIC_EXPORT void TeleManager_fileReceived( const rtl::OUString rStr )
{
-fprintf( stderr, incoming file '%s'\n,
- rtl::OUStringToOString( rStr, RTL_TEXTENCODING_UTF8 ).getStr() );
+SAL_INFO( tubes, TeleManager_fileReceived: incoming file: rStr );
css::uno::Reference css::lang::XMultiServiceFactory rFactory =
::comphelper::getProcessServiceFactory();
@@ -202,8 +201,7 @@ SAL_DLLPUBLIC_EXPORT void TeleManager_fileReceived( const
rtl::OUString rStr )
}
catch ( const css::uno::Exception e )
{
-fprintf( stderr, exception when loading '%s' !\n,
- rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8
).getStr() );
+SAL_WARN( tubes, TeleManager_fileReceived: exception when loading:
e.Message );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_extensions' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes' - tubes/source
tubes/source/manager.cxx | 13 +
1 file changed, 1 insertion(+), 12 deletions(-)
New commits:
commit a47357a689baf7fe3ec60ef699606f3ea7c67020
Author: Matúš Kukan matus.ku...@gmail.com
Date: Tue Jul 17 12:00:35 2012 +0200
tubes: do not freeze when preparing Account Manager
We don't need to wait for our capabilities update to propagate from one
account via the network and back.
Since e3d1001c08d255c588ed6ca93f3b58b2161cce45 ContactList returns all
online contacts regardless of its capabilities.
Change-Id: Icf8982dd1e6aedec4f21920ff8020f8547d7b855
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index 896fcc8..a01d267 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -287,14 +287,6 @@ static void TeleManager_ChannelReadyHandler(
pConference-offerTube();
}
-static gboolean caps_hack_timeout_cb (void *pUserData)
-{
-TeleManager* pManager = reinterpret_castTeleManager*(pUserData);
-
-pManager-setAccountManagerReadyHandlerInvoked( true);
-return FALSE;
-}
-
static void TeleManager_AccountManagerReadyHandler(
GObject*pSourceObject,
GAsyncResult* pResult,
@@ -308,10 +300,6 @@ static void TeleManager_AccountManagerReadyHandler(
if (!pManager)
return;
-// Hack
-// pManager-setAccountManagerReadyHandlerInvoked( true);
-g_timeout_add_seconds( 2, caps_hack_timeout_cb, pManager);
-
GError* pError = NULL;
gboolean bPrepared = tp_proxy_prepare_finish( pSourceObject, pResult,
pError);
SAL_WARN_IF( !bPrepared, tubes, TeleManager_AccountManagerReadyHandler:
not prepared);
@@ -322,6 +310,7 @@ static void TeleManager_AccountManagerReadyHandler(
}
pManager-setAccountManagerReady( bPrepared);
+pManager-setAccountManagerReadyHandlerInvoked( true);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeOpenBSD.conf distro-configs/OxygenOfficeLinux.conf distro-configs/OxygenOfficeWin32.conf
configure.in |3 +-- distro-configs/LibreOfficeLinux.conf |1 - distro-configs/LibreOfficeOpenBSD.conf |1 - distro-configs/OxygenOfficeLinux.conf |1 - distro-configs/OxygenOfficeWin32.conf |1 - 5 files changed, 1 insertion(+), 6 deletions(-) New commits: commit 3201fd2316bb4aa420803c86d1aa7f71ba355f29 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Jul 16 22:22:33 2012 +0200 there is no --with-openldap option anymore Change-Id: I59dd2a5b2f7760ca610d64289cb11d5aedcd5965 diff --git a/configure.in b/configure.in index 7069b5e..d5a75ae 100644 --- a/configure.in +++ b/configure.in @@ -1260,7 +1260,7 @@ AC_ARG_WITH(system-icu, [Use icu already on system.]),, [with_system_icu=$with_system_libs]) -AC_ARG_WITH(system_openldap, +AC_ARG_WITH(system-openldap, AS_HELP_STRING([--with-system-openldap], [Use the OpenLDAP LDAP SDK already on system.]),, [with_system_openldap=$with_system_libs]) @@ -,7 +,6 @@ AC_SUBST(MOZ_FLAVOUR) AC_SUBST(MOZ_INC) AC_SUBST(MOZ_LIB) AC_SUBST(MOZ_LIB_XPCOM) -AC_SUBST(MOZ_LDAP_CFLAGS) dnl === dnl Check for system NSS only with xmlsec or mozilla build enabled diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index 499d30a..647001e 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -12,7 +12,6 @@ --without-system-jars --without-system-cairo --without-system-postgresql ---without-openldap --without-junit --without-helppack-integration --with-linker-hash-style=both diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf index f0a..8315fe3 100644 --- a/distro-configs/LibreOfficeOpenBSD.conf +++ b/distro-configs/LibreOfficeOpenBSD.conf @@ -47,7 +47,6 @@ --with-system-zlib --with-vendor=The OpenBSD project --without-junit ---without-openldap --without-system-mozilla --without-unix-wrapper --without-system-libwpd diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf index a9203f2..b4e27b9 100644 --- a/distro-configs/OxygenOfficeLinux.conf +++ b/distro-configs/OxygenOfficeLinux.conf @@ -77,7 +77,6 @@ --enable-graphite --enable-dependency-tracking --enable-python=internal ---with-openldap --enable-oxygenoffice --enable-ccache --enable-crashdump diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf index 04b92dd..3faac6d 100644 --- a/distro-configs/OxygenOfficeWin32.conf +++ b/distro-configs/OxygenOfficeWin32.conf @@ -41,4 +41,3 @@ --enable-dependency-tracking --enable-mozilla --with-system-mozilla=mozilla ---with-openldap ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes' - sc/source tubes/source
sc/source/ui/collab/contacts.cxx | 23 +++
sc/source/ui/collab/contacts.hrc |1 +
sc/source/ui/collab/contacts.src | 10 --
tubes/source/contact-list.cxx| 30 --
4 files changed, 40 insertions(+), 24 deletions(-)
New commits:
commit e3d1001c08d255c588ed6ca93f3b58b2161cce45
Author: Matúš Kukan matus.ku...@gmail.com
Date: Tue Jul 17 00:32:37 2012 +0200
tubes: improve contacts dialog
- do not show until it's ready
- do not close it with buttons
- buttons for both 1-1 and MUC sessions
- display all online contacts
Change-Id: Idfbea7ffdf76ef3f31dbeeefe62d69cb5e3e64b7
diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx
index 51bd1e4..4536e2e 100644
--- a/sc/source/ui/collab/contacts.cxx
+++ b/sc/source/ui/collab/contacts.cxx
@@ -47,6 +47,7 @@ class TubeContacts : public ModelessDialog
{
FixedLine maLabel;
PushButton maBtnConnect;
+PushButton maBtnGroup;
PushButton maBtnInvite;
PushButton maBtnListen;
SvxSimpleTableContainer maListContainer;
@@ -55,6 +56,7 @@ class TubeContacts : public ModelessDialog
ScDocFuncSend* mpSender;
DECL_LINK( BtnConnectHdl, void * );
+DECL_LINK( BtnGroupHdl, void * );
DECL_LINK( BtnInviteHdl, void * );
DECL_LINK( BtnListenHdl, void * );
@@ -152,12 +154,14 @@ public:
ModelessDialog( NULL, ScResId( RID_SCDLG_CONTACTS ) ),
maLabel( this, ScResId( FL_LABEL ) ),
maBtnConnect( this, ScResId( BTN_CONNECT ) ),
+maBtnGroup( this, ScResId( BTN_GROUP ) ),
maBtnInvite( this, ScResId( BTN_INVITE ) ),
maBtnListen( this, ScResId( BTN_LISTEN ) ),
maListContainer( this, ScResId( CTL_LIST ) ),
maList( maListContainer ),
mpManager( TeleManager::get() )
{
+Hide();
ScDocShell *pScDocShell = dynamic_castScDocShell*
(SfxObjectShell::Current());
ScDocFunc *pDocFunc = pScDocShell ? pScDocShell-GetDocFunc() : NULL;
mpSender = dynamic_castScDocFuncSend* (pDocFunc);
@@ -185,6 +189,7 @@ public:
}
}
maBtnConnect.SetClickHdl( LINK( this, TubeContacts, BtnConnectHdl ) );
+maBtnGroup.SetClickHdl( LINK( this, TubeContacts, BtnGroupHdl ) );
maBtnInvite.SetClickHdl( LINK( this, TubeContacts, BtnInviteHdl ) );
maBtnListen.SetClickHdl( LINK( this, TubeContacts, BtnListenHdl ) );
@@ -200,7 +205,6 @@ public:
sHeader += String( ScResId( STR_HEADER_NAME ) );
sHeader += '\t';
maList.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_LEFT );
-Show();
}
virtual ~TubeContacts()
{
@@ -221,7 +225,6 @@ public:
ContactList *pContacts = mpManager-getContactList();
if ( pContacts )
{
-fprintf( stderr, contacts !\n );
AccountContactPairV aPairs = pContacts-getContacts();
AccountContactPairV::iterator it;
for( it = aPairs.begin(); it != aPairs.end(); it++ )
@@ -240,10 +243,6 @@ public:
aImage = Image( aBitmap );
}
}
-fprintf( stderr, '%s' = '%s' '%s'\n,
- tp_account_get_display_name( it-first ),
- tp_contact_get_alias( it-second ),
- tp_contact_get_identifier( it-second ) );
rtl::OUStringBuffer aEntry( 128 );
aEntry.append( sal_Unicode( '\t' ) );
aEntry.append( fromUTF8 ( tp_contact_get_alias( it-second ) )
);
@@ -256,31 +255,31 @@ public:
pEntry-SetUserData( maACs.back() );
}
}
+Show();
}
};
IMPL_LINK_NOARG( TubeContacts, BtnConnectHdl )
{
-#if 0
StartBuddySession();
-#else
+return 0;
+}
+
+IMPL_LINK_NOARG( TubeContacts, BtnGroupHdl )
+{
StartGroupSession();
-#endif
-Close();
return 0;
}
IMPL_LINK_NOARG( TubeContacts, BtnInviteHdl )
{
Invite();
-Close();
return 0;
}
IMPL_LINK_NOARG( TubeContacts, BtnListenHdl )
{
Listen();
-Close();
return 0;
}
diff --git a/sc/source/ui/collab/contacts.hrc b/sc/source/ui/collab/contacts.hrc
index 59aeb67..4d7cc5f 100644
--- a/sc/source/ui/collab/contacts.hrc
+++ b/sc/source/ui/collab/contacts.hrc
@@ -5,6 +5,7 @@
#define BTN_CONNECT 3
#define BTN_INVITE 4
#define BTN_LISTEN 5
+#define BTN_GROUP6
#define STR_HEADER_ALIAS 20
#define STR_HEADER_NAME 21
diff --git a/sc/source/ui/collab/contacts.src b/sc/source/ui/collab/contacts.src
index 27d1dca..6a868ae 100644
--- a/sc/source/ui/collab/contacts.src
+++ b/sc/source/ui/collab/contacts.src
@@ -9,7 +9,7 @@ ModelessDialog RID_SCDLG_CONTACTS
Hide = FALSE ;
Moveable = TRUE ;
Closeable = TRUE ;
-Size =
[Libreoffice-commits] .: 3 commits - comphelper/inc comphelper/source .gitignore sc/source sfx2/Library_sfx.mk unusedcode.easy
.gitignore |3 -
comphelper/inc/comphelper/SelectionMultiplex.hxx |5 -
comphelper/source/misc/SelectionMultiplex.cxx| 10 ---
sc/source/filter/inc/sheetdatabuffer.hxx | 45 -
sc/source/filter/oox/sheetdatabuffer.cxx | 58 ---
sfx2/Library_sfx.mk | 15 -
unusedcode.easy |3 -
7 files changed, 2 insertions(+), 137 deletions(-)
New commits:
commit e9e3bd0659e761b5b9409d61ae831afc59b983cf
Author: Matúš Kukan matus.ku...@gmail.com
Date: Mon Jul 16 00:23:44 2012 +0200
do not hide .patch files
to hide more, try git config --global core.excludesfile
Change-Id: I1da4131b943a962797a1f389554139e87fe074bc
diff --git a/.gitignore b/.gitignore
index 45d72d0..c1aef58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -130,6 +130,3 @@ test/user-template/user/psprint/pspfontcache
# Somepeople love debugging
gdbtrace.log
valgrind.log
-
-#patches
-*.patch
commit 31b05fe9ffdc043211a6bd7216a809ab500b9691
Author: Matúš Kukan matus.ku...@gmail.com
Date: Mon Jul 16 00:20:25 2012 +0200
unusedcode: drop CellBlock and one small method
Change-Id: I7cad80ea59b4527193a35ea1b7cfdd56e07a0efe
diff --git a/comphelper/inc/comphelper/SelectionMultiplex.hxx
b/comphelper/inc/comphelper/SelectionMultiplex.hxx
index 390b3ff..56e8375 100644
--- a/comphelper/inc/comphelper/SelectionMultiplex.hxx
+++ b/comphelper/inc/comphelper/SelectionMultiplex.hxx
@@ -56,11 +56,6 @@ namespace comphelper
virtual void _disposing(const ::com::sun::star::lang::EventObject
_rSource) throw( ::com::sun::star::uno::RuntimeException);
protected:
-/** If the derivee also owns the mutex which we know as reference,
then call this within your
-derivee's dtor.
-*/
-voiddisposeAdapter();
-
// pseudo-private. Making it private now could break compatibility
voidsetAdapter( OSelectionChangeMultiplexer* _pAdapter );
};
diff --git a/comphelper/source/misc/SelectionMultiplex.cxx
b/comphelper/source/misc/SelectionMultiplex.cxx
index ca267e7..aa3092d 100644
--- a/comphelper/source/misc/SelectionMultiplex.cxx
+++ b/comphelper/source/misc/SelectionMultiplex.cxx
@@ -47,16 +47,6 @@ void OSelectionChangeListener::_disposing(const
EventObject) throw( RuntimeExce
}
//--
-void OSelectionChangeListener::disposeAdapter()
-{
-if ( m_pAdapter )
-m_pAdapter-dispose();
-
-// will automatically set a new adapter
-OSL_ENSURE( !m_pAdapter, OSelectionChangeListener::disposeAdapter: what
did dispose do? );
-}
-
-//--
void OSelectionChangeListener::setAdapter(OSelectionChangeMultiplexer*
pAdapter)
{
if (m_pAdapter)
diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx
b/sc/source/filter/inc/sheetdatabuffer.hxx
index 898d039..7c4e32e 100644
--- a/sc/source/filter/inc/sheetdatabuffer.hxx
+++ b/sc/source/filter/inc/sheetdatabuffer.hxx
@@ -90,48 +90,6 @@ struct DataTableModel
//
-/** Stores position and contents of a range of cells for optimized import. */
-class CellBlock : public WorksheetHelper
-{
-public:
-explicitCellBlock( const WorksheetHelper rHelper, const
ValueRange rColSpan, sal_Int32 nRow );
-
-/** Writes all buffered cells into the Calc sheet. */
-voidfinalizeImport();
-
-private:
-/** Fills unused cells before passed index with empty strings. */
-voidfillUnusedCells( sal_Int32 nIndex );
-
-private:
-/** Stores position and string data of a rich-string cell. */
-struct RichStringCell
-{
-::com::sun::star::table::CellAddress
-maCellAddr; /// The address of the
rich-string cell.
-RichStringRef mxString; /// The string with rich
formatting.
-const Font* mpFirstPortionFont; /// Font information from cell
for first text portion.
-
-explicitRichStringCell(
-const ::com::sun::star::table::CellAddress
rCellAddr,
-const RichStringRef rxString,
-const Font* pFirstPortionFont );
-};
-typedef ::std::list RichStringCell RichStringCellList;
-
-::com::sun::star::table::CellRangeAddress
-maRange;/// Cell range covered by this
cell block.
-RichStringCellList maRichStrings; /// Cached rich-string cells.
-::com::sun::star::uno::Sequence ::com::sun::star::uno::Sequence
::com::sun::star::uno::Any
-maCellArray;/// The array of cells of this
cell block.
-::com::sun::star::uno::Any*
-
[Libreoffice-commits] .: extensions/source
extensions/source/activex/so_activex.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cfec62ef443b3cda054bb698375ee49bc11586a0 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Jul 11 08:34:51 2012 +0200 fix typo Change-Id: I004a3981728b0f00f1536b6e7975bb45b2451eda diff --git a/extensions/source/activex/so_activex.cxx b/extensions/source/activex/so_activex.cxx index 3ae9145..a9b134c 100644 --- a/extensions/source/activex/so_activex.cxx +++ b/extensions/source/activex/so_activex.cxx @@ -180,7 +180,7 @@ BOOL createKey( HKEY hkey, 0, REG_SZ, reinterpret_castconst BYTE*(aChildValue), - sal::static_int_castDWORD(strlen(aChildValue + sal::static_int_castDWORD(strlen(aChildValue ERROR_SUCCESS == RegCloseKey( hkey1 ) ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes' - sc/CustomTarget_uiconfig.mk sc/Module_sc.mk sc/Package_uiconfig.mk sc/uiconfig solenv/gbuild
sc/CustomTarget_uiconfig.mk | 22 ++ sc/Module_sc.mk |1 + sc/Package_uiconfig.mk|2 ++ sc/uiconfig/scalc/menubar/menubar.xml |3 +-- solenv/gbuild/CustomTarget.mk |1 + 5 files changed, 27 insertions(+), 2 deletions(-) New commits: commit a6cd97c29c1cfdb0679d693b7b350f34427a9da6 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Jul 3 12:40:14 2012 +0200 tubes: add Collaborate menu item only in telepathy enabled build Change-Id: Ibfd90941a64540d0e59f1e884a0992758cbc3bb8 diff --git a/sc/CustomTarget_uiconfig.mk b/sc/CustomTarget_uiconfig.mk new file mode 100644 index 000..8e4e1ae --- /dev/null +++ b/sc/CustomTarget_uiconfig.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_CustomTarget_CustomTarget,sc/uiconfig)) + +ifeq ($(ENABLE_TELEPATHY),TRUE) +$(call gb_CustomTarget_get_target,sc/uiconfig) : \ + $(OUTDIR)/xml/uiconfig/modules/scalc/menubar/menubar.xml + +$(OUTDIR)/xml/uiconfig/modules/scalc/menubar/menubar.xml : $(SRCDIR)/sc/uiconfig/scalc/menubar/menubar.xml \ + | $(OUTDIR)/xml/uiconfig/modules/scalc/menubar/.dir + sed 's/.*.uno:Collaborate.*/menu:menuseparator\/\n menu:menuitem menu:id=.uno:Collaborate\//' $ $@ + +endif + +# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 3afcaf2..6f5b034 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -25,6 +25,7 @@ $(eval $(call gb_Module_Module,sc)) $(eval $(call gb_Module_add_targets,sc,\ AllLangResTarget_sc \ + CustomTarget_uiconfig \ Library_sc \ Library_scd \ Library_scfilt \ diff --git a/sc/Package_uiconfig.mk b/sc/Package_uiconfig.mk index bc3ec4d..f85a789 100644 --- a/sc/Package_uiconfig.mk +++ b/sc/Package_uiconfig.mk @@ -21,7 +21,9 @@ # instead of those above. $(eval $(call gb_Package_Package,sc_uiconfig,$(SRCDIR)/sc/uiconfig)) +ifneq ($(ENABLE_TELEPATHY),TRUE) $(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/menubar/menubar.xml,scalc/menubar/menubar.xml)) +endif $(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/statusbar/statusbar.xml,scalc/statusbar/statusbar.xml)) $(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/alignmentbar.xml,scalc/toolbar/alignmentbar.xml)) $(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/arrowshapes.xml,scalc/toolbar/arrowshapes.xml)) diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 6104095..71ad4f8 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -15,8 +15,7 @@ menu:menuseparator/ menu:menuitem menu:id=.uno:Reload/ menu:menuitem menu:id=.uno:VersionDialog/ -menu:menuseparator/ -menu:menuitem menu:id=.uno:Collaborate/ +!-- .uno:Collaborate menuitem, see CustomTarget_uiconfig.mk -- menu:menuseparator/ menu:menuitem menu:id=.uno:ExportTo/ menu:menuitem menu:id=.uno:ExportToPDF/ diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk index 31c5e9c..d8b59d2 100644 --- a/solenv/gbuild/CustomTarget.mk +++ b/solenv/gbuild/CustomTarget.mk @@ -43,6 +43,7 @@ $(call gb_CustomTarget_get_clean_target,%) : define gb_CustomTarget_CustomTarget $(eval $(call gb_Module_register_target,$(call gb_CustomTarget_get_target,$(1)),$(call gb_CustomTarget_get_clean_target,$(1 +$(call gb_CustomTarget_get_target,$(1)) :| $(dir $(call gb_CustomTarget_get_target,$(1))).dir endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/tubes'
New branch 'feature/tubes' available with the following commits: commit 34a8d93eaf138decdc24b9873c178368cdf638f5 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Jul 2 14:57:54 2012 +0200 tubes: fix makefiles after rebase Change-Id: I99a0dd6765d57c4a1d842b25d600d760930704fa commit 883b8af9d5c91d67f634b25a7e80ddb6a564b117 Author: Matúš Kukan matus.ku...@gmail.com Date: Sun Jul 1 23:43:33 2012 +0200 tubes: correctly set pDocFunc commit dd42110d3f40e98f1a1f9d7f72afdaf36d617f3e Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Jun 30 12:52:57 2012 +0200 tubes: make TeleManager::startGroupSession work and use it commit 138b58829bf9be8f30a6d75741e1bed5068aea67 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jun 29 19:30:46 2012 +0200 tubes: fallback to master mode when not possible to init TeleManager as slave commit 5cfe380087bf9ad99ac2f0976fecd8625d875f93 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jun 29 19:17:59 2012 +0200 tubes: unref TeleManager if we do not store the pointer commit 6047abb7ca4d1a67ca873eab76bd8cb31f854a52 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jun 29 19:15:40 2012 +0200 tubes: use new TeleManager::get() method without parameter commit 4c10749067715d43da22aeefaa501b9150231f9e Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jun 29 19:00:16 2012 +0200 tubes: remove unused SetCollaboration method commit 9b6fd6c598c969b068101877017fd3f85371f664 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jun 29 18:58:37 2012 +0200 tubes: use correct casts commit aa121092b084f3172bfd90731430db542cc21b97 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Jun 16 22:52:18 2012 +0200 tubes: add listen button to start TeleManager No more need to run soffice with LIBO_TUBES set. commit 4542e4b177163af24d2eb5790feb106474350229 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Jun 18 23:15:04 2012 +0200 tubes: create InitTeleManager method commit 85bec83beddc6ca1570a73ae42af9edf305157e2 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Jun 16 22:39:35 2012 +0200 tubes: extract class definitions to sendfunc.hxx commit 214d0def721688a947456bd96372cff8dceee7c5 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Jun 16 23:42:03 2012 +0200 tubes: start collaboration from the contacts widget commit 4136ff88b6495d60e7c359d78b27b2568f6d7f77 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Jun 16 23:29:03 2012 +0200 tubes: ScDocFuncSend: store pointer to TeleManager commit 9d3e305389e91026391cc0f001d3864eb74198d5 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Jun 13 20:03:26 2012 +0200 tubes: add File - Collaborate menu entry to launch contacts widget commit bc9f30a06d279e81fe383b42c96a15993bd285b8 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jun 8 21:10:59 2012 +0200 tubes: remove ScCollaboration layer commit de289d2dc4beb531387fd9d12ef27dc10917929d Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jun 8 16:31:22 2012 +0200 remove a few unused includes commit 24d2946d2f638e6473171902dd9c8072681032f5 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jun 8 16:18:33 2012 +0200 tubes: get Avatars loaded and displayed commit 9637ec42bbfd5ca2a3b416855bca6c9c59af6f7c Author: Matúš Kukan matus.ku...@gmail.com Date: Fri May 11 22:26:06 2012 +0200 tubes: improve contacts list sizing commit 6a5e84759907bab38d4dde5be5cca2ea354d806c Author: Michael Meeks michael.me...@suse.com Date: Tue May 22 17:42:59 2012 +0100 tubes: cleanup abstraction, and add in-process demo mode Pass const rtl::OUString s around instead of random pointers. Allow sc/ to build and work without telepathy enabled. Add aforementioned demo mode hack. commit 6ff46cc770448a57ce8092bf2106312402eeebc7 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Apr 14 14:02:39 2012 +0200 tubes: tweak makefiles commit bc4761d9c9b954e2d78fca9dddfc9c32ca49d3c3 Author: Eike Rathke er...@redhat.com Date: Sat Apr 14 13:06:29 2012 +0200 tubes: mention local copy of needed telepathy-glib commit 93eda34db33aaf4237251878c4bc4a1327dd7b35 Author: Will Thompson will.thomp...@collabora.co.uk Date: Thu Apr 5 10:53:21 2012 +0100 conference: remove a stray dbus-glib import. This is no longer needed since the switch to using GDBus for the tube connection. commit 9a74a73f36267f67ef4a252627e3ee81018add1c Author: Will Thompson will.thomp...@collabora.co.uk Date: Sun Apr 1 15:50:20 2012 +0100 tubes: use tp_dbus_tube_channel_offer/accept_async I added these to the recently-released telepathy-glib 0.18.0 mainly to let us simplify the code here. With this new API, tp-glib takes care of waiting for the state changes, creating the GDBusConnection, etc. commit 8996a8e480c2ecdeabcd584b2a622daea67d3e17 Author: Will Thompson will.thomp...@collabora.co.uk Date: Sun
[Libreoffice-commits] Changes to 'feature/tubes'
New branch 'feature/tubes' available with the following commits: commit 109a3a48abaefbd3fe2c97de5cff18ffe4455030 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Jul 2 14:57:54 2012 +0200 tubes: fix makefiles after rebase Change-Id: I99a0dd6765d57c4a1d842b25d600d760930704fa commit 97e5186a0a70254e62f5e3167ba9005630250493 Author: Matúš Kukan matus.ku...@gmail.com Date: Sun Jul 1 23:43:33 2012 +0200 tubes: correctly set pDocFunc commit 8fecf7c9183e0eaeb9ff975a5981bf9a39947a37 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Jun 30 12:52:57 2012 +0200 tubes: make TeleManager::startGroupSession work and use it commit 241a4639fc115e344f8f95d3d39ca888f4d7024c Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jun 29 19:30:46 2012 +0200 tubes: fallback to master mode when not possible to init TeleManager as slave commit ef8fb00f59a2ae629956c252d749d9448b6d1ce7 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jun 29 19:17:59 2012 +0200 tubes: unref TeleManager if we do not store the pointer commit 8bad1a570d3ca1b6afe3c458d2d73076092da84c Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jun 29 19:15:40 2012 +0200 tubes: use new TeleManager::get() method without parameter commit b05456ecd29faec5db12c6b0fb9dab682896dcf3 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jun 29 19:00:16 2012 +0200 tubes: remove unused SetCollaboration method commit adf76bfb4663c838d8600071fe5149be01232cf4 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jun 29 18:58:37 2012 +0200 tubes: use correct casts commit 284f32fe09a0299dd7b9737c292fe83cb5a65cda Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Jun 16 22:52:18 2012 +0200 tubes: add listen button to start TeleManager No more need to run soffice with LIBO_TUBES set. commit aa37b90f7f2db5610ca3a71a2d26d5250318e322 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Jun 18 23:15:04 2012 +0200 tubes: create InitTeleManager method commit 3de6455f07fdfb4fae6fe700062992367817da0b Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Jun 16 22:39:35 2012 +0200 tubes: extract class definitions to sendfunc.hxx commit 13002347f87254c2b07896a3d351234e3a135baf Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Jun 16 23:42:03 2012 +0200 tubes: start collaboration from the contacts widget commit c5355d070cffc5dc9df7a825e06de123e95b33af Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Jun 16 23:29:03 2012 +0200 tubes: ScDocFuncSend: store pointer to TeleManager commit f70dda79c3a173d607620e30a043a96300f4a604 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Jun 13 20:03:26 2012 +0200 tubes: add File - Collaborate menu entry to launch contacts widget commit 52542f0a9f24a4e0c76ea92104f7848fa45be940 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jun 8 21:10:59 2012 +0200 tubes: remove ScCollaboration layer commit 8c9647d7c754d6419ba5dd32b35c2a9e42f2d2f8 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jun 8 16:31:22 2012 +0200 remove a few unused includes commit b0dace3c2b9b6f4389c322ab6610a15ca4cb8837 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jun 8 16:18:33 2012 +0200 tubes: get Avatars loaded and displayed commit 4fced2ee3e3da47e27b3cb35920c9a30d7e190b1 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri May 11 22:26:06 2012 +0200 tubes: improve contacts list sizing commit 08a5c5537f962e55a94563930b165820a9db4cd1 Author: Michael Meeks michael.me...@suse.com Date: Tue May 22 17:42:59 2012 +0100 tubes: cleanup abstraction, and add in-process demo mode Pass const rtl::OUString s around instead of random pointers. Allow sc/ to build and work without telepathy enabled. Add aforementioned demo mode hack. commit dbd7ff79ef2aa499a5047aece175d51be0c7b0a4 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Apr 14 14:02:39 2012 +0200 tubes: tweak makefiles commit 23f23300e187d4e2f53938d84727563507a925e9 Author: Eike Rathke er...@redhat.com Date: Sat Apr 14 13:06:29 2012 +0200 tubes: mention local copy of needed telepathy-glib commit 463e33e6d1cc1ccaacc95afcdd5f2aaa339ea8e5 Author: Will Thompson will.thomp...@collabora.co.uk Date: Thu Apr 5 10:53:21 2012 +0100 conference: remove a stray dbus-glib import. This is no longer needed since the switch to using GDBus for the tube connection. commit daf479dea3211bad80e32e5fcca474309861e51e Author: Will Thompson will.thomp...@collabora.co.uk Date: Sun Apr 1 15:50:20 2012 +0100 tubes: use tp_dbus_tube_channel_offer/accept_async I added these to the recently-released telepathy-glib 0.18.0 mainly to let us simplify the code here. With this new API, tp-glib takes care of waiting for the state changes, creating the GDBusConnection, etc. commit fc686c5f4456b0e057953c7dafb8aa34a4901bd2 Author: Will Thompson will.thomp...@collabora.co.uk Date: Sun
[Libreoffice-commits] .: embedserv/Library_emser.mk solenv/gbuild
embedserv/Library_emser.mk |3 +-- solenv/gbuild/Executable.mk |2 -- solenv/gbuild/Library.mk|2 -- 3 files changed, 1 insertion(+), 6 deletions(-) New commits: commit ad39c2cdc3b652c530732c690618b2c7f47b8bd9 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Jul 2 18:43:50 2012 +0200 fix build, typo Change-Id: I532a6822d6ee023d72a71e012c97929f56c7b05a diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index f34836e..8628a05 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -39,8 +39,7 @@ $(eval $(call gb_Library_add_defs,emser,\ -UNOMINMAX \ )) -$(eval $(call gb_Library_use_api,emser)) -$(eval $(call gb_Library_use_api,emser)) +$(eval $(call gb_Library_use_sdk_api,emser)) $(eval $(call gb_Library_use_libraries,emser,\ comphelper \ diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index fd3269c..9f56296 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -110,8 +110,6 @@ $(eval $(foreach method,\ add_api \ use_api \ use_sdk_api \ - use_sdk_api \ - use_udk_api \ use_udk_api \ add_internal_api \ use_internal_api \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 1471b04..157be8c 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -191,8 +191,6 @@ $(eval $(foreach method,\ add_api \ use_api \ use_sdk_api \ - use_sdk_api \ - use_udk_api \ use_udk_api \ add_internal_api \ use_internal_api \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes2' - 3 commits - sc/source tubes/inc tubes/source
sc/source/ui/collab/contacts.cxx | 25 +
sc/source/ui/inc/docsh.hxx |1 +
tubes/inc/tubes/manager.hxx |8 +---
tubes/source/manager.cxx | 26 --
4 files changed, 39 insertions(+), 21 deletions(-)
New commits:
commit c2412e1f2a6c78f491b55c097b3f8a70fd6343ed
Author: Matúš Kukan matus.ku...@gmail.com
Date: Sun Jul 1 23:43:33 2012 +0200
tubes: correctly set pDocFunc
diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx
index bfc7710..078bcdd 100644
--- a/sc/source/ui/collab/contacts.cxx
+++ b/sc/source/ui/collab/contacts.cxx
@@ -74,7 +74,7 @@ class TubeContacts : public ModelessDialog
boost::shared_ptrScDocFuncDirect pDirect( new ScDocFuncDirect(
*pScDocShell ) );
boost::shared_ptrScDocFuncRecv pReceiver( new ScDocFuncRecv(
pDirect ) );
pSender = new ScDocFuncSend( *pScDocShell, pReceiver );
-pDocFunc = pSender;
+pScDocShell-SetDocFunc( pSender );
}
// This is a hack to work around:
// `error registering client handler: Name
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index a00e98e..827a3e9 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -241,6 +241,7 @@ public:
ScDocument* GetDocument() { return aDocument; }
ScDocFunc GetDocFunc(){ return *pDocFunc; }
+voidSetDocFunc( ScDocFunc *pDF ) { pDocFunc = pDF; }
SfxPrinter* GetPrinter( sal_Bool bCreateIfNotExist = sal_True );
sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, sal_uInt16
nDiffFlags = SFX_PRINTER_ALL );
commit da2da6094b879157efb1f501c440e49917855971
Author: Matúš Kukan matus.ku...@gmail.com
Date: Sat Jun 30 12:52:57 2012 +0200
tubes: make TeleManager::startGroupSession work and use it
diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx
index d1f27ec..bfc7710 100644
--- a/sc/source/ui/collab/contacts.cxx
+++ b/sc/source/ui/collab/contacts.cxx
@@ -107,6 +107,21 @@ class TubeContacts : public ModelessDialog
}
}
+void StartGroupSession()
+{
+AccountContact *pAC = NULL;
+if (maList.FirstSelected())
+pAC = static_castAccountContact*
(maList.FirstSelected()-GetUserData());
+if (pAC)
+{
+TpAccount* pAccount = pAC-mpAccount;
+fprintf( stderr, picked %s\n, tp_account_get_display_name(
pAccount ) );
+TeleManager *pManager = TeleManager::get();
+if (!pManager-startGroupSession( pAccount,
rtl::OUString(liboroom), rtl::OUString(conference.jabber.org) ))
+fprintf( stderr, could not start group session\n );
+}
+}
+
public:
TubeContacts() :
ModelessDialog( NULL, ScResId( RID_SCDLG_CONTACTS ) ),
@@ -188,7 +203,11 @@ public:
IMPL_LINK_NOARG( TubeContacts, BtnConnectHdl )
{
+#if 0
StartBuddySession();
+#else
+StartGroupSession();
+#endif
Close();
return 0;
}
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index c780fd2..326cc51 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -101,9 +101,11 @@ public:
*/
ContactList*getContactList() const;
-#if 0
/** Start a group session in a MUC.
+@param pAccount
+The account to use. This must be a valid Jabber account.
+
@param rConferenceRoom
The MUC to be created/joined, e.g. LibreOffice. If empty, the
conference's UUID is used.
@@ -113,9 +115,9 @@ public:
empty, only the conference's UUID is used and rConferenceRoom is
ignored, hopefully resulting in a local DBus tube.
*/
-boolstartGroupSession( const rtl::OUString
rConferenceRoom,
+boolstartGroupSession( TpAccount *pAccount,
+ const rtl::OUString
rConferenceRoom,
const rtl::OUString
rConferenceServer );
-#endif
/** Start a session with a buddy.
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index 2e0cd3e..06b1533 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -442,8 +442,6 @@ bool TeleManager::connect()
/* TODO: setup filters for LibreOfficeCalc, LibreOfficeWriter, ... */
-/* FIXME: once we can handle MUCs, this is additional to buddy channels! */
-#if 0
// Setup client handler for MUC channels with our service.
tp_base_client_take_handler_filter( pImpl-mpClient,
tp_asv_new(
@@ -451,7 +449,6 @@ bool TeleManager::connect()
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
TP_HANDLE_TYPE_ROOM,
TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME, G_TYPE_STRING,
getFullServiceName().getStr(),
NULL));
[Libreoffice-commits] .: Branch 'feature/tubes2' - 5 commits - sc/source tubes/inc
sc/source/ui/collab/contacts.cxx | 29 +
sc/source/ui/collab/contacts.hxx |2 +-
sc/source/ui/collab/sendfunc.cxx |6 +-
sc/source/ui/collab/sendfunc.hxx |1 -
sc/source/ui/view/cellsh3.cxx|4 ++--
tubes/inc/tubes/manager.hxx |1 +
6 files changed, 26 insertions(+), 17 deletions(-)
New commits:
commit 9fb21707db92e051493a3e959308a37112d32ffe
Author: Matúš Kukan matus.ku...@gmail.com
Date: Fri Jun 29 19:30:46 2012 +0200
tubes: fallback to master mode when not possible to init TeleManager as
slave
diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx
index 7ef5ab0..0c70585 100644
--- a/sc/source/ui/collab/contacts.cxx
+++ b/sc/source/ui/collab/contacts.cxx
@@ -76,7 +76,18 @@ class TubeContacts : public ModelessDialog
pSender = new ScDocFuncSend( *pScDocShell, pReceiver );
pDocFunc = pSender;
}
-pSender-InitTeleManager( false );
+// This is a hack to work around:
+// `error registering client handler: Name
+// 'org.freedesktop.Telepathy.Client.LibreOffice' already in use by
another process`
+// This happens when there is already slave instance running,
+// so we try to init TeleManager as master.
+bool bIsMaster = false;
+if (!pSender-InitTeleManager( bIsMaster ))
+{
+fprintf( stderr, Trying to initialize TeleManager as master..\n
);
+bIsMaster = true;
+pSender-InitTeleManager( bIsMaster );
+}
}
void StartBuddySession()
commit 26ff9e3b06efcefb1b9cda2b41378fcb23a01ece
Author: Matúš Kukan matus.ku...@gmail.com
Date: Fri Jun 29 19:17:59 2012 +0200
tubes: unref TeleManager if we do not store the pointer
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index f58fd6a..9ab6e78 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -302,6 +302,7 @@ bool ScDocFuncSend::InitTeleManager( bool bIsMaster )
return true;
}
fprintf( stderr, Could not connect.\n );
+pManager-unref();
return false;
}
commit c81e93931f42567f4e662804129d97b6e0cfa0d7
Author: Matúš Kukan matus.ku...@gmail.com
Date: Fri Jun 29 19:15:40 2012 +0200
tubes: use new TeleManager::get() method without parameter
diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx
index bd6e6d4..7ef5ab0 100644
--- a/sc/source/ui/collab/contacts.cxx
+++ b/sc/source/ui/collab/contacts.cxx
@@ -132,9 +132,11 @@ public:
RTL_TEXTENCODING_UTF8 );
}
-void Populate( const TeleManager rManager )
+void Populate( const TeleManager *pManager )
{
-ContactList *pContacts = rManager.getContactList();
+if (!pManager)
+return ;
+ContactList *pContacts = pManager-getContactList();
if ( pContacts )
{
fprintf( stderr, contacts !\n );
@@ -193,11 +195,11 @@ IMPL_LINK_NOARG( TubeContacts, BtnListenHdl )
#endif
namespace tubes {
-void createContacts( const TeleManager rManager )
+void createContacts( const TeleManager *pManager )
{
#ifdef CONTACTS_DLG
TubeContacts *pContacts = new TubeContacts();
-pContacts-Populate( rManager );
+pContacts-Populate( pManager );
#endif
}
}
diff --git a/sc/source/ui/collab/contacts.hxx b/sc/source/ui/collab/contacts.hxx
index f7ff6a9..404a6fc 100644
--- a/sc/source/ui/collab/contacts.hxx
+++ b/sc/source/ui/collab/contacts.hxx
@@ -30,7 +30,7 @@
class TeleManager;
namespace tubes {
-void createContacts( const TeleManager rContacts );
+void createContacts( const TeleManager *pManager );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 6d3fcf3..e10d5b5 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -60,7 +60,7 @@
#ifdef ENABLE_TELEPATHY
#include tubes/manager.hxx
namespace tubes {
-void createContacts( const TeleManager rContacts );
+void createContacts( const TeleManager *pManager );
}
#endif
@@ -125,7 +125,7 @@ void ScCellShell::Execute( SfxRequest rReq )
case SID_COLLABORATION:
#ifdef ENABLE_TELEPATHY
-tubes::createContacts( TeleManager::get( true ) );
+tubes::createContacts( TeleManager::get() );
#endif
break;
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index 1aba675..c780fd2 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -82,6 +82,7 @@ public:
TeleManager( bool bAcceptIncoming = true, bool bCreateOwnGMainLoop = false
);
~TeleManager();
+static TeleManager *get() { return pSingleton; }
static TeleManager *get( bool bAcceptIncoming );
voidunref();
commit 352c5e358dba7cd575c5579698b2fff348612926
[Libreoffice-commits] .: Branch 'feature/tubes2' - 6 commits - officecfg/registry sc/inc sc/sdi sc/source sc/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |5
sc/inc/sc.hrc |1
sc/sdi/cellsh.sdi |1
sc/sdi/scalc.sdi | 25
sc/source/ui/collab/contacts.cxx | 76 +
sc/source/ui/collab/contacts.hrc |2
sc/source/ui/collab/contacts.src | 14
sc/source/ui/collab/sendfunc.cxx | 627
+++---
sc/source/ui/collab/sendfunc.hxx | 267
sc/source/ui/view/cellsh3.cxx | 13
sc/uiconfig/scalc/menubar/menubar.xml |2
11 files changed, 605 insertions(+), 428 deletions(-)
New commits:
commit b711bcff8a93ff751d555e49f73b424a4e7ab1b4
Author: Matúš Kukan matus.ku...@gmail.com
Date: Sat Jun 16 22:52:18 2012 +0200
tubes: add listen button to start TeleManager
No more need to run soffice with LIBO_TUBES set.
diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx
index 44821a5..085237b 100644
--- a/sc/source/ui/collab/contacts.cxx
+++ b/sc/source/ui/collab/contacts.cxx
@@ -30,6 +30,8 @@
#include vector
#include contacts.hrc
+#include sendfunc.hxx
+#include docsh.hxx
#include scresid.hxx
#include svtools/filter.hxx
#include tubes/manager.hxx
@@ -45,10 +47,12 @@ class TubeContacts : public ModelessDialog
{
FixedLine maLabel;
PushButton maBtnConnect;
+PushButton maBtnListen;
SvxSimpleTableContainer maListContainer;
SvxSimpleTable maList;
DECL_LINK( BtnConnectHdl, void * );
+DECL_LINK( BtnListenHdl, void * );
struct AccountContact
{
@@ -59,6 +63,22 @@ class TubeContacts : public ModelessDialog
};
boost::ptr_vectorAccountContact maACs;
+void Listen()
+{
+ScDocShell *pScDocShell = reinterpret_castScDocShell*
(SfxObjectShell::Current());
+ScDocFunc *pDocFunc = pScDocShell ? pScDocShell-GetDocFunc() : NULL;
+ScDocFuncSend *pSender = reinterpret_castScDocFuncSend* (pDocFunc);
+if (!pSender)
+{
+delete pDocFunc;
+boost::shared_ptrScDocFuncDirect pDirect( new ScDocFuncDirect(
*pScDocShell ) );
+boost::shared_ptrScDocFuncRecv pReceiver( new ScDocFuncRecv(
pDirect ) );
+pSender = new ScDocFuncSend( *pScDocShell, pReceiver );
+pDocFunc = pSender;
+}
+pSender-InitTeleManager( false );
+}
+
void StartBuddySession()
{
AccountContact *pAC = NULL;
@@ -83,10 +103,12 @@ public:
ModelessDialog( NULL, ScResId( RID_SCDLG_CONTACTS ) ),
maLabel( this, ScResId( FL_LABEL ) ),
maBtnConnect( this, ScResId( BTN_CONNECT ) ),
+maBtnListen( this, ScResId( BTN_LISTEN ) ),
maListContainer( this, ScResId( CTL_LIST ) ),
maList( maListContainer )
{
maBtnConnect.SetClickHdl( LINK( this, TubeContacts, BtnConnectHdl ) );
+maBtnListen.SetClickHdl( LINK( this, TubeContacts, BtnListenHdl ) );
static long aStaticTabs[]=
{
@@ -160,6 +182,13 @@ IMPL_LINK_NOARG( TubeContacts, BtnConnectHdl )
return 0;
}
+IMPL_LINK_NOARG( TubeContacts, BtnListenHdl )
+{
+Listen();
+Close();
+return 0;
+}
+
} // anonymous namespace
#endif
diff --git a/sc/source/ui/collab/contacts.hrc b/sc/source/ui/collab/contacts.hrc
index dd3fcc4..cb69916 100644
--- a/sc/source/ui/collab/contacts.hrc
+++ b/sc/source/ui/collab/contacts.hrc
@@ -3,6 +3,7 @@
#define FL_LABEL 1
#define CTL_LIST 2
#define BTN_CONNECT 3
+#define BTN_LISTEN 4
#define STR_HEADER_ALIAS 20
#define STR_HEADER_NAME 21
diff --git a/sc/source/ui/collab/contacts.src b/sc/source/ui/collab/contacts.src
index 1689823..0de2849 100644
--- a/sc/source/ui/collab/contacts.src
+++ b/sc/source/ui/collab/contacts.src
@@ -21,10 +21,16 @@ ModelessDialog RID_SCDLG_CONTACTS
};
PushButton BTN_CONNECT
{
-Pos = MAP_APPFONT( 8 , 200 );
+Pos = MAP_APPFONT( 70 , 200 );
Size = MAP_APPFONT( 50 , 10 );
Text [ en-US ] = Collaborate;
};
+PushButton BTN_LISTEN
+{
+Pos = MAP_APPFONT( 8 , 200 );
+Size = MAP_APPFONT( 50 , 10 );
+Text [ en-US ] = Listen;
+};
Control CTL_LIST
{
Pos = MAP_APPFONT ( 8 , 10 ) ;
commit 6d74d44900a8dfb80a78fb81af4dccdf11cc47fd
Author: Matúš Kukan matus.ku...@gmail.com
Date: Mon Jun 18 23:15:04 2012 +0200
tubes: create InitTeleManager method
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index ee623e4..262273d 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++
[Libreoffice-commits] .: 2 commits - writerfilter/CustomTarget_source.mk writerfilter/debug_setup.mk writerfilter/Library_writerfilter.mk writerfilter/source
writerfilter/CustomTarget_source.mk |4 +- writerfilter/Library_writerfilter.mk | 18 +-- writerfilter/debug_setup.mk | 17 -- writerfilter/source/generated.mk | 55 --- 4 files changed, 17 insertions(+), 77 deletions(-) New commits: commit 951ed65898208a7597c813141ed160716708d348 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Jun 14 10:12:00 2012 +0200 writerfilter: two more dependencies Change-Id: I97491c61ef83f947e1923785300490f3b7920203 diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk index b039bcd..fc29784 100644 --- a/writerfilter/CustomTarget_source.mk +++ b/writerfilter/CustomTarget_source.mk @@ -149,7 +149,7 @@ $(writerfilter_GEN_ooxml_FactoryValues_hxx) : $(writerfilter_SRC_ooxml_FactoryVa $(call gb_Output_announce,$@,build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(writerfilter_SRC_ooxml_FactoryValues_xsl) $(writerfilter_GEN_ooxml_Model_processed)) $@ -$(writerfilter_GEN_ooxml_FastTokens_hxx) : $(writerfilter_SRC_ooxml_FastTokens_xsl) $(writerfilter_GEN_ooxml_Token_xml) +$(writerfilter_GEN_ooxml_FastTokens_hxx) : $(writerfilter_SRC_ooxml_FastTokens_xsl) $(writerfilter_GEN_ooxml_Token_xml) | $(writerfilter_WORK)/ooxml/.dir $(call gb_Output_announce,$@,build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(writerfilter_SRC_ooxml_FastTokens_xsl) $(writerfilter_GEN_ooxml_Token_xml)) $@ @@ -166,7 +166,7 @@ $(writerfilter_GEN_ooxml_Model_processed) : $(writerfilter_GEN_ooxml_Namespacesm $(call gb_Output_announce,$@,build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(writerfilter_GEN_ooxml_Namespacesmap_xsl) $(writerfilter_SRC_ooxml_Model)) $@ -$(writerfilter_GEN_ooxml_NamespaceIds_hxx) : $(writerfilter_SRC_ooxml_NamespaceIds_xsl) $(writerfilter_GEN_ooxml_Model_processed) +$(writerfilter_GEN_ooxml_NamespaceIds_hxx) : $(writerfilter_SRC_ooxml_NamespaceIds_xsl) $(writerfilter_GEN_ooxml_Model_processed) | $(writerfilter_WORK)/ooxml/.dir $(call gb_Output_announce,$@,build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(writerfilter_SRC_ooxml_NamespaceIds_xsl) $(writerfilter_GEN_ooxml_Model_processed)) $@ commit c65225a71bacc45d0cb54cac1edb9b22588d7468 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Jun 14 09:49:36 2012 +0200 writerfilter: remove unused / unneeded .mk files Change-Id: Ic64e3e527ced7fcf81f90075bae7d8a646789d4e diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 09d8587..2efffc3 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -25,8 +25,6 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -include $(SRCDIR)/writerfilter/debug_setup.mk - $(eval $(call gb_Library_Library,writerfilter)) $(eval $(call gb_Library_use_custom_headers,writerfilter,\ @@ -52,7 +50,21 @@ $(eval $(call gb_Library_add_defs,writerfilter,\ -DWRITERFILTER_RESOURCEMODEL_DLLIMPLEMENTATION \ -DWRITERFILTER_RTFTOK_DLLIMPLEMENTATION \ -DWRITERFILTER_WRITERFILTER_DLLIMPLEMENTATION \ - $(writerfilter_debug_flags) \ + $(if $(filter-out 0 1,$(gb_DEBUGLEVEL)), \ + -DDEBUG_DOMAINMAPPER \ + -DDEBUG_ELEMENT \ + -DDEBUG_RESOLVE \ + -DDEBUG_CONTEXT_STACK \ + -DDEBUG_ATTRIBUTES \ + -DDEBUG_PROPERTIES \ + -DDEBUG_CONTEXT_HANDLER \ + -DDEBUG_IMPORT \ + -DDEBUG_LOGGING \ + -DDEBUG_DMAPPER_PROPERTY_MAP \ + -DDEBUG_DMAPPER_TABLE_HANDLER \ + -DDEBUG_TABLE \ + -DDEBUG_DMAPPER_SETTINGS_TABLE \ + ) \ )) $(eval $(call gb_Library_use_libraries,writerfilter,\ diff --git a/writerfilter/debug_setup.mk b/writerfilter/debug_setup.mk deleted file mode 100644 index 95681da..000 --- a/writerfilter/debug_setup.mk +++ /dev/null @@ -1,17 +0,0 @@ -define writerfilter_debug_flags -$(if $(filter-out 0 1,$(strip $(gb_DEBUGLEVEL))),\ --DDEBUG_DOMAINMAPPER \ --DDEBUG_ELEMENT \ --DDEBUG_RESOLVE \ --DDEBUG_CONTEXT_STACK \ --DDEBUG_ATTRIBUTES \ --DDEBUG_PROPERTIES \ --DDEBUG_CONTEXT_HANDLER \ --DDEBUG_IMPORT \ --DDEBUG_LOGGING \ --DDEBUG_DMAPPER_PROPERTY_MAP \ --DDEBUG_DMAPPER_TABLE_HANDLER \ --DDEBUG_TABLE \ --DDEBUG_DMAPPER_SETTINGS_TABLE \ -) -endef diff --git a/writerfilter/source/generated.mk b/writerfilter/source/generated.mk deleted file mode 100644 index 39895d5..000 --- a/writerfilter/source/generated.mk +++ /dev/null @@ -1,55 +0,0 @@ -#* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -#
[Libreoffice-commits] .: 2 commits - cross_toolset/prj pyuno/prj tail_build/prj
cross_toolset/prj/build.lst |2 +- pyuno/prj/d.lst | 27 --- tail_build/prj/build.lst|2 +- 3 files changed, 2 insertions(+), 29 deletions(-) New commits: commit 656e9238de03bcc696e9d6f629e71a75be2c66d0 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Jun 14 12:55:31 2012 +0200 pyuno: clean d.lst Change-Id: Iaca5b31fb723e158198c7a21c1361f3f4a756477 diff --git a/pyuno/prj/d.lst b/pyuno/prj/d.lst index 38ae95d..e69de29 100644 --- a/pyuno/prj/d.lst +++ b/pyuno/prj/d.lst @@ -1,27 +0,0 @@ -mkdir: %_DEST%\bin\pyuno -mkdir: %_DEST%\lib\pyuno - -..\%__SRC%\lib\libpyuno.so %_DEST%\lib\libpyuno.so -..\%__SRC%\lib\libpyuno.dylib %_DEST%\lib\libpyuno.dylib -..\%__SRC%\lib\pyuno.so %_DEST%\lib\pyuno.so -..\%__SRC%\lib\pyuno.dylib %_DEST%\lib\pyuno.dylib -..\%__SRC%\lib\pythonloader.uno.so %_DEST%\lib\pythonloader.uno.so -..\%__SRC%\lib\pythonloader.uno.dylib %_DEST%\lib\pythonloader.uno.dylib -..\%__SRC%\lib\unohelper.py %_DEST%\lib\pyuno\unohelper.py -..\%__SRC%\lib\pythonloader.py %_DEST%\lib\pyuno\pythonloader.py -..\%__SRC%\lib\uno.py %_DEST%\lib\pyuno\uno.py -..\%__SRC%\misc\pythonloader.component %_DEST%\xml\pythonloader.component - -..\%__SRC%\bin\unohelper.py %_DEST%\bin\pyuno\unohelper.py -..\%__SRC%\bin\pythonloader.py %_DEST%\bin\pyuno\pythonloader.py -..\%__SRC%\bin\uno.py %_DEST%\bin\pyuno\uno.py -..\%__SRC%\bin\pyuno.pyd %_DEST%\bin\pyuno.pyd -..\%__SRC%\bin\pyuno.dll %_DEST%\bin\pyuno.dll -..\%__SRC%\bin\pythonl*.dll %_DEST%\bin\pythonl*.dll - -..\%__SRC%\misc\pyunorc %_DEST%\lib\pyunorc -..\%__SRC%\misc\pyuno.ini %_DEST%\bin\pyuno.ini -..\%__SRC%\bin\python-core-*.zip %_DEST%\bin\python-core-*.zip -..\%__SRC%\bin\python.bin %_DEST%\bin\python.bin -..\%__SRC%\bin\python.sh %_DEST%\bin\pyuno\python -..\%__SRC%\bin\python.exe %_DEST%\bin\pyuno\python.exe commit 3d085997437e09692827f834ee8ec7fb5c192ec2 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Jun 14 12:38:06 2012 +0200 icc no more exists Change-Id: I3e4387ba5414aee7108e8a471d964baaece2c0a0 diff --git a/cross_toolset/prj/build.lst b/cross_toolset/prj/build.lst index 732dd6b..5374f6a 100644 --- a/cross_toolset/prj/build.lst +++ b/cross_toolset/prj/build.lst @@ -1 +1 @@ -crscross_toolset :: autodoc cross_tail_build setup_native icc NULL +crscross_toolset :: autodoc cross_tail_build setup_native NULL diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index f7e..9e4780a 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBMSPUB:libmspub LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external icc jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo remotebridges RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper udkapi xmlr eader xsltml NULL +tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBMSPUB:libmspub LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo remotebridges RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper udkapi xmlreade r xsltml NULL tb tail_build\prj nmake - all tb_prj NULL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: pyuno/Module_pyuno.mk
pyuno/Module_pyuno.mk | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) New commits: commit 83726096bfe32160f1fd0aab106a1052aec9ecaa Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Jun 14 21:01:11 2012 +0200 pyuno: more stuff unwanted if there is system python Change-Id: I13d543f9f877f65f377ae914f8308876bf2c0532 diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index 0f15ac5..e39bcd0 100755 --- a/pyuno/Module_pyuno.mk +++ b/pyuno/Module_pyuno.mk @@ -41,6 +41,8 @@ $(eval $(call gb_Module_add_targets,pyuno,\ )) endif +ifneq ($(SYSTEM_PYTHON),YES) + # zipcore: python.exe on Windows # zipcore: pyversion.hxx on Windows ifeq ($(OS),WNT) @@ -53,7 +55,6 @@ endif # zipcore: python.sh on Unix -ifneq ($(SYSTEM_PYTHON),YES) ifeq ($(GUI),UNX) $(eval $(call gb_Module_add_targets,pyuno,\ CustomTarget_python_shell \ @@ -66,21 +67,18 @@ $(eval $(call gb_Module_add_targets,pyuno,\ )) endif endif -endif # python-zipcore-$(PYVESION) not on MACOSX # (OOoPython.framework.zip is already delivered for MACOSX in python module) -ifneq ($(SYSTEM_PYTHON),YES) ifneq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,pyuno,\ CustomTarget_zipcore \ Package_zipcore \ )) endif -endif - -endif # DISABLE_PYTHON +endif # SYSTEM_PYTHON +endif # DISABLE_PYTHON # vim:set shiftwidth=4 softtabstop=4 expandtab: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes2' - 4 commits - sc/Library_sc.mk sc/source
sc/Library_sc.mk |6 -
sc/source/ui/collab/collab.cxx | 126 ---
sc/source/ui/collab/contacts.cxx | 22 +-
sc/source/ui/collab/contacts.hxx |4 -
sc/source/ui/collab/contacts.src |4 -
sc/source/ui/collab/sendfunc.cxx | 82 -
sc/source/ui/inc/collab.hxx | 76 ---
7 files changed, 71 insertions(+), 249 deletions(-)
New commits:
commit d17dca0a25d893445c4e384fad66364a4b2fb66d
Author: Matúš Kukan matus.ku...@gmail.com
Date: Fri Jun 8 21:10:59 2012 +0200
tubes: remove ScCollaboration layer
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index f8ef430..6aa71ae 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -53,20 +53,14 @@ $(eval $(call gb_Library_add_linked_libs,sc,\
))
$(eval $(call gb_Library_add_cxxflags,sc,\
- $$(TELEPATHY_CFLAGS) \
-DENABLE_TELEPATHY \
))
-$(eval $(call gb_Library_add_libs,sc,\
- $$(TELEPATHY_LIBS) \
-))
-
$(eval $(call gb_Library_use_externals,sc,\
telepathy \
))
$(eval $(call gb_Library_add_exception_objects,sc,\
- sc/source/ui/collab/collab \
sc/source/ui/collab/contacts \
sc/source/ui/collab/sendfunc \
))
diff --git a/sc/source/ui/collab/collab.cxx b/sc/source/ui/collab/collab.cxx
deleted file mode 100644
index d14b42e..000
--- a/sc/source/ui/collab/collab.cxx
+++ /dev/null
@@ -1,126 +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 collab.hxx
-#include tubes/manager.hxx
-#include tubes/conference.hxx
-#include tubes/contact-list.hxx
-
-ScCollaboration::ScCollaboration()
-:
-mpAccount( NULL),
-mpContact( NULL),
-mpManager( NULL)
-{
-}
-
-
-ScCollaboration::~ScCollaboration()
-{
-if (mpAccount)
-g_object_unref( mpAccount);
-if (mpContact)
-g_object_unref( mpContact);
-
-mpManager-unref();
-mpManager = NULL;
-}
-
-
-void ScCollaboration::receivedFile( const rtl::OUString rFileURL )
-{
-fprintf( stderr, file recieved '%s'\n,
- rtl::OUStringToOString( rFileURL, RTL_TEXTENCODING_UTF8
).getStr() );
-sigFileReceived( rFileURL );
-}
-
-void ScCollaboration::packetReceivedCallback( TeleConference *pConference,
TelePacket rPacket )
-{
-rtl::OString aString( rPacket.getData(), rPacket.getSize());
-/* Relay the signal out⦠*/
-sigPacketReceived( pConference, aString);
-}
-
-bool ScCollaboration::initManager(bool bAcceptIncoming)
-{
-mpManager = TeleManager::get(bAcceptIncoming);
-mpManager-sigPacketReceived.connect(
-boost::bind( ScCollaboration::packetReceivedCallback, this, _1, _2 ));
-mpManager-connect();
-mpManager-prepareAccountManager();
-mpManager-sigFileReceived.connect(
-boost::bind( ScCollaboration::receivedFile, this, _1 ));
-return true;
-}
-
-
-bool ScCollaboration::initAccountContact()
-{
-ContactList* pContactList = mpManager-getContactList();
-AccountContactPairV aVec( pContactList-getContacts());
-
-fprintf( stderr, %u contacts\n, (int) aVec.size() );
-if (aVec.empty())
-return false;
-
-/* TODO: select a pair, for now just take the first */
-mpAccount = aVec[0].first;
-mpContact = aVec[0].second;
-fprintf( stderr, picked %s\n, tp_contact_get_identifier( mpContact ) );
-return true;
-}
-
-
-bool ScCollaboration::startCollaboration()
-{
-bool bOk = mpManager-startBuddySession( mpAccount, mpContact);
-return bOk;
-}
-
-
-bool ScCollaboration::sendPacket( const rtl::OString rString )
-{
-TelePacket aPacket( sender, rString.getStr(), rString.getLength());
-bool bOk = mpManager-sendPacket( aPacket);
-return bOk;
-}
-
-
-extern C {
-static void file_sent_cb( bool aSuccess, void* /* pUserData */ )
-{
-fprintf( stderr, File send %s\n,
[Libreoffice-commits] .: packimages/CustomTarget_images.mk packimages/Package_images.mk
packimages/CustomTarget_images.mk |5 +++-- packimages/Package_images.mk |6 -- 2 files changed, 7 insertions(+), 4 deletions(-) New commits: commit 584c5f1d3530eec6c6bfa68a05533609a81cfb2f Author: Matúš Kukan matus.ku...@gmail.com Date: Sun Jun 3 11:24:03 2012 +0200 packimages: better interpret 'default' value in WITH_THEMES Change-Id: Id68748b557f4ec5a28489ea894be221953ac9045 diff --git a/packimages/CustomTarget_images.mk b/packimages/CustomTarget_images.mk index 8b27653..5521694 100644 --- a/packimages/CustomTarget_images.mk +++ b/packimages/CustomTarget_images.mk @@ -35,8 +35,9 @@ packimages_CUSTOM_FALLBACK_1 := -c $(SRCDIR)/icon-themes/tango packimages_CUSTOM_FALLBACK_2 := -c $(SRCDIR)/icon-themes/industrial $(call gb_CustomTarget_get_target,packimages/images) : \ - $(packimages_DIR)/images.zip $(packimages_DIR)/images_brand.zip $(foreach theme,$(WITH_THEMES),\ - $(packimages_DIR)/images_$(theme).zip) + $(packimages_DIR)/images_brand.zip \ + $(if $(filter default,$(WITH_THEMES)),$(packimages_DIR)/images.zip) \ + $(foreach theme,$(filter-out default,$(WITH_THEMES)),$(packimages_DIR)/images_$(theme).zip) $(packimages_DIR)/images.zip : \ $(packimages_DIR)/sorted.lst $(packimages_DIR)/commandimagelist.ilst diff --git a/packimages/Package_images.mk b/packimages/Package_images.mk index 9f7ee7b..a57c7e4 100644 --- a/packimages/Package_images.mk +++ b/packimages/Package_images.mk @@ -27,10 +27,12 @@ $(eval $(call gb_Package_Package,packimages_images,$(call gb_CustomTarget_get_workdir,packimages/images))) -$(eval $(call gb_Package_add_file,packimages_images,bin/images.zip,images.zip)) $(eval $(call gb_Package_add_file,packimages_images,bin/images_brand.zip,images_brand.zip)) -$(foreach theme,$(WITH_THEMES),\ +$(if $(filter default,$(WITH_THEMES)),\ +$(eval $(call gb_Package_add_file,packimages_images,bin/images.zip,images.zip))) + +$(foreach theme,$(filter-out default,$(WITH_THEMES)),\ $(eval $(call gb_Package_add_file,packimages_images,bin/images_$(theme).zip,images_$(theme).zip))) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 5 commits - config_host.mk.in configure.in extensions/Executable_pluginapp.bin.mk extensions/Library_pl.mk extensions/Library_scn.mk extensions/source extensions/StaticLibrary
Module_tail_build.mk |8 RepositoryExternal.mk | 13 RepositoryModule_ooo.mk|1 config_host.mk.in |1 configure.in |7 extensions/Executable_pluginapp.bin.mk |2 extensions/Library_pl.mk |2 extensions/Library_scn.mk | 11 extensions/StaticLibrary_plugcon.mk|2 extensions/source/scanner/twain.cxx| 478 - extensions/source/scanner/twain.hxx| 95 -- np_sdk/Module_np_sdk.mk|6 np_sdk/Package_inc.mk |8 np_sdk/Package_mozilla_inc.mk | 35 ++ sane/Module_sane.mk|4 15 files changed, 66 insertions(+), 607 deletions(-) New commits: commit 8f6510b31f47e7f21a460fefce74842cdb2ba07f Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Jun 2 21:54:26 2012 +0200 np_sdk: separate system and internal headers Change-Id: I4c61dcb40acf12fa0fe4cf4d6c39a8bfd7b7c9b4 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 780f4a4..326a9a6 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -54,22 +54,21 @@ endif ifeq ($(SYSTEM_MOZILLA_HEADERS),YES) define gb_LinkTarget__use_mozilla_headers -$(eval $(call gb_LinkTarget_use_package,$(1),np_sdk_inc)) -$(eval $(call gb_LinkTarget_set_include,$(1),\ +$(call gb_LinkTarget_set_include,$(1),\ $(MOZILLA_HEADERS_CFLAGS) \ $$(INCLUDE) \ -)) +) endef else #!SYSTEM_MOZILLA_HEADERS define gb_LinkTarget__use_mozilla_headers -$(eval $(call gb_LinkTarget_use_package,$(1),np_sdk_inc)) -$(eval $(call gb_LinkTarget_set_include,$(1),\ - -I$(OUTDIR)/inc/npsdk \ +$(call gb_LinkTarget_use_package,$(1),mozilla_inc) +$(call gb_LinkTarget_set_include,$(1),\ + -I$(OUTDIR)/inc/external/npsdk \ $$(INCLUDE) \ -)) +) endef diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk index 57bbb18..4fd84f0 100644 --- a/extensions/Executable_pluginapp.bin.mk +++ b/extensions/Executable_pluginapp.bin.mk @@ -30,6 +30,8 @@ $(eval $(call gb_Executable_Executable,pluginapp.bin)) +$(eval $(call gb_Executable_use_package,pluginapp.bin,np_sdk_inc)) + $(eval $(call gb_Executable_use_external,pluginapp.bin,mozilla_headers)) $(eval $(call gb_Executable_set_include,pluginapp.bin,\ diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index 8db7fba..cbcfc79 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -32,6 +32,8 @@ $(eval $(call gb_Library_Library,pl)) $(eval $(call gb_Library_set_componentfile,pl,extensions/source/plugin/pl)) +$(eval $(call gb_Library_use_package,pl,np_sdk_inc)) + $(eval $(call gb_Library_use_external,pl,mozilla_headers)) $(eval $(call gb_Library_set_include,pl,\ diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk index 50e90d0..0ef41af 100644 --- a/extensions/StaticLibrary_plugcon.mk +++ b/extensions/StaticLibrary_plugcon.mk @@ -31,6 +31,8 @@ endif $(eval $(call gb_StaticLibrary_StaticLibrary,plugcon)) +$(eval $(call gb_StaticLibrary_use_package,plugcon,np_sdk_inc)) + $(eval $(call gb_StaticLibrary_use_external,plugcon,mozilla_headers)) $(eval $(call gb_StaticLibrary_set_include,plugcon,\ diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk index 6a60e3f..eabc6f8 100644 --- a/np_sdk/Module_np_sdk.mk +++ b/np_sdk/Module_np_sdk.mk @@ -33,6 +33,12 @@ $(eval $(call gb_Module_add_targets,np_sdk,\ Package_inc \ )) +ifeq ($(SYSTEM_MOZILLA_HEADERS),NO) +$(eval $(call gb_Module_add_targets,np_sdk,\ + Package_mozilla_inc \ +)) +endif + ifeq ($(ENABLE_NSPLUGIN),YES) $(eval $(call gb_Module_add_targets,np_sdk,\ StaticLibrary_nputils \ diff --git a/np_sdk/Package_inc.mk b/np_sdk/Package_inc.mk index 26dc537..841b1bd 100644 --- a/np_sdk/Package_inc.mk +++ b/np_sdk/Package_inc.mk @@ -32,12 +32,4 @@ $(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/jri_md.h,mozsrc/jri_md.h) $(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/jritypes.h,mozsrc/jritypes.h)) $(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/npupp.h,mozsrc/npupp.h)) -ifeq ($(SYSTEM_MOZILLA_HEADERS),NO) -$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/npapi.h,inc/npapi.h)) -$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/npfunctions.h,inc/npfunctions.h)) -$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/npruntime.h,inc/npruntime.h)) -$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/nptypes.h,inc/nptypes.h)) - -endif - # vim: set noet sw=4 ts=4: diff --git a/np_sdk/Package_mozilla_inc.mk b/np_sdk/Package_mozilla_inc.mk new file mode 100644 index 000..20b94f1 --- /dev/null +++ b/np_sdk/Package_mozilla_inc.mk @@ -0,0 +1,35 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of
[Libreoffice-commits] .: vcl/Library_vcl.mk
vcl/Library_vcl.mk |5 + 1 file changed, 5 insertions(+) New commits: commit 13aaac50bc5c37d4d9be97b441032dd7d6d02406 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Jun 2 23:58:05 2012 +0200 vcl: add dependency on basebmp's headers not implied by linking Change-Id: Ic35a980f7ddc45ce319fe6d78c93be33126380a6 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 8d9473a..75a1059 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -319,6 +319,11 @@ endif # GUIBASE specific stuff ifeq ($(GUIBASE),aqua) +# headers from basebmp are included but the library is not used ? +$(eval $(call gb_Library_use_packages,vcl,\ + basebmp_inc \ +)) + $(eval $(call gb_Library_add_cxxflags,vcl,\ $(gb_OBJCXXFLAGS) \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in | 23 ++- 1 file changed, 2 insertions(+), 21 deletions(-) New commits: commit 6a491cbe8f86e7ce57e0281bf45d74c628ef7956 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu May 31 15:48:15 2012 +0200 fix SCPDEFS for --disable-activex Change-Id: Id20f7294e2bf00cf1a980cb137b51a107ef698e7 diff --git a/configure.in b/configure.in index c834829..9706033 100644 --- a/configure.in +++ b/configure.in @@ -601,11 +601,6 @@ AC_ARG_ENABLE(epm, useless for large scale package building.]) ) -AC_ARG_ENABLE(activex_component, -AS_HELP_STRING([--disable-activex-component], -[Remove support for ActiveX embedding of LibreOffice.]) -) - AC_ARG_ENABLE(odk, AS_HELP_STRING([--disable-odk], [LibreOffice includes an ODK, office development kit which some packagers may @@ -2556,6 +2551,7 @@ if test $_os = WINNT; then AC_MSG_CHECKING([whether to use ActiveX]) if test $enable_activex = yes -o $enable_activex = TRUE -o $enable_activex = ; then DISABLE_ACTIVEX= +SCPDEFS=$SCPDEFS -DWITH_ACTIVEX_COMPONENT AC_MSG_RESULT([yes]) else DISABLE_ACTIVEX=TRUE @@ -10476,22 +10472,7 @@ else fi AC_SUBST(ENABLE_SILENT_MSI) -dnl === -dnl Test whether to enable ActiveX embedding -dnl === -if test $_os = WINNT -a $WITH_MINGW != yes; then -AC_MSG_CHECKING([whether to enable ActiveX embedding of LibreOffice components]) -if test $enable_activex_component = yes -o $enable_activex_component = TRUE -o $enable_activex_component = ; then -ENABLE_ACTIVEX_COMPONENT=TRUE -AC_MSG_RESULT([yes]) -SCPDEFS=$SCPDEFS -DWITH_ACTIVEX_COMPONENT -else -ENABLE_ACTIVEX_COMPONENT= -AC_MSG_RESULT([no]) -fi -AC_SUBST(ENABLE_ACTIVEX_COMPONENT) -AC_SUBST(SCPDEFS) -fi +AC_SUBST(SCPDEFS) AC_MSG_CHECKING([whether and how to use Xinerama]) if test $_os = Darwin; then ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/Library_svxcore.mk
svx/Library_svxcore.mk |1 + 1 file changed, 1 insertion(+) New commits: commit bb0eaf4f0e3129a496a861daf96da1e1907758d5 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed May 30 09:35:19 2012 +0200 svxcore: needs also generated header from connectivity Change-Id: I4279f9e6024e7128286e8b2d6343deee944866b2 diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 7c021f7..beda9bd 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -384,6 +384,7 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))$(filter IOS,$(OS))) $(eval $(call gb_Library_use_packages,svxcore,\ connectivity_inc \ + connectivity_generated \ )) $(eval $(call gb_Library_add_exception_objects,svxcore,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/CustomTarget_localedata.mk
i18npool/CustomTarget_localedata.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit af1fe5e603b8fff6b35a759d9c558f6a49638e2e Author: Matúš Kukan matus.ku...@gmail.com Date: Wed May 30 12:20:48 2012 +0200 i18npool: depend on outdir target Change-Id: Ib94620f316899a77b3842989dd859625f6748ddc diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk index 37c9474..d8c260d 100644 --- a/i18npool/CustomTarget_localedata.mk +++ b/i18npool/CustomTarget_localedata.mk @@ -54,7 +54,7 @@ $(i18npool_LDDIR)/saxparser.rdb : $(i18npool_LDDIR)/saxparser.input \ $(gb_XSLTPROC) --nonet --stringparam prefix $(OUTDIR_FOR_BUILD)/xml/ \ -o $@ $(SOLARENV)/bin/packcomponents.xslt $) -$(i18npool_LDDIR)/saxparser.input : $(call gb_ComponentTarget_get_target,sax/source/expatwrap/expwrap) | $(i18npool_LDDIR)/.dir +$(i18npool_LDDIR)/saxparser.input : $(call gb_ComponentTarget_get_outdir_target,sax/source/expatwrap/expwrap) | $(i18npool_LDDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) echo 'listfilenamecomponent/sax/source/expatwrap/expwrap.component/filename/list' $@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in reportbuilder/Module_reportbuilder.mk
configure.in |3 --- reportbuilder/Module_reportbuilder.mk |2 +- 2 files changed, 1 insertion(+), 4 deletions(-) New commits: commit c88234357f97020885010d50aa3e2c3e1c53d605 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed May 30 00:22:11 2012 +0200 reportbuilder: build only when enabled Change-Id: Iee65c6bd8ddc51b3ae703e6d38c825f3801389fe diff --git a/configure.in b/configure.in index 94f545e..f5088f9 100644 --- a/configure.in +++ b/configure.in @@ -9119,7 +9119,6 @@ AC_MSG_CHECKING([whether to build the Report Builder extension]) if test $enable_ext_report_builder != no -a x$enable_extension_integration != xno -a $with_java != no; then AC_MSG_RESULT([yes]) ENABLE_REPORTBUILDER=YES -AC_MSG_CHECKING([for reportbuilder module]) AC_MSG_CHECKING([which jfreereport libs to use]) if test $with_system_jfreereport = yes; then SYSTEM_JFREEREPORT=YES @@ -9282,11 +9281,9 @@ if test $enable_ext_report_builder != no -a x$enable_extension_integration else AC_MSG_RESULT([internal]) -AC_MSG_CHECKING([for jfreereport module]) SYSTEM_JFREEREPORT=NO BUILD_TYPE=$BUILD_TYPE JFREEREPORT fi -BUILD_TYPE=$BUILD_TYPE REPORTBUILDER else AC_MSG_RESULT([no]) ENABLE_REPORTBUILDER=NO diff --git a/reportbuilder/Module_reportbuilder.mk b/reportbuilder/Module_reportbuilder.mk index 9d3bea5..1829743 100644 --- a/reportbuilder/Module_reportbuilder.mk +++ b/reportbuilder/Module_reportbuilder.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Module_Module,reportbuilder)) -ifneq ($(SOLAR_JAVA),) +ifeq ($(ENABLE_REPORTBUILDER),YES) $(eval $(call gb_Module_add_targets,reportbuilder,\ Configuration_reportbuilder \ Extension_reportbuilder \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - shell/Library_ooofilt.mk shell/Library_ooofilt_x64.mk shell/Library_propertyhdl.mk shell/Library_propertyhdl_x64.mk shell/Library_shlxthdl.mk s
shell/Library_ooofilt.mk| 23 ++-- shell/Library_ooofilt_x64.mk| 10 +++- shell/Library_propertyhdl.mk| 19 +--- shell/Library_propertyhdl_x64.mk|5 shell/Library_shlxthdl.mk | 10 +++- shell/Library_shlxthdl_x64.mk | 10 +++- shell/Module_shell.mk |4 +-- shell/source/cmdmail/exports.dxp|1 shell/source/win32/exports.dxp |1 shell/source/win32/shlxthandler/prophdl/exports.dxp |2 - shell/source/win32/simplemail/exports.dxp |1 11 files changed, 33 insertions(+), 53 deletions(-) New commits: commit 3ca7b8c296bcda699bcf642db3932b3fdbe7ad06 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon May 28 15:04:18 2012 +0200 shell: export more symbols, as private Change-Id: Ifca9712c2ee28c8e38925150b3e6d0f27195ff1d diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk index 30dd615..35e3662 100644 --- a/shell/Library_ooofilt.mk +++ b/shell/Library_ooofilt.mk @@ -57,38 +57,31 @@ $(eval $(call gb_Library_use_libraries,ooofilt,\ advapi32 \ comctl32 \ kernel32 \ + msvcprt \ ole32 \ shell32 \ uuid \ $(gb_Library_win32_OLDNAMES) \ )) -ifneq ($(COM),GCC) - -$(eval $(call gb_Library_use_libraries,ooofilt,\ - msvcprt \ -)) - ifneq ($(PRODUCT),full) $(eval $(call gb_Library_use_libraries,ooofilt,\ msvcrt \ )) endif -$(eval $(call gb_Library_add_ldflags,ooofilt,\ - /EXPORT:DllCanUnloadNow \ - /EXPORT:DllGetClassObject \ - /EXPORT:DllRegisterServer \ - /EXPORT:DllUnregisterServer \ -)) - -endif - $(eval $(call gb_Library_use_static_libraries,ooofilt,\ shell_xmlparser \ shlxthandler_common \ )) +$(eval $(call gb_Library_add_ldflags,ooofilt,\ + /EXPORT:DllCanUnloadNow,PRIVATE \ + /EXPORT:DllGetClassObject,PRIVATE \ + /EXPORT:DllRegisterServer,PRIVATE \ + /EXPORT:DllUnregisterServer,PRIVATE \ +)) + $(eval $(call gb_Library_add_exception_objects,ooofilt,\ shell/source/win32/shlxthandler/ooofilt/ooofilt \ shell/source/win32/shlxthandler/ooofilt/propspec \ diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index 0e68d62..ca779ff 100644 --- a/shell/Library_ooofilt_x64.mk +++ b/shell/Library_ooofilt_x64.mk @@ -77,14 +77,12 @@ $(eval $(call gb_Library_use_static_libraries,ooofilt_x64,\ shlxthandler_common_x64 \ )) -ifeq ($(COM),MSC) $(eval $(call gb_Library_add_ldflags,ooofilt_x64,\ - /EXPORT:DllCanUnloadNow \ - /EXPORT:DllGetClassObject \ - /EXPORT:DllRegisterServer \ - /EXPORT:DllUnregisterServer \ + /EXPORT:DllCanUnloadNow,PRIVATE \ + /EXPORT:DllGetClassObject,PRIVATE \ + /EXPORT:DllRegisterServer,PRIVATE \ + /EXPORT:DllUnregisterServer,PRIVATE \ )) -endif $(eval $(call gb_Library_add_exception_objects,ooofilt_x64,\ CustomTarget/shell/source/win32/shlxthandler/ooofilt/ooofilt \ diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk index 250a530..8b7d7ff 100644 --- a/shell/Library_propertyhdl.mk +++ b/shell/Library_propertyhdl.mk @@ -59,6 +59,7 @@ $(eval $(call gb_Library_use_libraries,propertyhdl,\ gdi32 \ gdiplus \ kernel32 \ + msvcprt \ ole32 \ oleaut32 \ propsys \ @@ -67,24 +68,16 @@ $(eval $(call gb_Library_use_libraries,propertyhdl,\ uuid \ )) -ifneq ($(COM),GCC) - -$(eval $(call gb_Library_use_libraries,propertyhdl,\ - msvcprt \ -)) - -ifneq ($(PRODUCT),full) -$(eval $(call gb_Library_use_libraries,propertyhdl,\ -)) -endif - -endif - $(eval $(call gb_Library_use_static_libraries,propertyhdl,\ shell_xmlparser \ shlxthandler_common \ )) +$(eval $(call gb_Library_add_ldflags,propertyhdl,\ + /EXPORT:DllCanUnloadNow,PRIVATE \ + /EXPORT:DllGetClassObject,PRIVATE \ +)) + $(eval $(call gb_Library_add_exception_objects,propertyhdl,\ shell/source/win32/shlxthandler/prophdl/propertyhdl \ )) diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk index af9fa22..c84738b 100644 --- a/shell/Library_propertyhdl_x64.mk +++ b/shell/Library_propertyhdl_x64.mk @@ -78,6 +78,11 @@ $(eval $(call gb_Library_use_static_libraries,propertyhdl_x64,\ shlxthandler_common_x64 \ )) +$(eval $(call gb_Library_add_ldflags,propertyhdl_x64,\ + /EXPORT:DllCanUnloadNow,PRIVATE \ + /EXPORT:DllGetClassObject,PRIVATE \ +)) + $(eval $(call gb_Library_add_exception_objects,propertyhdl_x64,\ shell/source/win32/shlxthandler/prophdl/propertyhdl \ )) diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk index 199cc8d..c546db6 100644 --- a/shell/Library_shlxthdl.mk +++ b/shell/Library_shlxthdl.mk
[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - shell/Library_ooofilt.mk shell/Library_ooofilt_x64.mk shell/Library_propertyhdl.mk shell/Library_propertyhdl_x64.mk shell/Library_shlxthdl.mk s
shell/Library_ooofilt.mk |8 shell/Library_ooofilt_x64.mk |8 shell/Library_propertyhdl.mk |4 ++-- shell/Library_propertyhdl_x64.mk |4 ++-- shell/Library_shlxthdl.mk|8 shell/Library_shlxthdl_x64.mk|8 6 files changed, 20 insertions(+), 20 deletions(-) New commits: commit 7dce4fb5e4e6e56cb6c4dc6b7b1bc127b70a07f4 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon May 28 15:23:46 2012 +0200 partially revert 3ca7b8c296bcda699bcf642db3932b3fdbe7ad06 It is not possible to use PRIVATE this way. So, there are still warnings as: LINK : warning LNK4104: export of symbol 'DllCanUnloadNow' should be PRIVATE Change-Id: I9f14dd95b611475ef89914270c931a7115f1f5c8 diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk index 35e3662..af30efb 100644 --- a/shell/Library_ooofilt.mk +++ b/shell/Library_ooofilt.mk @@ -76,10 +76,10 @@ $(eval $(call gb_Library_use_static_libraries,ooofilt,\ )) $(eval $(call gb_Library_add_ldflags,ooofilt,\ - /EXPORT:DllCanUnloadNow,PRIVATE \ - /EXPORT:DllGetClassObject,PRIVATE \ - /EXPORT:DllRegisterServer,PRIVATE \ - /EXPORT:DllUnregisterServer,PRIVATE \ + /EXPORT:DllCanUnloadNow \ + /EXPORT:DllGetClassObject \ + /EXPORT:DllRegisterServer \ + /EXPORT:DllUnregisterServer \ )) $(eval $(call gb_Library_add_exception_objects,ooofilt,\ diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index ca779ff..7620d52 100644 --- a/shell/Library_ooofilt_x64.mk +++ b/shell/Library_ooofilt_x64.mk @@ -78,10 +78,10 @@ $(eval $(call gb_Library_use_static_libraries,ooofilt_x64,\ )) $(eval $(call gb_Library_add_ldflags,ooofilt_x64,\ - /EXPORT:DllCanUnloadNow,PRIVATE \ - /EXPORT:DllGetClassObject,PRIVATE \ - /EXPORT:DllRegisterServer,PRIVATE \ - /EXPORT:DllUnregisterServer,PRIVATE \ + /EXPORT:DllCanUnloadNow \ + /EXPORT:DllGetClassObject \ + /EXPORT:DllRegisterServer \ + /EXPORT:DllUnregisterServer \ )) $(eval $(call gb_Library_add_exception_objects,ooofilt_x64,\ diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk index 8b7d7ff..4d701cd 100644 --- a/shell/Library_propertyhdl.mk +++ b/shell/Library_propertyhdl.mk @@ -74,8 +74,8 @@ $(eval $(call gb_Library_use_static_libraries,propertyhdl,\ )) $(eval $(call gb_Library_add_ldflags,propertyhdl,\ - /EXPORT:DllCanUnloadNow,PRIVATE \ - /EXPORT:DllGetClassObject,PRIVATE \ + /EXPORT:DllCanUnloadNow \ + /EXPORT:DllGetClassObject \ )) $(eval $(call gb_Library_add_exception_objects,propertyhdl,\ diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk index c84738b..f613bd3 100644 --- a/shell/Library_propertyhdl_x64.mk +++ b/shell/Library_propertyhdl_x64.mk @@ -79,8 +79,8 @@ $(eval $(call gb_Library_use_static_libraries,propertyhdl_x64,\ )) $(eval $(call gb_Library_add_ldflags,propertyhdl_x64,\ - /EXPORT:DllCanUnloadNow,PRIVATE \ - /EXPORT:DllGetClassObject,PRIVATE \ + /EXPORT:DllCanUnloadNow \ + /EXPORT:DllGetClassObject \ )) $(eval $(call gb_Library_add_exception_objects,propertyhdl_x64,\ diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk index c546db6..b8df8a9 100644 --- a/shell/Library_shlxthdl.mk +++ b/shell/Library_shlxthdl.mk @@ -74,10 +74,10 @@ $(eval $(call gb_Library_use_static_libraries,shlxthdl,\ $(eval $(call gb_Library_add_nativeres,shlxthdl,shlxthdl)) $(eval $(call gb_Library_add_ldflags,shlxthdl,\ - /EXPORT:DllCanUnloadNow,PRIVATE \ - /EXPORT:DllGetClassObject,PRIVATE \ - /EXPORT:DllRegisterServer,PRIVATE \ - /EXPORT:DllUnregisterServer,PRIVATE \ + /EXPORT:DllCanUnloadNow \ + /EXPORT:DllGetClassObject \ + /EXPORT:DllRegisterServer \ + /EXPORT:DllUnregisterServer \ )) $(eval $(call gb_Library_add_exception_objects,shlxthdl,\ diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index d1e2d98..f13d9dc 100644 --- a/shell/Library_shlxthdl_x64.mk +++ b/shell/Library_shlxthdl_x64.mk @@ -80,10 +80,10 @@ $(eval $(call gb_Library_use_static_libraries,shlxthdl_x64,\ $(eval $(call gb_Library_add_nativeres,shlxthdl_x64,shlxthdl)) $(eval $(call gb_Library_add_ldflags,shlxthdl_x64,\ - /EXPORT:DllCanUnloadNow,PRIVATE \ - /EXPORT:DllGetClassObject,PRIVATE \ - /EXPORT:DllRegisterServer,PRIVATE \ - /EXPORT:DllUnregisterServer,PRIVATE \ + /EXPORT:DllCanUnloadNow \ + /EXPORT:DllGetClassObject \ + /EXPORT:DllRegisterServer \ + /EXPORT:DllUnregisterServer \ )) $(eval $(call gb_Library_add_generated_exception_objects,shlxthdl_x64,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - connectivity/source
connectivity/source/drivers/postgresql/pq_connection.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3e1314312cd2ee25feaa7df02f65be4bd78026e2
Author: Matúš Kukan matus.ku...@gmail.com
Date: Mon May 28 17:11:54 2012 +0200
connectivity: add SAL_DLLPUBLIC_EXPORT
Change-Id: I850b9f9fcf662eafaee6c4c00187c6902670b639
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx
b/connectivity/source/drivers/postgresql/pq_connection.cxx
index c148646..e1e3754 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -785,7 +785,7 @@ static struct cppu::ImplementationEntry g_entries[] =
extern C
{
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return cppu::component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey , g_entries );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - 5 commits - Makefile.top RepositoryExternal.mk shell/CustomTarget_shlxthdl_res.mk solenv/gbuild testtools/CustomTarget_bridgetest_climaker.mk t
Makefile.top |2 +- RepositoryExternal.mk |4 ++-- shell/CustomTarget_shlxthdl_res.mk|2 +- solenv/gbuild/InstallModuleTarget.mk |5 + testtools/CustomTarget_bridgetest.mk | 25 +++-- testtools/CustomTarget_bridgetest_climaker.mk |2 +- 6 files changed, 13 insertions(+), 27 deletions(-) New commits: commit c774d2bea6f0549d09b04d288505371011bb4633 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat May 26 23:47:05 2012 +0200 scp2: fix Windows build Change-Id: I6662bfca925f9dae99b3f70fd81dba04d36ac9c8 diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index db8aa61..1b717a7 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -73,15 +73,12 @@ endef # ScpPreprocessTarget class -gb_ScpPreprocessTarget_TARGET := $(call gb_Executable_get_target_for_build,cpp.lcc) -gb_ScpPreprocessTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_ScpPreprocessTarget_TARGET) - gb_ScpPreprocessTarget_get_source = $(SRCDIR)/$(1).scp define gb_ScpPreprocessTarget__command $(call gb_Output_announce,$(2),$(true),SPP,2) $(call gb_Helper_abbreviate_dirs,\ - $(gb_ScpPreprocessTarget_COMMAND) \ + $(call gb_Helper_execute,cpp.lcc) \ -+ -P \ $(SCPDEFS) $(SCP_DEFS) -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \ $(SCP_INCLUDE) $(SCP_TEMPLATE_INCLUDE) \ commit 46a222798acfc508e10ddb8ff470771eabbf8b3c Author: Matúš Kukan matus.ku...@gmail.com Date: Sat May 26 23:38:34 2012 +0200 pq's name is different on Windows Change-Id: I63731a1114edcf60a19083e6ceafaae1b402e716 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index b1c1f11..25a6749 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1281,7 +1281,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ - pq \ + $(if $(filter MSC,$(COM)),lib)pq \ ) ifeq ($(GUI)$(COM),WNTMSC) @@ -1296,7 +1296,7 @@ endif endef $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ - pq \ + $(if $(filter MSC,$(COM)),lib)pq \ )) endif # SYSTEM_POSTGRESQL commit a2dc0d67c4fcd25510a497b45c5dfe37df5208fe Author: Matúš Kukan matus.ku...@gmail.com Date: Sat May 26 23:12:53 2012 +0200 shell is gbuildified Change-Id: Ia40e317a69883c578a349035604afb5a5dad4c86 diff --git a/Makefile.top b/Makefile.top index 5bd62f0..192ddbd 100644 --- a/Makefile.top +++ b/Makefile.top @@ -111,6 +111,7 @@ scripting\ sd\ sdext\ sfx2\ +shell\ slideshow\ smoketest\ solenv\ @@ -231,7 +232,6 @@ remotebridges\ rhino\ saxon\ setup_native\ -shell\ soltools\ stax\ stlport\ commit 70477ab82e2d7657f7aed527649d89d9a5d4cff7 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat May 26 22:41:54 2012 +0200 testttools: tweak makefiles, fix typos Change-Id: I4e7c7f2d79641772479924f8efc479beaf137f8f diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk index a4237d3..473613d 100644 --- a/testtools/CustomTarget_bridgetest.mk +++ b/testtools/CustomTarget_bridgetest.mk @@ -43,14 +43,12 @@ bridgetest_TARGET := $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \ ifneq ($(SOLAR_JAVA),) bridgetest_TARGET := $(bridgetest_TARGET) \ $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) \ - $(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) + $(workdir_SERVER)/bridgetest_inprocess_java$(BATCH_SUFFIX) endif $(call gb_CustomTarget_get_target,testtools/bridgetest) : $(bridgetest_TARGET) -# which other prerequisites do we need here? -$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \ - $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir +$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) :| $(workdir_SERVER)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) $(call gb_Helper_abbreviate_dirs,\ echo $(UNO_EXE) \ @@ -62,26 +60,20 @@ $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \ --singleaccept $@) $(GIVE_EXEC_RIGHTS) $@ -ifneq ($(SOLAR_JAVA),) -# how to do it more elegantly? -MY_CLASSPATH := $(OUTDIR)/bin/ridl.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/java_uno.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/jurt.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/juh.jar +testtools_MY_CLASSPATH := $(OUTDIR)/bin/ridl.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/java_uno.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/jurt.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/juh.jar -# which other prerequisites do we need here? -$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) : \ - $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir +$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) :| $(workdir_SERVER)/.dir $(call
[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - RepositoryExternal.mk solenv/gbuild
RepositoryExternal.mk |3 ++- solenv/gbuild/platform/WNT_INTEL_MSC.mk |1 - 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit c7c7f8eafdd026a10190f25be52108d456d174db Author: Matúš Kukan matus.ku...@gmail.com Date: Sun May 27 00:21:12 2012 +0200 no openssl library on Windows Change-Id: I40df9611be87830e4938ee20a4e3be19767ddfad diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 25a6749..b38b038 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1285,8 +1285,9 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ ) ifeq ($(GUI)$(COM),WNTMSC) +$(call gb_LinkTarget_use_external,$(1),openssl) + $(call gb_LinkTarget_use_libraries,$(1),\ - openssl \ secur32 \ ws2_32 \ $(if $(filter YES,$(WITH_LDAP)),ldap) \ diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index fb833f7..3882327 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -407,7 +407,6 @@ gb_Library_PLAINLIBS_NONE += \ $(gb_Library_win32_OLDNAMES) \ ole32 \ oleaut32 \ - openssl \ propsys \ secur32 \ shell32 \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - testtools/CustomTarget_bridgetest_climaker.mk
testtools/CustomTarget_bridgetest_climaker.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 32615a6be25f5ba08c204bc75e69e6de0efee535 Author: Matúš Kukan matus.ku...@gmail.com Date: Sun May 27 00:43:26 2012 +0200 testtools: superfluous dependency Change-Id: Id57d40f2b6cdaa9934a885764d986d581d149a59 diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk index b66d8a3..56c7f79 100644 --- a/testtools/CustomTarget_bridgetest_climaker.mk +++ b/testtools/CustomTarget_bridgetest_climaker.mk @@ -31,7 +31,7 @@ climaker_DIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_climaker $(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \ $(climaker_DIR)/cli_types_bridgetest.dll -$(climaker_DIR)/cli_types_bridgetest.dll : $(OUTDIR)/bin/bridgetest.rdb \ +$(climaker_DIR)/cli_types_bridgetest.dll : \ $(OUTDIR)/bin/types.rdb $(OUTDIR)/bin/cli_uretypes.dll \ $(call gb_Executable_get_target_for_build,climaker) | $(climaker_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - configure.in icu/icuversion.mk icu/makefile.mk icu/prj scp2/InstallModule_ooo.mk solenv/inc
configure.in |6 +++--- icu/icuversion.mk | 38 -- icu/makefile.mk |2 -- icu/prj/d.lst |2 -- scp2/InstallModule_ooo.mk |4 solenv/inc/libs.mk|1 - 6 files changed, 3 insertions(+), 50 deletions(-) New commits: commit cd3559f0b2483fa6655df5711ae207853f7ce8ee Author: Matúš Kukan matus.ku...@gmail.com Date: Fri May 25 17:35:18 2012 +0200 bin icuversion.mk, set the variables in configure Change-Id: Ife00d7477dacfe1eb325c722517fb038ead083db diff --git a/configure.in b/configure.in index bf4766e..fa47eab 100644 --- a/configure.in +++ b/configure.in @@ -7763,9 +7763,9 @@ SYSTEM_GENBRK= SYSTEM_GENCCODE= SYSTEM_GENCMN= -ICU_MAJOR= -ICU_MINOR= -ICU_MICRO= +ICU_MAJOR=49 +ICU_MINOR=1 +ICU_MICRO=1 ICU_RECLASSIFIED_CLOSE_PARENTHESIS=YES ICU_RECLASSIFIED_PREPEND_SET_EMPTY=YES ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER=YES diff --git a/icu/icuversion.mk b/icu/icuversion.mk deleted file mode 100755 index ddc7104..000 --- a/icu/icuversion.mk +++ /dev/null @@ -1,38 +0,0 @@ -#* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# http://www.openoffice.org/license.html -# for a copy of the LGPLv3 License. -# -#* -# major -.IF $(ICU_MAJOR) == -ICU_MAJOR=49 -.ENDIF -# minor -.IF $(ICU_MINOR) == -ICU_MINOR=1 -.ENDIF -# micro -.IF $(ICU_MICRO) == -ICU_MICRO=1 -.ENDIF diff --git a/icu/makefile.mk b/icu/makefile.mk index afedbbc..d6a73f9 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -35,8 +35,6 @@ TARGET=so_icu # --- Files -.INCLUDE : icuversion.mk - TARFILE_NAME=icu4c-49_1_1-src TARFILE_MD5=7c53f83e0327343f4060c0eb83842daf TARFILE_ROOTDIR=icu diff --git a/icu/prj/d.lst b/icu/prj/d.lst index c76b3ff..d5fc11a 100644 --- a/icu/prj/d.lst +++ b/icu/prj/d.lst @@ -42,8 +42,6 @@ mkdir: %_DEST%\inc\external\unicode ..\%__SRC%\lib\libicuuc.a %_DEST%\lib\ ..\%__SRC%\lib\libicutu.a %_DEST%\lib\ -..\icuversion.mk %_DEST%\inc\icuversion.mk - linklib: libicudata.*.*.* linklib: libicui18n.*.*.* linklib: libicule.*.*.* diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 81653a0..927c4e1 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -177,10 +177,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ )) endif -ifneq ($(SYSTEM_LIBXSLT),YES) -include $(OUTDIR)/inc/icuversion.mk -endif - $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ -DICU_MAJOR=$(ICU_MAJOR) \ -DICU_MINOR=$(ICU_MINOR) \ diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index a936193..c8259bd 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -26,7 +26,6 @@ #* LIBSMKREV!:=$$Revision: 1.134.2.3 $$ -.INCLUDE .IGNORE : icuversion.mk .INCLUDE .IGNORE : i18npool/version.mk .INCLUDE .IGNORE : comphelper/version.mk .INCLUDE .IGNORE : ucbhelper/version.mk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/Library_writerfilter.mk
writerfilter/Library_writerfilter.mk |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 4283c433b91bb2b1d9479bc071d8c02e0c3c4d69 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat May 19 10:10:16 2012 +0200 add dependency on generated files Change-Id: Idad4558cfa741f1f2e17b270989a8a96ac80dd06 diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 0964cac..b06ee75 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -30,6 +30,10 @@ include $(SRCDIR)/writerfilter/source/generated.mk $(eval $(call gb_Library_Library,writerfilter)) +$(eval $(call gb_Library_use_custom_headers,writerfilter,\ + writerfilter/source \ +)) + $(eval $(call gb_Library_set_include,writerfilter,\ $$(INCLUDE) \ -I$(SRCDIR)/writerfilter/inc \ @@ -37,7 +41,6 @@ $(eval $(call gb_Library_set_include,writerfilter,\ -I$(SRCDIR)/writerfilter/source/dmapper \ -I$(SRCDIR)/writerfilter/source/doctok \ -I$(SRCDIR)/writerfilter/source/ooxml \ --I$(WORKDIR)/CustomTarget/writerfilter/source \ -I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \ -I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/CustomTarget_source.mk
writerfilter/CustomTarget_source.mk | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) New commits: commit c1f7f1f4c812f5bba073ff99e6e8c89bd74fb0a7 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu May 17 20:35:46 2012 +0200 sigh, more missing dependencies Change-Id: I0d1802ebcf384095a6962fb1faf9516bd9a2dda6 diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk index 6322eab..0edbc27 100644 --- a/writerfilter/CustomTarget_source.mk +++ b/writerfilter/CustomTarget_source.mk @@ -90,7 +90,7 @@ wf_GEN_ooxml_GperfFastToken_hxx=$(writerfilter_WORK)/gperffasttoken.hxx wf_GEN_ooxml_Model_processed=$(writerfilter_WORK)/model_preprocessed.xml wf_GEN_ooxml_Model_analyzed=$(writerfilter_WORK)/ooxml/model_analyzed.xml -$(wf_GEN_ooxml_token_tmp) : $(OUTDIR)/inc/oox/tokens.txt +$(wf_GEN_ooxml_token_tmp) : $(OUTDIR)/inc/oox/tokens.txt | $(writerfilter_WORK)/.dir $(call gb_Output_announce,$@,build,CAT,1) cat $(OUTDIR)/inc/oox/tokens.txt \ | sed s#\(.*\)#fasttoken\1/fasttoken# $@ @@ -140,7 +140,7 @@ $(wf_GEN_ooxml_GperfFastToken_hxx) : $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $ $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $(wf_GEN_ooxml_token_xml)) \ | tr -d '\r' | $(GPERF) -I -t -E -S1 -c -G -LC++ $@ -$(wf_GEN_ooxml_Model_analyzed): $(wf_SRC_ooxml_Analyze_model_xsl) $(wf_SRC_ooxml_Model) +$(wf_GEN_ooxml_Model_analyzed) : $(wf_SRC_ooxml_Analyze_model_xsl) $(wf_SRC_ooxml_Model) | $(writerfilter_WORK)/ooxml/.dir $(call gb_Output_announce,$@,build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $^) $@ @@ -174,7 +174,7 @@ $(wf_GEN_ooxml_QNameToStr_tmp): $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Mo $(call gb_Output_announce,$@,build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed)) $@ -$(wf_GEN_doctok_QnameToStr_tmp): $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model) +$(wf_GEN_doctok_QnameToStr_tmp): $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model) | $(writerfilter_WORK)/.dir $(call gb_Output_announce,$@,build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model)) $@ @@ -182,7 +182,7 @@ $(wf_GEN_model_QNameToStr_cxx): $(wf_GEN_ooxml_QNameToStr_tmp) $(wf_GEN_doctok_Q $(call gb_Output_announce,$@,build,CAT,1) cat $(writerfilter_SRC)/resourcemodel/qnametostrheader $(wf_GEN_ooxml_QNameToStr_tmp) $(wf_GEN_doctok_QnameToStr_tmp) $(writerfilter_SRC)/resourcemodel/qnametostrfooter $@ -$(wf_GEN_model_SprmCodeToStr_tmp) : $(wf_SRC_doctok_SprmCodeToStr_xsl) $(wf_SRC_doctok_Model) +$(wf_GEN_model_SprmCodeToStr_tmp) : $(wf_SRC_doctok_SprmCodeToStr_xsl) $(wf_SRC_doctok_Model) | $(writerfilter_WORK)/.dir $(call gb_Output_announce,$@,build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_doctok_SprmCodeToStr_xsl) $(wf_SRC_doctok_Model)) $@ @@ -190,11 +190,12 @@ $(wf_GEN_model_SprmCodeToStr_cxx): $(writerfilter_SRC)/resourcemodel/sprmcodetos $(call gb_Output_announce,$@,build,CAT,1) cat $^ $@ -$(wf_GEN_ooxml_Namespacesmap_xsl) : $(wf_SRC_ooxml_Model) $(wf_DEP_ooxml_namespaces_txt) $(wf_SRC_model_NamespacePreprocess) +$(wf_GEN_ooxml_Namespacesmap_xsl) : $(wf_SRC_ooxml_Model) $(wf_DEP_ooxml_namespaces_txt) \ + $(wf_SRC_model_NamespacePreprocess) | $(writerfilter_WORK)/.dir $(call gb_Output_announce,$@,build,PRL,1) $(PERL) $(wf_SRC_model_NamespacePreprocess) $(wf_DEP_ooxml_namespaces_txt) $@ -$(wf_GEN_ooxml_preprocess_xsl) : $(wf_SRC_ooxml_Preprocess_xsl) +$(wf_GEN_ooxml_preprocess_xsl) : $(wf_SRC_ooxml_Preprocess_xsl) | $(writerfilter_WORK)/.dir $(call gb_Output_announce,$@,build,CPY,1) cp -f $(wf_SRC_ooxml_Preprocess_xsl) $@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/Module_vcl.mk
vcl/Module_vcl.mk |7 --- 1 file changed, 7 deletions(-) New commits: commit b576aa1318ebdfea8349c23da7a8b1237156a8f9 Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Wed May 16 12:54:05 2012 +0200 fdo#47246: vcl: fix --enable-headless build Follow android way of building stuff. Change-Id: Ia3f8d7c58dbd09e070d9ea583872e115828365cb diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 441ec37..8789813 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -77,13 +77,6 @@ $(eval $(call gb_Module_add_targets,vcl,\ endif endif -ifeq ($(GUIBASE),headless) -$(eval $(call gb_Module_add_targets,vcl,\ -Library_vclplug_svp \ -StaticLibrary_headless \ -)) -endif - ifeq ($(GUIBASE),aqua) $(eval $(call gb_Module_add_targets,vcl,\ Zip_osxres \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Makefile.top
Makefile.top |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 9aad89df8757d4570084424e63b9562a13448bde Author: Matúš Kukan matus.ku...@gmail.com Date: Wed May 16 20:00:47 2012 +0200 improve make invocation Change-Id: I9dbe77062df3a9b02dab0f5755c0e616829fa125 diff --git a/Makefile.top b/Makefile.top index 6c473ec..70bfe7a 100644 --- a/Makefile.top +++ b/Makefile.top @@ -243,7 +243,7 @@ xpdf\ xsltml\ zlib\ -gb_TAILBUILDMODULES := $(shell make -f $(SRCDIR)/tail_build/Makefile showmodules) +gb_TAILBUILDMODULES := $(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules) export gb_TAILBUILDTARGET=all slowcheck define gbuild_module_rules @@ -389,7 +389,7 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE) endif cd packimages unset MAKEFLAGS \ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) \ - make + $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) build: build-packimages ifeq ($(OS_FOR_BUILD),WNT) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - avmedia/Library_avmediawin.mk dtrans/StaticLibrary_dtobj.mk Makefile vcl/Library_desktop_detector.mk vcl/Library_vclplug_gen.mk vcl/Library_vclplug_gtk3.mk vcl/Lib
Makefile|4 +++- avmedia/Library_avmediawin.mk |1 - dtrans/StaticLibrary_dtobj.mk |5 - vcl/Library_desktop_detector.mk |1 - vcl/Library_vclplug_gen.mk |1 - vcl/Library_vclplug_gtk.mk |1 - vcl/Library_vclplug_gtk3.mk |1 - vcl/Library_vclplug_kde.mk |1 - vcl/Library_vclplug_svp.mk |1 - vcl/StaticLibrary_headless.mk |1 - vcl/StaticLibrary_vclmain.mk|1 - 11 files changed, 3 insertions(+), 15 deletions(-) New commits: commit a0c36a1e39c0874b3dc9731544ddfe5b2822e42f Author: Matúš Kukan matus.ku...@gmail.com Date: Mon May 14 16:59:52 2012 +0200 quick fix for slowcheck targets in tail_build Change-Id: Ia74a76659d97d10299d9ddfe8d2118d5c1c5725e diff --git a/Makefile b/Makefile index 55d3605..88dad31 100644 --- a/Makefile +++ b/Makefile @@ -244,6 +244,7 @@ xsltml\ zlib\ gb_TAILBUILDMODULES := $(shell make -f $(SRCDIR)/tail_build/Makefile showmodules) +export gb_TAILBUILDTARGET=all slowcheck define gbuild_module_rules .PHONY: $(1) $(1).all $(1).clean $(1).deliver @@ -257,7 +258,8 @@ $(1).all: bootstrap fetch $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) else $(1).all: bootstrap fetch - cd tail_build unset MAKEFLAGS export gb_TAILBUILDTARGET=$(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) \ + cd tail_build unset MAKEFLAGS \ + export gb_TAILBUILDTARGET=$(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1) \ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) endif commit 15f637229dc9d196461af4c096a4b4a99cb255db Author: Matúš Kukan matus.ku...@gmail.com Date: Mon May 14 09:38:35 2012 +0200 dxguid.lib not needed here Change-Id: I73ab08289965a311e36ea5f0187d57f7662208ab diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk index bac5161..39a065c 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -56,7 +56,6 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\ $(eval $(call gb_Library_add_libs,avmediawin,\ strmiids.lib \ - dxguid.lib \ )) $(eval $(call gb_Library_add_exception_objects,avmediawin,\ commit d2fe7ac24b43e8a00a7c59cdbd0efb4ff117e583 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat May 12 12:28:55 2012 +0200 -I$(SRCDIR)/solenv/inc is from SOLARINC Change-Id: I I4fdd35b2d2c256f7d45022fb837178ace9d678d9 diff --git a/dtrans/StaticLibrary_dtobj.mk b/dtrans/StaticLibrary_dtobj.mk index 200edcb..cdc4a2d 100644 --- a/dtrans/StaticLibrary_dtobj.mk +++ b/dtrans/StaticLibrary_dtobj.mk @@ -28,11 +28,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,dtobj)) -$(eval $(call gb_StaticLibrary_set_include,dtobj,\ - $$(INCLUDE) \ - -I$(SRCDIR)/solenv/inc \ -)) - $(eval $(call gb_StaticLibrary_use_api,dtobj,\ udkapi \ offapi \ diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index df85604..4aa4609 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_Library,desktop_detector)) $(eval $(call gb_Library_set_include,desktop_detector,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ --I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_Library_add_defs,desktop_detector,\ diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 31df6c2..3ff257a 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Library_Library,vclplug_gen)) $(eval $(call gb_Library_set_include,vclplug_gen,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ --I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_Library_use_api,vclplug_gen,\ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 658c72d..e816fcf 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\ -I$(SRCDIR)/vcl/inc \ -I$(SRCDIR)/vcl/unx \ -I$(SRCDIR)/vcl/unx/gtk/inc \ --I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_Library_add_defs,vclplug_gtk,\ diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 29bcf0b..120199c 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,vclplug_gtk3,\ -I$(SRCDIR)/vcl/inc \ -I$(SRCDIR)/vcl/unx \ -I$(SRCDIR)/vcl/unx/gtk3/inc \ --I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_Library_add_cxxflags,vclplug_gtk3,\ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 1673945..303b98c 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_packages,vclplug_kde,\ $(eval $(call gb_Library_set_include,vclplug_kde,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc
[Libreoffice-commits] .: basic/Library_sb.mk cairo/cairo cairo/pixman configure.in curl/makefile.mk icu/makefile.mk nss/makefile.mk odk/util postprocess/rebase python/makefile.mk reportbuilder/util sa
basic/Library_sb.mk |8 cairo/cairo/makefile.mk |2 +- cairo/pixman/makefile.mk|2 +- configure.in|4 ++-- curl/makefile.mk|2 +- icu/makefile.mk |2 +- nss/makefile.mk |6 +++--- odk/util/makefile.pmk |4 ++-- postprocess/rebase/makefile.mk |2 +- python/makefile.mk |4 ++-- reportbuilder/util/makefile.pmk |2 +- sal/Library_sal.mk |4 ++-- salhelper/test/rtti/makefile.mk |2 +- setup_native/scripts/source/makefile.mk |4 ++-- 14 files changed, 24 insertions(+), 24 deletions(-) New commits: commit 9520dbf59f6bd6c86791954e082488556a610adc Author: Thomas Collerton tom.col...@gmail.com Date: Wed May 9 01:22:29 2012 +0200 EasyHack fdo#42783: get rid of CPU define/build system variable Change-Id: I6a178f7ff9c8306e15bcfa847ad1e5e4f8476504 diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index 352f3e6..acf3996 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -156,12 +156,12 @@ $(eval $(call gb_Library_use_libraries,sb,\ )) endif -ifeq ($(GUI)$(CPU),WNTI) +ifeq ($(GUI)$(CPUNAME),WNTINTEL) $(eval $(call gb_Library_add_exception_objects,sb,\ basic/source/runtime/dllmgr-x86 \ )) else -ifeq ($(GUI)$(CPU),WNTX) +ifeq ($(GUI)$(CPUNAME),WNTX86_64) $(eval $(call gb_Library_add_exception_objects,sb,\ basic/source/runtime/dllmgr-x64 \ )) @@ -171,12 +171,12 @@ $(eval $(call gb_Library_add_exception_objects,sb,\ )) endif endif -ifeq ($(GUI)$(COM)$(CPU),WNTMSCI) +ifeq ($(GUI)$(COM)$(CPUNAME),WNTMSCINTEL) $(eval $(call gb_Library_add_asmobjects,sb,\ basic/source/runtime/wnt-x86 \ )) endif -ifeq ($(GUI)$(COM)$(CPU),WNTGCCI) +ifeq ($(GUI)$(COM)$(CPUNAME),WNTGCCINTEL) $(eval $(call gb_Library_add_asmobjects,sb,\ basic/source/runtime/wnt-mingw \ )) diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 16a89bf..43f7b8f 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -156,7 +156,7 @@ LDFLAGS:=$(cairo_LDFLAGS) cairo_CFLAGS+=-xc99=none .ENDIF -.IF $(CPU)==I +.IF $(CPUNAME)==INTEL cairo_CFLAGS+=-march=i486 .ENDIF diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 307f852..a584b52 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -117,7 +117,7 @@ LDFLAGS+=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -L$(SOLARLIBDIR) -lpthread -ld pixman_CFLAGS+=-xc99=none .ENDIF -.IF $(CPU)==I +.IF $(CPUNAME)==INTEL pixman_CFLAGS+=-march=i486 .ENDIF diff --git a/configure.in b/configure.in index 8e37485..c471e34 100644 --- a/configure.in +++ b/configure.in @@ -2995,8 +2995,8 @@ darwin*) ;; powerpc*) CPU=P -CPUNAME=POWERPC -OUTPATH=unxmacxp +CPUNAME=POWERPC +OUTPATH=unxmacxp ;; i*86|x86_64) CPU=I diff --git a/curl/makefile.mk b/curl/makefile.mk index 3eabe72..97a1835 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -140,7 +140,7 @@ EXCFLAGS=/EHsc /YX BUILD_DIR=.$/lib -.IF $(CPU) == I +.IF $(CPUNAME) == INTEL MACHINE=X86 .ELSE MACHINE=X64 diff --git a/icu/makefile.mk b/icu/makefile.mk index 35d847d..9cc4905 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -283,7 +283,7 @@ ICU_BUILD_VERSION=Release ICU_BUILD_LIBPOST= .ENDIF -.IF $(CPU) == I +.IF $(CPUNAME) == INTEL ICU_BUILD_ARCH=Win32 .ELSE ICU_BUILD_ARCH=x64 diff --git a/nss/makefile.mk b/nss/makefile.mk index 2a1dd0f..4e8dd9d 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -76,15 +76,15 @@ CONFIGURE_ACTION=mozilla/nsprpub/configure --prefix=$(my_prefix) --includedir=$( # force 64-bit buildmode USE_64:=1 .EXPORT : USE_64 -.ENDIF # $(CPU)==X +.ENDIF # $(CPUNAME)==X86_64 .ENDIF # $(OS)$(COM)==LINUXGCC .IF $(OS)$(COM)==FREEBSDGCC -.IF $(CPU)==X +.IF $(CPUNAME)==X86_64 # force 64-bit buildmode USE_64:=1 .EXPORT : USE_64 -.ENDIF # $(CPU)==X +.ENDIF # $(CPUNAME)==X86_64 .ENDIF # $(OS)$(COM)==LINUXGCC .IF $(OS)==MACOSX diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index 583f33a..3ffb45c 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -114,7 +114,7 @@ MY_DLLPOSTFIX=.so MY_DLLOUT=$(OUT)/lib DLLOUT=$(SOLARLIBDIR) -.IF $(OS)$(CPU)==SOLARISS +.IF $(OS)$(CPUNAME)==SOLARISSPARC # SOLARIS SPARC DESTPLATFROM=solsparc @@ -122,7 +122,7 @@ DESTPLATFROM=solsparc # SOLARIS SPARC 64 DESTPLATFROM=solsparc64 -.ELIF $(OS)$(CPU)==SOLARISI +.ELIF $(OS)$(CPUNAME)==SOLARISINTEL # SOLARIS INTEL DESTPLATFROM=solintel diff --git a/postprocess/rebase/makefile.mk b/postprocess/rebase/makefile.mk index a6a2eb9..c5d7615 100644 --- a/postprocess/rebase/makefile.mk +++ b/postprocess/rebase/makefile.mk
[Libreoffice-commits] .: sc/source unusedcode.easy
sc/source/filter/inc/drawingmanager.hxx | 30 --
sc/source/filter/oox/drawingmanager.cxx | 68
unusedcode.easy |1
3 files changed, 99 deletions(-)
New commits:
commit 7099da8058b5ca6ed681745e8049d095fd38294e
Author: Matúš Kukan matus.ku...@gmail.com
Date: Sun May 6 14:16:22 2012 +0200
unusedcode: BiffGroupObject
Change-Id: I13d969511dfb8cb87a88be47c72de4d882247f46
diff --git a/sc/source/filter/inc/drawingmanager.hxx
b/sc/source/filter/inc/drawingmanager.hxx
index 7021b38..6a1953c 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -196,36 +196,6 @@ private:
};
//
-
-/** A group object that is able to contain other child objects. */
-class BiffGroupObject : public BiffDrawingObjectBase
-{
-public:
-explicitBiffGroupObject( const WorksheetHelper rHelper );
-
-/** Tries to insert the passed drawing object into this or a nested group.
*/
-booltryInsert( const BiffDrawingObjectRef rxDrawingObj );
-
-protected:
-/** Reads the contents of the a BIFF3 OBJ record from the passed stream. */
-virtual voidimplReadObjBiff3( BiffInputStream rStrm, sal_uInt16
nMacroSize );
-/** Reads the contents of the a BIFF4 OBJ record from the passed stream. */
-virtual voidimplReadObjBiff4( BiffInputStream rStrm, sal_uInt16
nMacroSize );
-/** Reads the contents of the a BIFF5 OBJ record from the passed stream. */
-virtual voidimplReadObjBiff5( BiffInputStream rStrm, sal_uInt16
nNameLen, sal_uInt16 nMacroSize );
-
-/** Creates the corresponding XShape and insert it into the passed
container. */
-virtual ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape
-implConvertAndInsert( BiffDrawingBase rDrawing,
-const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShapes rxShapes,
-const ::com::sun::star::awt::Rectangle rShapeRect
) const;
-
-protected:
-BiffDrawingObjectContainer maChildren; /// All child objects contained
in this group object.
-sal_uInt16 mnFirstUngrouped; /// Object identfier of first
object not grouped into this group.
-};
-
-//
// BIFF drawing page
//
diff --git a/sc/source/filter/oox/drawingmanager.cxx
b/sc/source/filter/oox/drawingmanager.cxx
index 2d081ac..9f6f31d 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -221,10 +221,6 @@ BiffDrawingObjectContainer::BiffDrawingObjectContainer()
void BiffDrawingObjectContainer::insertGrouped( const BiffDrawingObjectRef
rxDrawingObj )
{
-if( !maObjects.empty() )
-if( BiffGroupObject* pGroupObj = dynamic_cast BiffGroupObject* (
maObjects.back().get() ) )
-if( pGroupObj-tryInsert( rxDrawingObj ) )
-return;
maObjects.push_back( rxDrawingObj );
}
@@ -536,70 +532,6 @@ void BiffDrawingObjectBase::implReadObjBiff8SubRec(
BiffInputStream /*rStrm*/,
}
//
-
-BiffGroupObject::BiffGroupObject( const WorksheetHelper rHelper ) :
-BiffDrawingObjectBase( rHelper ),
-mnFirstUngrouped( BIFF_OBJ_INVALID_ID )
-{
-}
-
-bool BiffGroupObject::tryInsert( const BiffDrawingObjectRef rxDrawingObj )
-{
-if( rxDrawingObj-getObjId() == mnFirstUngrouped )
-return false;
-// insert into own list or into nested group
-maChildren.insertGrouped( rxDrawingObj );
-return true;
-}
-
-void BiffGroupObject::implReadObjBiff3( BiffInputStream rStrm, sal_uInt16
nMacroSize )
-{
-rStrm.skip( 4 );
-rStrm mnFirstUngrouped;
-rStrm.skip( 16 );
-readMacroBiff3( rStrm, nMacroSize );
-}
-
-void BiffGroupObject::implReadObjBiff4( BiffInputStream rStrm, sal_uInt16
nMacroSize )
-{
-rStrm.skip( 4 );
-rStrm mnFirstUngrouped;
-rStrm.skip( 16 );
-readMacroBiff4( rStrm, nMacroSize );
-}
-
-void BiffGroupObject::implReadObjBiff5( BiffInputStream rStrm, sal_uInt16
nNameLen, sal_uInt16 nMacroSize )
-{
-rStrm.skip( 4 );
-rStrm mnFirstUngrouped;
-rStrm.skip( 16 );
-readNameBiff5( rStrm, nNameLen );
-readMacroBiff5( rStrm, nMacroSize );
-}
-
-Reference XShape BiffGroupObject::implConvertAndInsert( BiffDrawingBase
rDrawing,
-const Reference XShapes rxShapes, const Rectangle rShapeRect )
const
-{
-Reference XShape xGroupShape;
-if( !maChildren.empty() ) try
-{
-xGroupShape = rDrawing.createAndInsertXShape( CREATE_OUSTRING(
com.sun.star.drawing.GroupShape ), rxShapes, rShapeRect );
-Reference XShapes
[Libreoffice-commits] .: 2 commits - registry/Executable_rdbedit.mk registry/Module_registry.mk registry/tools registry/version.mk RepositoryFixes.mk Repository.mk
Repository.mk |5 RepositoryFixes.mk |2 registry/Executable_rdbedit.mk | 43 - registry/Module_registry.mk|1 registry/tools/rdbedit.cxx | 318 - registry/version.mk| 39 - 6 files changed, 4 insertions(+), 404 deletions(-) New commits: commit a09b25f520594410d4851b2e435223aa0627078e Author: Matúš Kukan matus.ku...@gmail.com Date: Sun May 6 11:23:55 2012 +0200 register reg and store the same way as jvmfwk Change-Id: I054d9ac210051d42b47188489d2d67fbbd3ed0e9 diff --git a/Repository.mk b/Repository.mk index cf7c0a8..68a8890 100644 --- a/Repository.mk +++ b/Repository.mk @@ -376,9 +376,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ juh \ juhx \ log_uno \ -reg \ sal_textenc \ -store \ sunjavaplugin \ unsafe_uno \ xmlreader \ @@ -563,7 +561,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ cppu \ jvmfwk \ +reg \ sal \ +store \ )) $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \ diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 77c51be..dfdba60 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -38,7 +38,9 @@ gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_c gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst log_uno:liblog_uno%,log_uno:liblog_uno_uno%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst purpenvhelper:libpurpen%,purpenvhelper:libuno_purpen%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES)) ifneq ($(OS),ANDROID) gb_Library_FILENAMES := $(patsubst unobootstrapprotector:libuno%,unobootstrapprotector:uno%,$(gb_Library_FILENAMES)) commit b20cb1e13270a30c676b477954b9e613f083cb32 Author: Matúš Kukan matus.ku...@gmail.com Date: Sun May 6 11:23:22 2012 +0200 remove unused files Change-Id: I65ec941f72b9884d147f51939d592da313418329 diff --git a/Repository.mk b/Repository.mk index 2075275..cf7c0a8 100644 --- a/Repository.mk +++ b/Repository.mk @@ -45,7 +45,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \ osl_process_child \ pdf2xml \ pdfunzip \ -rdbedit \ rdbmaker \ regsingleton \ rsc \ diff --git a/registry/Executable_rdbedit.mk b/registry/Executable_rdbedit.mk deleted file mode 100644 index a9b31ff..000 --- a/registry/Executable_rdbedit.mk +++ /dev/null @@ -1,43 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# 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 David Ostrovsky d.ostrov...@gmx.de (initial developer) -# -# 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. - -$(eval $(call gb_Executable_Executable,rdbedit)) - -$(eval $(call gb_Executable_use_libraries,rdbedit,\ -sal \ -salhelper \ -reg \ -)) - -$(eval $(call gb_Executable_use_static_libraries,rdbedit,\ -registry_helper \ -)) - -$(eval $(call gb_Executable_add_exception_objects,rdbedit,\ -registry/tools/rdbedit \ -)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk index 066e2fd..0867564 100644 --- a/registry/Module_registry.mk +++ b/registry/Module_registry.mk @@ -39,7 +39,6 @@ $(eval $(call gb_Module_add_targets,registry,\ Executable_regview \ Executable_regcompare \ Executable_checksingleton \ -Executable_rdbedit \ )) endif diff --git a/registry/tools/rdbedit.cxx b/registry/tools/rdbedit.cxx deleted file mode
[Libreoffice-commits] .: 2 commits - l10ntools/Package_scripts.mk l10ntools/scripts solenv/gbuild
l10ntools/Package_scripts.mk |3 +++ l10ntools/scripts/propex.bat |8 solenv/gbuild/Extension.mk |3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) New commits: commit 4eadfa3acd50e80dc07b5c2b00fff46d0f3dd498 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat May 5 10:33:41 2012 +0200 propmerge is not executable, only a script Change-Id: I35c88dc5ffe1b4082d0ef9611dd2c698c0d4217e diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 3de3af9..94ef7b3 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -36,7 +36,8 @@ endif gb_Extension_XRMEXTARGET := $(call gb_Executable_get_target_for_build,xrmex) gb_Extension_XRMEXCOMMAND := \ $(gb_Helper_set_ld_path) $(gb_Extension_XRMEXTARGET) -gb_Extension_PROPMERGETARGET := $(call gb_Executable_get_target_for_build,propmerge) +# propmerge is a perl script +gb_Extension_PROPMERGETARGET := $(OUTDIR_FOR_BUILD)/bin/propmerge gb_Extension_PROPMERGECOMMAND := \ $(PERL) $(gb_Extension_PROPMERGETARGET) gb_Extension_HELPEXTARGET := $(call gb_Executable_get_target_for_build,helpex) commit d28ffc8856295035f297be4613ed68ac05653609 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat May 5 10:25:30 2012 +0200 add propex.bat back; it is used on Windows Change-Id: I9fd6cc52533d95f67685a595171f035ca78e84df diff --git a/l10ntools/Package_scripts.mk b/l10ntools/Package_scripts.mk index 5040488..999b4b6 100644 --- a/l10ntools/Package_scripts.mk +++ b/l10ntools/Package_scripts.mk @@ -33,5 +33,8 @@ $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/po2lo,po2lo)) $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/propex,propex)) $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/propmerge,propmerge)) +ifeq ($(OS_FOR_BUILD),WNT) +$(eval $(call gb_Package_add_file,l10ntools_scripts,bin/propex,propex.bat)) +endif # vim: set noet sw=4 ts=4: diff --git a/l10ntools/scripts/propex.bat b/l10ntools/scripts/propex.bat new file mode 100755 index 000..1174286 --- /dev/null +++ b/l10ntools/scripts/propex.bat @@ -0,0 +1,8 @@ +@echo off + +if x%PERL%x EQU xx ( +echo ERROR: Perl not found. Environment is not set. +exit /b 1 +) + +%PERL% %SOLARVER%\%INPATH%\bin\propex %* \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - configure.in icon-themes/README
configure.in |4 ++-- icon-themes/README |6 ++ 2 files changed, 4 insertions(+), 6 deletions(-) New commits: commit 2794c1945a5c6921c8ba6a1bdbbe6d67eb8bbd69 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat May 5 14:52:51 2012 +0200 remove classic theme from configure If you'd use it, you'd get icons from fallback themes. That I consider misleading. Change-Id: I I Id1d71ef3f2e90f783d03ef8287f53f05ce4aa9a9 diff --git a/configure.in b/configure.in index ee346e0..209efe6 100644 --- a/configure.in +++ b/configure.in @@ -975,7 +975,7 @@ AC_ARG_WITH(vba-package-format, AC_ARG_WITH(theme, AS_HELP_STRING([--with-theme=theme1 theme2...], [Choose which themes to include. By default those themes with an '*' are included. - Possible choices: classic, *crystal, *default (galaxy), *hicontrast, human, industrial, *oxygen, *tango.]), + Possible choices: *crystal, *default (galaxy), *hicontrast, human, industrial, *oxygen, *tango.]), ,) AC_ARG_WITH(helppack-integration, @@ -9613,7 +9613,7 @@ fi WITH_THEMES= for theme in $with_theme; do case $theme in - classic|crystal|default|galaxy|hicontrast|human|industrial|oxygen|tango) : ;; +crystal|default|galaxy|hicontrast|human|industrial|oxygen|tango) : ;; *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;; esac WITH_THEMES=$WITH_THEMES $theme commit a90d7788a4b9aca4378cd1660293403db3d399ac Author: Matúš Kukan matus.ku...@gmail.com Date: Sat May 5 14:47:15 2012 +0200 fix typo Change-Id: Ie8987092a63e9a3b5d3b94f7ae54fbef98fdfc2c diff --git a/configure.in b/configure.in index 7978f2f..ee346e0 100644 --- a/configure.in +++ b/configure.in @@ -975,7 +975,7 @@ AC_ARG_WITH(vba-package-format, AC_ARG_WITH(theme, AS_HELP_STRING([--with-theme=theme1 theme2...], [Choose which themes to include. By default those themes with an '*' are included. - Possible choices: *classic, crystal, *default (galaxy), *hicontrast, human, industrial, *oxygen, *tango.]), + Possible choices: classic, *crystal, *default (galaxy), *hicontrast, human, industrial, *oxygen, *tango.]), ,) AC_ARG_WITH(helppack-integration, commit cd40f99c8e25c1741e1af34f39705e23fd236708 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat May 5 14:46:37 2012 +0200 update icon-themes readme Change-Id: I I54bf0861f3c16d925fa91e8a172d60a5c1ee6a9d diff --git a/icon-themes/README b/icon-themes/README index 120c3ab..c252791 100644 --- a/icon-themes/README +++ b/icon-themes/README @@ -24,8 +24,7 @@ How to add a new image set: - Create a directory for it here (let's call it e.g. new_set) -- Add its images_ name to CUSTOM_IMAGE_SETS in - postprocess/packimages/pack/makefile.mk +- Add its name (new_set) to WITH_THEMES variable - Add its gid to the Files section of gid_Module_Root_Brand in scp2/source/ooo/module_hidden_ooo.scp and add a corresponding File entry @@ -62,5 +61,4 @@ How to add a new image set: ULONG StyleSettings::GetCurrentSymbolsStyle() const in vcl/source/app/settings.cxx -- The fallback for particular icons is defined in -packimages/pack/Makefile +- The fallback for particular icons is defined in CUSTOM_PREFERRED_FALLBACK_1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |4
1 file changed, 4 insertions(+)
New commits:
commit 2b391a91115cb361c508514fa2e34795677d0f48
Author: Matúš Kukan matus.ku...@gmail.com
Date: Fri May 4 12:39:36 2012 +0200
use formatted path here for cygwin
Change-Id: I1d3ade7813f85c3d87ba2e5017e9635d663ef76a
diff --git a/configure.in b/configure.in
index 8daf62f..5abb680 100644
--- a/configure.in
+++ b/configure.in
@@ -2145,6 +2145,8 @@ if test -n ${with_solver_and_workdir_root}; then
AC_MSG_ERROR([directory does not exist: ${with_solver_and_workdir_root}])
fi
SOLARVER=${with_solver_and_workdir_root}/solver
+PathFormat $SOLARVER
+SOLARVER=$formatted_path
else
SOLARVER=${SRC_ROOT}/solver
fi
@@ -3334,6 +3336,8 @@ fi
INPATH=${OUTPATH}${PROEXT}
if test -n ${with_solver_and_workdir_root}; then
WORKDIR=${with_solver_and_workdir_root}/workdir/${INPATH}
+PathFormat $WORKDIR
+WORKDIR=$formatted_path
else
WORKDIR=${SRC_ROOT}/workdir/${INPATH}
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/Package_scripts.mk l10ntools/scripts
l10ntools/Package_scripts.mk |3 +-- l10ntools/scripts/propex.bat |8 2 files changed, 1 insertion(+), 10 deletions(-) New commits: commit e3ef482153bd1620c93019a413a18665ef0ebb98 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri May 4 13:20:37 2012 +0200 there is no localize script and propmerge.bat is not used Change-Id: Ie5038d9f53a1249a5c6b5c116f7781084741b40e diff --git a/l10ntools/Package_scripts.mk b/l10ntools/Package_scripts.mk index 1ce9327..5040488 100644 --- a/l10ntools/Package_scripts.mk +++ b/l10ntools/Package_scripts.mk @@ -26,10 +26,9 @@ $(eval $(call gb_Package_Package,l10ntools_scripts,$(SRCDIR)/l10ntools/scripts)) -$(eval $(call gb_Package_add_file,l10ntools_scripts,bin/localize,localize)) +$(eval $(call gb_Package_add_file,l10ntools_scripts,bin/addkeyid2pot.pl,addkeyid2pot.pl)) $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/fast_merge.pl,fast_merge.pl)) $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/keyidGen.pl,keyidGen.pl)) -$(eval $(call gb_Package_add_file,l10ntools_scripts,bin/addkeyid2pot.pl,addkeyid2pot.pl)) $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/po2lo,po2lo)) $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/propex,propex)) $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/propmerge,propmerge)) diff --git a/l10ntools/scripts/propex.bat b/l10ntools/scripts/propex.bat deleted file mode 100755 index 1174286..000 --- a/l10ntools/scripts/propex.bat +++ /dev/null @@ -1,8 +0,0 @@ -@echo off - -if x%PERL%x EQU xx ( -echo ERROR: Perl not found. Environment is not set. -exit /b 1 -) - -%PERL% %SOLARVER%\%INPATH%\bin\propex %* \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/Module_l10ntools.mk
l10ntools/Module_l10ntools.mk |5 + 1 file changed, 5 insertions(+) New commits: commit 9fe6e4da50eefcdbf1fddb7ab32dbe99db815588 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri May 4 13:58:33 2012 +0200 build Jar_FCFGMerge only in with-java case Change-Id: I45ba6a2080f489d4b1cf44ca95de81b8e33adac9 diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk index e34896f..35327a9 100644 --- a/l10ntools/Module_l10ntools.mk +++ b/l10ntools/Module_l10ntools.mk @@ -40,7 +40,12 @@ $(eval $(call gb_Module_add_targets,l10ntools,\ Library_helplinker \ Package_inc \ Package_scripts \ +)) + +ifneq ($(SOLAR_JAVA),) +$(eval $(call gb_Module_add_targets,l10ntools,\ Jar_FCFGMerge \ )) +endif # vim:set shiftwidth=4 softtabstop=4 expandtab: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: idlc/Executable_idlc.mk rsc/Executable_rsc.mk solenv/gbuild
idlc/Executable_idlc.mk |3 --- rsc/Executable_rsc.mk |3 --- solenv/gbuild/LinkTarget.mk | 36 3 files changed, 16 insertions(+), 26 deletions(-) New commits: commit b5607764171b8364b5e89948a2a5c3ab9749a160 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Apr 14 22:48:55 2012 +0200 YaccTarget and headers cleaning diff --git a/idlc/Executable_idlc.mk b/idlc/Executable_idlc.mk index 7e19722..4319857 100644 --- a/idlc/Executable_idlc.mk +++ b/idlc/Executable_idlc.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Executable_Executable,idlc)) $(eval $(call gb_Executable_set_include,idlc,\ --I$(WORKDIR)/YaccTarget/idlc/source \ -I$(SRCDIR)/idlc/inc \ -I$(SRCDIR)/idlc/source \ $$(INCLUDE) \ @@ -43,8 +42,6 @@ $(eval $(call gb_Executable_add_grammars,idlc,\ idlc/source/parser \ )) -$(WORKDIR)/GenCxxObject/YaccTarget/idlc/source/parser.o: T_CXXFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS) - $(eval $(call gb_Executable_use_custom_headers,idlc,idlc/scanner)) $(eval $(call gb_Executable_add_exception_objects,idlc,\ diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk index 9c0f1e3..c9a1360 100644 --- a/rsc/Executable_rsc.mk +++ b/rsc/Executable_rsc.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Executable_Executable,rsc)) $(eval $(call gb_Executable_set_include,rsc,\ $$(INCLUDE) \ -I$(SRCDIR)/rsc/inc \ - -I$(WORKDIR)/YaccTarget/rsc/source/parser \ )) $(eval $(call gb_Executable_use_api,rsc,\ @@ -55,8 +54,6 @@ $(eval $(call gb_Executable_add_grammars,rsc,\ rsc/source/parser/rscyacc \ )) -$(WORKDIR)/GenCxxObject/YaccTarget/rsc/source/parser/rscyacc.o: T_CXXFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS) - $(eval $(call gb_Executable_add_exception_objects,rsc,\ rsc/source/parser/erscerr \ rsc/source/parser/rscdb \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index dc75200..cde46b0 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -197,7 +197,7 @@ gb_YaccTarget_get_source = $(1)/$(2).y .PHONY : $(call gb_YaccTarget_get_clean_target,%) $(call gb_YaccTarget_get_clean_target,%) : - $(call gb_Output_announce,$(2),$(false),YAC,3) + $(call gb_Output_announce,$*,$(false),YAC,3) $(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_YaccTarget_get_grammar_target,$*) $(call gb_YaccTarget_get_header_target,$*) $(call gb_YaccTarget_get_target,$*)) @@ -547,6 +547,15 @@ endif endef +define gb_LinkTarget__add_include +$(call gb_LinkTarget_get_headers_target,$(1)) \ +$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(2) +ifeq ($(gb_FULLDEPS),$(true)) +$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(2) +endif + +endef + define gb_LinkTarget_set_include $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $(2) @@ -584,24 +593,14 @@ $$(call gb_Output_error,\ endef define gb_LinkTarget_use_api -$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \ - $$(foreach api,$(2),$$(call gb_Package_get_target,$$(api)_inc)) -$(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += $$(foreach api,$(2),-I$(OUTDIR)/inc/$$(api)) -ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += $$(foreach api,$(2),-I$(OUTDIR)/inc/$$(api)) -endif +$(foreach api,$(2),$(call gb_LinkTarget__use_internal_api_one,$(1),$(api))) endef define gb_LinkTarget__use_internal_api_one $(call gb_LinkTarget_get_external_headers_target,$(1)) :| \ - $(call gb_UnoApiHeadersTarget_get_$(3)target,$(api)) -$(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call gb_UnoApiHeadersTarget_get_$(3)dir,$(api)) -ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(call gb_UnoApiHeadersTarget_get_$(3)dir,$(api)) -endif + $(call gb_UnoApiHeadersTarget_get_$(3)target,$(2)) +$(call gb_LinkTarget__add_include,$(1),$(call gb_UnoApiHeadersTarget_get_$(3)dir,$(2))) endef @@ -831,9 +830,10 @@ endef # gb_LinkTarget_add_grammar(component,grammar file) define gb_LinkTarget_add_grammar $(call gb_YaccTarget_YaccTarget,$(2)) -$(call gb_LinkTarget_add_generated_cxx_object,$(1),YaccTarget/$(2)) +$(call gb_LinkTarget_add_generated_exception_object,$(1),YaccTarget/$(2)) $(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_YaccTarget_get_clean_target,$(2)) $(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_YaccTarget_get_header_target,$(2))) +$(call gb_LinkTarget__add_include,$(1),$(dir $(call gb_YaccTarget_get_header_target,$(2 endef @@ -976,11 +976,7 @@ endef define gb_LinkTarget__use_custom_headers $(call gb_LinkTarget_get_external_headers_target,$(1)) :| \ $(call gb_CustomTarget_get_target,$(2)) -$(call
[Libreoffice-commits] .: sd/Library_sd.mk slideshow/Library_slideshow.mk
sd/Library_sd.mk |5 - slideshow/Library_slideshow.mk |5 - 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit f0a5768f14cdb11e3f5904df7c4775bc4393648e Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Apr 16 14:54:44 2012 +0200 animations is not api, it should be animations_inc package diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 92c8531..1e5be7b 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -48,6 +48,10 @@ $(eval $(call gb_Library_add_sdi_headers,sd,\ sd/sdi/sdslots \ )) +$(eval $(call gb_Library_use_packages,sd,\ + animations_inc \ +)) + $(eval $(call gb_Library_set_include,sd,\ $$(INCLUDE) \ -I$(SRCDIR)/sd/inc \ @@ -68,7 +72,6 @@ $(eval $(call gb_Library_set_defs,sd,\ endif $(eval $(call gb_Library_use_api,sd,\ -animations \ offapi \ udkapi \ )) diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index 38b3fe2..658456d 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -27,6 +27,10 @@ $(eval $(call gb_Library_Library,slideshow)) +$(eval $(call gb_Library_use_packages,slideshow,\ + animations_inc \ +)) + $(eval $(call gb_Library_set_include,slideshow,\ $$(INCLUDE) \ -I$(SRCDIR)/slideshow/source/inc \ @@ -44,7 +48,6 @@ $(eval $(call gb_Library_add_defs,slideshow,\ endif $(eval $(call gb_Library_use_api,slideshow,\ -animations \ offapi \ udkapi \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sdext/Library_presenter.mk sdext/source unusedcode.easy
sdext/Library_presenter.mk|2
sdext/source/presenter/PresenterAnimation.cxx | 75 ---
sdext/source/presenter/PresenterAnimation.hxx | 110 -
sdext/source/presenter/PresenterAnimator.cxx | 139 --
sdext/source/presenter/PresenterAnimator.hxx | 69 --
sdext/source/presenter/PresenterController.cxx|3
sdext/source/presenter/PresenterController.hxx|2
sdext/source/presenter/PresenterWindowManager.cxx |2
unusedcode.easy |1
9 files changed, 403 deletions(-)
New commits:
commit 2d0e58e1fca4d098ecea1a3b0c0fe1447da99855
Author: Matúš Kukan matus.ku...@gmail.com
Date: Sat Apr 14 16:21:40 2012 +0200
unusedcode: PresenterAnimation and PresenterAnimator
diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk
index 7cefb48..c6232de 100644
--- a/sdext/Library_presenter.mk
+++ b/sdext/Library_presenter.mk
@@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,PresenterScreen,\
$(eval $(call gb_Library_add_exception_objects,PresenterScreen,\
sdext/source/presenter/PresenterAccessibility \
-sdext/source/presenter/PresenterAnimation \
-sdext/source/presenter/PresenterAnimator \
sdext/source/presenter/PresenterBitmapContainer \
sdext/source/presenter/PresenterButton \
sdext/source/presenter/PresenterCanvasHelper \
diff --git a/sdext/source/presenter/PresenterAnimation.cxx
b/sdext/source/presenter/PresenterAnimation.cxx
deleted file mode 100644
index b5c30ec..000
--- a/sdext/source/presenter/PresenterAnimation.cxx
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#include PresenterAnimation.hxx
-
-#include osl/time.h
-
-namespace sdext { namespace presenter {
-
-sal_uInt64 GetCurrentTime (void)
-{
-TimeValue aTimeValue;
-if (osl_getSystemTime(aTimeValue))
-return sal_uInt64(aTimeValue.Seconds * 1000.0 + aTimeValue.Nanosec /
100.0);
-else
-return 0;
-}
-
-PresenterAnimation::PresenterAnimation (
-const sal_uInt64 nStartDelay,
-const sal_uInt64 nTotalDuration,
-const sal_uInt64 nStepDuration)
-: mnStartTime(GetCurrentTime()+nStartDelay),
- mnTotalDuration(nTotalDuration),
- mnStepDuration(nStepDuration)
-{
-}
-
-PresenterAnimation::~PresenterAnimation (void)
-{
-}
-
-sal_uInt64 PresenterAnimation::GetStartTime (void)
-{
-return mnStartTime;
-}
-
-sal_uInt64 PresenterAnimation::GetEndTime (void)
-{
-return mnStartTime + mnTotalDuration;
-}
-
-sal_uInt64 PresenterAnimation::GetStepDuration (void)
-{
-return mnStepDuration;
-}
-
-} } // end of namespace ::sdext::presenter
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterAnimation.hxx
b/sdext/source/presenter/PresenterAnimation.hxx
deleted file mode 100644
index 8c2ce42..000
--- a/sdext/source/presenter/PresenterAnimation.hxx
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/Helper.mk | 17 -
solenv/gbuild/platform/WNT_INTEL_MSC.mk |7 +--
solenv/gbuild/platform/com_GCC_defs.mk |8 ++--
3 files changed, 19 insertions(+), 13 deletions(-)
New commits:
commit 8fd5ba3749aa740b3c060db775b42f15a5ce50a7
Author: Matúš Kukan matus.ku...@gmail.com
Date: Fri Apr 13 11:18:26 2012 +0200
gbuild: improve handling of paths
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 3d41f77..e5106db 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -43,13 +43,28 @@ $(gb_Helper_MISCDUMMY) :
define gb_Helper_abbreviate_dirs
S=$(SRCDIR) \
$(subst $(SRCDIR)/,$$S/,O=$(OUTDIR)) \
-$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,W=$(WORKDIR) $(subst
$(WORKDIR)/,$$W/,$(1
+$(subst $(SRCDIR)/,$$S/,W=$(WORKDIR)) \
+$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,\
+$(call gb_Helper_unix_path,$(1)
endef
define gb_Helper_abbreviate_dirs_native
$(call gb_Helper_native_path,$(call gb_Helper_abbreviate_dirs,$(1)))
endef
+# Convert path to native notation
+# First convert to unix style to avoid problems when
+# $(SRCDIR) is substring of $(gb_Helper_SRCDIR_NATIVE)
+# and $(1) already contains $(gb_Helper_SRCDIR_NATIVE)
+define gb_Helper_native_path
+$(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE),$(call gb_Helper_unix_path,$(1)))
+endef
+
+# $(gb_Helper_SRCDIR_NATIVE) can't be substring of $(SRCDIR)
+define gb_Helper_unix_path
+$(subst $(gb_Helper_SRCDIR_NATIVE),$(SRCDIR),$(1))
+endef
+
define gb_Helper_make_clean_target
gb_$(1)_get_clean_target = $(WORKDIR)/Clean/$(1)/$$(1)
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index fff0b8a..a6d88ff 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -244,15 +244,10 @@ endif
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/bin
+gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR))
gb_Helper_set_ld_path := PATH=$${PATH}:$(OUTDIR)/bin
-gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR))
-# Convert path to native notation
-define gb_Helper_native_path
-$(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE),$(1))
-endef
-
# Convert path to file URL.
define gb_Helper_make_url
file:///$(strip $(1))
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index 8287624..cf4dcab 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -115,7 +115,7 @@ gb_COMPILERNOOPTFLAGS := -O0
gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
-
+# Helper class
ifeq ($(OS_FOR_BUILD),MACOSX)
gb_Helper_LIBRARY_PATH_VAR := DYLD_LIBRARY_PATH
@@ -134,11 +134,6 @@ define gb_Helper_extend_ld_path
$(gb_Helper_set_ld_path)$(foreach dir,$(1),:$(dir))
endef
-# Convert path to native notation
-define gb_Helper_native_path
-$(1)
-endef
-
# Convert path to file URL.
define gb_Helper_make_url
file://$(strip $(1))
@@ -146,5 +141,6 @@ endef
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/lib
+gb_Helper_SRCDIR_NATIVE := $(SRCDIR)
gb_Helper_get_rcfile = $(1)rc
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - idlc/CustomTarget_scanner.mk idlc/Executable_idlc.mk idlc/Executable_idlcpp.mk idlc/inc idlc/Makefile idlc/Module_idlc.mk idlc/prj idlc/source Makefile Repository.
Makefile|2
Repository.mk |5 +
RepositoryModule_ooo.mk |1
idlc/CustomTarget_scanner.mk| 39
idlc/Executable_idlc.mk | 75
idlc/Executable_idlcpp.mk | 46 ++
idlc/Makefile |7 ++
idlc/Module_idlc.mk | 35 +++
idlc/inc/makefile.mk| 39
idlc/prj/build.lst |4 -
idlc/prj/d.lst |7 --
idlc/prj/makefile.mk|1
idlc/source/makefile.mk | 124
idlc/source/preproc/eval.c | 24 +++
idlc/source/preproc/makefile.mk | 77
15 files changed, 223 insertions(+), 263 deletions(-)
New commits:
commit 99b04ed2be3023bec874fce529d453123f48ac99
Author: David Ostrovsky david.ostrov...@gmx.de
Date: Fri Apr 13 13:13:42 2012 +0200
WaE: declaration of 'rand' shadows a global declaration
diff --git a/idlc/source/preproc/eval.c b/idlc/source/preproc/eval.c
index 9a1a620..41cc2e3 100644
--- a/idlc/source/preproc/eval.c
+++ b/idlc/source/preproc/eval.c
@@ -262,7 +262,7 @@ long
{
Token *tp;
Nlist *np;
-int ntok, rand;
+int ntok, local_rand;
trp-tp++;
if (kw == KIFDEF || kw == KIFNDEF)
@@ -283,7 +283,7 @@ long
vp = vals;
op = ops;
*op++ = END;
-for (rand = 0, tp = trp-bp + ntok; tp trp-lp; tp++)
+for (local_rand = 0, tp = trp-bp + ntok; tp trp-lp; tp++)
{
switch (tp-type)
{
@@ -298,17 +298,17 @@ long
case NUMBER:
case CCON:
case STRING:
-if (rand)
+if (local_rand)
goto syntax;
*vp++ = tokval(tp);
-rand = 1;
+local_rand = 1;
continue;
/* unary */
case DEFINED:
case TILDE:
case NOT:
-if (rand)
+if (local_rand)
goto syntax;
*op++ = tp-type;
continue;
@@ -318,7 +318,7 @@ long
case MINUS:
case STAR:
case AND:
-if (rand == 0)
+if (local_rand == 0)
{
if (tp-type == MINUS)
*op++ = UMINUS;
@@ -349,22 +349,22 @@ long
case QUEST:
case COLON:
case COMMA:
-if (rand == 0)
+if (local_rand == 0)
goto syntax;
if (evalop(priority[tp-type]) != 0)
return 0;
*op++ = tp-type;
-rand = 0;
+local_rand = 0;
continue;
case LP:
-if (rand)
+if (local_rand)
goto syntax;
*op++ = LP;
continue;
case RP:
-if (!rand)
+if (!local_rand)
goto syntax;
if (evalop(priority[RP]) != 0)
return 0;
@@ -382,7 +382,7 @@ long
if (np (np-val == KMACHINE))
{
tp++;
-if (rand)
+if (local_rand)
goto syntax;
*op++ = ARCHITECTURE;
continue;
@@ -395,7 +395,7 @@ long
return 0;
}
}
-if (rand == 0)
+if (local_rand == 0)
goto syntax;
if (evalop(priority[END]) != 0)
return 0;
commit bed6580ec330fea6bc7ee015adf1baf6298ed3fb
Author: David Ostrovsky david.ostrov...@gmx.de
Date: Fri Apr 6 01:51:05 2012 +0200
gbuild conversion: idlc module
diff --git a/Makefile b/Makefile
index 865a324..338e620 100644
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,7 @@ hwpfilter\
i18npool\
i18nutil\
idl\
+idlc\
io\
javaunohelper\
jurt\
@@ -176,7 +177,6 @@ hunspell\
hyphen\
icc\
icu\
-idlc\
instsetoo_native\
jfreereport\
jpeg\
diff --git a/Repository.mk b/Repository.mk
index 1a3851e..2bf19b6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -53,6 +53,11 @@ $(eval $(call gb_Helper_register_executables,NONE, \
xpdfimport \
))
+$(eval $(call gb_Helper_register_executables,SDK, \
+idlc \
+idlcpp \
+))
+
$(eval $(call gb_Helper_register_executables,OOO, \
spadmin.bin \
$(if $(filter $(GUIBASE)$(ENABLE_KDE),unxTRUE), \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index a79028c..ea5d5ab 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
i18npool \
i18nutil \
idl \
+idlc \
javaunohelper \
jvmaccess \
jvmfwk \
diff --git
[Libreoffice-commits] .: solenv/bin
solenv/bin/macosx-change-install-names.pl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0c80ad06fd96a4fec062a7edfff12bb65ef204b4
Author: David Ostrovsky david.ostrov...@gmx.de
Date: Fri Apr 13 15:50:38 2012 +0200
fix macosx build
diff --git a/solenv/bin/macosx-change-install-names.pl
b/solenv/bin/macosx-change-install-names.pl
index 91bea7e..ad0318a 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -53,7 +53,7 @@ sub action($$$)
('app/UREBIN/URELIB' = '@executable_path/../lib',
'app/OOO/URELIB' = '@executable_path/../ure-link/lib',
'app/OOO/OOO' = '@executable_path',
- 'app/SDK/URELIB' = '@executable_path/../../ure-link/lib',
+ 'app/SDKBIN/URELIB' = '@executable_path/../../ure-link/lib',
'app/NONE/URELIB' = '@__VIA_LIBRARY_PATH__',
'app/NONE/OOO' = '@__VIA_LIBRARY_PATH__',
'app/NONE/NONE' = '@__VIA_LIBRARY_PATH__',
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - Makefile.post scripting/Jar_ScriptProviderForBeanShell.mk solenv/gbuild
Makefile.post |6 +- scripting/Jar_ScriptProviderForBeanShell.mk |3 +-- solenv/gbuild/LinkTarget.mk | 11 ++- 3 files changed, 12 insertions(+), 8 deletions(-) New commits: commit a4f4e51304e9c26b58d4ab5ee4f0a63e3cd4ec91 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Apr 11 17:24:06 2012 +0200 use gb_Helper_make_url here diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk index abe6125..7ef9af6 100644 --- a/scripting/Jar_ScriptProviderForBeanShell.mk +++ b/scripting/Jar_ScriptProviderForBeanShell.mk @@ -42,10 +42,9 @@ $(eval $(call gb_Jar_use_externals,ScriptProviderForBeanShell,\ $(eval $(call gb_Jar_set_manifest,ScriptProviderForBeanShell,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/beanshell/MANIFEST.MF)) -#TODO: Ensure file://$(BSH_JAR) is a proper file URL: ifeq ($(SYSTEM_BSH),YES) $(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \ -ScriptFramework.jar file://$(BSH_JAR))) +ScriptFramework.jar $(call gb_Helper_make_url,$(BSH_JAR else $(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \ ScriptFramework.jar bsh.jar)) commit 803b1840c860be843e370108febbf7b89e71 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Apr 10 12:12:40 2012 +0200 include environment also here diff --git a/Makefile.post b/Makefile.post index bfa8b34..76ea25b 100644 --- a/Makefile.post +++ b/Makefile.post @@ -1,7 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -gb_SourceEnvAndRecurse_STAGE=gbuild +ifeq ($(strip $(SOLARENV)),) +include $(dir $(realpath $(firstword $(MAKEFILE_LISTconfig_host.mk +endif + include $(SOLARENV)/gbuild/gbuild.mk + $(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk))) # vim: set noet sw=4 ts=4: commit 5a248896bee2a20685ec32f85b3992a1b747355d Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Apr 10 03:04:49 2012 +0200 gbuild: use = external headers This fixes circular dependencies. diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 37e2025..8d886c6 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -617,7 +617,8 @@ endif endef define gb_LinkTarget__use_internal_api_one -$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_UnoApiHeadersTarget_get_$(3)target,$(api))) +$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \ + $(call gb_UnoApiHeadersTarget_get_$(3)target,$(api)) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call gb_UnoApiHeadersTarget_get_$(3)dir,$(api)) ifeq ($(gb_FULLDEPS),$(true)) @@ -995,13 +996,13 @@ $$(call gb_Output_error,\ endef define gb_LinkTarget__use_custom_headers +$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \ + $(call gb_CustomTarget_get_target,$(2)) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call gb_CustomTarget_get_workdir,$(2)) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(call gb_CustomTarget_get_workdir,$(2)) endif -$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_CustomTarget_get_target,$(2))) -$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_CustomTarget_get_clean_target,$(2)) endef @@ -1028,8 +1029,8 @@ endef # use a header package, possibly from another module (i.e. via OUTDIR) define gb_LinkTarget_use_package -$(call gb_LinkTarget_get_headers_target,$(1) : | \ - $(call gb_Package_get_target,$(strip $(2 +$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \ + $(call gb_Package_get_target,$(strip $(2))) endef ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/CppunitTest_dbaccess_macros_test.mk i18npool/Library_i18npool.mk sc/CppunitTest_sc_cellrangeobj.mk sc/CppunitTest_sc_chart_regression_test.mk sc/CppunitTest_sc_databa
dbaccess/CppunitTest_dbaccess_macros_test.mk |5 + i18npool/Library_i18npool.mk |9 + sc/CppunitTest_sc_cellrangeobj.mk|5 + sc/CppunitTest_sc_chart_regression_test.mk |5 + sc/CppunitTest_sc_databaserangeobj.mk|5 + sc/CppunitTest_sc_datapilotfieldobj.mk |5 + sc/CppunitTest_sc_datapilottableobj.mk |5 + sc/CppunitTest_sc_filters_test.mk|5 + sc/CppunitTest_sc_macros_test.mk |5 + sc/CppunitTest_sc_namedrangeobj.mk |5 + sc/CppunitTest_sc_namedrangesobj.mk |5 + sc/CppunitTest_sc_subsequent_filters_test.mk |5 + sc/CppunitTest_sc_tableautoformatfield.mk|5 + sc/CppunitTest_sc_ucalc.mk |2 -- sw/CppunitTest_sw_filters_test.mk|5 - sw/CppunitTest_sw_layout_test.mk |7 --- sw/CppunitTest_sw_macros_test.mk |7 --- sw/CppunitTest_sw_regression_test.mk |7 --- sw/CppunitTest_sw_swdoc_test.mk |1 - 19 files changed, 21 insertions(+), 77 deletions(-) New commits: commit 5dce272584cc79da727bdd4887d60cec04cbce11 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Apr 11 16:24:35 2012 +0200 move dependency on localedata_en to i18npool diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index 2d48691..0f6e9de 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -127,11 +127,8 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,dbaccess_macros_test,\ )) # we need to -# a) explicitly depend on library msword because it is not implied by a link -#relation -# b) explicitly depend on the sc resource files needed at unit-test runtime +# - explicitly depend on the dbaccess resource files needed at unit-test runtime $(call gb_CppunitTest_get_target,dbaccess_macros_test) : \ $(WORKDIR)/AllLangRes/dbaccess \ -$(call gb_Library_get_target,localedata_en) \ # vim: set noet sw=4 ts=4: diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index 5ba850b..96ac0c8 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -148,4 +148,13 @@ $(eval $(call gb_Library_add_generated_cobjects,i18npool,\ CustomTarget/i18npool/breakiterator/$(notdir $(basename $(txt)))_brk) \ )) +# i18npool dlopens localedata_* libraries. +# This is runtime dependency to prevent tests +# to be run sooner then localedata_* exists. +$(call gb_Library_get_target,i18npool) : \ + $(call gb_Library_get_target,localedata_en) \ + $(call gb_Library_get_target,localedata_es) \ + $(call gb_Library_get_target,localedata_euro) \ + $(call gb_Library_get_target,localedata_others) \ + # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index 5a66fd0..78e4aa0 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -128,11 +128,8 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_cellrangesbase,\ )) # we need to -# a) explicitly depend on library localedata_en because it is not implied by a link -#relation -# b) explicitly depend on the sc resource files needed at unit-test runtime +# - explicitly depend on the sc resource files needed at unit-test runtime $(call gb_CppunitTest_get_target,sc_cellrangesbase) : \ $(WORKDIR)/AllLangRes/sc \ -$(call gb_Library_get_target,localedata_en) \ # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index 2c28e5a..603c2d9 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -135,11 +135,8 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_chart_regression_test,\ )) # we need to -# a) explicitly depend on library localedata_en because it is not implied by a link -#relation -# b) explicitly depend on the sc resource files needed at unit-test runtime +# - explicitly depend on the sc resource files needed at unit-test runtime $(call gb_CppunitTest_get_target,sc_chart_regression_test) : \ $(WORKDIR)/AllLangRes/sc \ -$(call gb_Library_get_target,localedata_en) \ # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index a519a39..2374d97 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -127,11 +127,8 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_databaserangeobj,\ )) # we need to -# a) explicitly depend on library localedata_en because it is not implied by a link -#relation -# b) explicitly depend on the sc resource files needed at unit-test runtime +# - explicitly depend on the sc
[Libreoffice-commits] .: tools/bootstrp tools/Executable_rscdep.mk
tools/Executable_rscdep.mk |6 -- tools/bootstrp/rscdep.cxx |4 2 files changed, 10 deletions(-) New commits: commit 40775ce183ac29e9598cbca59e995c7e77327a1a Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Apr 12 22:07:11 2012 +0200 HAVE_GETOPT is always NO for windows diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk index 2117162..a353b8d 100644 --- a/tools/Executable_rscdep.mk +++ b/tools/Executable_rscdep.mk @@ -57,15 +57,9 @@ $(eval $(call gb_Executable_add_exception_objects,rscdep,\ )) ifeq ($(OS),WNT) -ifeq ($(HAVE_GETOPT),YES) -$(eval $(call gb_Executable_add_defs,rscdep,\ --DHAVE_GETOPT \ -)) -else $(eval $(call gb_Executable_use_libraries,rscdep,\ gnu_getopt \ )) endif -endif # vim: set noet sw=4 ts=4: diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx index f10448d..269086b 100644 --- a/tools/bootstrp/rscdep.cxx +++ b/tools/bootstrp/rscdep.cxx @@ -44,13 +44,9 @@ #include cppdep.hxx #if defined WNT -#if !defined HAVE_GETOPT #define __STDC__ 1 #define __GNU_LIBRARY__ #include external/glibc/getopt.h -#else -#include getopt.h -#endif #endif class RscHrcDep : public CppDep ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/com_GCC_class.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 1a41f2730da3b9aa2c89d9420209a4b4d2ecb9aa Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Apr 9 23:45:15 2012 +0200 this was accidentally removed diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 9b302d3..8014915 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -28,6 +28,7 @@ gb_AsmObject_get_source = $(1)/$(2).s define gb_AsmObject__command $(call gb_Output_announce,$(2),$(true),ASM,3) $(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $(1)) $(dir $(4)) \ $(gb_CC) \ $(DEFS) \ $(T_CFLAGS) \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - jurt/CustomTarget_test_urp.mk jurt/JunitTest_urp.mk jurt/Module_jurt.mk jurt/Package_jnilib.mk jurt/Package_test_urp.mk jurt/test jurt/util ridljar/CustomTarget_ja
jurt/CustomTarget_test_urp.mk | 52 +
jurt/JunitTest_urp.mk |4 -
jurt/Module_jurt.mk |8 --
jurt/Package_jnilib.mk| 38 -
jurt/Package_test_urp.mk | 43 --
jurt/test/com/sun/star/lib/uno/protocols/urp/Makefile | 48
jurt/util/Makefile| 38 -
ridljar/CustomTarget_javamaker.mk | 40 ++
ridljar/Jar_ridl.mk |4 -
ridljar/Module_ridljar.mk |2
ridljar/Package_javamaker.mk | 37 -
ridljar/javamaker/Makefile| 39 -
solenv/gbuild/Jar.mk | 12 ++-
solenv/gbuild/JavaClassSet.mk |9 +-
solenv/gbuild/JunitTest.mk| 15 +++
solenv/gbuild/LinkTarget.mk |7 +
unoil/CustomTarget_climaker.mk| 71 ++
unoil/CustomTarget_javamaker.mk | 41 ++
unoil/Jar_unoil.mk|4 -
unoil/Module_unoil.mk |3
unoil/Package_climaker.mk | 15 ---
unoil/Package_javamaker.mk| 38 -
unoil/climaker/Makefile | 64
unoil/javamaker/Makefile | 40 --
unusedcode.easy |3
vcl/inc/vcl/slider.hxx|3
vcl/source/control/slider.cxx | 28 ---
27 files changed, 250 insertions(+), 456 deletions(-)
New commits:
commit 0168b4e6ec645ab3706a1c6104b2aba4a7002536
Author: Matúš Kukan matus.ku...@gmail.com
Date: Fri Apr 6 11:48:57 2012 +0200
make add_custom_headers better
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 996ef9c..cda3f46 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -907,7 +907,7 @@ $(2) :| $(call
gb_LinkTarget_get_external_headers_target,$(1))
endef
-define gb_LinkTarget_add_custom_headers
+define gb_LinkTarget__add_custom_headers
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call
gb_CustomTarget_get_workdir,$(2))
ifeq ($(gb_FULLDEPS),$(true))
@@ -918,6 +918,11 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : $(call
gb_CustomTarget_get_clean_t
endef
+define gb_LinkTarget_add_custom_headers
+$(foreach customtarget,$(2),$(call
gb_LinkTarget__add_custom_headers,$(1),$(customtarget)))
+
+endef
+
define gb_LinkTarget_add_package_headers
$(foreach package,$(2),$(call gb_LinkTarget__add_internal_headers,$(1),$(call
gb_Package_get_target,$(package
$(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach package,$(2),$(call
gb_Package_get_clean_target,$(package)))
commit 9f92346e7c711786243d41bcd952b61cc922a21f
Author: Thomas Collerton tom.col...@gmail.com
Date: Wed Apr 4 17:10:01 2012 +0200
Remove unused code (vcl)
diff --git a/unusedcode.easy b/unusedcode.easy
index 19586de..91368d3 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -123,9 +123,6 @@ SfxModuleArr_Impl::DeleteAndDestroy(unsigned short,
unsigned short)
SfxNavigatorWrapper::GetChildWindowId()
SfxPartChildWnd_Impl::GetChildWindowId()
SfxRecordingFloatWrapper_Impl::GetChildWindowId()
-Slider::SetRangeMax(long)
-Slider::SetRangeMin(long)
-Slider::Slider(Window*, ResId const)
SotStorage::GetProperty(String const, String const,
com::sun::star::uno::Any)
SpanStyleManager::get(WPXString const) const
SpinButton::SpinButton(Window*, ResId const)
diff --git a/vcl/inc/vcl/slider.hxx b/vcl/inc/vcl/slider.hxx
index 15f0495..c29959c 100644
--- a/vcl/inc/vcl/slider.hxx
+++ b/vcl/inc/vcl/slider.hxx
@@ -88,7 +88,6 @@ private:
public:
Slider( Window* pParent, WinBits nStyle = WB_HORZ );
-Slider( Window* pParent, const ResId rResId );
virtual voidMouseButtonDown( const MouseEvent rMEvt );
virtual voidMouseButtonUp( const MouseEvent rMEvt );
@@ -107,9 +106,7 @@ public:
{ mbFullDrag = bEnable; }
sal_BoolIsDragEnabled() const { return mbFullDrag; }
-voidSetRangeMin( long nNewRange );
longGetRangeMin() const { return mnMinRange; }
-voidSetRangeMax( long nNewRange );
longGetRangeMax() const { return mnMaxRange; }
voidSetRange( const Range rRange );
Range GetRange() const { return Range( GetRangeMin(),
GetRangeMax() ); }
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
[Libreoffice-commits] .: jurt/CustomTarget_jnilib.mk jurt/Module_jurt.mk jurt/Package_jnilib.mk
jurt/CustomTarget_jnilib.mk | 38 ++ jurt/Module_jurt.mk |7 +++ jurt/Package_jnilib.mk | 32 3 files changed, 77 insertions(+) New commits: commit 12b3707ed2ccd77a8fd8b8f341ea035c22d87f40 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Apr 6 13:05:53 2012 +0200 ops, this should not be deleted diff --git a/jurt/CustomTarget_jnilib.mk b/jurt/CustomTarget_jnilib.mk new file mode 100644 index 000..71d90f6 --- /dev/null +++ b/jurt/CustomTarget_jnilib.mk @@ -0,0 +1,38 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# 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) 2010 Red Hat, Inc., David Tardon dtar...@redhat.com +# (initial developer) +# +# 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. + +$(eval $(call gb_CustomTarget_CustomTarget,jurt/util,new_style)) + +JUJL := $(call gb_CustomTarget_get_workdir,jurt/util) + +$(call gb_CustomTarget_get_target,jurt/util) : $(JUJL)/libjpipe.jnilib + +$(JUJL)/libjpipe.jnilib : $(call gb_Library_get_target,jpipe) | $(JUJL)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MCB,1) + cd $(dir $@) $(SOLARENV)/bin/macosx-create-bundle $ + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk index 0501603..2026de2 100644 --- a/jurt/Module_jurt.mk +++ b/jurt/Module_jurt.mk @@ -35,6 +35,13 @@ $(eval $(call gb_Module_add_targets,jurt,\ Zip_jurt \ )) +ifeq ($(OS),MACOSX) +$(eval $(call gb_Module_add_targets,jurt,\ +CustomTarget_jnilib \ +Package_jnilib \ +)) +endif + ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,jurt,\ Library_jpipx \ diff --git a/jurt/Package_jnilib.mk b/jurt/Package_jnilib.mk new file mode 100644 index 000..a728e71 --- /dev/null +++ b/jurt/Package_jnilib.mk @@ -0,0 +1,32 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# 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) 2010 Red Hat, Inc., David Tardon dtar...@redhat.com +# (initial developer) +# +# 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. + +$(eval $(call gb_Package_Package,jurt_jnilib,$(WORKDIR)/CustomTarget/jurt/util)) + +$(eval $(call gb_Package_add_file,lib/$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe)),,$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe + +# vim:set shiftwidth=4 softtabstop=4 expandtab: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unoil/CustomTarget_climaker.mk
unoil/CustomTarget_climaker.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 501e290b8eb86a31e936e210aeb76d0b8c1a12b3 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Apr 6 13:15:14 2012 +0200 include variable before it's used diff --git a/unoil/CustomTarget_climaker.mk b/unoil/CustomTarget_climaker.mk index 462a2b8..0e529d0 100644 --- a/unoil/CustomTarget_climaker.mk +++ b/unoil/CustomTarget_climaker.mk @@ -25,6 +25,8 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. +include $(SRCDIR)/unoil/climaker/version.txt + $(eval $(call gb_CustomTarget_CustomTarget,unoil/climaker,new_style)) UICM := $(call gb_CustomTarget_get_workdir,unoil/climaker) @@ -34,8 +36,6 @@ $(call gb_CustomTarget_get_target,unoil/climaker) : \ $(UICM)/cli_oootypes.config \ $(UICM)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll -include $(SRCDIR)/unoil/climaker/version.txt - $(UICM)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \ $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \ $(OUTDIR)/bin/cliuno.snk $(OUTDIR)/bin/cli_uretypes.dll \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: jurt/CustomTarget_test_urp.mk
jurt/CustomTarget_test_urp.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b33134d246a49cab13bbeb6c95f862faf0a69268 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Apr 6 19:18:45 2012 +0200 fix build of jurt_urp diff --git a/jurt/CustomTarget_test_urp.mk b/jurt/CustomTarget_test_urp.mk index 725cae6..73f6fad 100644 --- a/jurt/CustomTarget_test_urp.mk +++ b/jurt/CustomTarget_test_urp.mk @@ -47,6 +47,6 @@ $(JUTU)/registry.rdb : $(JUTU)/interfaces.urd \ $(JUTU)/interfaces.urd : $(SRCDIR)/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl \ $(call gb_Executable_get_target_for_build,idlc) | $(JUTU)/urd/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IDL,1) - $(call gb_Helper_execute,idlc -O$(JUTU)/urd -I$(OUTDIR)/idl -cid -we $) + $(call gb_Helper_execute,idlc -O$(JUTU) -I$(OUTDIR)/idl -cid -we $) # vim:set shiftwidth=4 tabstop=4 noexpandtab: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: stoc/Library_javaloader.mk
stoc/Library_javaloader.mk |1 + 1 file changed, 1 insertion(+) New commits: commit ff496d9124b44c763cae2d45fe337e75781b743c Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Apr 6 20:02:04 2012 +0200 javaloader: add_linked_lib salhelper diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk index e0f1a13..8c672d2 100644 --- a/stoc/Library_javaloader.mk +++ b/stoc/Library_javaloader.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,javaloader,\ cppuhelper \ jvmaccess \ sal \ +salhelper \ $(gb_STDLIBS) \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/Module_extensions.mk
extensions/Module_extensions.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1e7fd91514940520c33f14898c2298d1251ac34d Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Apr 4 14:14:33 2012 +0200 fix so_activex_idl, part two The order seems to be important here. However it has worked for me and I am not sure this will fix tinderboxes. diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index f7e7180..00b7d7c 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -69,9 +69,9 @@ ifeq ($(OS),WNT) ifeq ($(COM),MSC) ifneq ($(DISABLE_ACTIVEX),TRUE) $(eval $(call gb_Module_add_targets,extensions,\ - CustomTarget_so_activex_idl \ WinResTarget_activex \ Library_so_activex \ + CustomTarget_so_activex_idl \ )) ifeq ($(BUILD_X64),TRUE) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - postprocess/packcomponents Repository.mk scp2/source vcl/CustomTarget_kde_moc.mk vcl/Executable_kdefilepicker.mk vcl/Module_vcl.mk vcl/Package_kde_moc.mk vcl/unx
Repository.mk |6 postprocess/packcomponents/makefile.mk |4 --- scp2/source/ooo/file_library_ooo.scp | 16 - vcl/CustomTarget_kde_moc.mk| 40 + vcl/Executable_kdefilepicker.mk|4 --- vcl/Module_vcl.mk |2 + vcl/Package_kde_moc.mk | 36 - vcl/unx/kde/fpicker/Makefile | 35 8 files changed, 42 insertions(+), 101 deletions(-) New commits: commit 19b7edb9c65793821bee984d2da43fbfbd605e74 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Apr 3 02:06:48 2012 +0200 fps_kde and fps_kde4 are no more diff --git a/Repository.mk b/Repository.mk index 74452fd..a112669 100644 --- a/Repository.mk +++ b/Repository.mk @@ -489,12 +489,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ $(if $(filter $(OS),WNT), \ fps_odma \ ) \ -$(if $(filter $(GUIBASE)$(ENABLE_KDE),unxTRUE), \ -fps_kde \ -) \ -$(if $(filter $(GUIBASE)$(ENABLE_KDE4),unxTRUE), \ -fps_kde4 \ -) \ )) ifeq ($(OS),WNT) diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 47a7d7c..488e322 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -375,10 +375,6 @@ my_components += mozbootstrap .END .ENDIF -.IF $(OS) != MACOSX $(OS) != WNT $(ENABLE_KDE4) != -my_components += component/fpicker/source/unx/kde4/fps_kde4 -.END - .IF $(OS) != WNT $(OS) != ANDROID $(OS) != IOS $(OS) != headless my_components += cmdmail .END diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 1b464cf..689a71b 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -502,24 +502,8 @@ File gid_File_Lib_Desktopbe Name = STRING(CONCAT2(desktopbe1.uno,UNXSUFFIX)); End -#ifdef ENABLE_KDE4 -#ifndef MACOSX -File gid_File_Lib_Fps_Kde4 -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde4.uno); -End -#endif -#endif #ifdef ENABLE_KDE #ifndef MACOSX -File gid_File_Lib_Fps_Kde -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde.uno); -End File gid_File_Bin_KdeFilePicker BIN_FILE_BODY; Styles = (PACKED); commit 8464e311309ca918ac3a7d111c0f6927bfe825f8 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Apr 3 01:40:29 2012 +0200 vcl: use CustomTarget makefile for kde_moc diff --git a/vcl/CustomTarget_kde_moc.mk b/vcl/CustomTarget_kde_moc.mk new file mode 100644 index 000..7d54c0b --- /dev/null +++ b/vcl/CustomTarget_kde_moc.mk @@ -0,0 +1,40 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# 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) 2010 Red Hat, Inc., David Tardon dtar...@redhat.com +# (initial developer) +# +# 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. + +$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde/fpicker,new_style)) + +VCKF := $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker) + +$(call gb_CustomTarget_get_target,vcl/unx/kde/fpicker) : \ + $(VCKF)/kdefilepicker.moc.cxx + +$(VCKF)/kdefilepicker.moc.cxx : \ + $(SRCDIR)/vcl/unx/kde/fpicker/kdefilepicker.hxx | $(VCKF)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1) + $(MOC) -o $@ $ + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/vcl/Executable_kdefilepicker.mk b/vcl/Executable_kdefilepicker.mk index 7820efc..2bfa978 100644 --- a/vcl/Executable_kdefilepicker.mk +++ b/vcl/Executable_kdefilepicker.mk @@ -27,10 +27,6 @@ $(eval $(call gb_Executable_Executable,kdefilepicker)) -$(eval $(call gb_Executable_add_package_headers,kdefilepicker,\ - vcl_kde_moc \ -)) - $(eval $(call gb_Executable_add_defs,kdefilepicker,\ $(KDE_CFLAGS) \ )) diff --git a/vcl/Module_vcl.mk
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/LinkTarget.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 41f74a4c6a4a88b675a443436df7f409754d34f8 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Mar 31 23:19:58 2012 +0200 Revert gbuild: do not let generated source files depend on headers There is a reason for that dependency. I will have to come up with something better later. diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index ba3ea56..11eeb02 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -745,7 +745,7 @@ $(call gb_LinkTarget_get_target,$(1)) : GENCOBJECTS += $(2) $(call gb_LinkTarget_get_clean_target,$(1)) : GENCOBJECTS += $(2) $(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCObject_get_target,$(2)) -$(call gb_GenCObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1)) +$(call gb_GenCObject_get_source,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1)) $(call gb_GenCObject_get_target,$(2)) : T_CFLAGS += $(3) $(call gb_GenCObject_get_target,$(2)) : \ OBJECTOWNER := $(call gb_Object__owner,$(2),$(1)) @@ -762,7 +762,7 @@ $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS += $(2) $(call gb_LinkTarget_get_clean_target,$(1)) : GENCXXOBJECTS += $(2) $(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCxxObject_get_target,$(2)) -$(call gb_GenCxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1)) +$(call gb_GenCxxObject_get_source,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1)) $(call gb_GenCxxObject_get_target,$(2)) : T_CXXFLAGS += $(3) $(call gb_GenCxxObject_get_target,$(2)) : \ OBJECTOWNER := $(call gb_Object__owner,$(2),$(1)) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
