date:20120810

 desktop/source/app/app.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 0cfed166261968068abbed485ceffd67ca5cbf61
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 10 09:06:08 2012 +0200

fdo#42470: Do not show backing window on --nodefault

Change-Id: Id265dc84de454568ea8194703687c68449e9a32b

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 84f60b8..eaa8bbb 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -3118,6 +3118,10 @@ void Desktop::DoFirstRunInitializations()
 
 void Desktop::ShowBackingComponent(Desktop * progress)
 {
+if (GetCommandLineArgs().IsNoDefault())
+{
+return;
+}
 Reference XMultiServiceFactory  xSMgr(
 comphelper::getProcessServiceFactory(), UNO_SET_THROW);
 Reference XFrame  xDesktopFrame(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-08-10 Thread Lionel Elie Mamane

 reportdesign/inc/UndoEnv.hxx |2 
 reportdesign/source/core/api/Section.cxx |   87 ++-
 reportdesign/source/core/inc/Section.hxx |   34 +---
 3 files changed, 82 insertions(+), 41 deletions(-)

New commits:
commit 40157f6fa8950505a7ffd22e0b11696ccbd512ae
Author: Michael Stahl mst...@redhat.com
Date:   Thu Aug 9 22:18:42 2012 +0200

fdo#53154: fix report design wizard crash:

As described by Stephan in the bug report, the XAggregation usage in
OSection of SvxFmDrawPage is broken; replace it by explicit forwarding
of the XDrawPage, XShapeGrouper, XFormsSupplier2 methods; it seems
to fix the crash here.  Also get rid of horrid refcount manipulation
etc. while at it.

Change-Id: Ib08830d2092bd2026db5b57c1c2e165b946889b3
Signed-off-by: Lionel Elie Mamane lio...@mamane.lu

diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx
index e48cd25..7d7ab35 100644
--- a/reportdesign/inc/UndoEnv.hxx
+++ b/reportdesign/inc/UndoEnv.hxx
@@ -32,6 +32,8 @@
 #include com/sun/star/beans/PropertyChangeEvent.hpp
 #include com/sun/star/container/XContainerListener.hpp
 #include com/sun/star/report/XReportDefinition.hpp
+
+#include cppuhelper/compbase3.hxx
 #include memory
 #include svl/lstner.hxx
 
diff --git a/reportdesign/source/core/api/Section.cxx 
b/reportdesign/source/core/api/Section.cxx
index dd054af..8142bef 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -143,8 +143,6 @@ OSection::OSection(const uno::Reference 
report::XReportDefinition  _xParent
 OSection::~OSection()
 {
 DBG_DTOR( rpt_OSection,NULL);
-if ( m_xProxy.is() )
-m_xProxy-setDelegator( NULL );
 }
 //--
 //IMPLEMENT_FORWARD_XINTERFACE2(OSection,SectionBase,SectionPropertySet)
@@ -159,7 +157,7 @@ uno::Any SAL_CALL OSection::queryInterface( const 
uno::Type _rType ) throw (uno
 if ( !aReturn.hasValue()  
OReportControlModel::isInterfaceForbidden(_rType) )
 return aReturn;
 
-return aReturn.hasValue() ? aReturn : (m_xProxy.is() ? 
m_xProxy-queryAggregation(_rType) : aReturn);
+return aReturn;
 }
 
 // 
-
@@ -206,33 +204,18 @@ void OSection::init()
 {
 uno::Reference report::XReportDefinition xReport = getReportDefinition();
 ::boost::shared_ptrrptui::OReportModel pModel = 
OReportDefinition::getSdrModel(xReport);
-OSL_ENSURE(pModel,No odel set at the report definition!);
+assert(pModel); //No model set at the report definition!
 if ( pModel )
 {
-// DO NOT TOUCH THIS BLOCKS, WE HAVE A COMPILER PROBLEM UNDER SOLARIS X86
-osl_incrementInterlockedCount( m_refCount );
-{
-uno::Referencereport::XSection xTemp = this;
-{
-{
-
m_xProxy.set(pModel-createNewPage(xTemp)-getUnoPage(),uno::UNO_QUERY);
-}
-{
-::comphelper::query_aggregation(m_xProxy,m_xDrawPage);
-}
-
-// set ourself as delegator
-{
-if ( m_xProxy.is() )
-{
-m_xProxy-setDelegator( xTemp );
-}
-}
-}
-xTemp.clear();
-}
-// DO NOT TOUCH THIS BLOCKS, WE HAVE A COMPILER PROBLEM UNDER SOLARIS X86
-osl_decrementInterlockedCount( m_refCount );
+uno::Referencereport::XSection const xSection(this);
+m_xDrawPage.set(pModel-createNewPage(xSection)-getUnoPage(),
+uno::UNO_QUERY_THROW);
+m_xDrawPage_ShapeGrouper.set(m_xDrawPage, uno::UNO_QUERY_THROW);
+// apparently we may also get OReportDrawPage which doesn't support 
this
+m_xDrawPage_FormSupplier.set(m_xDrawPage, uno::UNO_QUERY);
+// createNewPage _should_ have stored away 2 uno::References to this,
+// so our ref count cannot be 1 here, so this isn't destroyed here
+assert(m_refCount  1);
 }
 }
 // 
-
@@ -546,14 +529,14 @@ uno::Type SAL_CALL OSection::getElementType(  ) throw 
(uno::RuntimeException)
 uno::Any SAL_CALL OSection::getByIndex( ::sal_Int32 Index ) throw 
(lang::IndexOutOfBoundsException, lang::WrappedTargetException, 
uno::RuntimeException)
 {
 ::osl::MutexGuard aGuard(m_aMutex);
-return m_xDrawPage-getByIndex(Index);
+return m_xDrawPage.is() ? m_xDrawPage-getByIndex(Index) : uno::Any();
 }
 // 
-
 // XEnumerationAccess
 uno::Reference container::XEnumeration  SAL_CALL 
OSection::createEnumeration(  ) throw (uno::RuntimeException)
 {
 ::osl::MutexGuard aGuard(m_aMutex);
-return new

[ Patch ] fdo#37791 Insert selected text to Findbar by Ctrl+f

2012-08-10 Thread zolniatamas


Hi,

  At last I managed to get Findbar to behave with Ctrl+f as excepted.  
Details in patch description.



Regards,
Zolnai TamásFrom 7403288c94b25ce3391d0d0fcc7624b68dd8316a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolnai=20Tam=C3=A1s?= zolniata...@caesar.elte.hu
Date: Fri, 10 Aug 2012 09:32:03 +0200
Subject: [PATCH] fdo#37791 Insert selected text to Findbar by Ctrl+f

The dispatch function of FindbarDispatcher class is called when
Ctrl+f is pressed. This function makes Toolbar visible and takes
focus to TextField. So expand this function to insert the selected
text to TextField at the same time. With dynamic_cast convert
Window pointer, which point to the TextField and call TextField's new
function: SetTextToSelected_Impl(), which makes the mentioned
insertion.
Plus make a little cleanup. Replace one string, which is defined by
a macro.

Change-Id: I2a8a3b10a016f5b28ea58fa3e63a3f31c9a816bf
---
 svx/inc/tbunosearchcontrollers.hxx |1 +
 svx/source/tbxctrls/tbunosearchcontrollers.cxx |   50 +++-
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx
index 032662c..3cd6b859 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -64,6 +64,7 @@ public:
 
 void InitControls_Impl();
 void Remember_Impl(const String rStr);
+void SetTextToSelected_Impl();
 
 private:
 
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index e58bd7f..088e0ab 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -115,6 +115,32 @@ void FindTextFieldControl::Remember_Impl(const String rStr)
 InsertEntry(rStr, 0);
 }
 
+void FindTextFieldControl::SetTextToSelected_Impl()
+{
+String aString;
+
+try
+{
+css::uno::Referencecss::frame::XController xController(m_xFrame-getController(), css::uno::UNO_QUERY_THROW);
+css::uno::Referencecss::frame::XModel xModel(xController-getModel(), css::uno::UNO_QUERY_THROW);
+css::uno::Referencecss::container::XIndexAccess xIndexAccess(xModel-getCurrentSelection(), css::uno::UNO_QUERY_THROW);
+if (xIndexAccess-getCount()  0)
+{
+css::uno::Referencecss::text::XTextRange xTextRange(xIndexAccess-getByIndex(0), css::uno::UNO_QUERY_THROW);
+aString = xTextRange-getString();
+}
+}
+catch ( ... )
+{
+}
+
+if ( aString.Len() != 0 )
+{
+SetText( aString );
+m_bToClearTextField = sal_False;
+}
+}
+
 void FindTextFieldControl::Modify()
 {
 ComboBox::Modify();
@@ -184,24 +210,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent rNEvt )
 case EVENT_GETFOCUS:
 if ( m_bToClearTextField )
 {
-String aString;
-
-try
-{
-css::uno::Referencecss::frame::XController xController(m_xFrame-getController(), css::uno::UNO_QUERY_THROW);
-css::uno::Referencecss::frame::XModel xModel(xController-getModel(), css::uno::UNO_QUERY_THROW);
-css::uno::Referencecss::container::XIndexAccess xIndexAccess(xModel-getCurrentSelection(), css::uno::UNO_QUERY_THROW);
-if (xIndexAccess-getCount()  0)
-{
-css::uno::Referencecss::text::XTextRange xTextRange(xIndexAccess-getByIndex(0), css::uno::UNO_QUERY_THROW);
-aString = xTextRange-getString();
-}
-}
-catch ( ... )
-{
-}
-
-SetText( aString );
+SetText( String() );
 m_bToClearTextField = sal_False;
 }
 SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
@@ -738,11 +747,14 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL aURL, const css
 for ( sal_uInt16 i=0; inItemCount; ++i )
 {
 ::rtl::OUString sItemCommand = pToolBox-GetItemCommand(i);
-if ( sItemCommand == .uno:FindText )
+if ( sItemCommand == COMMAND_FINDTEXT )
 {
 Window* pItemWin = pToolBox-GetItemWindow( i );
 if ( pItemWin )
 {
+FindTextFieldControl* pFindTextFieldControl = dynamic_castFindTextFieldControl*(pItemWin);
+if ( pFindTextFieldControl )
+pFindTextFieldControl-SetTextToSelected_Impl();
 pItemWin-GrabFocus();
 return;
 }
-- 
1.7.7

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

Re: gerrit and Change-IDs - is everyone supposed to manually install a commit-hook?

2012-08-10 Thread Christian Lohmaier

Hi Björn, *,

On Fri, Aug 10, 2012 at 2:58 AM, Bjoern Michaelsen
bjoern.michael...@canonical.com wrote:
 On Fri, Aug 10, 2012 at 02:16:37AM +0200, Christian Lohmaier wrote:
 So is everyone supposed to install a commit-hook locally?
 [...]
 Usually one of the initial scripts (./download ?) do that for you. To be 
 safe, you can always run

Ah, that explains.
I don't trust git (or my abilities with git) so that I keep a vanilla
repo for doing the actual commits/pushes...

  ./g -z

 which should do the trick.

Thanks a lot.

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

[REVIEW 3-6] fdo#42470 honor --nodefault

Please consider backporting the rather trivial fix 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=0cfed166261968068abbed485ceffd67ca5cbf61 
fdo#42470: Do not show backing window on --nodefault to 
libreoffice-3-6.  Might keep the mob happy :P


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

Re: [ Patch ] fdo#37791 Insert selected text to Findbar by Ctrl+f

Hi Tamas,

On Fri, Aug 10, 2012 at 10:19:19AM +0200, zolniata...@caesar.elte.hu wrote:
 +String aString;

I know this is copied from existing code, but if you are at it, can't
you turn this into an OUString? most probably it'll work out of the box,
you just need to rename the class.

(See
http://wiki.documentfoundation.org/Development/String_Classes#Deprecated
)

 -SetText( aString );
 +SetText( String() );

Here as well.

 -if ( sItemCommand == .uno:FindText )
 +if ( sItemCommand == COMMAND_FINDTEXT )

Good catch. :)

Care to resubmit with this change, please?

Thanks,

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

[Libreoffice-commits] .: svx/inc

 svx/inc/svx/svdpage.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 7f01893356d1bd8882bde5c7df27f00073854514
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 10 10:46:27 2012 +0200

Remove misleading comment

... as f7f34c29aada422e54c5835eb4df610b7d2a627c INTEGRATION: CWS impress144
(1.6.104); FILE MERGED: 2008/06/07 16:54:05 cl 1.6.104.1: #i88525# keep
SvxUnoDrawPage wrapper for as long as the SvdPage lives had changed it from
WeakReference to Reference.

Change-Id: I14a46eb0a11e636a04d10d9743a14a1734f910af

diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx
index 19f9d35..e700f29 100644
--- a/svx/inc/svx/svdpage.hxx
+++ b/svx/inc/svx/svdpage.hxx
@@ -437,7 +437,6 @@ friend class ChXChartDocument;
 sal_Int32 nBordRgt; // Seitenrand rechts
 sal_Int32 nBordLwr; // Seitenrand unten
 
-// this is a weak reference to a possible living api wrapper for this page
 ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface  
mxUnoPage;
 
 protected:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANN] gerrit maildrop ready for testing

Hi,

the gerrit maildrop is ready for early beta testing. To upload a patch to
master, attach your git-format-patch patch and send a mail with a subject
starting with '[PATCH]' to:

 ger...@libreoffice.org

You patch should then be commited to master for review and you should get a
reply about it. If you want to upload a patch for another branch have the word
'branch' followed by the target branch in the subject. Example:

 [PATCH] heal the world for branch libreoffice-3-6

If you want to cherry-pick a commit (to a release-branch), start the subject
with '[CHERRYPICK]' and have to word 'commit' followed by the SHA to pick in
the subject:

 [CHERRYPICK] commit 8ec791316c1d90b25e85c94ad105e9cc62e568e2 for branch 
libreoffice-3-5

Additional words in the subject line and the body are ignored.

Please test vicously with your next patches, so the rough edges can be fixed
before we subject this on the general public.

The code lives at:

 
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/patchpickup;h=cd5f3f95514fc219e20b5a88e8e0810b7b293034;hb=HEAD

patches are most welcome (best via gerrit).

Best,

Bjoern

P.S.:
Known issues:
- currently only the core repo is a valid target
- cherry-pick doesnt rewrite the change-id, thus something reviewed on master
  cant yet be cherry-pick with this yet
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [ Patch ] fdo#37791 Insert selected text to Findbar by Ctrl+f

2012-08-10 Thread zolniatamas


Hi, Miklós

  Required changes have done.


Regards,
Zolnai Tamás

From 44e45fc2f99c78b014952dbe3d38e7822ae2340f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolnai=20Tam=C3=A1s?= zolniata...@caesar.elte.hu
Date: Fri, 10 Aug 2012 09:32:03 +0200
Subject: [PATCH] fdo#37791 Insert selected text to Findbar by Ctrl F

The dispatch function of FindbarDispatcher class is called when
Ctrl+f is pressed. This function makes Toolbar visible and takes
focus to TextField. So expand this function to insert the selected
text to TextField at the same time. With dynamic_cast convert
Window pointer, which point to the TextField and call TextField's new
function: SetTextToSelected_Impl(), which makes the mentioned
insertion.
Plus make a little cleanup. Replace one string, which is defined by
a macro.

Change-Id: I2a8a3b10a016f5b28ea58fa3e63a3f31c9a816bf
---
 svx/inc/tbunosearchcontrollers.hxx |1 +
 svx/source/tbxctrls/tbunosearchcontrollers.cxx |   50 +++-
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx
index 032662c..3cd6b859 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -64,6 +64,7 @@ public:
 
 void InitControls_Impl();
 void Remember_Impl(const String rStr);
+void SetTextToSelected_Impl();
 
 private:
 
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index e58bd7f..bd18647 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -115,6 +115,32 @@ void FindTextFieldControl::Remember_Impl(const String rStr)
 InsertEntry(rStr, 0);
 }
 
+void FindTextFieldControl::SetTextToSelected_Impl()
+{
+::rtl::OUString aString;
+
+try
+{
+css::uno::Referencecss::frame::XController xController(m_xFrame-getController(), css::uno::UNO_QUERY_THROW);
+css::uno::Referencecss::frame::XModel xModel(xController-getModel(), css::uno::UNO_QUERY_THROW);
+css::uno::Referencecss::container::XIndexAccess xIndexAccess(xModel-getCurrentSelection(), css::uno::UNO_QUERY_THROW);
+if (xIndexAccess-getCount()  0)
+{
+css::uno::Referencecss::text::XTextRange xTextRange(xIndexAccess-getByIndex(0), css::uno::UNO_QUERY_THROW);
+aString = xTextRange-getString();
+}
+}
+catch ( ... )
+{
+}
+
+if ( aString.getLength() != 0 )
+{
+SetText( aString );
+m_bToClearTextField = sal_False;
+}
+}
+
 void FindTextFieldControl::Modify()
 {
 ComboBox::Modify();
@@ -184,24 +210,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent rNEvt )
 case EVENT_GETFOCUS:
 if ( m_bToClearTextField )
 {
-String aString;
-
-try
-{
-css::uno::Referencecss::frame::XController xController(m_xFrame-getController(), css::uno::UNO_QUERY_THROW);
-css::uno::Referencecss::frame::XModel xModel(xController-getModel(), css::uno::UNO_QUERY_THROW);
-css::uno::Referencecss::container::XIndexAccess xIndexAccess(xModel-getCurrentSelection(), css::uno::UNO_QUERY_THROW);
-if (xIndexAccess-getCount()  0)
-{
-css::uno::Referencecss::text::XTextRange xTextRange(xIndexAccess-getByIndex(0), css::uno::UNO_QUERY_THROW);
-aString = xTextRange-getString();
-}
-}
-catch ( ... )
-{
-}
-
-SetText( aString );
+SetText( ::rtl::OUString() );
 m_bToClearTextField = sal_False;
 }
 SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
@@ -738,11 +747,14 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL aURL, const css
 for ( sal_uInt16 i=0; inItemCount; ++i )
 {
 ::rtl::OUString sItemCommand = pToolBox-GetItemCommand(i);
-if ( sItemCommand == .uno:FindText )
+if ( sItemCommand == COMMAND_FINDTEXT )
 {
 Window* pItemWin = pToolBox-GetItemWindow( i );
 if ( pItemWin )
 {
+FindTextFieldControl* pFindTextFieldControl = dynamic_castFindTextFieldControl*(pItemWin);
+if ( pFindTextFieldControl )
+pFindTextFieldControl-SetTextToSelected_Impl();
 pItemWin-GrabFocus();
 return;
 }
-- 
1.7.7

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

[REVIEW 3.6] vertically align and enlarge fields in cond.formatting dialog

Hi,

Please consider backporting to 3.6 this trivial fix
http://cgit.freedesktop.org/libreoffice/core/commit/?id=63e0644040536558df92e7598e70a56bb5a3422f

It make the Conditional Formating Dialog more readable, specifically for
FR localization.

Best regards.
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.

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

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

 svx/inc/tbunosearchcontrollers.hxx |1 
 svx/source/tbxctrls/tbunosearchcontrollers.cxx |   50 +++--
 2 files changed, 32 insertions(+), 19 deletions(-)

New commits:
commit 31b18677987eb82169730750670faf8409206e8c
Author: Zolnai TamÃ¡s zolniata...@caesar.elte.hu
Date:   Fri Aug 10 09:32:03 2012 +0200

fdo#37791 Insert selected text to Findbar by Ctrl F

The dispatch function of FindbarDispatcher class is called when
Ctrl+f is pressed. This function makes Toolbar visible and takes
focus to TextField. So expand this function to insert the selected
text to TextField at the same time. With dynamic_cast convert
Window pointer, which point to the TextField and call TextField's new
function: SetTextToSelected_Impl(), which makes the mentioned
insertion.
Plus make a little cleanup. Replace one string, which is defined by
a macro.

Change-Id: I2a8a3b10a016f5b28ea58fa3e63a3f31c9a816bf

diff --git a/svx/inc/tbunosearchcontrollers.hxx 
b/svx/inc/tbunosearchcontrollers.hxx
index 0118f51..8fb7d33 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -65,6 +65,7 @@ public:
 
 void InitControls_Impl();
 void Remember_Impl(const String rStr);
+void SetTextToSelected_Impl();
 
 private:
 
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx 
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 6752dac..382e042 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -115,6 +115,32 @@ void FindTextFieldControl::Remember_Impl(const String 
rStr)
 InsertEntry(rStr, 0);
 }
 
+void FindTextFieldControl::SetTextToSelected_Impl()
+{
+OUString aString;
+
+try
+{
+css::uno::Referencecss::frame::XController 
xController(m_xFrame-getController(), css::uno::UNO_QUERY_THROW);
+css::uno::Referencecss::frame::XModel 
xModel(xController-getModel(), css::uno::UNO_QUERY_THROW);
+css::uno::Referencecss::container::XIndexAccess 
xIndexAccess(xModel-getCurrentSelection(), css::uno::UNO_QUERY_THROW);
+if (xIndexAccess-getCount()  0)
+{
+css::uno::Referencecss::text::XTextRange 
xTextRange(xIndexAccess-getByIndex(0), css::uno::UNO_QUERY_THROW);
+aString = xTextRange-getString();
+}
+}
+catch ( ... )
+{
+}
+
+if ( aString.getLength() != 0 )
+{
+SetText( aString );
+m_bToClearTextField = sal_False;
+}
+}
+
 void FindTextFieldControl::Modify()
 {
 ComboBox::Modify();
@@ -184,24 +210,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent rNEvt )
 case EVENT_GETFOCUS:
 if ( m_bToClearTextField )
 {
-String aString;
-
-try
-{
-css::uno::Referencecss::frame::XController 
xController(m_xFrame-getController(), css::uno::UNO_QUERY_THROW);
-css::uno::Referencecss::frame::XModel 
xModel(xController-getModel(), css::uno::UNO_QUERY_THROW);
-css::uno::Referencecss::container::XIndexAccess 
xIndexAccess(xModel-getCurrentSelection(), css::uno::UNO_QUERY_THROW);
-if (xIndexAccess-getCount()  0)
-{
-css::uno::Referencecss::text::XTextRange 
xTextRange(xIndexAccess-getByIndex(0), css::uno::UNO_QUERY_THROW);
-aString = xTextRange-getString();
-}
-}
-catch ( ... )
-{
-}
-
-SetText( aString );
+SetText( OUString() );
 m_bToClearTextField = sal_False;
 }
 SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
@@ -758,11 +767,14 @@ void SAL_CALL FindbarDispatcher::dispatch( const 
css::util::URL aURL, const css
 for ( sal_uInt16 i=0; inItemCount; ++i )
 {
 ::rtl::OUString sItemCommand = pToolBox-GetItemCommand(i);
-if ( sItemCommand == .uno:FindText )
+if ( sItemCommand == COMMAND_FINDTEXT )
 {
 Window* pItemWin = pToolBox-GetItemWindow( i );
 if ( pItemWin )
 {
+FindTextFieldControl* pFindTextFieldControl = 
dynamic_castFindTextFieldControl*(pItemWin);
+if ( pFindTextFieldControl )
+pFindTextFieldControl-SetTextToSelected_Impl();
 pItemWin-GrabFocus();
 return;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED] fdo#37791 Insert selected text to Findbar by Ctrl+f

Hi Tamas,

On Fri, Aug 10, 2012 at 10:57:12AM +0200, zolniata...@caesar.elte.hu wrote:
 +::rtl::OUString aString;

Just for the future: you can use simply OUString here, in internal code
the ::rtl:: prefix is no longer necessary. (I corrected this before
pushing.)

 +if ( aString.getLength() != 0 )

Anothor minor nit, there is isEmpty() for this purpose (forgot to
correct it before pushing, just keep in mind for your next patch).

Other than that, nice work, thanks! :)

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

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

--- Comment #76 from Petr Mladek pmla...@suse.cz 2012-08-10 09:47:51 UTC ---
(In reply to comment #75)
 Please add this long standing bug
 Bug 40421 - PRINTING shapes with transparent(?) Bitmap background loses bezier
 curves

This bug is already listed as 3.5 MAB = we need not mention it here at these
stage.

-- 
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

fdo#52639: ServiceManager: check isDisposed():

From Michael Stahl mst...@redhat.com:

Michael Stahl has abandoned this change.

Change subject: fdo#52639: ServiceManager: check isDisposed():
..


Patch Set 1: Abandoned

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I473dd1824ee0cf8c4baddc027f86cf51fb0d3517
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

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

Re: [ANN] gerrit maildrop ready for testing


Hi Bjoern,

On 10.08.2012 12:55, Bjoern Michaelsen wrote:

the gerrit maildrop is ready for early beta testing.


Great!!


 If you want to upload a patch for another branch have the word
'branch' followed by the target branch in the subject. Example:

  [PATCH] heal the world for branch libreoffice-3-6


and what will happen if the branch word is inside a commit message?
raise Exception('%s does not look like a legal branch to me.' % 
self.branch) ?


Isn't this better:

 [PATCH 3-6] heal the world

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

[Libreoffice-commits] .: solenv/gbuild

 solenv/gbuild/ExtensionTarget.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ff795d058b36707ec65f8b6e159646e5c2c8c8c5
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 10 12:18:38 2012 +0200

One more cygwin symlink kludge needed

Change-Id: I0d7afd105ec093609fe1ecc9f19d541a43d77e9a

diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 2a434ef..105e58e 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -76,7 +76,7 @@ $(call gb_ExtensionTarget_get_workdir,%)/description.xml : 
$(gb_ExtensionTarget_
mkdir -p $(call gb_ExtensionTarget_get_workdir,$*)  \
$(gb_ExtensionTarget_XRMEXCOMMAND) \
-p $(PRJNAME) \
-   -i $(filter %.xml,$^) \
+   -i $(call gb_Helper_symlinked_native,$(filter 
%.xml,$^)) \
-o $@ \
-m $(SDF) \
-l all)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 37361] LibreOffice 3.5 most annoying bugs

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

Timur gti...@gmail.com changed:

   What|Removed |Added

 Depends on|36547, 45078|33591

--- Comment #354 from Timur gti...@gmail.com 2012-08-10 10:21:38 UTC ---
I deleted Bug36547 (DUPLICATE of Bug33591), added Bug33591 (FIXED), deleted
Bug45078 (DUPLICATE of Bug40289), added Bug40289 (NEW).

-- 
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

Re: [ANN] gerrit maildrop ready for testing


On 10.08.2012 14:13, Ivan Timofeev wrote:

 If you want to upload a patch for another branch have the word
'branch' followed by the target branch in the subject. Example:

  [PATCH] heal the world for branch libreoffice-3-6


and what will happen if the branch word is inside a commit message?
raise Exception('%s does not look like a legal branch to me.' %
self.branch) ?


Agrh, please ignore this nonsense, I am raving. It will pick the last 
occurrence of course.


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

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - vcl/source

2012-08-10 Thread Caolán McNamara

 vcl/source/window/window.cxx  |  310 -
 vcl/source/window/window2.cxx |  311 ++
 2 files changed, 311 insertions(+), 310 deletions(-)

New commits:
commit e1d839cf6ff963bb121882cd154c4df2f765a545
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Aug 10 11:31:09 2012 +0100

move from window.cxx to window2.cxx to build under windows

svsys.h on windows includes stuff that undefines WB_LEFT etc, sigh

Change-Id: I01dea9f1f6a4cf335402b04185047eeb99b07f9a

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 71ef16d..d969698 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -36,7 +36,6 @@
 #include unotools/confignode.hxx
 
 #include vcl/unohelp.hxx
-#include vcl/layout.hxx
 #include vcl/salgtype.hxx
 #include vcl/event.hxx
 #include vcl/help.hxx
@@ -9668,313 +9667,4 @@ Selection Window::GetSurroundingTextSelection() const
   return Selection( 0, 0 );
 }
 
-//When a widget wants to renegotiate size, get toplevel parent dialog and call
-//resize on it. Maybe better to just find direct parent and if its a container
-//chain it upwards one step at a time until a dialog is found.
-void Window::queue_resize()
-{
-Dialog *pParent = GetParentDialog();
-if (!pParent || pParent == this)
-return;
-if (pParent-isLayoutEnabled())
-pParent-Resize();
-}
-
-void Window::setChildAnyProperty(const rtl::OString rString, const Any 
rValue)
-{
-m_aWidgetProperties[rString] = rValue;
-}
-
-uno::Any Window::getWidgetAnyProperty(const rtl::OString rString) const
-{
-uno::Any aAny;
-ChildPropertyMap::const_iterator aI = m_aWidgetProperties.find(rString);
-if (aI != m_aWidgetProperties.end())
-aAny = aI-second;
-return aAny;
-}
-
-Size Window::get_preferred_size() const
-{
-Size aRet(mpWindowImpl-mnWidthRequest, mpWindowImpl-mnHeightRequest);
-if (aRet.Width() == -1 || aRet.Height() == -1)
-{
-Size aOptimal = GetOptimalSize(WINDOWSIZE_PREFERRED);
-if (aRet.Width() == -1)
-aRet.Width() = aOptimal.Width();
-if (aRet.Height() == -1)
-aRet.Height() = aOptimal.Height();
-}
-return aRet;
-}
-
-void Window::take_properties(Window rOther)
-{
-if (!mpWindowImpl)
-{
-ImplInitWindowData(WINDOW_WINDOW);
-ImplInit(rOther.GetParent(), rOther.GetStyle(), NULL);
-}
-
-WindowImpl *pWindowImpl = rOther.mpWindowImpl;
-if (!mpWindowImpl-mpRealParent)
-ImplInit(pWindowImpl-mpRealParent, rOther.GetStyle(), NULL);
-std::swap(mpWindowImpl-mpUserData, pWindowImpl-mpUserData);
-std::swap(mpWindowImpl-mpExtImpl, pWindowImpl-mpExtImpl);
-std::swap(mpWindowImpl-mpCursor, pWindowImpl-mpCursor);
-std::swap(mpWindowImpl-maPointer, pWindowImpl-maPointer);
-mpWindowImpl-maZoom = pWindowImpl-maZoom;
-mpWindowImpl-maText = pWindowImpl-maText;
-std::swap(mpWindowImpl-mpControlFont, pWindowImpl-mpControlFont);
-mpWindowImpl-maControlForeground = pWindowImpl-maControlForeground;
-mpWindowImpl-maControlBackground = pWindowImpl-maControlBackground;
-mpWindowImpl-mnLeftBorder = pWindowImpl-mnLeftBorder;
-mpWindowImpl-mnTopBorder = pWindowImpl-mnTopBorder;
-mpWindowImpl-mnRightBorder = pWindowImpl-mnRightBorder;
-mpWindowImpl-mnBottomBorder = pWindowImpl-mnBottomBorder;
-mpWindowImpl-mnWidthRequest = pWindowImpl-mnWidthRequest;
-mpWindowImpl-mnHeightRequest = pWindowImpl-mnHeightRequest;
-mpWindowImpl-mnX = pWindowImpl-mnX;
-mpWindowImpl-mnY = pWindowImpl-mnY;
-mpWindowImpl-mnAbsScreenX = pWindowImpl-mnAbsScreenX;
-mpWindowImpl-maPos = pWindowImpl-maPos;
-mpWindowImpl-maHelpId = pWindowImpl-maHelpId;
-mpWindowImpl-maUniqId = pWindowImpl-maUniqId;
-mpWindowImpl-maHelpText = pWindowImpl-maHelpText;
-mpWindowImpl-maQuickHelpText = pWindowImpl-maQuickHelpText;
-std::swap(mpWindowImpl-maInputContext, pWindowImpl-maInputContext);
-mpWindowImpl-mnStyle = pWindowImpl-mnStyle;
-mpWindowImpl-mnPrevStyle = pWindowImpl-mnPrevStyle;
-mpWindowImpl-mnExtendedStyle = pWindowImpl-mnExtendedStyle;
-mpWindowImpl-mnPrevExtendedStyle = pWindowImpl-mnPrevExtendedStyle;
-mpWindowImpl-mnType = pWindowImpl-mnType;
-mpWindowImpl-mnNativeBackground = pWindowImpl-mnNativeBackground;
-mpWindowImpl-mnWaitCount = pWindowImpl-mnWaitCount;
-mpWindowImpl-mnPaintFlags = pWindowImpl-mnPaintFlags;
-mpWindowImpl-mnGetFocusFlags = pWindowImpl-mnGetFocusFlags;
-mpWindowImpl-mnParentClipMode = pWindowImpl-mnParentClipMode;
-mpWindowImpl-mnActivateMode = pWindowImpl-mnActivateMode;
-mpWindowImpl-mnDlgCtrlFlags = pWindowImpl-mnDlgCtrlFlags;
-mpWindowImpl-mnLockCount = pWindowImpl-mnLockCount;
-mpWindowImpl-meAlwaysInputMode = pWindowImpl-meAlwaysInputMode;
-mpWindowImpl-mbFrame = pWindowImpl-mbFrame;
-mpWindowImpl-mbBorderWin =

[Libreoffice-commits] .: avmedia/source

 avmedia/source/viewer/mediawindowbase_impl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2bc36e14972a59e08f35b652e6970c2144cd557b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 10 12:36:28 2012 +0200

warning C4101: unreferenced local variable

Change-Id: Iaf3cc45545d4c2eedff12466c90eec1d442ae338

diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx 
b/avmedia/source/viewer/mediawindowbase_impl.cxx
index bc81869..daf26ad 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -76,7 +76,7 @@ uno::Reference media::XPlayer  
MediaWindowBaseImpl::createPlayer( const ::rtl:
 xManager = uno::Reference ::com::sun::star::media::XManager (
 xFactory-createInstance( AVMEDIA_MANAGER_SERVICE_NAME 
),
 uno::UNO_QUERY );
-} catch ( const uno::Exception e ) {
+} catch ( const uno::Exception  ) {
 }
 
 // a fallback path just for gstreamer which has
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - RepositoryExternal.mk liblangtag/makefile.mk

 RepositoryExternal.mk  |6 ++
 liblangtag/makefile.mk |   33 ++---
 2 files changed, 24 insertions(+), 15 deletions(-)

New commits:
commit de0b4bab96a4f078c38b6665a2f75096ff26c2ae
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Fri Aug 10 01:57:15 2012 +0200

cosmetics

Change-Id: Ie3f95efe013306637adbb336234266b10421ca24

diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk
index 038b74d..f244039 100644
--- a/liblangtag/makefile.mk
+++ b/liblangtag/makefile.mk
@@ -28,7 +28,7 @@ LIBLANGTAG_MICRO=0
 
 .IF $(SYSTEM_LIBLANGTAG) == YES
 @all:
-@echo Using system liblangtag.
+   @echo Using system liblangtag.
 .ENDIF
 
 TARFILE_NAME=liblangtag-$(LIBLANGTAG_MAJOR).$(LIBLANGTAG_MINOR)
@@ -50,13 +50,13 @@ my_prefix = 
@.__$(EXTRPATH)
 .ELSE
 my_prefix = install-liblangtag
 .END
-my_misc = $(shell @pwd)$/$(MISC)
+my_misc = $(shell @pwd)/$(MISC)
 my_install_sub = install
-my_destdir = $(my_misc)$/$(my_install_sub)
-my_install = $(my_destdir)$/$(my_prefix)
+my_destdir = $(my_misc)/$(my_install_sub)
+my_install = $(my_destdir)/$(my_prefix)
 # relative to $(MISC)/build/liblangtag/ for OUT2LIB, OUT2INC
-my_install_relative = ..$/..$/$(my_install_sub)$/$(my_prefix)
-my_data = $(my_install)$/share$/liblangtag
+my_install_relative = ../../$(my_install_sub)/$(my_prefix)
+my_data = $(my_install)/share/liblangtag
 
 CONFIGURE_FLAGS+= --prefix='/$(my_prefix)' --libdir='/$(my_prefix)/lib'
 
@@ -65,9 +65,9 @@ CONFIGURE_FLAGS+= --prefix='/$(my_prefix)' 
--libdir='/$(my_prefix)/lib'
 CONFIGURE_FLAGS+= --disable-introspection
 
 .IF $(SYSTEM_LIBXML)!=YES
-CONFIGURE_FLAGS+= LIBXML2_CFLAGS='-I$(SOLARINCDIR)$/external'
+CONFIGURE_FLAGS+= LIBXML2_CFLAGS='-I$(SOLARINCDIR)/external'
 .IF $(GUI)==WNT  $(COM)!=GCC
-CONFIGURE_FLAGS+= LIBXML2_LIBS='$(SOLARLIBDIR)$/libxml2.lib'
+CONFIGURE_FLAGS+= LIBXML2_LIBS='$(SOLARLIBDIR)/libxml2.lib'
 .ELSE
 CONFIGURE_FLAGS+= LIBXML2_LIBS='-L$(SOLARLIBDIR) -lxml2'
 .ENDIF
@@ -82,7 +82,7 @@ CONFIGURE_FLAGS+= LIBXML2_CFLAGS='$(LIBXML_CFLAGS)' 
LIBXML2_LIBS='$(LIBXML_LIBS)
 CONFIGURE_FLAGS+= LIBO_GLIB_CHEAT=YES
 CONFIGURE_FLAGS+= GLIB_CFLAGS='-I$(SOLARINCDIR)/external/glib-2.0'
 .IF $(GUI)==WNT  $(COM)!=GCC
-CONFIGURE_FLAGS+= GLIB_LIBS='$(SOLARLIBDIR)$/gio-2.0.lib 
$(SOLARLIBDIR)$/gobject-2.0.lib $(SOLARLIBDIR)$/gthread-2.0.lib 
$(SOLARLIBDIR)$/gmodule-2.0.lib $(SOLARLIBDIR)$/glib-2.0.lib'
+CONFIGURE_FLAGS+= GLIB_LIBS='$(SOLARLIBDIR)/gio-2.0.lib 
$(SOLARLIBDIR)/gobject-2.0.lib $(SOLARLIBDIR)/gthread-2.0.lib 
$(SOLARLIBDIR)/gmodule-2.0.lib $(SOLARLIBDIR)/glib-2.0.lib'
 .ELSE
 CONFIGURE_FLAGS+= GLIB_LIBS='-L$(SOLARLIBDIR) -lgio-2.0 -lgobject-2.0 
-lgthread-2.0 -lgmodule-2.0 -lglib-2.0'
 .IF $(OS) == MACOSX
@@ -95,7 +95,7 @@ CONFIGURE_FLAGS+= GOBJECT_QUERY=gobject-query
 CONFIGURE_FLAGS+= --disable-glibtest
 .ENDIF
 
-CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) .$/configure
+CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure
 
 BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)  \
 $(AUGMENT_LIBRARY_PATH) $(GNUMAKE) install 
DESTDIR=$(my_destdir)
@@ -118,15 +118,15 @@ PATCH_FILES+=liblangtag-0.2-msc-configure.patch
 .ENDIF # $(GUI)==WNT
 
 
-OUT2INC += $(my_install_relative)$/include$/liblangtag$/*
+OUT2INC += $(my_install_relative)/include/liblangtag/*
 
 .IF $(GUI)==WNT  $(COM)!=GCC
-OUT2LIB += $(my_install_relative)$/lib$/langtag.lib*
+OUT2LIB += $(my_install_relative)/lib/langtag.lib*
 .ELSE
 .IF $(OS) == MACOSX
-OUT2LIB += $(my_install_relative)$/lib$/liblangtag*.dylib
+OUT2LIB += $(my_install_relative)/lib/liblangtag*.dylib
 .ELSE
-OUT2LIB += $(my_install_relative)$/lib$/liblangtag.so*
+OUT2LIB += $(my_install_relative)/lib/liblangtag.so*
 .ENDIF
 .ENDIF
 
@@ -142,4 +142,4 @@ ALLTAR: $(MISC)/liblangtag_data.zip
 $(MISC)/liblangtag_data.zip: $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
@-rm -f $@
@echo creating $@
-   $(COMMAND_ECHO)cd $(my_data)  zip $(ZIP_VERBOSITY) -r 
$(my_misc)$/$(@:f) *
+   $(COMMAND_ECHO)cd $(my_data)  zip $(ZIP_VERBOSITY) -r 
$(my_misc)/$(@:f) *
commit 2e7387d828fe05300ad6fa96943357f953fd3bdd
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Fri Aug 10 01:56:34 2012 +0200

help XCode 2.5 resolve @loader_path/libfoo.dylib

Change-Id: I81837acd40f306c2db03f54f3896b79bb7fcbb08

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a07bdff..2fd6e5e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -485,6 +485,12 @@ $(call gb_LinkTarget_use_libraries,$(1),\
langtag \
 )
 
+ifeq ($(OS),MACOSX)
+
+$(call gb_LinkTarget_add_libs,$(1),$(foreach replaceme,libglib-2.0.0 
libgmodule-2.0.0,-dylib_file 
@loader_path/$(replaceme).dylib:$(gb_Library_OUTDIRLOCATION)/$(replaceme).dylib))
+
+endif
+
 endef
 
 endif # SYSTEM_LIBLANGTAG
diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk
index f710476..038b74d 100644
--- a/liblangtag/makefile.mk
+++

Re: [ANN] gerrit maildrop ready for testing


On 08/10/2012 10:55 AM, Bjoern Michaelsen wrote:

the gerrit maildrop is ready for early beta testing. To upload a patch to
master, attach your git-format-patch patch and send a mail with a subject
starting with '[PATCH]' to:


...starting with '[PATCH]' but apparently also required to not contain 
branch XXX -- can't we use an information encoding that is less 
ambiguous and error prone?


Stephan


  ger...@libreoffice.org

You patch should then be commited to master for review and you should get a
reply about it. If you want to upload a patch for another branch have the word
'branch' followed by the target branch in the subject. Example:

  [PATCH] heal the world for branch libreoffice-3-6


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

Re: [ANN] gerrit maildrop ready for testing

On Fri, Aug 10, 2012 at 02:13:15PM +0400, Ivan Timofeev wrote:
 and what will happen if the branch word is inside a commit message?
 raise Exception('%s does not look like a legal branch to me.' %
 self.branch) ?

Nothing. The commit message is ignored when deciding where to go with the
commit. ONLY the subject is used for deciding on what to do with the mail.
Otherwise you would indeed have unfortunate restrictions on the commit message.

Best,

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

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

 starmath/inc/document.hxx|2 +-
 starmath/source/document.cxx |3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 9495316659018427ac8d6bc0b6427600ba0ce01e
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri Aug 10 13:06:30 2012 +0200

SmDocShell::readFormulaOoxml: yes, just void

Change-Id: I2d5bc00c01318a23c604d93ffe6ce9dd0b72b3c2

diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 62e26f5..4d98b82 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -157,7 +157,7 @@ class SmDocShell : public SfxObjectShell, public SfxListener
 
 bool writeFormulaOoxml( ::sax_fastparser::FSHelperPtr pSerializer, 
oox::core::OoxmlVersion version );
 void writeFormulaRtf(OStringBuffer rBuffer, rtl_TextEncoding nEncoding);
-bool readFormulaOoxml( oox::formulaimport::XmlStream stream );
+void readFormulaOoxml( oox::formulaimport::XmlStream stream );
 
 public:
 TYPEINFO();
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index adc8271..da9dd3e 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -993,13 +993,12 @@ void SmDocShell::writeFormulaRtf(OStringBuffer rBuffer, 
rtl_TextEncoding nEncod
 aEquation.ConvertFromStarMath(rBuffer, nEncoding);
 }
 
-bool SmDocShell::readFormulaOoxml( oox::formulaimport::XmlStream stream )
+void SmDocShell::readFormulaOoxml( oox::formulaimport::XmlStream stream )
 {
 RTL_LOGFILE_CONTEXT( aLog, starmath: SmDocShell::readFormulaOoxml );
 
 SmOoxmlImport aEquation( stream );
 SetText( aEquation.ConvertToStarMath());
-return true; // TODO just void?
 }
 
 sal_Bool SmDocShell::SaveCompleted( const ::com::sun::star::uno::Reference 
::com::sun::star::embed::XStorage  xStorage )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/aqua

2012-08-10 Thread Christian Lohmaier

 vcl/aqua/source/gdi/salatslayout.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit febf7c52d5231cbe22340b7e3fec70854945ee31
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Fri Aug 10 13:16:58 2012 +0200

WaE: unused variable

see a9e58e29f65df820d133022c5cb15387075d6b37
not cherry-picked as file was moved on master

Change-Id: Ibb74e51a1bcba6f0fd532186767124d55e061f67

diff --git a/vcl/aqua/source/gdi/salatslayout.cxx 
b/vcl/aqua/source/gdi/salatslayout.cxx
index 8dcd70f..f368f51 100644
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/salatslayout.cxx
@@ -883,6 +883,7 @@ bool ATSLayout::GetBoundRect( SalGraphics rGraphics, 
Rectangle rVCLRect ) cons
 
 DBG_ASSERT( (numcontrols = nMaxControls), ATSLayout::GetBoundRect() 
numcontrols overflow );
 OSStatus theErr = ATSUSetLayoutControls (maATSULayout, numcontrols, 
theTags, theSizes, theValues);
+(void) theErr;
 DBG_ASSERT( (theErr==noErr), ATSLayout::GetBoundRect 
ATSUSetLayoutControls failed!\n );
 
 Rect aMacRect;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 cppuhelper/source/defaultbootstrap.cxx |  101 ++---
 desktop/source/app/app.cxx |4 +
 sw/source/ui/misc/redlndlg.cxx |2 
 3 files changed, 61 insertions(+), 46 deletions(-)

New commits:
commit 298b8c500a143211d122046075254c621571e7c8
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 10 09:06:08 2012 +0200

fdo#42470: Do not show backing window on --nodefault

Change-Id: Id265dc84de454568ea8194703687c68449e9a32b
(cherry picked from commit 0cfed166261968068abbed485ceffd67ca5cbf61)

Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 66e809b..263ca3f 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2988,6 +2988,10 @@ void Desktop::DoFirstRunInitializations()
 
 void Desktop::ShowBackingComponent(Desktop * progress)
 {
+if (GetCommandLineArgs().IsNoDefault())
+{
+return;
+}
 Reference XMultiServiceFactory  xSMgr(
 comphelper::getProcessServiceFactory(), UNO_SET_THROW);
 Reference XFrame  xDesktopFrame(
commit fdcd1655b1648f078289c5ac8a1c075c71e6e6df
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 9 17:44:14 2012 +0200

Related fdo#52639: Do not destroy Implementations with mutex locked

Erasing from data_ member maps can destroy contained Implementations, which 
in
turn releases the UNO objects referenced from there, which in turn can cause
XComponents to dispose, which in turn can call arbitrary code, so must not 
be
done with rMutex locked.  Witness the backtrace at
https://bugs.freedesktop.org/attachment.cgi?id=65142 linked from fdo#52639
(where this fix appears otherwise unrelated to that issue's main topic).

Change-Id: If55a3841b761ec1d9a0ef61fe54784426c4ee442
(cherry picked from commit 142d3ec875b446b56d0071c59d00937dea0cdd61)

Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/cppuhelper/source/defaultbootstrap.cxx 
b/cppuhelper/source/defaultbootstrap.cxx
index 151a36e..c3bdba3 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -1346,7 +1346,7 @@ void ServiceManager::disposing(css::lang::EventObject 
const  Source)
 
 void ServiceManager::disposing() {
 std::vector css::uno::Reference css::lang::XComponent   comps;
-css::uno::Reference css::lang::XEventListener  listener;
+Data clear;
 {
 osl::MutexGuard g(rBHelper.rMutex);
 for (DynamicImplementations::const_iterator i(
@@ -1358,10 +1358,10 @@ void ServiceManager::disposing() {
 comps.push_back(i-second-component);
 }
 }
-data_.namedImplementations.clear();
-data_.dynamicImplementations.clear();
-data_.services.clear();
-data_.singletons.clear();
+data_.namedImplementations.swap(clear.namedImplementations);
+data_.dynamicImplementations.swap(clear.dynamicImplementations);
+data_.services.swap(clear.services);
+data_.singletons.swap(clear.singletons);
 }
 for (std::vector
  css::uno::Reference css::lang::XComponent  ::const_iterator i(
@@ -1733,25 +1733,30 @@ void ServiceManager::removeRdbFiles(std::vector 
rtl::OUString  const  uris) {
 // The underlying data structures make this function somewhat inefficient,
 // but the assumption is that it is rarely called (and that if it is 
called,
 // it is called with a uris vector of size one):
-osl::MutexGuard g(rBHelper.rMutex);
-for (std::vector rtl::OUString ::const_iterator i(uris.begin());
- i != uris.end(); ++i)
+std::vector boost::shared_ptr Implementation   clear;
 {
-for (NamedImplementations::iterator j(
- data_.namedImplementations.begin());
- j != data_.namedImplementations.end();)
+osl::MutexGuard g(rBHelper.rMutex);
+for (std::vector rtl::OUString ::const_iterator i(uris.begin());
+ i != uris.end(); ++i)
 {
-assert(j-second.get() != 0);
-if (j-second-info-uri == *i) {
-//TODO: The below leaves data_ in an inconsistent state upon
-// exceptions:
-removeFromImplementationMap(
-data_.services, j-second-info-services, j-second);
-removeFromImplementationMap(
-data_.singletons, j-second-info-singletons, j-second);
-data_.namedImplementations.erase(j++);
-} else {
-++j;
+for (NamedImplementations::iterator j(
+ data_.namedImplementations.begin());
+ j != data_.namedImplementations.end();)
+{
+assert(j-second.get() != 0);
+if (j-second-info-uri == *i) {
+clear.push_back(j-second);
+//TODO: The below

[Libreoffice-commits] .: officecfg/registry sd/Library_sdui.mk sd/source

2012-08-10 Thread Andrzej J.R. Hunt

 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
2 
 sd/Library_sdui.mk   |
1 
 sd/source/ui/dlg/RemoteDialog.cxx|   
32 
 sd/source/ui/dlg/RemoteDialog.hxx|   
42 
 sd/source/ui/dlg/RemoteDialog.src|   
22 
 sd/source/ui/dlg/RemoteDialogClientBox.cxx   |  
895 ++
 sd/source/ui/dlg/RemoteDialogClientBox.hxx   |  
194 ++
 sd/source/ui/inc/RemoteDialog.hrc|
7 
 sd/source/ui/inc/RemoteDialog.hxx|   
34 
 sd/source/ui/inc/RemoteServer.hxx|   
18 
 sd/source/ui/remotecontrol/RemoteDialog.cxx  |   
20 
 sd/source/ui/remotecontrol/RemoteDialog.hxx  |   
29 
 sd/source/ui/remotecontrol/Server.cxx|   
14 
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx   |
1 
 14 files changed, 1217 insertions(+), 94 deletions(-)

New commits:
commit 2d63c4689a13599ec9389c370726005f01fea08c
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Fri Aug 10 13:27:40 2012 +0200

Basic Impress Remote + linking of dialog and server.

Change-Id: Ifd69df9ccfb5b6a78044b002b6ec5bf1f12b6faa

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index cc55a9e..3c78ec6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -45,7 +45,7 @@
   node oor:name=.uno:Remote oor:op=replace
 prop oor:name=Label oor:type=xs:string
 
-  value xml:lang=en-USImpress ~Remote/value
+  value xml:lang=en-USImpress R~emote/value
 /prop
 prop oor:name=Properties oor:type=xs:int
   value1/value
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index 1e1cb5b..7044a98 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -83,6 +83,7 @@ $(eval $(call gb_Library_add_exception_objects,sdui,\
 sd/source/ui/dlg/prltempl \
 sd/source/ui/dlg/prntopts \
 sd/source/ui/dlg/RemoteDialog \
+sd/source/ui/dlg/RemoteDialogClientBox \
 sd/source/ui/dlg/sddlgfact \
 sd/source/ui/dlg/sdpreslt \
 sd/source/ui/dlg/sduiexp \
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx 
b/sd/source/ui/dlg/RemoteDialog.cxx
index 69894ec..85d5ad2 100644
--- a/sd/source/ui/dlg/RemoteDialog.cxx
+++ b/sd/source/ui/dlg/RemoteDialog.cxx
@@ -7,25 +7,47 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include svl/itemset.hxx
-
 #include sdattr.hxx
 #include sdresid.hxx
 #include cusshow.hxx
 
 #include RemoteDialog.hxx
 #include RemoteDialog.hrc
+#include RemoteServer.hxx
 
-using namespace sd;
+using namespace ::sd;
+using namespace ::std;
 
 RemoteDialog::RemoteDialog( Window *pWindow ) :
-ModalDialog ( pWindow, SdResId( DLG_PAIR_REMOTE ) )
+ModalDialog( pWindow, SdResId( DLG_PAIR_REMOTE ) ),
+mButtonConnect( this, SdResId( BTN_CONNECT ) ),
+mButtonCancel(  this, SdResId( BTN_CANCEL ) ),
+mClientBox( this, NULL, SdResId( LB_SERVERS ) )
 {
-FreeResource();
+ FreeResource();
+
+vectorClientInfo aClients( RemoteServer::getClients() );
+
+for ( vectorClientInfo::const_iterator aIt( aClients.begin() );
+aIt  aClients.end(); aIt++ )
+{
+mClientBox.addEntry( *aIt );
+}
+
+mButtonConnect.SetClickHdl( LINK( this, RemoteDialog, HandleConnectButton 
) );
 }
 
 RemoteDialog::~RemoteDialog()
 {
 }
 
+// ---
+IMPL_LINK_NOARG(RemoteDialog, HandleConnectButton)
+{
+// setBusy( true );
+// Fixme: Try and connect
+
+return 1;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/sd/source/ui/dlg/RemoteDialog.hxx 
b/sd/source/ui/dlg/RemoteDialog.hxx
new file mode 100644
index 000..87782a6
--- /dev/null
+++ b/sd/source/ui/dlg/RemoteDialog.hxx
@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ */
+#ifndef _SD_REMOTEDIALOG_HXX_
+#define _SD_REMOTEDIALOG_HXX_
+
+#include vcl/lstbox.hxx
+#include vcl/fixed.hxx
+#include vcl/button.hxx
+#include vcl/dialog.hxx
+#include vcl/field.hxx
+#include svtools/svtreebx.hxx
+
+#include RemoteDialogClientBox.hxx
+
+namespace sd
+{
+
+class

[PUSHED][3-6] Re: [REVIEW 3-6] service manager dispose issue

On 09/08/12 18:06, Stephan Bergmann wrote:
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=142d3ec875b446b56d0071c59d00937dea0cdd61
  
 Related fdo#52639: Do not destroy Implementations with mutex locked 
 addresses a crash on exit documented at 
 https://bugs.freedesktop.org/show_bug.cgi?id=52639#c14 ReportBuilder: 
 Creating a new report destroys .odb (but apparently unrelated to that 
 issue's main topic).  It is a regression introduced with the new service 
 manager in LO 3.6.0, so please review and backport to libreoffice-3-6.

h so the real problem is that ServiceManager shouldn't release
references while it's in the middle of deleting its own members, because
that will invoke destructors and half of our application logic is in
destructors.

pushed to libreoffice-3-6


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

[PUSHED][3-6] Re: [REVIEW 3-6] fdo#42470 honor --nodefault

On 10/08/12 10:19, Stephan Bergmann wrote:
 Please consider backporting the rather trivial fix 
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=0cfed166261968068abbed485ceffd67ca5cbf61
  
 fdo#42470: Do not show backing window on --nodefault to 
 libreoffice-3-6.  Might keep the mob happy :P

it appears making the mob happy is a lucrative endeavour :)

pushed to libreoffice-3-6


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

[ANN] LibreOffice 3.5.6 RC2 available

2012-08-10 Thread Thorsten Behrens

Dear Community,

The Document Foundation is happy to announce the second release
candidate of LibreOffice 3.5.6. The upcoming 3.5.6 will be the sixth
in a series of frequent bugfix releases for our 3.5 code line. Please
be aware that LibreOffice 3.5.6 RC2 is not yet ready for production
use, you should continue to use LibreOffice 3.5.5 for that.

The release is available for Windows, Linux and Mac OS X from our QA
builds download page at

  http://www.libreoffice.org/download/pre-releases/

Should you find bugs, please report them to the FreeDesktop Bugzilla:

  https://bugs.freedesktop.org

A good way to assess the beta quality is to run some specific manual
tests on it, our TCM wiki page has more details:

 
http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test

 (and the announcement mail: 
http://lists.freedesktop.org/archives/libreoffice/2011-December/022464.html)
 
For other ways to get involved with this exciting project - you can
e.g. contribute code:

  http://www.libreoffice.org/get-involved/developers/

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/Translation_for_3.5

or help with funding our operations:

  http://challenge.documentfoundation.org/

A list of known issues and fixed bugs with 3.5.6 RC2 is available
from our wiki:

  http://wiki.documentfoundation.org/Releases/3.5.6/RC2

Please find the list of changes against LibreOffice 3.5.6 RC1 here:

  
http://download.documentfoundation.org/libreoffice/src/bugfixes-libreoffice-3-5-6-release-3.5.6.2.log

Let us close again with a BIG Thank You! to all of you having
contributed to the LibreOffice project - this release would not have
been possible without your help.

Yours,

The Document Foundation Board of Directors


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

[Libreoffice-commits] .: sd/source

 sd/source/ui/inc/RemoteServer.hxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 2626984db88f2a9a7cb1d880466beb4a7c1cd5c0
Author: Michael Stahl mst...@redhat.com
Date:   Fri Aug 10 14:04:27 2012 +0200

RemoteServer: ClientInfo is stored in STL vector, must be Assignable

Change-Id: Ie922207189ae0c7f5f9623043dcc38705b1f7364

diff --git a/sd/source/ui/inc/RemoteServer.hxx 
b/sd/source/ui/inc/RemoteServer.hxx
index b614dd1..d3e202b 100644
--- a/sd/source/ui/inc/RemoteServer.hxx
+++ b/sd/source/ui/inc/RemoteServer.hxx
@@ -43,8 +43,8 @@ namespace sd
 
 struct ClientInfo
 {
-const rtl::OUString mName;
-const rtl::OUString mAddress;
+rtl::OUString mName;
+rtl::OUString mAddress;
 
 enum PROTOCOL { NETWORK = 1, BLUETOOTH };
 ClientInfo( OUString rName, OUString rAddress) :
@@ -78,4 +78,4 @@ namespace sd
 }
 
 #endif // _SD_IMPRESSREMOTE_SERVER_HXX
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [ANN] gerrit maildrop ready for testing

On Fri, Aug 10, 2012 at 01:07:13PM +0200, Stephan Bergmann wrote:
 On 08/10/2012 10:55 AM, Bjoern Michaelsen wrote:
 the gerrit maildrop is ready for early beta testing. To upload a patch to
 master, attach your git-format-patch patch and send a mail with a subject
 starting with '[PATCH]' to:
 
 ...starting with '[PATCH]' but apparently also required to not
 contain branch XXX -- can't we use an information encoding that is
 less ambiguous and error prone?

I dont quit get what you are aiming for. Note that the email subject has little
to do with the commit message in your attached git format-patch-generated
patch.

Best,

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

MPL/LGPL Contribution Licensing

2012-08-10 Thread Tim Janik


All of my past  future contributions to LibreOffice may be licensed
under the MPL/LGPLv3+ dual license.

-- 
Yours sincerely,
Tim Janik

---
http://lanedo.com/~timj/ - Managing director at Lanedo GmbH.
Free software author and contributor on various projects.

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

Build LO for Android on Mac OS 10.8

2012-08-10 Thread James Chen

Hello,
I'm currently building LO for Android on Mac OS 10.8
Here's my autogen.lastrun:http://pastebin.com/2kyiRBFf
And it encounters errors while building module jurt and ucbhelper.
The build_error.log is: http://pastebin.com/jZT9L7in
I didn't find anything useful on internet according to the issues.

Any advice will be very appreciated.

Yours Truly,
James Chen
jamesc...@actions-micro.com mailto:brian...@actions-micro.com
+886-2-2223-8598 ext. 222
Actions Microelectronics.
--
Please change Text Encoding to UTF-8,
if you can't read my mail.
--


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

REMINDER: Release 3.6.1-rc1 from libreoffice-3-6 branch

Hi,

please note that the commit deadline for 3.6.1-rc1 is on Monday, August 13,
2012.

The tag and branch libreoffice-3-6-1 is going to be created the day after.
Only commits with 3 reviewers will be allowed for that branch.

See also
http://wiki.documentfoundation.org/ReleasePlan#3.6_release
http://wiki.documentfoundation.org/Release_Criteria
http://wiki.documentfoundation.org/Development/Branches


Best Regards,
Petr


PS: It was scheduled one week later in the wiki. We decided to move it
one week earlier to provide a solution for the nasty extensions
problems. See the last ESC meeting minutes.

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

[Libreoffice-commits] .: cppuhelper/source

 cppuhelper/source/defaultbootstrap.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8caf1164ee7cb8e27059d329fbffa3883731c0ae
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 10 14:34:03 2012 +0200

Missing mutex lock

Change-Id: Ifddd6131c2e62057561d4b17eeda88568f6ccf7c

diff --git a/cppuhelper/source/defaultbootstrap.cxx 
b/cppuhelper/source/defaultbootstrap.cxx
index c3bdba3..4e0ea17 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -1032,6 +1032,7 @@ css::uno::Type ServiceManager::getElementType()
 }
 
 sal_Bool ServiceManager::hasElements() throw (css::uno::RuntimeException) {
+osl::MutexGuard g(rBHelper.rMutex);
 return
 !(data_.namedImplementations.empty()
data_.dynamicImplementations.empty());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - i18npool/CppunitTest_i18npool_test_languagetag.mk i18npool/inc i18npool/Module_i18npool.mk i18npool/qa i18npool/source liblangtag/prj

 i18npool/CppunitTest_i18npool_test_languagetag.mk |   50 +
 i18npool/Module_i18npool.mk   |1 
 i18npool/inc/i18npool/languagetag.hxx |5 
 i18npool/qa/cppunit/test_languagetag.cxx  |  206 ++
 i18npool/source/languagetag/languagetag.cxx   |   90 ++---
 liblangtag/prj/d.lst  |   10 +
 6 files changed, 291 insertions(+), 71 deletions(-)

New commits:
commit 8ab887eea707f1a98e35909739be157a8ee45cb9
Author: Eike Rathke er...@redhat.com
Date:   Fri Aug 10 15:00:43 2012 +0200

added LanguageTag unit test

diff --git a/i18npool/CppunitTest_i18npool_test_languagetag.mk 
b/i18npool/CppunitTest_i18npool_test_languagetag.mk
new file mode 100644
index 000..8c42ad6
--- /dev/null
+++ b/i18npool/CppunitTest_i18npool_test_languagetag.mk
@@ -0,0 +1,50 @@
+# -*- 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_CppunitTest_CppunitTest,i18npool_test_languagetag))
+
+$(eval $(call gb_CppunitTest_use_api,i18npool_test_languagetag,\
+   udkapi \
+   offapi \
+))
+
+$(eval $(call 
gb_CppunitTest_use_library_objects,i18npool_test_languagetag,i18nisolang1))
+
+$(eval $(call gb_CppunitTest_use_libraries,i18npool_test_languagetag,\
+   cppu \
+   cppuhelper \
+   sal \
+   $(gb_STDLIBS) \
+))
+
+ifneq ($(OS),ANDROID)
+ifneq ($(OS),IOS)
+$(eval $(call gb_CppunitTest_use_externals,i18npool_test_languagetag,\
+   liblangtag \
+   glib \
+))
+endif
+endif
+
+ifeq ($(SYSTEM_LIBLANGTAG),YES)
+$(eval $(call gb_CppunitTest_add_cxxflags,i18npool_test_languagetag,\
+   -DSYSTEM_LIBLANGTAG \
+))
+endif
+
+$(eval $(call gb_CppunitTest_set_include,i18npool_test_languagetag,\
+   -I$(SRCDIR)/i18npool/inc \
+   $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_languagetag,\
+   i18npool/qa/cppunit/test_languagetag \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk
index bed175a..9214d00 100644
--- a/i18npool/Module_i18npool.mk
+++ b/i18npool/Module_i18npool.mk
@@ -63,6 +63,7 @@ endif
 $(eval $(call gb_Module_add_check_targets,i18npool,\
CppunitTest_i18npool_test_breakiterator \
CppunitTest_i18npool_test_characterclassification \
+   CppunitTest_i18npool_test_languagetag \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/i18npool/inc/i18npool/languagetag.hxx 
b/i18npool/inc/i18npool/languagetag.hxx
index 1dcc213..0066d8e 100644
--- a/i18npool/inc/i18npool/languagetag.hxx
+++ b/i18npool/inc/i18npool/languagetag.hxx
@@ -119,6 +119,11 @@ public:
 /** If this is a valid BCP 47 language tag. */
 boolisValidBcp47() const;
 
+/** Needed for unit test in build environment, must be called before any
+LanguageTag is instanciated.
+ */
+static void overrideDataPath( const rtl::OUString 
rPath );
+
 private:
 
 enum Decision
diff --git a/i18npool/qa/cppunit/test_languagetag.cxx 
b/i18npool/qa/cppunit/test_languagetag.cxx
new file mode 100644
index 000..fee5769
--- /dev/null
+++ b/i18npool/qa/cppunit/test_languagetag.cxx
@@ -0,0 +1,206 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ */
+
+#include sal/config.h
+
+#include cppunit/TestFixture.h
+#include cppunit/TestAssert.h
+#include cppunit/extensions/HelperMacros.h
+#include cppunit/plugin/TestPlugIn.h
+
+#include i18npool/languagetag.hxx
+
+#include rtl/ustring.hxx
+#include rtl/ustrbuf.hxx
+#include osl/file.hxx
+
+#include com/sun/star/lang/Locale.hpp
+
+using namespace com::sun::star;
+
+// To test the replacement code add ' 0' and also in
+// source/languagetag/languagetag.cxx
+#define USE_LIBLANGTAG (!defined(ANDROID)  !defined(IOS))
+
+namespace {
+
+class TestLanguageTag : public CppUnit::TestFixture
+{
+public:
+TestLanguageTag() {}
+virtual ~TestLanguageTag() {}
+
+void testInit();
+void testAllTags();
+
+CPPUNIT_TEST_SUITE(TestLanguageTag);
+CPPUNIT_TEST(testInit);
+CPPUNIT_TEST(testAllTags);
+CPPUNIT_TEST_SUITE_END();
+};
+
+void TestLanguageTag::testInit()
+{
+#if USE_LIBLANGTAG  !defined(SYSTEM_LIBLANGTAG)
+// file:///$SRCDIR/solver/$INPATH/share/liblangtag
+// file:///$OUTDIR/share/liblangtag
+OUStringBuffer aBuf(128);
+const char* pEnv = getenv(OUTDIR);
+CPPUNIT_ASSERT_MESSAGE(No $OUTDIR, pEnv);
+

[CHANGEUPLOAD FAILED] [ONGERRIT] leaked ODBC statement handles

2012-08-10 Thread gerrit

2012-08-10 13:09:19,202 INFO Handling incoming mail from Terrence Enger 
ten...@iseries-guru.com
2012-08-10 13:09:19,202 INFO subject: '[ONGERRIT] leaked ODBC statement 
handles'
2012-08-10 13:09:19,202 INFO executing command: None, branch: master, 
commit: leaked
2012-08-10 13:09:19,202 ERROREmailCommand instance has no attribute 
'do_None'
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Build LO for Android on Mac OS 10.8

2012-08-10 Thread Tor Lillqvist

The root cause to your problem is that you are building the MacOSX
build-time software as 64-bit code, and LO (including the build-time
tools that it builds in order to use them later during the build)
needs to be built as 32-bit code on the Mac. (And Windows, BTW. It's
only for Linux that LO can be built as 64-bit code. Which is a bit
sad, but not really a crucial misfeature;)

I see that you have your Xcode 4 in /Developer/Applications/Xcode.app,
is that just a personal preference of yours, or is there some common
situation in which Xcode ends up in such a location? (I assume the
normal one is /Applications/Xcode.app.)

Anyway, just add -m32 to the CC_FOR_BUILD and CXX_FOR_BUILD to
indicate that 32-bit code should be produced. Or, since last night,
you should be able to drop the CC_FOR_BUILD and CXX_FOR_BUILD settings
from your autogen.lastrun, the intent is now that the configure script
should then find out automatically which Xcode and SDK to use and
which compiler. I hope that it will work also for you even if you use
that /Developer/Applications path, as long as xcode-select and xcrun
are still in /usr/bin for you, are they?

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

[Libreoffice-commits] .: Branch 'feature/gsoc_test_improvements3' - 6 commits - sax/qa

2012-08-10 Thread Artur Dorda

 sax/qa/cppunit/test_converter.cxx |   97 ++
 1 file changed, 97 insertions(+)

New commits:
commit 7e639f9332d2e7af8502176ae2915983c2cfb389
Author: Artur Dorda artur.dorda+l...@gmail.com
Date:   Fri Aug 10 15:06:14 2012 +0200

'string to color' test covered

Change-Id: I024296d1f71bd06837547cd8af3adc2cf2830b95

diff --git a/sax/qa/cppunit/test_converter.cxx 
b/sax/qa/cppunit/test_converter.cxx
index 1bf1dd0..c3cab68 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -438,6 +438,16 @@ void ConverterTest::testPercent()
 doTestPercentToString(1%, 1);
 }
 
+void doTestStringToColor(sal_Int32 nValue, char const*const pis)
+{
+::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
+sal_Int32 nTemp;
+bool bSuccess(Converter::convertColor(nTemp, is));
+OSL_TRACE(%i, nTemp);
+CPPUNIT_ASSERT(bSuccess);
+CPPUNIT_ASSERT_EQUAL(nValue, nTemp);
+}
+
 void doTestColorToString(char const*const pis, sal_Int32 nValue)
 {
 ::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
@@ -449,6 +459,10 @@ void doTestColorToString(char const*const pis, sal_Int32 
nValue)
 
 void ConverterTest::testColor()
 {
+doTestStringToColor(11259375, #abcdef);
+doTestStringToColor(160, #a0);
+doTestStringToColor(40960, #00a000);
+doTestStringToColor(0, #00);
 doTestColorToString(#000615, 1557);
 doTestColorToString(#5bcd15, 123456789);
 doTestColorToString(#fffac7, -1337);
commit 768e16f91851f7c9696c26f2ea0e297ef2fe1f5c
Author: Artur Dorda artur.dorda+l...@gmail.com
Date:   Fri Aug 10 14:57:44 2012 +0200

'color to string' test covered

Change-Id: Ia65d1bef19ec02efbb5d7dd784d4cc48c3dd51f2

diff --git a/sax/qa/cppunit/test_converter.cxx 
b/sax/qa/cppunit/test_converter.cxx
index 1efbc94..1bf1dd0 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -53,6 +53,7 @@ public:
 void testMeasure();
 void testBool();
 void testPercent();
+void testColor();
 
 CPPUNIT_TEST_SUITE(ConverterTest);
 CPPUNIT_TEST(testDuration);
@@ -61,6 +62,7 @@ public:
 CPPUNIT_TEST(testMeasure);
 CPPUNIT_TEST(testBool);
 CPPUNIT_TEST(testPercent);
+CPPUNIT_TEST(testColor);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -435,6 +437,23 @@ void ConverterTest::testPercent()
 doTestPercentToString(0%, 0);
 doTestPercentToString(1%, 1);
 }
+
+void doTestColorToString(char const*const pis, sal_Int32 nValue)
+{
+::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
+::rtl::OUStringBuffer buf;
+Converter::convertColor(buf, nValue);
+OSL_TRACE(%s, ::rtl::OUStringToOString(buf.getStr(), 
RTL_TEXTENCODING_UTF8).getStr());
+CPPUNIT_ASSERT_EQUAL(is, buf.makeStringAndClear());
+}
+
+void ConverterTest::testColor()
+{
+doTestColorToString(#000615, 1557);
+doTestColorToString(#5bcd15, 123456789);
+doTestColorToString(#fffac7, -1337);
+doTestColorToString(#00, 0);
+}
 CPPUNIT_TEST_SUITE_REGISTRATION(ConverterTest);
 
 }
commit ee3617d926a8d416fec937b206e818c679f0df3d
Author: Artur Dorda artur.dorda+l...@gmail.com
Date:   Fri Aug 10 14:48:53 2012 +0200

'percent to string' test covered

Change-Id: I6966191a3adde0af318021ce8eec910763c42585

diff --git a/sax/qa/cppunit/test_converter.cxx 
b/sax/qa/cppunit/test_converter.cxx
index 62e6d5d..1efbc94 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -414,6 +414,15 @@ void doTestStringToPercent(sal_Int32 nValue, char 
const*const pis)
 CPPUNIT_ASSERT_EQUAL(nValue, nTemp);
 }
 
+void doTestPercentToString(char const*const pis, sal_Int32 nValue)
+{
+::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
+::rtl::OUStringBuffer buf;
+Converter::convertPercent(buf, nValue);
+OSL_TRACE(%s, ::rtl::OUStringToOString(buf.getStr(), 
RTL_TEXTENCODING_UTF8).getStr());
+CPPUNIT_ASSERT_EQUAL(is, buf.makeStringAndClear());
+}
+
 void ConverterTest::testPercent()
 {
 doTestStringToPercent(40, 40%);
@@ -421,6 +430,10 @@ void ConverterTest::testPercent()
 doTestStringToPercent(120, 120%);
 doTestStringToPercent(-40, -40%);
 doTestStringToPercent(0, 0%);
+doTestPercentToString(12%, 12);
+doTestPercentToString(-123%, -123);
+doTestPercentToString(0%, 0);
+doTestPercentToString(1%, 1);
 }
 CPPUNIT_TEST_SUITE_REGISTRATION(ConverterTest);
 
commit e48d7c56f745ea9aab1869d3ad7da02eea321f74
Author: Artur Dorda artur.dorda+l...@gmail.com
Date:   Fri Aug 10 14:44:48 2012 +0200

'string to percent' test covered

Change-Id: Ib18e28cba03c7032e8a446449b2839e7b7534133

diff --git a/sax/qa/cppunit/test_converter.cxx 
b/sax/qa/cppunit/test_converter.cxx
index b95a65c..62e6d5d 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -52,6 +52,7 @@ public:
 void testDouble();
 void

shadow drawing regression


Hi Miklos,

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

so it first paints background then shadow. But try to zoom out with at 
least 2 pages - the second page gets painted after the first page, and 
the shadow overlaps the already rendered page. It worked earlier on 
because the shadow image is nearly transparent, it was hard to notice 
the effect. Now it is evidently noticeable. :)


No idea how to fix this, maybe it is possible to get the size of the gap 
between the pages and set a clip region?...


Should I file a bug report?

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

[PATCH] fdo#47674 Calc: save settings for import ascii text dialog

2012-08-10 Thread jumbo444

Hello,

I propose a patch for fdo#47674

Open Text-CSV saved settings of ScImportAsciiDlg dialog, but not Paste 
Unformatted Text and Data  Text to Columns.
This patch adds two groups in Calc.xcs to save the settings (which are
independent).
cSep last parameter of ScImportAsciiDlg constructor was removed as it was
useless (parameter is controlled by settings).

I set \t as default separator for both Paste Unformatted Text and Text to
Columns. I set DetectSpecialNumbers at true as default for Paste Unformatted
Text. Why is it not set to true for import CSV file? It seems to me to be
the more common behavior.

Have a good day.

Laurent BP


http://nabble.documentfoundation.org/file/n4000438/0001-fdo-47674-Save-settings-for-Import-Ascii-Text-Dlg.patch
0001-fdo-47674-Save-settings-for-Import-Ascii-Text-Dlg.patch 



-
LibreOffice 3.5.5
--
View this message in context: 
http://nabble.documentfoundation.org/PATCH-fdo-47674-Calc-save-settings-for-import-ascii-text-dialog-tp4000438.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sw/source

2012-08-10 Thread Thorsten Behrens

 sw/source/core/table/swtable.cxx |  369 +--
 1 file changed, 169 insertions(+), 200 deletions(-)

New commits:
commit f2f3703740f65b76e891ecc3591d7e60d5b7caef
Author: Tim Janik tim.ja...@lanedo.com
Date:   Fri Aug 10 15:42:44 2012 +0200

Translate German comments in Writer.

Change-Id: Ia8179d4333434324dd4b5239691402d0e48da5a1

diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 3d1371b..5ea5db3 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -30,7 +30,7 @@
 #include ctype.h
 #include float.h
 #include hintids.hxx
-#include hints.hxx// fuer SwAttrSetChg
+#include hints.hxx// for SwAttrSetChg
 #include editeng/lrspitem.hxx
 #include editeng/shaditem.hxx
 #include editeng/adjitem.hxx
@@ -44,7 +44,7 @@
 #include fmtfld.hxx
 #include frmatr.hxx
 #include doc.hxx
-#include docary.hxx   // fuer RedlineTbl()
+#include docary.hxx   // for RedlineTbl()
 #include frame.hxx
 #include swtable.hxx
 #include ndtxt.hxx
@@ -296,19 +296,17 @@ SwTable::~SwTable()
 refObj-Closed();
 }
 
-// ist die Tabelle der letzte Client im FrameFormat, kann dieses
-// geloescht werden
+// the table can be deleted if it's the last client of the FrameFormat
 SwTableFmt* pFmt = (SwTableFmt*)GetFrmFmt();
-pFmt-Remove( this );   // austragen,
+pFmt-Remove( this );   // remove
 
 if( !pFmt-GetDepends() )
-pFmt-GetDoc()-DelTblFrmFmt( pFmt );   // und loeschen
+pFmt-GetDoc()-DelTblFrmFmt( pFmt );   // and delete
 
-// Loesche die Pointer aus dem SortArray der Boxen, die
-// Objecte bleiben erhalten und werden vom DTOR der Lines/Boxes
-// Arrays geloescht.
-//JP: reicht leider nicht, es muessen die Pointer auf den StartNode
-//  der Section geloescht werden
+// Delete the pointers from the SortArray of the boxes. The objects
+// are preserved and are deleted by the lines/boxes arrays dtor.
+// Note: unfortunately not enough, pointers to the StartNode of the
+// section need deletion.
 DelBoxNode( aSortCntBoxes );
 aSortCntBoxes.clear();
 delete pHTMLLayout;
@@ -363,7 +361,7 @@ static void lcl_ModifyBoxes( SwTableBoxes rBoxes, const 
long nOld,
 // For SubTables the rounding problem will not be solved :-(
 ::lcl_ModifyLines( rBox.GetTabLines(), nOld, nNew, rFmtArr, false 
);
 }
-//Die Box anpassen
+// Adjust the box
 SwFrmFmt *pFmt = rBox.GetFrmFmt();
 sal_uInt64 nBox = pFmt-GetFrmSize().GetWidth();
 nOriginalSum += nBox;
@@ -396,7 +394,7 @@ static void lcl_ModifyBoxes( SwTableBoxes rBoxes, const 
long nOld,
 
 void SwTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
 {
-// fange SSize Aenderungen ab, um die Lines/Boxen anzupassen
+// catch SSize changes, to adjust the lines/boxes
 sal_uInt16 nWhich = pOld ? pOld-Which() : pNew ? pNew-Which() : 0 ;
 const SwFmtFrmSize* pNewSize = 0, *pOldSize = 0;
 
@@ -420,7 +418,7 @@ void SwTable::Modify( const SfxPoolItem* pOld, const 
SfxPoolItem *pNew )
 {
 OSL_ENSURE( pOldSize  pOldSize-Which() == RES_FRM_SIZE 
 pNewSize  pNewSize-Which() == RES_FRM_SIZE,
-Kein Old oder New fuer FmtFrmSize-Modify der SwTable. );
+No Old or New for FmtFrmSize-Modify of the SwTable. );
 AdjustWidths( pOldSize-GetWidth(), pNewSize-GetWidth() );
 }
 }
@@ -458,8 +456,8 @@ void lcl_SortedTabColInsert( SwTabCols rToFill, const 
SwTableBox *pBox,
 OSL_ENSURE(nWish, weird = 0 width frmfrm);
 const long nAct  = rToFill.GetRight() - rToFill.GetLeft();  // +1 why?
 
-//Der Wert fuer die linke Kante der Box errechnet sich aus den
-//Breiten der vorhergehenden Boxen.
+// The value for the left edge of the box is calculated from the
+// widths of the previous boxes.
 sal_uInt16 nPos = 0;
 sal_uInt16 nSum = 0;
 sal_uInt16 nLeftMin = 0;
@@ -505,7 +503,7 @@ void lcl_SortedTabColInsert( SwTabCols rToFill, const 
SwTableBox *pBox,
 if ( (nPos = ((nCmp = COLFUZZY) ? nCmp - COLFUZZY : nCmp)) 
  (nPos = (nCmp + COLFUZZY)) )
 {
-bInsert = sal_False;//Hat ihn schon.
+bInsert = sal_False;// Already has it.
 }
 else if ( nPos  nCmp )
 {
@@ -593,8 +591,7 @@ void lcl_ProcessLineGet( const SwTableLine *pLine, 
SwTabCols rToFill,
 void SwTable::GetTabCols( SwTabCols rToFill, const SwTableBox *pStart,
   sal_Bool bRefreshHidden, sal_Bool bCurRowOnly ) const
 {
-//MA 30. Nov. 95: Opt: wenn bHidden gesetzt ist, wird nur das Hidden
-//Array aktualisiert.
+// Optimization: if bHidden is set, we only update the Hidden Array.
 if ( bRefreshHidden )
 {
 // remove corrections
@@ -607,7 +604,7 @@ void SwTable::GetTabCols( SwTabCols rToFill,

Re: [CHANGEUPLOAD FAILED] [ONGERRIT] leaked ODBC statement handles

Hi Terrence,

Ah, I removed that ONGERRIT thing, please just use PATCH.

rationale: We are now sending a mail to the dev-list for every patch anyway.
So I would suggest to _not_ CC the mailing list, as that would mean:
- One mail for you sending the patch
- One mail from the patchpickup saying its good
- One mail from gerrit that there is a new patch

The last mail should be enough for the list (and you will get the first two).

Best,

Bjoern

On Fri, Aug 10, 2012 at 01:09:19PM +, ger...@libreoffice.org wrote:
 2012-08-10 13:09:19,202 INFO Handling incoming mail from Terrence Enger 
 ten...@iseries-guru.com
 2012-08-10 13:09:19,202 INFO subject: '[ONGERRIT] leaked ODBC statement 
 handles'
 2012-08-10 13:09:19,202 INFO executing command: None, branch: master, 
 commit: leaked
 2012-08-10 13:09:19,202 ERROREmailCommand instance has no attribute 
 'do_None'
 ___
 LibreOffice mailing list
 LibreOffice@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: scaddins/source sc/source

 sc/source/core/tool/interpr3.cxx|3 ++
 scaddins/source/analysis/analysis.cxx   |   19 +--
 scaddins/source/analysis/analysishelper.cxx |   35 +++-
 scaddins/source/analysis/analysishelper.hxx |2 -
 4 files changed, 30 insertions(+), 29 deletions(-)

New commits:
commit 1f62afae0fd04236005be70736cf7ab059a10778
Author: Albert Thuswaldner albert.thuswald...@gmail.com
Date:   Wed Aug 1 01:26:25 2012 +0200

fdo#43135 - fix for MULTINOMIAL only supporting parameters up to 170

Change-Id: I9366de24414fa10e292e42df08a9658d90e5c1c1

diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 385ca9b..933775c 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -462,6 +462,9 @@ double ScInterpreter::Fakultaet(double x)
 
 double ScInterpreter::BinomKoeff(double n, double k)
 {
+// this method has been duplicated as BinomialCoefficient()
+// in scaddins/source/analysis/analysishelper.cxx
+
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, sc, er, 
ScInterpreter::BinomKoeff );
 double nVal = 0.0;
 k = ::rtl::math::approxFloor(k);
diff --git a/scaddins/source/analysis/analysis.cxx 
b/scaddins/source/analysis/analysis.cxx
index 00d5e3d..ca83361 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -689,26 +689,21 @@ AnalysisAddIn::getMultinomial( constREFXPS xOpt, const 
SEQSEQ( sal_Int32 ) aVL
 if( aValList.Count() == 0 )
 return 0.0;
 
-sal_Int32 nZ = 0;
-doublefN = 1.0;
+double nZ = 0;
+double fRet = 1.0;
 
 for( const double *p = aValList.First(); p; p = aValList.Next() )
 {
-double fInt = (*p = 0.0) ? rtl::math::approxFloor( *p ) : 
rtl::math::approxCeil( *p );
-if ( fInt  0.0 || fInt  170.0 )
+double n = (*p = 0.0) ? rtl::math::approxFloor( *p ) : 
rtl::math::approxCeil( *p );
+if ( n  0.0 )
 THROW_IAE;
-sal_Int32 n = static_cast sal_Int32 ( fInt );
-if( n  0 )
+
+if( n  0.0 )
 {
 nZ += n;
-fN *= Fak( n );
+fRet *= BinomialCoefficient(nZ, n);
 }
 }
-
-if( nZ  170 )
-THROW_IAE;
-
-double fRet = Fak( nZ ) / fN;
 RETURN_FINITE( fRet );
 }
 
diff --git a/scaddins/source/analysis/analysishelper.cxx 
b/scaddins/source/analysis/analysishelper.cxx
index 6b4309a..56064b5 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -521,29 +521,32 @@ double GetYearFrac( sal_Int32 nNullDate, sal_Int32 
nStartDate, sal_Int32 nEndDat
 return double( nYears ) + double( nDayDiff ) / double( nDaysInYear );
 }
 
-
-double Fak( sal_Int32 n )
+double BinomialCoefficient( double n, double k )
 {
-if( n  0 )
-{
-double  fRet = n;
-double  f = n - 1;
+// This method is a copy of BinomKoeff()
+// found in sc/source/core/tool/interpr3.cxx
 
-while( f = 2.0 )
+double nVal = 0.0;
+k = ::rtl::math::approxFloor(k);
+if (n  k)
+nVal = 0.0;
+else if (k == 0.0)
+nVal = 1.0;
+else
+{
+nVal = n/k;
+n--;
+k--;
+while (k  0.0)
 {
-fRet *= f;
-f--;
+nVal *= n/k;
+k--;
+n--;
 }
-
-return fRet;
 }
-else if( !n )
-return 1.0;
-else
-return 0.0;
+return nVal;
 }
 
-
 double GetGcd( double f1, double f2 )
 {
 double  f = fmod( f1, f2 );
diff --git a/scaddins/source/analysis/analysishelper.hxx 
b/scaddins/source/analysis/analysishelper.hxx
index bad6e21..fc5 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -94,7 +94,7 @@ inline double   GetYearFrac( constREFXPS xOpt, sal_Int32 
nStartDate, sal_In
 THROWDEF_RTE_IAE;
 inline void AlignDate( sal_uInt16 rDay, sal_uInt16 nMonth, sal_uInt16 
nYear );
 
-double  Fak( sal_Int32 n );
+double  BinomialCoefficient( double n, double k );
 double  GetGcd( double f1, double f2 );
 double  ConvertToDec( const STRING rFromNum, sal_uInt16 
nBaseFrom, sal_uInt16 nCharLim ) THROWDEF_RTE_IAE;
 STRING  ConvertFromDec(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#43135 - fix for MULTINOMIAL only supporting parameters u...

From Eike Rathke er...@redhat.com:

Eike Rathke has submitted this change and it was merged.

Change subject: fdo#43135 - fix for MULTINOMIAL only supporting parameters up 
to 170
..


fdo#43135 - fix for MULTINOMIAL only supporting parameters up to 170

Change-Id: I9366de24414fa10e292e42df08a9658d90e5c1c1
---
M sc/source/core/tool/interpr3.cxx
M scaddins/source/analysis/analysis.cxx
M scaddins/source/analysis/analysishelper.cxx
M scaddins/source/analysis/analysishelper.hxx
4 files changed, 32 insertions(+), 31 deletions(-)

Approvals:
  Eike Rathke: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9366de24414fa10e292e42df08a9658d90e5c1c1
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Albert Thuswaldner albert.thuswald...@gmail.com
Gerrit-Reviewer: Albert Thuswaldner albert.thuswald...@gmail.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com

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

Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values


On 08/10/2012 03:35 PM, anwen wrote:

Stephan Bergmann-2 wrote

I think you should execute your shutdown activies on notifyTermination,
not queryTermination.  The latter can be veto'ed by some other listener,
in which case Desktop would cancel the termination and continue running
(and notify you with queryTermination eventually followed by
notifyTermination again later on).


Thank you for your suggestion. Yes, queryTermination should be a place to
set up some status changes. And real stop or shutdown a process should be
done in notifyTermination. BTW, I saw that there is a XTerminationListener2
where cancelTermination() is called when the master environment (e.g.,
desktop) was canceled in it's terminate request. Is it good to use this
interface?


As long as you only listen on notifyTermination, you don't need to 
support the derived XTerminationListener2.



That queryTermination is called with SolarMutex locked is a bug.  (Is
notifyTermination also called with SolarMutex locked?  Would need to
check, in framework/source/services/desktop.cxx.)  However, it might be
a bug not easy to fix without opening any number of pandora's boxes...


Is there a bug report number regarding this issue? I would like to check its
progress in the future. In addition, since notifyTermination is also
protected by SolarMutex, I am wondering if you see any workaround to deal
with such a deadlock issue related to multithread shutdown.  Thank you.


I'm not aware of any specific bug for this.  I see no workaround short 
of a proper fix.  And a proper fix would mean to (a) identify the place 
up the call stack from Desktop::terminate where SolarMutex is locked (I 
assume that TransactionGuard is not SolarMutex, but yet another locking 
for Desktop's private parts, but I may be wrong), (b) redesign that code 
path so that Desktop::terminate can call notifyTermination without 
SolarMutex, (c) see if any of the existing listeners on 
notifyTermination exploited the fact that they used to be called with 
SolarMutex locked and need to be adapted now.


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

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

 sw/source/ui/docvw/PageBreakWin.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a7b26dbf7b4c59b34fed9957c32a41348bfd6f77
Author: Ivan Timofeev timofeev@gmail.com
Date:   Fri Aug 10 18:05:13 2012 +0400

Page Break: set position only when button is invisible

and don't let the moribund fading-out button pursue the mouse

Change-Id: I6f821f7e8144e9448c1cb65f8ce96102419cd6f0

diff --git a/sw/source/ui/docvw/PageBreakWin.cxx 
b/sw/source/ui/docvw/PageBreakWin.cxx
index d6d7e65..53160d1 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -95,7 +95,7 @@ namespace
 m_pWin-Fade( true );
 }
 
-if ( !rMEvt.IsSynthetic() )
+if ( !rMEvt.IsSynthetic()  !m_pWin-IsVisible() )
 {
 Point* pPtr = new Point( rMEvt.GetPosPixel() );
 m_pWin-UpdatePosition( pPtr );
commit 61df142e9398dee581935a4967f50ba0bd1d5235
Author: Ivan Timofeev timofeev@gmail.com
Date:   Fri Aug 10 16:14:17 2012 +0400

Page Break: don't show if mouse is gone and button is still invisible

it seems when the mouse leaves the dashed line, it immediately appears 
inside
a button (if the mouse motion is not super-fast).

Change-Id: I43c792fdba59feafd761bde8529a8683c07bf3d3

diff --git a/sw/source/ui/docvw/PageBreakWin.cxx 
b/sw/source/ui/docvw/PageBreakWin.cxx
index 23c1827..d6d7e65 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -87,7 +87,7 @@ namespace
 {
 // don't fade if we just move to the 'button'
 Point aEventPos( GetPosPixel() + rMEvt.GetPosPixel() );
-if ( !m_pWin-Contains( aEventPos ) )
+if ( !m_pWin-Contains( aEventPos ) || !m_pWin-IsVisible() )
 m_pWin-Fade( false );
 }
 else if ( !m_pWin-IsVisible() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/CppunitTest_i18npool_test_languagetag.mk

 i18npool/CppunitTest_i18npool_test_languagetag.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 26310504c3c20385caf35f5a703f1d5f1682b4c7
Author: Eike Rathke er...@redhat.com
Date:   Fri Aug 10 16:24:15 2012 +0200

at least Windows needs libxml2

Change-Id: I97312c746e8a76af73851c474b0c6c2491c44803

diff --git a/i18npool/CppunitTest_i18npool_test_languagetag.mk 
b/i18npool/CppunitTest_i18npool_test_languagetag.mk
index 8c42ad6..467a36b 100644
--- a/i18npool/CppunitTest_i18npool_test_languagetag.mk
+++ b/i18npool/CppunitTest_i18npool_test_languagetag.mk
@@ -32,6 +32,10 @@ $(eval $(call 
gb_CppunitTest_use_externals,i18npool_test_languagetag,\
 endif
 endif
 
+$(eval $(call gb_CppunitTest_use_externals,i18npool_test_languagetag,\
+   libxml2 \
+))
+
 ifeq ($(SYSTEM_LIBLANGTAG),YES)
 $(eval $(call gb_CppunitTest_add_cxxflags,i18npool_test_languagetag,\
-DSYSTEM_LIBLANGTAG \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW 3-6 (but only 3.6.2?)] No more prereg, no more unopkg sync

Quoting 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=6dcb3d4ef46312729bb6f16c473b433474863f68 
Related fdo#51252: No more prereg, no more unopkg sync:  Now that 
5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 'fdo#51252 Disable copying 
share/prereg/bundled to avoid startup crashes' removed the use of 
share/prereg, there is no longer need to generate it in the first place 
(by calling 'unopkg sync' at build or installation time), and so no need 
for the 'unopkg sync' sub-command, either.  This also allows to simplify 
some of the jvmfwk code that was only there so that 'unopkg sync' (which 
can require a JVM) can work in 'hostile' environments (during build and 
installation).


This is a somewhat large patch, removing stuff all over the code base. 
I checked it on all of Linux, Mac OS X, and Windows, but might well have 
missed one or the other nuance, esp. in terra incognita like 
setup_native/source/win32/customactions.


Hence, I would suggest to not jeopardize LO 3.6.1 with this clean up, 
but only backport it to libreoffice-3-6 after branch-off of 
libreoffice-3-6-1 early next week.  (This clean up would nicely remove 
the root for https://bugs.freedesktop.org/show_bug.cgi?id=44628 
unopkg.exe does not find VC runtime during install (extension 
registration), but it might be better to address that with yet another 
targeted band-aid fix for LO 3.6.1, like by just not calling unopkg 
sync from the msi install scripts.)


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

Good way of submitting patches

2012-08-10 Thread Jean-Tiare LE BIGOT


Hi !

What is the good way of submitting contributions ? It seems that 
sending the raw patch on the list leads to a faster a review/integration 
but the recommended way is still gerrit ?



--
Jean-Tiare LE BIGOT
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in i18npool/Library_i18nisolang1.mk i18npool/source liblangtag/makefile.mk RepositoryExternal.mk scp2/InstallModule_ooo.mk scp2/source

2012-08-10 Thread Jan Holesovsky

 RepositoryExternal.mk|4 +
 config_host.mk.in|1 
 configure.in |   50 +++---
 i18npool/Library_i18nisolang1.mk |5 --
 i18npool/source/languagetag/languagetag.cxx  |2 
 liblangtag/makefile.mk   |4 -
 scp2/InstallModule_ooo.mk|1 
 scp2/source/ooo/directory_ooo.scp|2 
 scp2/source/ooo/file_extra_ooo.scp   |2 
 scp2/source/ooo/file_library_ooo.scp |4 -
 vcl/win/source/gdi/salnativewidgets-luna.cxx |   61 +++
 11 files changed, 76 insertions(+), 60 deletions(-)

New commits:
commit 03dbe1a97c0050365ac3820575134bace0908e2b
Author: Jan Holesovsky ke...@suse.cz
Date:   Fri Aug 10 16:16:21 2012 +0200

Windows toolbars: Use our own theming even for vertical or bottom toolbars.

Change-Id: I4836d7f2055c4811f0e6ccdc87dc58895528b3f8

diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx 
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 065e450..8c343fe 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -457,31 +457,41 @@ void ImplConvertSpinbuttonValues( int nControlPart, const 
ControlState rState,
 pRect-bottom = rRect.Bottom()+1;
 }
 
-void impl_drawAeroToolbar( HDC hDC, RECT rc )
+/// Draw an own toolbar style on Windows Vista or later, looks better there
+void impl_drawAeroToolbar( HDC hDC, RECT rc, bool bHorizontal )
 {
-const long GRADIENT_HEIGHT = 32;
+if ( rc.top == 0  bHorizontal )
+{
+const long GRADIENT_HEIGHT = 32;
 
-long gradient_break = rc.top;
-GRADIENT_RECT g_rect[1] = { { 0, 1 } };
+long gradient_break = rc.top;
+GRADIENT_RECT g_rect[1] = { { 0, 1 } };
 
-// very slow gradient at the top (if we have space for that)
-if ( rc.bottom - rc.top  GRADIENT_HEIGHT )
-{
-gradient_break = rc.bottom - GRADIENT_HEIGHT;
+// very slow gradient at the top (if we have space for that)
+if ( rc.bottom - rc.top  GRADIENT_HEIGHT )
+{
+gradient_break = rc.bottom - GRADIENT_HEIGHT;
+
+TRIVERTEX vert[2] = {
+{ rc.left, rc.top,  0xff00, 0xff00, 0xff00, 0xff00 },
+{ rc.right, gradient_break, 0xfa00, 0xfa00, 0xfa00, 0xff00 },
+};
+GradientFill( hDC, vert, 2, g_rect, 1, GRADIENT_FILL_RECT_V );
+}
 
+// gradient at the bottom
 TRIVERTEX vert[2] = {
-{ rc.left, rc.top,  0xff00, 0xff00, 0xff00, 0xff00 },
-{ rc.right, gradient_break, 0xfa00, 0xfa00, 0xfa00, 0xff00 },
+{ rc.left, gradient_break, 0xfa00, 0xfa00, 0xfa00, 0xff00 },
+{ rc.right, rc.bottom, 0xf000, 0xf000, 0xf000, 0xff00 }
 };
 GradientFill( hDC, vert, 2, g_rect, 1, GRADIENT_FILL_RECT_V );
 }
-
-// gradient at the bottom
-TRIVERTEX vert[2] = {
-{ rc.left, gradient_break, 0xfa00, 0xfa00, 0xfa00, 0xff00 },
-{ rc.right, rc.bottom, 0xf000, 0xf000, 0xf000, 0xff00 }
-};
-GradientFill( hDC, vert, 2, g_rect, 1, GRADIENT_FILL_RECT_V );
+else
+{
+HBRUSH hbrush = CreateSolidBrush( RGB( 0xf0, 0xf0, 0xf0 ) );
+FillRect( hDC, rc, hbrush );
+DeleteObject( hbrush );
+}
 }
 
 sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
@@ -909,17 +919,16 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, 
RECT rc,
 {
 const ToolbarValue *pValue = static_castconst 
ToolbarValue*(aValue);
 if( pValue-mbIsTopDockingArea )
-{
 rc.top = 0; // extend potential gradient to cover menu bar 
as well
+}
 
-// make it more compatible with Aero
-if( ImplGetSVData()-maNWFData.mbDockingAreaAvoidTBFrames )
-{
-impl_drawAeroToolbar( hDC, rc );
-return sal_True;
-}
-}
+// make it more compatible with Aero
+if( ImplGetSVData()-maNWFData.mbDockingAreaAvoidTBFrames )
+{
+impl_drawAeroToolbar( hDC, rc, nPart == 
PART_DRAW_BACKGROUND_HORZ );
+return sal_True;
 }
+
 return ImplDrawTheme( hTheme, hDC, iPart, iState, rc, aCaption);
 }
 }
@@ -936,7 +945,7 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, 
RECT rc,
 // make it more compatible with Aero
 if( ImplGetSVData()-maNWFData.mbDockingAreaAvoidTBFrames )
 {
-impl_drawAeroToolbar( hDC, rc );
+impl_drawAeroToolbar( hDC, rc, true );
 return sal_True;
 }
 }
commit 6a7b32b09e621364239bca6ec02c858b122e07b8

Re: Good way of submitting patches

On Fri, Aug 10, 2012 at 04:32:50PM +0200, Jean-Tiare LE BIGOT wrote:
 What is the good way of submitting contributions ? It seems that
 sending the raw patch on the list leads to a faster a
 review/integration but the recommended way is still gerrit ?

Some of the grumpy old hacker only start to register at gerrit now (since the
migration is soon). Thus I expect things to move on gerrit more quickly now.

Best,

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

[Libreoffice-commits] .: Branch 'feature/gsoc_test_improvements3' - 4 commits - sax/CppunitTest_sax.mk sax/qa

2012-08-10 Thread Artur Dorda

 sax/CppunitTest_sax.mk|2 +
 sax/qa/cppunit/test_converter.cxx |   70 ++
 2 files changed, 72 insertions(+)

New commits:
commit 00d88714e3b85b71c2b29e836244482acc68f8bd
Author: Artur Dorda artur.dorda+l...@gmail.com
Date:   Fri Aug 10 16:55:19 2012 +0200

encodeBase64 test is working

Change-Id: I598ea47ff02b15fdb1d7ff3992d2c660f5a41c95

diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk
index 493cb76..fd8fb5e 100644
--- a/sax/CppunitTest_sax.mk
+++ b/sax/CppunitTest_sax.mk
@@ -17,6 +17,8 @@ $(eval $(call gb_CppunitTest_use_api,sax_cpputest,\
 $(eval $(call gb_CppunitTest_use_libraries,sax_cpputest, \
 sax \
 sal \
+comphelper \
+cppu \
 $(gb_STDLIBS) \
 ))
 
diff --git a/sax/qa/cppunit/test_converter.cxx 
b/sax/qa/cppunit/test_converter.cxx
index c799f45..428027b 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -31,6 +31,7 @@
 #include com/sun/star/util/MeasureUnit.hpp
 
 #include sax/tools/converter.hxx
+#include comphelper/sequenceasvector.hxx
 
 
 using namespace ::com::sun::star;
@@ -55,6 +56,7 @@ public:
 void testPercent();
 void testColor();
 void testNumber();
+void testBase64();
 
 CPPUNIT_TEST_SUITE(ConverterTest);
 CPPUNIT_TEST(testDuration);
@@ -65,6 +67,7 @@ public:
 CPPUNIT_TEST(testPercent);
 CPPUNIT_TEST(testColor);
 CPPUNIT_TEST(testNumber);
+CPPUNIT_TEST(testBase64);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -506,6 +509,35 @@ void ConverterTest::testNumber()
 doTestNumberToString(-1, -0001);
 doTestNumberToString(0, -0);
 }
+
+void doTestEncodeBase64(char const*const pis, const uno::Sequencesal_Int8 
aPass)
+{
+::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
+::rtl::OUStringBuffer buf;
+Converter::encodeBase64(buf, aPass);
+OSL_TRACE(%s, ::rtl::OUStringToOString(buf.getStr(), 
RTL_TEXTENCODING_UTF8).getStr());
+CPPUNIT_ASSERT_EQUAL(is, buf.makeStringAndClear());
+}
+void ConverterTest::testBase64()
+{
+comphelper::SequenceAsVector sal_Int8  tempSeq(4);
+for(sal_Int8 i = 0; i4; ++i)
+tempSeq.push_back(i);
+uno::Sequence sal_Int8  tempSequence = tempSeq.getAsConstList();
+doTestEncodeBase64(AAABAgM=, tempSequence);
+tempSeq[0] = sal_Int8(5);
+tempSeq[1] = sal_Int8(2);
+tempSeq[2] = sal_Int8(3);
+tempSequence = tempSeq.getAsConstList();
+doTestEncodeBase64(BQIDAAABAgM=, tempSequence);
+tempSeq[0] = sal_Int8(200);
+tempSeq[1] = sal_Int8(31);
+tempSeq[2] = sal_Int8(77);
+tempSeq[3] = sal_Int8(111);
+tempSequence = tempSeq.getAsConstList();
+doTestEncodeBase64(yB9NbwABAgM=, tempSequence);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ConverterTest);
 
 }
commit 4109661388f8919cb3b39a9a8c63e5ca82583cbe
Author: Artur Dorda artur.dorda+l...@gmail.com
Date:   Fri Aug 10 15:42:51 2012 +0200

added some extreme values in string-to-measure test

Change-Id: I8fd9029f42159444e7bb56f89eeb83fdb3745732

diff --git a/sax/qa/cppunit/test_converter.cxx 
b/sax/qa/cppunit/test_converter.cxx
index c4fe50e..c799f45 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -363,6 +363,9 @@ void ConverterTest::testMeasure()
 doTestStringToMeasure(777, 777, MeasureUnit::APPFONT, 10, 4321);
 doTestStringToMeasure(8, 8, MeasureUnit::SYSFONT, 10, 432100);
 //strange values (negative, too large etc.)
+doTestStringToMeasure(555, 666, MeasureUnit::MM, -1000, 555);
+doTestStringToMeasure(-1000, -1001, MeasureUnit::MM, -1000, 555);
+doTestStringToMeasure(0, -0, MeasureUnit::MM, -1, 0);
 doTestStringToMeasure(-539222987, 1234567890mm, MeasureUnit::MM_10TH, 
12, 12345678901);
 doTestStringToMeasure(-300, -300, MeasureUnit::MM, -1000, 555);
 doTestStringToMeasure(1305424328, -999px, 
MeasureUnit::PIXEL, -888, 555);   //really crazy numbers...
commit 1b32ec1503a77a28ffdcbc4768a0a113bb6d1c21
Author: Artur Dorda artur.dorda+l...@gmail.com
Date:   Fri Aug 10 15:40:05 2012 +0200

'string to number' test covered

Change-Id: Ib8a81edce168be5babd1bcd62746199de77c2ade

diff --git a/sax/qa/cppunit/test_converter.cxx 
b/sax/qa/cppunit/test_converter.cxx
index f0df6ad..c4fe50e 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -471,6 +471,16 @@ void ConverterTest::testColor()
 doTestColorToString(#00, 0);
 }
 
+void doTestStringToNumber(sal_Int32 nValue, char const*const pis, sal_Int32 
nMin, sal_Int32 nMax)
+{
+::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
+sal_Int32 nTemp;
+bool bSuccess(Converter::convertNumber(nTemp, is, nMin, nMax));
+OSL_TRACE(%i, nTemp);
+CPPUNIT_ASSERT(bSuccess);
+CPPUNIT_ASSERT_EQUAL(nValue, nTemp);
+}
+
 void doTestNumberToString(char const*const pis, sal_Int32 nValue)
 {
 ::rtl::OUString const

Re: [ANN] gerrit maildrop ready for testing


Hi Bjoern,

On 10.08.2012 12:55, Bjoern Michaelsen wrote:

The code lives at:

  
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/patchpickup;h=cd5f3f95514fc219e20b5a88e8e0810b7b293034;hb=HEAD

patches are most welcome (best via gerrit).


  24 desturl = 'shh://logerrit/core'

shh - ssh, could you correct that yourself please?

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

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

 desktop/inc/app.hxx   |4 
 desktop/source/app/app.cxx|  154 +-
 desktop/source/app/check_ext_deps.cxx |   19 -
 desktop/source/app/cmdlineargs.cxx|   74 ++--
 desktop/source/app/cmdlineargs.hxx|   34 +-
 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx|2 
 desktop/source/deployment/inc/dp_misc.h   |3 
 desktop/source/deployment/manager/dp_extensionmanager.cxx |2 
 desktop/source/deployment/misc/dp_misc.cxx|5 
 desktop/source/deployment/registry/component/dp_component.cxx |   97 +-
 desktop/source/pkgchk/unopkg/unopkg_app.cxx   |2 
 11 files changed, 235 insertions(+), 161 deletions(-)

New commits:
commit fd75125424b3dda0e77076d5b1709224ec22a345
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 9 13:29:22 2012 +0200

fdo#53006: Remove user/extensions/bundled cache after upgrade

... to clean out all sorts of inconsitencies that can have accrued there 
over
time apparently due to how the mechanism of copying share/prereg/bundled 
worked,
and to work around stale $BUNDLED_EXTENSIONS_PREREG references in a better 
way
than the previous 81fd6b084b0f3c0eb5a97c77592f5ceb21d2dfb1 fdo#53006 Force
reinstall of all bundled extensions on upgrade.

See the comment on refreshBundledExtensionsDir for how, at least in theory, 
that
functionality could be removed again in the future.

This effectively reverts 2d2b19dea1ab401b1b4971ff5b12b87bb11fd666 Force
ExtensionManager resync when the implementation changes and
81fd6b084b0f3c0eb5a97c77592f5ceb21d2dfb1 fdo#53006 Force reinstall of all
bundled extensions on upgrade (the latter at least on master; it had never 
been
cherry-picked to libreoffice-3-6), which it obsoletes.

Change-Id: I8f80c07a06ec9d53b03813338eeff7d7757c9d4d

Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index ea107e8..25b6352 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -130,14 +130,12 @@ class Desktop : public Application
 static sal_Bool isCrashReporterEnabled();
 
 // first-start (ever) related methods
-static bool newInstallation();
-
 static sal_Bool CheckExtensionDependencies();
 
 static void DoRestartActionsIfNecessary( sal_Bool 
bQuickStart );
 static void SetRestartState();
 
-voidSynchronizeExtensionRepositories(bool force);
+voidSynchronizeExtensionRepositories();
 voidSetSplashScreenText( const ::rtl::OUString 
rText );
 voidSetSplashScreenProgress( sal_Int32 );
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 991577f..6efc9f4 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -147,6 +147,145 @@ static sal_Bool _bCrashReporterEnabled = sal_True;
 static ::rtl::OUString getBrandSharePreregBundledPathURL();
 #endif
 
+namespace {
+
+void removeTree(OUString const  url) {
+osl::Directory dir(url);
+switch (dir.open()) {
+case osl::FileBase::E_None:
+break;
+case osl::FileBase::E_NOENT:
+return; //TODO: SAL_WARN if recursive
+default:
+throw css::uno::RuntimeException(
+cannot open directory  + url,
+css::uno::Reference css::uno::XInterface ());
+}
+for (;;) {
+osl::DirectoryItem i;
+osl::FileBase::RC rc = dir.getNextItem(i, SAL_MAX_UINT32);
+if (rc == osl::FileBase::E_NOENT) {
+break;
+}
+if (rc != osl::FileBase::E_None) {
+throw css::uno::RuntimeException(
+cannot iterate directory  + url,
+css::uno::Reference css::uno::XInterface ());
+}
+osl::FileStatus stat(
+osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName |
+osl_FileStatus_Mask_FileURL);
+if (i.getFileStatus(stat) != osl::FileBase::E_None) {
+throw css::uno::RuntimeException(
+cannot stat in directory  + url,
+css::uno::Reference css::uno::XInterface ());
+}
+if (stat.getFileType() == osl::FileStatus::Directory) { //TODO: 
symlinks
+removeTree(stat.getFileURL());
+} else {
+if (osl::File::remove(stat.getFileURL()) != osl::FileBase::E_None) 
{
+throw css::uno::RuntimeException(
+cannot remove  + stat.getFileURL(),
+css::uno::Reference css::uno::XInterface ());
+}
+}
+}
+}
+
+// Remove any existing UserInstallation's user/extensions/bundled cache
+// remaining from old

[Libreoffice-commits] .: cui/source tools/inc tools/source unusedcode.easy vcl/inc vcl/source

2012-08-10 Thread Caolán McNamara

 cui/source/inc/transfrm.hxx  |1 
 cui/source/tabpages/transfrm.cxx |   64 -
 tools/inc/tools/contnr.hxx   |1 
 tools/source/memtools/contnr.cxx |  140 ---
 unusedcode.easy  |6 +
 vcl/inc/vcl/split.hxx|3 
 vcl/source/window/split.cxx  |7 -
 7 files changed, 5 insertions(+), 217 deletions(-)

New commits:
commit 0c0d24589f167f5f77f3d955ebfa3fc807ad38c4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Aug 10 15:17:51 2012 +0100

callcatcher: reduce Container, update unused code list

Change-Id: I11733daf2668c4142052ceb4498f5500e7e291ef

diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index bb54fc7..cdcf618 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -157,7 +157,6 @@ private:
 DECL_LINK( ClickAutoHdl, void * );
 
 voidSetMaxSize( Rectangle aRect );
-Rectangle   GetRect();
 #endif
 
 public:
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 8f29c9d..57daf10 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -1535,70 +1535,6 @@ void SvxPositionSizeTabPage::DisableProtect()
 
 //
 
-Rectangle SvxPositionSizeTabPage::GetRect()
-{
-double fLeft(maRange.getMinX());
-double fTop(maRange.getMinY());
-double fRight(fLeft + (double)maMtrWidth.GetValue());
-double fBottom(fTop + (double)maMtrHeight.GetValue());
-
-switch ( maCtlSize.GetActualRP() )
-{
-case RP_LT:
-{
-break;
-}
-case RP_MT:
-{
-fLeft = maRange.getMinX() - ( fRight - maRange.getMaxX() ) / 2.0;
-break;
-}
-case RP_RT:
-{
-fLeft = maRange.getMinX() - ( fRight - maRange.getMaxX() );
-break;
-}
-case RP_LM:
-{
-fTop = maRange.getMinY() - ( fBottom - maRange.getMaxY() ) / 2.0;
-break;
-}
-case RP_MM:
-{
-fLeft = maRange.getMinX() - ( fRight - maRange.getMaxX() ) / 2.0;
-fTop = maRange.getMinY() - ( fBottom - maRange.getMaxY() ) / 2.0;
-break;
-}
-case RP_RM:
-{
-fLeft = maRange.getMinX() - ( fRight - maRange.getMaxX() );
-fTop = maRange.getMinY() - ( fBottom - maRange.getMaxY() ) / 2.0;
-break;
-}
-case RP_LB:
-{
-fTop = maRange.getMinY() - ( fBottom - maRange.getMaxY() );
-break;
-}
-case RP_MB:
-{
-fLeft = maRange.getMinX() - ( fRight - maRange.getMaxX() ) / 2.0;
-fTop = maRange.getMinY() - ( fBottom - maRange.getMaxY() );
-break;
-}
-case RP_RB:
-{
-fLeft = maRange.getMinX() - ( fRight - maRange.getMaxX() );
-fTop = maRange.getMinY() - ( fBottom - maRange.getMaxY() );
-break;
-}
-}
-
-return Rectangle(basegfx::fround(fLeft), basegfx::fround(fTop), 
basegfx::fround(fRight), basegfx::fround(fBottom));
-}
-
-//
-
 IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeWidthHdl)
 {
 if( maCbxScale.IsChecked()  maCbxScale.IsEnabled() )
diff --git a/tools/inc/tools/contnr.hxx b/tools/inc/tools/contnr.hxx
index 5096596..bf505f0 100644
--- a/tools/inc/tools/contnr.hxx
+++ b/tools/inc/tools/contnr.hxx
@@ -81,7 +81,6 @@ public:
 void*   Replace( void* pNew, void* pOld )
 { return Replace( pNew, GetPos( pOld ) ); }
 
-voidSetSize( sal_uIntPtr nNewSize );
 sal_uIntPtr   GetSize() const { return nCount; }
 
 sal_uIntPtr   Count() const { return nCount; }
diff --git a/tools/source/memtools/contnr.cxx b/tools/source/memtools/contnr.cxx
index 00c62aa..0b7c0d1 100644
--- a/tools/source/memtools/contnr.cxx
+++ b/tools/source/memtools/contnr.cxx
@@ -955,146 +955,6 @@ void* Container::Replace( void* p, sal_uIntPtr nIndex )
 
 /*
 |*
-|*Container::SetSize()
-|*
-*/
-
-void Container::SetSize( sal_uIntPtr nNewSize )
-{
-DBG_CHKTHIS( Container, DbgCheckContainer );
-
-if ( nNewSize )
-{
-// Unterscheiden sich die Groessen
-if ( nNewSize != nCount )
-{
-CBlock* pTemp;
-sal_uIntPtr nTemp;
-
-// Wird verkleinert
-if ( nNewSize  nCount )
-{
-pTemp = pFirstBlock;
-nTemp = 0;
-while ( (nTemp+pTemp-Count())  nNewSize )
-{
-nTemp += pTemp-Count();
-pTemp  = pTemp-GetNextBlock();
-

[Libreoffice-commits] .: sd/Library_sd.mk sd/source

2012-08-10 Thread Andrzej J.R. Hunt

 sd/Library_sd.mk|1 
 sd/source/ui/dlg/RemoteDialog.cxx   |6 
 sd/source/ui/inc/RemoteServer.hxx   |   42 --
 sd/source/ui/remotecontrol/Communicator.cxx |  128 
 sd/source/ui/remotecontrol/Communicator.hxx |   62 ++
 sd/source/ui/remotecontrol/Listener.cxx |   13 +-
 sd/source/ui/remotecontrol/Listener.hxx |6 
 sd/source/ui/remotecontrol/Server.cxx   |  173 +++-
 8 files changed, 304 insertions(+), 127 deletions(-)

New commits:
commit 2a248dc15ff314a630b19536c32c6ce6fd4959d1
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Fri Aug 10 17:20:16 2012 +0200

Refactored remote communication to allow for pairing.

Change-Id: Ia31e33fca6dca47faa1fad1a5879c3902df05835

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 1fb99e0..92db929 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -327,6 +327,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
 sd/source/ui/presenter/PresenterPreviewCache \
 sd/source/ui/presenter/PresenterTextView \
 sd/source/ui/presenter/SlideRenderer \
+sd/source/ui/remotecontrol/Communicator \
 sd/source/ui/remotecontrol/DiscoveryService \
 sd/source/ui/remotecontrol/ImagePreparer \
 sd/source/ui/remotecontrol/Server \
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx 
b/sd/source/ui/dlg/RemoteDialog.cxx
index 85d5ad2..465febc 100644
--- a/sd/source/ui/dlg/RemoteDialog.cxx
+++ b/sd/source/ui/dlg/RemoteDialog.cxx
@@ -26,12 +26,12 @@ RemoteDialog::RemoteDialog( Window *pWindow ) :
 {
  FreeResource();
 
-vectorClientInfo aClients( RemoteServer::getClients() );
+vectorClientInfo* aClients( RemoteServer::getClients() );
 
-for ( vectorClientInfo::const_iterator aIt( aClients.begin() );
+for ( vectorClientInfo*::const_iterator aIt( aClients.begin() );
 aIt  aClients.end(); aIt++ )
 {
-mClientBox.addEntry( *aIt );
+mClientBox.addEntry( **aIt );
 }
 
 mButtonConnect.SetClickHdl( LINK( this, RemoteDialog, HandleConnectButton 
) );
diff --git a/sd/source/ui/inc/RemoteServer.hxx 
b/sd/source/ui/inc/RemoteServer.hxx
index d3e202b..a77f5ab 100644
--- a/sd/source/ui/inc/RemoteServer.hxx
+++ b/sd/source/ui/inc/RemoteServer.hxx
@@ -16,6 +16,7 @@
 #include sys/types.h
 #include vector
 
+#include osl/mutex.hxx
 #include osl/socket.hxx
 #include rtl/ref.hxx
 #include salhelper/thread.hxx
@@ -36,10 +37,7 @@ namespace css = ::com::sun::star;
 
 namespace sd
 {
-
-class Transmitter;
-class Listener;
-class ImagePreparer;
+class Communicator;
 
 struct ClientInfo
 {
@@ -47,33 +45,53 @@ namespace sd
 rtl::OUString mAddress;
 
 enum PROTOCOL { NETWORK = 1, BLUETOOTH };
-ClientInfo( OUString rName, OUString rAddress) :
+ClientInfo( const rtl::OUString rName, const rtl::OUString rAddress ) :
 mName( rName ),
 mAddress( rAddress ) {}
 };
 
+struct ClientInfoInternal:
+ClientInfo
+{
+osl::StreamSocket mStreamSocket;
+rtl::OUString mPin;
+
+ClientInfoInternal( const rtl::OUString rName,
+const rtl::OUString rAddress,
+osl::StreamSocket rSocket, rtl::OUString rPin ):
+ClientInfo( rName, rAddress ),
+mStreamSocket( rSocket ),
+mPin( rPin ) {}
+};
+
 class RemoteServer : public salhelper::Thread
 {
 public:
+// Internal setup
 static void setup();
+
+// For slideshowimpl to inform us.
 static void presentationStarted( const css::uno::Reference
 css::presentation::XSlideShowController  rController );
 static void presentationStopped();
-void informListenerDestroyed();
 
-SD_DLLPUBLIC static std::vectorClientInfo getClients();
+// For the control dialog
+SD_DLLPUBLIC static std::vectorClientInfo* getClients();
 SD_DLLPUBLIC static void connectClient( ClientInfo aClient, 
rtl::OString aPin );
+
+// For the communicator
+static void removeCommunicator( Communicator* pCommunicator );
 private:
 RemoteServer();
 ~RemoteServer();
 static RemoteServer *spServer;
 osl::AcceptorSocket mSocket;
-osl::StreamSocket mStreamSocket;
-void pairClient();
-void listenThread();
+
+::osl::Mutex mDataMutex;
+::std::vectorCommunicator* mCommunicators;
+::std::vectorClientInfoInternal* mAvailableClients;
+
 void execute();
-static Transmitter *pTransmitter;
-static rtl::ReferenceListener mListener;
 };
 }
 
diff --git a/sd/source/ui/remotecontrol/Communicator.cxx 
b/sd/source/ui/remotecontrol/Communicator.cxx
new file mode 100644
index

[REVIEW 3-6] Window background of toolbars

2012-08-10 Thread Jan Holesovsky

Hi Astron,

Stefan Knorr píše v Pá 29. 06. 2012 v 09:50 +0200:

 sorry, it took so long... I have attached a mock-up of what I'd like. It
 builds on the last screenshot that you made available of the opaque menu
 bars – so hopefully it's current.
 As you can see, the proposal is quite simple...

I've pushed a change to master that (I hope) improves the situation:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=03dbe1a97c0050365ac3820575134bace0908e2b

[for cherry-picking purposes, probably easier to check the
non-whitespace changes version:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=03dbe1a97c0050365ac3820575134bace0908e2bignorews=1
]

With this patch, it looks like this:

http://artax.karlin.mff.cuni.cz/~kendy/design-list/vertical-toolbars-1.png

http://artax.karlin.mff.cuni.cz/~kendy/design-list/vertical-toolbars-2.png

Unfortunately it is not ideal; as you can see, the vertical toolbars
have no distinction between them and the workspace.  I think it is not
really a problem, just different to what we used to have, but needs
approval from you / UX list.

Your original proposal for comparison:

http://nabble.documentfoundation.org/attachment/3992797/0/toolbars.png 

I am doing some larger changes in master to make it more alike your
proposal, I am just a bit afraid they'll be too big for cherry-picking
to 3.6.x; unfortunately no easy win there :-(

Please let me know what do you prefer from the UX point of view:

1) status quo - 3.6 vertical / floating toolbars use the 'native'
   theming (inconsistent with the new 3.6 look)
2) half-way solution - my screenshots above; more consistent look, but
   no line splitting the vertical toolbars from the workspace
3) complete solution - will take some larger reviewing, as this touches
   look on all platforms; I'll see if I can find a brave reviewer :-)

Would be good to have a decision until the Monday's 3.6.1 RC1 freeze, so
that if we put it in, we are able to revert that in RC2, should it cause
trouble.

Regards,
Kendy

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

Re: gerrit and Change-IDs - is everyone supposed to manually install a commit-hook?

Hi,

On Friday, 2012-08-10 02:58:19 +0200, Bjoern Michaelsen wrote:

 On Fri, Aug 10, 2012 at 02:16:37AM +0200, Christian Lohmaier wrote:
  So is everyone supposed to install a commit-hook locally?
 yes.
  Or how is it supposed to work?
 
 Usually one of the initial scripts (./download ?) do that for you. To be 
 safe, you can always run
 
  ./g -z
 
 which should do the trick.

Just to mention that if one uses StGit to fumble around with a series of
patches (that I use a lot) the git hooks are bypassed. Commits result in
having no Change-Id then.

  Eike

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


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

Re: [PUSHED 3-6] fdo#53006 Force reinstall of all bundled extensions on upgrade

Stephan Bergmann píše v Čt 09. 08. 2012 v 15:03 +0200:
On 08/03/2012 06:10 PM, Stephan Bergmann wrote:
On 08/03/2012 11:24 AM, Stephan Bergmann wrote:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=81fd6b084b0f3c0eb5a97c77592f5ceb21d2dfb1

fdo#53006 Force reinstall of all bundled extensions on upgrade are the
two commits from master to get this fixed, which I would love to see
backported to libreoffice-3-6.

Please do *not* backport that one to libreoffice-3-6 for now. I just
got an idea that might obsolete it...

Finally got a new fix out, see
https://bugs.freedesktop.org/show_bug.cgi?id=53006#c17 for details.
With the one old commit from this thread still relevant, that means
please review the three master commits

...and this time, I /did/ test on Windows 3.6, too. -- Lets keep fingers
crossed...

It looks quite robust. It means that the first start will be slower but
what we can do. = I have pushed it into 3-6 branch:
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=40c80e6a637e80c220f3e39b855cd975c3e94799
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=006e90e29c6ca768e3a5d8d2a558a63b04817c4b
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=fd75125424b3dda0e77076d5b1709224ec22a345

Just to be sure. removeTree(url) removes only files and not directories.
Is it by intention? I think that both variants would be fine.

BTW: It worked well here with symlinks. I was not able to create
infinite loop with cyclic directories. So, we should be on the safe side
regarding the TODO comment.

Petr, Björn, Rene: With that fixed, prereg-affected Linux distros can
probably undo
https://build.opensuse.org/package/view_file?file=force-refresh-of-bundled-extension-cache.diffpackage=libreofficeproject=LibreOffice%3AUnstable

File force-refresh-of-bundled-extension-cache.diff of Package
libreoffice or its moral equivalent (if any) again.

Yup, your changes do similar thing like the hack. I am going to double
check it with SUSE build because I was able to reproduce it here with
the SUSE package.

Thanks a lot for digging into it.

Best Regards,
Petr

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

Re: [CHANGEUPLOAD FAILED] [ONGERRIT] leaked ODBC statement handles

2012-08-10 Thread Terrence Enger





--
View this message in context: 
http://nabble.documentfoundation.org/CHANGEUPLOAD-FAILED-ONGERRIT-leaked-ODBC-statement-handles-tp4000433p4000479.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

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

Bug 6 depends on bug 53006, which changed state.

Bug 53006 Summary: Autocorrection TWo INitial CApitals does not work because of 
bundled extensions problem
https://bugs.freedesktop.org/show_bug.cgi?id=53006

   What|Old Value   |New Value

 Resolution||FIXED
 Status|ASSIGNED|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' - sc/source

 sc/source/ui/src/condformatdlg.src |   56 ++---
 1 file changed, 28 insertions(+), 28 deletions(-)

New commits:
commit cc304dc643813184fb1eb4b0975749deb51779d6
Author: Jean-Baptiste FAURE jbf.fa...@orange.fr
Date:   Tue Jul 31 10:03:16 2012 +0200

vertically align and enlarge fields in cond.formatting dialog

add more room in several fields: usefull for FR translation
reorder the code by levels/lines in the dialog

Change-Id: I2c4cbaf926ade87b35a5900ab5461477e0157822
Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/sc/source/ui/src/condformatdlg.src 
b/sc/source/ui/src/condformatdlg.src
index 174da1f..12d4ef9 100644
--- a/sc/source/ui/src/condformatdlg.src
+++ b/sc/source/ui/src/condformatdlg.src
@@ -95,7 +95,7 @@ Control RID_COND_ENTRY
 ListBox LB_TYPE
 {
 Pos = MAP_APPFONT( 5, 15 );
-Size = MAP_APPFONT( 60, 40 );
+Size = MAP_APPFONT( 80, 40 );
 Border = TRUE;
 DropDown = TRUE;
 StringList [ en-US ] =
@@ -107,7 +107,7 @@ Control RID_COND_ENTRY
 };
 ListBox LB_CELLIS_TYPE
 {
-Pos = MAP_APPFONT( 70, 15 );
+Pos = MAP_APPFONT( 90, 15 );
 Size = MAP_APPFONT( 80, 40 );
 Border = TRUE;
 DropDown = TRUE;
@@ -125,52 +125,52 @@ Control RID_COND_ENTRY
 not duplicate;
 };
 };
-FixedText FT_STYLE
-{
-Pos = MAP_APPFONT( 10, 32 );
-Size = MAP_APPFONT( 35, 14 );
-Text [ en-US ] = Apply Style;
-};
 Edit ED_VAL1
 {
-Pos = MAP_APPFONT( 155, 15 );
+Pos = MAP_APPFONT( 175, 15 );
 Size = MAP_APPFONT( 50, 12 );
 Border = TRUE;
 };
 Edit ED_VAL2
 {
-Pos = MAP_APPFONT( 210, 15 );
+Pos = MAP_APPFONT( 230, 15 );
 Size = MAP_APPFONT( 50, 12 );
 Border = TRUE;
 };
-ListBox LB_STYLE
+ListBox LB_COLOR_FORMAT
 {
-Pos = MAP_APPFONT( 50, 32 );
-Size = MAP_APPFONT( 50, 80 );
+Pos = MAP_APPFONT( 100, 15 );
+Size = MAP_APPFONT( 100, 60);
 Border = TRUE;
 DropDown = TRUE;
 StringList [ en-US ] =
 {
-New Style...;
+Color Scale (2 Entries);
+Color Scale (3 Entries);
+Data Bar;
 };
 };
-ListBox LB_COLOR_FORMAT
+FixedText FT_STYLE
 {
-Pos = MAP_APPFONT( 70, 15 );
-Size = MAP_APPFONT( 80, 60);
+Pos = MAP_APPFONT( 5, 32 );
+Size = MAP_APPFONT( 50, 14 );
+Text [ en-US ] = Apply Style;
+};
+ListBox LB_STYLE
+{
+Pos = MAP_APPFONT( 90, 32 );
+Size = MAP_APPFONT( 80, 80 );
 Border = TRUE;
 DropDown = TRUE;
 StringList [ en-US ] =
 {
-Color Scale (2 Entries);
-Color Scale (3 Entries);
-Data Bar;
+New Style...;
 };
 };
 ListBox LB_TYPE_COL_SCALE
 {
 Pos = MAP_APPFONT( 5, 32 );
-Size = MAP_APPFONT( 60, 60 );
+Size = MAP_APPFONT( 80, 60 );
 Border = TRUE;
 DropDown = TRUE;
 StringList [ en-US ] =
@@ -183,17 +183,17 @@ Control RID_COND_ENTRY
 Formula;
 };
 };
-Edit ED_COL_SCALE
+Window WD_PREVIEW
 {
-Pos = MAP_APPFONT( 5, 48 );
-Size = MAP_APPFONT( 60, 12 );
+Pos = MAP_APPFONT( 175, 32 );
+Size = MAP_APPFONT( 105, 14 );
+Text [ en-US ] = Example;
 Border = TRUE;
 };
-Window WD_PREVIEW
+Edit ED_COL_SCALE
 {
-Pos = MAP_APPFONT( 150, 32 );
-Size = MAP_APPFONT( 60, 14 );
-Text [ en-US ] = Example;
+Pos = MAP_APPFONT( 5, 48 );
+Size = MAP_APPFONT( 60, 12 );
 Border = TRUE;
 };
 ListBox LB_COL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/qa writerfilter/source

 sw/qa/extras/rtfimport/data/fdo48446.rtf   |7 +++
 sw/qa/extras/rtfimport/rtfimport.cxx   |   10 ++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |3 +++
 3 files changed, 20 insertions(+)

New commits:
commit f6a24ace5ad12e79f0cc90709a290a30e3758781
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri Aug 10 17:48:57 2012 +0200

fdo#48446 implement RTF_CPG

Change-Id: I2fb2004f2f755ce337ddd1419acf2510f17622f3

diff --git a/sw/qa/extras/rtfimport/data/fdo48446.rtf 
b/sw/qa/extras/rtfimport/data/fdo48446.rtf
new file mode 100644
index 000..9ff8f6c
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo48446.rtf
@@ -0,0 +1,7 @@
+{\rtf
+{\fonttbl
+{\f1\cpg1251 Arial;}
+}
+\f1 Èìÿ
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 0f5e704..92d306c 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -102,6 +102,7 @@ public:
 void testFdo48033();
 void testFdo36089();
 void testFdo49892();
+void testFdo48446();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -146,6 +147,7 @@ public:
 CPPUNIT_TEST(testFdo48033);
 CPPUNIT_TEST(testFdo36089);
 CPPUNIT_TEST(testFdo49892);
+CPPUNIT_TEST(testFdo48446);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -886,6 +888,14 @@ void Test::testFdo49892()
 }
 }
 
+void Test::testFdo48446()
+{
+load(fdo48446.rtf);
+
+OUString aExpected(ÐÐ¼Ñ, 6, RTL_TEXTENCODING_UTF8);
+getParagraph(1, aExpected);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index e2c96c0..adfb18c 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2490,6 +2490,9 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 case RTF_ANSICPG:
 m_aStates.top().nCurrentEncoding = 
rtl_getTextEncodingFromWindowsCodePage(nParam);
 break;
+case RTF_CPG:
+m_aFontEncodings[m_nCurrentFontIndex] = 
rtl_getTextEncodingFromWindowsCodePage(nParam);
+break;
 case RTF_CF:
 {
 // NS_sprm::LN_CIco won't work, that would be an index in a 
static table
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED 3.6] vertically align and enlarge fields in cond.formatting dialog

Jean-Baptiste Faure píše v Pá 10. 08. 2012 v 10:59 +0200:
 Hi,
 
 Please consider backporting to 3.6 this trivial fix
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=63e0644040536558df92e7598e70a56bb5a3422f
 
 It make the Conditional Formating Dialog more readable, specifically for
 FR localization.

I like the changes. We are past UI freeze but this just slightly shift
the elements and the result looks better = pushed into 3-6
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=cc304dc643813184fb1eb4b0975749deb51779d6

Thanks for the nice fix.


Best Regards,
Petr




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

Re: [ANN] gerrit maildrop ready for testing

On Fri, Aug 10, 2012 at 06:56:14PM +0400, Ivan Timofeev wrote:
   
  https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/patchpickup;h=cd5f3f95514fc219e20b5a88e8e0810b7b293034;hb=HEAD
   24 desturl = 'shh://logerrit/core'
 
 shh - ssh, could you correct that yourself please?
done.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Change in core[libreoffice-3-6]: fdo#48446 implement RTF_CPG

From Miklos Vajna vmik...@suse.cz:

Miklos Vajna has uploaded a new change for review.

Change subject: fdo#48446 implement RTF_CPG
..

fdo#48446 implement RTF_CPG

(cherry picked from commit f6a24ace5ad12e79f0cc90709a290a30e3758781)

Change-Id: I2fb2004f2f755ce337ddd1419acf2510f17622f3
---
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
1 file changed, 3 insertions(+), 0 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fb2004f2f755ce337ddd1419acf2510f17622f3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Miklos Vajna vmik...@suse.cz

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

[Libreoffice-commits] .: sd/Library_sd.mk sd/source

2012-08-10 Thread Andrzej J.R. Hunt

 sd/Library_sd.mk|1 
 sd/source/ui/inc/RemoteServer.hxx   |   10 +--
 sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |   61 ++
 sd/source/ui/remotecontrol/BufferedStreamSocket.hxx |   45 +
 sd/source/ui/remotecontrol/Communicator.cxx |   13 ++-
 sd/source/ui/remotecontrol/Communicator.hxx |6 +
 sd/source/ui/remotecontrol/Server.cxx   |   66 +---
 7 files changed, 185 insertions(+), 17 deletions(-)

New commits:
commit f4ab85cb44664a4c46c52d5a34eee300947e6069
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Fri Aug 10 18:42:49 2012 +0200

Pairing implemented server side.

Change-Id: I542e563df68d38691f7c95cebf66aeb32071bd66

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 92db929..283971c 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -327,6 +327,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
 sd/source/ui/presenter/PresenterPreviewCache \
 sd/source/ui/presenter/PresenterTextView \
 sd/source/ui/presenter/SlideRenderer \
+sd/source/ui/remotecontrol/BufferedStreamSocket \
 sd/source/ui/remotecontrol/Communicator \
 sd/source/ui/remotecontrol/DiscoveryService \
 sd/source/ui/remotecontrol/ImagePreparer \
diff --git a/sd/source/ui/inc/RemoteServer.hxx 
b/sd/source/ui/inc/RemoteServer.hxx
index a77f5ab..c64bf94 100644
--- a/sd/source/ui/inc/RemoteServer.hxx
+++ b/sd/source/ui/inc/RemoteServer.hxx
@@ -38,6 +38,7 @@ namespace css = ::com::sun::star;
 namespace sd
 {
 class Communicator;
+class BufferedStreamSocket;
 
 struct ClientInfo
 {
@@ -53,14 +54,14 @@ namespace sd
 struct ClientInfoInternal:
 ClientInfo
 {
-osl::StreamSocket mStreamSocket;
+BufferedStreamSocket *mpStreamSocket;
 rtl::OUString mPin;
 
 ClientInfoInternal( const rtl::OUString rName,
 const rtl::OUString rAddress,
-osl::StreamSocket rSocket, rtl::OUString rPin ):
+BufferedStreamSocket *pSocket, rtl::OUString rPin 
):
 ClientInfo( rName, rAddress ),
-mStreamSocket( rSocket ),
+mpStreamSocket( pSocket ),
 mPin( rPin ) {}
 };
 
@@ -77,7 +78,8 @@ namespace sd
 
 // For the control dialog
 SD_DLLPUBLIC static std::vectorClientInfo* getClients();
-SD_DLLPUBLIC static void connectClient( ClientInfo aClient, 
rtl::OString aPin );
+SD_DLLPUBLIC static sal_Bool connectClient( ClientInfo *pClient,
+rtl::OUString aPin );
 
 // For the communicator
 static void removeCommunicator( Communicator* pCommunicator );
diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx 
b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
new file mode 100644
index 000..8232bd0
--- /dev/null
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
@@ -0,0 +1,61 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ */
+
+#include BufferedStreamSocket.hxx
+
+#include algorithm
+
+using namespace sd;
+using namespace std;
+using namespace osl;
+
+BufferedStreamSocket::BufferedStreamSocket( const osl::StreamSocket aSocket ):
+StreamSocket( aSocket ),
+aRet( 0 ),
+aRead( 0 ),
+aBuffer()
+{
+}
+
+sal_Int32 BufferedStreamSocket::readLine( OString aLine )
+{
+while ( true )
+{
+aBuffer.resize( aRead + 100 );
+aRet = recv( aBuffer[aRead], 100 );
+if ( aRet == 0 )
+{
+return aRet;
+}
+// Prevent buffer from growing massively large.
+if ( aRead  MAX_LINE_LENGTH )
+{
+aBuffer.erase( aBuffer.begin(), aBuffer.end() );
+return 0;
+}
+aRead += aRet;
+vectorchar::iterator aIt;
+while ( (aIt = find( aBuffer.begin(), aBuffer.end(), '\n' ))
+!= aBuffer.end() )
+{
+sal_uInt64 aLocation = aIt - aBuffer.begin();
+
+aLine = OString( (*aBuffer.begin()), aLocation );
+
+aBuffer.erase( aBuffer.begin(), aIt + 1 ); // Also delete the 
empty line
+aRead -= (aLocation + 1);
+
+return aLine.getLength();
+}
+}
+
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx 
b/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx
new file mode 100644
index 000..53b6e2a
--- /dev/null
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx
@@ -0,0

[PATCH] Change in core[libreoffice-3-5]: fdo#48446 implement RTF_CPG

From Miklos Vajna vmik...@suse.cz:

Miklos Vajna has uploaded a new change for review.

Change subject: fdo#48446 implement RTF_CPG
..

fdo#48446 implement RTF_CPG

(cherry picked from commit f6a24ace5ad12e79f0cc90709a290a30e3758781)

Change-Id: I2fb2004f2f755ce337ddd1419acf2510f17622f3
---
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
1 file changed, 3 insertions(+), 0 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fb2004f2f755ce337ddd1419acf2510f17622f3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-5
Gerrit-Owner: Miklos Vajna vmik...@suse.cz

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

[Libreoffice-commits] .: i18npool/Module_i18npool.mk

 i18npool/Module_i18npool.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 293151c8fc10c5a0ba84c5c5a796a3c72f573654
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 10 18:54:27 2012 +0200

Disabling CppunitTest_i18npool_test_languagetag for now

... as it causes problems on Windows:


file:///C:/lo/core/solver/wntmsci12.pro/share/liblangtag%5Clanguage-subtag-registry.xml:709:
 parser error : Input is not proper UTF-8, indicate encoding !
Bytes: 0xE5 0x6C 0x3C 0x2F
 descriptionNorwegian BokmÃ¥l/description

Apart from the encoding issue (looks like that language-subtag-registry.xml
delivered from module liblangtag is generated as MS-1252 rather than UTF-8 
on
Windows), what also looks worrying in the error message is the backslash 
encoded
as %5C (and the entity resolving that URL apparently decoding it somewhat
naively).

Change-Id: I756f911a92b144e3732f63668d36b4ae941f975a

diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk
index 9214d00..bed175a 100644
--- a/i18npool/Module_i18npool.mk
+++ b/i18npool/Module_i18npool.mk
@@ -63,7 +63,6 @@ endif
 $(eval $(call gb_Module_add_check_targets,i18npool,\
CppunitTest_i18npool_test_breakiterator \
CppunitTest_i18npool_test_characterclassification \
-   CppunitTest_i18npool_test_languagetag \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/source

 desktop/source/app/app.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 0ab5ce54c441b12ea6c12a2cedb9069f36cfd0f4
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 10 19:36:08 2012 +0200

fdo#53006: Remove directories too, not just plain files

... that was an oversight in 5300f6f711c2167931d45248c1b72dbce3a7df38; 
thanks
Petr for spotting it.

Change-Id: I4d0179165bc3b29d698cd776f7e1aa51fa73ebe3

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c0bc0ed..960a6e4 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -186,11 +186,16 @@ void removeTree(OUString const  url) {
 } else {
 if (osl::File::remove(stat.getFileURL()) != osl::FileBase::E_None) 
{
 throw css::uno::RuntimeException(
-cannot remove  + stat.getFileURL(),
+cannot remove file  + stat.getFileURL(),
 css::uno::Reference css::uno::XInterface ());
 }
 }
 }
+if (osl::Directory::remove(url) != osl::FileBase::E_None) {
+throw css::uno::RuntimeException(
+cannot remove directory  + url,
+css::uno::Reference css::uno::XInterface ());
+}
 }
 
 // Remove any existing UserInstallation's user/extensions/bundled cache
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW 3-6] fdo#53006: Remove directories too, not just plain files


On 08/10/2012 05:29 PM, Petr Mladek wrote:

Just to be sure. removeTree(url) removes only files and not directories.
Is it by intention? I think that both variants would be fine.


Oh, good catch.  No, it was an oversight to not remove directories.  So 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=0ab5ce54c441b12ea6c12a2cedb9069f36cfd0f4 
fdo#53006: Remove directories too, not just plain files fixes that.  I 
think it is best to backport it to libreoffice-3-6, too.  (Seen working 
as intended on both Linux and Windows master.)


Stephan

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

Re: [PUSHED 3.6] vertically align and enlarge fields in cond.formatting dialog

Le 10/08/2012 18:08, Petr Mladek a écrit :
 Jean-Baptiste Faure píše v Pá 10. 08. 2012 v 10:59 +0200:
 Hi,

 Please consider backporting to 3.6 this trivial fix
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=63e0644040536558df92e7598e70a56bb5a3422f

 It make the Conditional Formating Dialog more readable, specifically for
 FR localization.
 I like the changes. We are past UI freeze but this just slightly shift
 the elements and the result looks better = pushed into 3-6
 http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=cc304dc643813184fb1eb4b0975749deb51779d6

 Thanks for the nice fix.
Thank you

Best regards.
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

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

Bug 6 depends on bug 52639, which changed state.

Bug 52639 Summary: ReportBuilder: Creating a new report destroys .odb
https://bugs.freedesktop.org/show_bug.cgi?id=52639

   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] .: 2 commits - sc/inc sc/source

2012-08-10 Thread Markus Mohrhard

 sc/inc/column.hxx   |2 +-
 sc/inc/table.hxx|   34 +-
 sc/source/core/data/column2.cxx |2 +-
 sc/source/core/data/table1.cxx  |8 
 sc/source/core/data/table2.cxx  |   10 +-
 sc/source/core/data/table3.cxx  |   14 +++---
 sc/source/core/data/table4.cxx  |2 +-
 7 files changed, 36 insertions(+), 36 deletions(-)

New commits:
commit 26a1aed24cc903ee858fb2d354f5dbb00f6d9969
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Aug 10 19:21:12 2012 +0200

make more ScTable methods const

Change-Id: I9965a5ee383c4380dc1e75abc6a8df17ed69f6fc

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index d9c18ec..34e05cb 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -366,7 +366,7 @@ public:
 bool GetDataEntries(SCROW nRow, std::setScTypedStrData rStrings, bool 
bLimit);
 
 void UpdateInsertTabAbs(SCTAB nNewPos);
-boolTestTabRefAbs(SCTAB nTable);
+boolTestTabRefAbs(SCTAB nTable) const;
 boolGetNextSpellingCell(SCROW nRow, bool bInSel, const ScMarkData 
rData) const;
 
 voidRemoveAutoSpellObj();
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 10d25f8..223d38c 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -345,12 +345,12 @@ public:
 @param bForced  True = always create all captions, false = skip when 
Undo is disabled. */
 voidInitializeNoteCaptions( bool bForced = false );
 
-boolTestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCSIZE nSize );
+boolTestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCSIZE nSize ) 
const;
 voidInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, 
SCSIZE nSize );
 voidDeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, 
SCSIZE nSize,
 bool* pUndoOutline = NULL );
 
-boolTestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize );
+boolTestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize ) 
const;
 voidInsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, 
SCSIZE nSize );
 voidDeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, 
SCSIZE nSize,
 bool* pUndoOutline = NULL );
@@ -422,13 +422,13 @@ public:
   SCCOL rEndCol, SCROW rEndRow, bool 
bColumnsOnly ) const;
 
 SCSIZE  GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow,
-SCCOL nEndCol, SCROW nEndRow, 
ScDirection eDir );
+SCCOL nEndCol, SCROW nEndRow, 
ScDirection eDir ) const;
 
 voidFindAreaPos( SCCOL rCol, SCROW rRow, ScMoveDirection 
eDirection ) const;
 voidGetNextPos( SCCOL rCol, SCROW rRow, SCsCOL nMovX, SCsROW 
nMovY,
 bool bMarked, bool bUnprotected, const 
ScMarkData rMark ) const;
 
-voidLimitChartArea( SCCOL rStartCol, SCROW rStartRow, SCCOL 
rEndCol, SCROW rEndRow );
+voidLimitChartArea( SCCOL rStartCol, SCROW rStartRow, SCCOL 
rEndCol, SCROW rEndRow ) const;
 
 boolHasData( SCCOL nCol, SCROW nRow ) const;
 boolHasStringData( SCCOL nCol, SCROW nRow ) const;
@@ -653,9 +653,9 @@ public:
 sal_uInt16  GetOriginalWidth( SCCOL nCol ) const;
 sal_uInt16  GetOriginalHeight( SCROW nRow ) const;
 
-sal_uInt16  GetCommonWidth( SCCOL nEndCol );
+sal_uInt16  GetCommonWidth( SCCOL nEndCol ) const;
 
-SCROW   GetHiddenRowCount( SCROW nRow );
+SCROW   GetHiddenRowCount( SCROW nRow ) const;
 
 voidShowCol(SCCOL nCol, bool bShow);
 voidShowRow(SCROW nRow, bool bShow);
@@ -765,8 +765,8 @@ public:
 void GetFilteredFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, const 
ScQueryParam rParam, std::vectorScTypedStrData rStrings, bool rHasDates );
 bool GetDataEntries(SCCOL nCol, SCROW nRow, std::setScTypedStrData 
rStrings, bool bLimit);
 
-boolHasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, 
SCROW nEndRow );
-boolHasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, 
SCROW nEndRow );
+boolHasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, 
SCROW nEndRow ) const;
+boolHasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, 
SCROW nEndRow ) const;
 
 voidDoColResize( SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd );
 
@@ -777,7 +777,7 @@ public:
SCCOL nCol,
SCROW nRowStart, SCROW nRowEnd ) const;
 
-voidFindConditionalFormat( sal_uLong nKey, ScRangeList rRanges );
+voidFindConditionalFormat( sal_uLong nKey, ScRangeList rRanges ) 
const;
 
 voidIncRecalcLevel();
 voidDecRecalcLevel( bool bUpdateNoteCaptionPos = true );
@@ -871,7

[Libreoffice-commits] .: sw/source unusedcode.easy

2012-08-10 Thread Julien Nabet

 sw/source/filter/ww8/rtfattributeoutput.cxx |5 -
 sw/source/filter/ww8/rtfattributeoutput.hxx |1 -
 unusedcode.easy |1 -
 3 files changed, 7 deletions(-)

New commits:
commit 2058908d8ce86c9fec6db3ef3bc0be2ec20d1547
Author: Julien Nabet serval2...@yahoo.fr
Date:   Fri Aug 10 20:36:30 2012 +0200

Bin RtfAttributeOutput::WriteHex(sal_Int32 nNum)

Change-Id: Ibeb903c03a9c4c8638985847f527ebfa7c2756ce

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index de19745..a152e6e 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3225,11 +3225,6 @@ OString RtfAttributeOutput::WriteHex(const sal_uInt8* 
pData, sal_uInt32 nSize, S
 return aRet.makeStringAndClear();
 }
 
-OString RtfAttributeOutput::WriteHex(sal_Int32 nNum)
-{
-return RtfAttributeOutput::WriteHex((sal_uInt8*)nNum, sizeof(sal_Int32));
-}
-
 void lcl_AppendSP( OStringBuffer rBuffer,
 const char cName[],
 const ::rtl::OUString rValue,
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx 
b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 4a13da4..e7c51eb 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -588,7 +588,6 @@ public:
 
 /// Writes binary data as a hex dump.
 static rtl::OString WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, 
SvStream* pStream = 0, sal_uInt32 nLimit = 64);
-static rtl::OString WriteHex(sal_Int32 nNum);
 };
 
 #endif // _RTFATTRIBUTEOUTPUT_HXX_
diff --git a/unusedcode.easy b/unusedcode.easy
index abe2b56..ee2c76a 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -2,7 +2,6 @@ BasicDockingWindow::BasicDockingWindow(Window*, ResId const)
 FontSelectPattern::FontSelectPattern(PhysicalFontFace const, Size const, 
float, int, bool)
 PlaceEditDialog::GetResId(unsigned short)
 PopupMenu::SetSelectedEntry(unsigned short)
-RtfAttributeOutput::WriteHex(int)
 SanExtensionImpl::setCertExtn(com::sun::star::uno::Sequencesigned char, 
com::sun::star::uno::Sequencesigned char, unsigned char)
 SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, 
unsigned int, unsigned char)
 ScCompressedArrayint, unsigned char::GetEntryCount() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 dbaccess/source/ui/control/marktree.cxx |   37 +-
 dbaccess/source/ui/control/sqledit.cxx  |   21 ++--
 dbaccess/source/ui/dlg/TextConnectionHelper.cxx |   44 ++---
 dbaccess/source/ui/dlg/adtabdlg.cxx |   60 +---
 dbaccess/source/ui/dlg/dbfindex.cxx |   54 -
 dbaccess/source/ui/dlg/queryfilter.cxx  |   37 --
 dbaccess/source/ui/dlg/queryorder.cxx   |   19 ---
 7 files changed, 58 insertions(+), 214 deletions(-)

New commits:
commit 95ab516729ccf847f6e588a224677314afb77b29
Author: Philipp Riemer ruderphil...@gmail.com
Date:   Fri Aug 10 20:53:16 2012 +0200

fdo#39468: Translate German comments in dbaccess/

Follow-up patch of b803fa2579256979bac83f0b193f2c30d524d76b.

Change-Id: I86bea8483cc9a9703cc725eaef641c2df5896af0

diff --git a/dbaccess/source/ui/control/marktree.cxx 
b/dbaccess/source/ui/control/marktree.cxx
index 7efa249..07367d8 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -79,7 +79,7 @@ void OMarkableTreeListBox::InitButtonData()
 
 void OMarkableTreeListBox::KeyInput( const KeyEvent rKEvt )
 {
-// nur wenn space
+// only if there are spaces
 if (rKEvt.GetKeyCode().GetCode() == KEY_SPACE  
!rKEvt.GetKeyCode().IsShift()  !rKEvt.GetKeyCode().IsMod1())
 {
 SvLBoxEntry* pCurrentHandlerEntry = GetHdlEntry();
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx 
b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index d587959..88a24f5 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -343,7 +343,7 @@ DBG_NAME(OTextConnectionHelper)
 pErrorWin = m_aTextSeparator;
 }
 else if (m_aTextSeparator.GetText() == m_aDecimalSeparator.GetText())
-{   // Zehner und TextTrenner duerfen nicht gleich sein
+{   // Tenner and TextSeparator must not be the same
 aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER));
 
aErrorText.SearchAndReplaceAscii(#1,m_aTextSeparatorLabel.GetText());
 
aErrorText.SearchAndReplaceAscii(#2,m_aDecimalSeparatorLabel.GetText());
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx 
b/dbaccess/source/ui/dlg/dbfindex.cxx
index 88e6616..9dd9916 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -387,7 +387,7 @@ void ODbaseIndexDialog::Init()
 
 void ODbaseIndexDialog::SetCtrls()
 {
-// ComboBox Tabellen
+// ComboBox tables
 for (   ConstTableInfoListIterator aLoop = m_aTableInfoList.begin();
 aLoop != m_aTableInfoList.end();
 ++aLoop
@@ -428,7 +428,7 @@ void ODbaseIndexDialog::SetCtrls()
 // OTableInfo 
--
 void OTableInfo::WriteInfFile( const String rDSN ) const
 {
-// INF-Datei oeffnen
+// open INF file
 INetURLObject aURL;
 aURL.SetSmartProtocol(INET_PROT_FILE);
 String aDsn = rDSN;
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx 
b/dbaccess/source/ui/dlg/queryfilter.cxx
index affc779..cbcee0e 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -727,7 +727,7 @@ IMPL_LINK( DlgFilterCrit, ListSelectHdl, ListBox *, 
pListBox )
 }
 else
 {
-OSL_FAIL(DlgFilterCrit::ListSelectHdl: Diese Column dï¿½rfte 
garnicht vorhanden sein!);
+OSL_FAIL(DlgFilterCrit::ListSelectHdl: This column should not 
exist at all.);
 }
 }
 pComp-SelectEntryPos(0);
commit 25a56559db5d7dbf6ebee979b0b1aaf6be2a64e3
Author: Philipp Riemer ruderphil...@gmail.com
Date:   Fri Aug 10 20:50:33 2012 +0200

cleaned-up comments

Files were originally touched by b803fa2579256979bac83f0b193f2c30d524d76b.
This is just a follow-up patch.

Change-Id: I1e35d5e3c3d193bb5dfdb4b743328d8d22466a4d

diff --git a/dbaccess/source/ui/control/marktree.cxx 
b/dbaccess/source/ui/control/marktree.cxx
index 830f138..7efa249 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -17,23 +17,19 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include marktree.hxx
 #include dbu_control.hrc
 #include vcl/svapp.hxx
 
-//.
 namespace dbaui
 {
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-//.
+using namespace ::com::sun::star::lang;
+
 #define SPACEBETWEENENTRIES 4
-//
-//= OMarkableTreeListBox
-//
+
 DBG_NAME(OMarkableTreeListBox)

[Libreoffice-commits] .: basctl/source unusedcode.easy

2012-08-10 Thread Julien Nabet

 basctl/source/basicide/bastypes.cxx |8 
 basctl/source/inc/bastypes.hxx  |1 -
 unusedcode.easy |1 -
 3 files changed, 10 deletions(-)

New commits:
commit 369da987d373bdf5bdabfeb11d4b2562c916f372
Author: Julien Nabet serval2...@yahoo.fr
Date:   Fri Aug 10 20:55:41 2012 +0200

Bin BasicDockingWindow( Window* pParent, const ResId rResId )

Change-Id: I84f4929eb923bc3d05bdf04a8958cb58b5bfb921

diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index ded9595..3aa29e6 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -252,14 +252,6 @@ BasicDockingWindow::BasicDockingWindow( Window* pParent ) :
 {
 }
 
-BasicDockingWindow::BasicDockingWindow( Window* pParent, const ResId rResId ) 
:
-DockingWindow( pParent, rResId )
-{
-SetStyle( WB_BORDER | WB_3DLOOK | WB_MOVEABLE |
-WB_SIZEABLE | WB_ROLLABLE |
-WB_DOCKABLE | WB_CLIPCHILDREN );
-}
-
 sal_Bool BasicDockingWindow::Docking( const Point rPos, Rectangle rRect )
 {
 ModulWindowLayout* pLayout = (ModulWindowLayout*)GetParent();
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 30fb847..90541a5 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -69,7 +69,6 @@ protected:
 
 public:
 BasicDockingWindow( Window* pParent );
-BasicDockingWindow( Window* pParent, const ResId rResId );
 };
 
 // helper class for sorting TabBar
diff --git a/unusedcode.easy b/unusedcode.easy
index ee2c76a..e4d051c 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,4 +1,3 @@
-BasicDockingWindow::BasicDockingWindow(Window*, ResId const)
 FontSelectPattern::FontSelectPattern(PhysicalFontFace const, Size const, 
float, int, bool)
 PlaceEditDialog::GetResId(unsigned short)
 PopupMenu::SetSelectedEntry(unsigned short)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

 sw/source/core/doc/docfld.cxx |   27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

New commits:
commit bb6bd1ff9cd3eecec7eb2cd7bd0a4dcef584c903
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri Aug 10 21:09:40 2012 +0200

fdo#53210 SwDoc::UpdateExpFlds don't crash when hiding all sections

Change-Id: I9b7a61f18f987214708195a89f6e346c865c7f9f

diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index aa5156e..b70ddcc 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -1288,6 +1288,15 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool 
bUpdRefFlds )
 SwNewDBMgr* pMgr = GetNewDBMgr();
 pMgr-CloseAll(sal_False);
 
+// Make sure we don't hide all sections, which would lead to a crash. 
First, count how many of them do we have.
+int nShownSections = 0;
+for( _SetGetExpFlds::const_iterator it = pUpdtFlds-GetSortLst()-begin(); 
it != pUpdtFlds-GetSortLst()-end(); ++it )
+{
+SwSection* pSect = (SwSection*)(*it)-GetSection();
+if ( pSect  !pSect-IsCondHidden())
+nShownSections++;
+}
+
 String aNew;
 for( _SetGetExpFlds::const_iterator it = pUpdtFlds-GetSortLst()-begin(); 
it != pUpdtFlds-GetSortLst()-end(); ++it )
 {
@@ -1298,7 +1307,23 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool 
bUpdRefFlds )
 SwSbxValue aValue = aCalc.Calculate(
 pSect-GetCondition() );
 if(!aValue.IsVoidValue())
-pSect-SetCondHidden( aValue.GetBool() );
+{
+// Do we want to hide this one?
+bool bHide = aValue.GetBool();
+if (bHide  !pSect-IsCondHidden())
+{
+// This section will be hidden, but it wasn't before
+if (nShownSections == 1)
+{
+// This would be the last section, so set its 
condition to false, and avoid hiding it.
+OUString aCond(0);
+pSect-SetCondition(aCond);
+bHide = false;
+}
+nShownSections--;
+}
+pSect-SetCondHidden( bHide );
+}
 continue;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] more german translations in dbaccess

2012-08-10 Thread Daniel Herde

Hi, here are some more translations of german comments.

Have a nice friday evening, Daniel.


0001-additional-translations-of-german-comments-in-dbacce.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 11 commits - basctl/source basic/source l10ntools/source svtools/source svx/inc svx/source

2012-08-10 Thread Andras Timar

 basctl/source/basicide/basides1.cxx|3 
 basctl/source/basicide/basidesh.cxx|6 
 basctl/source/basicide/bastype2.cxx|   34 +++
 basctl/source/basicide/bastype2.hxx|2 
 basctl/source/basicide/objdlg.cxx  |7 
 basctl/source/basicide/objdlg.hxx  |2 
 basic/source/runtime/methods.cxx   |   11 -
 l10ntools/source/help/HelpCompiler.cxx |  219 -
 l10ntools/source/help/HelpCompiler.hxx |2 
 svtools/source/edit/textview.cxx   |4 
 svx/inc/tbunosearchcontrollers.hxx |6 
 svx/source/svdraw/svdotext.cxx |2 
 svx/source/tbxctrls/tbunosearchcontrollers.cxx |   70 +--
 13 files changed, 181 insertions(+), 187 deletions(-)

New commits:
commit b0aac2a42566185dd9809e8ded8231a2162bfcba
Author: Noel Power noel.po...@novell.com
Date:   Tue Jul 31 14:25:29 2012 +0100

tweak for commit 8181dddb7bf166be4a00e9280d52f8d7a1741290 fdo#42492

avoid char buffer and snprintf.

Change-Id: Ia83cfc9333591bcb3b191679ccf2be587b4be243
Signed-off-by: Andras Timar ati...@suse.com

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 49ebf27..d54c506 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -872,14 +872,12 @@ RTLFUNC(Hex)
 StarBASIC::Error( SbERR_BAD_ARGUMENT );
 else
 {
-char aBuffer[17];
 SbxVariableRef pArg = rPar.Get( 1 );
-// converting value to unsigned
+// converting value to unsigned and limit to 2 or 4 byte representation
 sal_uInt32 nVal = pArg-IsInteger() ?
 static_castsal_uInt16(pArg-GetInteger()) :
 static_castsal_uInt32(pArg-GetLong());
-snprintf( aBuffer, sizeof(aBuffer), %SAL_PRIXUINT32, nVal );
-rPar.Get(0)-PutString( rtl::OUString::createFromAscii( aBuffer ) );
+rPar.Get(0)-PutString( rtl::OUString::valueOf( sal_Int64(nVal), 16 ) 
);
 }
 }
 
commit 8f08ad4deeb0e5bce7a137ff1d678b71ce74377a
Author: Jan Holesovsky ke...@suse.cz
Date:   Thu Aug 9 11:30:35 2012 +0200

Minor cleanup.

Change-Id: I087043b36d59e1a76c6fe12a5a684c4137eca2d9
Signed-off-by: Andras Timar ati...@suse.com

diff --git a/svx/inc/tbunosearchcontrollers.hxx 
b/svx/inc/tbunosearchcontrollers.hxx
index 490a3f0..8fb7d33 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -96,7 +96,7 @@ private:
 typedef ::comphelper::SequenceAsVector css::beans::PropertyValue  
SearchToolbarControllersVec;
 typedef ::std::map css::uno::Reference css::frame::XFrame , 
SearchToolbarControllersVec  SearchToolbarControllersMap;
 SearchToolbarControllersMap aSearchToolbarControllersMap;
-std::vectorrtl::OUStringaSearchStrings;
+std::vectorrtl::OUString m_aSearchStrings;
 
 };
 
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx 
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 4deaf8c..d645ba9 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -119,7 +119,7 @@ void FindTextFieldControl::Remember_Impl(const String rStr)
 
 void FindTextFieldControl::SetTextToSelected_Impl()
 {
-OUString aString;
+rtl::OUString aString;
 
 try
 {
@@ -212,7 +212,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent rNEvt )
 case EVENT_GETFOCUS:
 if ( m_bToClearTextField )
 {
-SetText( OUString() );
+SetText( rtl::OUString() );
 m_bToClearTextField = sal_False;
 }
 SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
@@ -257,21 +257,21 @@ SearchToolbarControllersManager 
SearchToolbarControllersManager::createControll
 return theSearchToolbarControllersManager::get();
 }
 
-void SearchToolbarControllersManager::saveSearchHistory(const 
FindTextFieldControl* m_pFindTextFieldControl)
+void SearchToolbarControllersManager::saveSearchHistory(const 
FindTextFieldControl* pFindTextFieldControl)
 {
-sal_uInt16 nECount( m_pFindTextFieldControl-GetEntryCount() );
-aSearchStrings.resize( nECount );
+sal_uInt16 nECount( pFindTextFieldControl-GetEntryCount() );
+m_aSearchStrings.resize( nECount );
 for( sal_uInt16 i=0; inECount; ++i )
 {
-aSearchStrings[i] = m_pFindTextFieldControl-GetEntry(i);
+m_aSearchStrings[i] = pFindTextFieldControl-GetEntry(i);
 }
 }
 
-void SearchToolbarControllersManager::loadSearchHistory(FindTextFieldControl* 
m_pFindTextFieldControl)
+void SearchToolbarControllersManager::loadSearchHistory(FindTextFieldControl* 
pFindTextFieldControl)
 {
-for( sal_uInt16 i=0; iaSearchStrings.size(); ++i )
+for( sal_uInt16 i=0; im_aSearchStrings.size(); ++i )
 {
-   m_pFindTextFieldControl-InsertEntry(aSearchStrings[i],i);
+

[Libreoffice-commits] .: toolkit/inc toolkit/source unotools/inc unotools/source xmloff/source

 toolkit/inc/toolkit/awt/vclxgraphics.hxx  |3 +
 toolkit/inc/toolkit/awt/vclxprinter.hxx   |2 -
 toolkit/inc/toolkit/controls/stdtabcontroller.hxx |2 -
 toolkit/inc/toolkit/helper/property.hxx   |4 +-
 toolkit/source/awt/vclxcontainer.cxx  |   15 
 toolkit/source/awt/vclxwindow.cxx |   19 +--
 toolkit/source/awt/vclxwindows.cxx|   16 +
 toolkit/source/controls/stdtabcontroller.cxx  |   34 +---
 toolkit/source/controls/stdtabcontrollermodel.cxx |   17 --
 toolkit/source/controls/unocontrol.cxx|   28 
 toolkit/source/controls/unocontrolbase.cxx|2 -
 toolkit/source/controls/unocontrolcontainer.cxx   |   16 -
 toolkit/source/controls/unocontrolmodel.cxx   |   37 ++
 toolkit/source/controls/unocontrols.cxx   |   15 
 toolkit/source/helper/unowrapper.cxx  |8 ++--
 unotools/inc/unotools/textsearch.hxx  |   17 --
 unotools/source/i18n/textsearch.cxx   |8 ++--
 xmloff/source/draw/sdxmlexp.cxx   |2 -
 xmloff/source/text/txtprmap.cxx   |2 -
 19 files changed, 122 insertions(+), 125 deletions(-)

New commits:
commit be88027c327b5f09d134f235db100ec54afdc30d
Author: Oliver GÃ¼nther m...@oliverguenther.de
Date:   Thu Aug 9 14:47:19 2012 +0200

fdo#39468: Translate German comments in toolkit,unotools,  xmloff

Also checked the following with bin/find-german-comments (all
false positives):
- sysui
- xml2cmp
- udm
- ucb

Change-Id: I2c72f973f5cecf56d70b5419e56338170dd55a2e

diff --git a/toolkit/inc/toolkit/awt/vclxgraphics.hxx 
b/toolkit/inc/toolkit/awt/vclxgraphics.hxx
index 1feea0b..a63723d 100644
--- a/toolkit/inc/toolkit/awt/vclxgraphics.hxx
+++ b/toolkit/inc/toolkit/awt/vclxgraphics.hxx
@@ -61,7 +61,8 @@ class VCLXGraphics :public 
::com::sun::star::awt::XGraphics,
 public ::cppu::OWeakObject
 {
 private:
-::com::sun::star::uno::Reference ::com::sun::star::awt::XDevice 
mxDevice; // nur um bei getDevice() immer das gleiche zurueckzugeben
+// used to return same reference on each call to getDevice()
+::com::sun::star::uno::Reference ::com::sun::star::awt::XDevice mxDevice;
 
 OutputDevice*   mpOutputDevice;
 FontmaFont;
diff --git a/toolkit/inc/toolkit/awt/vclxprinter.hxx 
b/toolkit/inc/toolkit/awt/vclxprinter.hxx
index 0e962c8..6671f83 100644
--- a/toolkit/inc/toolkit/awt/vclxprinter.hxx
+++ b/toolkit/inc/toolkit/awt/vclxprinter.hxx
@@ -34,7 +34,7 @@
 
 #include vcl/oldprintadaptor.hxx
 
-// Fuer den Drucker relevante Properties:
+// relevant properties for the printer:
 /*
  sal_Bool   Horizontal
  sal_uInt16 CopyCount;
diff --git a/toolkit/inc/toolkit/controls/stdtabcontroller.hxx 
b/toolkit/inc/toolkit/controls/stdtabcontroller.hxx
index de6420e..dd54c95 100644
--- a/toolkit/inc/toolkit/controls/stdtabcontroller.hxx
+++ b/toolkit/inc/toolkit/controls/stdtabcontroller.hxx
@@ -45,7 +45,7 @@ private:
 protected:
 ::osl::Mutex   GetMutex() { return maMutex; }
 sal_BoolImplCreateComponentSequence( 
::com::sun::star::uno::Sequence ::com::sun::star::uno::Reference 
::com::sun::star::awt::XControl   rControls, const 
::com::sun::star::uno::Sequence ::com::sun::star::uno::Reference 
::com::sun::star::awt::XControlModel   rModels, 
::com::sun::star::uno::Sequence ::com::sun::star::uno::Reference 
::com::sun::star::awt::XWindow   rComponents, 
::com::sun::star::uno::Sequence ::com::sun::star::uno::Any* pTabStops, 
sal_Bool bPeerComponent ) const;
-// wenn rModels kuerzer als rControls ist, werden nur die rModels 
entsprechenden Elemente geliefert und die korrespondierenden Elemente aus 
rControls entfernt
+// if sequence length of rModels is less than rControls, return only the 
matching elements in rModels sequence and remove corresponding elements from 
rControls
 voidImplActivateControl( sal_Bool bFirst ) const;
 
 public:
diff --git a/toolkit/inc/toolkit/helper/property.hxx 
b/toolkit/inc/toolkit/helper/property.hxx
index dd4bdd1..a44db62 100644
--- a/toolkit/inc/toolkit/helper/property.hxx
+++ b/toolkit/inc/toolkit/helper/property.hxx
@@ -55,7 +55,7 @@ namespace rtl {
 #define BASEPROPERTY_LINECOLOR   5  // sal_Int32
 #define BASEPROPERTY_BORDER  6  // sal_Int16
 #define BASEPROPERTY_ALIGN   7  // sal_Int16
-#define BASEPROPERTY_FONTDESCRIPTOR  8  // 
::com::sun::star::awt::FontDescriptor, war mal Font, aber nie gespeichert...
+#define BASEPROPERTY_FONTDESCRIPTOR  8  // 
::com::sun::star::awt::FontDescriptor
 #define BASEPROPERTY_DROPDOWN9  // sal_Bool
 #define BASEPROPERTY_MULTILINE   10

[GSOC-UPDATE](10.08) Impress Remote

2012-08-10 Thread Andrzej J. R. Hunt


Hi everyone,

The latest:
- Dialog with pin entry working, linked to the Server code.
- Communication code refactored to allow pairing as per design, and to 
simplify code reuse between network and bluetooth code.

- Pairing implemented on the LO side.

That means I can now implement the pairing on the Android side, which 
should be fairly simple to do.


Cheers,

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

[PUSHED][PATCH] fdo#39468 translate German comments, removing redundant ones

2012/8/9 Oliver Günther m...@oliverguenther.de:
 I've translated the following core folders: toolkit, unotools, xmloff
 Please review the respective patch for fdo#39468 that I've attached to this 
 post.

 The following reported folders (from the find-german-comments script) only 
 yield false positves:
 - sysui, xml2cmp, udm, ucb

 All of my past  future contributions to LibreOffice are licensed under the 
 MPL 1.1 and LGPLv3+ dual license.

 Thanks,
 Oliver

Pushed! Thank you very much!

However, I had to remove some trailing whitespaces in your patch
before pushing it (git warns you when committing). Please take care of
those in your next contribution.

Hope to see more of such great work from you again soon ;-)

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

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

Jean-Baptiste Faure jbf.fa...@orange.fr changed:

   What|Removed |Added

 Depends on||53089

--- Comment #77 from Jean-Baptiste Faure jbf.fa...@orange.fr 2012-08-10 
21:01:03 UTC ---
Nominate bug 53089 : Numbers from external URL are always interpreted as text
It is a regression from LO 3.5 that make Calc unusable to analyze linked
external data.

-- 
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] .: sc/inc sc/source unusedcode.easy

2012-08-10 Thread Matus Kukan

 sc/inc/compressedarray.hxx  |  185 
 sc/source/core/data/compressedarray.cxx |   27 
 unusedcode.easy |9 -
 3 files changed, 221 deletions(-)

New commits:
commit 07090cac4251e254b21676b77742c07f28cccaf4
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Fri Aug 10 22:50:25 2012 +0200

sc: this appears to be unused

Change-Id: I22a759ef55a46dc560ebe5f802c937f1d47bf645

diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx
index eb38a3d..a20963d 100644
--- a/sc/inc/compressedarray.hxx
+++ b/sc/inc/compressedarray.hxx
@@ -36,8 +36,6 @@
 
 const size_t nScCompressedArrayDelta = 4;
 
-template typename A, typename D  class ScCompressedArrayIterator;
-
 /** Compressed array of row (or column) entries, e.g. heights, flags, ...
 
 The array stores ranges of values such that consecutive values occupy only
@@ -102,13 +100,8 @@ public:
 // methods public for the coupled array sum methods
 /** Obtain index into entries for nPos */
 SC_DLLPUBLIC size_t  Search( A nPos ) const;
-/** Get number of entries */
-size_t  GetEntryCount() const;
 
 protected:
-
-friend class ScCompressedArrayIteratorA,D;
-
 size_t  nCount;
 size_t  nLimit;
 size_t  nDelta;
@@ -165,184 +158,6 @@ const D ScCompressedArrayA,D::GetNextValue( size_t 
nIndex, A nEnd ) const
 return pData[nEntry].aValue;
 }
 
-
-template typename A, typename D 
-size_t ScCompressedArrayA,D::GetEntryCount() const
-{
-return nCount;
-}
-
-
-// === ScCompressedArrayIterator =
-
-/** Iterator for ScCompressedArray.
-
-@ATTENTION: the iterator is not persistant if the underlying
-ScCompressedArray happens to be changed by any means, for example by
-setting new values or adding or removing or combining entries. If you do
-such things inside a loop you MUST resynchronize the iterator by calling
-methodResync()/method with the row where resynchronization should
-start. After doing so, methodGetRangeStart()/method and
-methodGetRangeEnd()/method may not point to the previous access points
-anymore. Use with care.
- */
-
-template typename A, typename D  class ScCompressedArrayIterator
-{
-public:
-ScCompressedArrayIterator(
-const ScCompressedArrayA,D  rArray,
-A nStart, A nEnd );
-/// Set new start and end, position on start.
-voidNewLimits( A nStart, A nEnd );
-A   GetIterStart() const;
-A   GetIterEnd() const;
-/// Advance by a single access point (e.g. row).
-booloperator ++();
-A   GetPos() const;
-operator bool() const;
-const Doperator *() const;
-/// Advance an entire range, one entry of the array.
-boolNextRange();
-A   GetRangeStart() const;
-A   GetRangeEnd() const;
-/// Resync to underlying array, calling Search().
-voidResync( A nPos );
-/** Set position without resyncing, avoid calling Search() if possible.
-Position obtained from steering coupled iterator is NOT checked for
-iterator bounds. */
-template typename X 
-voidFollow( const ScCompressedArrayIteratorA,X 
);
-
-private:
-const ScCompressedArrayA,D   rArray;
-size_t  nIndex;
-A   nIterStart;
-A   nIterEnd;
-A   nCurrent;
-boolbEnd;
-};
-
-
-template typename A, typename D 
-ScCompressedArrayIteratorA,D::ScCompressedArrayIterator(
-const ScCompressedArrayA,D  rArrayP, A nStart, A nEnd )
-: rArray( rArrayP )
-// other values set in NewLimits()
-{
-NewLimits( nStart, nEnd);
-}
-
-
-template typename A, typename D 
-void ScCompressedArrayIteratorA,D::NewLimits( A nStart, A nEnd )
-{
-nIterStart = nStart;
-nIterEnd = nEnd;
-nIndex = rArray.Search( nStart);
-nCurrent = GetRangeStart();
-bEnd = (nIterEnd  nIterStart);
-}
-
-
-template typename A, typename D 
-A ScCompressedArrayIteratorA,D::GetIterStart() const
-{
-return nIterStart;
-}
-
-
-template typename A, typename D 
-A ScCompressedArrayIteratorA,D::GetIterEnd() const
-{
-return nIterEnd;
-}
-
-
-template typename A, typename D 
-bool ScCompressedArrayIteratorA,D::operator++()
-{
-if (nCurrent  GetRangeEnd())
-{
-++nCurrent;
-return true;
-}
-else
-return NextRange();
-}
-
-
-template typename A, typename D 
-A

[Libreoffice-commits] .: 9 commits - framework/uiconfig officecfg/registry sc/uiconfig sd/uiconfig sfx2/inc sfx2/source sw/uiconfig

2012-08-10 Thread Rafael Dominguez

 framework/uiconfig/startmodule/menubar/menubar.xml   |1 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |7 
 sc/uiconfig/scalc/menubar/menubar.xml|2 
 sd/uiconfig/sdraw/menubar/menubar.xml|3 
 sd/uiconfig/simpress/menubar/menubar.xml |3 
 sfx2/inc/sfx2/sfxcommands.h  |1 
 sfx2/inc/sfx2/templateabstractview.hxx   |2 
 sfx2/inc/sfx2/thumbnailview.hxx  |6 
 sfx2/inc/templatedlg.hxx |5 
 sfx2/source/appl/appopen.cxx |   43 ++-
 sfx2/source/control/templateabstractview.cxx |5 
 sfx2/source/control/thumbnailview.cxx|   20 +
 sfx2/source/doc/templatedlg.cxx  |  135 
+-
 sfx2/source/doc/templatedlg.hrc  |5 
 sfx2/source/doc/templatedlg.src  |   12 
 sw/uiconfig/sglobal/menubar/menubar.xml  |3 
 sw/uiconfig/sweb/menubar/menubar.xml |3 
 sw/uiconfig/swform/menubar/menubar.xml   |2 
 sw/uiconfig/swreport/menubar/menubar.xml |3 
 sw/uiconfig/swriter/menubar/menubar.xml  |3 
 sw/uiconfig/swxform/menubar/menubar.xml  |3 
 21 files changed, 228 insertions(+), 39 deletions(-)

New commits:
commit 68129703673851b81f0c75b256026f981aba1928
Author: Rafael Dominguez venccsra...@gmail.com
Date:   Wed Aug 8 23:03:45 2012 -0430

Remove TemplateManager menu entry.

Change-Id: I000fc9c1328aec5924da1557da599e6c7bdcb373

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index c74db9d..07f55f3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2341,11 +2341,6 @@
 value1/value
 /prop
 /node
-node oor:name=.uno:TemplateManager oor:op=replace
-prop oor:name=Label oor:type=xs:string
-value xml:lang=en-USTemplate Manager/value
-/prop
-/node
 node oor:name=.uno:Organizer oor:op=replace
 prop oor:name=Label oor:type=xs:string
 value xml:lang=en-US~Organize.../value
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml 
b/sd/uiconfig/sdraw/menubar/menubar.xml
index 990d32b..ec84a44 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -28,7 +28,6 @@
   menu:menuseparator/
   menu:menuitem menu:id=.uno:SetDocumentProperties/
   menu:menuitem menu:id=.uno:Signature/
-  menu:menuitem menu:id=.uno:TemplateManager/
   menu:menu menu:id=.uno:TemplateMenu
 menu:menupopup
   menu:menuitem menu:id=.uno:Organizer/
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml 
b/sd/uiconfig/simpress/menubar/menubar.xml
index 71d6443..13c6939 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -30,7 +30,6 @@
 menu:menuseparator/
 menu:menuitem menu:id=.uno:SetDocumentProperties/
 menu:menuitem menu:id=.uno:Signature/
-menu:menuitem menu:id=.uno:TemplateManager/
 menu:menu menu:id=.uno:TemplateMenu
 menu:menupopup
 menu:menuitem menu:id=.uno:Organizer/
diff --git a/sfx2/inc/sfx2/sfxcommands.h b/sfx2/inc/sfx2/sfxcommands.h
index 0b37f65..fc075b2 100644
--- a/sfx2/inc/sfx2/sfxcommands.h
+++ b/sfx2/inc/sfx2/sfxcommands.h
@@ -46,7 +46,6 @@
 #define CMD_SID_OPENTEMPLATE.uno:OpenTemplate
 #define CMD_SID_OPENURL .uno:OpenUrl
 #define CMD_SID_OPTIONS .uno:Options
-#define CMD_SID_TEMPLATE_MANAGER.uno:TemplateManager
 #define CMD_SID_ORGANIZER   .uno:Organizer
 #define CMD_SID_PASTE   .uno:Paste
 #define CMD_SID_PASTE_SPECIAL   .uno:PasteSpecial
diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src
index 0b59c6b..e9e072d 100644
--- a/sfx2/source/doc/templatedlg.src
+++ b/sfx2/source/doc/templatedlg.src
@@ -47,7 +47,6 @@ String STR_REPOSITORY_NEW
 
 ModelessDialog DLG_TEMPLATE_MANAGER
 {
-HelpId = CMD_SID_TEMPLATE_MANAGER;
 OutputSize = TRUE;
 SVLook = TRUE;
 Moveable = TRUE;
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml

which configure option is missing to allow linking to external data in Calc ?

Hi,

When doing tests on bug fdo#53089 I found that my own build LO 3.6.1.0+
is not able to link to external data in Calc while I do not have such
kind of problem with official build LO 3.6.0.4

Perhaps I am missing some configure option ? My autogen.lastrun contains:
--without-junit
--enable-ext-pdfimport
--enable-ext-presenter-console
--enable-ext-presenter-minimizer
--with-lang=en-US fr
--enable-binfilter
--enable-graphite
--with-system-cairo
--with-max-jobs=2
--with-num-cpus=2
--disable-mozilla
--without-doxygen
--enable-ext-nlpsolver

Is there an option missing or is it something else ?

Best regards.
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.

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

[Libreoffice-commits] .: toolkit/source

 toolkit/source/awt/vclxwindows.cxx  |2 +-
 toolkit/source/controls/unocontrols.cxx |2 +-
 toolkit/source/helper/unowrapper.cxx|4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1e0a822fa14eb4f8d3da80cf76dd5a43df472649
Author: Philipp Riemer ruderphil...@gmail.com
Date:   Fri Aug 10 23:47:53 2012 +0200

fdo#39468: Translate remaining German comments in toolkit/

This is a follow-up patch of be88027c327b5f09d134f235db100ec54afdc30d
translating the remaing comments that were missed there.

Change-Id: I7866060ef6eec5f92751671bd4fc4bee64db149b

diff --git a/toolkit/source/awt/vclxwindows.cxx 
b/toolkit/source/awt/vclxwindows.cxx
index 586d3a6..88ae10a 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -467,7 +467,7 @@ void VCLXButton::setActionCommand( const ::rtl::OUString 
rCommand ) throw(::com
 if ( pButton )
 {
 Size aMinSz = pButton-CalcMinimumSize();
-// Kein Text, also Image
+// no text, thus image
 if ( !pButton-GetText().Len() )
 {
 if ( aSz.Width()  aMinSz.Width() )
diff --git a/toolkit/source/controls/unocontrols.cxx 
b/toolkit/source/controls/unocontrols.cxx
index 9d7c942..7fa0101 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -926,7 +926,7 @@ UnoImageControlControl::UnoImageControlControl( const 
Reference XMultiServiceFa
 :UnoImageControlControl_Base( i_factory )
 ,maActionListeners( *this )
 {
-// Woher die Defaults nehmen?
+// TODO: Where should I look for defaults?
 maComponentInfos.nWidth = 100;
 maComponentInfos.nHeight = 100;
 }
diff --git a/toolkit/source/helper/unowrapper.cxx 
b/toolkit/source/helper/unowrapper.cxx
index 1712622..aab4433 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -258,8 +258,8 @@ sal_Bool lcl_ImplIsParent( Window* pParentWindow, Window* 
pPossibleChild )
 
 void UnoWrapper::WindowDestroyed( Window* pWindow )
 {
-// ggf. existieren noch von ::com::sun::star::loader::Java erzeugte 
Children, die sonst erst
-// im Garbage-Collector zerstoert werden...
+// their still might be some children created with 
::com::sun::star::loader::Java
+// that would otherwise not be destroyed until the garbage collector 
cleans up
 Window* pChild = pWindow-GetWindow( WINDOW_FIRSTCHILD );
 while ( pChild )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

 sw/source/filter/ascii/parasc.cxx|2 +-
 sw/source/filter/basflt/iodetect.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7d8cd0abb8e4b1b891e982d10f57de108aaca1ea
Author: Michael Stahl mst...@redhat.com
Date:   Sat Aug 11 00:01:20 2012 +0200

fdo#53328: sw: ascii import: fix crash:

The aWork buffer is missing space for the null terminator, which the
previous String::AllocateBuffer automatically added.
(regression from aac04652fda01b0299e17087b151f07d6115e894)

Change-Id: Ia12ad46dfb95dd59965a073debb95b241b2e97d9

diff --git a/sw/source/filter/ascii/parasc.cxx 
b/sw/source/filter/ascii/parasc.cxx
index ec68e01..4d53a8f 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -331,7 +331,7 @@ sal_uLong SwASCIIParser::ReadChars()
 {
 sal_uInt32 nInfo;
 sal_Size nNewLen = lGCount, nCntBytes;
-aWork.reset(new sal_Unicode[nNewLen]);
+aWork.reset(new sal_Unicode[nNewLen + 1]); // add 1 for '\0'
 sal_Unicode* pBuf = aWork.get();
 
 nNewLen = rtl_convertTextToUnicode( hConverter, hContext,
diff --git a/sw/source/filter/basflt/iodetect.cxx 
b/sw/source/filter/basflt/iodetect.cxx
index 88c26d7..af3cd97 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -450,7 +450,7 @@ bool SwIoSystem::IsDetectableText(const sal_Char* pBuf, 
sal_uLong rLen,
 
 if (eCharSet != RTL_TEXTENCODING_DONTKNOW)
 {
-boost::scoped_arraysal_Unicode aWork(new sal_Unicode[rLen]);
+boost::scoped_arraysal_Unicode aWork(new sal_Unicode[rLen+1]);
 sal_Unicode *pNewBuf = aWork.get();
 sal_Size nNewLen;
 if (eCharSet != RTL_TEXTENCODING_UCS2)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: which configure option is missing to allow linking to external data in Calc ?

2012-08-10 Thread Kohei Yoshida

On Fri, Aug 10, 2012 at 5:45 PM, Jean-Baptiste Faure
jbf.fa...@sud-ouest.org wrote:
 Hi,

 When doing tests on bug fdo#53089 I found that my own build LO 3.6.1.0+
 is not able to link to external data in Calc while I do not have such
 kind of problem with official build LO 3.6.0.4
...
 Is there an option missing or is it something else ?

Probably something else.  I'm not 100% sure exactly which external
data linking you are using (since there are several different ways to
link to external data in Calc), but none of those depend on external
libraries.

What exactly is the problem, btw?

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

[PATCH] fix duplicated import introduced in 63c508e3e86a140e35161c45d2be97779746f6cb

2012-08-10 Thread Petr Vorel

Hi there,

there is tiny patch removing duplicity in import of python fax script.

Regards,
Petr
From f55d2538eb844bb8a7e38314acf9d0eccf48f243 Mon Sep 17 00:00:00 2001
From: Petr Vorel petr.vo...@gmail.com
Date: Sat, 11 Aug 2012 01:19:40 +0200
Subject: [PATCH] fix duplicated import introduced in
 63c508e3e86a140e35161c45d2be97779746f6cb

Change-Id: I07a90b15450d1150e70280f83f310c2efec585d1
---
 wizards/com/sun/star/wizards/ui/event/ListModelBinder.py |1 -
 1 file changed, 1 deletion(-)

diff --git a/wizards/com/sun/star/wizards/ui/event/ListModelBinder.py b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.py
index 64d3841..c4f26f4 100644
--- a/wizards/com/sun/star/wizards/ui/event/ListModelBinder.py
+++ b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.py
@@ -16,7 +16,6 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 from wizards.common.Helper import Helper
-from wizards.common.Helper import Helper
 
 class ListModelBinder(object):
 
-- 
1.7.10.4

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

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

--- Comment #78 from ape os...@yandex.ru 2012-08-11 04:29:39 UTC ---
Nominate bug 53113 (DOCX filter loses shape containing text) and bug 53175
(Error reading “Content (TOC)” from a DOCX).
These bugs are not regression but they make unusable re-import OOXML text
documents (DOCX, ISO) by Writer. As result we need to use Microsoft Office for
this purpose.

-- 
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

Re: which configure option is missing to allow linking to external data in Calc ?

Hi Kohei,

Le 11/08/2012 00:33, Kohei Yoshida a écrit :
 On Fri, Aug 10, 2012 at 5:45 PM, Jean-Baptiste Faure
 jbf.fa...@sud-ouest.org wrote:
 Hi,

 When doing tests on bug fdo#53089 I found that my own build LO 3.6.1.0+
 is not able to link to external data in Calc while I do not have such
 kind of problem with official build LO 3.6.0.4
 ...
 Is there an option missing or is it something else ?
 Probably something else.  I'm not 100% sure exactly which external
 data linking you are using (since there are several different ways to
 link to external data in Calc), but none of those depend on external
 libraries.

 What exactly is the problem, btw?
When I reproduce the bug 53089 (menu Insert  Link to external data),
for example with url given in comment #10, the dialog in which I type
the url does nothing while it answers by giving available data sections
when I do the same with LO 3.6.0.4


Best regards.
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.

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

[CHERRYPICK] commit a9210660294dd40c18814f59106164d548416032 for branch libreoffice-3-6