Re: [PATCH] More STL'ification (7)
On 2012-08-13 22:53, Michael Stahl wrote: On 13/08/12 15:37, Noel Grandin wrote: Hi These patches convert various places from using tools/list.hxx to using normal STL containers. thanks, pushed to master. Thanks. At this point, it seems like all of the STL'ification work is done, unless there is something more you are aware of? Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
On 08/13/2012 08:10 PM, Bjoern Michaelsen wrote: On Mon, Aug 13, 2012 at 10:26:57AM -0700, bfo wrote: I think many bugs introduced are an effect of omitting one (or more) steps from that list by the developer. nope, I think you are just underestimating the size of the codebase (and the range of our target platforms). Suggested reading: Michael Feathers, Working Effectively with Legacy Code ... and suggested action: writing a dozen fixes for LO. There is no shortage of wisdom around here how to do things well in theory, I think. Sorry for sounding rude... Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] More STL'ification (7)
Hi Noel, On Tue, Aug 14, 2012 at 08:57:30AM +0200, Noel Grandin wrote: On 2012-08-13 22:53, Michael Stahl wrote: On 13/08/12 15:37, Noel Grandin wrote: Hi These patches convert various places from using tools/list.hxx to using normal STL containers. thanks, pushed to master. Thanks. At this point, it seems like all of the STL'ification work is done, unless there is something more you are aware of? There is still List (tools/inc/tools/list.hxx) and Container (tools/inc/tools/contnr.hxx :-) D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
On Tue, Aug 14, 2012 at 1:59 AM, Stephan Bergmann sberg...@redhat.com wrote: ... and suggested action: writing a dozen fixes for LO. There is no shortage of wisdom around here how to do things well in theory, I think. Sorry for sounding rude... Nah, that did not sound rude at all... especially compared to what I had in mind :-) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-ux-advise] [REVIEW 3-6] Window background of toolbars
Hello there, I tend to push it for rc1. It will be easier to revert to the old code for rc2 than to push new code for rc2 :-) You have last chance to stop me ;-) No, sounds good to me. At least the bottom toolbars seem to be fixed now and this is what most people probably use. Of course, from my POV, it would be great if we had a full fix in 3.6.2 or so, but if that's too risky, I think we can live with it for half a year. Astron. PS: Thanks Kendy! Sorry for my nagging and sorry for doing it so late. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: jvmfwk/Library_sunjavaplugin.mk
jvmfwk/Library_sunjavaplugin.mk |4 1 file changed, 4 insertions(+) New commits: commit 3269a0d10e28e183e2c443859b3fbc6ec11fb0db Author: Tomas Chvatal tchva...@suse.cz Date: Mon Aug 13 20:48:34 2012 +0200 Depend on headers so we wont get crasher on missing framework.h. Change-Id: I2734f5ccc8f3abe415cf48c6c2c8c2783573a550 Signed-off-by: Tomas Chvatal tchva...@suse.cz diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index 7d25d8d..694cecc 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -41,6 +41,10 @@ $(eval $(call gb_Library_use_api,sunjavaplugin,\ udkapi \ )) +$(eval $(call gb_Library_use_package,sunjavaplugin,\ +jvmfwk_inc \ +)) + $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ cppu \ cppuhelper \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] logerrit: Fix some typos.
From Tomáš Chvátal tchva...@suse.cz: Tomáš Chvátal has submitted this change and it was merged. Change subject: logerrit: Fix some typos. .. logerrit: Fix some typos. Change-Id: I0d6f3f5521d32dad1ffaa8675d5f43c7d7fa7cea --- M logerrit 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jean-Tiare Le Bigot: Looks good to me, but someone else must approve Tomáš Chvátal: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/409 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d6f3f5521d32dad1ffaa8675d5f43c7d7fa7cea Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Tim Retout t...@retout.co.uk Gerrit-Reviewer: Jean-Tiare Le Bigot ad...@jtlebi.fr Gerrit-Reviewer: Tomáš Chvátal tchva...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] More STL'ification (7)
On 2012-08-14 09:23, David Tardon wrote: There is still List (tools/inc/tools/list.hxx) and Container (tools/inc/tools/contnr.hxx :-) There is only one usage of tools/list.hxx remaining, after which it could be moved to binfilter. Although Michael might have already done that, in which case it could just get removed. The usage is: sd/source/ui/inc/animobjs.hxx but it makes extensive use of the CurPos property of List in interesting ways, which I'd probably break. Anything else that you're aware of? Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sd/source
sd/source/ui/dlg/RemoteDialog.src |4
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 25 +++--
sd/source/ui/inc/RemoteDialog.hrc |1 -
3 files changed, 23 insertions(+), 7 deletions(-)
New commits:
commit 331c410205f6f456af7c3ab54e981c771784fd6c
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Tue Aug 14 09:47:57 2012 +0200
Improved pin entry in dialog box -- correct sizing.
Change-Id: Ide6184395ea2d916d48dd93a2004dbb6d271a33a
diff --git a/sd/source/ui/dlg/RemoteDialog.src
b/sd/source/ui/dlg/RemoteDialog.src
index e7d9a96..609dbee 100644
--- a/sd/source/ui/dlg/RemoteDialog.src
+++ b/sd/source/ui/dlg/RemoteDialog.src
@@ -47,6 +47,10 @@ ModalDialog DLG_PAIR_REMOTE
TabStop = TRUE ;
};
+String STR_ENTER_PIN
+{
+Text [ en-US ] = Enter PIN:;
+};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 8ce809e..c734a2e 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -98,6 +98,7 @@ ClientBox::ClientBox( Dialog* pParent, RemoteServer *pServer,
m_pScrollBar-EnableDrag();
m_aPinBox.SetUseThousandSep(false);
+// m_aPinDescription.SetText( String( SdResId( STR_ENTER_PIN ) ) );
SetPaintTransparent( true );
SetPosPixel( Point( RSC_SP_DLG_INNERBORDER_LEFT,
RSC_SP_DLG_INNERBORDER_TOP ) );
@@ -180,8 +181,9 @@ void ClientBox::CalcActiveHeight( const long nPos )
aSize.Width() -= ICON_OFFSET;
-
-aTextHeight += m_aPinBox.GetOutputHeightPixel();
+aSize = LogicToPixel( Size( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT ),
+ MapMode( MAP_APPFONT ) );
+aTextHeight += aSize.Height();
if ( aTextHeight m_nStdHeight )
aTextHeight = m_nStdHeight;
@@ -359,16 +361,27 @@ void ClientBox::DrawRow( const Rectangle rRect, const
TClientBoxEntry pEntry )
aPos.Y() += aTextHeight;
if ( pEntry-m_bActive )
{
+Size aSize = LogicToPixel( Size( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT ),
+ MapMode( MAP_APPFONT ) );
+m_aPinBox.SetSizePixel( aSize );
const Rectangle aRect( GetEntryRect( m_nActive ) );
Size aBtnSize( m_aPinBox.GetSizePixel() );
-Point aBtnPos( aRect.Left() + ICON_OFFSET,
+Size aTextSize( m_aPinDescription.GetSizePixel() );
+Point aBtnPos( aRect.Left(),
+ aRect.Bottom() - TOP_OFFSET - aBtnSize.Height() );
+// m_aPinDescription.SetPosPixel( aBtnPos );
+DrawText( Rectangle( aBtnPos.X(), aBtnPos.Y(), rRect.Right(),
rRect.Bottom() - TOP_OFFSET),
+ String( SdResId( STR_ENTER_PIN ) ), 0 );
+
+aBtnPos = Point( aRect.Left() + GetTextWidth( String( SdResId(
STR_ENTER_PIN ) ) ),
aRect.Bottom() - TOP_OFFSET - aBtnSize.Height() );
m_aPinBox.SetPosPixel( aBtnPos );
-Size aSize = LogicToPixel( Size( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT ),
- MapMode( MAP_APPFONT ) );
-m_aPinBox.SetSizePixel( aSize );
+
+
+
+
// long nExtraHeight = 0;
//
// if ( pEntry-m_bHasButtons )
diff --git a/sd/source/ui/inc/RemoteDialog.hrc
b/sd/source/ui/inc/RemoteDialog.hrc
index 7e3bee7..da2e889 100644
--- a/sd/source/ui/inc/RemoteDialog.hrc
+++ b/sd/source/ui/inc/RemoteDialog.hrc
@@ -14,4 +14,5 @@
#define BTN_CANCEL 2
#define LB_SERVERS 3
#define INPUT_PIN 4
-#define TEXT_PIN5
\ No newline at end of file
+#define TEXT_PIN5
+#define STR_ENTER_PIN 6
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values
On 08/14/2012 12:35 AM, anwen wrote: I implemented the above code with c++ . However, it did not work. Anything wrong with the following code: m_xCC is a given ReferenceXComponentContext ReferenceXEventBroadcaster xBrd(m_xCC-getServiceManager()-createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.frame.GlobalEventbroadcaster)), it's GlobalEventBroadcaster (with a capital B) Stephan m_xCC), UNO_QUERY); //xBrd is still empty, not sure why? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: filter/inc filter/source
filter/inc/filter/msfilter/svdfppt.hxx | 10 +-
filter/source/msfilter/svdfppt.cxx | 10 +-
2 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 71248cadf6736fbb14b57e1b3edea0a924781609
Author: David Tardon dtar...@redhat.com
Date: Tue Aug 14 10:05:12 2012 +0200
the copy ctor can take const ref
Change-Id: I4ef23f084d918dbf8227610f64bb7c38680e377a
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx
b/filter/inc/filter/msfilter/svdfppt.hxx
index b8d5454..dba6d37 100644
--- a/filter/inc/filter/msfilter/svdfppt.hxx
+++ b/filter/inc/filter/msfilter/svdfppt.hxx
@@ -945,11 +945,11 @@ struct PPTCharPropSet
voidSetColor( sal_uInt32 nColor );
explicit PPTCharPropSet( sal_uInt32 nParagraph );
-PPTCharPropSet( PPTCharPropSet rCharPropSet );
-PPTCharPropSet( PPTCharPropSet rCharPropSet,
sal_uInt32 nParagraph );
+PPTCharPropSet( const PPTCharPropSet rCharPropSet );
+PPTCharPropSet( const PPTCharPropSet rCharPropSet,
sal_uInt32 nParagraph );
~PPTCharPropSet();
-PPTCharPropSet operator=( PPTCharPropSet rCharPropSet );
+PPTCharPropSet operator=( const PPTCharPropSet rCharPropSet );
private:
voidImplMakeUnique();
@@ -1106,12 +1106,12 @@ public:
PPTPortionObj( const PPTStyleSheet, sal_uInt32 nInstance,
sal_uInt32 nDepth );
PPTPortionObj(
-PPTCharPropSet,
+const PPTCharPropSet,
const PPTStyleSheet,
sal_uInt32 nInstance,
sal_uInt32 nDepth
);
-PPTPortionObj( PPTPortionObj );
+PPTPortionObj( const PPTPortionObj );
~PPTPortionObj();
// the following function should be removed during next full update
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index da00296..a13c361 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -4323,7 +4323,7 @@ PPTCharPropSet::PPTCharPropSet( sal_uInt32 nParagraph ) :
mnLanguage[ 0 ] = mnLanguage[ 1 ] = mnLanguage[ 2 ] = 0;
}
-PPTCharPropSet::PPTCharPropSet( PPTCharPropSet rCharPropSet )
+PPTCharPropSet::PPTCharPropSet( const PPTCharPropSet rCharPropSet )
{
pCharSet = rCharPropSet.pCharSet;
pCharSet-mnRefCount++;
@@ -4337,7 +4337,7 @@ PPTCharPropSet::PPTCharPropSet( PPTCharPropSet
rCharPropSet )
mnLanguage[ 2 ] = rCharPropSet.mnLanguage[ 2 ];
}
-PPTCharPropSet::PPTCharPropSet( PPTCharPropSet rCharPropSet, sal_uInt32
nParagraph )
+PPTCharPropSet::PPTCharPropSet( const PPTCharPropSet rCharPropSet, sal_uInt32
nParagraph )
{
pCharSet = rCharPropSet.pCharSet;
pCharSet-mnRefCount++;
@@ -4356,7 +4356,7 @@ PPTCharPropSet::~PPTCharPropSet()
delete mpFieldItem;
}
-PPTCharPropSet PPTCharPropSet::operator=( PPTCharPropSet rCharPropSet )
+PPTCharPropSet PPTCharPropSet::operator=( const PPTCharPropSet rCharPropSet )
{
if ( this != rCharPropSet )
{
@@ -5247,7 +5247,7 @@ PPTPortionObj::PPTPortionObj( const PPTStyleSheet
rStyleSheet, sal_uInt32 nInst
{
}
-PPTPortionObj::PPTPortionObj( PPTCharPropSet rCharPropSet, const
PPTStyleSheet rStyleSheet, sal_uInt32 nInstance, sal_uInt32 nDepth ) :
+PPTPortionObj::PPTPortionObj( const PPTCharPropSet rCharPropSet, const
PPTStyleSheet rStyleSheet, sal_uInt32 nInstance, sal_uInt32 nDepth ) :
PPTCharPropSet ( rCharPropSet ),
mrStyleSheet( rStyleSheet ),
mnInstance ( nInstance ),
@@ -5255,7 +5255,7 @@ PPTPortionObj::PPTPortionObj( PPTCharPropSet
rCharPropSet, const PPTStyleSheet
{
}
-PPTPortionObj::PPTPortionObj( PPTPortionObj rPortionObj ) :
+PPTPortionObj::PPTPortionObj( const PPTPortionObj rPortionObj ) :
PPTCharPropSet ( rPortionObj ),
mrStyleSheet( rPortionObj.mrStyleSheet ),
mnInstance ( rPortionObj.mnInstance ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] More STL'ification (7)
Hi, On Tue, Aug 14, 2012 at 09:46:11AM +0200, Noel Grandin wrote: On 2012-08-14 09:23, David Tardon wrote: There is still List (tools/inc/tools/list.hxx) and Container (tools/inc/tools/contnr.hxx :-) There is only one usage of tools/list.hxx remaining, after which it could be moved to binfilter. Although Michael might have already done that, in which case it could just get removed. The usage is: sd/source/ui/inc/animobjs.hxx but it makes extensive use of the CurPos property of List in interesting ways, which I'd probably break. Great :-) Anything else that you're aware of? Well, there is still Container :-) It is used at ~10 places in svx and possibly elsewhere. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - jvmfwk/Library_sunjavaplugin.mk
jvmfwk/Library_sunjavaplugin.mk |4 1 file changed, 4 insertions(+) New commits: commit e77bbc82f98c0006b39842e1afe1f74940d547cc Author: Tomas Chvatal tchva...@suse.cz Date: Mon Aug 13 20:48:34 2012 +0200 Depend on headers so we wont get crasher on missing framework.h. Change-Id: I2734f5ccc8f3abe415cf48c6c2c8c2783573a550 Signed-off-by: Tomas Chvatal tchva...@suse.cz Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index 7d25d8d..694cecc 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -41,6 +41,10 @@ $(eval $(call gb_Library_use_api,sunjavaplugin,\ udkapi \ )) +$(eval $(call gb_Library_use_package,sunjavaplugin,\ +jvmfwk_inc \ +)) + $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ cppu \ cppuhelper \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] More STL'ification (7)
On 2012-08-14 10:09, David Tardon wrote: Anything else that you're aware of? Well, there is still Container :-) It is used at ~10 places in svx and possibly elsewhere. Thanks, I'll go work on those. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: logerrit
logerrit |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit e06c1f56b9c70cbf208e508d4a6dd8b276e1bd19 Author: Tim Retout t...@retout.co.uk Date: Mon Aug 13 21:52:02 2012 +0100 logerrit: Fix some typos. Change-Id: I0d6f3f5521d32dad1ffaa8675d5f43c7d7fa7cea Reviewed-on: https://gerrit.libreoffice.org/409 Reviewed-by: Jean-Tiare Le Bigot ad...@jtlebi.fr Reviewed-by: TomÃ¡à ¡ Chvátal tchva...@suse.cz Tested-by: TomÃ¡à ¡ Chvátal tchva...@suse.cz diff --git a/logerrit b/logerrit index 6585db1..c936653 100755 --- a/logerrit +++ b/logerrit @@ -73,7 +73,7 @@ case $1 in test) if test -n `ssh $GERRITHOST 21|grep \Welcome to Gerrit Code Review\` then - echo Your gerrit setup was succesfull! + echo Your gerrit setup was successful! else echo There seems to be trouble. echo please have the output of: ssh - logerrit @@ -90,7 +90,7 @@ case $1 in nextchange) if test -n `git status -s -uno` then - echo You have uncommited changes. Please commit or stash these: + echo You have uncommitted changes. Please commit or stash these: git status exit 1 fi @@ -129,7 +129,7 @@ case $1 in echo no Change-Id given on the command line, reviewing change$CHANGEID fi MESSAGEREQ= - read -p 'was the change verified to build sucessfully (+) or found not to build (-) or none of that ()? ' VERIFIED + read -p 'was the change verified to build successfully (+) or found not to build (-) or none of that ()? ' VERIFIED ask_tristate $VERIFIED case $ANSWER in y) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] More STL'ification (7)
On Tue, 2012-08-14 at 08:57 +0200, Noel Grandin wrote: At this point, it seems like all of the STL'ification work is done, unless there is something more you are aware of? Wow - fantastic work ! :-) this is really encouraging, thank you to all involved ! Naturally removing the last list.hxx user to use a simple vector, and preferably one that has both the relevant BitmapEx and Time values as struct members in the array would be really good; clean the code, remove a ton of ugly casts and finally stop new code being able to accidentally use that List class ;-) But anyhow - great work ! Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/docnode/ndnotxt.cxx | 22 +++---
1 file changed, 7 insertions(+), 15 deletions(-)
New commits:
commit a6c7410c1391b67f4550dadf105c8f4979c21dcd
Author: Bertrand Lorentz bertrand.lore...@gmail.com
Date: Mon Aug 13 19:01:29 2012 +0200
fdo#39468: Translated German comments in sw/source/core/docnode/ndnotxt.cxx
Change-Id: I0838ef7e1a80056a2a0bf0fc8d4ff91f9acbe5b7
diff --git a/sw/source/core/docnode/ndnotxt.cxx
b/sw/source/core/docnode/ndnotxt.cxx
index 9b9f6cd..fd3a069 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -38,7 +38,7 @@
#include ndgrf.hxx
#include ndole.hxx
#include ndindex.hxx
-#include hints.hxx// fuer SwFmtChg
+#include hints.hxx
#include istyleaccess.hxx
#include SwStyleNameMapper.hxx
@@ -54,23 +54,21 @@ SwNoTxtNode::SwNoTxtNode( const SwNodeIndex rWhere,
bContourMapModeValid( sal_True ),
bPixelContour( sal_False )
{
-// soll eine Harte-Attributierung gesetzt werden?
+// Should this set a hard attribute?
if( pAutoAttr )
SetAttr( *pAutoAttr );
}
-
SwNoTxtNode::~SwNoTxtNode()
{
delete pContour;
}
-
-// erzeugt fuer alle Ableitungen einen AttrSet mit Bereichen
-// fuer Frame- und Grafik-Attributen
+/// Creates an AttrSet for all derivations with ranges for frame-
+/// and graphics-attributes.
void SwNoTxtNode::NewAttrSet( SwAttrPool rPool )
{
-OSL_ENSURE( !mpAttrSet.get(), AttrSet ist doch gesetzt );
+OSL_ENSURE( !mpAttrSet.get(), AttrSet is already set );
SwAttrSet aNewAttrSet( rPool, aNoTxtNodeSetRange );
// put names of parent style and conditional style:
@@ -84,22 +82,18 @@ void SwNoTxtNode::NewAttrSet( SwAttrPool rPool )
mpAttrSet = GetDoc()-GetIStyleAccess().getAutomaticStyle( aNewAttrSet,
IStyleAccess::AUTO_STYLE_NOTXT );
}
-// Dummies fuer das Laden/Speichern von persistenten Daten
-// bei Grafiken und OLE-Objekten
-
-
+/// Dummies for loading/saving of persistent data
+/// when working with graphics and OLE objects
sal_Bool SwNoTxtNode::RestorePersistentData()
{
return sal_True;
}
-
sal_Bool SwNoTxtNode::SavePersistentData()
{
return sal_True;
}
-
void SwNoTxtNode::SetContour( const PolyPolygon *pPoly, sal_Bool bAutomatic )
{
delete pContour;
@@ -112,7 +106,6 @@ void SwNoTxtNode::SetContour( const PolyPolygon *pPoly,
sal_Bool bAutomatic )
bPixelContour = sal_False;
}
-
void SwNoTxtNode::CreateContour()
{
OSL_ENSURE( !pContour, Contour available. );
@@ -262,7 +255,6 @@ sal_Bool SwNoTxtNode::IsPixelContour() const
return bRet;
}
-
Graphic SwNoTxtNode::GetGraphic() const
{
Graphic aRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: hunspell/makefile.mk
hunspell/makefile.mk |3 +++ 1 file changed, 3 insertions(+) New commits: commit d3bec41a1b92cc8ca9f4750c5f9740da52879085 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Aug 14 10:53:06 2012 +0200 Patches reported upstream Change-Id: I1275b73d4f18633ba03831b6973b801b0467cf0d diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index 920a703..156cbbe 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -40,6 +40,9 @@ TARFILE_NAME=hunspell-1.3.2 TARFILE_MD5=3121aaf3e13e5d88dfff13fb4a5f1ab8 ADDITIONAL_FILES+=config.h +# hunspell-1.3.2-nullptr.patch, hunspell-1.3.2-literal.patch: reported upstream +# as https://sourceforge.net/tracker/?func=detailaid=3557292group_id=143754; +# atid=756395 Some C++11 related fixes PATCH_FILES=\ hunspell-twoaffixcompound.patch \ hunspell-static.patch \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: framework/source
framework/source/uielement/menubarmanager.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 7bfb229230a439c2edb3e8452fe0d3430f9931ce Author: Noel Power noel.po...@suse.com Date: Mon Aug 13 16:14:34 2012 +0100 sync cell context menu edit menu 'PasteSpecial' entries for calc fdo#46250 calc application specifically handles PasteSpecial so no need to set the state of the menu entry to enabled always ( for calc at least ) Change-Id: Iaf13dd825f0cbdcf9f455db07d727753fae90868 diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 2938528..d3ea1b1 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -505,7 +505,9 @@ throw ( RuntimeException ) #ifdef UNIX //enable some slots hardly, because UNIX clipboard does not notify all changes // Can be removed if follow up task will be fixed directly within applications. -if ( pMenuItemHandler-aMenuItemURL == .uno:Paste || pMenuItemHandler-aMenuItemURL == .uno:PasteSpecial +// Note: PasteSpecial is handled specifically by calc +if ( pMenuItemHandler-aMenuItemURL == .uno:Paste || +( m_aModuleIdentifier != com.sun.star.sheet.SpreadsheetDocument pMenuItemHandler-aMenuItemURL == .uno:PasteSpecial ) || pMenuItemHandler-aMenuItemURL == .uno:PasteClipboard ) // special for draw/impress bEnabledItem = sal_True; #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/win
vcl/win/source/gdi/salnativewidgets-luna.cxx | 61 +++
1 file changed, 35 insertions(+), 26 deletions(-)
New commits:
commit 53f23d99b0f5549ede0b5e868f884c7bce2e9746
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
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index b8abaee..2f4df21 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -460,31 +460,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,
@@ -927,17 +937,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);
}
}
@@ -954,7 +963,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;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED][PATCH] fdo#39468 translate German comments in core/tools
2012/8/12 Philipp Riemer ruderphil...@gmail.com:
Hey Oliver,
2012/8/12 Oliver Günther m...@oliverguenther.de:
Hi,
I finished translation all german comments in the core/tools folder.
Please find the patch attached.
Sorry for messing up with the whitespace, I was simply missing the
approriate Vim highlights and git warnings.
I hope the new patch is more conformant.
Cheers,
Oliver
I tried applying your patch. While this worked like a charm, I
realized some stuff (also citing mmeeks here):
Some of the original German comments are sometimes a bit cute / un-necessary:
// class FooBaa //
class FooBaa {
...
};
In that case you can delete the comment completely. If there is some
valueable info in the box than please remove all the ascii art and
just keep the pure commit content. Also the blank line between comment
and class definition is not needed.
In addition, feel free to clean-out redundant cruft like (can also be
completely removed):
// hole Beschreibung vom Objekt FooBaa
rtl::OUString FooBaa::getDescription()
{
}
A super plus would be if you could also format the patches to conform
to Doxygen style (see http://doxygen.org/) if they are in a header
(.hxx etc.) file. This means that one-liners have three slashes
(instead of two) and multi-line comments have a /** */ frame with
@param etc.
So, I am currently going through all the files and clean them up
as well before submitting your patch. Thus, please do not wonder why
it is still not integrated yet.
Cheers,
Philipp
Hey Oliver,
I integrated your patch (see
http://cgit.freedesktop.org/libreoffice/core/commit/?id=c8b7aa55138848fe07108779099267424bc03e3d).
After that I started cleaning up the first parts:
* 7dfba55bfd15b3c3b080a13b63073e6d2ab808b7 doxygenized comments in tools/inc
* 731f3ce64a84b14b43a2a8ca3d455dd8711781b9 clean-up of existing
comments in tools/inc
* 70fc650319f8cfc0b3230ad2dea584eb1368a238 remove ascii art and blank
lines in tools/inc/
Having done inc, I will now continue with my cleanup of the other
subfolders of tools/ over the following evenings...
Waiting for more such great translations from you ;-)
Philipp
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-ux-advise] [PUSHED 3-6] Window background of toolbars
Stefan Knorr píše v Út 14. 08. 2012 v 11:26 +0200: Hello there, I tend to push it for rc1. It will be easier to revert to the old code for rc2 than to push new code for rc2 :-) You have last chance to stop me ;-) No, sounds good to me. At least the bottom toolbars seem to be fixed now and this is what most people probably use. Exactly, it is a step forward, so I pushed it into 3-6 branch, see http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=53f23d99b0f5549ede0b5e868f884c7bce2e9746 Of course, from my POV, it would be great if we had a full fix in 3.6.2 or so, but if that's too risky, I think we can live with it for half a year. Let's see what changes are really needed in the end. Thanks a lot for feedback. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/ww8par.cxx | 37 ++---
1 file changed, 30 insertions(+), 7 deletions(-)
New commits:
commit 2cd01f9c90dec1c3b4409d5268cd642d397df136
Author: Caolán McNamara caol...@redhat.com
Date: Tue Aug 14 10:05:26 2012 +0100
minimize fractured text spans
There's a mismatch between writer and word as to the categorization
of text, which is a pain.
Change-Id: Id087034e72113d718a98ad21db1c09c79d1d4772
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 505369c..ee4e34b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2731,6 +2731,20 @@ namespace
return nScript;
}
+
+bool samePitchIgnoreUnknown(FontPitch eA, FontPitch eB)
+{
+return (eA == eB || eA == PITCH_DONTKNOW || eB == PITCH_DONTKNOW);
+}
+
+bool sameFontIgnoringIrrelevantFields(const SvxFontItem rA, const
SvxFontItem rB)
+{
+//Ignoring CharSet, and ignoring unknown pitch
+return rA.GetFamilyName() == rB.GetFamilyName()
+rA.GetStyleName() == rB.GetStyleName()
+rA.GetFamily() == rB.GetFamily()
+samePitchIgnoreUnknown(rA.GetPitch(), rB.GetPitch());
+}
}
//In writer we categorize text into CJK, CTL and Western for everything else.
@@ -2826,13 +2840,23 @@ void
SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString rAddS
bool bWriterWillUseSameFontAsWordAutomatically = false;
-if (
- (nWriterScript == i18n::ScriptType::ASIAN nForceFromFontId
== RES_CHRATR_CJK_FONT) ||
- (nWriterScript == i18n::ScriptType::COMPLEX
nForceFromFontId == RES_CHRATR_CTL_FONT) ||
- (nWriterScript == i18n::ScriptType::LATIN nForceFromFontId
== RES_CHRATR_FONT)
- )
+if (nWriterScript != i18n::ScriptType::WEAK)
{
-bWriterWillUseSameFontAsWordAutomatically = true;
+if (
+ (nWriterScript == i18n::ScriptType::ASIAN
nForceFromFontId == RES_CHRATR_CJK_FONT) ||
+ (nWriterScript == i18n::ScriptType::COMPLEX
nForceFromFontId == RES_CHRATR_CTL_FONT) ||
+ (nWriterScript == i18n::ScriptType::LATIN
nForceFromFontId == RES_CHRATR_FONT)
+ )
+{
+bWriterWillUseSameFontAsWordAutomatically = true;
+}
+else
+{
+const SvxFontItem *pSourceFont = (const
SvxFontItem*)GetFmtAttr(nForceFromFontId);
+sal_uInt16 nDestId = aIds[nWriterScript-1];
+const SvxFontItem *pDestFont = (const
SvxFontItem*)GetFmtAttr(nDestId);
+bWriterWillUseSameFontAsWordAutomatically =
sameFontIgnoringIrrelevantFields(*pSourceFont, *pDestFont);
+}
}
//Writer won't use the same font as word, so force the issue
@@ -2873,7 +2897,6 @@ void
SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString rAddS
if (nPos nLen)
nScript = lcl_getScriptType(xBI, rAddString, nPos);
}
-
}
void SwWW8ImplReader::simpleAddTextToParagraph(const String rAddString)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
visualising improved quality practices ...
On Tue, 2012-08-14 at 02:25 -0500, Norbert Thiebaud wrote: On Tue, Aug 14, 2012 at 1:59 AM, Stephan Bergmann sberg...@redhat.com wrote: ... and suggested action: writing a dozen fixes for LO. There is no shortage of wisdom around here how to do things well in theory, I think. Sorry for sounding rude... Nah, that did not sound rude at all... especially compared to what I had in mind :-) It's certainly an FAQ :-) We have end-users that have no idea what is involved in our development process, and how we work to eliminate bugs, and the innovations we've introduced to try to reduce regressions, and so on. And of course we're not there yet; in particularly I keep meaning to file my performance regression testing easy-hack to get something setup there. In my ideal world we have someone who wants to write a blog series on our approach to improving quality - that we can feed with some outlines / tid-bits they can research and write-up the good story of where we're at today. Its easy to see the improvements from the inside, but perhaps not so much from the outside :-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Translate German comments in sw/source/core/docnode/ndnotxt....
From Björn Michaelsen bjoern.michael...@canonical.com: Björn Michaelsen has abandoned this change. Change subject: Translate German comments in sw/source/core/docnode/ndnotxt.cxx .. Patch Set 1: Abandoned abandoning this change, it has been merged as per above comment (albeit with a different change-id) -- To view, visit https://gerrit.libreoffice.org/407 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ibc948a9f1770945e5d9d37891570f0836ef3e231 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Bertrand Lorentz bertrand.lore...@gmail.com Gerrit-Reviewer: Philipp Riemer ruderphil...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: --with-mozilla-build required on windows ?
On Mon, 2012-08-13 at 17:17 +0200, Matúš Kukan wrote: Hello, Since 500261a6b6e9dbeacce7f693b01a1c32a112f4fb nss seems to be needed for vcl. I'd push attached patch to fix W2008R2_16-minimal_build but It would fail anyway because one needs Mozilla build tools for that ? So - what's wrong ? Running configure on windows without --with-mozilla-build ? I also may have missed something. I think we really have to bite the bullet and just state that we *need* nss (and we *need* xmlsec) and if the buildbots die with can't find mozilla-build tools required to build nss then that's fine and the buildbot needs to install the additional dependency. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/unitymenus' - vcl/inc vcl/unx
vcl/inc/unx/gtk/gtksalmenu.hxx| 78 --
vcl/unx/gtk/app/gtkinst.cxx |2
vcl/unx/gtk/window/gtksalmenu.cxx | 97 --
3 files changed, 63 insertions(+), 114 deletions(-)
New commits:
commit 376df92806d3ae1138529bccae2820428c7fc92c
Author: Antonio Fernandez antonio.fernan...@aentos.es
Date: Tue Aug 14 10:20:01 2012 +0100
Cleaned up some code and did a small refactoring.
Change-Id: I06b987a06ccadd00ee67db8e781ec5a9e42fc89e
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 67adec4..d0ce612 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -47,53 +47,57 @@ class GtkSalMenuItem;
class GtkSalMenu : public SalMenu
{
private:
-sal_BoolmbMenuBar;
+sal_BoolmbMenuBar;
+Menu* mpVCLMenu;
+GtkSalMenu* mpParentSalMenu;
+const GtkSalFrame* mpFrame;
-virtual void publishMenu( GMenuModel*, GActionGroup* );
-
-GtkSalMenuItem* GetSalMenuItem( sal_uInt16 nId );
-
-public:
std::vector GMenuModel* maSections;
std::vector GtkSalMenuItem* maItems;
-Menu* mpVCLMenu;
-GtkSalMenu* mpParentSalMenu;
-const GtkSalFrame* mpFrame;
-
-// DBus variables
-gchar* aDBusPath;
-gchar* aDBusMenubarPath;
-GDBusConnection*pSessionBus;
-sal_Int32 mBusId;
-sal_Int32 mMenubarId;
-sal_Int32 mActionGroupId;
+// DBus attributes
+gchar* aDBusPath;
+gchar* aDBusMenubarPath;
+GDBusConnection*pSessionBus;
+sal_Int32 mMenubarId;
+sal_Int32 mActionGroupId;
// GMenuModel attributes
-GMenuModel* mpMenuModel;
-GMenuModel* mpCurrentSection;
+GMenuModel* mpMenuModel;
+GMenuModel* mpCurrentSection;
+
+virtual voidpublishMenu( GMenuModel*, GActionGroup* );
+GtkSalMenuItem* GetSalMenuItem( sal_uInt16 nId );
+public:
GtkSalMenu( sal_Bool bMenuBar );
virtual ~GtkSalMenu();
-virtual sal_Bool VisibleMenuBar(); // must return TRUE to actually
DISPLAY native menu bars
-// otherwise only menu messages are
processed (eg, OLE on Windows)
-
-virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos );
-virtual void RemoveItem( unsigned nPos );
-virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu,
unsigned nPos );
-virtual void SetFrame( const SalFrame* pFrame );
-virtual void CheckItem( unsigned nPos, sal_Bool bCheck );
-virtual void EnableItem( unsigned nPos, sal_Bool bEnable );
-virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const
rtl::OUString rText );
-virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const
Image rImage);
-virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem,
const KeyCode rKeyCode, const rtl::OUString rKeyName );
-virtual void GetSystemMenuData( SystemMenuData* pData );
-virtual void SetItemCommand( unsigned nPos, SalMenuItem* pSalMenuItem,
const rtl::OUString aCommandStr );
-virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle
rRect, sal_uLong nFlags);
-virtual void Freeze();
-
-virtual const GtkSalFrame* getFrame() const;
+virtual sal_BoolVisibleMenuBar(); // must return TRUE to
actually DISPLAY native menu bars
+// otherwise only menu
messages are processed (eg, OLE on Windows)
+
+virtual voidInsertItem( SalMenuItem* pSalMenuItem,
unsigned nPos );
+virtual voidRemoveItem( unsigned nPos );
+virtual voidSetSubMenu( SalMenuItem* pSalMenuItem,
SalMenu* pSubMenu, unsigned nPos );
+virtual voidSetFrame( const SalFrame* pFrame );
+virtual const GtkSalFrame* GetFrame() const;
+virtual voidCheckItem( unsigned nPos, sal_Bool bCheck );
+virtual voidEnableItem( unsigned nPos, sal_Bool bEnable );
+virtual voidSetItemText( unsigned nPos, SalMenuItem*
pSalMenuItem, const rtl::OUString rText );
+virtual voidSetItemImage( unsigned nPos, SalMenuItem*
pSalMenuItem, const Image rImage);
+virtual voidSetAccelerator( unsigned nPos, SalMenuItem*
pSalMenuItem, const KeyCode rKeyCode, const rtl::OUString rKeyName );
+virtual
Re: --with-mozilla-build required on windows ?
On 14/08/12 11:18, Caolán McNamara wrote: On Mon, 2012-08-13 at 17:17 +0200, Matúš Kukan wrote: Hello, Since 500261a6b6e9dbeacce7f693b01a1c32a112f4fb nss seems to be needed for vcl. I'd push attached patch to fix W2008R2_16-minimal_build but It would fail anyway because one needs Mozilla build tools for that ? So - what's wrong ? Running configure on windows without --with-mozilla-build ? I also may have missed something. I think we really have to bite the bullet and just state that we *need* nss (and we *need* xmlsec) and if the buildbots die with can't find mozilla-build tools required to build nss then that's fine and the buildbot needs to install the additional dependency. indeed, AFAIR --disable-xmlsec is not supposed to be used on desktop platforms, it is only for those weird smartphone things; perhaps we should add a platform check in configure... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.in
configure.in |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 690078182aa82ba41e7da849d0fef271bb55c847 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Aug 13 17:09:45 2012 +0200 nss is now required unconditionally in vcl Change-Id: I846c9ef6bf9682ff02f586de6b979845deae6e93 diff --git a/configure.in b/configure.in index 2fd333e..fc14552 100644 --- a/configure.in +++ b/configure.in @@ -7977,9 +7977,8 @@ AC_SUBST(MOZ_LIB) AC_SUBST(MOZ_LIB_XPCOM) dnl === -dnl Check for system NSS only with xmlsec or mozilla build enabled +dnl Check for system NSS dnl === -if test x$enable_xmlsec != xno -o x$enable_mozilla != xno; then AC_MSG_CHECKING([which NSS to use]) if test $with_system_nss = yes; then AC_MSG_RESULT([external]) @@ -8013,7 +8012,6 @@ from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32]) fi fi fi # system nss -fi # enable xmlsec || enable mozilla AC_SUBST(SYSTEM_NSS) AC_SUBST(NSS_CFLAGS) AC_SUBST(NSS_LIBS) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Missing ICU Library
On Mon, 2012-08-13 at 22:51 +0200, Samuel Mehrbrodt wrote: Yes, I followed the instructions there. I already had a successful build, but that was last year and on an older Ubuntu version. Are you building from scratch (i.e. after a make clean) or incrementally inside last years build ? If the second it might be necessary to do a make clean after this length of time and try again. I am compiling from master, pulled yesterday. http://wiki.documentfoundation.org/Development/How_to_build/Configure_options On this page I saw a configure option '--with-system-icu'. Is there an option to use the internal icu? There is, but while --with-system-icu should work, you'd definitely have to do a make clean before using different --with-system options. Typically just ./autogen.sh make is the recommended approach. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Missing ICU Library
Hi Samuel, On Mon, 2012-08-13 at 22:51 +0200, Samuel Mehrbrodt wrote: Yes, I followed the instructions there. I already had a successful build, but that was last year and on an older Ubuntu version. Ah ! :-) there is always fun when you've updated. I am compiling from master, pulled yesterday. http://wiki.documentfoundation.org/Development/How_to_build/Configure_options So - I wonder if you have all the dependencies installed; you -really- want to run: sudo apt-get build-dep libreoffice without that your life will be one long round of suffering ... :-) On this page I saw a configure option '--with-system-icu'. Is there an option to use the internal icu? Sure - just remove the --with-system-icu option and all should be well, IIRC we default to the internal version. HTH :-) Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/ui/misc/pggrid.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 89587e6cf1182095e52f6c5a3ddab35c783fca2e
Author: Takeshi Abe t...@fixedpoint.jp
Date: Sun Jul 15 23:46:05 2012 +0900
fdo#50941: Characters per line will not change when changing Max base
text size
max characters per line follows max base text size in the squared mode of
text grid
Change-Id: I47f8cd0db1ece5c940f31aada7d51d40058c7513
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 86f7a2f..5be1e57 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -453,6 +453,16 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, SpinField*,
pField)
if (aTextSizeMF == pField)
{
m_bRubyUserValue = sal_False;
+
+// fdo#50941: set maximum characters per line
+sal_Int32 nTextSize = static_cast sal_Int32
(aTextSizeMF.Denormalize(aTextSizeMF.GetValue(FUNIT_TWIP)));
+if (nTextSize 0)
+{
+sal_Int32 nMaxChars = m_aPageSize.Width() / nTextSize;
+aCharsPerLineNF.SetValue(nMaxChars);
+aCharsPerLineNF.SetMax(nMaxChars);
+SetLinesOrCharsRanges( aCharsRangeFT ,
aCharsPerLineNF.GetMax() );
+}
}
//set maximum line per page
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/core/doc/docfld.cxx | 30 --
1 file changed, 28 insertions(+), 2 deletions(-)
New commits:
commit b5edfe152737650772504dc6464dbbb2f607f453
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
(cherry picked from commit bb6bd1ff9cd3eecec7eb2cd7bd0a4dcef584c903)
Change-Id: I9b7a61f18f987214708195a89f6e346c865c7f9f
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 4d0aa72..a2a58fc 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -1296,18 +1296,44 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool
bUpdRefFlds )
SwNewDBMgr* pMgr = GetNewDBMgr();
pMgr-CloseAll(sal_False);
-String aNew;
+// 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;
const _SetGetExpFldPtr* ppSortLst = pUpdtFlds-GetSortLst()-GetData();
for( n = pUpdtFlds-GetSortLst()-Count(); n; --n, ++ppSortLst )
{
SwSection* pSect = (SwSection*)(*ppSortLst)-GetSection();
+if ( pSect !pSect-IsCondHidden())
+nShownSections++;
+}
+
+String aNew;
+ppSortLst = pUpdtFlds-GetSortLst()-GetData();
+for( n = pUpdtFlds-GetSortLst()-Count(); n; --n, ++ppSortLst )
+{
+SwSection* pSect = (SwSection*)(*ppSortLst)-GetSection();
if( pSect )
{
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.
+rtl::OUString aCond(RTL_CONSTASCII_USTRINGPARAM(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
Change in core[libreoffice-3-5]: fdo#53210 SwDoc::UpdateExpFlds don't crash when hiding all s...
From Miklos Vajna vmik...@suse.cz: Miklos Vajna has abandoned this change. Change subject: fdo#53210 SwDoc::UpdateExpFlds don't crash when hiding all sections .. Patch Set 1: Abandoned Petr will push a fixed commit to -3-5 -- To view, visit https://gerrit.libreoffice.org/404 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I9b7a61f18f987214708195a89f6e346c865c7f9f 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
Change in core[libreoffice-3-6]: fdo#53210 SwDoc::UpdateExpFlds don't crash when hiding all s...
From Miklos Vajna vmik...@suse.cz: Miklos Vajna has abandoned this change. Change subject: fdo#53210 SwDoc::UpdateExpFlds don't crash when hiding all sections .. Patch Set 1: Abandoned Petr will push a fixed commit to -3-6 -- To view, visit https://gerrit.libreoffice.org/403 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I9b7a61f18f987214708195a89f6e346c865c7f9f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: --with-mozilla-build required on windows ?
@tml: On the --disable-xmlsec stuff in the Android and iOS default configs. Why is that ?, it is because they don't build, because its just handier to not worry about nss and xmlsec for now, or is there a fundamental problem ? It's handier not to worry about building NSS now. Presumably that doesn't really cross-compile out of the box for Android or iOS. The less 3rd-party libraries we need to struggle with the better. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/core/doc/docfld.cxx | 30 --
1 file changed, 28 insertions(+), 2 deletions(-)
New commits:
commit d2a5e4bb705673119b13c2e203562fecfd386be8
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
(cherry picked from commit bb6bd1ff9cd3eecec7eb2cd7bd0a4dcef584c903)
Change-Id: I9b7a61f18f987214708195a89f6e346c865c7f9f
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index b7c6549..9e3e564 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -1300,18 +1300,44 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool
bUpdRefFlds )
SwNewDBMgr* pMgr = GetNewDBMgr();
pMgr-CloseAll(sal_False);
-String aNew;
+// 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;
const _SetGetExpFldPtr* ppSortLst = pUpdtFlds-GetSortLst()-GetData();
for( n = pUpdtFlds-GetSortLst()-Count(); n; --n, ++ppSortLst )
{
SwSection* pSect = (SwSection*)(*ppSortLst)-GetSection();
+if ( pSect !pSect-IsCondHidden())
+nShownSections++;
+}
+
+String aNew;
+ppSortLst = pUpdtFlds-GetSortLst()-GetData();
+for( n = pUpdtFlds-GetSortLst()-Count(); n; --n, ++ppSortLst )
+{
+SwSection* pSect = (SwSection*)(*ppSortLst)-GetSection();
if( pSect )
{
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.
+rtl::OUString aCond(RTL_CONSTASCII_USTRINGPARAM(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
[Libreoffice-commits] .: 2 commits - oox/source sw/source writerfilter/source
oox/source/export/vmlexport.cxx | 10 +++---
sw/source/filter/ww8/rtfsdrexport.cxx |9 -
writerfilter/source/rtftok/rtfsdrimport.cxx |5 +++--
3 files changed, 18 insertions(+), 6 deletions(-)
New commits:
commit 5da2e40292e420dc48da7ea5aef29c96a1127140
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Aug 14 12:04:49 2012 +0200
RTF shape filter: handle custom segment types
Change-Id: I320bab34080b401c61efbc5b3383836362f5f43f
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx
b/sw/source/filter/ww8/rtfsdrexport.cxx
index c8040e5..a377ef0 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -314,7 +314,14 @@ void RtfSdrExport::Commit( EscherPropertyContainer
rProps, const Rectangle rRe
case 0x8000: // end
break;
default:
-SAL_INFO(sw.rtf, OSL_THIS_FUNC :
unhandled segment ' nSeg ' in the path);
+// See
EscherPropertyContainer::CreateCustomShapeProperties, by default nSeg is simply
the number of points.
+for (int i = 0; i nSeg; ++i)
+{
+sal_Int32 nX =
impl_GetPointComponent(pVerticesIt, nPointSize);
+sal_Int32 nY =
impl_GetPointComponent(pVerticesIt, nPointSize);
+
aVerticies.append(;().append(nX).append(,).append(nY).append());
+++nVertices;
+}
break;
}
}
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 7fe19e5..4eea20b 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -251,8 +251,9 @@ void RTFSdrImport::resolve(RTFShape rShape)
aSegments[nIndex].Command =
drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH;
aSegments[nIndex].Count = sal_Int32(0);
break;
-default:
-SAL_INFO(writerfilter, OSL_THIS_FUNC :
unhandled segment ' hex nSeg ' in the path);
+default: // given number of lineto elements
+aSegments[nIndex].Command =
drawing::EnhancedCustomShapeSegmentCommand::LINETO;
+aSegments[nIndex].Count = nSeg;
break;
}
nIndex++;
commit 4dd8aa2630074b479b216da8ee7b50ed0bf78511
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Aug 14 12:03:57 2012 +0200
fdo#53113 vml export: handle custom segment types
It seems that EscherPropertyContainer::CreateCustomShapeProperties()
simply sets nSeg to the number of (lineto) point pairs by default.
Change-Id: I24bde088f5f2970d53de827e1ca03c5419ac892c
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 08aac17..e764d87 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -466,9 +466,13 @@ void VMLExport::Commit( EscherPropertyContainer rProps,
const Rectangle rRect
aPath.append( e );
break;
default:
-#if OSL_DEBUG_LEVEL 0
-fprintf( stderr, TODO: unhandled segment
'%x' in the path\n, nSeg );
-#endif
+// See
EscherPropertyContainer::CreateCustomShapeProperties, by default nSeg is simply
the number of points.
+for (int i = 0; i nSeg; ++i)
+{
+sal_Int32 nX =
impl_GetPointComponent(pVerticesIt, nPointSize);
+sal_Int32 nY =
impl_GetPointComponent(pVerticesIt, nPointSize);
+
aPath.append(l).append(nX).append(,).append(nY);
+}
break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/unitymenus' - vcl/inc vcl/unx
vcl/inc/unx/gtk/gtksalmenu.hxx|1 -
vcl/unx/gtk/window/gtksalmenu.cxx | 22 --
2 files changed, 16 insertions(+), 7 deletions(-)
New commits:
commit 02f0ab10969751353bd850f9704da7ef975b6926
Author: Antonio Fernandez antonio.fernan...@aentos.es
Date: Tue Aug 14 11:22:57 2012 +0100
Fixed a regression with popup menus. Added a method to update menu every
sec.
Change-Id: I419a304f2c90d07ee7a5365e0397040b7eb953d7
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index d0ce612..78ec7a1 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -88,7 +88,6 @@ public:
virtual voidSetAccelerator( unsigned nPos, SalMenuItem*
pSalMenuItem, const KeyCode rKeyCode, const rtl::OUString rKeyName );
virtual voidGetSystemMenuData( SystemMenuData* pData );
virtual voidSetItemCommand( unsigned nPos, SalMenuItem*
pSalMenuItem, const rtl::OUString aCommandStr );
-virtual boolShowNativePopupMenu(FloatingWindow * pWin,
const Rectangle rRect, sal_uLong nFlags);
virtual voidFreeze();
virtual voidSetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; }
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx
b/vcl/unx/gtk/window/gtksalmenu.cxx
index 0c78997..642f2b8 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -202,6 +202,7 @@ GtkSalMenu::GtkSalMenu( sal_Bool bMenuBar ) :
GtkSalMenu::~GtkSalMenu()
{
+// FIXME: Not sure if we need to unset X Properties.
if ( mpFrame ) {
GtkWidget *widget = GTK_WIDGET( mpFrame-getWindow() );
GdkWindow *gdkWindow = gtk_widget_get_window( widget );
@@ -241,7 +242,7 @@ GtkSalMenu::~GtkSalMenu()
sal_Bool GtkSalMenu::VisibleMenuBar()
{
-return sal_False;
+return sal_True;
}
void GtkSalMenu::InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos )
@@ -284,6 +285,16 @@ void GtkSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem,
SalMenu* pSubMenu, unsig
}
}
+void updateNativeMenu( GtkSalMenu* pMenu );
+
+gboolean GenerateMenu(gpointer user_data) {
+cout Generating menu... endl;
+GtkSalMenu* pSalMenu = static_cast GtkSalMenu* ( user_data );
+updateNativeMenu( pSalMenu );
+
+return TRUE;
+}
+
void GtkSalMenu::SetFrame( const SalFrame* pFrame )
{
mpFrame = static_castconst GtkSalFrame*( pFrame );
@@ -306,6 +317,10 @@ void GtkSalMenu::SetFrame( const SalFrame* pFrame )
// Try to publish the menu with the right bus data.
Freeze();
+
+// Refresh the menu every second.
+// This code is a workaround until required modifications in Gtk+ are
available.
+//g_timeout_add( 1000, GenerateMenu, this );
}
}
@@ -391,11 +406,6 @@ void GtkSalMenu::GetSystemMenuData( SystemMenuData* pData )
{
}
-bool GtkSalMenu::ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle
rRect, sal_uLong nFlags)
-{
-return TRUE;
-}
-
void updateNativeMenu( GtkSalMenu* pMenu ) {
if ( pMenu ) {
for ( sal_uInt16 i = 0; i pMenu-GetItemCount(); i++ ) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: android/experimental
android/experimental/LibreOffice4Android/Makefile
|3 +-
android/experimental/LibreOffice4Android/jni/Application.mk
|2 -
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
| 11 +-
3 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 318590b2900ff01ac36bb0bab84ddb69ffa0f9c9
Author: Michael Meeks michael.me...@suse.com
Date: Tue Aug 14 10:28:47 2012 +0100
android: recover from un-thumb-nail-able documents without crashing
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index 3a49c7d..0bfbf3b 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -244,4 +244,5 @@ build-ant: copy-stuff properties
run:
# /data/local/tmp/sample-document.odt
- adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e input
/assets/test1.odt -e lo-main-delay 20
+# add -e lo-strace to strace
+ adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e
lo-strace -e input /assets/test1.odt
diff --git a/android/experimental/LibreOffice4Android/jni/Application.mk
b/android/experimental/LibreOffice4Android/jni/Application.mk
deleted file mode 100644
index a11b28d..000
--- a/android/experimental/LibreOffice4Android/jni/Application.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-APP_ABI := armeabi-v7a
-APP_PLATFORM := android-14
diff --git
a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
index a4d0336..7c824f8 100644
---
a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
+++
b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -132,7 +132,7 @@ public class LibreOfficeUIActivity extends SherlockActivity
implements ActionBar
//Set the home - top level - directory.
homeDirectory = new
File(Environment.getExternalStorageDirectory(),LibreOffice);
homeDirectory.mkdirs();
-currentDirectory = homeDirectory;
+currentDirectory = homeDirectory;
//Load default settings
@@ -819,6 +819,9 @@ class ListItemAdapter implements ListAdapter{
toolkit = (XToolkit2)
UnoRuntime.queryInterface(XToolkit2.class, toolkitService);
renderable = (XRenderable)
UnoRuntime.queryInterface(XRenderable.class, doc);
+ if (renderable == null)
+ // some serious error with the rendering backend
+ return new Integer(0);
// Set up dummySmallDevice and use it to find out the
number
// of pages (renderers).
@@ -851,6 +854,12 @@ class ListItemAdapter implements ListAdapter{
}
protected void onPostExecute(Integer result){
+
+ if (renderable == null) {
+Log.i(TAG, Document is un-renderable);
+ return; // TODO: check if this falls-back to a sensible
image
+ }
+
int widthInPx = dpToPx( 100 );
int heightInPx = dpToPx( (int)( 100*Math.sqrt(2) ) );
ByteBuffer bb = renderPage( 0 , widthInPx , heightInPx);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSoC] testing - Weekly Report no. 12
Hi Artur, On Tue, 2012-08-14 at 00:52 +0200, Artur Dorda wrote: This week I wrote some tests for the XML unit converter in sax. I have expanded test_converter.cxx in sax/qa/cppunit of the following functions tested: Looks really nice :-) However, I will happily continue contributing to LibreOffice, I will write more in my GSoC summary mail, next week. That's great news. Incidentally - it'd be good to respond to / process the gerrit changeover mail you should have had - so you can continue to commit smoothly as/when the repositories move. Did you see that ? All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: starmath/source
starmath/source/smdetect.cxx | 18 ++
1 file changed, 14 insertions(+), 4 deletions(-)
New commits:
commit aa4b8a8164f01a120ba9bfb2e86b1ed33cc1d69c
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Aug 14 12:33:52 2012 +0200
Be more careful in recognizing MathML (bnc#774921)
Change-Id: I82c36a3ff49f74dc674df46dcf35f8c1a991c9e2
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 5a36375..da11ce6 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -312,10 +312,20 @@ SmFilterDetect::~SmFilterDetect()
{
if (0 == strncmp( ?xml,aBuffer,nSize))
{
-static const sal_Char sFltrNm_2[] = MATHML_XML;
-static const sal_Char sTypeNm_2[] =
math_MathML_XML_Math;
-aFilterName.AssignAscii( sFltrNm_2 );
-aTypeName.AssignAscii( sTypeNm_2 );
+// 200 should be enough for the XML
+// version, encoding and !DOCTYPE
+// stuff I hope?
+sal_Char aBuffer2[200];
+nBytesRead = pStrm-Read( aBuffer2,
sizeof(aBuffer2) - 1);
+aBuffer2[nBytesRead] = 0;
+if (strstr( aBuffer2, math ) != NULL ||
+strstr( aBuffer2, math ) != NULL)
+{
+static const sal_Char sFltrNm_2[] =
MATHML_XML;
+static const sal_Char sTypeNm_2[] =
math_MathML_XML_Math;
+aFilterName.AssignAscii( sFltrNm_2 );
+aTypeName.AssignAscii( sTypeNm_2 );
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
image rendering regression ?
Hi guys, I was just looking at: http://users.freedesktop.org/~michael/dfaure/print-sample.odt And (interestingly) it seems that while we can load, and save the embedded image successfully as a graphic; we don't appear to be able to render it ;-) Mercifully -3-6-0 seems to work just fine (at least for me). It'd be nice to fix that of course; but I wonder - is this unit-test-able ? annoyingly the PDF output shows the image just fine as well ;-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svx/source
svx/source/svdraw/svdoashp.cxx |4 1 file changed, 4 insertions(+) New commits: commit e3acf19c0502b0758359b56abda81e504d167630 Author: Muthu Subramanian sumu...@suse.com Date: Tue Aug 14 16:12:53 2012 +0530 fdo#47434: Zero rect. size causing wrong line positions. Thanks to Korrawit Pruegsanusak detective.conan.1...@gmail.com for the indepth analysis and debugging. diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 74338ff..624a2a7 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -3026,6 +3026,10 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix rMatrix, // build and set BaseRect (use scale) Point aPoint = Point(); Size aSize(FRound(aScale.getX()), FRound(aScale.getY())); +// fdo#47434 We need a valid rectangle here +if( !aSize.Height() ) aSize.setHeight( 1 ); +if( !aSize.Width() ) aSize.setWidth( 1 ); + Rectangle aBaseRect(aPoint, aSize); SetSnapRect(aBaseRect); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Update.
On Mon, Aug 13, 2012 at 01:29:55PM +0100, Iain Billett iainbill...@gmail.com wrote: I've worked out a way of getting reasonable box-shadow around the page thumbnails. Ultimately it requires pixel by pixel modification to soften the shadow ( It was too dark before ). All the same it doesn't seem too slow but currently the thumbnails are small. Currently, the shadow is added at runtime as part of the grid adapter but I could just add the shadow to the thumbnail? ( This would make it difficult to change once added, unless we keep the original also ). I'm really surprised that there is no clean way of doing this (that I can see). Before you reinvent the wheel, the Writer shadow image is at icon-themes/galaxy/sw/res/page-shadow-mask.png, you could reuse that in the Android app. (And that's split to top, topright, right, bottomright, bottom, bottomleft, left and topleft parts runtime, I guess that's more or less trivial to do in Java.) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/inc sc/qa sc/source
sc/inc/stringutil.hxx | 26 ++
sc/qa/unit/ucalc.cxx |9 +
sc/source/core/data/column3.cxx|4 ++--
sc/source/core/data/dpoutput.cxx |6 +++---
sc/source/core/tool/stringutil.cxx |2 +-
sc/source/filter/rtf/eeimpars.cxx |2 +-
sc/source/ui/docshell/impex.cxx|4 ++--
7 files changed, 40 insertions(+), 13 deletions(-)
New commits:
commit 22571981cdae59bce508dfd2af4c873aa216d885
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Aug 13 14:20:13 2012 -0400
fdo#53089: Avoid setting valid numbers as text during html import.
(cherry picked from commit 51f1fc69aa539dec8035195b98e0b128026388e9)
Conflicts:
sc/qa/unit/ucalc.cxx
Change-Id: I5fa9a54f70e8e4d8aac42687f2a204b2925d4619
diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx
index 954d4bc..1932f59 100644
--- a/sc/inc/stringutil.hxx
+++ b/sc/inc/stringutil.hxx
@@ -40,6 +40,25 @@ class SvNumberFormatter;
*/
struct SC_DLLPUBLIC ScSetStringParam
{
+enum TextFormatPolicy
+{
+/**
+ * Set Text number format no matter what the input string is.
+ */
+Always,
+
+/**
+ * Set Text number format only when the input string is considered a
+ * special number but we only want to detect a simple number.
+ */
+SpecialNumberOnly,
+
+/**
+ * Never set Text number format.
+ */
+Never
+};
+
/**
* Stores the pointer to the number formatter instance to be used during
* number format detection. The caller must manage the life cycle of the
@@ -55,11 +74,10 @@ struct SC_DLLPUBLIC ScSetStringParam
bool mbDetectNumberFormat;
/**
- * When true, set the format of the cell to Text when a string cell is
- * requested for a number input. We may want to do this during text file
- * import (csv, html etc).
+ * Determine when to set the 'Text' number format to the cell where the
+ * input string is being set.
*/
-bool mbSetTextCellFormat;
+TextFormatPolicy meSetTextNumFormat;
/**
* When true, treat input with a leading apostrophe / single quote special
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 8d9febe..cab47a6 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -360,6 +360,15 @@ void Test::testInput()
bTest = test == 'apple';
CPPUNIT_ASSERT_MESSAGE(Text content should have retained the first
apostrophe., bTest);
+// Customized string handling policy.
+ScSetStringParam aParam;
+aParam.mbDetectNumberFormat = false;
+aParam.meSetTextNumFormat = ScSetStringParam::Always;
+aParam.mbHandleApostrophe = false;
+m_pDoc-SetString(0, 0, 0, 000123, aParam);
+m_pDoc-GetString(0, 0, 0, test);
+CPPUNIT_ASSERT_MESSAGE(Text content should have been treated as string,
not number., test == 000123);
+
m_pDoc-DeleteTab(0);
}
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 7e35fe6..aab315c 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1341,7 +1341,7 @@ bool ScColumn::SetString( SCROW nRow, SCTAB nTabP, const
String rString,
}
}
}
-else if (!aParam.mbSetTextCellFormat)
+else if (aParam.meSetTextNumFormat != ScSetStringParam::Always)
{
// Only check if the string is a regular number.
const LocaleDataWrapper* pLocale =
aParam.mpNumFormatter-GetLocaleData();
@@ -1367,7 +1367,7 @@ bool ScColumn::SetString( SCROW nRow, SCTAB nTabP, const
String rString,
if (!pNewCell)
{
-if (aParam.mbSetTextCellFormat
aParam.mpNumFormatter-IsNumberFormat(rString, nIndex, nVal))
+if (aParam.meSetTextNumFormat != ScSetStringParam::Never
aParam.mpNumFormatter-IsNumberFormat(rString, nIndex, nVal))
{
// Set the cell format type to Text.
sal_uInt32 nFormat =
aParam.mpNumFormatter-GetStandardFormat(NUMBERFORMAT_TEXT);
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 34ae9d6..2b86a69 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -793,13 +793,13 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow,
SCTAB nTab,
if (bNumeric)
{
aParam.mbDetectNumberFormat = true;
-aParam.mbSetTextCellFormat = false;
+aParam.meSetTextNumFormat = ScSetStringParam::Never;
aParam.mbHandleApostrophe = true;
}
else
{
aParam.mbDetectNumberFormat = false;
-aParam.mbSetTextCellFormat = true;
+aParam.meSetTextNumFormat = ScSetStringParam::Always;
Re: [PUSHED 3-6] Fix for fdo#53089
Hi Kohei, On Monday, 2012-08-13 15:13:10 -0400, Kohei Yoshida wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=51f1fc69aa539dec8035195b98e0b128026388e9 Cherry-picked to 3-6, all three bugs mentioned are/remain fixed. http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=22571981cdae59bce508dfd2af4c873aa216d885 Thanks Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpfRmLh4GWAD.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: image rendering regression ?
Hi, I know about this problem and I am working on it. There seems to be a problem with rendering of transparent images in grfmgr2.cxx. Regards, Tomaž Vajngerl On Tue, Aug 14, 2012 at 12:42 PM, Michael Meeks michael.me...@suse.com wrote: Hi guys, I was just looking at: http://users.freedesktop.org/~michael/dfaure/print-sample.odt And (interestingly) it seems that while we can load, and save the embedded image successfully as a graphic; we don't appear to be able to render it ;-) Mercifully -3-6-0 seems to work just fine (at least for me). It'd be nice to fix that of course; but I wonder - is this unit-test-able ? annoyingly the PDF output shows the image just fine as well ;-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ 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
Re: Update.
Hi Iain, On 08/13/2012 02:29 PM, Iain Billett wrote: I've worked out a way of getting reasonable box-shadow around the page thumbnails. Ultimately it requires pixel by pixel modification to soften the shadow ( It was too dark before ). All the same it doesn't seem too slow but currently the thumbnails are small. Currently, the shadow is added at runtime as part of the grid adapter but I could just add the shadow to the thumbnail? ( This would make it difficult to change once added, unless we keep the original also ). I'm really surprised that there is no clean way of doing this (that I can see). I don't know how your images are stored/drawn, but this is how I add shadows in the remote control using a shadow paint (assuming you're doing it in Java): Bitmap aBitmap = getMyBitmapFromSomewhere(); final int borderWidth = 8; // However much space you want for shadows Paint p = new Paint(Paint.ANTI_ALIAS_FLAG); p.setShadowLayer(borderWidth, 0, 0, Color.BLACK); // Change the colour of the shadow here Bitmap aOut = Bitmap.createBitmap(aBitmap.getWidth() + 2 // The new larger bitmap containing image+shadow * borderWidth, aBitmap.getHeight() + 2 * borderWidth, aBitmap.getConfig()); RectF aRect = new RectF(borderWidth, borderWidth, borderWidth // This is the rectangle where the original image will be painted + aBitmap.getWidth(), borderWidth + aBitmap.getHeight()); Canvas canvas = new Canvas(aOut); canvas.drawColor(Color.TRANSPARENT); // Fade out to a given background color canvas.drawRect(aRect, p); // Draw the shadow first canvas.drawBitmap(aBitmap, null, aRect, null); // Draw the original image on top return aOut; // New Bitmap with shadow. Hope this helps, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sd/qa
sd/qa/unit/data/n759180.pptx |binary
sd/qa/unit/regression-test.cxx | 45 +
2 files changed, 45 insertions(+)
New commits:
commit 3ccb8dac1405dc4ffa0ca3c45bd0724cc339d8ad
Author: Muthu Subramanian sumu...@suse.com
Date: Tue Aug 14 17:04:40 2012 +0530
Adding unit test case for n#759180
diff --git a/sd/qa/unit/data/n759180.pptx b/sd/qa/unit/data/n759180.pptx
new file mode 100644
index 000..16cbf9a
Binary files /dev/null and b/sd/qa/unit/data/n759180.pptx differ
diff --git a/sd/qa/unit/regression-test.cxx b/sd/qa/unit/regression-test.cxx
index 787291b..342d6a8 100644
--- a/sd/qa/unit/regression-test.cxx
+++ b/sd/qa/unit/regression-test.cxx
@@ -60,6 +60,11 @@
#include com/sun/star/drawing/XDrawPagesSupplier.hpp
#include drawinglayer/XShapeDumper.hxx
+#include editeng/editobj.hxx
+#include editeng/outlobj.hxx
+#include editeng/ulspitem.hxx
+#include editeng/fhgtitem.hxx
+
/* Implementation of Filters test */
using namespace ::com::sun::star;
@@ -78,9 +83,11 @@ public:
virtual void tearDown();
void test();
+void testN759180();
CPPUNIT_TEST_SUITE(SdFiltersTest);
CPPUNIT_TEST(test);
+CPPUNIT_TEST(testN759180);
CPPUNIT_TEST_SUITE_END();
private:
@@ -152,6 +159,44 @@ void SdFiltersTest::test()
}*/
}
+void SdFiltersTest::testN759180()
+{
+::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc(/sd/qa/unit/data/n759180.pptx));
+CPPUNIT_ASSERT_MESSAGE( failed to load, xDocShRef.Is() );
+CPPUNIT_ASSERT_MESSAGE( not in destruction,
!xDocShRef-IsInDestruction() );
+
+SdDrawDocument *pDoc = xDocShRef-GetDoc();
+CPPUNIT_ASSERT_MESSAGE( no document, pDoc != NULL );
+const SdrPage *pPage = pDoc-GetPage (1);
+CPPUNIT_ASSERT_MESSAGE( no page, pPage != NULL );
+
+//sal_uIntPtr nObjs = pPage-GetObjCount();
+//for (sal_uIntPtr i = 0; i nObjs; i++)
+{
+// Get the object
+SdrObject *pObj = pPage-GetObj(0);
+SdrTextObj *pTxtObj = dynamic_castSdrTextObj *( pObj );
+CPPUNIT_ASSERT(pTxtObj);
+std::vectorEECharAttrib rLst;
+const EditTextObject aEdit =
pTxtObj-GetOutlinerParaObject()-GetTextObject();
+const SvxULSpaceItem *pULSpace = dynamic_castconst SvxULSpaceItem
*(aEdit.GetParaAttribs(0).GetItem(EE_PARA_ULSPACE));
+CPPUNIT_ASSERT(pULSpace);
+CPPUNIT_ASSERT_MESSAGE( Para bottom spacing is wrong!,
pULSpace-GetLower() == 0 );
+aEdit.GetCharAttribs(1, rLst);
+for( std::vectorEECharAttrib::reverse_iterator it = rLst.rbegin();
it!=rLst.rend(); it++)
+{
+const SvxFontHeightItem * pFontHeight = dynamic_castconst
SvxFontHeightItem *((*it).pAttr);
+if(pFontHeight)
+{
+// nStart == 9
+// font height = 5 = 5*2540/72
+CPPUNIT_ASSERT_MESSAGE( Font height is wrong,
pFontHeight-GetHeight() == 176 );
+break;
+}
+}
+}
+}
+
void SdFiltersTest::testStuff(::sd::DrawDocShellRef xDocShRef, const
rtl::OString fileNameBase)
{
CPPUNIT_ASSERT_MESSAGE( failed to load, xDocShRef.Is() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config_host.mk.in configure.in distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf distro-configs/LibreOfficeiOS.conf libxmlsec/makefile.mk nss/ma
config_host.mk.in|1 configure.in | 17 -- distro-configs/LibreOfficeAndroid.conf |1 distro-configs/LibreOfficeAndroidX86.conf|1 distro-configs/LibreOfficeiOS.conf |1 libxmlsec/makefile.mk|4 +-- nss/makefile.mk |7 +- postprocess/packcomponents/makefile.mk |4 --- sc/CppunitTest_sc_subsequent_filters_test.mk |2 - scp2/InstallModule_ooo.mk|1 scp2/source/ooo/file_library_ooo.scp | 31 +-- tail_build/prj/build.lst |2 - xmlsecurity/Module_xmlsecurity.mk|4 ++- xmlsecurity/prj/build.lst|2 - 14 files changed, 30 insertions(+), 48 deletions(-) New commits: commit ee93dfafddd0f14b9a1ac3c82b967bf3a65f64aa Author: Caolán McNamara caol...@redhat.com Date: Tue Aug 14 10:38:35 2012 +0100 drop disable-xmlsec, it's core functionality, have to live with it we basically need this functionality, the idea of it being optional isn't really logical anymore with nss split out from mozilla. for iOS and Android where they doesn't build yet spit out lame fixme nag warnings Change-Id: I4b16c62553b12d3dcd340a0b5c5a4cbd807c2f02 diff --git a/config_host.mk.in b/config_host.mk.in index 717383b..7289d55 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -150,7 +150,6 @@ export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@ export ENABLE_SYMBOLS=@ENABLE_SYMBOLS@ export ENABLE_SYSTRAY_GTK=@ENABLE_SYSTRAY_GTK@ export ENABLE_TELEPATHY=@ENABLE_TELEPATHY@ -export ENABLE_XMLSEC=@ENABLE_XMLSEC@ export ENABLE_ZENITY=@ENABLE_ZENITY@ export EPM=@EPM@ export EPM_FLAGS=@EPM_FLAGS@ diff --git a/configure.in b/configure.in index fc14552..95bd0db 100644 --- a/configure.in +++ b/configure.in @@ -850,12 +850,6 @@ AC_ARG_ENABLE(build-mozilla, the Mozilla source code but take precompiled zips.]), ,) -AC_ARG_ENABLE(xmlsec, -AS_HELP_STRING([--disable-xmlsec], -[Whether to enable XMLsec for open document signing. Be warned, - building without XML Security will likely give you test failures.]), -) - AC_ARG_ENABLE(tde, AS_HELP_STRING([--enable-tde], [Determines whether to use TQt/TDE vclplug on platforms where TQt and @@ -7710,17 +7704,6 @@ else AC_MSG_RESULT([yes]) fi -AC_MSG_CHECKING([whether to build XML Security support]) -if test $enable_xmlsec = no; then -AC_MSG_RESULT([no]) -ENABLE_XMLSEC= -else -ENABLE_XMLSEC=YES -BUILD_TYPE=$BUILD_TYPE LIBXMLSEC -AC_MSG_RESULT([yes]) -fi -AC_SUBST(ENABLE_XMLSEC) - dnl === dnl Check for system openldap dnl === diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf index aac1da7..01f11ca 100644 --- a/distro-configs/LibreOfficeAndroid.conf +++ b/distro-configs/LibreOfficeAndroid.conf @@ -17,7 +17,6 @@ --disable-randr --disable-randr-link --disable-systray ---disable-xmlsec --enable-mergelibs --without-junit --without-ppds diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf index a60fec7..a3662d6 100644 --- a/distro-configs/LibreOfficeAndroidX86.conf +++ b/distro-configs/LibreOfficeAndroidX86.conf @@ -18,7 +18,6 @@ --disable-randr --disable-randr-link --disable-systray ---disable-xmlsec --enable-mergelibs --without-junit --without-ppds diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf index 67afb67..89e88ed 100644 --- a/distro-configs/LibreOfficeiOS.conf +++ b/distro-configs/LibreOfficeiOS.conf @@ -20,7 +20,6 @@ --disable-randr-link --disable-systray --disable-vba ---disable-xmlsec --without-afms --without-fonts --without-java diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 1470503..18c46fb 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -35,9 +35,9 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE .INCLUDE : settings.mk -.IF $(ENABLE_XMLSEC) != YES +.IF $(OS) == ANDROID || $(OS) == IOS @all: -@echo XMLSec module disabled + @echo FIXME: XMLSec module not buildable yet on this platform .ENDIF # --- Files diff --git a/nss/makefile.mk b/nss/makefile.mk index 505bcfd..8603fbb 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -39,7 +39,12 @@ TARGET=nss .IF $(SYSTEM_NSS)==YES all: @echo NSS will not be built. Using system one instead. -.ENDIF +.ENDIF + +.IF $(OS) == ANDROID || $(OS) == IOS +@all: + @echo FIXME: NSS module not buildable yet on this platform +.ENDIF VER_MAJOR=3 VER_MINOR=13 diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index
[REVIEW: 3-5] fdo#47311 crash when copying cells into more than one sheet
Hi all, fdo#47311 has got at least 2 duplicates since it was first reported, so I think we should fix it in 3.5. It has got clear and simple reproducer and one-liner fix. Any takers? D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: --with-mozilla-build required on windows ?
On Tue, 2012-08-14 at 12:59 +0300, Tor Lillqvist wrote: @tml: On the --disable-xmlsec stuff in the Android and iOS default configs. Why is that ?, it is because they don't build, because its just handier to not worry about nss and xmlsec for now, or is there a fundamental problem ? It's handier not to worry about building NSS now. Presumably that doesn't really cross-compile out of the box for Android or iOS. The less 3rd-party libraries we need to struggle with the better. Alright, so I've removed --disable-xmlsec but stuck ifdefs for Android and iOS about the place in nss and xmlsec and scp2 etc in its place. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Cherry-pick request: aa4b8a8164f01a120ba9bfb2e86b1ed33cc1d69c
Makes the MathML filter less prone to think any random XML file is for it. Some people want to open XML files in Writer (through the ASCII filter), yes, weird, which worked in 3.3. Please cherry-pick to the 3-6 branch. I was not able to do this request through gerrit, sorry, need larger cluebat. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#35323 - fix for The standard date format for Swedish is ...
From Eike Rathke er...@redhat.com: Eike Rathke has submitted this change and it was merged. Change subject: fdo#35323 - fix for The standard date format for Swedish is wrong .. fdo#35323 - fix for The standard date format for Swedish is wrong Change-Id: I967b75b54a330692fb88783609e714d016506f89 --- M i18npool/source/localedata/data/sv_SE.xml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/408 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I967b75b54a330692fb88783609e714d016506f89 Gerrit-PatchSet: 1 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
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/sv_SE.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 789b162cce8ad306861344e8497eab460983440b Author: Albert Thuswaldner albert.thuswald...@gmail.com Date: Mon Aug 13 22:08:23 2012 +0200 fdo#35323 - fix for The standard date format for Swedish is wrong Change-Id: I967b75b54a330692fb88783609e714d016506f89 diff --git a/i18npool/source/localedata/data/sv_SE.xml b/i18npool/source/localedata/data/sv_SE.xml index 3af71e3..7574a63 100644 --- a/i18npool/source/localedata/data/sv_SE.xml +++ b/i18npool/source/localedata/data/sv_SE.xml @@ -102,13 +102,13 @@ FormatElement msgid=CurrencyFormatskey6 default=false type=medium usage=CURRENCY formatindex=17 FormatCode#Â ##0,-- [CURRENCY];[RED]-#Â ##0,-- [CURRENCY]/FormatCode /FormatElement -FormatElement msgid=DateFormatskey1 default=true type=short usage=DATE formatindex=18 +FormatElement msgid=DateFormatskey1 default=true type=medium usage=DATE formatindex=18 FormatCode-MM-DD/FormatCode /FormatElement FormatElement msgid=DateFormatskey9 default=true type=long usage=DATE formatindex=19 FormatCodeD /FormatCode /FormatElement -FormatElement msgid=DateFormatskey8 default=true type=medium usage=DATE formatindex=20 +FormatElement msgid=DateFormatskey8 default=true type=short usage=DATE formatindex=20 FormatCodeYY-MM-DD/FormatCode /FormatElement FormatElement msgid=DateFormatskey7 default=false type=medium usage=DATE formatindex=21 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - oox/inc oox/source
oox/inc/oox/drawingml/textparagraphproperties.hxx |2 +-
oox/source/drawingml/textparagraph.cxx|9 +++--
oox/source/drawingml/textparagraphproperties.cxx |7 ---
3 files changed, 12 insertions(+), 6 deletions(-)
New commits:
commit b8b054785b9718f0ec08f92b0c53cac7a497b189
Author: Muthu Subramanian sumu...@suse.com
Date: Tue Aug 14 17:43:54 2012 +0530
n#759180: Override properties with endParaPr.
This is done only for empty textruns.
diff --git a/oox/source/drawingml/textparagraph.cxx
b/oox/source/drawingml/textparagraph.cxx
index 163b79c..a47a5d5 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -92,8 +92,13 @@ void TextParagraph::insertAt(
{
for( TextRunVector::const_iterator aIt = maRuns.begin(), aEnd =
maRuns.end(); aIt != aEnd; ++aIt )
{
+sal_Int32 nLen = (*aIt)-getText().getLength();
+// n#759180: Force use, maEndProperties for the last segment
+// This is currently applied to only empty runs
+if( !nLen ( ( aIt + 1 ) == aEnd ) )
+(*aIt)-getTextCharacterProperties().assignUsed(
maEndProperties );
nCharHeight = std::max sal_Int32 ( nCharHeight,
(*aIt)-insertAt( rFilterBase, xText, xAt, aTextCharacterStyle ) );
-nParagraphSize += (*aIt)-getText().getLength();
+nParagraphSize += nLen;
}
}
xAt-gotoEnd( sal_True );
commit ed011e491bc9c4ca5ea90851bb81384eb0b47537
Author: Muthu Subramanian sumu...@suse.com
Date: Tue Aug 14 17:41:59 2012 +0530
n#759180: Push oox default spacing values.
diff --git a/oox/inc/oox/drawingml/textparagraphproperties.hxx
b/oox/inc/oox/drawingml/textparagraphproperties.hxx
index c9f6ea7..3dacd86 100644
--- a/oox/inc/oox/drawingml/textparagraphproperties.hxx
+++ b/oox/inc/oox/drawingml/textparagraphproperties.hxx
@@ -97,7 +97,7 @@ public:
voidapply( const TextParagraphProperties
rSourceProps );
voidpushToPropSet( const
::oox::core::XmlFilterBase* pFilterBase,
const
::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet
xPropSet,
-PropertyMap rioBulletList,
const BulletList* pMasterBuList, sal_Bool bApplyBulletList, float fFontSize )
const;
+PropertyMap rioBulletList,
const BulletList* pMasterBuList, sal_Bool bApplyBulletList, float fFontSize,
bool bPushDefaultValues = false ) const;
voidpushToPropSet( const
::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet
xPropSet) const;
/** Returns the largest character size of this paragraph. If possible the
diff --git a/oox/source/drawingml/textparagraph.cxx
b/oox/source/drawingml/textparagraph.cxx
index 24804c8..163b79c 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -103,7 +103,7 @@ void TextParagraph::insertAt(
float fCharacterSize = nCharHeight 0 ? GetFontHeight( nCharHeight )
: 18;
if ( pTextParagraphStyle.get() )
{
-pTextParagraphStyle-pushToPropSet( rFilterBase, xProps,
aioBulletList, NULL, sal_True, fCharacterSize );
+pTextParagraphStyle-pushToPropSet( rFilterBase, xProps,
aioBulletList, NULL, sal_True, fCharacterSize, true );
fCharacterSize = pTextParagraphStyle-getCharHeightPoints(
fCharacterSize );
// bullets have same color as following texts by default
diff --git a/oox/source/drawingml/textparagraphproperties.cxx
b/oox/source/drawingml/textparagraphproperties.cxx
index e9afae2..3cd0bba 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -381,7 +381,8 @@ void TextParagraphProperties::apply( const
TextParagraphProperties rSourceProps
}
void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase*
pFilterBase,
-const Reference XPropertySet xPropSet, PropertyMap rioBulletMap,
const BulletList* pMasterBuList, sal_Bool bApplyBulletMap, float fCharacterSize
) const
+const Reference XPropertySet xPropSet, PropertyMap rioBulletMap,
const BulletList* pMasterBuList, sal_Bool bApplyBulletMap, float fCharacterSize,
+bool bPushDefaultValues ) const
{
PropertySet aPropSet( xPropSet );
aPropSet.setProperties( maTextParagraphPropertyMap );
@@ -396,9 +397,9 @@ void TextParagraphProperties::pushToPropSet( const
::oox::core::XmlFilterBase* p
maBulletList.pushToPropMap( pFilterBase, rioBulletMap );
-if ( maParaTopMargin.bHasValue )
+if ( maParaTopMargin.bHasValue || bPushDefaultValues )
aPropSet.setProperty( PROP_ParaTopMargin, maParaTopMargin.toMargin(
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
sc/source/filter/oox/workbookhelper.cxx | 12 1 file changed, 8 insertions(+), 4 deletions(-) New commits: commit 0eeab7204ac244bebb0f8c4d8a8891037423534a Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Mon Aug 13 17:08:57 2012 -0400 fdo#53456: initialize pivot tables *after* the formula cells. Or else all the formula cells within pivot table's source ranges would be treated as if they are empty. (cherry picked from commit ae296a60781a2b5d5b7523cbda3444e3dd21506f) Signed-off-by: Eike Rathke er...@redhat.com Conflicts: sc/source/filter/oox/workbookhelper.cxx Change-Id: Ib04f4902863b091c483711eeaf31a282f6feaf67 diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index e8df821..071b9a6 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -590,9 +590,17 @@ void WorkbookGlobals::finalize() aPropSet.setProperty( PROP_IsExecuteLinkEnabled, true ); // #i79826# enable updating automatic row height after loading the document aPropSet.setProperty( PROP_IsAdjustHeightEnabled, true ); + getFormulaBuffer().finalizeImport(); + // hack, setting it true the second time will delete the cache aPropSet.setProperty( PROP_IsAdjustHeightEnabled, true ); + +// Insert all pivot tables. Must be done after loading all sheets and +// formulas, because data pilots expect existing source data on +// creation. +getPivotTables().finalizeImport(); + // #i76026# enable Undo after loading the document aPropSet.setProperty( PROP_IsUndoEnabled, true ); // disable editing read-only documents (e.g. from read-only files) @@ -659,10 +667,6 @@ void WorkbookHelper::finalizeWorkbookImport() mrBookGlob.getWorkbookSettings().finalizeImport(); mrBookGlob.getViewSettings().finalizeImport(); -/* Insert all pivot tables. Must be done after loading all sheets, because -data pilots expect existing source data on creation. */ -mrBookGlob.getPivotTables().finalizeImport(); - /* Insert scenarios after all sheet processing is done, because new hidden sheets are created for scenarios which would confuse code that relies on certain sheet indexes. Must be done after pivot tables too. */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-6] Fix pivot table import from xlsx (fdo#53456)
Hi Kohei, On Monday, 2012-08-13 17:16:28 -0400, Kohei Yoshida wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=ae296a60781a2b5d5b7523cbda3444e3dd21506f Cherry-picked to 3-6 http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=0eeab7204ac244bebb0f8c4d8a8891037423534a Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpBspfI8ZRad.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-6] Fix pivot table import from xlsx (fdo#53456)
Hi Pedro, On Tuesday, 2012-08-14 00:11:26 -0700, Pedro wrote: I came across this awful bug which caused me to loose some work. I'm sure glad you fixed it. Can it please be cherry picked to the 3.5 branch? This does not appear to be a problem in 3-5, I assume you'll be happy with the fix in 3-6? Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpaAtj7nggDj.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - offapi/com offapi/type_reference offapi/UnoApi_offapi.mk
offapi/UnoApi_offapi.mk | 11 +++
offapi/com/sun/star/auth/SSOExceptions.idl| 33 --
offapi/com/sun/star/auth/SSOManagerFactory.idl| 11 ++-
offapi/com/sun/star/auth/SSOPasswordCache.idl | 11 ++-
offapi/com/sun/star/auth/XSSOAcceptorContext.idl |5 ++-
offapi/com/sun/star/auth/XSSOInitiatorContext.idl |5 ++-
offapi/com/sun/star/auth/XSSOManager.idl |4 ++
offapi/com/sun/star/auth/XSSOPasswordCache.idl|3 +-
offapi/type_reference/typelibrary_history.txt |2 -
offapi/type_reference/types.rdb |binary
offapi/type_reference/update-rdb.sh | 32 +
11 files changed, 59 insertions(+), 58 deletions(-)
New commits:
commit 629dd9dae17b902b53839842929fcff4b836b47a
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 14 14:40:39 2012 +0200
Remove SSOExceptions.idl
Change-Id: I930603bfcee8084eae0a086d3ce02182b8b13541
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 152358c..8322f90 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -299,9 +299,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessi
Accessible \
AccessibleContext \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/auth,\
- SSOExceptions \
-))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\
AccessibleButton \
AccessibleCheckBox \
diff --git a/offapi/com/sun/star/auth/SSOExceptions.idl
b/offapi/com/sun/star/auth/SSOExceptions.idl
deleted file mode 100644
index 097a7c8..000
--- a/offapi/com/sun/star/auth/SSOExceptions.idl
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_auth_SSOExceptions_idl__
-#define __com_sun_star_auth_SSOExceptions_idl__
-
-#include com/sun/star/auth/AuthenticationFailedException.idl
-#include com/sun/star/auth/InvalidArgumentException.idl
-#include com/sun/star/auth/InvalidContextException.idl
-#include com/sun/star/auth/InvalidCredentialException.idl
-#include com/sun/star/auth/InvalidPrincipalException.idl
-#include com/sun/star/auth/PersistenceFailureException.idl
-#include com/sun/star/auth/UnsupportedException.idl
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/auth/XSSOAcceptorContext.idl
b/offapi/com/sun/star/auth/XSSOAcceptorContext.idl
index af9de07..d8eb2c2 100644
--- a/offapi/com/sun/star/auth/XSSOAcceptorContext.idl
+++ b/offapi/com/sun/star/auth/XSSOAcceptorContext.idl
@@ -29,8 +29,11 @@
#ifndef __com_sun_star_auth_XSSOAcceptorContext_idl__
#define __com_sun_star_auth_XSSOAcceptorContext_idl__
+#include com/sun/star/auth/AuthenticationFailedException.idl
+#include com/sun/star/auth/InvalidArgumentException.idl
+#include com/sun/star/auth/InvalidContextException.idl
+#include com/sun/star/auth/InvalidCredentialException.idl
#include com/sun/star/auth/XSSOContext.idl
-#include com/sun/star/auth/SSOExceptions.idl
module com { module sun { module star { module auth {
diff --git a/offapi/com/sun/star/auth/XSSOInitiatorContext.idl
b/offapi/com/sun/star/auth/XSSOInitiatorContext.idl
index 7b4408b..a1b69a3 100644
--- a/offapi/com/sun/star/auth/XSSOInitiatorContext.idl
+++ b/offapi/com/sun/star/auth/XSSOInitiatorContext.idl
@@ -29,8 +29,11 @@
#ifndef __com_sun_star_auth_XSSOInitiatorContext_idl__
#define __com_sun_star_auth_XSSOInitiatorContext_idl__
+#include com/sun/star/auth/AuthenticationFailedException.idl
+#include com/sun/star/auth/InvalidArgumentException.idl
+#include com/sun/star/auth/InvalidContextException.idl
+#include com/sun/star/auth/InvalidCredentialException.idl
#include com/sun/star/auth/XSSOContext.idl
-#include com/sun/star/auth/SSOExceptions.idl
module com { module sun { module star { module auth {
diff --git a/offapi/com/sun/star/auth/XSSOManager.idl
b/offapi/com/sun/star/auth/XSSOManager.idl
index acb2eb2..0a68a32 100644
---
[Libreoffice-commits] .: xmlsecurity/Module_xmlsecurity.mk
xmlsecurity/Module_xmlsecurity.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d72568fc7d2680107c8f86f777bc6f55e5f09ae7 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Aug 14 14:47:20 2012 +0200 Fix condition Change-Id: I746778a0d0f229c65dca37bcf3fdae9dcebd4340 diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk index 46646b0..752f625 100644 --- a/xmlsecurity/Module_xmlsecurity.mk +++ b/xmlsecurity/Module_xmlsecurity.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\ AllLangResTarget_xsec \ Library_xmlsecurity \ Library_xsec_fw \ -$(ifneq ($(filter-out IOS ANDROID,$(OS)),),Library_xsec_xmlsec) \ +$(if $(filter-out IOS ANDROID,$(OS)),Library_xsec_xmlsec) \ )) #FIXME: ^^^, get nsslibxmlsec building on ios and android ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svtools/inc svtools/source
svtools/inc/svtools/slidesorterbaropt.hxx | 90 ++--
svtools/source/config/slidesorterbaropt.cxx | 210 +++-
2 files changed, 138 insertions(+), 162 deletions(-)
New commits:
commit b843d9056898f916b8c1bf86b36190c3c796a60f
Author: Rob Snelders programm...@ertai.nl
Date: Sat Aug 4 20:43:13 2012 +0200
code cleanup
Change-Id: Ib154cd53253e4d802d13a024a20f6c34d499e672
diff --git a/svtools/inc/svtools/slidesorterbaropt.hxx
b/svtools/inc/svtools/slidesorterbaropt.hxx
index c2ef705..c00952a 100644
--- a/svtools/inc/svtools/slidesorterbaropt.hxx
+++ b/svtools/inc/svtools/slidesorterbaropt.hxx
@@ -27,68 +27,76 @@
#include rtl/ustring.hxx
#include unotools/options.hxx
- /*@short forward declaration to our private date container
implementation
-@descr We use these class as internal member to support small
memory requirements.
-You can create the container if it is neccessary. The
class which use these mechanism
-is faster and smaller then a complete implementation!*/
+/** forward declaration to our private date container implementation
+
+We use these class as internal member to support small memory requirements.
+You can create the container if it is neccessary. The class which use
these mechanism
+is faster and smaller then a complete implementation!
+*/
class SvtSlideSorterBarOptions_Impl;
class Link;
- /*@short collect informations about sidebar group
-@ATTENTION This class is partially threadsafe.
-@devstatus ready to use*/
+/** collect informations about sidebar group
+
+\attention This class is partially threadsafe.
+*/
class SVT_DLLPUBLIC SvtSlideSorterBarOptions: public utl::detail::Options
{
public:
- /*@short standard constructor and destructor
-@descr This will initialize an instance with default values.
-We implement these class with a refcount mechanism!
Every instance of this class increase it
-at create and decrease it at delete time - but all
instances use the same data container!
-He is implemented as a static member ...
-@seealsomember m_nRefCount
-@seealsomember m_pDataContainer*/
- SvtSlideSorterBarOptions();
+/** standard constructor and destructor
+
+This will initialize an instance with default values.
+We implement these class with a refcount mechanism! Every instance
of this class increase it
+at create and decrease it at delete time - but all instances use
the same data container!
+He is implemented as a static member ...
+
+\samember m_nRefCount
+\samember m_pDataContainer
+*/
+SvtSlideSorterBarOptions();
virtual ~SvtSlideSorterBarOptions();
void AddListenerLink( const Link rLink );
void RemoveListenerLink( const Link rLink );
-sal_BoolGetVisibleImpressView() const;
-voidSetVisibleImpressView( sal_Bool bVisible );
-sal_BoolGetVisibleOutlineView() const;
-voidSetVisibleOutlineView( sal_Bool bVisible );
-sal_BoolGetVisibleNotesView() const;
-voidSetVisibleNotesView( sal_Bool bVisible );
-sal_BoolGetVisibleHandoutView() const;
-voidSetVisibleHandoutView( sal_Bool bVisible );
-sal_BoolGetVisibleSlideSorterView() const;
-voidSetVisibleSlideSorterView( sal_Bool bVisible );
-sal_BoolGetVisibleDrawView() const;
-voidSetVisibleDrawView( sal_Bool bVisible );
+bool GetVisibleImpressView() const;
+void SetVisibleImpressView( bool bVisible );
+bool GetVisibleOutlineView() const;
+void SetVisibleOutlineView( bool bVisible );
+bool GetVisibleNotesView() const;
+void SetVisibleNotesView( bool bVisible );
+bool GetVisibleHandoutView() const;
+void SetVisibleHandoutView( bool bVisible );
+bool GetVisibleSlideSorterView() const;
+void SetVisibleSlideSorterView( bool bVisible );
+bool GetVisibleDrawView() const;
+void SetVisibleDrawView( bool bVisible );
private:
- /*@short return a reference to a static mutex
-@descr These class is partially threadsafe (for
de-/initialization only).
-All access methods are'nt safe!
-We create a static mutex only for one ime and use at
different times.
-@return A reference to a static mutex member.*/
+/** return a reference to a static mutex
+
+These class is partially threadsafe (for de-/initialization only).
+All access methods are'nt safe!
+We create a static mutex only for one ime and use at different
times.
[Libreoffice-commits] .: slideshow/source
slideshow/source/engine/transitions/slidechangebase.cxx| 10 +
slideshow/source/engine/transitions/slidechangebase.hxx| 12 +
slideshow/source/engine/transitions/slidetransitionfactory.cxx | 95
+-
3 files changed, 71 insertions(+), 46 deletions(-)
New commits:
commit 2e8b2e6de14d325863d9bc419a461b75c3aaf3d0
Author: David Tardon dtar...@redhat.com
Date: Tue Aug 14 14:44:18 2012 +0200
fix uncover slide transitions with presenter console
It turns out it is really not a good idea to render _anything_ on the
first run of performIn/performOut in classes derived from
SlideChangeBase. That is because the functions are called separetely for
every view, so, if there is more than one view, like when the presenter
console is active, it will be done only for the first of them. This
commit introduces another function, prepareForRun, that can be used
reliably for that purpose.
Change-Id: I2c690fb145ccc05a680d4c2991c73900336e6f42
diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx
b/slideshow/source/engine/transitions/slidechangebase.cxx
index 3b9c70d..56d7887 100644
--- a/slideshow/source/engine/transitions/slidechangebase.cxx
+++ b/slideshow/source/engine/transitions/slidechangebase.cxx
@@ -199,6 +199,10 @@ void SlideChangeBase::start( const
AnimatableShapeSharedPtr rShape,
prefetch(rShape,rLayer); // no-op, if already done
+// get the subclasses a chance to do any specific initialization before run
+for ( ViewsVecT::const_iterator aCurr( beginViews() ), aEnd( endViews() );
aCurr != aEnd; ++aCurr )
+prepareForRun( *aCurr, aCurr-mpView-getCanvas() );
+
// start accompanying sound effect, if any
if( mpSoundPlayer )
{
@@ -356,6 +360,12 @@ bool SlideChangeBase::operator()( double nValue )
return true;
}
+void SlideChangeBase::prepareForRun(
+const ViewEntry /* rViewEntry */,
+const boost::shared_ptrcppcanvas::Canvas /* rDestinationCanvas */ )
+{
+}
+
void SlideChangeBase::performIn(
const cppcanvas::CustomSpriteSharedPtr /*rSprite*/,
const ViewEntry /*rViewEntry*/,
diff --git a/slideshow/source/engine/transitions/slidechangebase.hxx
b/slideshow/source/engine/transitions/slidechangebase.hxx
index 586bc8e..396c03a 100644
--- a/slideshow/source/engine/transitions/slidechangebase.hxx
+++ b/slideshow/source/engine/transitions/slidechangebase.hxx
@@ -126,6 +126,18 @@ protected:
void renderBitmap( SlideBitmapSharedPtr const
pSlideBitmap,
boost::shared_ptrcppcanvas::Canvas const pCanvas );
+/** Called on derived classes to perform actions before first run.
+
+This typically involves rendering of the initial slide content.
+
+@param rViewEntry the view entry
+
+@param rDestinationCanvas the canvas to render on
+ */
+virtual void prepareForRun(
+const ViewEntry rViewEntry,
+const cppcanvas::CanvasSharedPtr rDestinationCanvas );
+
/** Called on derived classes to implement actual slide change.
This method is called with the sprite of the slide coming 'in'
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx
b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
index 47491c1..f61a5da 100644
--- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
@@ -393,10 +393,13 @@ public:
rViewContainer,
rScreenUpdater,
rEventMultiplexer ),
- maFadeColor( rFadeColor ),
- mbFirstTurn( true )
+ maFadeColor( rFadeColor )
{}
+virtual void prepareForRun(
+const ViewEntry rViewEntry,
+const cppcanvas::CanvasSharedPtr rDestinationCanvas );
+
virtual void performIn(
const ::cppcanvas::CustomSpriteSharedPtr rSprite,
const ViewEntryrViewEntry,
@@ -411,9 +414,19 @@ public:
private:
const boost::optional RGBColormaFadeColor;
-boolmbFirstTurn;
};
+void FadingSlideChange::prepareForRun(
+const ViewEntry rViewEntry,
+const cppcanvas::CanvasSharedPtr rDestinationCanvas )
+{
+// clear page to given fade color. 'Leaving' slide is
+// painted atop of that, but slowly fading out.
+fillPage( rDestinationCanvas,
+ ::basegfx::B2DSize( getEnteringSlideSizePixel( rViewEntry.mpView
) ),
+ *maFadeColor );
+}
+
void FadingSlideChange::performIn(
const ::cppcanvas::CustomSpriteSharedPtr rSprite,
const ViewEntry/*rViewEntry*/,
@@ -434,7 +447,7 @@ void FadingSlideChange::performIn(
void FadingSlideChange::performOut(
const ::cppcanvas::CustomSpriteSharedPtr rSprite,
-const
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/inc/FieldDescControl.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ea7b1af01511d147ba7bfea925d407e72723a7db
Author: Philipp Riemer ruderphil...@gmail.com
Date: Sun Aug 12 18:58:02 2012 +0200
Moved method declaration in class definition
The following method was added at the bottom and is now moved to all
other methods marked as protected.
This is a follow-up patch of 401a454c2da7560d5ec41ef07ac116403956c55a.
Change-Id: Ib536f93f1565a128a3bb5dff12496005c51acb83
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx
b/dbaccess/source/ui/inc/FieldDescControl.hxx
index 98d9561..a43f0cc 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -171,6 +171,8 @@ namespace dbaui
const OPropColumnEditCtrl* getColumnCtrl() const { return
m_pColumnName; }
+voidimplFocusLost(Window* _pWhich);
+
public:
OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHelpBar);
OFieldDescControl( Window* pParent, const ResId rResId,
OTableDesignHelpBar* pHelpBar);
@@ -205,8 +207,6 @@ namespace dbaui
String getControlDefault( const OFieldDescription*
_pFieldDescr ,sal_Bool _bCheck = sal_True) const;
inline void setEditWidth(sal_Int32 _nWidth) { m_nWidth = _nWidth; }
-protected:
-voidimplFocusLost(Window* _pWhich);
};
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values
Stephan Bergmann-2 wrote On 08/14/2012 12:35 AM, anwen wrote: I implemented the above code with c++ . However, it did not work. Anything wrong with the following code: m_xCC is a given ReferenceXComponentContext ReferenceXEventBroadcaster xBrd(m_xCC-getServiceManager()-createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.frame.GlobalEventbroadcaster)), it's GlobalEventBroadcaster (with a capital B) Stephan m_xCC), UNO_QUERY); //xBrd is still empty, not sure why? Stephan, thank you for your kind and important correct. It works now. In addition, from the link (http://www.openoffice.org/api/docs/common/ref/com/sun/star/sdb/OfficeDatabaseDocument.html), I saw that both OnPrepareUnload and OnUnload events are synchronously broadcaster. Does it mean SolarMutex protection again? I really hope it does not. Thank you again, Wendi -- View this message in context: http://nabble.documentfoundation.org/Solarmutex-Deadlock-when-Closing-Calc-which-contains-functions-with-XVolatileResult-return-values-tp3998056p4001199.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
[PUSHED] Change in core[libreoffice-3-6]: fdo#47495 fix RTF import of multiple shapes inside textframe...
From Petr Mladek pmla...@suse.cz: Petr Mladek has submitted this change and it was merged. Change subject: fdo#47495 fix RTF import of multiple shapes inside textframes .. fdo#47495 fix RTF import of multiple shapes inside textframes (cherry-picked from commit ad72a47dbd16f65316432df71dffe3b9b835fcc7) Change-Id: Iee8541ff9e88139648d45f08968476f2b1d4e1b3 --- M writerfilter/source/rtftok/rtfdocumentimpl.cxx 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/405 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iee8541ff9e88139648d45f08968476f2b1d4e1b3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Fwd: LineEnding issues, .md .docx
FYI, just interested if there is a known issue here and/or compliance errors you can help pandoc with... -- Forwarded message -- From: Oliver Schrenk oliver.schr...@gmail.com Date: 2012/8/14 Subject: Re: LineEnding issues, .md .docx To: pandoc-disc...@googlegroups.com pandoc-disc...@googlegroups.com Cc: pandoc-disc...@googlegroups.com pandoc-disc...@googlegroups.com I currently have only access to OpenOffice 3.0. What would be a good approach to debug this? My plan is to create native docx with something like code blocks and see how this is formatted and how it fairs in OO, but I suspect that this is what you did in the first place. Am 13.08.2012 um 18:51 schrieb John MacFarlane fiddlosop...@gmail.com: I wasn't aware of this issue. I just confirmed it with LibreOffice on Mac OS X. So it seems that the docx pandoc produces is fine for Word, but somehow confuses the Libre/OpenOffice converter. If anyone has insight on this, it would be welcome. This is how pandoc renders a verbatim section in docx: Markdown: A level-two header -- Docx: w:br / w:r w:rPr w:rStyle w:val=VerbatimChar / /w:rPr w:t xml:space=preserve/w:t /w:r w:br / w:r w:rPr w:rStyle w:val=VerbatimChar / /w:rPr w:t xml:space=preserve A level-two header /w:t /w:r w:br / w:r w:rPr w:rStyle w:val=VerbatimChar / /w:rPr w:t xml:space=preserve -- /w:t /w:r Note, there's an explicit w:br / (line break) between the first line and the second. The LibreOffice converter seems to be ignoring this. This may be a bug in LibreOffice, though it's also possible that I'm doing it wrong. +++ Oliver Schrenk [Aug 13 12 04:05 ]: I mainly want to use pandoc to generate documentation for software and often use code examples. In markdown I format codeblocks using tabs as indentation and use `pandoc *.md -o book.docx`) to convert the files. When I open the result file in OpenOffice (on Linux and Windows) all line endings are gone, in Word all line endings are displayed correctly. I suspected issues with converting LF to CRLF and ran `unix2dos *.md` but it didn't help. Does anybody know a way around this? -- You received this message because you are subscribed to the Google Groups pandoc-discuss group. To post to this group, send email to pandoc-disc...@googlegroups.com. To unsubscribe from this group, send email to pandoc-discuss+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msg/pandoc-discuss/-/5W53P-rv6lgJ. For more options, visit https://groups.google.com/groups/opt_out. -- You received this message because you are subscribed to the Google Groups pandoc-discuss group. To post to this group, send email to pandoc-disc...@googlegroups.com. To unsubscribe from this group, send email to pandoc-discuss+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out. -- You received this message because you are subscribed to the Google Groups pandoc-discuss group. To post to this group, send email to pandoc-disc...@googlegroups.com. To unsubscribe from this group, send email to pandoc-discuss+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 9f6ede5c0a998d2925b017b82ff73dd0a793a858
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Aug 13 12:23:05 2012 +0200
fdo#47495 fix RTF import of multiple shapes inside textframes
(cherry-picked from commit ad72a47dbd16f65316432df71dffe3b9b835fcc7)
Change-Id: Iee8541ff9e88139648d45f08968476f2b1d4e1b3
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 32366cc..3409224 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3439,7 +3439,8 @@ int RTFDocumentImpl::popState()
bFaltEnd = true;
}
else if (m_aStates.top().nDestinationState == DESTINATION_FLYMAINCONTENT
-|| m_aStates.top().nDestinationState == DESTINATION_SHPPICT)
+|| m_aStates.top().nDestinationState == DESTINATION_SHPPICT
+|| aState.nDestinationState == DESTINATION_SHAPE)
bPopFrame = true;
else if (m_aStates.top().nDestinationState == DESTINATION_DRAWINGOBJECT
m_aStates.top().aDrawingObject.xShape.is())
{
@@ -3461,6 +3462,8 @@ int RTFDocumentImpl::popState()
{
m_aStates.top().resetFrame();
parBreak();
+// Save this state for later use, so we only reset frame status only
for the first shape inside a frame.
+aState = m_aStates.top();
m_bNeedPap = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-5]: fdo#47495 fix RTF import of multiple shapes inside textframe...
From Petr Mladek pmla...@suse.cz: Petr Mladek has submitted this change and it was merged. Change subject: fdo#47495 fix RTF import of multiple shapes inside textframes .. fdo#47495 fix RTF import of multiple shapes inside textframes (cherry-picked from commit ad72a47dbd16f65316432df71dffe3b9b835fcc7) Change-Id: Iee8541ff9e88139648d45f08968476f2b1d4e1b3 --- M writerfilter/source/rtftok/rtfdocumentimpl.cxx 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/406 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iee8541ff9e88139648d45f08968476f2b1d4e1b3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/unitymenus' - vcl/inc vcl/unx
vcl/inc/unx/gtk/gtksalmenu.hxx|3 -
vcl/unx/gtk/window/gtksalmenu.cxx | 84 +-
2 files changed, 59 insertions(+), 28 deletions(-)
New commits:
commit cd3845cb77a77293bcd3db00058c4e45bdc959b1
Author: Antonio Fernandez antonio.fernan...@aentos.es
Date: Tue Aug 14 14:38:35 2012 +0100
Menu is published once. Only special menus are updated now.
Change-Id: Ie7643e81c61ae0794bdf8a6e1e7d292f9550674b
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 78ec7a1..3bffc6c 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -62,9 +62,10 @@ private:
sal_Int32 mMenubarId;
sal_Int32 mActionGroupId;
-// GMenuModel attributes
+// GMenuModel and GActionGroup attributes
GMenuModel* mpMenuModel;
GMenuModel* mpCurrentSection;
+GActionGroup* mpActionGroup;
virtual voidpublishMenu( GMenuModel*, GActionGroup* );
GtkSalMenuItem* GetSalMenuItem( sal_uInt16 nId );
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx
b/vcl/unx/gtk/window/gtksalmenu.cxx
index 642f2b8..a3812d7 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -186,7 +186,8 @@ GtkSalMenu::GtkSalMenu( sal_Bool bMenuBar ) :
aDBusMenubarPath( NULL ),
pSessionBus( NULL ),
mMenubarId( 0 ),
-mActionGroupId ( 0 )
+mActionGroupId ( 0 ),
+mpActionGroup( NULL )
{
mpCurrentSection = G_MENU_MODEL( g_lo_menu_new() );
maSections.push_back( mpCurrentSection );
@@ -195,6 +196,8 @@ GtkSalMenu::GtkSalMenu( sal_Bool bMenuBar ) :
g_lo_menu_append_section( G_LO_MENU( mpMenuModel ), NULL, mpCurrentSection
);
if (bMenuBar) {
+mpActionGroup = G_ACTION_GROUP( g_lo_action_group_new() );
+
pSessionBus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
if(!pSessionBus) puts (Fail bus get);
}
@@ -202,6 +205,8 @@ GtkSalMenu::GtkSalMenu( sal_Bool bMenuBar ) :
GtkSalMenu::~GtkSalMenu()
{
+g_source_remove_by_user_data( this );
+
// FIXME: Not sure if we need to unset X Properties.
if ( mpFrame ) {
GtkWidget *widget = GTK_WIDGET( mpFrame-getWindow() );
@@ -238,11 +243,15 @@ GtkSalMenu::~GtkSalMenu()
g_object_unref( mpMenuModel );
g_object_unref( mpCurrentSection );
+
+if ( mpActionGroup ) {
+g_object_unref( mpActionGroup );
+}
}
sal_Bool GtkSalMenu::VisibleMenuBar()
{
-return sal_True;
+return sal_False;
}
void GtkSalMenu::InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos )
@@ -268,6 +277,13 @@ void GtkSalMenu::InsertItem( SalMenuItem* pSalMenuItem,
unsigned nPos )
void GtkSalMenu::RemoveItem( unsigned nPos )
{
+// FIXME: This method makes the application crash.
+//if ( nPos maItems.size() ) {
+//GtkSalMenuItem* pSalMenuItem = maItems[ nPos ];
+
+//g_lo_menu_remove( G_LO_MENU( pSalMenuItem-mpParentSection ),
pSalMenuItem-mnPos );
+//maItems.erase( maItems.begin() + nPos, maItems.begin() + nPos );
+//}
}
void GtkSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu,
unsigned nPos )
@@ -287,14 +303,32 @@ void GtkSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem,
SalMenu* pSubMenu, unsig
void updateNativeMenu( GtkSalMenu* pMenu );
+void updateSpecialMenus( GtkSalMenu *pMenu ) {
+if ( pMenu ) {
+for ( sal_uInt16 i = 0; i pMenu-GetItemCount(); i++ ) {
+GtkSalMenuItem* pSalMenuItem = pMenu-GetItemAtPos( i );
+
+rtl::OUString aCommand = pSalMenuItem-mpVCLMenu-GetItemCommand(
pSalMenuItem-mnId );
+
+if ( isSpecialSubmenu( aCommand ) ) {
+updateNativeMenu( pSalMenuItem-mpSubMenu );
+}
+
+updateSpecialMenus( pSalMenuItem-mpSubMenu );
+}
+}
+}
+
gboolean GenerateMenu(gpointer user_data) {
cout Generating menu... endl;
GtkSalMenu* pSalMenu = static_cast GtkSalMenu* ( user_data );
-updateNativeMenu( pSalMenu );
+//updateNativeMenu( pSalMenu );
+updateSpecialMenus( pSalMenu );
return TRUE;
}
+
void GtkSalMenu::SetFrame( const SalFrame* pFrame )
{
mpFrame = static_castconst GtkSalFrame*( pFrame );
@@ -315,12 +349,12 @@ void GtkSalMenu::SetFrame( const SalFrame* pFrame )
gdk_x11_window_set_utf8_property ( gdkWindow,
_GTK_WINDOW_OBJECT_PATH, aDBusWindowPath );
gdk_x11_window_set_utf8_property ( gdkWindow,
_GTK_MENUBAR_OBJECT_PATH, aDBusMenubarPath );
-// Try to publish the menu with the right bus data.
-Freeze();
+// Publish the menu.
+this-publishMenu( mpMenuModel, mpActionGroup );
// Refresh the menu every second.
// This code is a workaround until required modifications in Gtk+ are
available.
-//g_timeout_add( 1000, GenerateMenu, this );
+g_timeout_add_seconds(
[Libreoffice-commits] .: 2 commits - officecfg/registry sc/inc sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 133
sc/inc/scabstdlg.hxx |4
sc/source/ui/attrdlg/scdlgfact.cxx |9
sc/source/ui/attrdlg/scdlgfact.hxx |3
sc/source/ui/dbgui/scuiasciiopt.cxx | 243 ---
sc/source/ui/inc/asciiopt.hxx|6
sc/source/ui/inc/scuiasciiopt.hxx|7
sc/source/ui/unoobj/filtuno.cxx |9
sc/source/ui/view/cellsh2.cxx|4
sc/source/ui/view/viewfun5.cxx |3
10 files changed, 294 insertions(+), 127 deletions(-)
New commits:
commit d26599c3e1dea940439985b46b727cfc22b37c38
Author: Eike Rathke er...@redhat.com
Date: Tue Aug 14 15:35:16 2012 +0200
changes to fdo#47674 Save settings for Import Ascii Text Dlg
* For TextToColumn some fields are preset and not changeable and
configuration does not provide properties, do not attempt to access
non-existing properties. In fact unotools/source/config/configmgr.cxx
mocks about these cases if built with debug.
* Do not use RTL_CONSTASCII_USTRINGPARAM with new code, OUString knows
about ASCII literals.
* Converted an if(meCall==...){}if(meCall==...) to a switch case.
* Sensible indentation, please ;-)
Change-Id: I6ef78cad3958b6379d17275a716bb62553b07601
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 753bda6..4a25381 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -121,18 +121,21 @@ static void load_Separators( OUString sFieldSeparators,
OUString sTextSeparato
{
SequenceAnyaValues;
const Any *pProperties;
-SequenceOUString aNames(9);
+SequenceOUString aNames( eCall == SC_TEXTTOCOLUMNS ? 4 : 9 );
OUString* pNames = aNames.getArray();
OUString aSepPath;
switch(eCall)
{
- case SC_IMPORTFILE :
aSepPath=OUString(RTL_CONSTASCII_USTRINGPARAM(SEP_PATH));
- break;
- case SC_PASTETEXT :
aSepPath=OUString(RTL_CONSTASCII_USTRINGPARAM(SEP_PATH_CLPBRD));
- break;
- case SC_TEXTTOCOLUMNS :
- default:
aSepPath=OUString(RTL_CONSTASCII_USTRINGPARAM(SEP_PATH_TEXT2COL));
- break;
+case SC_IMPORTFILE:
+aSepPath = SEP_PATH;
+break;
+case SC_PASTETEXT:
+aSepPath = SEP_PATH_CLPBRD;
+break;
+case SC_TEXTTOCOLUMNS:
+default:
+aSepPath = SEP_PATH_TEXT2COL;
+break;
}
ScLinkConfigItem aItem( aSepPath );
@@ -140,61 +143,72 @@ static void load_Separators( OUString sFieldSeparators,
OUString sTextSeparato
pNames[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SEPARATORS ));
pNames[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( TEXT_SEPARATORS ));
pNames[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( FIXED_WIDTH ));
-pNames[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( FROM_ROW ));
-pNames[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( CHAR_SET ));
-pNames[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( QUOTED_AS_TEXT ));
-pNames[7] = OUString(RTL_CONSTASCII_USTRINGPARAM( DETECT_SPECIAL_NUM ));
-pNames[8] = OUString(RTL_CONSTASCII_USTRINGPARAM( LANGUAGE ));
+if (eCall != SC_TEXTTOCOLUMNS)
+{
+pNames[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( FROM_ROW ));
+pNames[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( CHAR_SET ));
+pNames[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( QUOTED_AS_TEXT ));
+pNames[7] = OUString(RTL_CONSTASCII_USTRINGPARAM( DETECT_SPECIAL_NUM
));
+pNames[8] = OUString(RTL_CONSTASCII_USTRINGPARAM( LANGUAGE ));
+}
aValues = aItem.GetProperties( aNames );
pProperties = aValues.getConstArray();
+
+if( pProperties[0].hasValue() )
+bMergeDelimiters = ScUnoHelpFunctions::GetBoolFromAny( pProperties[0]
);
+
if( pProperties[1].hasValue() )
pProperties[1] = sFieldSeparators;
if( pProperties[2].hasValue() )
pProperties[2] = sTextSeparators;
-if( pProperties[0].hasValue() )
-bMergeDelimiters = ScUnoHelpFunctions::GetBoolFromAny( pProperties[0]
);
-
if( pProperties[3].hasValue() )
bFixedWidth = ScUnoHelpFunctions::GetBoolFromAny( pProperties[3] );
-if( pProperties[4].hasValue() )
-pProperties[4] = nFromRow;
+if (eCall != SC_TEXTTOCOLUMNS)
+{
+if( pProperties[4].hasValue() )
+pProperties[4] = nFromRow;
-if( pProperties[5].hasValue() )
-pProperties[5] = nCharSet;
+if( pProperties[5].hasValue() )
+pProperties[5] = nCharSet;
-if ( pProperties[6].hasValue() )
-pProperties[6] = bQuotedAsText;
+if ( pProperties[6].hasValue() )
+
Re: [REVIEW 3-6] Fix pivot table import from xlsx (fdo#53456)
Hi Eike Eike Rathke-2 wrote This does not appear to be a problem in 3-5, I assume you'll be happy with the fix in 3-6? You are correct. That bug does not affect 3.5.5.3. Just downloaded the sample file. My bad for assuming it was the same problem. The problem I had is related to https://bugs.freedesktop.org/show_bug.cgi?id=35414 Regards, Pedro -- View this message in context: http://nabble.documentfoundation.org/REVIEW-3-6-Fix-pivot-table-import-from-xlsx-fdo-53456-tp4001085p4001213.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
Reminder: IP change tomorrow
Hello, this is just a short reminder that tomorrow, we will do the IP change on various TDF virtual machines. Affected should be at least MozTrap, AskBot and Gerrit, and probably others. We expect only some short downtime to occur, but since Murphy is everywhere, be warned. ;-) Affected old IPs: 176.9.46.24 176.9.46.25 176.9.46.237 176.9.46.238 176.9.226.1-15 We will be in the #tdf-infra IRC channel on irc.freenode.net during the migration, for questions and help. Sorry for any inconveniences this may cause, Florian -- Florian Effenberger, Chairman of the Board (Vorstandsvorsitzender) Tel: +49 8341 99660880 | Mobile: +49 151 14424108 The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 1067832bbfae15811ff2e1d478139b5af283de51
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Aug 13 12:23:05 2012 +0200
fdo#47495 fix RTF import of multiple shapes inside textframes
(cherry-picked from commit ad72a47dbd16f65316432df71dffe3b9b835fcc7)
Change-Id: Iee8541ff9e88139648d45f08968476f2b1d4e1b3
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 1355501..aa58eaa 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3411,7 +3411,8 @@ int RTFDocumentImpl::popState()
bFaltEnd = true;
}
else if (m_aStates.top().nDestinationState == DESTINATION_FLYMAINCONTENT
-|| m_aStates.top().nDestinationState == DESTINATION_SHPPICT)
+|| m_aStates.top().nDestinationState == DESTINATION_SHPPICT
+|| aState.nDestinationState == DESTINATION_SHAPE)
bPopFrame = true;
else if (m_aStates.top().nDestinationState == DESTINATION_DRAWINGOBJECT
m_aStates.top().aDrawingObject.xShape.is())
{
@@ -3436,6 +3437,8 @@ int RTFDocumentImpl::popState()
{
m_aStates.top().resetFrame();
parBreak();
+// Save this state for later use, so we only reset frame status only
for the first shape inside a frame.
+aState = m_aStates.top();
m_bNeedPap = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] fdo#47674 Calc: save settings for import ascii text dialog
Hi jumbo444, On Friday, 2012-08-10 06:26:52 -0700, jumbo444 wrote: I propose a patch for fdo#47674 Pushed http://cgit.freedesktop.org/libreoffice/core/commit/?id=597bdd89d108fb8325d81f5b30ffdd0d3ea68072 with changes http://cgit.freedesktop.org/libreoffice/core/commit/?id=d26599c3e1dea940439985b46b727cfc22b37c38 Thanks! Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpXsStB8rRBY.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Fwd: LineEnding issues, .md .docx
On Tue, 2012-08-14 at 15:28 +0200, Joop Kiefte wrote: FYI, just interested if there is a known issue here and/or compliance errors you can help pandoc with... Looks like yet-another interoperability bug fix opportunity. The trick is to file a bug - this is not the right place for promoting your individual issue. Of course, if you want a timely fix - it's by far better to buy support from one of the many companies around help fund the development of the project :-) Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'libreoffice-3-6-1'
New branch 'libreoffice-3-6-1' available with the following commits: commit 09128ff9c1ff9e56dfd8f111aa1c062a86e6162b Author: Petr Mladek pmla...@suse.cz Date: Tue Aug 14 16:18:17 2012 +0200 Branch libreoffice-3-6-1 This is 'libreoffice-3-6-1' - the stable branch for the 3.6.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.6.x release, please use the 'libreoffice-3-6' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I563db52db2ebda49f7d6fd9da23ebd503e50f50e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-6-1'
New branch 'libreoffice-3-6-1' available with the following commits: commit dc888d2535d8e914dd3b645a38ef8f1ff0750282 Author: Petr Mladek pmla...@suse.cz Date: Tue Aug 14 16:18:18 2012 +0200 Branch libreoffice-3-6-1 This is 'libreoffice-3-6-1' - the stable branch for the 3.6.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.6.x release, please use the 'libreoffice-3-6' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: If18cc636e90f68eaff9abb7bf47334708b48f34b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-6-1'
New branch 'libreoffice-3-6-1' available with the following commits: commit 756d1ba15d3841552d0ed4500ff05f668d9c71e6 Author: Petr Mladek pmla...@suse.cz Date: Tue Aug 14 16:18:18 2012 +0200 Branch libreoffice-3-6-1 This is 'libreoffice-3-6-1' - the stable branch for the 3.6.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.6.x release, please use the 'libreoffice-3-6' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I2f218c3cbb437819e4310c2efe0d2d399f55a61b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/colorscale.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 480dc0740cf5112b595902dc44d5640899c40d85 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Aug 14 16:18:46 2012 +0200 warning C4702: unreachable code Change-Id: I02e6f646ee5deb278f4193185ffac8835efadc5c diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index ae592f4..1303e01 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -656,8 +656,6 @@ bool NeedUpdate(ScColorScaleEntry* pEntry) default: return false; } - -return false; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/rtl
sal/rtl/source/cipher.cxx |4 1 file changed, 4 deletions(-) New commits: commit 3c23dfb5d06bce5ebdd6886c1f879eadce1b0f6f Author: Olivier Hallot olivier.hal...@alta.org.br Date: Sun Aug 12 10:46:32 2012 -0300 Remove some dead assignements in sal/cipher.cxx Remove some dead assignements indicated by clang scan-build report. Thanks to John Smith clang investigation Patch corrected Change-Id: Icbee3a65b6753d45433f1a4ca30567675e27e6d9 diff --git a/sal/rtl/source/cipher.cxx b/sal/rtl/source/cipher.cxx index 29408b3..b5ff962 100644 --- a/sal/rtl/source/cipher.cxx +++ b/sal/rtl/source/cipher.cxx @@ -722,7 +722,6 @@ static rtlCipherError __rtl_cipherBF_init ( } } -D = DL = DR = 0; return rtl_Cipher_E_None; } @@ -865,7 +864,6 @@ static void __rtl_cipherBF_updateCBC ( ctx-m_iv.m_long[1] = IVR; RTL_CIPHER_HTONL64(DL, DR, pBuffer, nLength); -IVL = IVR = 0; } DL = DR = 0; } @@ -944,7 +942,6 @@ static void __rtl_cipherBF_encode ( *xl = XL; *xr = XR; -t = XL = XR = 0; } /* @@ -979,7 +976,6 @@ static void __rtl_cipherBF_decode ( *xl = XL; *xr = XR; -t = XL = XR = 0; } /* ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values
On 08/14/2012 03:20 PM, anwen wrote: In addition, from the link (http://www.openoffice.org/api/docs/common/ref/com/sun/star/sdb/OfficeDatabaseDocument.html), I saw that both OnPrepareUnload and OnUnload events are synchronously broadcaster. Does it mean SolarMutex protection again? I really hope it does not. I'm not sure what that broadcasted synchronously column there is supposed to mean. In general, (UNO) listener notifications must happen with no mutices locked. So I would hope for it does not too... Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - oox/inc oox/source sw/source
oox/inc/oox/export/vmlexport.hxx |2 oox/source/export/vmlexport.cxx | 20 ++- sw/source/filter/ww8/docxattributeoutput.cxx |5 + sw/source/filter/ww8/docxattributeoutput.hxx |1 sw/source/filter/ww8/rtfsdrexport.cxx| 75 +++ 5 files changed, 70 insertions(+), 33 deletions(-) New commits: commit c9cae5b599a951ce0a0aae67dff69b6b677b1e86 Author: Miklos Vajna vmik...@suse.cz Date: Tue Aug 14 14:10:33 2012 +0200 RtfSdrExport: unnecessary explicit OString ctors Change-Id: I2d8b9870f2d8c6836e1006e10eed3fe4a2566c2d diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index b75c94c..7792f97 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -180,35 +180,35 @@ void RtfSdrExport::Commit( EscherPropertyContainer rProps, const Rectangle rRe } break; case ESCHER_Prop_fillColor: - m_aShapeProps.insert(std::pairOString,OString(OString(fillColor), OString::valueOf(sal_Int32(it-nPropValue; +m_aShapeProps.insert(std::pairOString,OString(fillColor, OString::valueOf(sal_Int32(it-nPropValue; break; case ESCHER_Prop_fillBackColor: - m_aShapeProps.insert(std::pairOString,OString(OString(fillBackColor), OString::valueOf(sal_Int32(it-nPropValue; + m_aShapeProps.insert(std::pairOString,OString(fillBackColor, OString::valueOf(sal_Int32(it-nPropValue; break; case ESCHER_Prop_AnchorText: - m_aShapeProps.insert(std::pairOString,OString(OString(anchorText), OString::valueOf(sal_Int32(it-nPropValue; +m_aShapeProps.insert(std::pairOString,OString(anchorText, OString::valueOf(sal_Int32(it-nPropValue; break; case ESCHER_Prop_fNoFillHitTest: if (it-nPropValue) - m_aShapeProps.insert(std::pairOString,OString(OString(fNoFillHitTest), OString::valueOf(sal_Int32(1; + m_aShapeProps.insert(std::pairOString,OString(fNoFillHitTest, OString::valueOf(sal_Int32(1; break; case ESCHER_Prop_fNoLineDrawDash: // for some reason the value is set to 0x9 if lines are switched off if( it-nPropValue == 0x9 ) - m_aShapeProps.insert(std::pairOString,OString(OString(fLine), OString::valueOf(sal_Int32(0; +m_aShapeProps.insert(std::pairOString,OString(fLine, OString::valueOf(sal_Int32(0; break; case ESCHER_Prop_lineColor: - m_aShapeProps.insert(std::pairOString,OString(OString(lineColor), OString::valueOf(sal_Int32(it-nPropValue; +m_aShapeProps.insert(std::pairOString,OString(lineColor, OString::valueOf(sal_Int32(it-nPropValue; break; case ESCHER_Prop_lineBackColor: - m_aShapeProps.insert(std::pairOString,OString(OString(lineBackColor), OString::valueOf(sal_Int32(it-nPropValue; + m_aShapeProps.insert(std::pairOString,OString(lineBackColor, OString::valueOf(sal_Int32(it-nPropValue; break; case ESCHER_Prop_lineJoinStyle: - m_aShapeProps.insert(std::pairOString,OString(OString(lineJoinStyle), OString::valueOf(sal_Int32(it-nPropValue; + m_aShapeProps.insert(std::pairOString,OString(lineJoinStyle, OString::valueOf(sal_Int32(it-nPropValue; break; case ESCHER_Prop_fshadowObscured: if (it-nPropValue) - m_aShapeProps.insert(std::pairOString,OString(OString(fshadowObscured), OString::valueOf(sal_Int32(1; + m_aShapeProps.insert(std::pairOString,OString(fshadowObscured, 1)); break; case ESCHER_Prop_geoLeft: case ESCHER_Prop_geoTop: @@ -226,9 +226,9 @@ void RtfSdrExport::Commit( EscherPropertyContainer rProps, const Rectangle rRe rProps.GetOpt( ESCHER_Prop_geoLeft, nLeft ); } - m_aShapeProps.insert(std::pairOString,OString(OString(geoLeft), +m_aShapeProps.insert(std::pairOString,OString(geoLeft, OString::valueOf(sal_Int32(sal_Int32( nLeft ); - m_aShapeProps.insert(std::pairOString,OString(OString(geoTop), +m_aShapeProps.insert(std::pairOString,OString(geoTop, OString::valueOf(sal_Int32(sal_Int32( nTop ); } break; @@ -251,9 +251,9 @@ void RtfSdrExport::Commit( EscherPropertyContainer rProps, const Rectangle rRe rProps.GetOpt( ESCHER_Prop_geoRight,
Re: Build LO for Android on Mac OS 10.8
There are several undefined reference errors according to vcl:PDEFWriter and PDFWriterImpl during tail_build. Should be fixed since yesterday evening, git pull -r and try again. --tml Thanks, tml and all of you! It builds successfully. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: chart2/source
chart2/source/controller/dialogs/tp_Scale.cxx | 53 +++---
1 file changed, 23 insertions(+), 30 deletions(-)
New commits:
commit 84a219020ca37a28799972cc60d9286c82ca7511
Author: Joseph Brown 1st...@gmail.com
Date: Mon Aug 13 23:23:04 2012 -0400
fdo#51695 Check for Textformat
Numbers shouldn't be in NUMBERFORMAT_TEXT, but it can happen. When it
does, IsNumberFormat call fails even when a number is entered.
Also reordered other check logic and removed unused code.
1st...@gmail.com -- Joseph Brown
Change-Id: Icabd8b33b634c324302a970e137f8d74a2c20caf
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx
b/chart2/source/controller/dialogs/tp_Scale.cxx
index 5604785..d53a6cb 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -559,14 +559,13 @@ int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
bool bDateAxis = chart2::AxisType::DATE == m_nAxisType;
-sal_uInt32 nIndex = pNumFormatter-GetStandardIndex(LANGUAGE_SYSTEM);
-const SfxPoolItem *pPoolItem = NULL;
-if( GetItemSet().GetItemState( SID_ATTR_NUMBERFORMAT_VALUE, sal_True,
pPoolItem ) == SFX_ITEM_SET )
-nIndex = static_cast sal_uInt32 ( static_cast const SfxInt32Item*
(pPoolItem)-GetValue());
-else
-{
-OSL_FAIL( Using Standard Language );
-}
+sal_uInt32 nMinMaxOriginFmt = aFmtFldMax.GetFormatKey();
+if ((pNumFormatter-GetType(nMinMaxOriginFmt) ~ NUMBERFORMAT_DEFINED) ==
NUMBERFORMAT_TEXT)
+nMinMaxOriginFmt = 0;
+// numberformat_text cause numbers to fail being numbers... Shouldn't
happen, but can.
+sal_uInt32 nStepFmt = aFmtFldStepMain.GetFormatKey();
+if ((pNumFormatter-GetType(nStepFmt) ~NUMBERFORMAT_DEFINED) ==
NUMBERFORMAT_TEXT)
+nStepFmt = 0;
Control* pControl = NULL;
sal_uInt16 nErrStrId = 0;
@@ -593,42 +592,30 @@ int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
pControl = aFmtFldMin;
nErrStrId = STR_BAD_LOGARITHM;
}
-else if (!aCbxAutoMax.IsChecked() !aCbxAutoMin.IsChecked()
- fMin = fMax)
-{
-pControl = aFmtFldMin;
-nErrStrId = STR_MIN_GREATER_MAX;
-}
-else if (!aCbxAutoStepMain.IsChecked() fStepMain = 0)
-{
-pControl = aFmtFldStepMain;
-nErrStrId = STR_STEP_GT_ZERO;
-}
// check for entries that cannot be parsed for the current number format
else if ( aFmtFldMin.IsModified()
- !aCbxAutoMin.IsChecked()
- !pNumFormatter-IsNumberFormat(aFmtFldMin.GetText(), nIndex,
fDummy))
+ !aCbxAutoMin.IsChecked()
+ !pNumFormatter-IsNumberFormat( aFmtFldMin.GetText(),
nMinMaxOriginFmt, fDummy))
{
pControl = aFmtFldMin;
nErrStrId = STR_INVALID_NUMBER;
}
-else if (aFmtFldMax.IsModified() !aCbxAutoMax.IsChecked()
- !pNumFormatter-IsNumberFormat(aFmtFldMax.GetText(),
-nIndex, fDummy))
+else if ( aFmtFldMax.IsModified()
+ !aCbxAutoMax.IsChecked()
+ !pNumFormatter-IsNumberFormat( aFmtFldMax.GetText(),
nMinMaxOriginFmt, fDummy))
{
pControl = aFmtFldMax;
nErrStrId = STR_INVALID_NUMBER;
}
-else if ( !bDateAxis aFmtFldStepMain.IsModified()
!aCbxAutoStepMain.IsChecked()
- !pNumFormatter-IsNumberFormat(aFmtFldStepMain.GetText(),
-nIndex, fDummy))
+else if ( !bDateAxis aFmtFldStepMain.IsModified()
+ !aCbxAutoStepMain.IsChecked()
+ !pNumFormatter-IsNumberFormat( aFmtFldStepMain.GetText(),
nStepFmt, fDummy))
{
pControl = aFmtFldStepMain;
-nErrStrId = STR_STEP_GT_ZERO;
+nErrStrId = STR_INVALID_NUMBER;
}
else if (aFmtFldOrigin.IsModified() !aCbxAutoOrigin.IsChecked()
- !pNumFormatter-IsNumberFormat(aFmtFldOrigin.GetText(),
-nIndex, fDummy))
+ !pNumFormatter-IsNumberFormat( aFmtFldOrigin.GetText(),
nMinMaxOriginFmt, fDummy))
{
pControl = aFmtFldOrigin;
nErrStrId = STR_INVALID_NUMBER;
@@ -638,6 +625,12 @@ int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
pControl = aFmtFldStepMain;
nErrStrId = STR_STEP_GT_ZERO;
}
+else if (!aCbxAutoMax.IsChecked() !aCbxAutoMin.IsChecked()
+ fMin = fMax)
+{
+pControl = aFmtFldMin;
+nErrStrId = STR_MIN_GREATER_MAX;
+}
else if( bDateAxis )
{
if( !aCbxAutoStepMain.IsChecked() !aCbxAutoStepHelp.IsChecked() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Fwd: LineEnding issues, .md .docx
I just crossposted here to check about this, it's not a personal issue, just something that I thought was asking for sharing with Libreoffice-devs. I let it to the pandoc-list/John MacFarlane on how to handle this further (either adapt pandoc to work around and/or filing a bug and/or patching Libreoffice). 2012/8/14 Michael Meeks michael.me...@suse.com: On Tue, 2012-08-14 at 15:28 +0200, Joop Kiefte wrote: FYI, just interested if there is a known issue here and/or compliance errors you can help pandoc with... Looks like yet-another interoperability bug fix opportunity. The trick is to file a bug - this is not the right place for promoting your individual issue. Of course, if you want a timely fix - it's by far better to buy support from one of the many companies around help fund the development of the project :-) Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: image rendering regression ?
On Tue, 2012-08-14 at 13:14 +0200, Tomaž Vajngerl wrote: I know about this problem and I am working on it. There seems to be a problem with rendering of transparent images in grfmgr2.cxx. Oh great ! :-) thanks for digging into that - just trying to raise master regressions here quickly. Good stuff, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7910c47221d07e836d62b7d816e1afe19859b601
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Aug 14 16:50:16 2012 +0200
Fix fdo#47495 backport
On master, the fix was fine, but on -3-6 this broke the fdo#47036 unit
test, fix this.
Change-Id: I02449a41801646c7eb2408e60f9051e1269d6693
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index aa58eaa..c814b91 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3411,8 +3411,7 @@ int RTFDocumentImpl::popState()
bFaltEnd = true;
}
else if (m_aStates.top().nDestinationState == DESTINATION_FLYMAINCONTENT
-|| m_aStates.top().nDestinationState == DESTINATION_SHPPICT
-|| aState.nDestinationState == DESTINATION_SHAPE)
+|| m_aStates.top().nDestinationState == DESTINATION_SHPPICT)
bPopFrame = true;
else if (m_aStates.top().nDestinationState == DESTINATION_DRAWINGOBJECT
m_aStates.top().aDrawingObject.xShape.is())
{
@@ -3439,6 +3438,7 @@ int RTFDocumentImpl::popState()
parBreak();
// Save this state for later use, so we only reset frame status only
for the first shape inside a frame.
aState = m_aStates.top();
+bPopFrame = true;
m_bNeedPap = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - drawinglayer/inc drawinglayer/source
drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx |2
drawinglayer/source/primitive2d/baseprimitive2d.cxx | 31 +-
2 files changed, 18 insertions(+), 15 deletions(-)
New commits:
commit 234738874f29ed23cd2aafb470511b5acf411e3c
Author: Lennard wassert...@nefkom.net
Date: Sat Aug 11 20:29:24 2012 +0200
Fixed Bug [35079]
Drawing: Fixed Custom Shape Frame-Selection Bounding box bug
Change-Id: Ia14feba446358cb195922477e0aa9576e9be2ae6
Signed-off-by: Lennard wassert...@nefkom.net
diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index 54b23ed..df66275 100644
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
@@ -27,6 +27,7 @@
/
#include drawinglayer/primitive2d/baseprimitive2d.hxx
+#include drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
#include drawinglayer/geometry/viewinformation2d.hxx
#include basegfx/tools/canvastools.hxx
@@ -121,25 +122,27 @@ namespace drawinglayer
basegfx::B2DRange getB2DRangeFromPrimitive2DReference(const
Primitive2DReference rCandidate, const geometry::ViewInformation2D
aViewInformation)
{
basegfx::B2DRange aRetval;
-
if(rCandidate.is())
{
-// try to get C++ implementation base
-const BasePrimitive2D* pCandidate(dynamic_cast
BasePrimitive2D* (rCandidate.get()));
-
-if(pCandidate)
-{
-// use it if possible
-aRetval.expand(pCandidate-getB2DRange(aViewInformation));
-}
-else
+//Ignores hidden primitives that may be malpositioned
+if ((dynamic_cast
BasePrimitive2D*(rCandidate.get()))-getPrimitive2DID() !=
PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D)
{
-// use UNO API call instead
-const uno::Sequence beans::PropertyValue
rViewParameters(aViewInformation.getViewInformationSequence());
-
aRetval.expand(basegfx::unotools::b2DRectangleFromRealRectangle2D(rCandidate-getRange(rViewParameters)));
+// try to get C++ implementation base
+const BasePrimitive2D* pCandidate(dynamic_cast
BasePrimitive2D* (rCandidate.get()));
+
+if(pCandidate)
+{
+// use it if possible
+
aRetval.expand(pCandidate-getB2DRange(aViewInformation));
+}
+else
+{
+// use UNO API call instead
+const uno::Sequence beans::PropertyValue
rViewParameters(aViewInformation.getViewInformationSequence());
+
aRetval.expand(basegfx::unotools::b2DRectangleFromRealRectangle2D(rCandidate-getRange(rViewParameters)));
+}
}
}
-
return aRetval;
}
commit 5321134c73dca4b7e7a191758f4691b71e49dcc7
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Aug 14 16:56:28 2012 +0200
drawinglayer: fixed file name in a comment
Change-Id: Ia27b38a2eb027a987990d55cbe8b9951b7d384f7
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx
b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx
index 5b7c32f..ecab8e9 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx
@@ -168,7 +168,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const
geometry::ViewInformation2D rViewInformation) const;
/** provide unique ID for fast identifying of known primitive
implementations in renderers. These use
-the the defines from primitivetypes2d.hxx to define unique IDs.
+the the defines from drawinglayer_primitivetypes2d.hxx to
define unique IDs.
This method is normally defined using DeclPrimitrive2DIDBlock()
*/
virtual sal_uInt32 getPrimitive2DID() const = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6-1' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 558f5af9feec7825f4edf5f7e4e6f7094fc1c094
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Aug 14 16:50:16 2012 +0200
Fix fdo#47495 backport
On master, the fix was fine, but on -3-6 this broke the fdo#47036 unit
test, fix this.
Change-Id: I02449a41801646c7eb2408e60f9051e1269d6693
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index aa58eaa..c814b91 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3411,8 +3411,7 @@ int RTFDocumentImpl::popState()
bFaltEnd = true;
}
else if (m_aStates.top().nDestinationState == DESTINATION_FLYMAINCONTENT
-|| m_aStates.top().nDestinationState == DESTINATION_SHPPICT
-|| aState.nDestinationState == DESTINATION_SHAPE)
+|| m_aStates.top().nDestinationState == DESTINATION_SHPPICT)
bPopFrame = true;
else if (m_aStates.top().nDestinationState == DESTINATION_DRAWINGOBJECT
m_aStates.top().aDrawingObject.xShape.is())
{
@@ -3439,6 +3438,7 @@ int RTFDocumentImpl::popState()
parBreak();
// Save this state for later use, so we only reset frame status only
for the first shape inside a frame.
aState = m_aStates.top();
+bPopFrame = true;
m_bNeedPap = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] fdo#35079: EDITING: Drawing element completely in mouse selection frame not selected
Hi Lennard, Many thanks for your patch, it works like a charm. I only transformed the magical number 61 into its corresponding ID in drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx I just pushed it to master branch. http://cgit.freedesktop.org/libreoffice/core/commit/?id=234738874f29ed23cd2aafb470511b5acf411e3c But BTW, I forgot to ask you whether you are willing to submit your changes under the MPL/LGPLv3+ dual license. -- Cedric On Sat, 2012-08-11 at 20:51 +0200, Wasserthal wrote: I have found a solution for the Bug that 1. increased the size of the bounding box for frame selection 2. increased the size of the bounding box for exporting the selection to a jpeg. It appeared on rotated, custom shapes. https://bugs.freedesktop.org/show_bug.cgi?id=35079 This patch keeps the hidden Shape elements from being included in the bounding box. greetings - Lennard Wasserthal ___ 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
[PUSHED] fileaccess: use anonymous namespace
On Sun, 2012-08-12 at 23:52 +, Gerrit wrote: Matúš Kukan has uploaded a new change for review. Change subject: fileaccess: use anonymous namespace found pushed. Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 53d64c71d3a4fcc6b238e946fd6883b8b4593bca
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Aug 14 16:50:16 2012 +0200
Fix fdo#47495 backport
On master, the fix was fine, but on -3-6 this broke the fdo#47036 unit
test, fix this.
Change-Id: I02449a41801646c7eb2408e60f9051e1269d6693
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 3409224..79991eb 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3439,8 +3439,7 @@ int RTFDocumentImpl::popState()
bFaltEnd = true;
}
else if (m_aStates.top().nDestinationState == DESTINATION_FLYMAINCONTENT
-|| m_aStates.top().nDestinationState == DESTINATION_SHPPICT
-|| aState.nDestinationState == DESTINATION_SHAPE)
+|| m_aStates.top().nDestinationState == DESTINATION_SHPPICT)
bPopFrame = true;
else if (m_aStates.top().nDestinationState == DESTINATION_DRAWINGOBJECT
m_aStates.top().aDrawingObject.xShape.is())
{
@@ -3464,6 +3463,7 @@ int RTFDocumentImpl::popState()
parBreak();
// Save this state for later use, so we only reset frame status only
for the first shape inside a frame.
aState = m_aStates.top();
+bPopFrame = true;
m_bNeedPap = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] merge these libraries only for android
On Sun, 2012-08-12 at 23:52 +, Gerrit wrote: Matúš Kukan has uploaded a new change for review. Change subject: merge these libraries only for android Found pushed, Michael. PS. It would be -really- nice if gerrit correctly sent out the [PUSHED] mail when such a commit is merged to avoid duplicated work and/or loosing mailing-list patches. PPS. Come on Matus - you're an expert you don't need review for these simple patches :-) -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] formatted a missed comment into doxygen style
On Sun, 2012-08-12 at 16:58 +, Gerrit wrote: Philipp Riemer has uploaded a new change for review. Change subject: formatted a missed comment into doxygen style found pushed, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] removed commented out calls
On Sun, 2012-08-12 at 16:58 +, Gerrit wrote: Philipp Riemer has uploaded a new change for review. Change subject: removed commented out calls found pushed, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] align code pieces to surrounding lines/style
On Sun, 2012-08-12 at 16:58 +, Gerrit wrote: Philipp Riemer has uploaded a new change for review. Change subject: align code pieces to surrounding lines/style found pushed, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] change indentation
On Sun, 2012-08-12 at 16:58 +, Gerrit wrote: Philipp Riemer has uploaded a new change for review. Change subject: change indentation Found pushed, Michael. PS. do we really need to send this lot via gerrit ? and hence the mailing list :-) -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sd/source
sd/source/ui/dlg/RemoteDialogClientBox.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 2380db59653f5f1cb7e8f6d43727be5ca61f77cf Author: Tor Lillqvist t...@iki.fi Date: Tue Aug 14 18:09:26 2012 +0300 WaE: unused variable Change-Id: I828e6ffd3aafa5182d98535c87bdd8fe448fb10f diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index c734a2e..0c59799 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -366,7 +366,6 @@ void ClientBox::DrawRow( const Rectangle rRect, const TClientBoxEntry pEntry ) m_aPinBox.SetSizePixel( aSize ); const Rectangle aRect( GetEntryRect( m_nActive ) ); Size aBtnSize( m_aPinBox.GetSizePixel() ); -Size aTextSize( m_aPinDescription.GetSizePixel() ); Point aBtnPos( aRect.Left(), aRect.Bottom() - TOP_OFFSET - aBtnSize.Height() ); // m_aPinDescription.SetPosPixel( aBtnPos ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
