[Libreoffice-commits] .: sfx2/inc sfx2/source

[Kohei Yoshida]

 sfx2/inc/sfx2/sfxbasemodel.hxx   |3 +--
 sfx2/source/doc/sfxbasemodel.cxx |6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit e05a284f0b3beb93ffcea43663ff165a0dd2001a
Author: Kohei Yoshida 
Date:   Tue Jul 24 22:41:10 2012 -0400

Useless macro define.

Change-Id: I19e71dfd514b19e34c7d73642a8c6bc2d3464590

diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index bdb5d6a..844bc33 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -139,7 +139,6 @@
 #define NOSUPPORTEXCEPTION  ::com::sun::star::lang::NoSupportException
 #define RUNTIMEEXCEPTION::com::sun::star::uno::RuntimeException
 #define CLOSEVETOEXCEPTION  ::com::sun::star::util::CloseVetoException
-#define DOUBLEINITIALIZATIONEXCEPTION  
::com::sun::star::frame::DoubleInitializationException
 #define ILLEGALARGUMENTEXCEPTION 
::com::sun::star::lang::IllegalArgumentException
 #define IOEXCEPTION ::com::sun::star::io::IOException
 #define EXCEPTION   ::com::sun::star::uno::Exception
@@ -1042,7 +1041,7 @@ public:
 virtual void SAL_CALL loadFromStorage( const REFERENCE< XSTORAGE >& 
xStorage,
 const 
::com::sun::star::uno::Sequence< PROPERTYVALUE >& aMediaDescriptor )
 throw ( ILLEGALARGUMENTEXCEPTION,
-DOUBLEINITIALIZATIONEXCEPTION,
+com::sun::star::frame::DoubleInitializationException,
 IOEXCEPTION,
 EXCEPTION,
 RUNTIMEEXCEPTION );
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 8309d28..1641a6f 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1834,7 +1834,7 @@ void SAL_CALL SfxBaseModel::initNew()
 if ( m_pData->m_pObjectShell.Is() )
 {
 if( m_pData->m_pObjectShell->GetMedium() )
-throw DOUBLEINITIALIZATIONEXCEPTION();
+throw frame::DoubleInitializationException();
 
 sal_Bool bRes = m_pData->m_pObjectShell->DoInitNew( NULL );
 sal_uInt32 nErrCode = m_pData->m_pObjectShell->GetError() ?
@@ -1867,7 +1867,7 @@ void SAL_CALL SfxBaseModel::load(   const uno::Sequence< 
beans::PropertyValue >&
 {
 if( m_pData->m_pObjectShell->GetMedium() )
 // if a Medium is present, the document is already initialized
-throw DOUBLEINITIALIZATIONEXCEPTION();
+throw frame::DoubleInitializationException();
 
 SfxMedium* pMedium = new SfxMedium( seqArguments );
 String aFilterName;
@@ -3515,7 +3515,7 @@ embed::VisualRepresentation SAL_CALL 
SfxBaseModel::getPreferredVisualRepresentat
 void SAL_CALL SfxBaseModel::loadFromStorage( const uno::Reference< XSTORAGE >& 
xStorage,
  const uno::Sequence< 
beans::PropertyValue >& aMediaDescriptor )
 throw ( lang::IllegalArgumentException,
-DOUBLEINITIALIZATIONEXCEPTION,
+frame::DoubleInitializationException,
 IOEXCEPTION,
 EXCEPTION,
 uno::RuntimeException )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - framework/source

[Kohei Yoshida]

 framework/source/inc/loadenv/loadenv.hxx |   24 +++--
 framework/source/loadenv/loadenv.cxx |   55 ---
 2 files changed, 6 insertions(+), 73 deletions(-)

New commits:
commit c549e1e836182e586a42e5ecb398db6faf0a2cbe
Author: Kohei Yoshida 
Date:   Tue Jul 24 13:08:07 2012 -0400

Unused methods.

Change-Id: Iafd1895d96df32c312f937db479e04abd7cb7038

diff --git a/framework/source/inc/loadenv/loadenv.hxx 
b/framework/source/inc/loadenv/loadenv.hxx
index 75269e3..4c72e6b 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -373,14 +373,6 @@ class LoadEnv : private ThreadHelpBase
 
 //___
 /** TODO document me ... */
-void cancelLoading();
-
-//___
-/** TODO document me ... */
-css::uno::Reference< css::frame::XFrame > getTarget() const;
-
-//___
-/** TODO document me ... */
 css::uno::Reference< css::lang::XComponent > getTargetComponent() 
const;
 
 
diff --git a/framework/source/loadenv/loadenv.cxx 
b/framework/source/loadenv/loadenv.cxx
index 35b85c5..79224ef 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -463,57 +463,6 @@ sal_Bool LoadEnv::waitWhileLoading(sal_uInt32 nTimeout)
 // <- SAFE --
 }
 
-
-void LoadEnv::cancelLoading()
-{
-// PARTIAL(!) SAFE -> --
-ReadGuard aReadLock(m_aLock);
-
-// Still running? Might waitWhileLoading()
-// runned into the timeout!
-if (m_xAsynchronousJob.is())
-{
-// try to cancel it ... if its an asynchronous frame loader
-css::uno::Reference< css::frame::XFrameLoader > 
xAsyncLoader(m_xAsynchronousJob, css::uno::UNO_QUERY);
-if (xAsyncLoader.is())
-{
-aReadLock.unlock();
-// <- BREAK SAFE --
-xAsyncLoader->cancel();
-// <- RESTART SAFE 
-aReadLock.lock();
-/* Attention:
-After returning from any cancel/dispose call, neither the 
frame nor weself
-may be called back. Because only we can cancel this job, we 
already know
-the result! => Thats why its not usefull nor neccessary to 
wait for any
-asynchronous listener notification.
-*/
-m_bLoaded = sal_False;
-m_xAsynchronousJob.clear();
-}
-// or may be its a content handler? Such handler can't be cancelled in 
its running
-// operation :-( And we can't deregister us there again :-(
-// => The only chance is an exception :-)
-else
-throw LoadEnvException(LoadEnvException::ID_STILL_RUNNING);
-}
-
-impl_reactForLoadingState();
-
-aReadLock.unlock();
-// <- PARTIAL(!) SAFE --
-}
-
-
-css::uno::Reference< css::frame::XFrame > LoadEnv::getTarget() const
-{
-// SAFE ->
-ReadGuard aReadLock(m_aLock);
-return m_xTargetFrame;
-// <- SAFE
-}
-
-
 css::uno::Reference< css::lang::XComponent > LoadEnv::getTargetComponent() 
const
 {
 // SAFE ->
commit f15b1d084eb026342e8d0440d5bfb3ac8f23f30c
Author: Kohei Yoshida 
Date:   Tue Jul 24 13:03:22 2012 -0400

It makes no sense to make these methods virtual.

LoadEnv doesn't have any child classes, and is not a UNO service.

Change-Id: I773324e10b755c6e5f1a29c07495b21f6a236a3e

diff --git a/framework/source/inc/loadenv/loadenv.hxx 
b/framework/source/inc/loadenv/loadenv.hxx
index 9ed683c..75269e3 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -248,7 +248,7 @@ class LoadEnv : private ThreadHelpBase
 
 /** @short  deinitialize an instance of this class in the right way.
  */
-virtual ~LoadEnv();
+~LoadEnv();
 
 //___
 
@@ -315,14 +315,13 @@ class LoadEnv : private ThreadHelpBase
 @throw  A RuntimeException in case any internal process indicates, 
that
 the whole runtime cant be used any longer.
  */
-virtual void initializeLoading(const ::rtl::OUString&  
 sURL,
+void initializeLoading(const ::rtl::OUString&  
 sURL,
const css::uno::Sequence< 
css::beans::PropertyValue >&   lMediaDescriptor,
const css::uno::Reference< 
css::frame::XFrame >& xBaseFrame  ,
const ::rtl::OUString&  
 sTarget ,
 

factorized document changes notification code. cf LO bug #47...

[Gerrit]

>From Jean-Tiare Le Bigot :

Jean-Tiare Le Bigot has abandoned this change.

Change subject: factorized document changes notification code. cf LO bug #47958.
..


Patch Set 1: Abandoned

Eike Rathke is right. This patch introduces a performance regression and this 
is not acceptable. Anyway, there is a merge conflict and fixing it was not 
worth the effort since this is only a minor rewrite. The goal was to do a firts 
timer job in the code base before doing a more in depth contribution. So I am 
going to the next step :)

--
To view, visit https://gerrit.libreoffice.org/337
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I239c678a4a918865683baf83d6f172d4b0620be1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Jean-Tiare Le Bigot 
Gerrit-Reviewer: Eike Rathke 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] add ./logerrit resubmit and releasepick

[Gerrit]

>From Björn Michaelsen :

Björn Michaelsen has uploaded a new change for review.

Change subject: add ./logerrit resubmit and releasepick
..

add ./logerrit resubmit and releasepick

resubmit creates a new Change-Id for the current change and thus allow to submit
changes for review on release branches that were already reviewed on master.

releasepick picks out one commit to a release branch and commits it for review
with a new Change-Id.

Also hint advanced users to 'git review' which requires some more setup, but
should make things easier for regular users.

Getting this functionality into 'git review' would be likely help adoption too
-- and in python there is some sane errorchecking possible.

Change-Id: Ibea6bbfe747af160728b838c6ee236fd8f89671d
---
M logerrit
1 file changed, 49 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/343/1
--
To view, visit https://gerrit.libreoffice.org/343
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibea6bbfe747af160728b838c6ee236fd8f89671d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/mork' - connectivity/Executable_mork_helper.mk

[Matus Kukan]

 connectivity/Executable_mork_helper.mk |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 8348d52377edfa8b9c5758205e098e795cdd3850
Author: Matúš Kukan 
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] .: 3 commits - Makefile.top sc/source svx/inc svx/source tubes/inc tubes/source unusedcode.easy

[Matus Kukan]

 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 
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 
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 
 #include 
 #include 
 
 #include "tubes/tubesdllapi.h"
+#include 
 
 typedef struct _TpAccount TpAccount;
 typedef struct _TpContact TpContact;
@@ -49,8 +51,12 @@ public:
 
 AccountContactPairV getContacts();
 
+/** Emitted when a contact changes its presence. */
+boost::signals2::signal sigContactListChanged;
+
 private:
 TpAccountManager*   mpAccountManager;
+std::set< TpContact* >  maRegistered;
 
 };
 
diff --git a/tubes/source/contact-list.cxx b/tubes/source/contact-list.cxx
index 0d46803..78f84b5 100644
--- a/tubes/source/contact-list.cxx
+++ b/tubes/source/contact-list.cxx
@@ -92,6 +92,15 @@ tb_contact_is_online (TpContact *contact)
 }
 }
 
+static void presence_changed_cb( TpContact* /* contact */,
+ guint  /* type */,
+ gchar* /* status */,
+ gchar* /* message */,
+ gpointer   pContactList )
+{
+reinterpret_cast (pContactList)->sigContactListChanged();
+}
+
 AccountContactPairV ContactList::getContacts()
 {
   GList *accounts;
@@ -121,6 +130,12 @@ AccountContactPairV ContactList::getContacts()
 {
   TpContact *contact =
   reinterpret_cast(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 
Date:   Tue Jul 24 16:38:27 2012 +0200

unusedcode: svx: remove unused methods

Change-Id: I50af310bef92f8f36c31b5b4f343639e89c628ac

diff --git a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx 
b/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx
index cae7723..2d42088 100644
--- a/svx/inc/svx/sdr/attribute/sdrformtextattri

[Libreoffice-commits] .: Branch 'feature/mork' - connectivity/Executable_mork_helper.mk connectivity/Library_mork.mk connectivity/Module_connectivity.mk connectivity/source Repository.mk

[David Ostrovsky]

 Repository.mk   |1 
 connectivity/Executable_mork_helper.mk  |   29 ++
 connectivity/Library_mork.mk|4 
 connectivity/Module_connectivity.mk |1 
 connectivity/source/drivers/mork/MDriver.cxx|4 
 connectivity/source/drivers/mork/MDriver.hxx|   16 -
 connectivity/source/drivers/mork/MNSFolders.cxx |  156 +++
 connectivity/source/drivers/mork/MNSFolders.hxx |   34 ++
 connectivity/source/drivers/mork/MNSINIParser.cxx   |  103 +++
 connectivity/source/drivers/mork/MNSINIParser.hxx   |   74 +
 connectivity/source/drivers/mork/MNSProfileDiscover.cxx |  224 
 connectivity/source/drivers/mork/MNSProfileDiscover.hxx |   96 ++
 connectivity/source/drivers/mork/mork_helper.cxx|9 
 13 files changed, 746 insertions(+), 5 deletions(-)

New commits:
commit 8950f9ffeed6cecbcfc9996bc01c7d6a9025d866
Author: David Ostrovsky 
Date:   Tue Jul 24 23:16:47 2012 +0200

mork driver: more files added

Change-Id: Ia4e3e0be9426c785b8d25a968111b153ca45f363

diff --git a/Repository.mk b/Repository.mk
index f689f5a..e4142c1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 idxdict \
 lngconvex \
 localize \
+mork_helper \
 mkunroll \
 osl_process_child \
 pdf2xml \
diff --git a/connectivity/Executable_mork_helper.mk 
b/connectivity/Executable_mork_helper.mk
new file mode 100644
index 000..90c06e4
--- /dev/null
+++ b/connectivity/Executable_mork_helper.mk
@@ -0,0 +1,29 @@
+# -*- 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_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_libraries,mork_helper,\
+mork \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,mork_helper,\
+connectivity/source/drivers/mork/mork_helper \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk
index 85e0f81..4a6621f 100644
--- a/connectivity/Library_mork.mk
+++ b/connectivity/Library_mork.mk
@@ -20,12 +20,16 @@ $(eval $(call gb_Library_use_libraries,mork, \
 cppu \
 cppuhelper \
 sal \
+dbtools \
 $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,mork))
 
 $(eval $(call gb_Library_add_exception_objects,mork, \
+connectivity/source/drivers/mork/MNSFolders \
+connectivity/source/drivers/mork/MNSINIParser \
+connectivity/source/drivers/mork/MNSProfileDiscover \
 connectivity/source/drivers/mork/MorkParser \
 connectivity/source/drivers/mork/MDriver \
 connectivity/source/drivers/mork/MConnection \
diff --git a/connectivity/Module_connectivity.mk 
b/connectivity/Module_connectivity.mk
index a438066..c3d7c2d 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
Configuration_flat \
Configuration_mysql \
Configuration_odbc \
+   Executable_mork_helper \
Library_calc \
Library_dbase \
Library_dbpool2 \
diff --git a/connectivity/source/drivers/mork/MDriver.cxx 
b/connectivity/source/drivers/mork/MDriver.cxx
index 7c73eef..1bc336d 100644
--- a/connectivity/source/drivers/mork/MDriver.cxx
+++ b/connectivity/source/drivers/mork/MDriver.cxx
@@ -9,8 +9,10 @@
 
 #include "MDriver.hxx"
 #include "MConnection.hxx"
+#include "MNSProfileDiscover.hxx"
 
 using namespace connectivity::mork;
+using namespace connectivity::mozab;
 
 namespace connectivity
 {
@@ -26,6 +28,7 @@ namespace connectivity
 MorkDriver::MorkDriver(css::uno::Reference< css::uno::XComponentContext > 
const context):
 context_(context)
 {
+m_ProfileAccess = new ProfileAccess();
 assert(context.is());
 }
 
@@ -73,7 +76,6 @@ css::uno::Reference< css::sdbc::XConnection > 
MorkDriver::connect(
 css::uno::Sequence< css::beans::PropertyValue > const & info)
 throw (css::sdbc::SQLException, css::uno::RuntimeException)
 {
-//... TODO
 (void) url; (void) info; // avoid warnings
 //return static_cast< cppu::OWeakObject * >(new MConnection(this));
 return NULL;
diff --git a/connectivity/source/drivers/mork/MDriver.hxx 
b/connectivity/source/drivers/mork/MDriver.hxx
index 08ecf46..74bb556 100644
--- a/co

Re: [PATCH] Fix for sw_filter_test crash due to ambiguous FieldEntry destructor

[Tor Lillqvist]

> so the future of Mac development is to switch from a working toolchain
> to one hat's fundamentally broken?  sigh...

Well, if "working" means "obsolete and hard to find and install", and
"fundamentally broken" means "some under-specified corner case works
differently than GCC+GNU binutils on ELF+Linux", then yes.

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED 3-6-0] Change in core[libreoffice-3-6]: fdo#39812: Writer: fix collapsing merged table border painti...

[Eike Rathke]

Hi,

On Tuesday, 2012-07-24 14:43:18 +0200, Petr Mladek wrote:

> One more approval is needed.

Found to be working, cherry-picked to 3-6-0
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6-0&id=8e37cd1ebaee3760677e182e4ac117c813208e31

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpqz9gQXUnQv.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6-0' - sw/source

[Eike Rathke]

 sw/source/core/layout/paintfrm.cxx |   39 -
 1 file changed, 26 insertions(+), 13 deletions(-)

New commits:
commit 8e37cd1ebaee3760677e182e4ac117c813208e31
Author: Michael Stahl 
Date:   Mon Jul 23 14:24:31 2012 +0200

fdo#39812: Writer: fix collapsing merged table border painting:

Create a table with a merged cell like in the screenshot in the
bug, with a SAL_DEBUG in SwTabFrmPainter::PaintLines the following
lines are painted:

debug: paint start
1 debug: start: 2749,1488 end: 12387,1488
2 debug: start: 2749,1945 end: 7567,1945
3 debug: start: 7567,1945 end: 12387,1945
4 debug: start: 2749,2015 end: 12387,2015
5 debug: start: 2749,2542 end: 7567,2542
6 debug: start: 7567,2542 end: 12387,2542
7 debug: start: 2749,1488 end: 2749,1945
8 debug: start: 2749,1945 end: 2749,2015
9 debug: start: 2749,2015 end: 2749,2542
A debug: start: 7567,1945 end: 7567,2542
B debug: start: 12387,1488 end: 12387,1945
C debug: start: 12387,1945 end: 12387,2015
D debug: start: 12387,2015 end: 12387,2542
debug: paint end

*1*1*
7   B
7   B
*2*3*
8 A C
*4*4*
9 A D
9 A D
*5*6*

The problem is obviously that the Y coordinates of the lines 2, 3
and 4 differ; they should be on the same Y position.
The problem here is that logically horizontal lines must be painted
not centered but "below" the line, and It turns out that
SwTabFrmPainter::Insert cannot correct the positions properly to
do that, because it only looks at borders in a single cell.

When using the UI to set the borders, we get (for innner table borders)
only a bottom border in the cells, but no top borders, so the
top position of the logically vertical borders needs to be corrected
with the width of the bottom border of the cell _above_; a symmetric
correction of the bottom position to the top border of the cell below
is also necessary.

Fortunately if we just leave the positons alone in Insert then
TabFrmPainter will eliminate duplicate lines with equal positions
and so it's only necessary to correct the positions when actually
painting the line in wTabFrmPainter::PaintLines,
where we have the neighboring lines available.

(cherry picked from commit 02e80d2e431a57ad775a674eb3cfcd6cec53e09f)

Change-Id: Ia8519f6673db0f3a1ecaa68038896cac39609129
Signed-off-by: Miklos Vajna 
(cherry picked from commit a6d01758da37af1d6bab9c14197134ce410d9408)

Signed-off-by: Petr Mladek 
Signed-off-by: Eike Rathke 

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index d26dca7..4d874a1 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2534,6 +2534,28 @@ void SwTabFrmPainter::PaintLines( OutputDevice& rDev, 
const SwRect& rRect ) cons
 aPaintEnd.Y() = aUpperAligned._Bottom();
 }
 
+// logically vertical lines are painted centered on the line,
+// logically horizontal lines are painted "below" the line
+bool const isBelow((mrTabFrm.IsVertical()) ? !bHori : bHori);
+double const offsetStart = (isBelow)
+?   aStyles[0].GetWidth() / 2.0
+:   std::max(aStyles[1].GetWidth(),
+aStyles[3].GetWidth()) / 2.0;
+double const offsetEnd = (isBelow)
+?   aStyles[0].GetWidth() / 2.0
+:   std::max(aStyles[4].GetWidth(),
+aStyles[6].GetWidth()) / 2.0;
+if (mrTabFrm.IsVertical())
+{
+aPaintStart.X() -= static_cast(offsetStart + 0.5);
+aPaintEnd.X()   -= static_cast(offsetEnd   + 0.5);
+}
+else
+{
+aPaintStart.Y() += static_cast(offsetStart + 0.5);
+aPaintEnd.Y()   += static_cast(offsetEnd   + 0.5);
+}
+
 aPaintStart.X() -= nTwipXCorr; // nHalfPixelSzW - 2 to assure 
that we do not leave the pixel
 aPaintEnd.X()   -= nTwipXCorr;
 aPaintStart.Y() -= nTwipYCorr;
@@ -2732,19 +2754,10 @@ void SwTabFrmPainter::Insert( const SwFrm& rFrm, const 
SvxBoxItem& rBoxItem )
 aR.MirrorSelf();
 aB.MirrorSelf();
 
-const SwTwips nHalfBottomWidth = aB.GetWidth() / 2;
-const SwTwips nHalfTopWidth = (bBottomAsTop)
-? nHalfBottomWidth : aT.GetWidth() / 2;
-
-// these are positions of the lines
-const SwTwips nLeft   =
-aBorderRect._Left()  - ((bVert) ? nHalfBottomWidth : 0);
-const SwTwips nRight  =
-aBorderRect._Right() - ((bVert) ? nHalfTopWidth : 0);
-const SwTwips nTop=
-

[Libreoffice-commits] .: 2 commits - svtools/source svx/inc svx/source vcl/inc vcl/source

[Tomaž Vajngerl]

 svtools/source/graphic/grfmgr2.cxx  |  137 -
 svx/inc/svx/compressgraphicdialog.hxx   |6 
 svx/source/dialog/compressgraphicdialog.cxx |  101 +++---
 vcl/inc/vcl/bitmap.hxx  |  112 ---
 vcl/inc/vcl/bitmapex.hxx|5 
 vcl/source/gdi/bitmap3.cxx  |  406 +++-
 vcl/source/gdi/bitmapex.cxx |   42 ++
 7 files changed, 629 insertions(+), 180 deletions(-)

New commits:
commit 53d51dbee6d4037c4cfc3fa743de8dac76da48c6
Author: Tomaž Vajngerl 
Date:   Tue Jul 24 22:01:18 2012 +0200

One pass scale, rotate and crop using bilinear filtering and averaging.

With this commit I reintroduce one pass scale, rotate and crop that
was located in grfmgr2.cxx (now in Bitmap class) and was used for
preparing bitmaps for displaying on screen. By default the combination
of two filters is used: bilinear, which is a similar algorithm than
the "old" one, but with the same result, and averaging algorithm. Bilinear
filtering is used for bitmap enlarging and shrinking till factor 0.6. Below
this bilinear gives bad results because of limited sampling. For such cases
averaging is used which is a simple algorithm for shrinking. In averaging
the algorithm calculates the average of samples which result is the new
pixel. Currently both algorithms are not optimised.

One pass scale, rotate and crop should only be used for displaying of
images.

Change-Id: I5a1330b58a7cbb6fde8546e16c3e8c140afca565

diff --git a/svtools/source/graphic/grfmgr2.cxx 
b/svtools/source/graphic/grfmgr2.cxx
index f072f77..f3b6a07 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -44,7 +44,6 @@
 // - defines -
 // ---
 
-#define MAP( cVal0, cVal1, nFrac )  
((sal_uInt8)long)(cVal0)<<20L)+nFrac*((long)(cVal1)-(cVal0)))>>20L))
 #define WATERMARK_LUM_OFFSET50
 #define WATERMARK_CON_OFFSET-70
 
@@ -267,14 +266,16 @@ sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, 
const Point& rPt,
 
 sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice,
const Point& rPoint, const Size& rSize,
-   const BitmapEx& rBitmapEx, const 
GraphicAttr& rAttr,
-   const sal_uLong nFlags, BitmapEx* 
pBmpEx )
+   const BitmapEx& rBitmapEx, const 
GraphicAttr& rAttributes,
+   const sal_uLong nFlags, BitmapEx* 
pResultBitmapEx )
 {
 boolbRet = false;
 Point   aOutPointInPixels;
 SizeaOutSizeInPixels;
-int nRotation = rAttr.GetRotation() % 3600;
-SizeaUnrotatedSizeInPixels( pOutputDevice->LogicToPixel( rSize ) );
+int nRotation = rAttributes.GetRotation() % 3600;
+
+Point   aUnrotatedPointInPixels( pOutputDevice->LogicToPixel( rPoint ) 
);
+SizeaUnrotatedSizeInPixels(  pOutputDevice->LogicToPixel( rSize ) 
);
 
 BitmapExaBitmapEx( rBitmapEx );
 
@@ -283,69 +284,70 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* 
pOutputDevice,
 
 if( nRotation )
 {
-Polygon aRotationPolygon( Rectangle( rPoint, rSize ) );
-aRotationPolygon.Rotate( rPoint, nRotation );
-const Rectangle aRotationBoundRectangle( 
aRotationPolygon.GetBoundRect() );
-aOutPointInPixels = pOutputDevice->LogicToPixel( 
aRotationBoundRectangle.TopLeft() );
-aOutSizeInPixels = pOutputDevice->LogicToPixel( 
aRotationBoundRectangle.GetSize() );
-
-// rotate the image before further processing
-aBitmapEx.Rotate( nRotation, COL_TRANSPARENT );
+Polygon aPoly( Rectangle( rPoint, rSize ) );
+aPoly.Rotate( rPoint, nRotation );
+const Rectangle aRotationBoundRect( aPoly.GetBoundRect() );
+aOutPointInPixels = pOutputDevice->LogicToPixel( 
aRotationBoundRect.TopLeft() );
+aOutSizeInPixels = pOutputDevice->LogicToPixel( 
aRotationBoundRect.GetSize() );
 }
 else
 {
-aOutPointInPixels = pOutputDevice->LogicToPixel( rPoint );
+aOutPointInPixels = aUnrotatedPointInPixels;
 aOutSizeInPixels = aUnrotatedSizeInPixels;
 }
 
-Point   aOutPoint;
-SizeaOutSize;
-const Size& rBitmapSizePixels = rBitmapEx.GetSizePixel();
-longnStartX(-1), nStartY(-1), nEndX(-1), nEndY(-1);
-boolisHorizontalMirrored = ( rAttr.GetMirrorFlags() & 
BMP_MIRROR_HORZ ) != 0;
-boolisVerticalMirrored   = ( rAttr.GetMirrorFlags() & 
BMP_MIRROR_VERT ) != 0;
+Point   aOutPoint;
+SizeaOutSize;
+
+const Size& rBitmapSizePixels = rBitmapEx.GetSizePixel();
+Rectangle   aCropRectangle(-1, -1, -1, -1);
+boolisHorizontalMirrored = ( rAttributes.GetMirrorFlags() & 
BMP_MIRROR_

Re: [REVIEW 3-6, 3-6-0] fdo#50345 accept empty string as scalar numeric 0 argument

[Eike Rathke]

Hi Kohei,

On Monday, 2012-07-23 22:15:57 -0400, Kohei Yoshida wrote:

> Anyway, in case we change our mind and backport this to 3.6, commits
> 4e8552993aed7caaa247bb1baf6168ddcfba159a through
> 01ee7955fe6d0e25c325717fe7d5dbd56e28983c add an extra configuration
> option to toggle this behavior.

Great, thanks!

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgp7J7kmz3zev.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/remote' - 3 commits - android/sdremote sd/source

[Andrzej J.R. Hunt]

 android/sdremote/res/layout/fragment_presentation.xml  
 |8 
 android/sdremote/res/menu/actionbar_presentation.xml   
 |   17 +
 android/sdremote/res/values/strings.xml
 |6 
 android/sdremote/src/org/libreoffice/impressremote/ActionBarManager.java   
 |   51 +
 android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java   
 |   16 -
 android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java   
 |   90 --
 android/sdremote/src/org/libreoffice/impressremote/TestClient.java 
 |1 
 android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java  
 |   10 +
 android/sdremote/src/org/libreoffice/impressremote/communication/Receiver.java 
 |3 
 
android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java 
|   66 ++-
 android/sdremote/src/pl/polidea/coverflow/CoverFlow.java   
 |2 
 sd/source/ui/remotecontrol/ImagePreparer.cxx   
 |2 
 12 files changed, 234 insertions(+), 38 deletions(-)

New commits:
commit 2c777ebfa6c6a3fea0cbad7ebc8baf4ad44ae907
Author: Andrzej J.R. Hunt 
Date:   Tue Jul 24 21:24:26 2012 +0200

Added basic actionbar code, improved cover flow scaling.

Change-Id: I68dcbf2449ed61f06503442a3621cccb97f1e697

diff --git a/android/sdremote/res/layout/fragment_presentation.xml 
b/android/sdremote/res/layout/fragment_presentation.xml
index 53e7737..2d17759 100644
--- a/android/sdremote/res/layout/fragment_presentation.xml
+++ b/android/sdremote/res/layout/fragment_presentation.xml
@@ -13,10 +13,7 @@
 android:layout_marginTop="5dip"
 coverflow:imageHeight="150dip"
 coverflow:imageWidth="180dip"
-
 coverflow:withReflection="false" />
-
 
 
+android:layout_height="wrap_content" />
 
 
 
\ No newline at end of file
diff --git a/android/sdremote/res/menu/actionbar_presentation.xml 
b/android/sdremote/res/menu/actionbar_presentation.xml
new file mode 100644
index 000..020fae1
--- /dev/null
+++ b/android/sdremote/res/menu/actionbar_presentation.xml
@@ -0,0 +1,17 @@
+
+http://schemas.android.com/apk/res/android"; >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/sdremote/res/values/strings.xml 
b/android/sdremote/res/values/strings.xml
index 668d073..c677dcb 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -2,7 +2,11 @@
 
 
 LibreOffice Remote
-Hello world!
 Settings
 PresentationActivity
+Handle to resize view.
+Blank Screen
+Options
+HH:mm
+h:m:ss
 
\ No newline at end of file
diff --git 
a/android/sdremote/src/org/libreoffice/impressremote/ActionBarManager.java 
b/android/sdremote/src/org/libreoffice/impressremote/ActionBarManager.java
index 44ef183..33ea95c 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/ActionBarManager.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/ActionBarManager.java
@@ -8,11 +8,62 @@
  */
 package org.libreoffice.impressremote;
 
+import org.libreoffice.impressremote.communication.CommunicationService;
+
+import android.content.Context;
+import android.os.Handler;
+import android.text.format.DateFormat;
+import android.view.Menu;
+
 /**
  * Used to manage the action bar whenever a presentation is running.
  *
  */
 public class ActionBarManager {
 
+   private Context mContext;
+   private Menu mMenu;
+   private CommunicationService mCommunicationService;
+
+   /*
+* True if the timer is being used as a timer, false if we are showing a
+* clock.
+*/
+   private boolean mTimerOn = false;
+
+   public ActionBarManager(Context aContext, Menu aMenu,
+   CommunicationService aCommunicationService) {
+   mContext = aContext;
+   mMenu = aMenu;
+   mCommunicationService = aCommunicationService;
+   timerHandler.removeCallbacks(timerUpdateThread);
+   timerHandler.postDelayed(timerUpdateThread, 50);
+   }
+
+   private Handler timerHandler = new Handler();
+
+   private Thread timerUpdateThread = new Thread() {
+
+   @Override
+   public void run() {
+   //  invalidateOptionsMenu();
+   CharSequence aTimeString;
+   long aTime = 
mCommunicationService.getSlideShow().getTimer()
+   .getTimeMillis();
+   if (mTimerOn) {
+   aTimeString = 
DateFormat.format(mContext.getResources()
+   
.getString(R.string.actionbar_timerformat),
+

Re: [PUSHED 3-6-0] Fix for fdo#51943 toolbar floater bug on Mac

[Michael Meeks]

On Tue, 2012-07-24 at 17:52 +0200, Petr Mladek wrote:
> I still could close the color selector by clicking anywhere else => I do
> not see any real-life change in the behavior.

Great :-) wonder-fix Thorsten :-)

Thanks !

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [GSOC-UPDATE](23.7)

[Michael Meeks]

On Mon, 2012-07-23 at 19:28 +0200, Andrzej J. R. Hunt wrote:
> - Styled the Thumbnail Activity.
> - Fixed a bug in the Service, meaning that the thumbnail activity can 
> now control the slideshow.

Nice stuff :-)

> I've also discovered that someone has already implemented a 3d 
> "cover-flow" widget for android, which can probably be used for the main 
> view (apache licenced), which will save me having to implement one myself.

Great to see that.

> (I've also switched to using a 32 bit system on an SSD, which makes 
> things noticeably faster, especially when using git.)

That was a quick switch / upgrade :-) glad performance is better -
hopefully that means more frequent / small commits ? :-)

Good work,

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Need help to locate HSQLDB in Base

[Michael Meeks]

Hi Muhammad,

On Mon, 2012-07-23 at 23:50 +0500, Muhammad Waqas Iftikhar wrote:
> Me and my friends are trying to work on to embedd SQLite under base
> instead of hsqldb.

Interesting ! :-) I think the consensus (or at least Lionel's view
which I trust) is that there will be fundamental problems with a sqlite
backend, due to it missing type support that we will require to make
things work properly. I believe this is explained in bug:

https://bugs.freedesktop.org/show_bug.cgi?id=38811

However - don't despair - there is a nice chunk of work still needed
here, which is to use the Firebird database instead, there is a new bug
to track that here:

https://bugs.freedesktop.org/show_bug.cgi?id=51780

Which perhaps would be interesting ? :-)

> under the "dbaccess" module as well as the code in "connection.cxx"
> file found in the "source/code/dataaccess" folder, also under the
> "dbaccess" module. We've seen how the wizards and the windows for Base
> are initialized and then displayed and how the connection is
> established when the tables are to be accessed. However, we haven't
> been able to locate the portion of code that actually initializes
> HSQLDB. Please give us an idea of how to proceed further.

As David says connectivity/source/drivers/ is the right place to dig at
this. If I were you - I would save myself a lot of time connecting up
the code, fixing the installation, and doing all that tricky / boring
stuff of creating a new connector and plugging it in.

Instead - I would take some existing database backend that is nicely
written and savage it by ripping it's guts out to make it use
firebird :-)

A good choice here might be to hack the code in:

connectivity/source/drivers/mozab/

To expunge the mozilla stuff and make it do what you want :-) then
as/when you make some progress one of us can help split that out and
re-target it to be it's own separate database backend (which is some
tedious busy-work around packaging).

How does that sound ?

Thanks !

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Gerrit question

[Bjoern Michaelsen]

On Tue, Jul 24, 2012 at 02:27:56PM -0400, Kohei Yoshida wrote:
> So, I approved this patch: https://gerrit.libreoffice.org/#/c/337/
> and would like to see this pushed to the fdo master.  But I'm not
> sure if I need to do anything more to make that happen.  Being a
> newbie on gerrit I'd like to know what the next step is for this
> patch.

Just push. Gerrit will notice the change to be pushed (unless you did something
evil like removing the Change-Id). Once we switched to gerrit, even the pushing
wont be needed (gerrit will do it itself).

Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: cppu/source

[Arnaud Versini]

 cppu/source/typelib/typelib.cxx |6 --
 cppu/source/uno/constr.hxx  |4 ++--
 cppu/source/uno/eq.hxx  |   12 ++--
 cppu/source/uno/sequence.cxx|   21 ++---
 4 files changed, 26 insertions(+), 17 deletions(-)

New commits:
commit b8d562018155d7bb961198dc1f1dfd5e7a0d1d62
Author: Arnaud Versini 
Date:   Mon Jul 23 21:17:15 2012 +0200

Use memset and memcmp insteadof rtl_zeroMemory and rtl_compareMemory in cppu

Change-Id: I88976b215bc23ce5001916ccf123bc3561c2a33a

diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 06b0b9f..90f7ba6 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -1735,8 +1735,10 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL 
typelib_typedescription_register(
 pTDR->pType->nSize = (*ppNewDescription)->nSize;
 pTDR->pType->nAlignment = (*ppNewDescription)->nAlignment;
 
-::rtl_zeroMemory(
-*ppNewDescription +1, nSize - sizeof( 
typelib_TypeDescription ) );
+memset(
+*ppNewDescription +1,
+0,
+nSize - sizeof( typelib_TypeDescription ) );
 
 if( pTDR->pType->bOnDemand && !(*ppNewDescription)->bOnDemand )
 {
diff --git a/cppu/source/uno/constr.hxx b/cppu/source/uno/constr.hxx
index 06107ca..dd0343a 100644
--- a/cppu/source/uno/constr.hxx
+++ b/cppu/source/uno/constr.hxx
@@ -19,9 +19,9 @@
 #ifndef CONSTR_HXX
 #define CONSTR_HXX
 
+#include 
 #include "prim.hxx"
 
-
 namespace cppu
 {
 
@@ -90,7 +90,7 @@ inline void _defaultConstructArray(
 case typelib_TypeClass_FLOAT:
 case typelib_TypeClass_DOUBLE:
 case typelib_TypeClass_INTERFACE:
-::rtl_zeroMemory(pMem, nElementSize * nTotalElements);
+memset(pMem, 0, nElementSize * nTotalElements);
 break;
 
 case typelib_TypeClass_STRING:
diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx
index 396a8dc..a270f6e 100644
--- a/cppu/source/uno/eq.hxx
+++ b/cppu/source/uno/eq.hxx
@@ -127,7 +127,7 @@ inline sal_Bool _equalSequence(
 switch (pElementType->eTypeClass)
 {
 case typelib_TypeClass_CHAR:
-return (0 == ::rtl_compareMemory( pDestElements, pSourceElements, 
sizeof(sal_Unicode) * nElements ));
+return (0 == memcmp( pDestElements, pSourceElements, 
sizeof(sal_Unicode) * nElements ));
 case typelib_TypeClass_BOOLEAN:
 {
 for ( sal_Int32 nPos = nElements; nPos--; )
@@ -141,16 +141,16 @@ inline sal_Bool _equalSequence(
 return sal_True;
 }
 case typelib_TypeClass_BYTE:
-return (0 == ::rtl_compareMemory( pDestElements, pSourceElements, 
sizeof(sal_Int8) * nElements ));
+return (0 == memcmp( pDestElements, pSourceElements, sizeof(sal_Int8) 
* nElements ));
 case typelib_TypeClass_SHORT:
 case typelib_TypeClass_UNSIGNED_SHORT:
-return (0 == ::rtl_compareMemory( pDestElements, pSourceElements, 
sizeof(sal_Int16) * nElements ));
+return (0 == memcmp( pDestElements, pSourceElements, sizeof(sal_Int16) 
* nElements ));
 case typelib_TypeClass_LONG:
 case typelib_TypeClass_UNSIGNED_LONG:
-return (0 == ::rtl_compareMemory( pDestElements, pSourceElements, 
sizeof(sal_Int32) * nElements ));
+return (0 == memcmp( pDestElements, pSourceElements, sizeof(sal_Int32) 
* nElements ));
 case typelib_TypeClass_HYPER:
 case typelib_TypeClass_UNSIGNED_HYPER:
-return (0 == ::rtl_compareMemory( pDestElements, pSourceElements, 
sizeof(sal_Int64) * nElements ));
+return (0 == memcmp( pDestElements, pSourceElements, sizeof(sal_Int64) 
* nElements ));
 case typelib_TypeClass_FLOAT:
 {
 for ( sal_Int32 nPos = nElements; nPos--; )
@@ -206,7 +206,7 @@ inline sal_Bool _equalSequence(
 return sal_True;
 }
 case typelib_TypeClass_ENUM:
-return (0 == ::rtl_compareMemory( pDestElements, pSourceElements, 
sizeof(sal_Int32) * nElements ));
+return (0 == memcmp( pDestElements, pSourceElements, sizeof(sal_Int32) 
* nElements ));
 case typelib_TypeClass_STRUCT:
 case typelib_TypeClass_EXCEPTION:
 {
diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx
index a431973..1397a89 100644
--- a/cppu/source/uno/sequence.cxx
+++ b/cppu/source/uno/sequence.cxx
@@ -78,8 +78,9 @@ static inline bool idefaultConstructElements(
 pSeq = reallocSeq( pSeq, sizeof(sal_Unicode), nAlloc );
 if (pSeq != 0)
 {
-::rtl_zeroMemory(
+memset(
 pSeq->elements + (sizeof(sal_Unicode) * nStartIndex),
+0,
 sizeof(sal_Unicode) * (nStopIndex - nStartIndex) );
 }
 break;
@@ -88,8 +89,9 @@ static inline bool idefaultConstructElements(
 pSeq = reallocSeq( pSeq, sizeof(sal_Bool), nAlloc );
 if (pSeq != 0)
 {
-::rtl_

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - hwpfilter/source

[Michael Stahl]

 hwpfilter/source/hwpreader.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 330769828fdf933eb1fb6b504ebbeb5cbe0e0eba
Author: Ivan Timofeev 
Date:   Tue Jul 24 21:17:58 2012 +0400

-Werror=format

Change-Id: If468ca444865f81a7adeabb72ecb6d8647f6dde0
(cherry picked from commit 10f08195b8195640016a6eab42818c662f4541d2)

Signed-off-by: Michael Stahl 

diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 412a966..c726fb6 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -1903,7 +1903,7 @@ void HwpReader::makeTableStyle(Table *tbl)
 // --- row  //
 for (size_t i = 0 ; i < tbl->rows.nCount -1 ; i++)
 {
-sprintf(buf,"Table%d.row%ld",hbox->style.boxnum, i + 1);
+sprintf(buf,"Table%d.row%" SAL_PRI_SIZET "u",hbox->style.boxnum, i + 
1);
 padd(ascii("style:name"), sXML_CDATA, ascii( buf ));
 padd(ascii("style:family"), sXML_CDATA,ascii("table-row"));
 rstartEl(ascii("style:style"), rList);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Gerrit question

[Kohei Yoshida]

Hi there,

So, I approved this patch: https://gerrit.libreoffice.org/#/c/337/ and 
would like to see this pushed to the fdo master.  But I'm not sure if I 
need to do anything more to make that happen.  Being a newbie on gerrit 
I'd like to know what the next step is for this patch.


Thanks a lot,

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED 3-6-0] fdo#52399 Report-Builder does not show any properties

[Bjoern Michaelsen]

On Tue, Jul 24, 2012 at 07:17:02PM +0200, Lionel Elie Mamane wrote:
> On Tue, Jul 24, 2012 at 06:09:34PM +0200, Michael Stahl wrote:
> > On 24/07/12 17:46, Stephan Bergmann wrote:
> >>  "EDITING: 
> >> Report-Builder does not show any properties" is a recent regression 
> >> where some stupid, useless piece of code (that appears to have been 
> >> there "since the beginning") happened to work by accident before.  The 
> >> fix in 
> >> 
> >>  
> >> "fdo#52399: Do not needlessly set DefaultContext of global 
> >> ServiceManager" is to simply remove that useless piece of code so that 
> >> it can no longer cause harm.
> 
> >> Please consider for backporting to libreoffice-3-6 and libreoffice-3-6-0.
> 
> > pushed to libreoffice-3-6, 2 more reviews needed
> 
> Good for libreoffice-3-6-0; one more review needed.

pushed to -3-6-0. Trying to bring the ServiceManager into an identity crisis
sounds like a bad idea.

Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6-0' - reportdesign/source

[Bjoern Michaelsen]

 reportdesign/source/ui/report/propbrw.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 002f9b03c8ccf7ae0dcc346ca6b87454105e3379
Author: Stephan Bergmann 
Date:   Tue Jul 24 17:29:20 2012 +0200

fdo#52399: Do not needlessly set DefaultContext of global ServiceManager

...the new cppuhelper/source/defaultbootstrap.cxx now forbids this nonsense 
with
a PropertyVetoException.  It looks like the code in propbrw.cxx had always 
been
confused about what to do exactly (using xOwnContext as delegate in the 
call to
createComponentContext should just be enough) and the useless re-setting of 
the
global ServiceManager's DefaultContext happened to work by accident.

Change-Id: I80a87fe9b0948d9aa6dc9e2e63497097044a4959
Signed-off-by: Michael Stahl 
Signed-off-by: Lionel Elie Mamane 
Signed-off-by: Bjoern Michaelsen 

diff --git a/reportdesign/source/ui/report/propbrw.cxx 
b/reportdesign/source/ui/report/propbrw.cxx
index 45b4f1a..cb4bd10 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -173,7 +173,6 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >&   
_xORB,Window* pParen
 uno::Reference< uno::XInterface > xDefaultHelpProvider( 
inspection::DefaultHelpProvider::create( m_xInspectorContext, xInspectorUI ) );
 }
 }
-xFactoryProperties->setPropertyValue( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ,makeAny(xOwnContext));
 }
 catch (Exception&)
 {
@@ -182,9 +181,6 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >&   
_xORB,Window* pParen
 {
 ::comphelper::disposeComponent(m_xBrowserController);
 ::comphelper::disposeComponent(m_xBrowserComponentWindow);
-Reference< XPropertySet > xFactoryProperties( m_xORB, 
UNO_QUERY_THROW );
-if ( xOwnContext.is() )
-xFactoryProperties->setPropertyValue( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ,makeAny(xOwnContext));
 }
 catch(Exception&) { }
 m_xBrowserController.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW 3-6][REVIEW 3-6-0] prevent crash in malformed pivot table loaded from .xls

[Eike Rathke]

Hi,

On Tuesday, 2012-07-24 11:31:50 +0200, Eike Rathke wrote:

> Unfortunately I can't provide a testcase document to reproduce this.

Funny (coincidence?) https://bugs.freedesktop.org/show_bug.cgi?id=52447
was submitted today and is fixed by this change.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpqdHL6gbrS7.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=6

Bug 6 depends on bug 52447, which changed state.

Bug 52447 Summary: FILEOPEN particular .xls: EDITING PIVOTTABLE will CRASH
https://bugs.freedesktop.org/show_bug.cgi?id=52447

   What|Old Value   |New Value

 Resolution||FIXED
 Status|NEW |RESOLVED

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: hwpfilter/source

[Ivan Timofeev]

 hwpfilter/source/hwpreader.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 10f08195b8195640016a6eab42818c662f4541d2
Author: Ivan Timofeev 
Date:   Tue Jul 24 21:17:58 2012 +0400

-Werror=format

Change-Id: If468ca444865f81a7adeabb72ecb6d8647f6dde0

diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index d14ef99..ce894ab 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -1893,7 +1893,7 @@ void HwpReader::makeTableStyle(Table *tbl)
 // --- row  //
 for (size_t i = 0 ; i < tbl->rows.nCount -1 ; i++)
 {
-sprintf(buf,"Table%d.row%ld",hbox->style.boxnum, i + 1);
+sprintf(buf,"Table%d.row%" SAL_PRI_SIZET "u",hbox->style.boxnum, i + 
1);
 padd(ascii("style:name"), sXML_CDATA, ascii( buf ));
 padd(ascii("style:family"), sXML_CDATA,ascii("table-row"));
 rstartEl(ascii("style:style"), rList);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: reportdesign/source

[Lionel Elie Mamane]

 reportdesign/source/ui/report/propbrw.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 3d46635bf1e1606e555f64c4b497056d2bc32d36
Author: Lionel Elie Mamane 
Date:   Tue Jul 24 19:22:36 2012 +0200

Debug unhandled exception

Change-Id: I65661ffe5c006529f8ba1f3652a4d997d46c3da2

diff --git a/reportdesign/source/ui/report/propbrw.cxx 
b/reportdesign/source/ui/report/propbrw.cxx
index cb4bd10..3ad3355 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -32,6 +32,7 @@
 #include 
 #include "rptui_slotid.hrc"
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -125,6 +126,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >&   
_xORB,Window* pParen
 catch (Exception&)
 {
 OSL_FAIL("PropBrw::PropBrw: could not create/initialize my frame!");
+DBG_UNHANDLED_EXCEPTION();
 m_xMeAsFrame.clear();
 }
 
@@ -177,6 +179,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >&   
_xORB,Window* pParen
 catch (Exception&)
 {
 OSL_FAIL("PropBrw::PropBrw: could not create/initialize the 
browser controller!");
+DBG_UNHANDLED_EXCEPTION();
 try
 {
 ::comphelper::disposeComponent(m_xBrowserController);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW 3-6-0] fdo#52399 Report-Builder does not show any properties

[Lionel Elie Mamane]

On Tue, Jul 24, 2012 at 06:09:34PM +0200, Michael Stahl wrote:
> On 24/07/12 17:46, Stephan Bergmann wrote:
>>  "EDITING: 
>> Report-Builder does not show any properties" is a recent regression 
>> where some stupid, useless piece of code (that appears to have been 
>> there "since the beginning") happened to work by accident before.  The 
>> fix in 
>> 
>>  
>> "fdo#52399: Do not needlessly set DefaultContext of global 
>> ServiceManager" is to simply remove that useless piece of code so that 
>> it can no longer cause harm.

>> Please consider for backporting to libreoffice-3-6 and libreoffice-3-6-0.

> pushed to libreoffice-3-6, 2 more reviews needed

Good for libreoffice-3-6-0; one more review needed.

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Tinderbox nightlies broken (was Re: No Win builds?)

[Norbert Thiebaud]

On Tue, Jul 24, 2012 at 11:43 AM, Lubos Lunak  wrote:
> On Monday 23 of July 2012, Norbert Thiebaud wrote:
>> On Mon, Jul 23, 2012 at 4:30 AM, Lubos Lunak  wrote:
>> > On Sunday 22 of July 2012, Norbert Thiebaud wrote:
>> >> ... but I used a simple grep +
>> >> sed to extract INPATH=  simpler and most importantly avoid  using
>> >> 'make' on platform for which that may not resolve to a gnumake.
>> >
>> >  You forgot to tell grep what to grep for, so if anybody has updated
>> > after this, please pull again.
>> >
>> >> I added the push of LibO*.zip files in push_nightlies.sh.
>> >
>> >  Is there any point in uploading a .zip file with a Windows build?
>>
>> I suspect that the 2 are exclusive right... so either there is a zip or a
>> msi so push_nightlies.sh should not care and do a best effort
>
>  They are not exclusive. Right now 'make build' creates .msi again after I
> partially reverted the dev-install change, and dev-install builds the .zip .
> So a tinderbox with the latest tinbuild that uploads nightlies and builds
> also tests now presumably uploads both.
>
>  I don't know which one is better (and I think plain build should not create
> either), but as I said, I don't see a reason to upload both.

to provide a choice to the would be tester ?
so he could choose the zip or msi according to what is convenient for him ?

Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Tinderbox nightlies broken (was Re: No Win builds?)

[Lubos Lunak]

On Monday 23 of July 2012, Norbert Thiebaud wrote:
> On Mon, Jul 23, 2012 at 4:30 AM, Lubos Lunak  wrote:
> > On Sunday 22 of July 2012, Norbert Thiebaud wrote:
> >> ... but I used a simple grep +
> >> sed to extract INPATH=  simpler and most importantly avoid  using
> >> 'make' on platform for which that may not resolve to a gnumake.
> >
> >  You forgot to tell grep what to grep for, so if anybody has updated
> > after this, please pull again.
> >
> >> I added the push of LibO*.zip files in push_nightlies.sh.
> >
> >  Is there any point in uploading a .zip file with a Windows build?
>
> I suspect that the 2 are exclusive right... so either there is a zip or a
> msi so push_nightlies.sh should not care and do a best effort

 They are not exclusive. Right now 'make build' creates .msi again after I 
partially reverted the dev-install change, and dev-install builds the .zip . 
So a tinderbox with the latest tinbuild that uploads nightlies and builds 
also tests now presumably uploads both.

 I don't know which one is better (and I think plain build should not create 
either), but as I said, I don't see a reason to upload both.

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] fdo#<47164>:

[Joel Madero]

Sure thing. I'll try to fix it tonight. As for the magic numbers, I agree,
the original way it was done just wasn't good in my opinion and made fixing
it hard and partly redundant. It might take me an extra day or two because
I might try to make it a bit cleaner than it currently is. The original
code linked the size of the arrow with the hot spot which meant to increase
the size of the hotspot you automatically increased the size of the arrow.

As for nX, this was simply copied from the original code. I'll relook at it
but for some reason I remember getting an error when I removed it.

Give me a day or two.

Joel



On Tue, Jul 24, 2012 at 9:23 AM, Ivan Timofeev wrote:

> Hi Joel,
>
>  fdo: #47164:
>>
>
> it should be fdo#47164, otherwise the commit would not be recognized as a
> bug-fix.
>
>   Please enter the commit message for your changes. Lines starting
>>
> > ...
>
> How did you manage to get this lines in the commit message? :) Please
> remove those.
>
>  -pDev->DrawRect( Rectangle( nX+0, nY+0, nX+6, nY+0 ) );
>> +pDev->DrawRect( Rectangle( nX-0, nY+0, nX+6, nY+0 ) );
>>
>
> By the way, such changes make reviewing harder.
>
>
>  +if( ! bLayout )
>> +{
>> +long nDistance = (aInRect.GetHeight() > 10) ? 2 : 1;
>> +DecorationView aDecoView( pDev );
>> +if( bMenuBtnSep )
>> +{
>> +long nX = aInRect.Left() - 3*nDistance;
>> +}
>>
>> +aDecoView.DrawSymbol( aInRect, SYMBOL_SPIN_DOWN, aColor,
>> nStyle );
>> +}
>>
>
> nX is unused (and thus nDistance is unused as well). What was the
> intension here?
>
>
>  @@ -880,13 +900,12 @@ void PushButton::**ImplDrawPushButtonContent(
>> OutputDevice* pDev, sal_uLong nDrawF
>>  DecorationView aDecoView( pDev );
>>  if( bMenuBtnSep )
>>  {
>> -long nX = aInRect.Left() - 2*nDistance;
>> -Point aStartPt( nX, aInRect.Top()+nDistance );
>> +long nX = aInRect.Left() - 3*nDistance;
>> +Point aStartPt( nX+10, aInRect.Top()+nDistance );
>>  Point aEndPt( nX, aInRect.Bottom()-nDistance );
>>  aDecoView.DrawSeparator( aStartPt, aEndPt );
>>  }
>>
>
> the x coordinate is different in the start point and the end point. You
> can see it, run:
>
>  $ export SAL_USE_VCLPLUGIN=gen && ./install/program/soffice
>
>
> I have absolutely no idea of those magic numbers that was there in
> button.cxx, but it seems you adjusted them right, the patch in general
> works fine.
>
> Could you send an updated patch?
>
> Thanks,
>
> Ivan
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] fdo#<47164>:

[Ivan Timofeev]

Hi Joel,


fdo: #47164:


it should be fdo#47164, otherwise the commit would not be recognized as 
a bug-fix.



 Please enter the commit message for your changes. Lines starting

> ...

How did you manage to get this lines in the commit message? :) Please 
remove those.



-pDev->DrawRect( Rectangle( nX+0, nY+0, nX+6, nY+0 ) );
+pDev->DrawRect( Rectangle( nX-0, nY+0, nX+6, nY+0 ) );


By the way, such changes make reviewing harder.



+if( ! bLayout )
+{
+long nDistance = (aInRect.GetHeight() > 10) ? 2 : 1;
+DecorationView aDecoView( pDev );
+if( bMenuBtnSep )
+{
+long nX = aInRect.Left() - 3*nDistance;
+}

+aDecoView.DrawSymbol( aInRect, SYMBOL_SPIN_DOWN, aColor, nStyle );
+}


nX is unused (and thus nDistance is unused as well). What was the 
intension here?




@@ -880,13 +900,12 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice* 
pDev, sal_uLong nDrawF
 DecorationView aDecoView( pDev );
 if( bMenuBtnSep )
 {
-long nX = aInRect.Left() - 2*nDistance;
-Point aStartPt( nX, aInRect.Top()+nDistance );
+long nX = aInRect.Left() - 3*nDistance;
+Point aStartPt( nX+10, aInRect.Top()+nDistance );
 Point aEndPt( nX, aInRect.Bottom()-nDistance );
 aDecoView.DrawSeparator( aStartPt, aEndPt );
 }


the x coordinate is different in the start point and the end point. You 
can see it, run:


 $ export SAL_USE_VCLPLUGIN=gen && ./install/program/soffice


I have absolutely no idea of those magic numbers that was there in 
button.cxx, but it seems you adjusted them right, the patch in general 
works fine.


Could you send an updated patch?

Thanks,

Ivan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] Fix for sw_filter_test crash due to ambiguous FieldEntry destructor

[Stephan Bergmann]

On 07/23/2012 05:28 PM, Stephan Bergmann wrote:

On 07/23/2012 04:40 PM, Michael Stahl wrote:

On 22/07/12 11:25, Kristian Rietveld wrote:

(Please keep me on CC as I am not subscribed to the list)

[...]

that is really not supposed to happen, we really should build everything
with -fvisibility=hidden on all platforms where unnecessarily exported
symbols cause such problems (guess that means everything but Windows).

on master and libreoffice-3-6, in solenv/gbuild/platform/macosx.mk the
-fvisibility=hidden is inside:


ifeq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE)


can you check that that is actually detected properly for your compiler?


Explicitly disabled for Clang on Mac OS X in configure.in, see

"Visibility doesn't seem to work as we want in Apple's Clang."  :(


...and if you revert that (leading to HAVE_GCC_VISIBILITY_FEATURE=TRUE 
and HAVE_GCC_VISIBILITY_BROKEN=TRUE), the build starts to break as e.g. 
libxolo.dylib contains 
__ZN4cppu15WeakImplHelper6IN3com3sun4star8document7XFilterENS3_4lang12XServiceInfoENS4_9XExporterENS6_15XInitializationENS3_9container6XNamedENS6_10XUnoTunnelEE14queryInterfaceERKNS3_3uno4TypeE 
(aka "cppu::WeakImplHelper6com::sun::star::lang::XServiceInfo, com::sun::star::document::XExporter, 
com::sun::star::lang::XInitialization, 
com::sun::star::container::XNamed, 
com::sun::star::lang::XUnoTunnel>::queryInterface(com::sun::star::uno::Type 
const&)") as "t" (nm: non-external text section symbol), causing the 
linking of liblnglo.dylib (module linguistic) to fail with "Undefined 
symbols for architecture i386: 
'cppu::WeakImplHelper6com::sun::star::lang::XServiceInfo, com::sun::star::document::XExporter, 
com::sun::star::lang::XInitialization, 
com::sun::star::container::XNamed, 
com::sun::star::lang::XUnoTunnel>::queryInterface(com::sun::star::uno::Type 
const&)', referenced from: vtable for ConvDicXMLExport in convdicxml.o" etc.


With a Clang 3.1 build on Linux, on the other hand, that queryInterface 
symbol is exported from libxolo.so as "W" (nm: external weak symbol), so 
liblnglo.so can link against it.


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

3.6 beta 1 and beta 2 can't be run on Win XP 32bit and Win 7 64bit

[Ana Stanic]

https://bugs.freedesktop.org/show_bug.cgi?id=52439
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] Fix for sw_filter_test crash due to ambiguous FieldEntry destructor

[Michael Stahl]

On 23/07/12 17:28, Stephan Bergmann wrote:
> On 07/23/2012 04:40 PM, Michael Stahl wrote:
>> On 22/07/12 11:25, Kristian Rietveld wrote:
>>> (Please keep me on CC as I am not subscribed to the list)
> [...]
>> that is really not supposed to happen, we really should build everything
>> with -fvisibility=hidden on all platforms where unnecessarily exported
>> symbols cause such problems (guess that means everything but Windows).
>>
>> on master and libreoffice-3-6, in solenv/gbuild/platform/macosx.mk the
>> -fvisibility=hidden is inside:
>>
>>> ifeq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE)
>>
>> can you check that that is actually detected properly for your compiler?
> 
> Explicitly disabled for Clang on Mac OS X in configure.in, see 
> 
>  
> "Visibility doesn't seem to work as we want in Apple's Clang."  :(

so the future of Mac development is to switch from a working toolchain
to one hat's fundamentally broken?  sigh...

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW 3-6][REVIEW 3-6-0] fdo#52399 Report-Builder does not show any properties

[Michael Stahl]

On 24/07/12 17:46, Stephan Bergmann wrote:
>  "EDITING: 
> Report-Builder does not show any properties" is a recent regression 
> where some stupid, useless piece of code (that appears to have been 
> there "since the beginning") happened to work by accident before.  The 
> fix in 
> 
>  
> "fdo#52399: Do not needlessly set DefaultContext of global 
> ServiceManager" is to simply remove that useless piece of code so that 
> it can no longer cause harm.

it does what? oh. wow.

> Please consider for backporting to libreoffice-3-6 and libreoffice-3-6-0.

pushed to libreoffice-3-6, 2 more reviews needed

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=6

Bug 6 depends on bug 51943, which changed state.

Bug 51943 Summary: OSX: Text color setting is broken
https://bugs.freedesktop.org/show_bug.cgi?id=51943

   What|Old Value   |New Value

 Resolution||FIXED
 Status|NEW |RESOLVED

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - reportdesign/source

[Michael Stahl]

 reportdesign/source/ui/report/propbrw.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit e3f087d9ed753be702503220e1f97a3514d74d62
Author: Stephan Bergmann 
Date:   Tue Jul 24 17:29:20 2012 +0200

fdo#52399: Do not needlessly set DefaultContext of global ServiceManager

...the new cppuhelper/source/defaultbootstrap.cxx now forbids this nonsense 
with
a PropertyVetoException.  It looks like the code in propbrw.cxx had always 
been
confused about what to do exactly (using xOwnContext as delegate in the 
call to
createComponentContext should just be enough) and the useless re-setting of 
the
global ServiceManager's DefaultContext happened to work by accident.

Change-Id: I80a87fe9b0948d9aa6dc9e2e63497097044a4959
(cherry picked from commit c2617e960e1ff9c132af34b11f2e099f04fb46a3)

Signed-off-by: Michael Stahl 

diff --git a/reportdesign/source/ui/report/propbrw.cxx 
b/reportdesign/source/ui/report/propbrw.cxx
index 45b4f1a..cb4bd10 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -173,7 +173,6 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >&   
_xORB,Window* pParen
 uno::Reference< uno::XInterface > xDefaultHelpProvider( 
inspection::DefaultHelpProvider::create( m_xInspectorContext, xInspectorUI ) );
 }
 }
-xFactoryProperties->setPropertyValue( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ,makeAny(xOwnContext));
 }
 catch (Exception&)
 {
@@ -182,9 +181,6 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >&   
_xORB,Window* pParen
 {
 ::comphelper::disposeComponent(m_xBrowserController);
 ::comphelper::disposeComponent(m_xBrowserComponentWindow);
-Reference< XPropertySet > xFactoryProperties( m_xORB, 
UNO_QUERY_THROW );
-if ( xOwnContext.is() )
-xFactoryProperties->setPropertyValue( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ,makeAny(xOwnContext));
 }
 catch(Exception&) { }
 m_xBrowserController.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=6

Rainer Bielefeld  changed:

   What|Removed |Added

 Depends on||52447

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=6

--- Comment #53 from Rainer Bielefeld  
2012-07-24 16:05:19 PDT ---
Add "Bug 52447 - FILEOPEN particular .xls: EDITING PIVOTTABLE will CRASH":
Regression Crash

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: svtools/source

[Lionel Elie Mamane]

 svtools/source/brwbox/editbrowsebox.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6faebe5fb2d57110feabecb5202bcb993c92f4bd
Author: Lionel Elie Mamane 
Date:   Tue Jul 24 17:59:11 2012 +0200

janitorial: C++-style cast instead of legacy C-style cast

Change-Id: I86cd5d87751c5a9dd31a392e2b3847e8f5741524

diff --git a/svtools/source/brwbox/editbrowsebox.cxx 
b/svtools/source/brwbox/editbrowsebox.cxx
index 3560f2d..598c8a5 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -898,7 +898,7 @@ namespace svt
 return sal_False;
 }
 
-EditBrowseBox * pTHIS = (EditBrowseBox *) this;
+EditBrowseBox * pTHIS = const_cast (this);
 
 // save the cell content if
 // a) a selection is beeing made
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/base-preview' - svtools/source

[Lionel Elie Mamane]

 svtools/source/brwbox/editbrowsebox.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6db60dd61764088017381e907bf3e32b02c89feb
Author: Lionel Elie Mamane 
Date:   Tue Jul 24 17:59:11 2012 +0200

janitorial: C++-style cast instead of legacy C-style cast

Change-Id: I86cd5d87751c5a9dd31a392e2b3847e8f5741524

diff --git a/svtools/source/brwbox/editbrowsebox.cxx 
b/svtools/source/brwbox/editbrowsebox.cxx
index 1bf3f97..1625e15 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -900,7 +900,7 @@ namespace svt
 return sal_False;
 }
 
-EditBrowseBox * pTHIS = (EditBrowseBox *) this;
+EditBrowseBox * pTHIS = const_cast (this);
 
 // save the cell content if
 // a) a selection is beeing made
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Why does svtools::EditBrowseBox::IsCursorMoveAllowed paint?

[Lionel Elie Mamane]

On Wed, Jul 18, 2012 at 07:48:43PM +0200, Lionel Elie Mamane wrote:

> Has anybody any clue why svtools::EditBrowseBox::IsCursorMoveAllowed
> needs to call rWindow.Paint()? (...)

> This function, by name, looks like a purely "informative" function,

as is suggested also by its const qualifier...

> that shouldn't really have any side effect, but it seems like it has
> several :-(

as is clearly shown by this:

EditBrowseBox * pTHIS = (EditBrowseBox *) this;

And then using pTHIS to call non-const member functions :-(

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED 3-6-0] Fix for fdo#51943 toolbar floater bug on Mac

[Petr Mladek]

Michael Meeks píše v Út 24. 07. 2012 v 14:25 +0100:
> On Tue, 2012-07-24 at 15:04 +0200, Petr Mladek wrote:
> > >  
> > > http://cgit.freedesktop.org/libreoffice/core/commit/?id=94fdc1e684d691cd63d75685b5a607d35e737dcf
> > 
> > I can confirm that it works fine on Linux => +1
> > 
> > One more approval needed for 3-6-0, preferably from a Windows hacker.
> 
>   As I said to Thorsten on IM, I'm concerned that this means we have to
> manually pop-down the color selector if we don't want to select a color
> (rather than just clicking something else, another drop-down /
> whatever); which seems sub-optimal.

I still could close the color selector by clicking anywhere else => I do
not see any real-life change in the behavior.

>   OTOH - even if that is the case, it seems a lot better than not being
> able to select text colors on OSX :-) so I'm a +1 too for 3.6.0

Exactly. Fridrich does not see any change in the behavior on Windows as
well => pushed into 3-6-0 branch.


Best Regards,
Petr

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Why does svtools::EditBrowseBox::IsCursorMoveAllowed paint?

[Lionel Elie Mamane]

On Thu, Jul 19, 2012 at 12:39:43PM +0100, Michael Meeks wrote:

> On Wed, 2012-07-18 at 19:48 +0200, Lionel Elie Mamane wrote:

>> Has anybody any clue why svtools::EditBrowseBox::IsCursorMoveAllowed
>> needs to call rWindow.Paint()? It causes some pretty stupid behaviour
>> in base, namely:

>   Nope - it looks rather crazy to me. (...)

>> If I apply the attached patch, things get faster in Base (the
>> procedure stops at step 4), but have I broken something else? I don't
>> really have a clue.

I have found out that it breaks the repainting of the current
record/row (in grid view, the green triangle/arrow that points to the
current row).

>   I would be inclined to call:

> virtual voidInvalidate( const Rectangle& rRect, sal_uInt16
> nFlags = 0 );

>   instead of paint there - which -should- defer the rendering until
> everything has settled down :-)

Yes, same performance advantage for Base and seems it does not break
the repainting of the current row indicator. Pushed to master.

http://cgit.freedesktop.org/libreoffice/core/commit/?id=9bd5e75b95d7b380f9be95913c949221dc4c0d67

Thanks for the advice! One more question:

The Paint() call was preceded and followed by:

 pTHIS->bPaintStatus = static_cast< sal_Bool >
 (( GetBrowserFlags() & EBBF_HANDLE_COLUMN_TEXT ) == 
EBBF_HANDLE_COLUMN_TEXT );

and

 pTHIS->bPaintStatus = sal_True;

respectively. Do these lines still make sense after switching to
Invalidate instead of Paint? I guess not, but in doubt I left
them. Please advise (or just remove them).

Actually, if my guess is right, we can remove the bPaintStatus data
member completely, as this code was the only one ever touching it (it
is private to the class) -> one horrible hack less.

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW 3-6][REVIEW 3-6-0] fdo#52399 Report-Builder does not show any properties

[Stephan Bergmann]

 "EDITING: 
Report-Builder does not show any properties" is a recent regression 
where some stupid, useless piece of code (that appears to have been 
there "since the beginning") happened to work by accident before.  The 
fix in 
 
"fdo#52399: Do not needlessly set DefaultContext of global 
ServiceManager" is to simply remove that useless piece of code so that 
it can no longer cause harm.


Please consider for backporting to libreoffice-3-6 and libreoffice-3-6-0.

Thanks,
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6-0' - svx/source

[Petr Mladek]

 svx/source/tbxctrls/linectrl.cxx |5 -
 svx/source/tbxctrls/tbcontrl.cxx |   18 --
 2 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 60ebdce4735f8ecf51a6ddd94786d465f112f334
Author: Thorsten Behrens 
Date:   Tue Jul 24 12:32:56 2012 +0200

Fix fdo#51943 - prevent lose focus event to close popup.

This is a follow-up bandaid for fdo#48096 side-effects, which in
turn was a band-aid for side-effects caused by ooo-build's
toolbar-decorations-svx.diff.

Fix instructs vcl to not auto-close the floater on losefocus events,
which at least on OSX comes _before_ we even see the mouse button
down event.

Change-Id: I21896c4169addffdf2af920a37e0e3786438cc4e
Signed-off-by: Thorsten Behrens 
Signed-off-by: Fridrich Strba 
Signed-off-by: Petr Mladek 

diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 2d649d4..0b75ce7 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -744,7 +744,10 @@ SfxPopupWindow* 
SvxLineEndToolBoxControl::CreatePopupWindow()
 {
 SvxLineEndWindow* pLineEndWin =
 new SvxLineEndWindow( GetId(), m_xFrame, &GetToolBox(), SVX_RESSTR( 
RID_SVXSTR_LINEEND ) );
-pLineEndWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS | 
FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+pLineEndWin->StartPopupMode( &GetToolBox(),
+ FLOATWIN_POPUPMODE_GRABFOCUS |
+ FLOATWIN_POPUPMODE_ALLOWTEAROFF |
+ FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
 pLineEndWin->StartSelection();
 SetPopupWindow( pLineEndWin );
 return pLineEndWin;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 6ff2c51..3e80d55 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2127,7 +2127,7 @@ SfxPopupWindow* 
SvxFontColorToolBoxControl::CreatePopupWindow()
 mLastColor);
 
 pColorWin->StartPopupMode( &GetToolBox(),
-FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+
FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE
 );
 pColorWin->StartSelection();
 SetPopupWindow( pColorWin );
 return pColorWin;
@@ -2203,7 +2203,7 @@ SfxPopupWindow* 
SvxColorToolBoxControl::CreatePopupWindow()
 mLastColor);
 
 pColorWin->StartPopupMode( &GetToolBox(),
-FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+
FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE
 );
 pColorWin->StartSelection();
 SetPopupWindow( pColorWin );
 return pColorWin;
@@ -2331,7 +2331,7 @@ SfxPopupWindow* 
SvxColorExtToolBoxControl::CreatePopupWindow()
 }
 
 pColorWin->StartPopupMode( &GetToolBox(),
-FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+
FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE
 );
 pColorWin->StartSelection();
 SetPopupWindow( pColorWin );
 bChoiceFromPalette = sal_True;
@@ -2459,7 +2459,10 @@ SfxPopupWindow* 
SvxFrameToolBoxControl::CreatePopupWindow()
 SvxFrameWindow_Impl* pFrameWin = new SvxFrameWindow_Impl(
 GetSlotId(), m_xFrame, &GetToolBox() );
 
-pFrameWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS | 
FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+pFrameWin->StartPopupMode( &GetToolBox(),
+   FLOATWIN_POPUPMODE_GRABFOCUS |
+   FLOATWIN_POPUPMODE_ALLOWTEAROFF |
+   FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
 pFrameWin->StartSelection();
 SetPopupWindow( pFrameWin );
 
@@ -2508,7 +2511,10 @@ SfxPopupWindowType 
SvxFrameLineStyleToolBoxControl::GetPopupWindowType() const
 SfxPopupWindow* SvxFrameLineStyleToolBoxControl::CreatePopupWindow()
 {
 SvxLineWindow_Impl* pLineWin = new SvxLineWindow_Impl( GetSlotId(), 
m_xFrame, &GetToolBox() );
-pLineWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS | 
FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+pLineWin->StartPopupMode( &GetToolBox(),
+  FLOATWIN_POPUPMODE_GRABFOCUS |
+  FLOATWIN_POPUPMODE_ALLOWTEAROFF |
+  FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
 SetPopupWindow( pLineWin );
 
 return pLineWin;
@@ -2573,7 +2579,7 @@ SfxPopupWindow* 
SvxFrameLineColorToolBoxControl::CreatePopupWindow()
 mLastColor);
 
 pColorWin->StartPopupMode( &GetToolBox(),
-FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+
FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE
 );
 pColorWin->StartSelect

[Libreoffice-commits] .: reportdesign/source

[Stephan Bergmann]

 reportdesign/source/ui/report/propbrw.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit c2617e960e1ff9c132af34b11f2e099f04fb46a3
Author: Stephan Bergmann 
Date:   Tue Jul 24 17:29:20 2012 +0200

fdo#52399: Do not needlessly set DefaultContext of global ServiceManager

...the new cppuhelper/source/defaultbootstrap.cxx now forbids this nonsense 
with
a PropertyVetoException.  It looks like the code in propbrw.cxx had always 
been
confused about what to do exactly (using xOwnContext as delegate in the 
call to
createComponentContext should just be enough) and the useless re-setting of 
the
global ServiceManager's DefaultContext happened to work by accident.

Change-Id: I80a87fe9b0948d9aa6dc9e2e63497097044a4959

diff --git a/reportdesign/source/ui/report/propbrw.cxx 
b/reportdesign/source/ui/report/propbrw.cxx
index 45b4f1a..cb4bd10 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -173,7 +173,6 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >&   
_xORB,Window* pParen
 uno::Reference< uno::XInterface > xDefaultHelpProvider( 
inspection::DefaultHelpProvider::create( m_xInspectorContext, xInspectorUI ) );
 }
 }
-xFactoryProperties->setPropertyValue( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ,makeAny(xOwnContext));
 }
 catch (Exception&)
 {
@@ -182,9 +181,6 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >&   
_xORB,Window* pParen
 {
 ::comphelper::disposeComponent(m_xBrowserController);
 ::comphelper::disposeComponent(m_xBrowserComponentWindow);
-Reference< XPropertySet > xFactoryProperties( m_xORB, 
UNO_QUERY_THROW );
-if ( xOwnContext.is() )
-xFactoryProperties->setPropertyValue( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ,makeAny(xOwnContext));
 }
 catch(Exception&) { }
 m_xBrowserController.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svtools/source

[Lionel Elie Mamane]

 svtools/source/brwbox/editbrowsebox.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 9bd5e75b95d7b380f9be95913c949221dc4c0d67
Author: Lionel Elie Mamane 
Date:   Tue Jul 24 17:15:55 2012 +0200

forcing repaint has catastrophic performance implications; invalidate only

In Base:
1) Open a big table (hundreds of rows)
2) Only the first 40 to 100 rows are fetched into the cache and shown
   (depending on screen / window size).
3) Move to last row (click on icon |>|)
4) The last 40 to 100 rows are fetched into the cache; the data of the
   first 40/100 rows is pushed out of the cache.
5) The first 40 to 100 rows are fetched, just so that the call to
   rWindow.Paint() can do its job, because they are not in the cache
   anymore (!). The last 40/100 rows are pushed out of the cache.
6) The last 40 to 100 rows are fetched into the cache and displayed;
   the first 40/100 rows are pushed out of the cache *again*.

Steps 5 and 6 are obviously *very* stupid.

Change-Id: Ic11b893ea9440c2c5a142bd3c77c95d6730aa723

diff --git a/svtools/source/brwbox/editbrowsebox.cxx 
b/svtools/source/brwbox/editbrowsebox.cxx
index 129b9f4..3560f2d 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -927,8 +927,6 @@ namespace svt
 if (nNewRow != nEditRow)
 {
 Window& rWindow = GetDataWindow();
-// don't paint too much
-// update the status immediatly if possible
 if ((nEditRow >= 0) && (GetBrowserFlags() & 
EBBF_NO_HANDLE_COLUMN_CONTENT) == 0)
 {
 Rectangle aRect = GetFieldRectPixel(nEditRow, 0, sal_False );
@@ -937,7 +935,7 @@ namespace svt
 // probably because it is part of a bitfield
 pTHIS->bPaintStatus = static_cast< sal_Bool >
 (( GetBrowserFlags() & EBBF_HANDLE_COLUMN_TEXT ) == 
EBBF_HANDLE_COLUMN_TEXT );
-rWindow.Paint(aRect);
+rWindow.Invalidate(aRect);
 pTHIS->bPaintStatus = sal_True;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/bin

[Jan Holesovsky]

 solenv/bin/make_installer.pl  |2 +-
 solenv/bin/modules/installer/control.pm   |   16 +++-
 solenv/bin/modules/installer/globals.pm   |2 +-
 solenv/bin/modules/installer/windows/msiglobal.pm |2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit e8ddf693e69ea768e4cb1bd4c0445990149af07d
Author: Jan Holesovsky 
Date:   Tue Jul 24 17:29:28 2012 +0200

Cross-compiling-msi-related changes; not finished.

Change-Id: Ib0d3d43a291f01c4c0d9c5adb0055c180b3ab40a

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index e58bd4d..1a7dd57 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -261,7 +261,7 @@ if (!($installer::globals::is_copy_only_project)) { 
installer::ziplist::set_manu
 # Checking version of makecab.exe
 ##
 
-if ( $installer::globals::iswindowsbuild && (!defined($ENV{'CROSS_COMPILING'}) 
|| $ENV{'CROSS_COMPILING'} ne 'YES' || $ENV{'PKGFORMAT'} eq 'msi')) { 
installer::control::check_makecab_version(); }
+if ( $installer::globals::iswindowsbuild && (!defined($ENV{'CROSS_COMPILING'}) 
|| $ENV{'CROSS_COMPILING'} ne 'YES' || $installer::globals::packageformat eq 
'msi')) { installer::control::check_makecab_version(); }
 
 ##
 # Getting the include path from the settings in zip list
diff --git a/solenv/bin/modules/installer/control.pm 
b/solenv/bin/modules/installer/control.pm
index efc6331..57659a1 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -79,6 +79,12 @@ sub check_system_path
 # All platforms: zip
 # Windows only: "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", 
"msitran.exe", "expand.exe" for msi database and packaging
 
+if ($ENV{'CROSS_COMPILING'} eq 'YES')
+{
+# we build our own msi* etc. tools when cross-compiling
+$ENV{'PATH'} .= $installer::globals::pathseparator . 
$ENV{'OUTDIR_FOR_BUILD'} . '/bin';
+}
+
 my $onefile;
 my $error = 0;
 my $pathvariable = $ENV{'PATH'};
@@ -103,7 +109,11 @@ sub check_system_path
 
 if (($installer::globals::iswin) && ($installer::globals::iswindowsbuild))
 {
-@needed_files_in_path = ("zip.exe", "msiinfo.exe", "msidb.exe", 
"uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe");
+@needed_files_in_path = ("zip.exe", "msiinfo.exe", "msidb.exe", 
"uuidgen", "makecab.exe", "msitran.exe", "expand.exe");
+}
+elsif ($installer::globals::isunix && $installer::globals::packageformat 
eq 'msi')
+{
+@needed_files_in_path = ("zip", "msiinfo.exe", "msidb.exe", "uuidgen", 
"makecab.exe", "msitran.exe", "cabextract");
 }
 elsif ($installer::globals::iswin)
 {
@@ -168,6 +178,10 @@ sub get_makecab_version
 my $makecabversion = -1;
 
 my $systemcall = "makecab.exe |";
+if ( $installer::globals::isunix )
+{
+$systemcall = "$ENV{'OUTDIR_FOR_BUILD'}/bin/makecab.exe |";
+}
 my @makecaboutput = ();
 
 open (CAB, $systemcall);
diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index ddc2e21..09b3b2d 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -462,7 +462,7 @@ BEGIN
 $libextension = "\.dll";
 $isunix = 0;
 $iswin = 1;
-$archiveformat = ".zip";
+$archiveformat = ".zip";
 %savedmapping = ();
 %savedrevmapping = ();
 %savedrev83mapping = ();
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm 
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 93cc78c..e9bd828 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1272,7 +1272,7 @@ sub get_guid_list
 # "-c" for uppercase output
 
 my $systemcall = "$uuidgen -n$number |";
-if ( $ENV{'CROSS_COMPILING'} eq 'YES' )
+if ( $installer::globals::isunix )
 {
 # -n is not present in the non-windows uuidgen
 $systemcall = "for I in `seq 1 $number` ; do uuidgen ; done |";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/base-preview'

[Lionel Elie Mamane]

New branch 'feature/base-preview' available with the following commits:
commit 818520eac34401410529f1e884953bd9f75a4c7f
Author: Lionel Elie Mamane 
Date:   Mon Jul 23 16:05:25 2012 +0200

TODO fdo#52179

Change-Id: I3144087cfe60b15a38853460f15a39ec730f0bf4

commit 085ee861c5c4ea44b99ef5aafe1e618ae0ba8db0
Author: Lionel Elie Mamane 
Date:   Tue Jul 24 17:15:55 2012 +0200

forcing repaint has catastrophic performance implications; invalidate only

In Base:
1) Open a big table (hundreds of rows)
2) Only the first 40 to 100 rows are fetched into the cache and shown
   (depending on screen / window size).
3) Move to last row (click on icon |>|)
4) The last 40 to 100 rows are fetched into the cache; the data of the
   first 40/100 rows is pushed out of the cache.
5) The first 40 to 100 rows are fetched, just so that the call to
   rWindow.Paint() can do its job, because they are not in the cache
   anymore (!). The last 40/100 rows are pushed out of the cache.
6) The last 40 to 100 rows are fetched into the cache and displayed;
   the first 40/100 rows are pushed out of the cache *again*.

Steps 5 and 6 are obviously *very* stupid.

Change-Id: Ic11b893ea9440c2c5a142bd3c77c95d6730aa723

commit 82ee17eba45644799d8ded525b05da2abfea7b46
Author: Terrence Enger 
Date:   Wed Jul 18 14:46:11 2012 -0400

stop some leaked statement handles

Change-Id: I06764e0569ea615e66de6cd5946614c7c538e60e
Signed-off-by: Lionel Elie Mamane 

commit d36731c1f07d2b53c630577bdaa346ef0222140d
Author: Terrence Enger 
Date:   Wed Jul 18 14:46:11 2012 -0400

ODBMetaDataRS ctor: abort if statement handle allocation failed

Change-Id: Ieac069565bbc14c909eeecf3e67588191191992f
Signed-off-by: Lionel Elie Mamane 

commit 9c378687dcf789172d07cb404325972c1e73277d
Author: Terrence Enger 
Date:   Wed Jul 18 14:46:11 2012 -0400

avoid freeing the NULL handle

Change-Id: Id3f22bacfbf5e582656cc8ac38d60b781a25b4c3
Signed-off-by: Lionel Elie Mamane 

commit a07ebb18fa904bf0b0b56ed4139c9189ce9b03f5
Author: Lionel Elie Mamane 
Date:   Mon Jul 16 23:58:18 2012 +0200

fdo#51239 refresh row lazily (when data is requested)

This avoids fetching data that will not be requested when the "cursor" is 
only moved and no data requested. That is typically what RowSetCache does when 
its own cursor is moved within its window.

This basically makes the whole {next,previous,absolute,...}_checked story 
obsolete, by basically always being as fast as the i_bFetchRow==false case, but 
in a safer way.

Change-Id: I89eaf277069736b3077bde8b45325929db290f2d

commit b280519ed8f059e44625ca59689fb7d4026c3194
Author: Lionel Elie Mamane 
Date:   Thu Jul 12 23:28:10 2012 +0200

errors to stderr

Change-Id: I01756622dd7700d3918d156f118cd69c8a15879a

commit 00aa439708f92e639e6d0f5bf645b70bb53f
Author: Lionel Elie Mamane 
Date:   Thu Jul 12 18:10:14 2012 +0200

debug unexpected exception

Change-Id: I404072caf6ddab0ed833586066507c7d332fcea4

commit 874159195233acb07a8817658735784e0a36b0cd
Author: Lionel Elie Mamane 
Date:   Thu Jul 12 13:07:03 2012 +0200

fix hsqldb java version detection

1) The values were not properly exclusive.
   E.g. when compiling under OpenJDK 1.6, iscjava12 was set (!)

2) On Java 1.6, should not enable the parts that are (only) for Java7!

3) When non-JAVA7, need to preprocess the files that have JAVA7-only code, 
so that it gets removed

Change-Id: I99b6bd9e781fee1007a04a4dc3d3f952c1b2eb00

commit 677c403068d8274821e508b5c35a14ecafc55c23
Author: Lionel Elie Mamane 
Date:   Tue Jul 3 20:17:01 2012 +0200

embedded HSQLDB: reclaim space occupied by deleted rows

Disadvantage is that saving/closing the file may take a significantly 
longer time

Change-Id: I1cc35c34b49e60d73e8d341549c5a3c5ef314b6d

commit 5ed9ae4933650e169eec6f23ce3f9322986076ca
Author: Lionel Elie Mamane 
Date:   Mon Jul 2 19:33:38 2012 +0200

LEM notes

Change-Id: I16939e5d6e1f7c0a83f7f2b2dbc9a5b397b45c36

commit ab1b641c394f63d418eba2cb13748a9a93285168
Author: Lionel Elie Mamane 
Date:   Mon Jul 2 14:48:03 2012 +0200

janitorial: remove unused xParamsAsNames variable

Change-Id: Ic4fe24faf75d38a8123a8f0e8304c054760bad85

commit 84ed380543b17dcd9def1d69e3a0c7836ff7894b
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:28:50 2012 +0200

legacy reports: unify treatment of query and table

In *both* cases, the value of hidden control "Sorting" (if non-empty)
decides the columns being sorted on.

Change-Id: I7f4b50c3af8c12e48e5dedd36b5877ad7a9e1b66

commit fec7c41fe6af8cbba40c8c532635da65f5e00430
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:26:58 2012 +0200

legacy report wizard: when source is table, save name in QueryName

Change-Id: Ie0bdbed9578b95f7fccc3d9ff6d9c8b5b91ac0ab

commit 600856b94

[Libreoffice-commits] .: Branch 'feature/base-preview' - 0 commits -

[Lionel Elie Mamane]

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] Changes to 'feature/base-preview'

[Lionel Elie Mamane]

New branch 'feature/base-preview' available with the following commits:
commit c85495ff5839da63885d1d7f90b7369747907a78
Author: Lionel Elie Mamane 
Date:   Tue Jul 24 17:15:55 2012 +0200

forcing repaint has catastrophic performance implications; invalidate only

In Base:
1) Open a big table (hundreds of rows)
2) Only the first 40 to 100 rows are fetched into the cache and shown
   (depending on screen / window size).
3) Move to last row (click on icon |>|)
4) The last 40 to 100 rows are fetched into the cache; the data of the
   first 40/100 rows is pushed out of the cache.
5) The first 40 to 100 rows are fetched, just so that the call to
   rWindow.Paint() can do its job, because they are not in the cache
   anymore (!). The last 40/100 rows are pushed out of the cache.
6) The last 40 to 100 rows are fetched into the cache and displayed;
   the first 40/100 rows are pushed out of the cache *again*.

Steps 5 and 6 are obviously *very* stupid.

Change-Id: Ic11b893ea9440c2c5a142bd3c77c95d6730aa723

commit 564aa105f27368c7af0e2199e617560f588a9d95
Author: Lionel Elie Mamane 
Date:   Mon Jul 23 16:05:25 2012 +0200

TODO fdo#TODO

Change-Id: I3144087cfe60b15a38853460f15a39ec730f0bf4

commit 82ee17eba45644799d8ded525b05da2abfea7b46
Author: Terrence Enger 
Date:   Wed Jul 18 14:46:11 2012 -0400

stop some leaked statement handles

Change-Id: I06764e0569ea615e66de6cd5946614c7c538e60e
Signed-off-by: Lionel Elie Mamane 

commit d36731c1f07d2b53c630577bdaa346ef0222140d
Author: Terrence Enger 
Date:   Wed Jul 18 14:46:11 2012 -0400

ODBMetaDataRS ctor: abort if statement handle allocation failed

Change-Id: Ieac069565bbc14c909eeecf3e67588191191992f
Signed-off-by: Lionel Elie Mamane 

commit 9c378687dcf789172d07cb404325972c1e73277d
Author: Terrence Enger 
Date:   Wed Jul 18 14:46:11 2012 -0400

avoid freeing the NULL handle

Change-Id: Id3f22bacfbf5e582656cc8ac38d60b781a25b4c3
Signed-off-by: Lionel Elie Mamane 

commit a07ebb18fa904bf0b0b56ed4139c9189ce9b03f5
Author: Lionel Elie Mamane 
Date:   Mon Jul 16 23:58:18 2012 +0200

fdo#51239 refresh row lazily (when data is requested)

This avoids fetching data that will not be requested when the "cursor" is 
only moved and no data requested. That is typically what RowSetCache does when 
its own cursor is moved within its window.

This basically makes the whole {next,previous,absolute,...}_checked story 
obsolete, by basically always being as fast as the i_bFetchRow==false case, but 
in a safer way.

Change-Id: I89eaf277069736b3077bde8b45325929db290f2d

commit b280519ed8f059e44625ca59689fb7d4026c3194
Author: Lionel Elie Mamane 
Date:   Thu Jul 12 23:28:10 2012 +0200

errors to stderr

Change-Id: I01756622dd7700d3918d156f118cd69c8a15879a

commit 00aa439708f92e639e6d0f5bf645b70bb53f
Author: Lionel Elie Mamane 
Date:   Thu Jul 12 18:10:14 2012 +0200

debug unexpected exception

Change-Id: I404072caf6ddab0ed833586066507c7d332fcea4

commit 874159195233acb07a8817658735784e0a36b0cd
Author: Lionel Elie Mamane 
Date:   Thu Jul 12 13:07:03 2012 +0200

fix hsqldb java version detection

1) The values were not properly exclusive.
   E.g. when compiling under OpenJDK 1.6, iscjava12 was set (!)

2) On Java 1.6, should not enable the parts that are (only) for Java7!

3) When non-JAVA7, need to preprocess the files that have JAVA7-only code, 
so that it gets removed

Change-Id: I99b6bd9e781fee1007a04a4dc3d3f952c1b2eb00

commit 677c403068d8274821e508b5c35a14ecafc55c23
Author: Lionel Elie Mamane 
Date:   Tue Jul 3 20:17:01 2012 +0200

embedded HSQLDB: reclaim space occupied by deleted rows

Disadvantage is that saving/closing the file may take a significantly 
longer time

Change-Id: I1cc35c34b49e60d73e8d341549c5a3c5ef314b6d

commit 5ed9ae4933650e169eec6f23ce3f9322986076ca
Author: Lionel Elie Mamane 
Date:   Mon Jul 2 19:33:38 2012 +0200

LEM notes

Change-Id: I16939e5d6e1f7c0a83f7f2b2dbc9a5b397b45c36

commit ab1b641c394f63d418eba2cb13748a9a93285168
Author: Lionel Elie Mamane 
Date:   Mon Jul 2 14:48:03 2012 +0200

janitorial: remove unused xParamsAsNames variable

Change-Id: Ic4fe24faf75d38a8123a8f0e8304c054760bad85

commit 84ed380543b17dcd9def1d69e3a0c7836ff7894b
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:28:50 2012 +0200

legacy reports: unify treatment of query and table

In *both* cases, the value of hidden control "Sorting" (if non-empty)
decides the columns being sorted on.

Change-Id: I7f4b50c3af8c12e48e5dedd36b5877ad7a9e1b66

commit fec7c41fe6af8cbba40c8c532635da65f5e00430
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:26:58 2012 +0200

legacy report wizard: when source is table, save name in QueryName

Change-Id: Ie0bdbed9578b95f7fccc3d9ff6d9c8b5b91ac0ab

commit 600856b94c

[Libreoffice-commits] .: Branch 'feature/base-preview' - 0 commits -

[Lionel Elie Mamane]

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] .: 9 commits - writerfilter/source

[Miklos Vajna]

 writerfilter/source/rtftok/rtfcontrolwords.cxx |2 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |  263 -
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |   30 ++
 3 files changed, 161 insertions(+), 134 deletions(-)

New commits:
commit 2e5fcf43328cefc099b6766d9d06169756d25761
Author: Miklos Vajna 
Date:   Tue Jul 24 17:17:18 2012 +0200

import RTF_MTYPE

Change-Id: I9414c9af69aa721a84e08fd323bc1efd5bd6c887

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 8b1977a..6e2a886 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -965,6 +965,7 @@ void RTFDocumentImpl::text(OUString& rString)
 case DESTINATION_MENDCHR:
 case DESTINATION_MSUBHIDE:
 case DESTINATION_MSUPHIDE:
+case DESTINATION_MTYPE:
 m_aStates.top().aDestinationText.append(rString);
 break;
 case DESTINATION_EQINSTRUCTION:
@@ -1422,6 +1423,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword 
nKeyword)
 case RTF_MVERTJC: m_aStates.top().nDestinationState = 
DESTINATION_MVERTJC; break;
 case RTF_MSTRIKEH: m_aStates.top().nDestinationState = 
DESTINATION_MSTRIKEH; break;
 case RTF_MDEGHIDE: m_aStates.top().nDestinationState = 
DESTINATION_MDEGHIDE; break;
+case RTF_MTYPE: m_aStates.top().nDestinationState = DESTINATION_MTYPE; 
break;
 case RTF_MHIDETOP:
 case RTF_MHIDEBOT:
 case RTF_MHIDELEFT:
@@ -3628,6 +3630,7 @@ int RTFDocumentImpl::popState()
 case DESTINATION_MENDCHR: if (!nMathToken) nMathToken = M_TOKEN(endChr);
 case DESTINATION_MSUBHIDE: if (!nMathToken) nMathToken = M_TOKEN(subHide);
 case DESTINATION_MSUPHIDE: if (!nMathToken) nMathToken = M_TOKEN(supHide);
+case DESTINATION_MTYPE: if (!nMathToken) nMathToken = M_TOKEN(type);
 {
 oox::formulaimport::XmlStream::AttributeList aAttribs;
 aAttribs[M_TOKEN(val)] = 
m_aStates.top().aDestinationText.makeStringAndClear();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 52c40f7..e5164e5 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -173,6 +173,7 @@ namespace writerfilter {
 DESTINATION_MSSUBSUPPR,
 DESTINATION_MSPRE,
 DESTINATION_MSPREPR,
+DESTINATION_MTYPE,
 };
 
 enum RTFBorderState
commit 5debe1aa463ca74851f68457957803624bd083ac
Author: Miklos Vajna 
Date:   Tue Jul 24 17:04:41 2012 +0200

RTFDocumentImpl::popState: clean up duplicated list of DESTINATION_M* cases

Change-Id: I7806a9dc897c0187fd523d480e6366925676287b

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 0f5e0a0..8b1977a 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3217,6 +3217,7 @@ int RTFDocumentImpl::popState()
 bool bFaltEnd = false;
 bool bPopFrame = false;
 RTFParserState aState(m_aStates.top());
+sal_Int32 nMathToken = 0;
 
 switch (m_aStates.top().nDestinationState)
 {
@@ -3618,34 +3619,20 @@ int RTFDocumentImpl::popState()
 case DESTINATION_MDEN: m_aMathBuffer.appendClosingTag(M_TOKEN(den)); break;
 case DESTINATION_MACC: m_aMathBuffer.appendClosingTag(M_TOKEN(acc)); break;
 case DESTINATION_MACCPR: m_aMathBuffer.appendClosingTag(M_TOKEN(accPr)); 
break;
-case DESTINATION_MCHR:
-case DESTINATION_MPOS:
-case DESTINATION_MVERTJC:
-case DESTINATION_MSTRIKEH:
-case DESTINATION_MDEGHIDE:
-case DESTINATION_MBEGCHR:
-case DESTINATION_MENDCHR:
-case DESTINATION_MSUBHIDE:
-case DESTINATION_MSUPHIDE:
+case DESTINATION_MCHR: if (!nMathToken) nMathToken = M_TOKEN(chr);
+case DESTINATION_MPOS: if (!nMathToken) nMathToken = M_TOKEN(pos);
+case DESTINATION_MVERTJC: if (!nMathToken) nMathToken = M_TOKEN(vertJc);
+case DESTINATION_MSTRIKEH: if (!nMathToken) nMathToken = M_TOKEN(strikeH);
+case DESTINATION_MDEGHIDE: if (!nMathToken) nMathToken = M_TOKEN(degHide);
+case DESTINATION_MBEGCHR: if (!nMathToken) nMathToken = M_TOKEN(begChr);
+case DESTINATION_MENDCHR: if (!nMathToken) nMathToken = M_TOKEN(endChr);
+case DESTINATION_MSUBHIDE: if (!nMathToken) nMathToken = M_TOKEN(subHide);
+case DESTINATION_MSUPHIDE: if (!nMathToken) nMathToken = M_TOKEN(supHide);
 {
 oox::formulaimport::XmlStream::AttributeList aAttribs;
 aAttribs[M_TOKEN(val)] = 
m_aStates.top().aDestinationText.makeStringAndClear();
-sal_Int32 nToken = 0;
-switch (m_aStates.top().nDestinationState)
-{
-case DESTINATION_MCHR: nToken = M_TOKEN(chr); break;
-case DESTINATION_MPOS: nToken = M_TOKEN(pos); break;
-case DESTI

Make bundling Microsoft_VC100_CRT_x86.msm truly optional

[Stephan Bergmann]

 
"Make bundling Microsoft_VC100_CRT_x86.msm truly optional" should 
prevent builds from failing on machines where no 
Microsoft_VC100_CRT_x86.msm is available.


However, I could not check whether it does not cause any regressions on 
machines that /do/ have Microsoft_VC100_CRT_x86.msm (i.e., would stop 
bundling it there and break 
 "LibreOffice says 
that Java runtime JRE 1.7 on Windows is defective" again).  If anybody 
with such a machine could please have a look...


Thanks,
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] Changes to 'feature/base-preview'

[Lionel Elie Mamane]

New branch 'feature/base-preview' available with the following commits:
commit beb9623bc6d27415c68901ba0b46c3be068fbbfc
Author: Lionel Elie Mamane 
Date:   Mon Jul 23 16:05:25 2012 +0200

TODO fdo#TODO

Change-Id: I3144087cfe60b15a38853460f15a39ec730f0bf4

commit 3271eef49c7686069291531232fcec2e865f54ad
Author: Terrence Enger 
Date:   Wed Jul 18 14:46:11 2012 -0400

stop some leaked statement handles

Change-Id: I06764e0569ea615e66de6cd5946614c7c538e60e
Signed-off-by: Lionel Elie Mamane 

commit 9de2c5a7107360a05853bfadb32989897690c3c8
Author: Terrence Enger 
Date:   Wed Jul 18 14:46:11 2012 -0400

ODBMetaDataRS ctor: abort if statement handle allocation failed

Change-Id: Ieac069565bbc14c909eeecf3e67588191191992f
Signed-off-by: Lionel Elie Mamane 

commit 362e423b08721b5908a29d68d9899ce87da2
Author: Terrence Enger 
Date:   Wed Jul 18 14:46:11 2012 -0400

avoid freeing the NULL handle

Change-Id: Id3f22bacfbf5e582656cc8ac38d60b781a25b4c3
Signed-off-by: Lionel Elie Mamane 

commit ca28fd45995ca051a0a8bf7cb3eb9d0bbb959653
Author: Lionel Elie Mamane 
Date:   Wed Jul 18 19:34:19 2012 +0200

why the hell does this need to paint?

Problematic for Base because when moving, it causes:
1) Fetch new data
2)Fetch old data
3)Fetch new data
Obviously, 2) and 3) are completely pointless

Change-Id: Ie3cc4f13b0b033965e51ced0eb3700bd2aad8028

commit a07ebb18fa904bf0b0b56ed4139c9189ce9b03f5
Author: Lionel Elie Mamane 
Date:   Mon Jul 16 23:58:18 2012 +0200

fdo#51239 refresh row lazily (when data is requested)

This avoids fetching data that will not be requested when the "cursor" is 
only moved and no data requested. That is typically what RowSetCache does when 
its own cursor is moved within its window.

This basically makes the whole {next,previous,absolute,...}_checked story 
obsolete, by basically always being as fast as the i_bFetchRow==false case, but 
in a safer way.

Change-Id: I89eaf277069736b3077bde8b45325929db290f2d

commit b280519ed8f059e44625ca59689fb7d4026c3194
Author: Lionel Elie Mamane 
Date:   Thu Jul 12 23:28:10 2012 +0200

errors to stderr

Change-Id: I01756622dd7700d3918d156f118cd69c8a15879a

commit 00aa439708f92e639e6d0f5bf645b70bb53f
Author: Lionel Elie Mamane 
Date:   Thu Jul 12 18:10:14 2012 +0200

debug unexpected exception

Change-Id: I404072caf6ddab0ed833586066507c7d332fcea4

commit 874159195233acb07a8817658735784e0a36b0cd
Author: Lionel Elie Mamane 
Date:   Thu Jul 12 13:07:03 2012 +0200

fix hsqldb java version detection

1) The values were not properly exclusive.
   E.g. when compiling under OpenJDK 1.6, iscjava12 was set (!)

2) On Java 1.6, should not enable the parts that are (only) for Java7!

3) When non-JAVA7, need to preprocess the files that have JAVA7-only code, 
so that it gets removed

Change-Id: I99b6bd9e781fee1007a04a4dc3d3f952c1b2eb00

commit 677c403068d8274821e508b5c35a14ecafc55c23
Author: Lionel Elie Mamane 
Date:   Tue Jul 3 20:17:01 2012 +0200

embedded HSQLDB: reclaim space occupied by deleted rows

Disadvantage is that saving/closing the file may take a significantly 
longer time

Change-Id: I1cc35c34b49e60d73e8d341549c5a3c5ef314b6d

commit 5ed9ae4933650e169eec6f23ce3f9322986076ca
Author: Lionel Elie Mamane 
Date:   Mon Jul 2 19:33:38 2012 +0200

LEM notes

Change-Id: I16939e5d6e1f7c0a83f7f2b2dbc9a5b397b45c36

commit ab1b641c394f63d418eba2cb13748a9a93285168
Author: Lionel Elie Mamane 
Date:   Mon Jul 2 14:48:03 2012 +0200

janitorial: remove unused xParamsAsNames variable

Change-Id: Ic4fe24faf75d38a8123a8f0e8304c054760bad85

commit 84ed380543b17dcd9def1d69e3a0c7836ff7894b
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:28:50 2012 +0200

legacy reports: unify treatment of query and table

In *both* cases, the value of hidden control "Sorting" (if non-empty)
decides the columns being sorted on.

Change-Id: I7f4b50c3af8c12e48e5dedd36b5877ad7a9e1b66

commit fec7c41fe6af8cbba40c8c532635da65f5e00430
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:26:58 2012 +0200

legacy report wizard: when source is table, save name in QueryName

Change-Id: Ie0bdbed9578b95f7fccc3d9ff6d9c8b5b91ac0ab

commit 600856b94c2d9474242b7bd61ead2e36ab7b838d
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:25:51 2012 +0200

SQLQueryComposer allow setQueryCommand with prependSorting instead of append

Change-Id: Ia06794537ea4d0f6f069c83709792ebbcc084804

commit 1034265bdf0b7fe8f3f14ad654dc730a601cb847
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:24:54 2012 +0200

db.SQLQueryComposer allow prependSortingCriteria call with 
addAliasFieldNames

Change-Id: I05889ccac213743a55c302bd7249b30f817c0428

commit 98ee7c7ba907996a5ab938aab39ea391e2dc2440
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:23:50 2012 +0200

[Libreoffice-commits] .: Branch 'features/base-preview' - 0 commits -

[Lionel Elie Mamane]

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] .: configure.in oowintool scp2/source

[Stephan Bergmann]

 configure.in  |9 +++--
 oowintool |   11 +++
 scp2/source/ooo/vc_redist.scp |8 
 3 files changed, 22 insertions(+), 6 deletions(-)

New commits:
commit 6cfe3c93dc55264e57f1057a2911d54232353d13
Author: Stephan Bergmann 
Date:   Tue Jul 24 17:06:21 2012 +0200

Make bundling Microsoft_VC100_CRT_x86.msm truly optional

Change-Id: I4fa998f33059a6ebc9afe0a9ce65443a115b6db2

diff --git a/configure.in b/configure.in
index ddbb22f..6e1ffe5 100644
--- a/configure.in
+++ b/configure.in
@@ -5135,9 +5135,14 @@ fi
 AC_SUBST([JITC_PROCESSOR_TYPE])
 
 if test $_os = "WINNT"; then
-SCPDEFS="$SCPDEFS -DWITH_VC_REDIST"
+AC_MSG_CHECKING([for Microsoft_VC100_CRT_x86.msm])
+if ./oowintool --msvc-find-msms-vc100; then
+AC_MSG_RESULT([yes])
+SCPDEFS="$SCPDEFS -DWITH_VC100_REDIST"
+else
+AC_MSG_RESULT([no])
+fi
 fi
-AC_SUBST(WITH_VC_REDIST)
 
 dnl ===
 dnl Checks for Java
diff --git a/oowintool b/oowintool
index 087d478..9afc1cd 100755
--- a/oowintool
+++ b/oowintool
@@ -47,6 +47,8 @@ sub print_syntax()
 print " commands:\n";
 print "   --msvc-ver  - print version of MSVC eg. 6.0\n";
 print "   --msvc-copy-dlls  - copy msvc[pr]??.dlls into 
/msvcp??/\n";
+print "   --msvc-find-msms-vc100  - exit with 0 if 
Microsoft_VC100_CRT_x86.msm\n";
+print " is available\n";
 print "   --msvc-copy-msms  - copy mscrt merge modules to 
/msm90/\n";
 print "   --msvc-copy-msms-64 - copy the x64 mscrt merge modules to 
/msm90/\n";
 print "   --msvc-productdir   - print productdir\n";
@@ -271,6 +273,13 @@ sub msvc_copy_dlls($)
 }
 }
 
+sub msvc_find_msms_vc100()
+{
+my $msm_path = (cygpath reg_get_value 
("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/9.0/Setup/VS/MSMDir"), 
'w', $output_format);
+defined $msm_path || die "MSMDir not found";
+return -e "$msm_path/Microsoft_VC100_CRT_x86.msm" ? 0 : 1;
+}
+
 sub msvc_copy_msms($$)
 {
 # $postfix is empty for x86, and '_x64' for x64
@@ -318,6 +327,8 @@ while (@commands) {
 my $dest = shift @commands;
 defined $dest || die "copy-dlls requires a destination directory";
 msvc_copy_dlls( $dest );
+} elsif ($opt eq '--msvc-find-msms-vc100') {
+exit msvc_find_msms_vc100();
 } elsif ($opt eq '--msvc-copy-msms') {
 my $dest = shift @commands;
 defined $dest || die "copy-msms requires a destination directory";
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 265a595..c0e5302 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -27,8 +27,6 @@
 
 #include "macros.inc"
 
-#if defined(WITH_VC_REDIST)
-
 MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86
 Feature = gm_Root;
 Name = "Microsoft_VC90_CRT_x86.msm";
@@ -36,6 +34,8 @@ MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86
 ComponentCondition = "VC_REDIST=1";
 End
 
+#if defined(WITH_VC100_REDIST)
+
 MergeModule gid_MergeModule_Microsoft_VC100_CRT_x86
 Feature = gm_Root;
 Name = "Microsoft_VC100_CRT_x86.msm";
@@ -43,6 +43,8 @@ MergeModule gid_MergeModule_Microsoft_VC100_CRT_x86
 ComponentCondition = "VC_REDIST=1";
 End
 
+#endif
+
 MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86
 Feature = gm_Root;
 Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm";
@@ -67,5 +69,3 @@ MergeModule 
gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86_x64
 End
 
 #endif
-
-#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Need help to locate HSQLDB in Base

[Lionel Elie Mamane]

On Mon, Jul 23, 2012 at 11:50:12PM +0500, Muhammad Waqas Iftikhar wrote:

> Me and my friends are trying to work on to embedd SQLite under base
> instead of hsqldb.

Because of sqlite's cavalier attitude to the strict / static type
discipline that underlies the SQL model, I feel that embedding SQLite
won't give a robust solution overall. See the discussion in
https://bugs.freedesktop.org/show_bug.cgi?id=38811

This bug log also contains a few pointers by me where to find all
"special" things that are done for embedded HSQLDB.

Maybe I can redirect you to
https://bugs.freedesktop.org/show_bug.cgi?id=51780
instead, that is embed Firebird instead? Or if you have a better idea,
I'd be delighted to hear about it in
https://bugs.freedesktop.org/show_bug.cgi?id=51781

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] fdo#47164 Start Center: Recent Documents picker can not be reached right third of separate button area

[Rainer Bielefeld]

Hi all,

has already someone had a look on Joel's patch?

Best regards

Rainer
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [HELP] fdo#52399 report design editor shows no property

[Stephan Bergmann]

On 07/24/2012 04:18 PM, Lionel Elie Mamane wrote:

I'd appreciate some help on fdo#52399; it is very annoying for Base
users.

I did some analysis (see the bug log) but I don't know where to go
from there.

Basically, my guess is that "somewhere" the wrong Factory is
initialised, and then this value in inherited deep down the line, but
I don't know where this happens.


Ah,  mentions my 
defaultbootstrap.cxx; I'll have a look...


(Btw, please always provide a link when mentioning bug ids.  Makes it so 
much simpler for your audience to look up the relevant information.)


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sw/source

[Lubos Lunak]

 sw/source/filter/ww8/ww8par.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f0460881e7a60d2852d6314991cd3627623d6be8
Author: Luboš Luňák 
Date:   Tue Jul 24 16:23:27 2012 +0200

++aIter++ is quite funny, but it's in practice the same like ++aIter

Change-Id: Ie88d995cd3b5d48d0096f3c1be4344b78f425b07

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 54118d3..292b4fb 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5185,7 +5185,7 @@ void SwWW8ImplReader::SetOutLineStyles()
 
 int nMax = 0;
 myIter aEnd2 = aRuleMap.end();
-for (myIter aIter = aRuleMap.begin(); aIter != aEnd2; ++aIter++)
+for (myIter aIter = aRuleMap.begin(); aIter != aEnd2; ++aIter)
 {
 if (aIter->second > nMax)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[HELP] fdo#52399 report design editor shows no property

[Lionel Elie Mamane]

I'd appreciate some help on fdo#52399; it is very annoying for Base
users.

I did some analysis (see the bug log) but I don't know where to go
from there.

Basically, my guess is that "somewhere" the wrong Factory is
initialised, and then this value in inherited deep down the line, but
I don't know where this happens.

Thanks in advance.

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Possible null pointer dereference in sw/source/ui/misc/redlndlg.cxx

[Michael Stahl]

On 14/07/12 01:49, julien2412 wrote:
> Hello,
> 
> On master sources updated today, cppcheck reported this :
> [sw/source/ui/misc/redlndlg.cxx:402]: (error) Possible null pointer
> dereference: pView - otherwise it is redundant to check if pView is null at
> line 406
> 
> 395 void SwRedlineAcceptDlg::Activate()
> 396 {
> 397 // prevent update if flag is set (#102547#)
> 398 if( bInhibitActivate )
> 399 return;
> 400 
> 401 SwView *pView = ::GetActiveView();
> 402 SwWait aWait( *pView->GetDocShell(), sal_False );
> 403 
> 404 aUsedSeqNo.Remove((sal_uInt16)0, aUsedSeqNo.Count());
> 405 
> 406 if (!pView) // can happen when switching to another app, when a
> Listbox in the dialog
> 407 return; // had the focus previously (actually THs Bug)
> 
> Should we test pView ... ?

hmm... it appears that this code is essentially unchanged since the
initial import, except that the comment "can happen when... " there has
been translated from the original Klingon.

so pView ultimately comes from SfxViewFrame::Current(), dynamically
casted to SwView... i bet the idea is that null pView is never supposed
to happen, and the comment indicates that a certain "TH" was at some
time tasked with fixing the bug that it could indeed be null at that time.

since it has been unconditionally dereferenced for the last 12 years at
least anyway, i think the check is just redundant and could be removed.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: i18npool/qa

[Jan Holesovsky]

 i18npool/qa/cppunit/test_breakiterator.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 43b75d8af0efb359887c0ae1b2655c617d42f9a3
Author: Jan Holesovsky 
Date:   Tue Jul 24 15:28:23 2012 +0200

Disable testWordBoundaries test with old icu.

Change-Id: I8d75eeb2eee43e1338a6f54c4b8ed633631bac0d

diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx 
b/i18npool/qa/cppunit/test_breakiterator.cxx
index f983686..b944540 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -68,7 +68,9 @@ public:
 
 CPPUNIT_TEST_SUITE(TestBreakIterator);
 CPPUNIT_TEST(testLineBreaking);
+#if (U_ICU_VERSION_MAJOR_NUM > 4)
 CPPUNIT_TEST(testWordBoundaries);
+#endif
 CPPUNIT_TEST(testGraphemeIteration);
 CPPUNIT_TEST(testWeak);
 CPPUNIT_TEST(testAsian);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW-3-6-0 2/3] Fix for fdo#51943 toolbar floater bug on Mac

[Michael Meeks]

On Tue, 2012-07-24 at 15:04 +0200, Petr Mladek wrote:
> >  
> > http://cgit.freedesktop.org/libreoffice/core/commit/?id=94fdc1e684d691cd63d75685b5a607d35e737dcf
> 
> I can confirm that it works fine on Linux => +1
> 
> One more approval needed for 3-6-0, preferably from a Windows hacker.

As I said to Thorsten on IM, I'm concerned that this means we have to
manually pop-down the color selector if we don't want to select a color
(rather than just clicking something else, another drop-down /
whatever); which seems sub-optimal.

OTOH - even if that is the case, it seems a lot better than not being
able to select text colors on OSX :-) so I'm a +1 too for 3.6.0

Thanks !

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED 3-6-0] fdo#51659 "File - Wizards - Letter" crash

[Michael Stahl]

On 24/07/12 11:27, Petr Mladek wrote:
> David Tardon píše v Út 24. 07. 2012 v 10:26 +0200:
>> On Tue, Jul 24, 2012 at 10:11:21AM +0200, Stephan Bergmann wrote:
>>>  "File >>
>>> Wizards >> Letter Yields No UI" had apparently independently been
>>> fixed on master already with Caolan's 
>>> 
>>> "this is the stupidest hard-coded number in the world," but it also
>>> requires backporting to libreoffice-3-6 and libreoffice-3-6-0.
>>>
>>> I backported it to libreoffice-3-6 with my sign-off now as 
>>> .
>>> Two more reviews for this trivial fix are needed for
>>> libreoffice-3-6-0.
>>
>> +1 from me. One more needed.
> 
> Great catch. Works well => +1 => pushed into 3-6-0 branch.

to prevent this particular ridiculous problem from happening again on
master i've just added a static assertion:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=117fb70532aeae01327bfe0d828ef8a2d4793b85

unfortunately the BOOST_STATIC_ASSERT_MSG doesn't seem to be available
in the internal boost version, but hopefully people will look up the
source if they get a weird compile error :)

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: svtools/source

[Michael Stahl]

 svtools/source/misc/langtab.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 117fb70532aeae01327bfe0d828ef8a2d4793b85
Author: Michael Stahl 
Date:   Tue Jul 24 15:14:53 2012 +0200

fdo#51659: static assertion for STR_ARR_SVT_LANGUAGE_TABLE

Change-Id: I5588198452a609dd541d51ac7a84cd5773949ae7

diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index 9168daf..92c91a6 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -26,6 +26,7 @@
  *
  /
 
+#include 
 
 #include 
 
@@ -122,6 +123,12 @@ SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const 
String &rText )
 
 //
 
+namespace {
+BOOST_STATIC_ASSERT(
+16642 == STR_ARR_SVT_LANGUAGE_TABLE);
+//"The value of STR_ARR_SVT_LANGUAGE_TABLE has changed. 
wizards/com/sun/star/wizards/letter/LocaleCodes.java has this value hard coded, 
please adapt it to your change."
+}
+
 SvtLanguageTable::SvtLanguageTable() :
 ResStringArray( SvtResId( STR_ARR_SVT_LANGUAGE_TABLE ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED][3-6-0] Re: [PUSHED 3-6][REVIEW 3-6-0 2/3] prevent crash in malformed pivot table loaded from .xls

[Michael Stahl]

On 24/07/12 15:02, Petr Mladek wrote:
> Stephan Bergmann píše v Út 24. 07. 2012 v 14:58 +0200:
>> On 07/24/2012 02:49 PM, Eike Rathke wrote:
>>> On Tuesday, 2012-07-24 14:26:58 +0200, Stephan Bergmann wrote:
> Please review and cherry-pick to 3-6 and 3-6-0
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=3536fcd999f16525f20a1fff5c2512b565511d7b

> + return pData && nComp == pData2->GetValue();

 that should be return pData2 && ..., right?
>>>
>>> hmpf.. of course, thanks for noticing.
>>> So, this is also needed:
>>> http://cgit.freedesktop.org/libreoffice/core/commit/?id=9b2ec8c2a3478047a270b31bc25ad1d782401306
>>
>> Patch looks reasonable overall, so pushed the combination of the above 
>> two to libreoffice-3-6 as 
>> 
>>  
>> now.
>>
>> Two more reviews needed for libreoffice-3-6-0.
> 
> Yup. it looks sane => +1
> 
> One more approval needed for 3-6-0 branch.

that looks simple enough.

pushed to libreoffice-3-6-0

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6-0' - sc/inc sc/source

[Michael Stahl]

 sc/inc/dptabsrc.hxx  |2 +-
 sc/source/core/data/dptabsrc.cxx |   17 -
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit b1af9e14759f752689c26f8426a76c35e57064f3
Author: Eike Rathke 
Date:   Tue Jul 24 10:53:33 2012 +0200

prevent crash in malformed pivot table loaded from .xls

ScDPMember::GetItemData() unconditionally returned a reference to a
ScDPItemData pointer obtained through ScDPSource::GetItemDataById()
ScDPTableData::GetMemberById() ScDPCache::GetItemDataById() that can be
null for malformed entries. Changed ScDPMember::GetItemData() to return
a pointer instead and adapted callers to check for null.

3.5.x in ScDPSource::GetItemDataById() had a check for null pointer and
added an empty ScDPItemData element to the cache for this case and
returned the pointer to that entry (marked as todo). This is not the
case anymore.

(cherry picked from commit 3536fcd999f16525f20a1fff5c2512b565511d7b
plus follow-up 9b2ec8c2a3478047a270b31bc25ad1d782401306 "it's pData2")

Change-Id: I241c232d7182f5d58e8531af540e69b26ab4888a
Signed-off-by: Stephan Bergmann 
(cherry picked from commit ca9607ac8ed43d29125a0a2d22a938ec8f414841)

Signed-off-by: Petr Mladek 
Signed-off-by: Michael Stahl 

diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index b69846b..9fced30 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -755,7 +755,7 @@ public:
 
 rtl::OUString GetNameStr() const;
 voidFillItemData( ScDPItemData& rData ) const;
-const ScDPItemData&  GetItemData() const;
+const ScDPItemData*  GetItemData() const;
 SCROW GetItemDataId() const { return mnDataId; }
 bool IsNamedItem(SCROW nIndex) const;
 
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 4d680ae..bbf9217 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -2583,7 +2583,8 @@ bool ScDPMember::IsNamedItem(SCROW nIndex) const
 (long)::rtl::math::approxFloor( pData->GetValue() ),
 nHier, nLev );
 //  fValue is converted from integer, so simple comparison works
-return nComp == GetItemData().GetValue();
+const ScDPItemData* pData2 = GetItemData();
+return pData2 && nComp == pData2->GetValue();
 }
 }
 
@@ -2619,7 +2620,8 @@ void ScDPMember::FillItemData( ScDPItemData& rData ) const
 {
 //! handle date hierarchy...
 
-rData = GetItemData() ;
+const ScDPItemData* pData = GetItemData();
+rData = (pData ? *pData : ScDPItemData());
 }
 
 const OUString* ScDPMember::GetLayoutName() const
@@ -2634,7 +2636,10 @@ long ScDPMember::GetDim() const
 
 rtl::OUString ScDPMember::GetNameStr() const
 {
-return pSource->GetData()->GetFormattedString(nDim, GetItemData());
+const ScDPItemData* pData = GetItemData();
+if (pData)
+return pSource->GetData()->GetFormattedString(nDim, *pData);
+return rtl::OUString();
 }
 
 ::rtl::OUString SAL_CALL ScDPMember::getName() throw(uno::RuntimeException)
@@ -2729,9 +2734,11 @@ const ScDPCache* ScDPSource::GetCache()
 return ( GetData()!=NULL) ? GetData()->GetCacheTable().getCache() : NULL ;
 }
 
-const ScDPItemData& ScDPMember::GetItemData() const
+const ScDPItemData* ScDPMember::GetItemData() const
 {
-return *pSource->GetItemDataById(nDim, mnDataId);
+const ScDPItemData* pData = pSource->GetItemDataById(nDim, mnDataId);
+SAL_WARN_IF( !pData, "sc", "ScDPMember::GetItemData: what data? nDim " << 
nDim << ", mnDataId " << mnDataId);
+return pData;
 }
 
 const ScDPItemData* ScDPSource::GetItemDataById(long nDim, long nId)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW-3-6-0 2/3] Fix for fdo#51943 toolbar floater bug on Mac

[Petr Mladek]

Thorsten Behrens píše v Út 24. 07. 2012 v 13:39 +0200:
> Hi there,
> 
> managed to fix $subject by adding another band-aid - fix behaves
> well on Mac and Linux, barring bad side effects on Win, I'd *very*
> much like to have this cherry-picked for 3-6-0 - commit is
> 
>  
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=94fdc1e684d691cd63d75685b5a607d35e737dcf

I can confirm that it works fine on Linux => +1

One more approval needed for 3-6-0, preferably from a Windows hacker.


Best Regards,
Petr

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED 3-6][REVIEW 3-6-0 2/3] prevent crash in malformed pivot table loaded from .xls

[Petr Mladek]

Stephan Bergmann píše v Út 24. 07. 2012 v 14:58 +0200:
> On 07/24/2012 02:49 PM, Eike Rathke wrote:
> > On Tuesday, 2012-07-24 14:26:58 +0200, Stephan Bergmann wrote:
> >>> Please review and cherry-pick to 3-6 and 3-6-0
> >>> http://cgit.freedesktop.org/libreoffice/core/commit/?id=3536fcd999f16525f20a1fff5c2512b565511d7b
> >>
> >>> + return pData && nComp == pData2->GetValue();
> >>
> >> that should be return pData2 && ..., right?
> >
> > hmpf.. of course, thanks for noticing.
> > So, this is also needed:
> > http://cgit.freedesktop.org/libreoffice/core/commit/?id=9b2ec8c2a3478047a270b31bc25ad1d782401306
> 
> Patch looks reasonable overall, so pushed the combination of the above 
> two to libreoffice-3-6 as 
> 
>  
> now.
> 
> Two more reviews needed for libreoffice-3-6-0.

Yup. it looks sane => +1

One more approval needed for 3-6-0 branch.


Best Regards,
Petr

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED 3-6][REVIEW 3-6-0 1/3] prevent crash in malformed pivot table loaded from .xls

[Stephan Bergmann]

On 07/24/2012 02:49 PM, Eike Rathke wrote:

On Tuesday, 2012-07-24 14:26:58 +0200, Stephan Bergmann wrote:

Please review and cherry-pick to 3-6 and 3-6-0
http://cgit.freedesktop.org/libreoffice/core/commit/?id=3536fcd999f16525f20a1fff5c2512b565511d7b



+ return pData && nComp == pData2->GetValue();


that should be return pData2 && ..., right?


hmpf.. of course, thanks for noticing.
So, this is also needed:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=9b2ec8c2a3478047a270b31bc25ad1d782401306


Patch looks reasonable overall, so pushed the combination of the above 
two to libreoffice-3-6 as 
 
now.


Two more reviews needed for libreoffice-3-6-0.

Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/inc sc/source

[Stephan Bergmann]

 sc/inc/dptabsrc.hxx  |2 +-
 sc/source/core/data/dptabsrc.cxx |   17 -
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit ca9607ac8ed43d29125a0a2d22a938ec8f414841
Author: Eike Rathke 
Date:   Tue Jul 24 10:53:33 2012 +0200

prevent crash in malformed pivot table loaded from .xls

ScDPMember::GetItemData() unconditionally returned a reference to a
ScDPItemData pointer obtained through ScDPSource::GetItemDataById()
ScDPTableData::GetMemberById() ScDPCache::GetItemDataById() that can be
null for malformed entries. Changed ScDPMember::GetItemData() to return
a pointer instead and adapted callers to check for null.

3.5.x in ScDPSource::GetItemDataById() had a check for null pointer and
added an empty ScDPItemData element to the cache for this case and
returned the pointer to that entry (marked as todo). This is not the
case anymore.

(cherry picked from commit 3536fcd999f16525f20a1fff5c2512b565511d7b
plus follow-up 9b2ec8c2a3478047a270b31bc25ad1d782401306 "it's pData2")

Change-Id: I241c232d7182f5d58e8531af540e69b26ab4888a
Signed-off-by: Stephan Bergmann 

diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index b69846b..9fced30 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -755,7 +755,7 @@ public:
 
 rtl::OUString GetNameStr() const;
 voidFillItemData( ScDPItemData& rData ) const;
-const ScDPItemData&  GetItemData() const;
+const ScDPItemData*  GetItemData() const;
 SCROW GetItemDataId() const { return mnDataId; }
 bool IsNamedItem(SCROW nIndex) const;
 
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 4d680ae..bbf9217 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -2583,7 +2583,8 @@ bool ScDPMember::IsNamedItem(SCROW nIndex) const
 (long)::rtl::math::approxFloor( pData->GetValue() ),
 nHier, nLev );
 //  fValue is converted from integer, so simple comparison works
-return nComp == GetItemData().GetValue();
+const ScDPItemData* pData2 = GetItemData();
+return pData2 && nComp == pData2->GetValue();
 }
 }
 
@@ -2619,7 +2620,8 @@ void ScDPMember::FillItemData( ScDPItemData& rData ) const
 {
 //! handle date hierarchy...
 
-rData = GetItemData() ;
+const ScDPItemData* pData = GetItemData();
+rData = (pData ? *pData : ScDPItemData());
 }
 
 const OUString* ScDPMember::GetLayoutName() const
@@ -2634,7 +2636,10 @@ long ScDPMember::GetDim() const
 
 rtl::OUString ScDPMember::GetNameStr() const
 {
-return pSource->GetData()->GetFormattedString(nDim, GetItemData());
+const ScDPItemData* pData = GetItemData();
+if (pData)
+return pSource->GetData()->GetFormattedString(nDim, *pData);
+return rtl::OUString();
 }
 
 ::rtl::OUString SAL_CALL ScDPMember::getName() throw(uno::RuntimeException)
@@ -2729,9 +2734,11 @@ const ScDPCache* ScDPSource::GetCache()
 return ( GetData()!=NULL) ? GetData()->GetCacheTable().getCache() : NULL ;
 }
 
-const ScDPItemData& ScDPMember::GetItemData() const
+const ScDPItemData* ScDPMember::GetItemData() const
 {
-return *pSource->GetItemDataById(nDim, mnDataId);
+const ScDPItemData* pData = pSource->GetItemDataById(nDim, mnDataId);
+SAL_WARN_IF( !pData, "sc", "ScDPMember::GetItemData: what data? nDim " << 
nDim << ", mnDataId " << mnDataId);
+return pData;
 }
 
 const ScDPItemData* ScDPSource::GetItemDataById(long nDim, long nId)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Changing sort order of language list box

[Eike Rathke]

Hi Michael,

On Tuesday, 2012-07-24 14:22:07 +0200, Michael Stahl wrote:

> wasn't exactly this approach of limiting the selectable languages for
> text to those that have a spelling checker discussed here last month or
> so, and wasn't the result that there are good reasons why even languages
> without an available spelling checker should be selectable, such as
> language dependent field formats etc.?

Yes ...

> ah there's this bug, that's probably what i'm remembering:
> https://bugs.freedesktop.org/show_bug.cgi?id=47896
> 
> >> But, what I'm after is sorting the listbox by
> >> 1) Languages with Installed checkers then
> >> 2) Languages without
> 
> that sounds like a reasonable approach, all languages are available, and
> the most likely used ones at the front.

... and indeed taking this further to present languages with
spellcheckers first before all others IMHO is a reasonable approach.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpUo3ZlascPq.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW 3-6][REVIEW 3-6-0] prevent crash in malformed pivot table loaded from .xls

[Eike Rathke]

Hi Stephan,

On Tuesday, 2012-07-24 14:26:58 +0200, Stephan Bergmann wrote:

> >Please review and cherry-pick to 3-6 and 3-6-0
> >http://cgit.freedesktop.org/libreoffice/core/commit/?id=3536fcd999f16525f20a1fff5c2512b565511d7b
> 
> >+ return pData && nComp == pData2->GetValue();
> 
> that should be return pData2 && ..., right?

hmpf.. of course, thanks for noticing.
So, this is also needed:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=9b2ec8c2a3478047a270b31bc25ad1d782401306

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgprjEqV4IHuK.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sc/source

[Eike Rathke]

 sc/source/core/data/dptabsrc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9b2ec8c2a3478047a270b31bc25ad1d782401306
Author: Eike Rathke 
Date:   Tue Jul 24 14:47:46 2012 +0200

it's pData2

Change-Id: I1d1229f1c1ef229ca7454a712e027a78e25ab56f

diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 039fa58..542d991 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -2578,7 +2578,7 @@ bool ScDPMember::IsNamedItem(SCROW nIndex) const
 nHier, nLev );
 //  fValue is converted from integer, so simple comparison works
 const ScDPItemData* pData2 = GetItemData();
-return pData && nComp == pData2->GetValue();
+return pData2 && nComp == pData2->GetValue();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW][3-6-0 2/3] Re: [PATCH] Change in core[libreoffice-3-6]: fdo#39812: Writer: fix collapsing merged table border painti...

[Petr Mladek]

Michael Stahl píše v Út 24. 07. 2012 v 11:21 +0200:
> i'm trying to push this to gerrit libreoffice-3-6-0, but git-review
> warns me that it wants to push not 1 but ~10 patches; apparently the
> libreoffice-3-6-0 branch on gerrit is not automatically updated?
> 
> anyway, asking for 2 more reviews here.

It looks good. It works well. I have checked few other documents with
borders and did not find any regression => +1

One more approval is needed.


Best Regards,
Petr

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'update' - check.php

[Jan Holesovsky]

 check.php |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit b739c6a8f194d95ae1016bbf274745c455d53544
Author: Jan Holesovsky 
Date:   Tue Jul 24 14:27:18 2012 +0200

Offer update to 3.6.0.2 (RC2).

diff --git a/check.php b/check.php
index b627fac..c162923 100644
--- a/check.php
+++ b/check.php
@@ -131,7 +131,8 @@ $update_versions = array(
 '1f1cdd8-e28082e-41df8bf-b153627-a97a84' => 'LO-3.6-pre',  # 3.6.0 Beta1
 'f010139-41cc8cc-da4127d-d2bb4b0-f433b8' => 'LO-3.6-pre',  # 3.6.0 Beta2
 '3e2b862-dd05a58-d67668b-8ec3f67-dfb62d' => 'LO-3.6-pre',  # 3.6.0 Beta3
-#'73f9fb6-115b9dc-d7b744e-21dd070-d656a7' => 'LO-3.6-pre',  # 3.6.0 RC1
+'73f9fb6-115b9dc-d7b744e-21dd070-d656a7' => 'LO-3.6-pre',  # 3.6.0 RC1
+#'815c576-a5d8898-9df72e7-b4d87fe-96ce64' => 'LO-3.6-pre',  # 3.6.0 RC2
 );
 
 # Descriptions of the target versions
@@ -152,9 +153,9 @@ $update_map = array(
 #  'update_type' => 'text/html',
 #  'update_src'  => 
'http://www.libreoffice.org/download/pre-releases/'),
 
-'LO-3.6-pre' => array('gitid'   => 
'73f9fb6-115b9dc-d7b744e-21dd070-d656a7',
-  'id'  => 'LibreOffice 3.6.0 RC1',
-  'version' => '3.6.0 RC1',
+'LO-3.6-pre' => array('gitid'   => 
'815c576-a5d8898-9df72e7-b4d87fe-96ce64',
+  'id'  => 'LibreOffice 3.6.0 RC2',
+  'version' => '3.6.0 RC2',
   'update_type' => 'text/html',
   'update_src'  => 
'http://www.libreoffice.org/download/pre-releases/'),
 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW 3-6][REVIEW 3-6-0] prevent crash in malformed pivot table loaded from .xls

[Stephan Bergmann]

On 07/24/2012 11:31 AM, Eike Rathke wrote:

Please review and cherry-pick to 3-6 and 3-6-0
http://cgit.freedesktop.org/libreoffice/core/commit/?id=3536fcd999f16525f20a1fff5c2512b565511d7b



diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 8b7d6f8..039fa58 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -2577,7 +2577,8 @@ bool ScDPMember::IsNamedItem(SCROW nIndex) const
(long)::rtl::math::approxFloor( pData->GetValue() ),
nHier, nLev );
// fValue is converted from integer, so simple comparison works
- return nComp == GetItemData().GetValue();
+ const ScDPItemData* pData2 = GetItemData();
+ return pData && nComp == pData2->GetValue();


that should be return pData2 && ..., right?

Stephan


}
}

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Gerrit: branch libreoffice-3-6-0 is out of sync -- was Re: [REVIEW][3-6-0] Re: [PATCH] Change in core[libreoffice-3-6]: fdo#39812: Writer: fix collapsing merged table border painti...

[Bjoern Michaelsen]

On Tue, Jul 24, 2012 at 11:46:28AM +0200, d.ostrov...@idaia.de wrote:
> http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/gerritbot/syncgerrit
> libreoffice-3-6-0 branch is still missing:
> [...]
> branches['core']  = ['master', 'libreoffice-3-5',
> 'libreoffice-3-5-5', 'libreoffice-3-6']
> [...]
> 
> I would suggest to file a bug to ger...@otrs.documentfoundation.org.

That would be the proper way, but I just shortcut this: should be fixed now.

Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Changing sort order of language list box

[Michael Stahl]

On 24/07/12 13:17, Eike Rathke wrote:
> Hi Arno,
> 
> On Monday, 2012-07-23 18:16:44 -0500, Arno Teigseth wrote:
> 
>> Figured out how to break my LO's language list box, so that it would
>> only show languages with installed checkers:
>>
>> http://imgbin.org/index.php?page=image&id=8868
> 
> cool :)

wasn't exactly this approach of limiting the selectable languages for
text to those that have a spelling checker discussed here last month or
so, and wasn't the result that there are good reasons why even languages
without an available spelling checker should be selectable, such as
language dependent field formats etc.?

ah there's this bug, that's probably what i'm remembering:
https://bugs.freedesktop.org/show_bug.cgi?id=47896

>> But, what I'm after is sorting the listbox by
>> 1) Languages with Installed checkers then
>> 2) Languages without

that sounds like a reasonable approach, all languages are available, and
the most likely used ones at the front.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Makefile.top

[Jan Holesovsky]

 Makefile.top |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 15f69da73429638692c1706c2b819d8fc6dc21d4
Author: Jan Holesovsky 
Date:   Tue Jul 24 14:16:25 2012 +0200

Attempt to remove the last FORCE2ARCHIVE.

Change-Id: I7b0675151d39d6ce39c99ba3f85e8efebe303a2f

diff --git a/Makefile.top b/Makefile.top
index e7080dd..1c7b400 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -429,7 +429,7 @@ dev-install: build
@rm -rf $(DEVINSTALLDIR)
@mkdir $(DEVINSTALLDIR)
 ifeq ($(OS_FOR_BUILD),WNT)
-   cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl 
FORCE2ARCHIVE=TRUE
+   cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl 
PKGFORMAT=archive
unzip -d "$(DEVINSTALLDIR)" 
"$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice_Dev/archive/install/en-US/LibO*_install-arc_en-US.zip"
mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt
 else
@@ -446,7 +446,7 @@ install-tb:
@rm -rf $(DEVINSTALLDIR)
@mkdir $(DEVINSTALLDIR)
 ifeq ($(OS_FOR_BUILD),WNT)
-   cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl 
FORCE2ARCHIVE=TRUE
+   cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl 
PKGFORMAT=archive
unzip -d "$(DEVINSTALLDIR)" 
"$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice_Dev/archive/install/en-US/LibO*_install-arc_en-US.zip"
mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 4 commits - writerfilter/source

[Miklos Vajna]

 writerfilter/source/rtftok/rtfcontrolwords.cxx |2 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |  257 -
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |   11 -
 3 files changed, 183 insertions(+), 87 deletions(-)

New commits:
commit d93eba476b45ca99792e9963064160539a9ddc19
Author: Miklos Vajna 
Date:   Tue Jul 24 14:11:02 2012 +0200

implement import of RTF_{MM,MMPR,MMR}

Change-Id: I6e21159af832c5850db77a6dfe630a0fc0bb6238

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 015252d..5957194 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1493,6 +1493,18 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword 
nKeyword)
 m_aMathBuffer.appendOpeningTag(M_TOKEN(lim));
 m_aStates.top().nDestinationState = DESTINATION_MLIM;
 break;
+case RTF_MM:
+m_aMathBuffer.appendOpeningTag(M_TOKEN(m));
+m_aStates.top().nDestinationState = DESTINATION_MM;
+break;
+case RTF_MMPR:
+m_aMathBuffer.appendOpeningTag(M_TOKEN(mPr));
+m_aStates.top().nDestinationState = DESTINATION_MMPR;
+break;
+case RTF_MMR:
+m_aMathBuffer.appendOpeningTag(M_TOKEN(mr));
+m_aStates.top().nDestinationState = DESTINATION_MMR;
+break;
 default:
 SAL_INFO("writerfilter", OSL_THIS_FUNC << ": TODO handle 
destination '" << lcl_RtfToString(nKeyword) << "'");
 // Make sure we skip destinations (even without \*) till we don't 
handle them
@@ -3155,7 +3167,9 @@ int RTFDocumentImpl::pushState()
 (m_aStates.top().nDestinationState == DESTINATION_FIELDINSTRUCTION 
&& !m_bEq) ||
 m_aStates.top().nDestinationState == DESTINATION_MNUM ||
 m_aStates.top().nDestinationState == DESTINATION_MDEN ||
-m_aStates.top().nDestinationState == DESTINATION_ME)
+m_aStates.top().nDestinationState == DESTINATION_ME ||
+m_aStates.top().nDestinationState == DESTINATION_MFNAME ||
+m_aStates.top().nDestinationState == DESTINATION_MLIM)
 m_aStates.top().nDestinationState = DESTINATION_NORMAL;
 else if (m_aStates.top().nDestinationState == DESTINATION_FIELDINSTRUCTION 
&& m_bEq)
 m_aStates.top().nDestinationState = DESTINATION_EQINSTRUCTION;
@@ -3659,6 +3673,9 @@ int RTFDocumentImpl::popState()
 case DESTINATION_MLIMLOW: m_aMathBuffer.appendClosingTag(M_TOKEN(limLow)); 
break;
 case DESTINATION_MLIMLOWPR: 
m_aMathBuffer.appendClosingTag(M_TOKEN(limLowPr)); break;
 case DESTINATION_MLIM: m_aMathBuffer.appendClosingTag(M_TOKEN(lim)); break;
+case DESTINATION_MM: m_aMathBuffer.appendClosingTag(M_TOKEN(m)); break;
+case DESTINATION_MMPR: m_aMathBuffer.appendClosingTag(M_TOKEN(mPr)); break;
+case DESTINATION_MMR: m_aMathBuffer.appendClosingTag(M_TOKEN(mr)); break;
 default: break;
 }
 
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 70d7c86..06f7f05 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -142,7 +142,10 @@ namespace writerfilter {
 DESTINATION_MFNAME,
 DESTINATION_MLIMLOW,
 DESTINATION_MLIMLOWPR,
-DESTINATION_MLIM
+DESTINATION_MLIM,
+DESTINATION_MM,
+DESTINATION_MMPR,
+DESTINATION_MMR
 };
 
 enum RTFBorderState
commit 42922c40362f414ee06e65636f61798ef28cdcde
Author: Miklos Vajna 
Date:   Tue Jul 24 13:47:18 2012 +0200

RTFDocumentImpl::popState: use switch here

Change-Id: If03ae8a5b44f477471ddc33063af552b3f2cfc31

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index f1e2ef1..015252d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3230,17 +3230,21 @@ int RTFDocumentImpl::popState()
 bool bPopFrame = false;
 RTFParserState aState(m_aStates.top());
 
-if (m_aStates.top().nDestinationState == DESTINATION_FONTTABLE)
+switch (m_aStates.top().nDestinationState)
+{
+case DESTINATION_FONTTABLE:
 {
 writerfilter::Reference::Pointer_t const pTable(new 
RTFReferenceTable(m_aFontTableEntries));
 Mapper().table(NS_rtf::LN_FONTTABLE, pTable);
 }
-else if (m_aStates.top().nDestinationState == DESTINATION_STYLESHEET)
+break;
+case DESTINATION_STYLESHEET:
 {
 writerfilter::Reference::Pointer_t const pTable(new 
RTFReferenceTable(m_aStyleTableEntries));
 Mapper().table(NS_rtf::LN_STYLESHEET, pTable);
 }
-else if (m_aStates.top().nDestinationState == 
DESTINATION_LISTOVERRIDETABLE)
+break;
+case DESTINATION_LISTOVERR

[Libreoffice-commits] .: solenv/bin

[Jan Holesovsky]

 solenv/bin/modules/installer/windows/msiglobal.pm |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 8251cd1936af5047c817adf88333fef31031c506
Author: Jan Holesovsky 
Date:   Tue Jul 24 14:10:41 2012 +0200

Call uuidgen without -n when cross-compiling.

Change-Id: I533c9bcdbadcaf5caa5aa8bcefb6dc0c141a4d0e

diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm 
b/solenv/bin/modules/installer/windows/msiglobal.pm
index d4b626d..93cc78c 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1272,6 +1272,11 @@ sub get_guid_list
 # "-c" for uppercase output
 
 my $systemcall = "$uuidgen -n$number |";
+if ( $ENV{'CROSS_COMPILING'} eq 'YES' )
+{
+# -n is not present in the non-windows uuidgen
+$systemcall = "for I in `seq 1 $number` ; do uuidgen ; done |";
+}
 open (UUIDGEN, "$systemcall" ) or die("uuidgen is missing.");
 my @uuidlist = ;
 close (UUIDGEN);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Stephan Bergmann]

 sw/source/core/doc/dbgoutsw.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit b265709fbf9ff9f03645cbcbbc441699402c73a8
Author: Stephan Bergmann 
Date:   Tue Jul 24 13:55:49 2012 +0200

warning C4702: unreachable code

Change-Id: Ia3e119e1b9ac68fbdd9aa4a9a5177e28c1a0d605

diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
old mode 100644
new mode 100755
index 89bc16e..aa6c9e8
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -974,12 +974,9 @@ String lcl_TokenType2Str(FormTokenType nType)
 case TOKEN_END:
 return String("END", RTL_TEXTENCODING_ASCII_US);
 default:
+OSL_FAIL("should not be reached");
 return String("??", RTL_TEXTENCODING_ASCII_US);
 }
-
-OSL_FAIL("should not be reached");
-
-return  String("??", RTL_TEXTENCODING_ASCII_US);
 }
 
 String lcl_dbg_out(const SwFormToken & rToken)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - desktop/inc desktop/Library_sofficeapp.mk desktop/source sc/source tubes/inc tubes/source

[Matus Kukan]

 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 
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_cast (mpDirect))
+delete mpDirect;
 }
 
 void ScDocFuncSend::SetCollaboration( TeleConference* pConference )
commit bbeb2ea423d106fd4e7f35fedc4ba9bf58362ab5
Author: Matúš Kukan 
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 
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 
 #include 
 #include 
+#ifdef ENABLE_TELEPATHY
+#include 
+#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();
 SetSplashScreenProgress(60);
 
+#ifdef ENABLE_TELEPATHY
+m_pTeleManager = TeleManager::get();
+bool bListen = rCmdLineArgs.IsInvisible();
+m_pTeleManager->ini

[Libreoffice-commits] .: 4 commits - configure.in instsetoo_native/util README.cross setup_native/source solenv/bin

[Jan Holesovsky]

 README.cross   |   10 
 configure.in   |  172 +
 instsetoo_native/util/makefile.mk  |9 
 setup_native/source/win32/wintools/makecab/makefile.mk |2 
 setup_native/source/win32/wintools/msidb/makefile.mk   |2 
 setup_native/source/win32/wintools/msiinfo/makefile.mk |2 
 setup_native/source/win32/wintools/msimsp/makefile.mk  |2 
 setup_native/source/win32/wintools/msitran/makefile.mk |2 
 solenv/bin/make_installer.pl   |2 
 9 files changed, 116 insertions(+), 87 deletions(-)

New commits:
commit 22d551b3f636c15468e9411b93872f7ab3aecdea
Author: Jan Holesovsky 
Date:   Tue Jul 24 13:42:06 2012 +0200

Check for makecab in case we are cross-building .msi.

Change-Id: I57cb8cc9d0173c50f789533a479d55972bdb14b4

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 06ff6b9..e58bd4d 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -261,7 +261,7 @@ if (!($installer::globals::is_copy_only_project)) { 
installer::ziplist::set_manu
 # Checking version of makecab.exe
 ##
 
-if ( $installer::globals::iswindowsbuild && (!defined($ENV{'CROSS_COMPILING'}) 
|| $ENV{'CROSS_COMPILING'} ne 'YES')) { 
installer::control::check_makecab_version(); }
+if ( $installer::globals::iswindowsbuild && (!defined($ENV{'CROSS_COMPILING'}) 
|| $ENV{'CROSS_COMPILING'} ne 'YES' || $ENV{'PKGFORMAT'} eq 'msi')) { 
installer::control::check_makecab_version(); }
 
 ##
 # Getting the include path from the settings in zip list
commit f7fd0e0198bd78c4af07918f5c900b898d4f13a6
Author: Jan Holesovsky 
Date:   Tue Jul 24 12:40:35 2012 +0200

Kill FORCE2ARCHIVE.

Change-Id: Ie72dcc8ef9e82da1f0aa328648f20f9ed4a20482

diff --git a/configure.in b/configure.in
index 2baafb4..ddbb22f 100644
--- a/configure.in
+++ b/configure.in
@@ -5953,7 +5953,12 @@ elif test "$enable_epm" = "yes"; then
 AC_MSG_ERROR([unknown system])
 esac
 else
-PKGFORMAT=native
+if test "$WITH_MINGW" = "yes"; then
+# when tested, we should default this to 'msi', instead of 'archive'
+PKGFORMAT=archive
+else
+PKGFORMAT=native
+fi
 fi
 AC_MSG_RESULT([$PKGFORMAT])
 AC_SUBST(PKGFORMAT)
diff --git a/instsetoo_native/util/makefile.mk 
b/instsetoo_native/util/makefile.mk
index 54e399d..a4dc1f9 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -41,11 +41,6 @@ 
PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$
 .ENDIF # "$(GUI)"=="WNT"
 .EXPORT: PYTHONPATH
 
-.IF "$(OS)$(COM)" == "WNTGCC"
-# i.e. cross-compiling
-FORCE2ARCHIVE=TRUE
-.ENDIF
-
 ENABLE_DOWNLOADSETS*=TRUE
 
 .EXPORT: ENABLE_DOWNLOADSETS
@@ -128,10 +123,6 @@ ALLTAR : openofficedev_$(defaultlangiso) 
ooodevlanguagepack $(eq,$(OS),MACOSX $(
 .ENDIF # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
 .ENDIF # "$(GUI)"!="WNT" && "$(EPM)"=="NO"
 
-.IF "$(FORCE2ARCHIVE)" == "TRUE"
-PKGFORMAT = archive
-.END
-
 .IF "$(MAKETARGETS:e)"!=""
 PKGFORMAT+=$(MAKETARGETS:e:s/.//)
 .ENDIF # "$(MAKETARGETS:e)"!=""
commit cd93b227491a1e481452e79aee18b52fc558f368
Author: Jan Holesovsky 
Date:   Tue Jul 24 11:43:14 2012 +0200

Allow specification of --with-package-format=msi regardless of EPM setting.

Change-Id: I32c80cb7ffd6cedee854d03f198f21afd94a664c

diff --git a/configure.in b/configure.in
index 73f07d0..2baafb4 100644
--- a/configure.in
+++ b/configure.in
@@ -2364,24 +2364,6 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
 AC_PROG_CC
 fi
 
-dnl We need winegcc when building MinGW build to be able to cross-build msi 
tools
-AC_PATH_PROG(WINEGCC, winegcc)
-if test "$WITH_MINGW" = "yes" ; then
-if test "$WINEGCC" = ""; then
-AC_MSG_ERROR([winegcc was not found, please install wine-devel, or 
wine-devel-32bit])
-fi
-CC_save="$CC"
-CC="$WINEGCC -m32"
-AC_LINK_IFELSE([AC_LANG_PROGRAM([
-#include 
-],[
-printf ("hello world\n");
-])],,
-[AC_MSG_ERROR([winegcc cannot build 32bit binaries, please install 
glibc-devel-32bit and gcc-32bit])]
-)
-CC="$CC_save"
-fi
-
 COMPATH=`dirname "$CC"`
 if test "$COMPATH" = "."; then
 AC_PATH_PROGS(COMPATH, $CC)
@@ -5904,13 +5886,85 @@ else
 fi
 AC_SUBST(BUILD_DMAKE)
 
+dnl ===
+dnl Test which package format to use
+dnl ===
+AC_MSG_CHECKING([which package format to use])
+if test -n "$with_package_format"; then
+for i in $with_package_format; do
+case "$i" in
+aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | 
portable | archive | dmg | installed | msi)
+;;
+ 

[REVIEW-3-6-0] Fix for fdo#51943 toolbar floater bug on Mac

[Thorsten Behrens]

Hi there,

managed to fix $subject by adding another band-aid - fix behaves
well on Mac and Linux, barring bad side effects on Win, I'd *very*
much like to have this cherry-picked for 3-6-0 - commit is

 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=94fdc1e684d691cd63d75685b5a607d35e737dcf

Thanks a lot,

-- Thorsten


pgpHkdBWiQ9Xy.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - svx/source

[Thorsten Behrens]

 svx/source/tbxctrls/linectrl.cxx |5 -
 svx/source/tbxctrls/tbcontrl.cxx |   18 --
 2 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 94fdc1e684d691cd63d75685b5a607d35e737dcf
Author: Thorsten Behrens 
Date:   Tue Jul 24 12:32:56 2012 +0200

Fix fdo#51943 - prevent lose focus event to close popup.

This is a follow-up bandaid for fdo#48096 side-effects, which in
turn was a band-aid for side-effects caused by ooo-build's
toolbar-decorations-svx.diff.

Fix instructs vcl to not auto-close the floater on losefocus events,
which at least on OSX comes _before_ we even see the mouse button
down event.

Change-Id: I21896c4169addffdf2af920a37e0e3786438cc4e
Signed-off-by: Thorsten Behrens 

diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 2d649d4..0b75ce7 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -744,7 +744,10 @@ SfxPopupWindow* 
SvxLineEndToolBoxControl::CreatePopupWindow()
 {
 SvxLineEndWindow* pLineEndWin =
 new SvxLineEndWindow( GetId(), m_xFrame, &GetToolBox(), SVX_RESSTR( 
RID_SVXSTR_LINEEND ) );
-pLineEndWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS | 
FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+pLineEndWin->StartPopupMode( &GetToolBox(),
+ FLOATWIN_POPUPMODE_GRABFOCUS |
+ FLOATWIN_POPUPMODE_ALLOWTEAROFF |
+ FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
 pLineEndWin->StartSelection();
 SetPopupWindow( pLineEndWin );
 return pLineEndWin;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 6ff2c51..3e80d55 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2127,7 +2127,7 @@ SfxPopupWindow* 
SvxFontColorToolBoxControl::CreatePopupWindow()
 mLastColor);
 
 pColorWin->StartPopupMode( &GetToolBox(),
-FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+
FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE
 );
 pColorWin->StartSelection();
 SetPopupWindow( pColorWin );
 return pColorWin;
@@ -2203,7 +2203,7 @@ SfxPopupWindow* 
SvxColorToolBoxControl::CreatePopupWindow()
 mLastColor);
 
 pColorWin->StartPopupMode( &GetToolBox(),
-FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+
FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE
 );
 pColorWin->StartSelection();
 SetPopupWindow( pColorWin );
 return pColorWin;
@@ -2331,7 +2331,7 @@ SfxPopupWindow* 
SvxColorExtToolBoxControl::CreatePopupWindow()
 }
 
 pColorWin->StartPopupMode( &GetToolBox(),
-FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+
FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE
 );
 pColorWin->StartSelection();
 SetPopupWindow( pColorWin );
 bChoiceFromPalette = sal_True;
@@ -2459,7 +2459,10 @@ SfxPopupWindow* 
SvxFrameToolBoxControl::CreatePopupWindow()
 SvxFrameWindow_Impl* pFrameWin = new SvxFrameWindow_Impl(
 GetSlotId(), m_xFrame, &GetToolBox() );
 
-pFrameWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS | 
FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+pFrameWin->StartPopupMode( &GetToolBox(),
+   FLOATWIN_POPUPMODE_GRABFOCUS |
+   FLOATWIN_POPUPMODE_ALLOWTEAROFF |
+   FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
 pFrameWin->StartSelection();
 SetPopupWindow( pFrameWin );
 
@@ -2508,7 +2511,10 @@ SfxPopupWindowType 
SvxFrameLineStyleToolBoxControl::GetPopupWindowType() const
 SfxPopupWindow* SvxFrameLineStyleToolBoxControl::CreatePopupWindow()
 {
 SvxLineWindow_Impl* pLineWin = new SvxLineWindow_Impl( GetSlotId(), 
m_xFrame, &GetToolBox() );
-pLineWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS | 
FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+pLineWin->StartPopupMode( &GetToolBox(),
+  FLOATWIN_POPUPMODE_GRABFOCUS |
+  FLOATWIN_POPUPMODE_ALLOWTEAROFF |
+  FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
 SetPopupWindow( pLineWin );
 
 return pLineWin;
@@ -2573,7 +2579,7 @@ SfxPopupWindow* 
SvxFrameLineColorToolBoxControl::CreatePopupWindow()
 mLastColor);
 
 pColorWin->StartPopupMode( &GetToolBox(),
-FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+
FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE
 );
 pColorWin->StartSelection();
 SetPopupWindow( pColorWin );
 return pColorWin;
___

[Libreoffice-commits] .: svx/source

[Thorsten Behrens]

 svx/source/tbxctrls/linectrl.cxx |5 -
 svx/source/tbxctrls/tbcontrl.cxx |   18 --
 2 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 67e3e8bdb42603261de7b9e4b21dd0846d6ae6d5
Author: Thorsten Behrens 
Date:   Tue Jul 24 12:32:56 2012 +0200

Fix fdo#51943 - prevent lose focus event to close popup.

This is a follow-up bandaid for fdo#48096 side-effects, which in
turn was a band-aid for side-effects caused by ooo-build's
toolbar-decorations-svx.diff.

Fix instructs vcl to not auto-close the floater on losefocus events,
which at least on OSX comes _before_ we even see the mouse button
down event.

Change-Id: I21896c4169addffdf2af920a37e0e3786438cc4e

diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 114a956..5a74176 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -741,7 +741,10 @@ SfxPopupWindow* 
SvxLineEndToolBoxControl::CreatePopupWindow()
 {
 SvxLineEndWindow* pLineEndWin =
 new SvxLineEndWindow( GetId(), m_xFrame, &GetToolBox(), SVX_RESSTR( 
RID_SVXSTR_LINEEND ) );
-pLineEndWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS | 
FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+pLineEndWin->StartPopupMode( &GetToolBox(),
+ FLOATWIN_POPUPMODE_GRABFOCUS |
+ FLOATWIN_POPUPMODE_ALLOWTEAROFF |
+ FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
 pLineEndWin->StartSelection();
 SetPopupWindow( pLineEndWin );
 return pLineEndWin;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 90b12da..0ec964b 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2118,7 +2118,7 @@ SfxPopupWindow* 
SvxFontColorToolBoxControl::CreatePopupWindow()
 mLastColor);
 
 pColorWin->StartPopupMode( &GetToolBox(),
-FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+
FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE
 );
 pColorWin->StartSelection();
 SetPopupWindow( pColorWin );
 return pColorWin;
@@ -2194,7 +2194,7 @@ SfxPopupWindow* 
SvxColorToolBoxControl::CreatePopupWindow()
 mLastColor);
 
 pColorWin->StartPopupMode( &GetToolBox(),
-FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+
FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE
 );
 pColorWin->StartSelection();
 SetPopupWindow( pColorWin );
 return pColorWin;
@@ -2322,7 +2322,7 @@ SfxPopupWindow* 
SvxColorExtToolBoxControl::CreatePopupWindow()
 }
 
 pColorWin->StartPopupMode( &GetToolBox(),
-FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+
FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE
 );
 pColorWin->StartSelection();
 SetPopupWindow( pColorWin );
 bChoiceFromPalette = sal_True;
@@ -2450,7 +2450,10 @@ SfxPopupWindow* 
SvxFrameToolBoxControl::CreatePopupWindow()
 SvxFrameWindow_Impl* pFrameWin = new SvxFrameWindow_Impl(
 GetSlotId(), m_xFrame, &GetToolBox() );
 
-pFrameWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS | 
FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+pFrameWin->StartPopupMode( &GetToolBox(),
+   FLOATWIN_POPUPMODE_GRABFOCUS |
+   FLOATWIN_POPUPMODE_ALLOWTEAROFF |
+   FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
 pFrameWin->StartSelection();
 SetPopupWindow( pFrameWin );
 
@@ -2499,7 +2502,10 @@ SfxPopupWindowType 
SvxFrameLineStyleToolBoxControl::GetPopupWindowType() const
 SfxPopupWindow* SvxFrameLineStyleToolBoxControl::CreatePopupWindow()
 {
 SvxLineWindow_Impl* pLineWin = new SvxLineWindow_Impl( GetSlotId(), 
m_xFrame, &GetToolBox() );
-pLineWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS | 
FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+pLineWin->StartPopupMode( &GetToolBox(),
+  FLOATWIN_POPUPMODE_GRABFOCUS |
+  FLOATWIN_POPUPMODE_ALLOWTEAROFF |
+  FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
 SetPopupWindow( pLineWin );
 
 return pLineWin;
@@ -2564,7 +2570,7 @@ SfxPopupWindow* 
SvxFrameLineColorToolBoxControl::CreatePopupWindow()
 mLastColor);
 
 pColorWin->StartPopupMode( &GetToolBox(),
-FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
+
FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE
 );
 pColorWin->StartSelection();
 SetPopupWindow( pColorWin );
 return pColorWin;

Re: does the windows build require VC10 now?

[Stephan Bergmann]

On 07/24/2012 12:35 PM, Michael Stahl wrote:

we decided to bundle the redistributable for MSVC2010 because otherwise
dynamically loading the jvm.dll from Oracle JRE 7 fails if the
redistributable for MSVC2010 is not installed in the system, which the
Oracle JRE 7 does not do.  (i've also filed a bug against the JRE
because they really should fix that, but who knows how long that takes)

iirc somebody fixed that later so it is only bundled optinoally, i.e. if
it's actually available on the system; but apparently that doesn't work
for you?  this commit: 238eba337cedda17a9ed1ce7e91755c66446195a


Doesn't work for my very-recent-master build either; will take a look at 
it later.


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/remote' - 2 commits - android/sdremote

[Andrzej J.R. Hunt]

 android/sdremote/res/drawable-hdpi/handle_default.9.png  
|binary
 android/sdremote/res/drawable-hdpi/handle_light.9.png
|binary
 android/sdremote/res/drawable-ldpi/handle_default.9.png  
|binary
 android/sdremote/res/drawable-ldpi/handle_light.9.png
|binary
 android/sdremote/res/drawable-mdpi/handle_default.9.png  
|binary
 android/sdremote/res/drawable-mdpi/handle_light.9.png
|binary
 android/sdremote/res/drawable-xhdpi/handle_default.9.png 
|binary
 android/sdremote/res/drawable-xhdpi/handle_light.9.png   
|binary
 android/sdremote/res/drawable/handle.xml | 
   9 
 android/sdremote/res/layout/fragment_presentation.xml| 
  63 -
 android/sdremote/res/values/attrs.xml| 
  10 
 android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java | 
   5 
 android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java | 
 140 +++
 android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java| 
   2 
 android/sdremote/src/org/libreoffice/impressremote/communication/Client.java | 
   1 
 android/sdremote/src/pl/polidea/coverflow/AbstractCoverFlowImageAdapter.java | 
 125 +++
 android/sdremote/src/pl/polidea/coverflow/CoverFlow.java | 
 388 ++
 android/sdremote/src/pl/polidea/coverflow/ReflectingImageAdapter.java| 
 129 +++
 android/sdremote/src/pl/polidea/coverflow/ResourceImageAdapter.java  | 
  90 ++
 dev/null 
|binary
 20 files changed, 911 insertions(+), 51 deletions(-)

New commits:
commit 14eeca49cd3c34b0a9caa6fa3a2070346935c514
Author: Andrzej J.R. Hunt 
Date:   Tue Jul 24 11:46:48 2012 +0200

Added cover flow.

Change-Id: I7ffc47269a2e0b1fea4ec4dbcf6c03cdc37d4721

diff --git a/android/sdremote/res/layout/fragment_presentation.xml 
b/android/sdremote/res/layout/fragment_presentation.xml
index 3da7e09..fb50148 100644
--- a/android/sdremote/res/layout/fragment_presentation.xml
+++ b/android/sdremote/res/layout/fragment_presentation.xml
@@ -1,16 +1,21 @@
 
 http://schemas.android.com/apk/res/android";
+android:id="@+id/presentation_layout"
 android:layout_width="match_parent"
 android:layout_height="match_parent"
-android:orientation="vertical"
-android:id="@+id/presentation_layout">
+android:orientation="vertical" >
 
-http://schemas.android.com/apk/res/org.libreoffice.impressremote";
+android:id="@+id/presentation_coverflow"
+android:layout_width="fill_parent"
 android:layout_height="wrap_content"
-android:contentDescription="TODO"
-android:src="@drawable/testimage" />
+android:layout_marginTop="5dip"
+coverflow:imageHeight="150dip"
+coverflow:imageReflectionRatio="0.2"
+coverflow:imageWidth="100dip"
+coverflow:reflectionGap="2dip"
+coverflow:withReflection="true" />
 
 
 
 
 
 
 
diff --git a/android/sdremote/res/values/attrs.xml 
b/android/sdremote/res/values/attrs.xml
new file mode 100644
index 000..43de3bc
--- /dev/null
+++ b/android/sdremote/res/values/attrs.xml
@@ -0,0 +1,10 @@
+
+
+ 
+
+
+
+
+
+
+
\ No newline at end of file
diff --git 
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java 
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index e06d2b5..8806610 100644
--- 
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++ 
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
@@ -69,8 +69,10 @@ public class PresentationActivity extends Activity {
mCommunicationService = ((CommunicationService.CBinder) 
aService)
.getService();
mCommunicationService.setActivityMessenger(mMessenger);
+
+   mPresentationFragment
+   
.setCommunicationService(mCommunicationService);

mThumbnailFragment.setCommunicationService(mCommunicationService);
-   // TODO: add mCommunicationSercie to all fragments.
 
}
 
@@ -85,6 +87,7 @@ public class PresentationActivity extends Activity {
protected class MessageHandler extends Handler {
@Override
public void handleMessage(Message aMessage) {
+   mPresentationFragment.handleMessage(aMessage);
mThumbnailFragment.handleMessage(aMessage);
// Bundle aData = aMessage.getData();
// TODO: pass to fragments
diff --git 
a/android/sdrem

Re: Changing sort order of language list box

[Eike Rathke]

Hi Arno,

On Monday, 2012-07-23 18:16:44 -0500, Arno Teigseth wrote:

> Figured out how to break my LO's language list box, so that it would
> only show languages with installed checkers:
> 
> http://imgbin.org/index.php?page=image&id=8868

cool :)

> But, what I'm after is sorting the listbox by
> 1) Languages with Installed checkers then
> 2) Languages without
> 
> Now, I can't find where in the listbox control source the actual
> sorting takes place? Any hints?

The listbox control does that, it's enabled in
svx/source/dialog/langbox.cxx SvxLanguageBox::Init() with

// display entries sorted
SetStyle( GetStyle() | WB_SORT );

So if you wanted two sections sorted each you'd have to disable that,
obtain all entries - basically what's done in
SvxLanguageBox::SetLanguageList() but without calling InsertLanguage(),
sort the two sections independently and insert the sorted entries in
order.

Note though that the sort is not a mere code point sort, a usual sort
algorithm will fail for several translations and/or mixed alphanumeric
strings, details are in vcl/source/control/ilstbox.cxx
ImplEntryList::InsertEntry() and the NaturalStringSorter there above.


> -BEGIN PGP SIGNATURE-

Btw, I'd recommend to change the signature from old style inline-PGP to
PGP/MIME so that it doesn't clutter up the message text anymore. In
Thunderbird's Account Settings go to OpenPGP Security and enable Always
use PGP/MIME. See
http://enigmail.mozdev.org/documentation/per-account.php.html

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgptQHcKnSxHZ.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] fdo#52223: fix Object Catalog in Basic IDE when resizing

[Noel Power]

On 24/07/12 11:51, Noel Power wrote:

On 23/07/12 17:55, János Uray wrote:
This patch fixes this bug: 
https://bugs.freedesktop.org/show_bug.cgi?id=52223
just back from vacation, I have some passing knowledge of this, will 
try to review this as soon as I can
I see it is already committed ( my mail client threading is crap ), 
sorry for the noise


Noel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] fdo#52223: fix Object Catalog in Basic IDE when resizing

[Noel Power]

On 23/07/12 17:55, János Uray wrote:
This patch fixes this bug: 
https://bugs.freedesktop.org/show_bug.cgi?id=52223
just back from vacation, I have some passing knowledge of this, will try 
to review this as soon as I can


Noel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: does the windows build require VC10 now?

[Michael Stahl]

On 24/07/12 11:13, Noel Grandin wrote:
> Hi
> 
> I'm getting this error on my windows test box (which I'm trying to get 
> building again)
> 
> :
> : ***
> : ERROR: msm file not found: Microsoft_VC100_CRT_x86.msm !
> : in function: merge_mergemodules_into_msi_database
> : ***
> 
> 
> I have visual studio 2008 installed.

no, the only way to build on windows that works is still the old MSVC2008.

we decided to bundle the redistributable for MSVC2010 because otherwise
dynamically loading the jvm.dll from Oracle JRE 7 fails if the
redistributable for MSVC2010 is not installed in the system, which the
Oracle JRE 7 does not do.  (i've also filed a bug against the JRE
because they really should fix that, but who knows how long that takes)

iirc somebody fixed that later so it is only bundled optinoally, i.e. if
it's actually available on the system; but apparently that doesn't work
for you?  this commit: 238eba337cedda17a9ed1ce7e91755c66446195a



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

fdo#51695 nFmt is not an nIndex

[Gerrit]

>From Björn Michaelsen :

Björn Michaelsen has abandoned this change.

Change subject: fdo#51695 nFmt is not an nIndex
..


Patch Set 1: Abandoned

abandoned as per review

--
To view, visit https://gerrit.libreoffice.org/307
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I823468e8f132937fb937bbf2428c8ad45350ca3c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joseph Brown <1st...@gmail.com>
Gerrit-Reviewer: Eike Rathke 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

fdo#51966 Format brush tool moves selection anchor to a rand...

[Gerrit]

>From Björn Michaelsen :

Björn Michaelsen has abandoned this change.

Change subject: fdo#51966 Format brush tool moves selection anchor to a random 
cell
..


Patch Set 1: Abandoned

abandon as per review

--
To view, visit https://gerrit.libreoffice.org/321
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I93f6369b54d8ec05d6244defac02368b298be460
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Faisal al-otaibi 
Gerrit-Reviewer: Eike Rathke 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] Fix for sw_filter_test crash due to ambiguous FieldEntry destructor

[Stephan Bergmann]

On 07/23/2012 04:40 PM, Michael Stahl wrote:

On 22/07/12 11:25, Kristian Rietveld wrote:

(Please keep me on CC as I am not subscribed to the list)

[...]

that is really not supposed to happen, we really should build everything
with -fvisibility=hidden on all platforms where unnecessarily exported
symbols cause such problems (guess that means everything but Windows).

on master and libreoffice-3-6, in solenv/gbuild/platform/macosx.mk the
-fvisibility=hidden is inside:


ifeq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE)


can you check that that is actually detected properly for your compiler?


Explicitly disabled for Clang on Mac OS X in configure.in, see 
 
"Visibility doesn't seem to work as we want in Apple's Clang."  :(


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice