[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/control.pm |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 95d6675fd89f44bf499ec4fc5ed48f547cba80fa
Author: Andras Timar ati...@suse.com
Date: Thu Jul 19 08:03:08 2012 +0200
skip empty lines in msi-encodinglist.txt
Change-Id: I1dbcf68c9581e5b66df0f4485d73ca19c5168dd9
diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
index 43694b7..efc6331 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -417,6 +417,8 @@ sub read_encodinglist
if ( $line =~ /^\s*\#/ ) { next; } # this is a comment line
+if ( $line =~ /^$/ ) { next; } # this is an empty line
+
if ( $line =~ /^(.*?)(\#.*)$/ ) { $line = $1; } # removing comments
after #
if ( $line =~ /^\s*([\w-]+)\s*(\d+)\s*(\d+)\s*$/ )
@@ -430,7 +432,7 @@ sub read_encodinglist
}
else
{
-installer::exiter::exit_program(ERROR: Wrong syntax in Windows
encoding list $installer::globals::encodinglistname : en-US 1252 1033 !,
read_encodinglist);
+installer::exiter::exit_program(ERROR: Wrong syntax in Windows
encoding list $installer::globals::encodinglistname in line $i.,
read_encodinglist);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Patching our gerrit instance [was Re: [ANN] Please use Gerrit from now on for Patch Review]
On Wed, Jul 18, 2012 at 10:10:38PM +0200, David Ostrovsky wrote: https://gerrit.libreoffice.org/#/c/328/ The gitweb link on that page says 404 no such project. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svtools/source
svtools/source/contnr/imivctl2.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c68afc22fe8b1f90033cbe7d328a74daeae18e22 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 19 09:21:51 2012 +0200 Work around Mac GCC error Change-Id: I7fcd84e923c0971f420cfd3f298e5a1d0b111d1a diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx index de19b97..5582403 100644 --- a/svtools/source/contnr/imivctl2.cxx +++ b/svtools/source/contnr/imivctl2.cxx @@ -128,7 +128,7 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::SearchCol(sal_uInt16 nCol, sal_uInt16 nT IconChoiceMap::iterator mapIt = pColumns-find( nCol ); if ( mapIt == pColumns-end() ) return 0; -SvxIconChoiceCtrlEntryPtrVec rList = mapIt-second; +SvxIconChoiceCtrlEntryPtrVec const rList = mapIt-second; const sal_uInt16 nCount = rList.size(); if( !nCount ) return 0; @@ -203,7 +203,7 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::SearchRow(sal_uInt16 nRow, sal_uInt16 nL IconChoiceMap::iterator mapIt = pRows-find( nRow ); if ( mapIt == pRows-end() ) return 0; -SvxIconChoiceCtrlEntryPtrVec rList = mapIt-second; +SvxIconChoiceCtrlEntryPtrVec const rList = mapIt-second; const sal_uInt16 nCount = rList.size(); if( !nCount ) return 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: git branch audit ...
Michael Meeks wrote: origin/feature/opengl-canvas A somewhat working version of having canvas render entirely via opengl (and not just software-render to texture then use OpenGL as a blitter on steroids). Most wanted currently: freetype text support. origin/feature/coretext origin/feature/submodules Norbert's playground it seems. Cheers, -- Thorsten pgp05Tx4wdJOL.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: sorted_vector, constness, pointers, and structs
On 07/18/2012 08:09 PM, Lubos Lunak wrote: What you want is broken. It is definitely broken from the theoretical point of view, since modifying the items may change the sort order. While one can argue that it is broken, in practice I would not bother trying too hard to make the code safe against shooting-in-one's-foot at the expense of simplicity. Whether or not making non-const element access available for sorted_vectorT,C is safe depends on both T (element type) and C (comparison function), and e.g. adding a specialization so that sorted_vectorT* only gives access to T const* can be OK or overly restrictive. Quoting an answer I inadvertently only sent to Noel directly: Yeah, the 'only give const element access to avoid element modifications that invalidate container invariants' strategy is apparently not perfect. If you do need non-const access, there's no way around it than to offer it---and being careful not to accidentally invalidate the container's sortedness. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: sorted_vector, constness, pointers, and structs
On Wednesday 18 of July 2012, Noel Grandin wrote: On Wed, Jul 18, 2012 at 8:09 PM, Lubos Lunak l.lu...@suse.cz wrote: You didn't read further than that part above, did you? What you want is broken. It is definitely broken from the theoretical point of view, since modifying the items may change the sort order. Aargh. Instead of casting aspersions on my replies, how about you actually read the o3tl::sorted_vector.hxx code I have. Speaking of which, it would be very nice if new API was actually documented, such as the not immediately obvious return value of insert(). And I'll leave wondering about the performance of random inserts in a vector to somebody else. and look at some of the use-cases in the LO codebase. I won't. It doesn't really change anything about what I've said, and moreover if you wanted me to do that, you could have pointed me to a specific place with such a problem, instead of me having to look for it, if it's there already at all. What is broken is attempting to provide a level of protection that is not useful in practice, mostly get bypassed, and does not play nice with the C++ type-system. Look, either you do provide accessors that allow direct modifying of the elements, or you don't. If you do, I don't see your motivation to start this thread, since even though you started it by saying that David and Stephan recommended it, you try to dismiss that the entire time, so what's the point? What is broken is your entire problem, you apparently just don't see it. Now, however, if you look at my original email, I make some suggestions that will actually improve things. For example, we can split the problem into 2 sub-use-cases (a) sorted_vector_of_ptr_to_val (b) sorted_vector_of_val Then for each of these cases, we can apply some degree (but not a lot) of const-protection I've told you that the ptr vs non-ptr distinction is most probably not needed at all. Maybe you should start with reminding to read things with you? -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: git branch audit ...
On Wed, Jul 18, 2012 at 05:51:44PM +0100, Michael Meeks wrote: origin/feature/masterpages integrated in -3-6 and master by Petr origin/feature/tail_build seems to be a integrated/obsolete branch by dtardon origin/feature/unitymenus upcoming feature branch, alive Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo52066.rtf | 21 +
sw/qa/extras/rtfimport/rtfimport.cxx | 17 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 +++-
writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 +-
writerfilter/source/rtftok/rtfsdrimport.cxx| 10 ++
5 files changed, 48 insertions(+), 6 deletions(-)
New commits:
commit 173d769a9d32af83ea75dcf4d23b7663a5f19cb9
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Jul 18 22:47:03 2012 +0200
fdo#52066 fix RTF import of rectangle shape without text in it
We used to always add a paragraph on shapes, which breaks import of
abused rectangle shapes with minimal height, used as lines.
Change-Id: Ice240bad68bc030e7889c46f72c45646307f17e5
diff --git a/sw/qa/extras/rtfimport/data/fdo52066.rtf
b/sw/qa/extras/rtfimport/data/fdo52066.rtf
new file mode 100644
index 000..d293838
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo52066.rtf
@@ -0,0 +1,21 @@
+{\rtf1
+{\shp
+{\*\shpinst\shpleft3381\shptop249\shpright11461\shpbottom268
+{\sp
+{\sn shapeType}
+{\sv 1}
+}
+{\sp
+{\sn fillColor}
+{\sv 0}
+}
+{\sp
+{\sn fillBackColor}
+{\sv 0}
+}
+}
+{\shprslt
+}
+}
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index cb5a584..4aa2904 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -97,6 +97,7 @@ public:
void testFdo50665();
void testFdo49659();
void testFdo46966();
+void testFdo52066();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -137,6 +138,7 @@ public:
CPPUNIT_TEST(testFdo50665);
CPPUNIT_TEST(testFdo49659);
CPPUNIT_TEST(testFdo46966);
+CPPUNIT_TEST(testFdo52066);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -811,6 +813,21 @@ void Test::testFdo46966()
CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(720)), nValue);
}
+void Test::testFdo52066()
+{
+/*
+ * The problem was that the height of the shape was too big.
+ *
+ * xray ThisComponent.DrawPage(0).Size.Height
+ */
+load(fdo52066.rtf);
+
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+uno::Referencedrawing::XShape xShape(xDraws-getByIndex(0),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(19)),
xShape-getSize().Height);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index c7b719e..37da9c0 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3644,9 +3644,11 @@ void RTFDocumentImpl::setDestinationText(OUString
rString)
m_aStates.top().aDestinationText.append(rString);
}
-void RTFDocumentImpl::replayShapetext()
+bool RTFDocumentImpl::replayShapetext()
{
+bool bRet = !m_aShapetextBuffer.empty();
replayBuffer(m_aShapetextBuffer);
+return bRet;
}
bool RTFDocumentImpl::getSkipUnknown()
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 342..14ded59 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -370,7 +370,7 @@ namespace writerfilter {
/// Resolve a picture: If not inline, then anchored.
int resolvePict(bool bInline);
void runBreak();
-void replayShapetext();
+bool replayShapetext();
bool getSkipUnknown();
void setSkipUnknown(bool bSkipUnknown);
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 9ba957e..ae7b144 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -333,10 +333,12 @@ void RTFSdrImport::resolve(RTFShape rShape)
// Send it to dmapper
m_rImport.Mapper().startShape(xShape);
m_rImport.Mapper().startParagraphGroup();
-m_rImport.replayShapetext();
-m_rImport.Mapper().startCharacterGroup();
-m_rImport.runBreak();
-m_rImport.Mapper().endCharacterGroup();
+if (m_rImport.replayShapetext())
+{
+m_rImport.Mapper().startCharacterGroup();
+m_rImport.runBreak();
+m_rImport.Mapper().endCharacterGroup();
+}
m_rImport.Mapper().endParagraphGroup();
m_rImport.Mapper().endShape();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: sorted_vector, constness, pointers, and structs
On Thursday 19 of July 2012, Stephan Bergmann wrote: On 07/18/2012 08:09 PM, Lubos Lunak wrote: What you want is broken. It is definitely broken from the theoretical point of view, since modifying the items may change the sort order. While one can argue that it is broken, in practice I would not bother trying too hard to make the code safe against shooting-in-one's-foot at the expense of simplicity. Whether or not making non-const element access available for sorted_vectorT,C is safe depends on both T (element type) and C (comparison function), and e.g. adding a specialization so that sorted_vectorT* only gives access to T const* can be OK or overly restrictive. Quoting an answer I inadvertently only sent to Noel directly: Yeah, the 'only give const element access to avoid element modifications that invalidate container invariants' strategy is apparently not perfect. If you do need non-const access, there's no way around it than to offer it---and being careful not to accidentally invalidate the container's sortedness. Famous last words ... who's ever seen developers being always careful, huh :) ? If it's really impractical to have anything else than direct access that might possibly break the whole container, then the container really could use a checking code that would assert the correctness. I think it'd be enough to do it in insert() and erase(), and given it's a vector, it wouldn't matter much for performance even when enabled in debug builds. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: drawinglayer/source
drawinglayer/source/dumper/EnhancedShapeDumper.cxx |4 ++--
drawinglayer/source/dumper/XShapeDumper.cxx| 10 +-
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 390a56b5224fa43fd98dfbf09f5710bd40608bf3
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jul 19 10:23:25 2012 +0200
Work around bogus Mac GCC uninitialized warnings
Change-Id: I174b34835cc955c234a06618a48f61fc700e4400
diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
index 4d7c056..a0ad98a 100644
--- a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
+++ b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
@@ -1026,7 +1026,7 @@ void
EnhancedShapeDumper::dumpEnhancedCustomShapeTextPathService(uno::Reference
{
{
uno::Any anotherAny = xPropSet-getPropertyValue(TextPath);
-sal_Bool bTextPath;
+sal_Bool bTextPath = sal_Bool();
if(anotherAny = bTextPath)
dumpTextPathAsAttribute(bTextPath);
}
@@ -1038,7 +1038,7 @@ void
EnhancedShapeDumper::dumpEnhancedCustomShapeTextPathService(uno::Reference
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(ScaleX);
-sal_Bool bScaleX;
+sal_Bool bScaleX = sal_Bool();
if(anotherAny = bScaleX)
dumpScaleXAsAttribute(bScaleX);
}
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx
b/drawinglayer/source/dumper/XShapeDumper.cxx
index eca83e0..ee588be 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++ b/drawinglayer/source/dumper/XShapeDumper.cxx
@@ -1530,31 +1530,31 @@ void dumpShadowPropertiesService(uno::Reference
beans::XPropertySet xPropSet,
{
{
uno::Any anotherAny = xPropSet-getPropertyValue(Shadow);
-sal_Bool bShadow;
+sal_Bool bShadow = sal_Bool();
if(anotherAny = bShadow)
dumpShadowAsAttribute(bShadow, xmlWriter);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(ShadowColor);
-sal_Int32 aShadowColor;
+sal_Int32 aShadowColor = sal_Int32();
if(anotherAny = aShadowColor)
dumpShadowColorAsAttribute(aShadowColor, xmlWriter);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(ShadowTransparence);
-sal_Int32 aShadowTransparence;
+sal_Int32 aShadowTransparence = sal_Int32();
if(anotherAny = aShadowTransparence)
dumpShadowTransparenceAsAttribute(aShadowTransparence, xmlWriter);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(ShadowXDistance);
-sal_Int32 aShadowXDistance;
+sal_Int32 aShadowXDistance = sal_Int32();
if(anotherAny = aShadowXDistance)
dumpShadowXDistanceAsAttribute(aShadowXDistance, xmlWriter);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(ShadowYDistance);
-sal_Int32 aShadowYDistance;
+sal_Int32 aShadowYDistance = sal_Int32();
if(anotherAny = aShadowYDistance)
dumpShadowYDistanceAsAttribute(aShadowYDistance, xmlWriter);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: git branch audit ...
On Thu, Jul 19, 2012 at 10:08:30AM +0200, Bjoern Michaelsen wrote: On Wed, Jul 18, 2012 at 05:51:44PM +0100, Michael Meeks wrote: origin/feature/tail_build seems to be a integrated/obsolete branch by dtardon Yes, it has been integrated. Sorry, I have forgotten about than one entirely. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/crossmsi' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-3-6]: fdo#52066 fix RTF import of rectangle shape without text in ...
From Miklos Vajna vmik...@suse.cz: Miklos Vajna has uploaded a new change for review. Change subject: fdo#52066 fix RTF import of rectangle shape without text in it .. fdo#52066 fix RTF import of rectangle shape without text in it We used to always add a paragraph on shapes, which breaks import of abused rectangle shapes with minimal height, used as lines. Change-Id: Ice240bad68bc030e7889c46f72c45646307f17e5 --- M writerfilter/source/rtftok/rtfdocumentimpl.cxx M writerfilter/source/rtftok/rtfdocumentimpl.hxx M writerfilter/source/rtftok/rtfsdrimport.cxx 3 files changed, 10 insertions(+), 6 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/329/1 -- To view, visit https://gerrit.libreoffice.org/329 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice240bad68bc030e7889c46f72c45646307f17e5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: git branch audit ...
Hi, On 2012-07-18 at 22:01 +0200, Fridrich Strba wrote: I cherry-picked all from feature/crossmsi today, so the branch can happily die. The same happy fate for feature/mspub which is merged. Picking this for the replay, but applies to everybody who knows of a obsolete branch. Just do git push origin :feature/mspub [for example - I've already killed feature/crossmsi to check I am not lying], and it will vanish from the server. Just note that git might throw some funny warnings at you, like: - 8 - error: unable to find fatal: git-cat-file : bad file fatal: ambiguous argument '': unknown revision or path not in the working tree. Use '--' to separate paths from revisions fatal: bad object fatal: bad object To ssh://ke...@git.freedesktop.org/git/libreoffice/core - [deleted] feature/crossmsi - 8 - But the last line is the important one here. Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: git branch audit ...
On 18-07-2012 19:51, Michael Meeks wrote: origin/feature/pdf-signing My GSoC branch is already merged into master. Actually, some Werror fixes were applied to the master then, so this branch is ahead of master by 2 or 3 commits and is safe to remove if mentors (kendy, sberg, thorsten) are OK. -- Gökçen Eraslan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: drawinglayer/source
drawinglayer/source/dumper/EnhancedShapeDumper.cxx | 12 +++
drawinglayer/source/dumper/XShapeDumper.cxx| 34 ++---
2 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 9ae07fcc7791ca9324f9e60b2b66d1023a69d9b4
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jul 19 10:46:49 2012 +0200
Work around bogus Mac GCC uninitialized warnings
Change-Id: If16ce75845383cf697a2f1e4cef438a8bc43c125
diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
index a0ad98a..d24fea1 100644
--- a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
+++ b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
@@ -831,13 +831,13 @@ void
EnhancedShapeDumper::dumpEnhancedCustomShapePathService(uno::Reference bea
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(StretchX);
-sal_Int32 aStretchX;
+sal_Int32 aStretchX = sal_Int32();
if(anotherAny = aStretchX)
dumpStretchXAsAttribute(aStretchX);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(StretchY);
-sal_Int32 aStretchY;
+sal_Int32 aStretchY = sal_Int32();
if(anotherAny = aStretchY)
dumpStretchYAsAttribute(aStretchY);
}
@@ -861,25 +861,25 @@ void
EnhancedShapeDumper::dumpEnhancedCustomShapePathService(uno::Reference bea
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(GluePointType);
-sal_Int32 aGluePointType;
+sal_Int32 aGluePointType = sal_Int32();
if(anotherAny = aGluePointType)
dumpGluePointTypeAsAttribute(aGluePointType);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(ExtrusionAllowed);
-sal_Bool bExtrusionAllowed;
+sal_Bool bExtrusionAllowed = sal_Bool();
if(anotherAny = bExtrusionAllowed)
dumpExtrusionAllowedAsAttribute(bExtrusionAllowed);
}
{
uno::Any anotherAny =
xPropSet-getPropertyValue(ConcentricGradientFillAllowed);
-sal_Bool bConcentricGradientFillAllowed;
+sal_Bool bConcentricGradientFillAllowed = sal_Bool();
if(anotherAny = bConcentricGradientFillAllowed)
dumpConcentricGradientFillAllowedAsAttribute(bConcentricGradientFillAllowed);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(TextPathAllowed);
-sal_Bool bTextPathAllowed;
+sal_Bool bTextPathAllowed = sal_Bool();
if(anotherAny = bTextPathAllowed)
dumpTextPathAllowedAsAttribute(bTextPathAllowed);
}
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx
b/drawinglayer/source/dumper/XShapeDumper.cxx
index ee588be..37bf0f4 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++ b/drawinglayer/source/dumper/XShapeDumper.cxx
@@ -1146,25 +1146,25 @@ void dumpTextPropertiesService(uno::Reference
beans::XPropertySet xPropSet, x
if(xInfo-hasPropertyByName(IsNumbering))
{
uno::Any anotherAny = xPropSet-getPropertyValue(IsNumbering);
-sal_Bool bIsNumbering;
+sal_Bool bIsNumbering = sal_Bool();
if(anotherAny = bIsNumbering)
dumpIsNumberingAsAttribute(bIsNumbering, xmlWriter);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(TextAutoGrowHeight);
-sal_Bool bTextAutoGrowHeight;
+sal_Bool bTextAutoGrowHeight = sal_Bool();
if(anotherAny = bTextAutoGrowHeight)
dumpTextAutoGrowHeightAsAttribute(bTextAutoGrowHeight, xmlWriter);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(TextAutoGrowWidth);
-sal_Bool bTextAutoGrowWidth;
+sal_Bool bTextAutoGrowWidth = sal_Bool();
if(anotherAny = bTextAutoGrowWidth)
dumpTextAutoGrowWidthAsAttribute(bTextAutoGrowWidth, xmlWriter);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(TextContourFrame);
-sal_Bool bTextContourFrame;
+sal_Bool bTextContourFrame = sal_Bool();
if(anotherAny = bTextContourFrame)
dumpTextContourFrameAsAttribute(bTextContourFrame, xmlWriter);
}
@@ -1188,67 +1188,67 @@ void dumpTextPropertiesService(uno::Reference
beans::XPropertySet xPropSet, x
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(TextLeftDistance);
-sal_Int32 aTextLeftDistance;
+sal_Int32 aTextLeftDistance = sal_Int32();
if(anotherAny = aTextLeftDistance)
dumpTextLeftDistanceAsAttribute(aTextLeftDistance, xmlWriter);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(TextRightDistance);
-sal_Int32 aTextRightDistance;
+sal_Int32 aTextRightDistance = sal_Int32();
if(anotherAny = aTextRightDistance)
dumpTextRightDistanceAsAttribute(aTextRightDistance, xmlWriter);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(TextUpperDistance);
-
[ANN] LibreOffice 3.6.0 RC2 test builds available
Hi *, for the upcoming new version 3.6.0, the RC2 builds now start to be available on pre-releases. This build is slated to be second release candidate build on the way towards 3.6.0, please refer to our release plan timings here: http://wiki.documentfoundation.org/ReleasePlan#3.6_release Builds are now being uploaded to a public (but non-mirrored - so don't spread news too widely!) place, as soon as they're available. Grab them here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try report *critical* bugs not yet in bugzilla here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. NOTE: This build is in a release configuration and _will_ replace your existing LibreOffice install on Windows. The list of fixed bugs relative to 3.6.0 RC1 is here: http://dev-builds.libreoffice.org/pre-releases/src/bugfixes-libreoffice-3-6-0-release-3.6.0.2.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, Fridrich ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/gbuild_a11y' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_components' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_scp2' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_shell' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_sdext' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_testtools' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tail_build' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/pdf-signing' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: git branch audit ...
On 19-07-2012 11:44, Gökçen Eraslan wrote: On 18-07-2012 19:51, Michael Meeks wrote: origin/feature/pdf-signing My GSoC branch is already merged into master. Actually, some Werror fixes were applied to the master then, so this branch is ahead of master by 2 or 3 commits and is safe to remove if mentors (kendy, sberg, thorsten) are OK. Deleted. -- Gökçen Eraslan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: What is bibisect? And what is it doing in my office?
On 19/07/12 00:45, Norbert Thiebaud wrote: On Wed, Jul 18, 2012 at 12:09 PM, Robinson Tryon bishop.robin...@gmail.com wrote: Windows is a more...challenging creature. No kidding :-) But I'm not so much concerned about the git-foo part of the script but rather with what is put in bi-bisect. make dev-install does not work on all platform and you do not have a */opt/* to 'add' . hi Norbert, it looks like you're living under a rock :) on Windows with MSVC make dev-install has been working for several _days_ now on master (though it is quite slow), and you even have a */opt/* to add. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: drawinglayer/source
drawinglayer/source/dumper/EnhancedShapeDumper.cxx | 26 ++---
drawinglayer/source/dumper/XShapeDumper.cxx| 24 +--
2 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit c8e0a0ce4adaee2763d1a057a997fda058eaf6f2
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jul 19 11:04:10 2012 +0200
Work around bogus Mac GCC uninitialized warnings
Change-Id: I79731b0e8a991a96b87938749fa9898110fe2dde
diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
index d24fea1..6b32984 100644
--- a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
+++ b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
@@ -40,13 +40,13 @@ void
EnhancedShapeDumper::dumpEnhancedCustomShapeExtrusionService(uno::Reference
{
{
uno::Any anotherAny = xPropSet-getPropertyValue(Extrusion);
-sal_Bool bExtrusion;
+sal_Bool bExtrusion = sal_Bool();
if(anotherAny = bExtrusion)
dumpExtrusionAsAttribute(bExtrusion);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(Brightness);
-double aBrightness;
+double aBrightness = double();
if(anotherAny = aBrightness)
dumpBrightnessAsAttribute(aBrightness);
}
@@ -58,43 +58,43 @@ void
EnhancedShapeDumper::dumpEnhancedCustomShapeExtrusionService(uno::Reference
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(Diffusion);
-double aDiffusion;
+double aDiffusion = double();
if(anotherAny = aDiffusion)
dumpDiffusionAsAttribute(aDiffusion);
}
{
uno::Any anotherAny =
xPropSet-getPropertyValue(NumberOfLineSegments);
-sal_Int32 aNumberOfLineSegments;
+sal_Int32 aNumberOfLineSegments = sal_Int32();
if(anotherAny = aNumberOfLineSegments)
dumpNumberOfLineSegmentsAsAttribute(aNumberOfLineSegments);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(LightFace);
-sal_Bool bLightFace;
+sal_Bool bLightFace = sal_Bool();
if(anotherAny = bLightFace)
dumpLightFaceAsAttribute(bLightFace);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(FirstLightHarsh);
-sal_Bool bFirstLightHarsh;
+sal_Bool bFirstLightHarsh = sal_Bool();
if(anotherAny = bFirstLightHarsh)
dumpFirstLightHarshAsAttribute(bFirstLightHarsh);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(SecondLightHarsh);
-sal_Bool bSecondLightHarsh;
+sal_Bool bSecondLightHarsh = sal_Bool();
if(anotherAny = bSecondLightHarsh)
dumpSecondLightHarshAsAttribute(bSecondLightHarsh);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(FirstLightLevel);
-double aFirstLightLevel;
+double aFirstLightLevel = double();
if(anotherAny = aFirstLightLevel)
dumpFirstLightLevelAsAttribute(aFirstLightLevel);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(SecondLightLevel);
-double aSecondLightLevel;
+double aSecondLightLevel = double();
if(anotherAny = aSecondLightLevel)
dumpSecondLightLevelAsAttribute(aSecondLightLevel);
}
@@ -112,7 +112,7 @@ void
EnhancedShapeDumper::dumpEnhancedCustomShapeExtrusionService(uno::Reference
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(Metal);
-sal_Bool bMetal;
+sal_Bool bMetal = sal_Bool();
if(anotherAny = bMetal)
dumpMetalAsAttribute(bMetal);
}
@@ -136,7 +136,7 @@ void
EnhancedShapeDumper::dumpEnhancedCustomShapeExtrusionService(uno::Reference
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(Shininess);
-double aShininess;
+double aShininess = double();
if(anotherAny = aShininess)
dumpShininessAsAttribute(aShininess);
}
@@ -148,7 +148,7 @@ void
EnhancedShapeDumper::dumpEnhancedCustomShapeExtrusionService(uno::Reference
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(Specularity);
-double aSpecularity;
+double aSpecularity = double();
if(anotherAny = aSpecularity)
dumpSpecularityAsAttribute(aSpecularity);
}
@@ -172,7 +172,7 @@ void
EnhancedShapeDumper::dumpEnhancedCustomShapeExtrusionService(uno::Reference
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(ExtrusionColor);
-sal_Bool bExtrusionColor;
+sal_Bool bExtrusionColor = sal_Bool();
if(anotherAny = bExtrusionColor)
dumpExtrusionColorAsAttribute(bExtrusionColor);
}
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx
b/drawinglayer/source/dumper/XShapeDumper.cxx
index 37bf0f4..a81bc0b 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++
[Libreoffice-commits] .: Branch 'feature/remote' - sd/source
sd/source/ui/remotecontrol/Listener.cxx| 10 +++---
sd/source/ui/remotecontrol/Server.cxx |7 ---
sd/source/ui/remotecontrol/Transmitter.cxx |5 -
3 files changed, 15 insertions(+), 7 deletions(-)
New commits:
commit 55925e0944922a638d0b10615f520b7db0a50d68
Author: Andrzej J. R. Hunt andr...@ahunt.org
Date: Thu Jul 19 11:00:47 2012 +0200
Finally fixed the Transmitter bug.
Change-Id: Ia4c345b9ecb58a47219ceb0af14b66294ca3309e
diff --git a/sd/source/ui/remotecontrol/Listener.cxx
b/sd/source/ui/remotecontrol/Listener.cxx
index a21977e..7b607ab 100644
--- a/sd/source/ui/remotecontrol/Listener.cxx
+++ b/sd/source/ui/remotecontrol/Listener.cxx
@@ -23,9 +23,12 @@ using rtl::OStringBuffer;
Listener::Listener( sd::Transmitter *aTransmitter )
-: ::cppu::WeakComponentImplHelper1 XSlideShowListener( m_aMutex )
+: ::cppu::WeakComponentImplHelper1 XSlideShowListener ( m_aMutex ),
+ pTransmitter( NULL )
{
+fprintf( stderr, listener:: address of Transmitter1:%p\n, aTransmitter );
pTransmitter = aTransmitter;
+fprintf( stderr, listener:: address of Transmitter2:%p\n, pTransmitter );
}
Listener::~Listener()
@@ -37,7 +40,7 @@ void Listener::init( const css::uno::Reference
css::presentation::XSlideShowCon
if (aController.is() )
{
mController = css::uno::Reference
css::presentation::XSlideShowController ( aController );
-aController-addSlideShowListener(this);
+aController-addSlideShowListener( this );
fprintf( stderr, Registered listener.\n );
}
}
@@ -80,6 +83,7 @@ void SAL_CALL Listener::resumed (void)
void SAL_CALL Listener::slideEnded (sal_Bool bReverse)
throw (css::uno::RuntimeException)
{
+fprintf( stderr, listener:: address of Transmitter__:%p\n, pTransmitter
);
fprintf( stderr, slideEnded\n );
(void) bReverse;
sal_Int32 aSlide = mController-getCurrentSlideIndex();
@@ -125,7 +129,7 @@ void SAL_CALL Listener::disposing (void)
pTransmitter = NULL;
if ( mController.is() )
{
-mController-removeSlideShowListener(
static_castXSlideShowListener*(this) );
+mController-removeSlideShowListener( this );
}
}
diff --git a/sd/source/ui/remotecontrol/Server.cxx
b/sd/source/ui/remotecontrol/Server.cxx
index 8ed3b70..2906f6c 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -35,9 +35,11 @@ Server::~Server()
// Run as a thread
void Server::listenThread()
{
+fprintf( stderr, Server:: address of Transmitter before:%p\n,
pTransmitter );
pTransmitter = new Transmitter( mStreamSocket );
pTransmitter-launch();
Receiver aReceiver( pTransmitter );
+fprintf( stderr, Server:: address of Transmitter:%p\n, pTransmitter );
// aTransmitter.addMessage( Hello world\n\n, Transmitter::Priority::HIGH
);
try {
fprintf( stderr, Trying to add a Listener in listenThread\n );
@@ -75,14 +77,13 @@ void Server::listenThread()
aRet = mStreamSocket.recv( aBuffer[aRead], 100 );
if ( aRet == 0 )
{
-return; // closed
+break; // I.e. transmission finished.
}
aRead += aRet;
vectorchar::iterator aIt;
-while ( (aIt = find( aBuffer.begin() + aRead - aRet,
aBuffer.end(), '\n' ))
+while ( (aIt = find( aBuffer.begin(), aBuffer.end(), '\n' ))
!= aBuffer.end() )
{
-fprintf( stderr, we have string\n );
sal_uInt64 aLocation = aIt - aBuffer.begin();
aCommand.push_back( OString( (*aBuffer.begin()), aLocation )
);
diff --git a/sd/source/ui/remotecontrol/Transmitter.cxx
b/sd/source/ui/remotecontrol/Transmitter.cxx
index d7cfda0..efece0f 100644
--- a/sd/source/ui/remotecontrol/Transmitter.cxx
+++ b/sd/source/ui/remotecontrol/Transmitter.cxx
@@ -21,13 +21,15 @@ Transmitter::Transmitter( StreamSocket aSocket )
mLowPriority(),
mHighPriority()
{
+fprintf( stderr, Address of low queue in constructor:%p\n, mLowPriority
);
}
void Transmitter::execute()
{
fprintf( stderr, Waiting\n );
-while( mQueuesNotEmpty.wait() )
+while ( true )
{
+mQueuesNotEmpty.wait();
fprintf( stderr, Continuing after condition\n );
while ( true )
{
@@ -71,6 +73,7 @@ void Transmitter::addMessage( const OString aMessage, const
Priority aPriority
fprintf(stderr, Acquiring\n);
::osl::MutexGuard aQueueGuard( mQueueMutex );
fprintf(stderr, Acquired\n );
+fprintf( stderr, Address of low queue in addMessge:%p\n, mLowPriority );
switch ( aPriority )
{
case Priority::LOW:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cppcanvas/source xmloff/source
cppcanvas/source/inc/implrenderer.hxx|2 -
cppcanvas/source/mtfrenderer/emfplus.cxx | 54 ++-
xmloff/source/core/xmlexp.cxx|3 +
xmloff/source/draw/sdxmlexp.cxx |5 --
xmloff/source/draw/shapeexport4.cxx |5 ++
xmloff/source/draw/ximpcustomshape.cxx |7
6 files changed, 53 insertions(+), 23 deletions(-)
New commits:
commit d8720d4e390143279ccae8eed05decf54240e8fa
Author: Radek Doulik r...@novell.com
Date: Thu Jul 19 11:06:50 2012 +0200
odf: export arcangleto commands in enhanced path (use drawooo namespace)
Change-Id: I43a2c08ee8dfc0abe4d05579b837b5be0944c0fe
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 82c414e..cbf9ef3 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -375,7 +375,8 @@ void SvXMLExport::_InitCtor()
GetXMLToken(XML_NP_TABLE_EXT), GetXMLToken(XML_N_TABLE_EXT),
XML_NAMESPACE_TABLE_EXT);
mpNamespaceMap-Add(
GetXMLToken(XML_NP_CALC_EXT), GetXMLToken(XML_N_CALC_EXT),
XML_NAMESPACE_CALC_EXT);
-
+mpNamespaceMap-Add(
+GetXMLToken(XML_NP_DRAW_EXT), GetXMLToken(XML_N_DRAW_EXT),
XML_NAMESPACE_DRAW_EXT);
}
}
if( (getExportFlags() (EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 )
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index ce4d418..8927e92 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -641,11 +641,6 @@ void SAL_CALL SdXMLExport::setSourceDocument( const
Reference lang::XComponent
GetXMLToken(XML_NP_OFFICE_EXT),
GetXMLToken(XML_N_OFFICE_EXT),
XML_NAMESPACE_OFFICE_EXT);
-
-_GetNamespaceMap().Add(
-GetXMLToken(XML_NP_DRAW_EXT),
-GetXMLToken(XML_N_DRAW_EXT),
-XML_NAMESPACE_DRAW_EXT);
}
GetShapeExport()-enableLayerExport();
diff --git a/xmloff/source/draw/shapeexport4.cxx
b/xmloff/source/draw/shapeexport4.cxx
index aa4701d..43e75f9 100644
--- a/xmloff/source/draw/shapeexport4.cxx
+++ b/xmloff/source/draw/shapeexport4.cxx
@@ -329,6 +329,7 @@ void ImpExportEnhancedPath( SvXMLExport rExport,
rtl::OUString aStr;
rtl::OUStringBuffer aStrBuffer;
+sal_uInt16 aNamespace = XML_NAMESPACE_DRAW;
sal_Int32 i, j, k, l;
@@ -413,6 +414,8 @@ void ImpExportEnhancedPath( SvXMLExport rExport,
aStrBuffer.append( (sal_Unicode)'Y' ); nParameter = 1; break;
case
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::QUADRATICCURVETO :
aStrBuffer.append( (sal_Unicode)'Q' ); nParameter = 2; break;
+case
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO :
+aStrBuffer.append( (sal_Unicode)'G' ); nParameter = 2;
aNamespace = XML_NAMESPACE_DRAW_EXT; break;
default : // ups, seems to be something wrong
{
@@ -442,7 +445,7 @@ void ImpExportEnhancedPath( SvXMLExport rExport,
}
}
aStr = aStrBuffer.makeStringAndClear();
-rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_ENHANCED_PATH, aStr );
+rExport.AddAttribute( aNamespace, XML_ENHANCED_PATH, aStr );
}
void ImpExportEnhancedGeometry( SvXMLExport rExport, const uno::Reference
beans::XPropertySet xPropSet )
diff --git a/xmloff/source/draw/ximpcustomshape.cxx
b/xmloff/source/draw/ximpcustomshape.cxx
index 0736fe3..f8966a1 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -667,6 +667,13 @@ void GetEnhancedPath( std::vector
com::sun::star::beans::PropertyValue rDest
nIndex++;
}
break;
+case 'G' :
+{
+nLatestSegmentCommand =
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO;
+nParametersNeeded = 2;
+nIndex++;
+}
+break;
case 'W' :
{
nLatestSegmentCommand =
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO;
commit cf08e8a2ee18c3d1b26647489d16443b8cf617ad
Author: Radek Doulik r...@novell.com
Date: Tue Jul 17 16:15:50 2012 +0200
emf+: added implementation of DrawImage record
Change-Id: I6c86c2eaca1586d915b648292373da4378c755ba
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index 9b737d8..a0f59f4 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -211,7 +211,7 @@ static float GetSwapFloat( SvStream rSt )
typedef ::std::vector MtfAction ActionVector;
/* EMF+ */
-void ReadRectangle (SvStream s, float x, float y, float width,
float height, sal_uInt32 flags = 0);
+void ReadRectangle (SvStream s, float x, float y, float width,
float
Re: minutes of ESC call ...
On 12/07/12 17:55, Michael Meeks wrote: * Windows / ldap (Fridrich) + porting from mozilla ldap library to native windows API + moving to openldap included for linux / generic builds Done. Mozilla is not used for LDAP stuff in master anymore. For windows, it is winldap.h with the UTF-16 api and for *nix it is openLDAP with UTF-8 encoding. That means we have some level of ifdef-ing in one file, but given the nature of the API, it was lesser evil then to add whole C++ abstraction. + leave mozilla code for addressbook integration, and/or re-write to avoid big chunk of mozilla bundled Mozilla is also used for Outlook Express (WAB) address-book and for Outlook address-book via MAPI. For windows, there is a (deprecated) API to access Windows Address Book using wab32.dll. The MAPI API is also present on windows, so to make 2 distinct address-book drivers for Windows might be reasonably feasible. For mozilla/thunderbird addressbook, there seems to be a solution that does not require the whole beast and thus no xpcom eating CPU time. For Linux, there is libpst that is able to read outlook contacts and somehow old libwab that knows how the WAB format looks. They are GPL-licensed thus, so not directly usable. + use NSS for security pieces F. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: What is bibisect? And what is it doing in my office?
On Thu, Jul 19, 2012 at 4:02 AM, Michael Stahl mst...@redhat.com wrote: hi Norbert, it looks like you're living under a rock :) recently... a fjord actually :-) on Windows with MSVC make dev-install has been working for several _days_ now on master (though it is quite slow), and you even have a */opt/* to add. Great! How about Mac ? :-) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: What is bibisect? And what is it doing in my office?
On Thu, Jul 19, 2012 at 4:09 AM, Norbert Thiebaud nthieb...@gmail.com wrote: On Thu, Jul 19, 2012 at 4:02 AM, Michael Stahl mst...@redhat.com wrote: hi Norbert, it looks like you're living under a rock :) recently... a fjord actually :-) on Windows with MSVC make dev-install has been working for several _days_ now on master (though it is quite slow), and you even have a */opt/* to add. Great! How about Mac ? :-) BTW on mac I though that 'mounting' the dmg and then copying the content it over the 'artefact' git should do the trick... due to a poor upload bandwidth, I did not bother with it so far since I cannot afford to operate such bibisect construction on my box (well that is If I want to make it available to others) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: What is bibisect? And what is it doing in my office?
On 07/19/2012 11:09 AM, Norbert Thiebaud wrote: On Thu, Jul 19, 2012 at 4:02 AM, Michael Stahl mst...@redhat.com wrote: on Windows with MSVC make dev-install has been working for several _days_ now on master (though it is quite slow), and you even have a */opt/* to add. Great! How about Mac ? :-) make dev-install works well on Mac anyway, or what am I missing? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-5]: fdo#46966 dmapper: fix headery/footery default value
From Miklos Vajna vmik...@suse.cz: Miklos Vajna has uploaded a new change for review. Change subject: fdo#46966 dmapper: fix headery/footery default value .. fdo#46966 dmapper: fix headery/footery default value The docx spec doesn't say what is the default value, the rtf spec says it's 720, not 1440. Change-Id: Icb331591d4f2f96a7786f808d99af5974e645f8e --- M writerfilter/source/dmapper/DomainMapper_Impl.cxx 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/331/1 -- To view, visit https://gerrit.libreoffice.org/331 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb331591d4f2f96a7786f808d99af5974e645f8e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: drawinglayer/source
drawinglayer/source/dumper/EnhancedShapeDumper.cxx | 14 +++---
drawinglayer/source/dumper/XShapeDumper.cxx| 14 +++---
2 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 5a3eb92216d6865ad9c13f7f5ec357d82c8ce573
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jul 19 11:32:05 2012 +0200
Work around bogus Mac GCC uninitialized warnings
Change-Id: Ia735ee75b75b3e2dafe610cf5cd513dd7d4b7392
diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
index 6b32984..e39dd9f 100644
--- a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
+++ b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
@@ -624,19 +624,19 @@ void
EnhancedShapeDumper::dumpEnhancedCustomShapeHandleService(uno::Reference b
{
{
uno::Any anotherAny = xPropSet-getPropertyValue(MirroredX);
-sal_Bool bMirroredX;
+sal_Bool bMirroredX = sal_Bool();
if(anotherAny = bMirroredX)
dumpMirroredXAsAttribute(bMirroredX);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(MirroredY);
-sal_Bool bMirroredY;
+sal_Bool bMirroredY = sal_Bool();
if(anotherAny = bMirroredY)
dumpMirroredYAsAttribute(bMirroredY);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(Switched);
-sal_Bool bSwitched;
+sal_Bool bSwitched = sal_Bool();
if(anotherAny = bSwitched)
dumpSwitchedAsAttribute(bSwitched);
}
@@ -654,25 +654,25 @@ void
EnhancedShapeDumper::dumpEnhancedCustomShapeHandleService(uno::Reference b
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(RefX);
-sal_Int32 aRefX;
+sal_Int32 aRefX = sal_Int32();
if(anotherAny = aRefX)
dumpRefXAsAttribute(aRefX);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(RefY);
-sal_Int32 aRefY;
+sal_Int32 aRefY = sal_Int32();
if(anotherAny = aRefY)
dumpRefYAsAttribute(aRefY);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(RefAngle);
-sal_Int32 aRefAngle;
+sal_Int32 aRefAngle = sal_Int32();
if(anotherAny = aRefAngle)
dumpRefAngleAsAttribute(aRefAngle);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(RefR);
-sal_Int32 aRefR;
+sal_Int32 aRefR = sal_Int32();
if(anotherAny = aRefR)
dumpRefRAsAttribute(aRefR);
}
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx
b/drawinglayer/source/dumper/XShapeDumper.cxx
index a81bc0b..e60879d 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++ b/drawinglayer/source/dumper/XShapeDumper.cxx
@@ -1454,19 +1454,19 @@ void dumpLinePropertiesService(uno::Reference
beans::XPropertySet xPropSet, x
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(LineColor);
-sal_Int32 aLineColor;
+sal_Int32 aLineColor = sal_Int32();
if(anotherAny = aLineColor)
dumpLineColorAsAttribute(aLineColor, xmlWriter);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(LineTransparence);
-sal_Int32 aLineTransparence;
+sal_Int32 aLineTransparence = sal_Int32();
if(anotherAny = aLineTransparence)
dumpLineTransparenceAsAttribute(aLineTransparence, xmlWriter);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(LineWidth);
-sal_Int32 aLineWidth;
+sal_Int32 aLineWidth = sal_Int32();
if(anotherAny = aLineWidth)
dumpLineWidthAsAttribute(aLineWidth, xmlWriter);
}
@@ -1502,25 +1502,25 @@ void dumpLinePropertiesService(uno::Reference
beans::XPropertySet xPropSet, x
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(LineStartCenter);
-sal_Bool bLineStartCenter;
+sal_Bool bLineStartCenter = sal_Bool();
if(anotherAny = bLineStartCenter)
dumpLineStartCenterAsAttribute(bLineStartCenter, xmlWriter);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(LineStartWidth);
-sal_Int32 aLineStartWidth;
+sal_Int32 aLineStartWidth = sal_Int32();
if(anotherAny = aLineStartWidth)
dumpLineStartWidthAsAttribute(aLineStartWidth, xmlWriter);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(LineEndCenter);
-sal_Bool bLineEndCenter;
+sal_Bool bLineEndCenter = sal_Bool();
if(anotherAny = bLineEndCenter)
dumpLineEndCenterAsAttribute(bLineEndCenter, xmlWriter);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(LineEndWidth);
-sal_Int32 aLineEndWidth;
+sal_Int32 aLineEndWidth = sal_Int32();
if(anotherAny = aLineEndWidth)
dumpLineEndWidthAsAttribute(aLineEndWidth, xmlWriter);
}
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/core/fields/reffld.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 37d4c94d5e2dc0541ee31a0b660425d81a766f8a Author: Miklos Vajna vmik...@suse.cz Date: Thu Jul 19 11:34:48 2012 +0200 fix build Change-Id: I0802bd56a9fe7ea2674e6627c2239850967f3646 Sigend-off-by: Andras Timar ati...@suse.com diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index e762286..3a77ef6 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -309,7 +309,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr ) rtl::OUString const Text = pTxtNd-GetTxt(); unsigned const nCatStart = Text.indexOf(sSetRefName); unsigned const nCatEnd = nCatStart == unsigned(-1) ? -unsigned(-1) : nCatStart + sSetRefName.getLength(); +unsigned(-1) : nCatStart + sSetRefName.Len(); bool const bHasCat = nCatStart != unsigned(-1); // length of the referenced text ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - connectivity/source
connectivity/source/drivers/odbcbase/OConnection.cxx|3 +
connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx | 22
++
connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx |3 -
3 files changed, 9 insertions(+), 19 deletions(-)
New commits:
commit 8cd92447d78c4fe9f93e1a6ee3031b4d8d5ec477
Author: Terrence Enger ten...@iseries-guru.com
Date: Wed Jul 18 14:46:11 2012 -0400
stop some leaked statement handles
Change-Id: I06764e0569ea615e66de6cd5946614c7c538e60e
Signed-off-by: Lionel Elie Mamane lio...@mamane.lu
diff --git
a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index 9d229fa..37040d4 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -66,7 +66,6 @@
ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(OConnection* _pConnection
,m_nCurrentFetchState(0)
,m_bWasNull(sal_True)
,m_bEOF(sal_False)
-,m_bFreeHandle(sal_False)
{
OSL_ENSURE(m_pConnection,ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet:
No parent set!);
if( SQL_NULL_HANDLE == m_aStatementHandle )
@@ -96,8 +95,8 @@ void ODatabaseMetaDataResultSet::disposing(void)
OPropertySetHelper::disposing();
::osl::MutexGuard aGuard(m_aMutex);
-if(m_bFreeHandle)
-m_pConnection-freeStatementHandle(m_aStatementHandle);
+
+m_pConnection-freeStatementHandle(m_aStatementHandle);
m_aStatement= NULL;
m_xMetaData.clear();
@@ -846,7 +845,6 @@ void ODatabaseMetaDataResultSet::openTables(const Any
catalog, const ::rtl::OUS
const ::rtl::OUString tableNamePattern,
const Sequence ::rtl::OUString types )
throw(SQLException, RuntimeException)
{
-m_bFreeHandle = sal_True;
::rtl::OString aPKQ,aPKO,aPKN,aCOL;
const ::rtl::OUString *pSchemaPat = NULL;
@@ -894,7 +892,6 @@ void ODatabaseMetaDataResultSet::openTables(const Any
catalog, const ::rtl::OUS
//-
void ODatabaseMetaDataResultSet::openTablesTypes( ) throw(SQLException,
RuntimeException)
{
-m_bFreeHandle = sal_True;
SQLRETURN nRetcode = N3SQLTables(m_aStatementHandle,
0,0,
0,0,
@@ -911,7 +908,6 @@ void ODatabaseMetaDataResultSet::openTablesTypes( )
throw(SQLException, RuntimeE
// -
void ODatabaseMetaDataResultSet::openCatalogs() throw(SQLException,
RuntimeException)
{
-m_bFreeHandle = sal_True;
SQLRETURN nRetcode = N3SQLTables(m_aStatementHandle,
(SDB_ODBC_CHAR *) SQL_ALL_CATALOGS,SQL_NTS,
(SDB_ODBC_CHAR *) ,SQL_NTS,
@@ -929,7 +925,6 @@ void ODatabaseMetaDataResultSet::openCatalogs()
throw(SQLException, RuntimeExcep
// -
void ODatabaseMetaDataResultSet::openSchemas() throw(SQLException,
RuntimeException)
{
-m_bFreeHandle = sal_True;
SQLRETURN nRetcode = N3SQLTables(m_aStatementHandle,
(SDB_ODBC_CHAR *) ,SQL_NTS,
(SDB_ODBC_CHAR *) SQL_ALL_SCHEMAS,SQL_NTS,
@@ -955,7 +950,6 @@ void ODatabaseMetaDataResultSet::openColumnPrivileges(
const Any catalog, cons
else
pSchemaPat = NULL;
-m_bFreeHandle = sal_True;
::rtl::OString aPKQ,aPKO,aPKN,aCOL;
if ( catalog.hasValue() )
@@ -991,7 +985,6 @@ void ODatabaseMetaDataResultSet::openColumns( const Any
catalog,
else
pSchemaPat = NULL;
-m_bFreeHandle = sal_True;
::rtl::OString aPKQ,aPKO,aPKN,aCOL;
if ( catalog.hasValue() )
aPKQ =
::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding);
@@ -1060,7 +1053,6 @@ void ODatabaseMetaDataResultSet::openProcedureColumns(
const Any catalog,
else
pSchemaPat = NULL;
-m_bFreeHandle = sal_True;
::rtl::OString aPKQ,aPKO,aPKN,aCOL;
if ( catalog.hasValue() )
aPKQ =
::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding);
@@ -1095,7 +1087,6 @@ void ODatabaseMetaDataResultSet::openProcedures(const
Any catalog, const ::rtl:
else
pSchemaPat = NULL;
-m_bFreeHandle = sal_True;
::rtl::OString aPKQ,aPKO,aPKN,aCOL;
if ( catalog.hasValue() )
@@ -1140,7 +1131,6 @@ void
ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any
else
pSchemaPat = NULL;
-m_bFreeHandle = sal_True;
::rtl::OString aPKQ,aPKO,aPKN,aCOL;
if ( catalog.hasValue() )
aPKQ =
::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding);
@@ -1179,8 +1169,6 @@ void
Re: Patching our gerrit instance [was Re: [ANN] Please use Gerrit from now on for Patch Review]
Hi, On Wed, Jul 18, 2012 at 07:11:53PM +0200, Jan Holesovsky wrote: Luckily, the Qt guys apparently had the same problem, and have a solution (the entire diff on one page, without abandoning the inline commenting): http://qt.gitorious.org/qtqa/gerrit/commit/737400d1bad4fa8bfd39cb326636a0307014901f So - what to do about that? Norbert had the right concerns that we probably shouldn't patch our instance, but do we have another possibility? David pointed out there might be some issues with the patch IIRC and it cant be upstreamed for licensing reasons (doh, yeah, awesome!). Since David has been investgating there, I would trust his judgement how we can best solve this one. @David: Any suggestion what the least sucking alternative is? Personally, I wouldnt use that feature at all and simply navigate with the keybindings through changes -- but as always, workflows differ. Another thing are the mail templates - can you please commit the current mail templates that we are using on gerrit.libreoffice.org to dev-tools/gerrit/gerrit_site/etc/mail, so that we can tweak them [eg. to get rid of the . line], in a version-controlled way, and deploy them back there easily? Done (David uploaded to gerrit, I pushed). Also, can you please make http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/commit/?id=72d5bdff8d4bae14f6a63fd67d988f637b0bbc07 live on the server? Im already in firefighting mode on the distro-level today, so I better wont tweak on another production system. Maybe Robert or Norbert can, the thing seems trivial enough. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: drawinglayer/source
drawinglayer/source/dumper/EnhancedShapeDumper.cxx |6 +++---
drawinglayer/source/dumper/XShapeDumper.cxx| 14 +++---
2 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 042686d3ead3ed9aa1e70460c25d471c380b177b
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jul 19 11:57:19 2012 +0200
Work around bogus Mac GCC uninitialized warnings
Change-Id: I04f64b11b484be8c997e1dbab8de35282fa64289
diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
index e39dd9f..484a18e 100644
--- a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
+++ b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
@@ -395,19 +395,19 @@ void
EnhancedShapeDumper::dumpEnhancedCustomShapeGeometryService(uno::Reference
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(MirroredX);
-sal_Bool bMirroredX;
+sal_Bool bMirroredX = sal_Bool();
if(anotherAny = bMirroredX)
dumpMirroredXAsAttribute(bMirroredX);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(MirroredY);
-sal_Bool bMirroredY;
+sal_Bool bMirroredY = sal_Bool();
if(anotherAny = bMirroredY)
dumpMirroredYAsAttribute(bMirroredY);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(TextRotateAngle);
-double aTextRotateAngle;
+double aTextRotateAngle = double();
if(anotherAny = aTextRotateAngle)
dumpTextRotateAngleAsAttribute(aTextRotateAngle);
}
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx
b/drawinglayer/source/dumper/XShapeDumper.cxx
index e60879d..f211575 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++ b/drawinglayer/source/dumper/XShapeDumper.cxx
@@ -1587,13 +1587,13 @@ void dumpShapeService(uno::Reference
beans::XPropertySet xPropSet, xmlTextWri
uno::Reference beans::XPropertySetInfo xInfo =
xPropSet-getPropertySetInfo();
{
uno::Any anotherAny = xPropSet-getPropertyValue(ZOrder);
-sal_Int32 aZOrder;
+sal_Int32 aZOrder = sal_Int32();
if(anotherAny = aZOrder)
dumpZOrderAsAttribute(aZOrder, xmlWriter);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(LayerID);
-sal_Int32 aLayerID;
+sal_Int32 aLayerID = sal_Int32();
if(anotherAny = aLayerID)
dumpLayerIDAsAttribute(aLayerID, xmlWriter);
}
@@ -1605,19 +1605,19 @@ void dumpShapeService(uno::Reference
beans::XPropertySet xPropSet, xmlTextWri
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(Visible);
-sal_Bool bVisible;
+sal_Bool bVisible = sal_Bool();
if(anotherAny = bVisible)
dumpVisibleAsAttribute(bVisible, xmlWriter);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(Printable);
-sal_Bool bPrintable;
+sal_Bool bPrintable = sal_Bool();
if(anotherAny = bPrintable)
dumpPrintableAsAttribute(bPrintable, xmlWriter);
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(MoveProtect);
-sal_Bool bMoveProtect;
+sal_Bool bMoveProtect = sal_Bool();
if(anotherAny = bMoveProtect)
dumpMoveProtectAsAttribute(bMoveProtect, xmlWriter);
}
@@ -1629,7 +1629,7 @@ void dumpShapeService(uno::Reference beans::XPropertySet
xPropSet, xmlTextWri
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(SizeProtect);
-sal_Bool bSizeProtect;
+sal_Bool bSizeProtect = sal_Bool();
if(anotherAny = bSizeProtect)
dumpSizeProtectAsAttribute(bSizeProtect, xmlWriter);
}
@@ -1641,7 +1641,7 @@ void dumpShapeService(uno::Reference beans::XPropertySet
xPropSet, xmlTextWri
}
{
uno::Any anotherAny = xPropSet-getPropertyValue(NavigationOrder);
-sal_Int32 aNavigationOrder;
+sal_Int32 aNavigationOrder = sal_Int32();
if(anotherAny = aNavigationOrder)
dumpNavigationOrderAsAttribute(aNavigationOrder, xmlWriter);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LibreOffice OWA
Hi, Am 19.06.2012 13:17, schrieb Michael Meeks: On Tue, 2012-06-19 at 11:26 +0200, Italo Vignoli wrote: (...) So - we need to try to reduce those differences incrementally, starting with just re-zipping the LibreOffice document: is there a container problem ? if not, then re-ordering it - is it an ordering problem, then adding ODF1.2 XML attributes to the manifest etc. etc. do we have any news on that issue? It seems to be a problem with the zipping of the meta.xml. I get more and more reports about that from my customers and I don't see a solution or at least a workaround. Regards, Jacqueline ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: xmloff/source
xmloff/source/style/PageMasterImportPropMapper.cxx | 51 +
1 file changed, 51 insertions(+)
New commits:
commit 7f9928bfa561ccb6ed4e2baacc7d6960bc1ce231
Author: Michael Stahl mst...@redhat.com
Date: Thu Jul 19 12:12:14 2012 +0200
fdo#38056: ODF import: fix page style attributes:
PageMasterImportPropMapper: in the case of a single fo:border
and style:border-line-width attribute, it is possible that the border
is imported wrongly, like this:
1. pAllBorderProperty is set from the imported value, with name TopBorder
2. individual pNewBorder[i] are created as copies from pAllBorderProperty,
one of which also with name TopBorder
3. pNewBorder[i] is updated with widths from pBorderWidths[i]
4. the individual pNewBorder[i] are added to the property vector
5. the property vector is sorted by property name
6. the properites are applied in order; if the pNewBorder[TOP]
happens to precede the pAllBorderProperty (which is indeterminate
as they both have name TopBorder), then the pAllBorderProperty
will overwrite the border widths computed in step 3.
Thus, nerf the various pAllFoo properties so they do not override
the individual Foo properties later on.
Change-Id: I87755f1184d59da2aa72ac053e6f77d7295d6958
diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx
b/xmloff/source/style/PageMasterImportPropMapper.cxx
index ad45cdb..005c732 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
@@ -408,6 +408,57 @@ void
PageMasterImportPropertyMapper::finished(::std::vector XMLPropertyState
rProperties.push_back(*pFooterDynamic);
delete pFooterDynamic;
}
+
+// fdo#38056: nerf the various AllFoo properties so they do not override
+// the individual Foo properties later on
+if (pAllPaddingProperty)
+{
+pAllPaddingProperty-mnIndex = -1;
+}
+if (pAllBorderProperty)
+{
+pAllBorderProperty-mnIndex = -1;
+}
+if (pAllBorderWidthProperty)
+{
+pAllBorderWidthProperty-mnIndex = -1;
+}
+if (pAllHeaderPaddingProperty)
+{
+pAllHeaderPaddingProperty-mnIndex = -1;
+}
+if (pAllHeaderBorderProperty)
+{
+pAllHeaderBorderProperty-mnIndex = -1;
+}
+if (pAllHeaderBorderWidthProperty)
+{
+pAllHeaderBorderWidthProperty-mnIndex = -1;
+}
+if (pAllFooterPaddingProperty)
+{
+pAllFooterPaddingProperty-mnIndex = -1;
+}
+if (pAllFooterBorderProperty)
+{
+pAllFooterBorderProperty-mnIndex = -1;
+}
+if (pAllFooterBorderWidthProperty)
+{
+pAllFooterBorderWidthProperty-mnIndex = -1;
+}
+if (pAllMarginProperty)
+{
+pAllMarginProperty-mnIndex = -1;
+}
+if (pAllHeaderMarginProperty)
+{
+pAllHeaderMarginProperty-mnIndex = -1;
+}
+if (pAllFooterMarginProperty)
+{
+pAllFooterMarginProperty-mnIndex = -1;
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: git branch audit ...
On Wed, 2012-07-18 at 17:51 +0100, Michael Meeks wrote: origin/feature/cmclayouttrans A work in progress, to munge translating .ui files into our localization mechanism. Extraction of translatables done, re-insertion still a to-do :-) C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fdo#38056: ODF import: fix page style attributes:
From Michael Stahl mst...@redhat.com: Michael Stahl has uploaded a new change for review. Change subject: fdo#38056: ODF import: fix page style attributes: .. fdo#38056: ODF import: fix page style attributes: PageMasterImportPropMapper: in the case of a single fo:border and style:border-line-width attribute, it is possible that the border is imported wrongly, like this: 1. pAllBorderProperty is set from the imported value, with name TopBorder 2. individual pNewBorder[i] are created as copies from pAllBorderProperty, one of which also with name TopBorder 3. pNewBorder[i] is updated with widths from pBorderWidths[i] 4. the individual pNewBorder[i] are added to the property vector 5. the property vector is sorted by property name 6. the properites are applied in order; if the pNewBorder[TOP] happens to precede the pAllBorderProperty (which is indeterminate as they both have name TopBorder), then the pAllBorderProperty will overwrite the border widths computed in step 3. Thus, nerf the various pAllFoo properties so they do not override the individual Foo properties later on. Change-Id: I87755f1184d59da2aa72ac053e6f77d7295d6958 (cherry picked from commit 7f9928bfa561ccb6ed4e2baacc7d6960bc1ce231) --- M xmloff/source/style/PageMasterImportPropMapper.cxx 1 file changed, 51 insertions(+), 0 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/333/1 -- To view, visit https://gerrit.libreoffice.org/333 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I87755f1184d59da2aa72ac053e6f77d7295d6958 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ONGERRIT] leaked ODBC statement handles
On Wed, Jul 18, 2012 at 03:09:55PM -0400, Terrence Enger wrote: Patch attached. I think it as we discussed. Thanks. Applied pushed to master. I split your patch into three commits: - avoid freeing the NULL handle - ODBMetaDataRS ctor: abort if statement handle allocation failed - stop some leaked statement handles In particular, in the ODBMetaDataRS ctor: abort if statement handle allocation failed commit, I moved the abort (exception throwing) to the top of the function instead of the bottom. At the bottom, it would leak the allocation in m_pRowStatusArray, and a reference count in m_pConnection (because acquire has already been called). By contrast, the other initialisations done before, in the initialisation list are safe: no heap allocation :) -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.in
configure.in |3 +++ 1 file changed, 3 insertions(+) New commits: commit 85b35ac289f661f64c145deaf419f61f5d4c Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 19 12:43:58 2012 +0200 Detect failing Clang with GCC 4.7 headers and --std=gnu++0x scenarios Change-Id: I6caa48a428ac7fef23f7c3e6fc7896b7e3a8d0fc diff --git a/configure.in b/configure.in index 15adc26..081c6f0 100644 --- a/configure.in +++ b/configure.in @@ -4778,6 +4778,9 @@ if test $GCC = yes; then AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include stddef.h +#include vector +// some Clang fail when compiling against GCC 4.7 headers with --std=gnu++0x + template typename T, size_t S char (sal_n_array_size( T()[S] ))[S]; namespace ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: git branch audit ...
Hey, origin/feature/cell-format-data-bar origin/feature/cell-notes both obsolete now. origin/feature/chart_errorbars Have to look at that one again. origin/feature/gsoc_test_improvements origin/feature/gsoc_test_improvements2 origin/feature/gsoc_test_improvements3 Artur's GSOC branch. IMHO should be held until the end of this year's google summer of code. origin/feature/line-numbers-in-basicIDE Has been merged to master by Noel or me. origin/feature/stub_writer A test branch for mocking writer during tests. I need to look at that branch when I have more time again. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW:3-5] broken build
Hi, Recent commit to libreoffice-3-5 breaks the build, because of API difference between OUString and String. Patch attached. Please apply. -- Lionel From b9cc9f9dbfc2af7ec1f9c971c345860e11c57c98 Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane lio...@mamane.lu Date: Thu, 19 Jul 2012 12:56:39 +0200 Subject: [PATCH] fix build: OUString-String Change-Id: I1f2a29fd6524e160174a2d2b28dc6bed0bcdcdcc --- sw/source/core/fields/reffld.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index e762286..3a77ef6 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -309,7 +309,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr ) rtl::OUString const Text = pTxtNd-GetTxt(); unsigned const nCatStart = Text.indexOf(sSetRefName); unsigned const nCatEnd = nCatStart == unsigned(-1) ? -unsigned(-1) : nCatStart + sSetRefName.getLength(); +unsigned(-1) : nCatStart + sSetRefName.Len(); bool const bHasCat = nCatStart != unsigned(-1); // length of the referenced text -- 1.7.10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: C++11 in LibreOffice
On 17/07/12 21:21, Kohei Yoshida wrote: On 07/17/2012 05:11 AM, Lubos Lunak wrote: So, as long as we require to build LO with MSVC, we can revisit the question of hard-depending on C++11 in, uhm, let's be optimistic and say 3 years. IOW, we can probably get there faster by ditching backwards ABI compatibility with LO4 and switching to a different compiler for Windows. What I'm curious is how the binaries generated from different compilers compare on Windows. If their performances are more or less comparable, then I could care less whether we stick with MSVC or gcc (or clang if it's available on Windows). But if MSVC still produces more optimized binaries, then I would be reluctant to support switching to a different compiler (though my voice is only one head count, easily overruled by the majority votes when it comes down to it). i don't believe an office suite will benefit all that much from sophisticated compiler optimizations; most of the problems we have are due to stupid algorithms/data structures that don't scale. the _real_ question is, how can you debug problems that happen only on Windows, what does MinGW offer there, does it actually work or does gdb crash all the time like it did 5 years ago on Linux. also, how do you run unit tests when cross compiling? but if you really care here's some recent windows benchmarks that look reasonably well done at first glance, and GCC looks very competitive with MSVC, though Intel is faster still: http://www.willus.com/ccomp_benchmark2.shtml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
gerrit via email
Not being registered with gerrit (because I lack OpenId), I recently tried http://lists.freedesktop.org/archives/libreoffice/2012-July/035330.html to submit a patch via email. Despite checking the open patches on gerrit occasionally thereafter, I never caught it showing my patch. Lionel Elie Mamane has already applied the patch, but he may have worked from my email rather than gerrit. So, I wonder ... (*) Is it the case that the patch went through gerrit as intended, and I just failed to notice? (*) Should I have put the patch in the body of the email rather than an attachment? Bjoern Michaelsen's instructions in http://lists.freedesktop.org/archives/libreoffice/2012-July/034689.html do not specify. (*) Did I do something else wrong? (*) Is my situation common enough to be worth mentioning in https://wiki.documentfoundation.org/Development#Sending_patches_directly_to_gerrit.libreoffice.org. (I do not want to make that change myself until I have had success at least once.) Thank you for your attention. Terry. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/fields/authfld.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 859018061956b1937c7be3809a9858cbd610fa9c
Author: David Tardon dtar...@redhat.com
Date: Thu Jul 19 14:00:55 2012 +0200
fdo#52241 remove just one entry
Change-Id: Ida7920c3196105f7f8aab519da12e79135839345
diff --git a/sw/source/core/fields/authfld.cxx
b/sw/source/core/fields/authfld.cxx
index 1f3c24b..ccfdfcf 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -322,9 +322,8 @@ sal_uInt16 SwAuthorityFieldType::GetSequencePos(long
nHandle)
DELETEZ(pNew);
else // remove the old content
{
-for (SwTOXSortTabBases::const_iterator it =
aSortArr.begin(); it != aSortArr.end(); ++it)
-delete *it;
-aSortArr.clear();
+aSortArr.erase(aSortArr.begin() + i);
+delete pOld;
}
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [HELP] fdo#51239 how to debug it is slow
On 07/18/2012 10:06 AM, Lionel Elie Mamane wrote: The issue *originally* reported in fdo#51239, which has been bumped to fdo#52170: in LibreOffice 3.5.2, much slower than before, on GNU/Linux, but NOT on Windows. Unknown on Mac. Not entirely clear what before it is. *This* issue *could* be JVM-thread-attach/detach related, or some other interaction between Java and C++ problem. My hunch in this direction is because it does not happen on MS Windows. So if you could look into it, even if only to rule it out, that would be useful. Looked into it on x64 Linux master, against both an 1.7.0 openjdk (as included in Fedora 17) and a jre-6u33-linux-x64 downloaded from Oracle. In either case, it does take significantly to open the Sales Invoices table (from https://bugs.freedesktop.org/attachment.cgi?id=63257), and then it takes ages to jump to the end. However, I could not find anything obviously suspicious at the JVM level. I locally reverted http://cgit.freedesktop.org/libreoffice/core/commit/?id=bb59742bcf4883af5876a2ffadcc4a689e414b60 Confine JDBC driver to thread-affine apartment for Java 6 performance and then everything became even more slow, so it apparently is not the case that the effect of that fix has meanwhile regressed again. I noticed that there are truckloads of calls to m_pVm-AttachCurrentThread from jvmaccess::VirtualMachine::attachThread (jvmaccess/source/virtualmachine.cxx). Such outermost calls into JNI (i.e., not recursively from a thread that is already in a JNI call, where jvmaccess::VirtualMachine::attachThread would be cheap) are always expensive (and the changes to the JVM that we tried to address with bb59742bcf4883af5876a2ffadcc4a689e414b60 only made them extra-extra expensive, when they already had been expensive). The LO database code is notorious for making truckloads of such expensive outermost JNI calls, but I do not know if this has increased substantially recently and so alone could explain any recent performance regressions. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW: 3-6-0] fdo#55241 updating of indexes is broken
Hi all,
commit 859018061956b1937c7be3809a9858cbd610fa9c fixes yet another STL
conversion bug (no offense meant, Noel--your work is much appreciated).
As a side note: I have to admire the ingenuity of authors of the TOX
implementation in Writer, whose glorious idea to define virtual
operator== and operator (with unrelated semantics) for the
SwTOXSortTabBase class hierarchy allows us to write code like:
if(*pOld == *pNew)
{
if(*pOld *pNew)
...
D.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gerrit via email
Hi Terrence,
On Thu, Jul 19, 2012 at 07:51:58AM -0400, Terrence Enger wrote:
Despite checking the open patches on gerrit occasionally thereafter, I
never caught it showing my patch. Lionel Elie Mamane has already
applied the patch, but he may have worked from my email rather than
gerrit.
My mail about the maildrop was a statement of intent, not that we have a full
solution in place already. There is scripting by David and me for the maildrop,
but it still needs tweaking and testing. Once we have that, we can easily
forward your mail from the list to gerrit.
So, I wonder ...
(*) Is it the case that the patch went through gerrit as intended, and
I just failed to notice?
no, it went directly in.
(*) Should I have put the patch in the body of the email rather than
an attachment? Bjoern Michaelsen's instructions in
http://lists.freedesktop.org/archives/libreoffice/2012-July/034689.html
do not specify.
Making the patch an attachment should be fine, 'git am' will find it.
(*) Did I do something else wrong?
no ;)
(*) Is my situation common enough to be worth mentioning in
https://wiki.documentfoundation.org/Development#Sending_patches_directly_to_gerrit.libreoffice.org.
(I do not want to make that change myself until I have had success
at least once.)
Well, I wonder what you would want to write in that section as it is about
using Gerrit directly (for which you need OpenID). Once the maildrop is in
place we will likely have a section about sending your patch to
ger...@libreoffice.org instead of sending it to the mailing list.
And before anyone gets out the forks and torches: gerrit sends a notification
about the new change to the dev list (and with the bot to IRC) and with kendy
latest tweaks that also includes the patch itself, so the dev list will get
notified with the full patch still.
Anyway: One step after the other: If you are interested in getting the maildrop
faster, David likely will appreciate your help!
Best,
Bjoern
P.S.: Attaching my unfinished script just to tease you.
#!/usr/bin/env python
import sys
import email
import os.path
import smtplib
import tempfile
import subprocess
import logging
import minilog
sourceurl = '/home/gerritbot/syncrepos/core.git'
desturl = '/tmp/test/core.git'
legalbranches = [ 'master', 'libreoffice-3-6', 'libreoffice-3-5',
'libreoffice-3-5-6' ]
logfile=os.path.join(os.environ['HOME'], 'patchpickup.log')
loglevel='INFO'
class PatchPusher():
def __init__(self, branch, logger):
self.tmpdir = tempfile.mkdtemp()
self.workrepo = os.path.join(self.tmpdir, 'repo')
self.repo = repo
self.branch = branch
self.logger = logger
def clone_base(self, sourceurl):
minilog.logged_call( \
['git', 'clone', '--branch', self.branch, sourceurl,
self.workrepo], \
self.logger, \
{})
def fetch_all(self):
minilog.logged_call( \
['git','--work-tree=%s' % self.workrepo, 'fetch', '--all'], \
self.logger, \
{})
def cherry_pick(self, commit):
minilog.logged_call( \
['git','--work-tree=%s' % self.workrepo, 'cherry-pick', '--all'], \
self.logger, \
{})
def apply_message(self, message):
messagefile = open(os.path.join(self.tmpdir,'message'))
messagefile.write(str(message))
messagefile.close()
minilog.logged_call( \
['git','--work-tree=%s' % self.workrepo, 'am', messagefile], \
self.logger, \
{})
def upload_change(self, desturl):
minilog.logged_call( \
['git','--work-tree=%s' % self.workrepo, 'push', desturl,
'HEAD:refs/for/%s' % self.branch], \
self.logger, \
{})
class EmailCommand():
def __init__(self, message, sourceurl, desturl, logger):
self.message = message
self.sourceurl = sourceurl
self.desturl = desturl
self.logger = logger
self.command = None
self.branch = master
self.commit = None
self.success = False
if not message.has_key('subject'):
raise Exception('message has no subject header -- ignoring.')
subject = message['subject']
self.parse_params(subject)
self.parse_command(subject)
def parse_params(self, subject):
state = None
words = subject.split(' ')
for word in words:
if state == 'branch':
self.branch = word
state = None
if state == 'commit':
self.commit = word
state == None
elif state is None and word == 'branch':
state == 'branch'
if state is None annd word == 'commit':
state == 'commit'
if self.commit is None and len(words) 1:
self.commit = words[1]
if not self.branch in legalbranches:
Re: [ONGERRIT] leaked ODBC statement handles
On Thu, 2012-07-19 at 07:18 -0400, Terrence Enger wrote: Again, thank you for all the help you have given me along the way to this small code contribution. Hey ! this really helps - it's really great to have people tackling bugs - there are really plenty to go around :-) 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: [REVIEW: 3-6-0] fdo#55241 updating of indexes is broken
On Thursday 19 of July 2012, David Tardon wrote: Hi all, commit 859018061956b1937c7be3809a9858cbd610fa9c fixes yet another STL conversion bug +1 But I have no idea to which branch you have already committed this (git branch --contains doesn't list anything), so I haven't done anything more than this +1. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: oowintool
oowintool | 23 ++-
1 file changed, 14 insertions(+), 9 deletions(-)
New commits:
commit 238eba337cedda17a9ed1ce7e91755c66446195a
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Thu Jul 19 07:38:31 2012 -0500
make the vc2010 redist optional
Change-Id: Ib81f168fa65d7a4affb15ce07f1a49ad1b2df479
diff --git a/oowintool b/oowintool
index fbc647d..087d478 100755
--- a/oowintool
+++ b/oowintool
@@ -1,4 +1,5 @@
-#!/usr/bin/perl -w # -*- tab-width: 4; cperl-indent-level: 4;
indent-tabs-mode: nil -*-
+#!/usr/bin/perl -w
+# -*- tab-width: 4; cperl-indent-level: 4; indent-tabs-mode: nil -*-
use File::Copy;
@@ -40,7 +41,7 @@ sub reg_find_key($)
sub print_syntax()
{
print oowintool [option] ...\n;
-print encoding options\n;
+print encoding options\n;
print-w - windows form\n;
print-u - unix form (default)\n;
print commands:\n;
@@ -69,7 +70,7 @@ sub cygpath($$$)
$path =~ s|\\*\s*$||;
}
-# 'Unterminated quoted string errors' from 'ash' when
+# 'Unterminated quoted string errors' from 'ash' when
# forking cygpath so - reimplement cygpath in perl [ gack ]
if ($format eq 'u' $input_format eq 'w') {
$path =~ s|\\|/|g;
@@ -206,7 +207,7 @@ sub print_csc_compiler_dir()
sub print_dotnetsdk_dir()
{
-my $dir =
+my $dir =
reg_get_value
(HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv1.1) ||
reg_get_value
(HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv2.0);
if ($dir) {
@@ -222,7 +223,7 @@ sub print_jdk_dir()
reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\
Kit/1.5/JavaHome) ||
reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\
Kit/1.4/JavaHome) ||
reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\
Kit/1.3/JavaHome);
-print cygpath($dir, 'w', $output_format);
+print cygpath($dir, 'w', $output_format);
}
sub copy_dll($$$)
@@ -241,11 +242,11 @@ sub msvc_find_version($)
{
my $checkpath = shift;
my $ver = find_msvc();
-my $srcdir = (cygpath ($ver-{'product_dir'}, 'w', 'u') . '/' .
+my $srcdir = (cygpath ($ver-{'product_dir'}, 'w', 'u') . '/' .
$ver-{$checkpath});
-d $srcdir return $ver;
$ver = find_msvs();
-$srcdir = (cygpath ($ver-{'product_dir'}, 'w', 'u') . '/' .
+$srcdir = (cygpath ($ver-{'product_dir'}, 'w', 'u') . '/' .
$ver-{$checkpath});
-d $srcdir return $ver;
return undef;
@@ -256,7 +257,7 @@ sub msvc_copy_dlls($)
my $dest = shift;
my $ver = msvc_find_version('dll_path');
defined $ver || return;
-my $srcdir = (cygpath ($ver-{'product_dir'}, 'w', 'u') . '/' .
+my $srcdir = (cygpath ($ver-{'product_dir'}, 'w', 'u') . '/' .
$ver-{'dll_path'});
copy_dll ($srcdir, msvcp . $ver-{'dll_suffix'} . .dll,
@@ -280,10 +281,14 @@ sub msvc_copy_msms($$)
my $msm_path = (cygpath reg_get_value
(HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/9.0/Setup/VS/MSMDir),
'w', $output_format);
defined $msm_path || die MSMDir not found;
-foreach $fname (Microsoft_VC90_CRT_x86$postfix.msm,
policy_9_0_Microsoft_VC90_CRT_x86$postfix.msm,
Microsoft_VC100_CRT_x86$postfix.msm) {
+foreach $fname (Microsoft_VC90_CRT_x86$postfix.msm,
policy_9_0_Microsoft_VC90_CRT_x86$postfix.msm) {
print STDERR Copying $msm_path/$fname to $dest\n;
copy ($msm_path/$fname, $dest) || die copy failed: $!;
}
+foreach $fname (Microsoft_VC100_CRT_x86$postfix.msm) {
+print STDERR Copying $msm_path/$fname to $dest\n;
+copy ($msm_path/$fname, $dest) || print copy failed: $!;
+}
}
if (!@ARGV) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW: 3-6 3-6-0] fdo#55241 updating of indexes is broken
On Thu, Jul 19, 2012 at 02:36:48PM +0200, Lubos Lunak wrote: On Thursday 19 of July 2012, David Tardon wrote: Hi all, commit 859018061956b1937c7be3809a9858cbd610fa9c fixes yet another STL conversion bug +1 But I have no idea to which branch you have already committed this (git branch --contains doesn't list anything), so I haven't done anything more than this +1. It is only on master. I suppose I should have written 3-6 into subject too.. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: What is bibisect? And what is it doing in my office?
On Thu, Jul 19, 2012 at 4:14 AM, Stephan Bergmann sberg...@redhat.com wrote: On 07/19/2012 11:09 AM, Norbert Thiebaud wrote: On Thu, Jul 19, 2012 at 4:02 AM, Michael Stahl mst...@redhat.com wrote: on Windows with MSVC make dev-install has been working for several _days_ now on master (though it is quite slow), and you even have a */opt/* to add. Great! How about Mac ? :-) make dev-install works well on Mac anyway, or what am I missing? It does indeed... I got thrown-off by the ominous FIXME: linkoo currently does not work on Mac OS X message at the end :-) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/core/fields/authfld.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 48d61f4ad1eb4f8a031e65c3fcbebc5023d600e9
Author: David Tardon dtar...@redhat.com
Date: Thu Jul 19 14:00:55 2012 +0200
fdo#52241 remove just one entry
Change-Id: Ida7920c3196105f7f8aab519da12e79135839345
(cherry picked from commit 859018061956b1937c7be3809a9858cbd610fa9c)
Signed-off-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/sw/source/core/fields/authfld.cxx
b/sw/source/core/fields/authfld.cxx
index 1f3c24b..ccfdfcf 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -322,9 +322,8 @@ sal_uInt16 SwAuthorityFieldType::GetSequencePos(long
nHandle)
DELETEZ(pNew);
else // remove the old content
{
-for (SwTOXSortTabBases::const_iterator it =
aSortArr.begin(); it != aSortArr.end(); ++it)
-delete *it;
-aSortArr.clear();
+aSortArr.erase(aSortArr.begin() + i);
+delete pOld;
}
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW: 3-6 3-6-0] fdo#55241 updating of indexes is broken
On Thursday 19 of July 2012, David Tardon wrote: On Thu, Jul 19, 2012 at 02:36:48PM +0200, Lubos Lunak wrote: On Thursday 19 of July 2012, David Tardon wrote: Hi all, commit 859018061956b1937c7be3809a9858cbd610fa9c fixes yet another STL conversion bug +1 But I have no idea to which branch you have already committed this (git branch --contains doesn't list anything), so I haven't done anything more than this +1. It is only on master. I suppose I should have written 3-6 into subject too.. I had figured that out, but I didn't see it even on master (until I pulled again just now, I have no idea what went wrong before). I've cherry-picked to 3-6. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [HELP] fdo#51239 how to debug it is slow
On 07/19/2012 02:38 PM, Lionel Elie Mamane wrote: On Thu, Jul 19, 2012 at 02:12:30PM +0200, Stephan Bergmann wrote: On 07/18/2012 10:06 AM, Lionel Elie Mamane wrote: The issue *originally* reported in fdo#51239, which has been bumped to fdo#52170: in LibreOffice 3.5.2, much slower than before, on GNU/Linux, but NOT on Windows. Unknown on Mac. Not entirely clear what before it is. *This* issue *could* be JVM-thread-attach/detach related, or some other interaction between Java and C++ problem. My hunch in this direction is because it does not happen on MS Windows. So if you could look into it, even if only to rule it out, that would be useful. I noticed that there are truckloads of calls to m_pVm-AttachCurrentThread from jvmaccess::VirtualMachine::attachThread (jvmaccess/source/virtualmachine.cxx). Such outermost calls into JNI (i.e., not recursively from a thread that is already in a JNI call, where jvmaccess::VirtualMachine::attachThread would be cheap) are always expensive (...). The LO database code is notorious for making truckloads of such expensive outermost JNI calls, (...) Try to give me an idea what would cause such calls. Is it Java code calling C(++) code (presumably through UNO) or C(++) code calling Java code (again presumably through UNO)? C++ code in connectivity and/or dbacess calling Java, not through UNO but directly talking JNI (though going through UNO would not actually make a difference to the performance implications). Grepping for jvmaccess::VirtualMachine::AttachGuard in connectivity and dbaccess should show the places where this is done. For example, to minimise the number of Java calls from C++ , maybe we could, when we retrieve a whole row through JDBC, doing this from Java code instead of from C++ code: for (i=0; i row-getNumberOfColumns; ++i) cacheEntry[i]=row-getColumnValue(i); This would bring us down from one call per column to one call per row, hopefully without duplicating *too* *much* logic between a C++ version and a Java version. Yes, this could be helpful. (When I discussed this with Ocke years ago, he always claimed there it was not possible to redesign the connectivity/dbaccess code to reduce the number of such outermost JNI calls, though.) A breakpoint at jvmaccess::VirtualMachine::attachThread in gdb does not seem to be immediately useful; the backtrace does not show me where that comes from. Is there a way to see that? That might be due to http://cgit.freedesktop.org/libreoffice/core/commit/?id=bb59742bcf4883af5876a2ffadcc4a689e414b60 Confine JDBC driver to thread-affine apartment for Java 6 performance offloading part of the code off the main thread into a dedicated thread. You can try reverting that locally (at the expense of even slower performance). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: C++11 in LibreOffice
On Thu, Jul 19, 2012 at 7:45 AM, Michael Stahl mst...@redhat.com wrote: i don't believe an office suite will benefit all that much from sophisticated compiler optimizations; It's certainly your opinion. But I tend think that, any binary generated from a compiler could use the benefit of compiler optimization. I find it hard to believe that somehow an office suite category is an exception. But maybe it's just me. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa sw/source
sw/qa/core/swdoc-test.cxx | 37 -
sw/source/core/txtnode/txtedt.cxx |5 +
2 files changed, 41 insertions(+), 1 deletion(-)
New commits:
commit 3442913accc4e44c3a1ac69a990edee15117948e
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jul 19 13:50:21 2012 +0100
Related: fdo#46757 fix weird word/char count with hidden deleted text
i.e. changes on, but not shown then unseen deleted text counted in word/char
count
Change-Id: I5725063edfbfc1f6545fe1dcea9b224dbfa3a418
diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx
index 8c06e25..f76cad3 100644
--- a/sw/qa/core/swdoc-test.cxx
+++ b/sw/qa/core/swdoc-test.cxx
@@ -61,6 +61,8 @@
#include fmtftn.hxx
#include fmtrfmrk.hxx
#include fmtfld.hxx
+#include redline.hxx
+#include docary.hxx
SO2_DECL_REF(SwDocShell)
SO2_IMPL_REF(SwDocShell)
@@ -399,7 +401,7 @@ void SwDocTest::testSwScanner()
pTxtNode-CountWords(aDocStat, 0, pTxtNode-Len());
CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_castsal_uLong(2));
-//turn on red-lining
+//turn on red-lining and show changes
m_pDoc-SetRedlineMode(nsRedlineMode_t::REDLINE_ON |
nsRedlineMode_t::REDLINE_SHOW_DELETE|nsRedlineMode_t::REDLINE_SHOW_INSERT);
CPPUNIT_ASSERT_MESSAGE(redlining should be on,
m_pDoc-IsRedlineOn());
CPPUNIT_ASSERT_MESSAGE(redlines should be visible,
IDocumentRedlineAccess::IsShowChanges(m_pDoc-GetRedlineMode()));
@@ -414,6 +416,39 @@ void SwDocTest::testSwScanner()
pTxtNode-SetWordCountDirty(true);
pTxtNode-CountWords(aDocStat, 0, pTxtNode-Len()); //but
word-counting the text should only count the non-deleted text
CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_castsal_uLong(1));
+
+pTxtNode-SetWordCountDirty(true);
+
+//keep red-lining on but hide changes
+m_pDoc-SetRedlineMode(nsRedlineMode_t::REDLINE_ON);
+CPPUNIT_ASSERT_MESSAGE(redlining should be still on,
m_pDoc-IsRedlineOn());
+CPPUNIT_ASSERT_MESSAGE(redlines should be invisible,
!IDocumentRedlineAccess::IsShowChanges(m_pDoc-GetRedlineMode()));
+
+aDocStat.Reset();
+pTxtNode-CountWords(aDocStat, 0, pTxtNode-Len()); //but
word-counting the text should only count the non-deleted text
+CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_castsal_uLong(1));
+
+rtl::OUString sLorem = pTxtNode-GetTxt();
+CPPUNIT_ASSERT(sLorem == Lorem);
+
+const SwRedlineTbl rTbl = m_pDoc-GetRedlineTbl();
+
+SwNodes rNds = m_pDoc-GetNodes();
+CPPUNIT_ASSERT(rTbl.Count() == 1);
+
+SwNodeIndex* pNodeIdx = rTbl[0]-GetContentIdx();
+CPPUNIT_ASSERT(pNodeIdx);
+
+pTxtNode = rNds[ pNodeIdx-GetIndex() + 1 ]-GetTxtNode();
//first deleted txtnode
+CPPUNIT_ASSERT(pTxtNode);
+
+rtl::OUString sIpsum = pTxtNode-GetTxt();
+CPPUNIT_ASSERT(sIpsum == ipsum);
+
+aDocStat.Reset();
+pTxtNode-CountWords(aDocStat, 0, pTxtNode-Len()); //word-counting
the text should only count the non-deleted text, and this whole chunk should be
ignored
+CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_castsal_uLong(0));
+CPPUNIT_ASSERT_EQUAL(aDocStat.nChar, static_castsal_uLong(0));
}
}
diff --git a/sw/source/core/txtnode/txtedt.cxx
b/sw/source/core/txtnode/txtedt.cxx
index 7da33e9..9f18fc7 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1830,6 +1830,11 @@ void SwTxtNode::ReplaceTextOnly( xub_StrLen nPos,
xub_StrLen nLen,
void SwTxtNode::CountWords( SwDocStat rStat,
xub_StrLen nStt, xub_StrLen nEnd ) const
{
+if (IsInRedlines())
+{ //not counting txtnodes used to hold deleted redline content
+return;
+}
+
sal_Bool isCountAll = ( (0 == nStt) (GetTxt().Len() == nEnd) );
++rStat.nAllPara; // #i93174#: count _all_ paragraphs
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on||51772, 51252 --- Comment #46 from Michael Meeks michael.me...@novell.com 2012-07-19 13:11:09 UTC --- add bug#51252 - can't start on Windows - missing VS2010 run-time (?) add bug#51772 - general I/O error loading RTF file, apparently a regression -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: What is bibisect? And what is it doing in my office?
On 19/07/12 14:50, Norbert Thiebaud wrote: On Thu, Jul 19, 2012 at 4:14 AM, Stephan Bergmann sberg...@redhat.com wrote: make dev-install works well on Mac anyway, or what am I missing? It does indeed... I got thrown-off by the ominous FIXME: linkoo currently does not work on Mac OS X message at the end :-) then again there are people that claim linkoo doesn't work on any platform, because it's broken by design :) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: git branch audit ...
On Wed, Jul 18, 2012 at 11:51 AM, Michael Meeks michael.me...@suse.com wrote: origin/feature/accfixes2 acc2 cws... not to be merged any time soon... but still keeping it around would not hurt origin/feature/coretext I've been doing some coretext support work in there.. but I have merged most of it I think... I'll check... origin/feature/external_gbuild That was a naive attempt to deal with gbuildification of external libraries... no much future for that attempt, can be killed Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [HELP] fdo#51239 how to debug it is slow
On Thu, Jul 19, 2012 at 02:53:35PM +0200, Stephan Bergmann wrote: On 07/19/2012 02:38 PM, Lionel Elie Mamane wrote: On Thu, Jul 19, 2012 at 02:12:30PM +0200, Stephan Bergmann wrote: On 07/18/2012 10:06 AM, Lionel Elie Mamane wrote: I noticed that there are truckloads of calls to m_pVm-AttachCurrentThread from jvmaccess::VirtualMachine::attachThread (jvmaccess/source/virtualmachine.cxx). Such outermost calls into JNI (i.e., not recursively from a thread that is already in a JNI call, where jvmaccess::VirtualMachine::attachThread would be cheap) are always expensive (...). The LO database code is notorious for making truckloads of such expensive outermost JNI calls, (...) Try to give me an idea what would cause such calls. Is it Java code calling C(++) code (presumably through UNO) or C(++) code calling Java code (again presumably through UNO)? Grepping for jvmaccess::VirtualMachine::AttachGuard in connectivity and dbaccess should show the places where this is done. It is wrapped in a SDBThreadAttach class, and this grep yields the expected places. Good, I see now. For example, to minimise the number of Java calls from C++ , maybe we could, when we retrieve a whole row through JDBC, doing this from Java code instead of from C++ code: for (i=0; i row-getNumberOfColumns; ++i) cacheEntry[i]=row-getColumnValue(i); This would bring us down from one call per column to one call per row, hopefully without duplicating *too* *much* logic between a C++ version and a Java version. Yes, this could be helpful. (When I discussed this with Ocke years ago, he always claimed there it was not possible to redesign the connectivity/dbaccess code to reduce the number of such outermost JNI calls, though.) Well, I haven't thought of a clean way to do it yet; several approaches exist. I'll have to sleep on it. Listing them here mostly not to forget them. One idea is to extend our SDBC API (which is basically a C++ version of JDBC, which is an extension of ODBC, which is an extension of X/Open SQL CLI, ...); it currently has only retrieve one column value; we'd add an *optional* get a whole row. If the optional extension is not implemented, the code would fallback to a C++ implementation of get a whole row that makes multiple calls to retrieve one column value. Replace source/drivers/jdbc/JStatement.cxx (and friends), which *are* called through UNO, by a full-Java implementation; ah no, that wouldn't help, since each UNO call would pass the expensive C++/Java barrier :-| Change source/drivers/jdbc/JStatement.cxx (and friends) to retrieve the whole row (through an ad-hoc Java function) and cache it? Which would make us a *third* level of caching, but well... Maybe it can cooperate with KeySet so that KeySet does not cache again in this case. Hmmm... the caching nature of KeySet was introduced because of ODBC limitations; maybe we could push that to drivers (through a helper wrapper class they can use to provide this): - the SDBC-ODBC layer would use the helper class as is; since it is to blame for the limitations that introduce the need for caching... Only it would suffer from the consequences. - the SDBC-JDBC layer would have a special implementation that fetches the whole row in one ad-hoc Java function call. I'm fond of my trampoline idea, but 't would have to be done in a clean way; not sure yet how. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: C++11 in LibreOffice
On Thu, Jul 19, 2012 at 08:59:34AM -0400, Kohei Yoshida wrote: On Thu, Jul 19, 2012 at 7:45 AM, Michael Stahl mst...@redhat.com wrote: i don't believe an office suite will benefit all that much from sophisticated compiler optimizations; It's certainly your opinion. But I tend think that, any binary generated from a compiler could use the benefit of compiler optimization. I find it hard to believe that somehow an office suite category is an exception. But maybe it's just me. I think Michael was suggesting that our prouct is IO-bound and not that CPU-bound anyway. While that isnt completely the case for the area you work on it is a valid assumption for the product as a whole. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
mdds to be updated to 0.6.0
Hi folks, Just FYI that I'll be working to update mdds to 0.6.0 today (on master). This means that, if you pull and do an incremental build sometime today, it may fail in mdds if the timing is bad. If it does, please re-run configure and do a clean build again. I'll let you guys know when the work finishes. Best, Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: C++11 in LibreOffice
On Thu, 2012-07-19 at 16:04 +0200, Michael Stahl wrote: i'm saying it doesn't benefit from the sophisticated optimizations that vendor compilers like SunStudio or Intel do that speed up your BLAS stuff with gigabytes of floating point arrays by X times because office suites don't contain gigabytes of floating point arrays. So - Kohei has been working for years to turn Calc spreadsheets into gigabyte arrays of floating point numbers - precisely to take advantage of this sort of optimisation :-) Having said that, I totally agree, our problems are 95% algorithmic, and fiddling with compiler optimiser settings is the last refuge of the desperate man ;-) The thing that concerns me about gcc vs. MSVC++ is not the speed of the generated code, but it's size (which impacts startup performance, I/O load, memory use etc.). If you checkout the tables you linked the binary size column is quite stark: http://www.willus.com/ccomp_benchmark2.shtml?p18+s12 http://www.willus.com/ccomp_benchmark2.shtml?p14+s12 in several cases a 2x growth. So - clearly this would need benchmarking various ways to see what the story is there with -Os etc. IMHO it's well worth looking at a gcc cross-compiled solution for Windows though; if only to use really fast, fully repeatable, Free Software tooling; though it'd be nice to use an enterprise / maintained cross-compiler - where is cygnus when you need them :-) 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] .: Branch 'libreoffice-3-6' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 +++-
writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 +-
writerfilter/source/rtftok/rtfsdrimport.cxx| 10 ++
3 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 0c1de6d3d6320f91770967d1b23c8dd57d168fe7
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Jul 18 22:47:03 2012 +0200
fdo#52066 fix RTF import of rectangle shape without text in it
We used to always add a paragraph on shapes, which breaks import of
abused rectangle shapes with minimal height, used as lines.
Change-Id: Ice240bad68bc030e7889c46f72c45646307f17e5
Signed-off-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index be34248..08fef7a 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3624,9 +3624,11 @@ void RTFDocumentImpl::setDestinationText(OUString
rString)
m_aStates.top().aDestinationText.append(rString);
}
-void RTFDocumentImpl::replayShapetext()
+bool RTFDocumentImpl::replayShapetext()
{
+bool bRet = !m_aShapetextBuffer.empty();
replayBuffer(m_aShapetextBuffer);
+return bRet;
}
bool RTFDocumentImpl::getSkipUnknown()
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 5756b5a..9778ce7 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -368,7 +368,7 @@ namespace writerfilter {
/// Resolve a picture: If not inline, then anchored.
int resolvePict(bool bInline);
void runBreak();
-void replayShapetext();
+bool replayShapetext();
bool getSkipUnknown();
void setSkipUnknown(bool bSkipUnknown);
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index ab4118c..dba4545 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -316,10 +316,12 @@ void RTFSdrImport::resolve(RTFShape rShape)
// Send it to dmapper
m_rImport.Mapper().startShape(xShape);
m_rImport.Mapper().startParagraphGroup();
-m_rImport.replayShapetext();
-m_rImport.Mapper().startCharacterGroup();
-m_rImport.runBreak();
-m_rImport.Mapper().endCharacterGroup();
+if (m_rImport.replayShapetext())
+{
+m_rImport.Mapper().startCharacterGroup();
+m_rImport.runBreak();
+m_rImport.Mapper().endCharacterGroup();
+}
m_rImport.Mapper().endParagraphGroup();
m_rImport.Mapper().endShape();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
minutes of ESC call ...
* Present: Norbert, Stephan, Eike, David T, Lionel, Markus, Kendy, Bjoern, Caolan, Andras, Michael M, Fridrich, Michael S, Rainer, Astron, Tibbylickle * Completed Action Items + fix CC-By-SA licensing requirements (Andras) + Mango icons - in gerrit pending review (Astron) AI: + reviewing action needed for 3-6-0 etc. (Michael, Caolan) * Pending Action Items + notify all committers when we have a nice simple, minimal statement of what is required for gerrit written (Bjoern) AI: + get list of freedesktop mails to Bjoern (Norbert) + check new templates are using auto-fitting functionality (Thorsten) + crediting: can we separate tempates in the credits page (Spaetz?) + quest for kind volunteer to update the website (Michael) * Release Engineering update (Fridrich) + 3.5.5 released, DVDs up-loaded yesterday etc. + 3.6.0 RC2 + build issues on windows but finally up-loaded this morning + synching to mirrors, announce expected tomorrow + branch created for libreoffice-3-6-0 + commits must be cherry-picked from 3-6 + after an additional two reviews (+1 for -3-6) + 3.5.6 RC1 - July 30th ish * 3.6.0 blocker bug check (Petr/Michael) + https://bugs.freedesktop.org/showdependencytree.cgi?id=6hide_resolved=1 + Java runtime fix / cherry-pick + concerned that the fix is right ? we can't ship endless MSVC++ runtimes. + 3.5+ Mac a11y issue - Stephan Norbert hunting + working with 3.6 and it works well (Rainer) + most concern around base performance issues + integrated cache regression speedup before branch (Fridrich) + not a crash issue (Lionel) + we can release-note fix for 3.6.1 AI: + review updated license / dos (Caolan, Bjoern) + concern wrt. count of testers (Bjeorn) + universal / release snapshot unique IP numbers + B1 1200, B2 1200, B3 700, RC1 500 + B3: 55 Linux, 54 Mac, 584 Windows + plus Linux distro downloads in parallel AI: + check updater to push people through to upgrade RCs (Kendy) * GSOC update (Fridrich) + nine of ten students passed the midterm evaluation + lots of great work going on, and applied dedication * UI / design update (Astron) + icons already discussed AI: + another review for splash-screens (Michael) + about box background image pending + 'official' conference logo is pending needs decision * cppunit / build issues (Stephan/Moggi/Michael) + --disable-cve-tests - useful on windows wrt. anti-virus + slam-dunk / good idea, merge the patch. + indifferent about --disable-xmlsec + only intended for iOS / Android currently, should not be used on Linux. + configure should check fail if this option is set for non iOS / Android + --disable-cppunit is controversial + programmers are lazy, we want widespread unit test running coverage (Markus) + once needed to disable unit tests working on coretext (Norbert) + 'make build' already exists (Markus) + not widely publicised + disables all unit tests in the build + problem is it doesn't build an install-set + can run make cmd cmd=bin/ooinstall after that + Ubuntu disables tests during the build already, so make check runs them in a separate phase (Bjoern) + disabling unit tests generally seems a bad idea, each time unit tests break - turned out to be a regression (Fridrich) + potential unit test performance problems + potential slowdown for linux tinderbox build tests investigating it (Norbert) + seen some runaway unit tests / slowchecks, chasing it (Bjoern) + will continue to dedicate some small % of build-time running unit tests * MSI cross-compilation from Linux (Tibby) + been merged to master + java enabled / compilation issues + help with build process / location of uuidgen using undocumented parameters etc. AI: + help get tinderboxes building up-loading msis (Andras) * re-basing update (Michael) + 85 modules ~complete, 48 to go + ~19k files re-based. * un-merged patches in bugzilla (Michael S / Caolan) + down to a dozen or so left. * ODF update (Thorsten) + long term sub-committee working on new change-tracking -proposal- on the horizon - more flexible,
Re: [Libreoffice-qa] minutes of ESC call ...
On Thu, Jul 19, 2012 at 10:50 AM, Michael Meeks michael.me...@suse.com wrote: * Pending Action Items + notify all committers when we have a nice simple, minimal statement of what is required for gerrit written (Bjoern) Done ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-6, 3-6-0] fdo#50345 accept empty string as scalar numeric 0 argument
Hey Eike, Kohei, 2012/7/19 Kohei Yoshida kohei.yosh...@gmail.com: On 07/19/2012 10:29 AM, Eike Rathke wrote: Hi, Please review and cherry-pick to 3-6 and 3-6-0 http://cgit.freedesktop.org/libreoffice/core/commit/?id=a439cb5aba49d01df20f67a2c84b68542e4d3d5a that resolves https://bugs.freedesktop.org/show_bug.cgi?id=50345 to accept empty string and strings containing only blanks as an argument converted to numeric 0. We already discussed this on IRC, but I disagree with this fix since it basically breaks another valid use case that relies on the current behavior. So, I'm afraid I cannot sign off on this. Having said that, if someone else wants to sign off on this, then I'll stay silent. I'm also not fully convinced of this patch. This behavior has been in Libreoffice since the start so IMHO it is more important to keep the behavior for all the LibO users than to change it again to please potential users switching from OOo. I think the only sane solution that will please both sides is to have it as configuration option but I'm not thrilled to see the default behavior changed again. This is just my opinion and if anyone still think it is a good idea the patch looks correct from a technical perspective. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - sw/source writerfilter/source
sw/source/filter/ww8/rtfattributeoutput.cxx | 10 --
sw/source/filter/ww8/rtfattributeoutput.hxx |5 +
sw/source/filter/ww8/rtfexport.cxx|4 +++-
writerfilter/source/dmapper/DomainMapper_Impl.cxx |3 ++-
writerfilter/source/rtftok/rtfdocumentimpl.cxx|4 +++-
writerfilter/source/rtftok/rtfdocumentimpl.hxx|2 +-
writerfilter/source/rtftok/rtfsdrimport.cxx | 10 ++
7 files changed, 28 insertions(+), 10 deletions(-)
New commits:
commit 33b5531fcc91d52196d6a5a1da976c8e0c5c6d97
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jun 26 16:39:17 2012 +0200
fdo#48335 two RTF export fixes
1) don't try to end not started runs
(cherry picked from commit 5d505e5b1edee7f709e4baff70a971cb3fe851c2)
Conflicts:
sw/source/filter/ww8/rtfattributeoutput.cxx
2) avoid fake page breaks on page style changes
The problem was that a page break has been always exported when the page
style changed -- but in case the page style changes just because of
first page-like styles, we don't need that.
(cherry picked from commit a03895986308206cc13a6f5ae25138d4b4ad5d43)
Change-Id: I05940e7ff649051ecae4a72ae73617a47ffca885
Signed-off-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 0c3533b..49df6ef 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -345,6 +345,8 @@ void RtfAttributeOutput::StartParagraphProperties( const
SwTxtNode rNode )
{
const SwTxtNode* pTxtNode = static_cast SwTxtNode* (
aNextIndex.GetNode() );
m_rExport.OutputSectionBreaks( pTxtNode-GetpSwAttrSet(), *pTxtNode );
+// Save the current page description for now, so later we will be able
to access the previous one.
+m_pPrevPageDesc = pTxtNode-FindPageDesc(sal_False);
}
else if ( aNextIndex.GetNode().IsTableNode() )
{
@@ -378,6 +380,7 @@ void RtfAttributeOutput::StartRun( const SwRedlineData*
pRedlineData, bool bSing
{
OSL_TRACE(%s, OSL_THIS_FUNC);
+m_bInRun = true;
m_bSingleEmptyRun = bSingleEmptyRun;
if (!m_bSingleEmptyRun)
m_aRun.append('{');
@@ -393,8 +396,9 @@ void RtfAttributeOutput::EndRun()
OSL_TRACE(%s, OSL_THIS_FUNC);
m_aRun.append(m_rExport.sNewLine);
m_aRun.append(m_aRunText.makeStringAndClear());
-if (!m_bSingleEmptyRun)
+if (!m_bSingleEmptyRun m_bInRun)
m_aRun.append('}');
+m_bInRun = false;
}
void RtfAttributeOutput::StartRunProperties()
@@ -3024,7 +3028,9 @@ RtfAttributeOutput::RtfAttributeOutput( RtfExport
rExport )
m_bHadFieldResult( false ),
m_bTableRowEnded( false ),
m_aCells(),
-m_bSingleEmptyRun(false)
+m_bSingleEmptyRun(false),
+m_bInRun(false),
+m_pPrevPageDesc(0)
{
OSL_TRACE(%s, OSL_THIS_FUNC);
}
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx
b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 406f063..5af53dd 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -542,6 +542,8 @@ private:
/// If we're in a paragraph that has a single empty run only.
bool m_bSingleEmptyRun;
+
+bool m_bInRun;
public:
RtfAttributeOutput( RtfExport rExport );
@@ -552,6 +554,9 @@ public:
rtl::OStringBuffer m_aTabStop;
+/// Access to the page style of the previous paragraph.
+const SwPageDesc* m_pPrevPageDesc;
+
// These are used by wwFont::WriteRtf()
/// Start the font.
void StartFont( const String rFamilyName ) const;
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index cf13e5f..4d46277 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -698,7 +698,9 @@ void RtfExport::PrepareNewPageDesc( const SfxItemSet* pSet,
else if ( pNewPgDesc )
m_pSections-AppendSection( pNewPgDesc, rNd, pFmt, nLnNm );
-AttrOutput().SectionBreak( msword::PageBreak,
m_pSections-CurrentSectionInfo() );
+// Don't insert a page break, when we're changing page style just because
the next page has to be a different one.
+if (!m_pAttrOutput-m_pPrevPageDesc ||
m_pAttrOutput-m_pPrevPageDesc-GetFollow() != pNewPgDesc)
+AttrOutput().SectionBreak( msword::PageBreak,
m_pSections-CurrentSectionInfo() );
}
bool RtfExport::DisallowInheritingOutlineNumbering( const SwFmt rFmt )
commit 364cb1e3f0915dd11766ba9ddf97b2cdea66df71
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jun 22 18:55:15 2012 +0200
fdo#46966 dmapper: fix headery/footery default value
The docx spec doesn't say what is the default value, the rtf spec says
it's 720, not 1440.
Change-Id: Icb331591d4f2f96a7786f808d99af5974e645f8e
Signed-off-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Re: [HELP] fdo#51239 how to debug it is slow
On Thu, 2012-07-19 at 15:47 +0200, Lionel Elie Mamane wrote: I'm fond of my trampoline idea, but 't would have to be done in a clean way; not sure yet how. Heh ;-) I'm still holding my breath for the end-of-problem Firebird solution myself ... I wonder if there are some sillies that we could tighten up there though - eg. there could be random ref/unref thrash in the Java / bridge traffic that might be easy to reduce. In theory there is this beautiful built-in UNO tracing logic that I've never used - that can show us all the calls that happen between various pieces - Stephan: could that get us a trace of the back-to-back cross-language thrash ? Presumably just looking at that would give us some immediate inspiration :-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [HELP] fdo#51239 how to debug it is slow
On 07/19/2012 06:03 PM, Michael Meeks wrote: On Thu, 2012-07-19 at 15:47 +0200, Lionel Elie Mamane wrote: I'm fond of my trampoline idea, but 't would have to be done in a clean way; not sure yet how. Heh ;-) I'm still holding my breath for the end-of-problem Firebird solution myself ... I wonder if there are some sillies that we could tighten up there though - eg. there could be random ref/unref thrash in the Java / bridge traffic that might be easy to reduce. In theory there is this beautiful built-in UNO tracing logic that I've never used - that can show us all the calls that happen between various pieces - Stephan: could that get us a trace of the back-to-back cross-language thrash ? This is about direct use of JNI, not via UNO. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-3-6]: fdo#52066 fix RTF import of rectangle shape without text in ...
From Miklos Vajna vmik...@suse.cz: Miklos Vajna has abandoned this change. Change subject: fdo#52066 fix RTF import of rectangle shape without text in it .. Patch Set 1: Abandoned 17:56 @llunak vmiklos: I have backported your https://gerrit.libreoffice.org/#/c/330/ to 3-6 too, since I didn't see it was meant for 3-5 -- To view, visit https://gerrit.libreoffice.org/329 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ice240bad68bc030e7889c46f72c45646307f17e5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6-0' - 2 commits - icon-themes/galaxy instsetoo_native/util
icon-themes/galaxy/brand/flat_logo.svg | 103 icon-themes/galaxy/brand/intro.png |binary icon-themes/galaxy/brand/shell/backing_left.png |binary icon-themes/galaxy/brand/shell/backing_rtl_left.png |binary icon-themes/galaxy/brand_dev/intro.png |binary instsetoo_native/util/openoffice.lst|2 6 files changed, 45 insertions(+), 60 deletions(-) New commits: commit 317489c04a54ae70ccd2e86421988ff51f26f512 Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Mon Jul 16 02:39:07 2012 +0200 fdo#51890: Display themed progress meter instead of the native one Change-Id: Ia72f46763de40205b1a8a9bb94839bb420933443 Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch Signed-off-by: Thorsten Behrens t...@documentfoundation.org Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 4fee7f4..377b771 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -25,7 +25,7 @@ Globals PROGRESSSIZE 319,10 PROGRESSPOSITION 164,225 PROGRESSFRAMECOLOR 207,208,211 -NATIVEPROGRESS true +NATIVEPROGRESS false REGISTRYLAYERNAME Layers SERVICEPACK 1 UPDATE_DATABASE 1 commit 59c26e93bd22dc32ad7f0c4af4ddd7b56462bbb7 Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Mon Jul 16 02:31:20 2012 +0200 Bring community branding in line with actual community logo Change-Id: Ib1e1d1ff7f20f51f991c7a14a6e5dc1510d8c1fd Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch Signed-off-by: Thorsten Behrens t...@documentfoundation.org Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/icon-themes/galaxy/brand/flat_logo.svg b/icon-themes/galaxy/brand/flat_logo.svg index 371e838..1559033 100644 --- a/icon-themes/galaxy/brand/flat_logo.svg +++ b/icon-themes/galaxy/brand/flat_logo.svg @@ -45,16 +45,6 @@ style=stop-color:#18a303;stop-opacity:1 offset=1 / /linearGradient -radialGradient - cx=520.80676 - cy=183.92038 - r=265 - fx=520.80676 - fy=183.92038 - id=radialGradient10424 - xlink:href=#linearGradient13473 - gradientUnits=userSpaceOnUse - gradientTransform=matrix(-0.92370346,0,0,-0.81991269,1087.8944,75.325519) / linearGradient id=linearGradient13473 stop @@ -114,55 +104,50 @@ id=rect13441 style=fill:url(#radialGradient11592);fill-opacity:1;stroke:none / /g - g - transform=matrix(0.67103871,0,0,0.67103868,-260.75081,-1572.1824) - id=g4122 - style=display:inline -path - d=m 643.40618,2379.7827 0,45.9017 29.59884,0 0,-6.9733 -20.56412,0 0,-38.9284 -9.03472,0 - id=path3047 - style=font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ff;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur / -path - d=m 678.46533,2425.6844 9.03473,0 0,-33.0384 -9.03473,0 0,33.0384 m 4.51736,-35.8819 c 2.83178,0 5.1916,-2.3019 5.1916,-5.2131 0,-2.8434 -2.35982,-5.2129 -5.1916,-5.2129 -2.89921,0 -5.1916,2.3695 -5.1916,5.2129 0,2.9112 2.29239,5.2131 5.1916,5.2131 - id=path3049 - style=font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ff;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur / -path - d=m 703.23342,2396.505 -0.13485,0 0,-19.5658 -9.03472,0 0,48.7452 8.83246,0 0.20226,-3.8591 0.13485,0 c 2.83178,3.1821 5.66357,4.5361 10.31577,4.5361 8.76503,0 14.56345,-7.9211 14.56345,-17.8056 0,-9.5459 -5.19161,-16.5869 -14.1589,-16.5869 -4.78706,0 -7.61885,1.4218 -10.72032,4.5361 m -0.13485,11.9155 c 0,-5.6869 2.5621,-9.4782 7.41657,-9.4782 5.39387,0 8.09081,3.8589 8.09081,10.1552 0,6.2285 -2.62952,10.2906 -7.95596,10.2906 -4.6522,0 -7.55142,-3.6559 -7.55142,-9.4782 l 0,-1.4894 - id=path3051 - style=font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ff;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur / -path - d=m 752.35511,2391.9689 c -4.3151,0.2709 -8.42793,2.9112 -10.31578,6.5671 l -0.13484,0 -0.20227,-5.89 -8.83246,0 0,33.0384 9.03473,0 0,-12.4571 c 0,-6.6348 1.21362,-9.0044 3.30374,-10.4937 1.82043,-1.2864 3.97798,-1.828 6.94461,-1.9635 l 0.20227,-8.8012 - id=path3053 - style=font-size:67.56232452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ff;fill-opacity:1;stroke:none;font-family:Vegur;-inkscape-font-specification:Vegur / -path - d=m 785.59681,2407.2019 c 0,-8.192 -4.98934,-15.233 -13.61952,-15.233
[PUSHED-3-6-0] Branding Splash screen fix
On Tue, 2012-07-17 at 17:12 +0200, Thorsten Behrens wrote: Stefan Knorr (Astron) wrote: Edited subject accordingly. Please review for 3.6.0. Thanks! This has my approval for 3-6-0. Thanks a lot Astron for fixing this! As agreed in the ESC, I gave it a last review pushed it :-) 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: minutes of ESC call ...
Hi, On Thu, Jul 19, 2012 at 04:50:28PM +0100, Michael Meeks wrote: * cppunit / build issues (Stephan/Moggi/Michael) + indifferent about --disable-xmlsec + only intended for iOS / Android currently, should not be used on Linux. + configure should check fail if this option is set for non iOS / Android We use --disable-xmlsec for mingw builds too (it most probably means libxmlsec does not cross-compile with mingw ATM; I do not remember). * MSI cross-compilation from Linux (Tibby) + been merged to master + java enabled / compilation issues + help with build process / location of uuidgen using undocumented parameters etc. What is the exact problem here? Note that the uuidgen binary from util-linux is not the one to use. There is another one (at least in Fedora) called uuid (from package uuid), that seems to be command-line-option-compatible with the Windows' uuidgen.exe . There is even a check for it in configure, but it only issues warning if it is not found (if we are going to always generate the MSI, it should be changed to error). D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
On Thu, Jul 19, 2012 at 5:50 PM, Michael Meeks michael.me...@suse.com wrote: * 4.0 - when to call it that ? (Kendy) + http://wiki.documentfoundation.org/Development/LibreOffice4 + too much to do in one six-month section IMNSHO, most of the stuff on that page can be accomplished in small, easy chunks, with a minimum of disruption: For each piece, create an EasyHack that looks like: (a) create new methods, namespaces, etc. that fix the problem (b) mark old stuff as deprecated http://stackoverflow.com/questions/295120/c-mark-as-deprecated (c) let the compiler point out the places that need changing (d) leave the old stuff for a couple of releases, and then start a rolling delete ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
On Thu, 2012-07-19 at 16:50 +0100, Michael Meeks wrote: AI: + review updated license / dos (Caolan, Bjoern) Looked ok to me, I then miscounted the reviews and pushed this to 3-6-0 (*shrug*) C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [HELP] fdo#51239 how to debug it is slow
On Thu, Jul 19, 2012 at 05:03:32PM +0100, Michael Meeks wrote: On Thu, 2012-07-19 at 15:47 +0200, Lionel Elie Mamane wrote: I'm fond of my trampoline idea, but 't would have to be done in a clean way; not sure yet how. Heh ;-) I'm still holding my breath for the end-of-problem Firebird solution myself ... Even if we switch to Firebird for our embedded database, we still want to support connecting to any database through any JDBC driver, so this question of heavy C++ - Java cost will still be on the table. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/ui/docshell/impex.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b7dbc768a71ccfb567e3b2979e57d0d1318977cf Author: Eike Rathke er...@redhat.com Date: Thu Jul 19 18:10:49 2012 +0200 resolved fdo#52205 do not force all text cells in CSV import Do not set ScSetStringParam::mbSetTextCellFormat=true for SetString() that slightly changed behavior, the nColFormat==SC_COL_TEXT case is handled separately anyway. Change-Id: I0a0f9472801dcb02af77d6eaf90170309a41e9a8 diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 877dfa1..3e1026c 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -1202,7 +1202,7 @@ static bool lcl_PutString( ScSetStringParam aParam; aParam.mpNumFormatter = pFormatter; aParam.mbDetectNumberFormat = bDetectNumFormat; -aParam.mbSetTextCellFormat = true; +aParam.mbSetTextCellFormat = false; aParam.mbHandleApostrophe = false; pDoc-SetString( nCol, nRow, nTab, rStr, aParam ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: C++11 in LibreOffice
+1 on considering startup performance/memory usage. It looks like with Office 13 Microsoft has done more work in getting Office to startup faster (no benchmarks, just anecdotal experience). +1 on the ability to do some kind of cross-compiling solution in parallel. +1 on gigabyte spreadsheets of floating point numbers. The competition kind of sucks in this regard... :-) On Thu, Jul 19, 2012 at 10:26 AM, Michael Meeks michael.me...@suse.com wrote: On Thu, 2012-07-19 at 16:04 +0200, Michael Stahl wrote: i'm saying it doesn't benefit from the sophisticated optimizations that vendor compilers like SunStudio or Intel do that speed up your BLAS stuff with gigabytes of floating point arrays by X times because office suites don't contain gigabytes of floating point arrays. So - Kohei has been working for years to turn Calc spreadsheets into gigabyte arrays of floating point numbers - precisely to take advantage of this sort of optimisation :-) Having said that, I totally agree, our problems are 95% algorithmic, and fiddling with compiler optimiser settings is the last refuge of the desperate man ;-) The thing that concerns me about gcc vs. MSVC++ is not the speed of the generated code, but it's size (which impacts startup performance, I/O load, memory use etc.). If you checkout the tables you linked the binary size column is quite stark: http://www.willus.com/ccomp_benchmark2.shtml?p18+s12 http://www.willus.com/ccomp_benchmark2.shtml?p14+s12 in several cases a 2x growth. So - clearly this would need benchmarking various ways to see what the story is there with -Os etc. IMHO it's well worth looking at a gcc cross-compiled solution for Windows though; if only to use really fast, fully repeatable, Free Software tooling; though it'd be nice to use an enterprise / maintained cross-compiler - where is cygnus when you need them :-) 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 mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW 3-6, 3-6-0] resolved fdo#52205 do not force all text cells in CSV import
Hi, Please review and cherry-pick to 3-6 and 3-6-0 http://cgit.freedesktop.org/libreoffice/core/commit/?id=b7dbc768a71ccfb567e3b2979e57d0d1318977cf that fixes https://bugs.freedesktop.org/show_bug.cgi?id=52205 Thanks Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpFQDgkCBAdM.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/unitymenus' - framework/source vcl/inc vcl/source
framework/source/uielement/menubarmanager.cxx |5 +++
framework/source/uielement/menubarwrapper.cxx |4 +++
vcl/inc/vcl/menu.hxx |4 +++
vcl/source/window/menu.cxx| 33 ++
4 files changed, 45 insertions(+), 1 deletion(-)
New commits:
commit 432cb6e505251a6465db5b1d49f5831b0b4ec380
Author: Antonio Fernandez antonio.fernan...@aentos.es
Date: Thu Jul 19 17:40:17 2012 +0100
Added a freeze method to Menu. Menus are now displayed on console.
Change-Id: I71bfc2c0272154b9ff5c2dabe7508a98950e199c
diff --git a/framework/source/uielement/menubarmanager.cxx
b/framework/source/uielement/menubarmanager.cxx
index 5e85620..d19a8bb 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1004,6 +1004,9 @@ IMPL_LINK( MenuBarManager, Activate, AbstractMenu *,
pMenu )
}
}
+//pMenu-Freeze();
+m_pVCLMenu-Freeze();
+
return 1;
}
@@ -1708,7 +1711,7 @@ void MenuBarManager::FillMenu(
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, framework, ocke.jans...@sun.com,
MenuBarManager::FillMenu );
// Fill menu bar with container contents
-for ( sal_Int32 n = 0; n rItemContainer-getCount(); n++ )
+ for ( sal_Int32 n = 0; n rItemContainer-getCount(); n++ )
{
Sequence PropertyValueaProp;
rtl::OUString aCommandURL;
diff --git a/framework/source/uielement/menubarwrapper.cxx
b/framework/source/uielement/menubarwrapper.cxx
index 45d5bf8..888f9d8 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -181,6 +181,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence
Any aArguments ) th
// Fill menubar with container contents
sal_uInt16 nId = 1;
MenuBarManager::FillMenuWithConfiguration( nId,
pVCLMenuBar, aModuleIdentifier, m_xConfigData, xTrans );
+//pVCLMenuBar-Freeze();
}
}
catch ( const NoSuchElementException )
@@ -222,6 +223,9 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence
Any aArguments ) th
// Don't use this toolkit menu bar or one of its functions. It is
only used as a data container!
pAwtMenuBar = new VCLXMenuBar( pVCLMenuBar );
m_xMenuBar = Reference XMenuBar ( static_cast OWeakObject *(
pAwtMenuBar ), UNO_QUERY );
+
+// Freeze the menubar
+pVCLMenuBar-Freeze();
}
}
}
diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx
index 3c4c753..f98e87e 100644
--- a/vcl/inc/vcl/menu.hxx
+++ b/vcl/inc/vcl/menu.hxx
@@ -198,6 +198,8 @@ public:
// Returns the system's menu handle if native menus are supported
// pData must point to a SystemMenuData structure
virtual sal_BoolGetSystemMenuData( SystemMenuData* pData )
const = 0;
+
+virtual voidFreeze(void) = 0;
};
//
@@ -455,6 +457,8 @@ public:
voidHighlightItem( sal_uInt16 nItemPos );
voidDeHighlight() { HighlightItem( 0x ); } //
MENUITEMPOS_INVALID
+
+voidFreeze();
};
// ---
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 3b4ac0d..121ee14 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -6063,4 +6063,37 @@ ImplMenuDelData::~ImplMenuDelData()
const_cast Menu* ( mpMenu )-ImplRemoveDel( *this );
}
+#include iostream
+using namespace std;
+
+void printMenu( AbstractMenu* pMenu ) {
+if ( pMenu ) {
+sal_uInt16 itemCount = pMenu-GetItemCount();
+MenuItemList *items = ((Menu*)pMenu)-GetItemList();
+
+for (int i=0; i itemCount; i++) {
+MenuItemData *itemData = items-GetDataFromPos(i);
+sal_uInt16 itemId = pMenu-GetItemId(i);
+
+if (itemData-eType == MENUITEM_SEPARATOR) {
+cout --- endl;
+} else {
+rtl::OUString itemText = itemData-aText;
+rtl::OUString cmdString = itemData-aCommandStr;
+cout Item ID: itemIdText: itemText
CMD: cmdString endl;
+
+if (itemData-pSubMenu) {
+cout SUBMENU endl;
+printMenu( itemData-pSubMenu );
+}
+}
+}
+}
+}
+
+void Menu::Freeze() {
+printMenu( this );
+cout
endl;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes2' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/remote' - 2 commits - android/sdremote sd/Library_sd.mk sd/source
android/sdremote/src/org/libreoffice/impressremote/TestClient.java |2
sd/Library_sd.mk |1
sd/source/ui/inc/Server.hxx|2
sd/source/ui/remotecontrol/Listener.cxx| 16 -
sd/source/ui/remotecontrol/Receiver.cxx| 97
--
sd/source/ui/remotecontrol/Receiver.hxx|6
sd/source/ui/remotecontrol/Server.cxx | 76
---
sd/source/ui/slideshow/slideshow.cxx |4
8 files changed, 54 insertions(+), 150 deletions(-)
New commits:
commit c88c56c30c1484e0100e36de9365e8a6c38a8caf
Author: Andrzej J. R. Hunt andr...@ahunt.org
Date: Thu Jul 19 18:43:18 2012 +0200
Moved preview image preparation/transfer into separate class. Enabled.
Change-Id: I09b0c2d1521939af058526d1727d0c4d34ad0452
diff --git a/android/sdremote/src/org/libreoffice/impressremote/TestClient.java
b/android/sdremote/src/org/libreoffice/impressremote/TestClient.java
index 1b0f749..4d716ad 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/TestClient.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/TestClient.java
@@ -158,8 +158,6 @@ public class TestClient extends Activity {
mImageView.setImageBitmap(aBitmap);
mCurrentPreviewImageMissing = false;
}
- mImageView.setImageBitmap(aBitmap);
- // TODO: remove above line, use slide changed
to show image.
break;
}
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 2b43a36..4847abf 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -320,6 +320,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/presenter/PresenterPreviewCache \
sd/source/ui/presenter/PresenterTextView \
sd/source/ui/presenter/SlideRenderer \
+sd/source/ui/remotecontrol/ImagePreparer \
sd/source/ui/remotecontrol/Server \
sd/source/ui/remotecontrol/Receiver \
sd/source/ui/remotecontrol/Listener \
diff --git a/sd/source/ui/inc/Server.hxx b/sd/source/ui/inc/Server.hxx
index b0dcc1c..065b1cd 100644
--- a/sd/source/ui/inc/Server.hxx
+++ b/sd/source/ui/inc/Server.hxx
@@ -35,6 +35,7 @@ namespace sd
class Transmitter;
class Listener;
+class ImagePreparer;
class Server : public salhelper::Thread
{
@@ -53,6 +54,7 @@ namespace sd
void execute();
static Transmitter *pTransmitter;
static rtl::ReferenceListener mListener;
+static rtl::ReferenceImagePreparer mPreparer;
};
}
diff --git a/sd/source/ui/remotecontrol/Listener.cxx
b/sd/source/ui/remotecontrol/Listener.cxx
index e51bb57..9607707 100644
--- a/sd/source/ui/remotecontrol/Listener.cxx
+++ b/sd/source/ui/remotecontrol/Listener.cxx
@@ -101,7 +101,7 @@ void SAL_CALL Listener::slideTransitionStarted (void)
sal_Int32 aSlide = mController-getCurrentSlideIndex();
OStringBuffer aBuilder( slide_updated\n );
-aBuilder.append( OString::valueOf( aSlide + 1 ) ); // Slides are numbered
from 0
+aBuilder.append( OString::valueOf( aSlide ) );
aBuilder.append( \n\n );
if ( pTransmitter )
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx
b/sd/source/ui/remotecontrol/Receiver.cxx
index 86a1a03..654664a 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -12,10 +12,8 @@
#include com/sun/star/presentation/XPresentationSupplier.hpp
#include com/sun/star/presentation/XPresentation2.hpp
#include com/sun/star/frame/XFramesSupplier.hpp
-#include com/sun/star/document/XFilter.hpp
-#include com/sun/star/document/XExporter.hpp
#include com/sun/star/uno/RuntimeException.hpp
-#include com/sun/star/beans/PropertyValue.hpp
+
#include comphelper/processfactory.hxx
#include osl/file.hxx
@@ -110,99 +108,6 @@ void Receiver::parseCommand( std::vectorOString aCommand
)
xSlideShowController-resume();
}
}
-// FIXME: remove later, this is just to test functionality
-// sendPreview( 0, xSlideShowController, mTransmitter );
-
-}
-
-void sendPreview( sal_uInt32 aSlideNumber,
- const uno::Referencepresentation::XSlideShowController
xSlideShowController, Transmitter *aTransmitter )
-{
-
-sal_uInt64 aSize; // Unused
-uno::Sequencesal_Int8 aImageData = preparePreview( aSlideNumber,
xSlideShowController, 320, 240, aSize );
-rtl::OUStringBuffer aStrBuffer;
-::sax::Converter::encodeBase64( aStrBuffer, aImageData );
-
-OString aEncodedShortString = rtl::OUStringToOString(
-aStrBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8 );
-
-// Start the writing
-rtl::OStringBuffer aBuffer;
-
-
[Libreoffice-commits] .: Branch 'feature/tubes' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
Hi, On Thu, Jul 19, 2012 at 04:50:28PM +0100, Michael Meeks wrote: * gerrit update (Bjoern) + syadmin team for gerrit have an alias: ger...@otrs.documentfoundation.org please use sparingly for agreed issues or service outages. + OTRS being deployed generally for sysadmin ticketing The reasoning here being not that I dont like the tool, but that we once its in, its not that easy to openly discuss in it. So good tickets: - Please give commiter rights to foo, he is doing great - OMG! gerrit is down! - gitweb doesnt work on project foo Bad tickets: - I dont like the style and have not discussed this anywhere, but please make the default font Comic Sans -- the code looks cutier with it Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW-3-6-0] updated tango artwork ...
Hi there, I just reviewed and merged Astron's nice artwork update to -3-6-0 - it all looks good to me, though the sendmail icon is a tad cute :-) It'd be great to get another 2x sign-offs so we can get that into 3.6.0: http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=21eaf701f1e2474f83d90e865590a7366c2df8e3 Thanks ! :-) Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[GSOC-UPDATE](19.07) Impress Remote
Hi everyone, I made some good progress today: - Finally found and fixed the cause of segfaults in the Transmitter (thanks to Valgrind). - Fixed some problems with the Listener lifecycle. - Fixed the listening loop in the Server to properly exit when the connection is closed. - Fixed listener registration for the case where a client connects before a slideshow starts. - Refactored the image preview code to send all images to the client when a slideshow starts. - All the above mean that communication from server to client is now reliable, and the current slide preview is shown on the app / updates with the presentation. This means that tomorrow I should be able to start work on the various views for the app! Cheers, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: mdds/makefile.mk mdds/mdds_0.5.3.patch mdds/mdds_0.6.0.patch ooo.lst.in
mdds/makefile.mk |6 ++--
mdds/mdds_0.5.3.patch | 62 --
mdds/mdds_0.6.0.patch | 54 +++
ooo.lst.in|2 -
4 files changed, 58 insertions(+), 66 deletions(-)
New commits:
commit e5e5c0c0c4b9c369543f09ab44e9d3c87dc93ca1
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Jul 19 13:36:05 2012 -0400
Update mdds package to 0.6.0. It builds for me.
Change-Id: I3f35f6f607e4a2fc40c6ecb5a52682cbc934
diff --git a/mdds/makefile.mk b/mdds/makefile.mk
index dea3514..f7b83f4 100644
--- a/mdds/makefile.mk
+++ b/mdds/makefile.mk
@@ -27,9 +27,9 @@ TARGET=mdds
# --- Files
-TARFILE_NAME=mdds_0.5.3
-TARFILE_MD5=0ff7d225d087793c8c2c680d77aac3e7
-PATCH_FILES=mdds_0.5.3.patch
+TARFILE_NAME=mdds_0.6.0
+TARFILE_MD5=3e89a35f253a4f1c7de68c57d851ef38
+PATCH_FILES=mdds_0.6.0.patch
CONFIGURE_DIR=
CONFIGURE_ACTION=
diff --git a/mdds/mdds_0.5.3.patch b/mdds/mdds_0.5.3.patch
deleted file mode 100644
index 40aedb1..000
--- a/mdds/mdds_0.5.3.patch
+++ /dev/null
@@ -1,62 +0,0 @@
misc/mdds_0.5.3/include/mdds/mixed_type_matrix_def.inl 2011-07-13
13:26:27.0 -0600
-+++ misc/build/mdds_0.5.3/include/mdds/mixed_type_matrix_def.inl
2011-07-20 02:02:21.164198900 -0600
-@@ -44,7 +44,6 @@
- default:
- throw matrix_error(unknown density type);
- }
--return NULL;
- }
-
- templatetypename _String, typename _Flag
-@@ -216,8 +216,8 @@
- // assignment to self.
- return;
-
--size_t row_count = ::std::min(mp_storage-rows(), r.mp_storage-rows());
--size_t col_count = ::std::min(mp_storage-cols(), r.mp_storage-cols());
-+size_t row_count = (::std::min)(mp_storage-rows(), r.mp_storage-rows());
-+size_t col_count = (::std::min)(mp_storage-cols(), r.mp_storage-cols());
- for (size_t i = 0; i row_count; ++i)
- for (size_t j = 0; j col_count; ++j)
- mp_storage-get_element(i, j) = r.mp_storage-get_element(i, j);
misc/mdds_0.5.3/include/mdds/mixed_type_matrix_storage_filled_linear.inl
2011-07-13 13:26:27.0 -0600
-+++
misc/build/mdds_0.5.3/include/mdds/mixed_type_matrix_storage_filled_linear.inl
2011-07-20 02:02:21.179798900 -0600
-@@ -354,8 +354,8 @@
- }
-
- array_type new_array(new_size, m_init_elem);
--size_t min_rows = ::std::min(row, m_rows);
--size_t min_cols = ::std::min(col, m_cols);
-+size_t min_rows = (::std::min)(row, m_rows);
-+size_t min_cols = (::std::min)(col, m_cols);
- for (size_t i = 0; i min_rows; ++i)
- {
- for (size_t j = 0; j min_cols; ++j)
-@@ -612,8 +612,8 @@
- }
-
- array_type new_array(new_size, element(0.0));
--size_t min_rows = ::std::min(row, m_rows);
--size_t min_cols = ::std::min(col, m_cols);
-+size_t min_rows = (::std::min)(row, m_rows);
-+size_t min_cols = (::std::min)(col, m_cols);
- for (size_t i = 0; i min_rows; ++i)
- {
- for (size_t j = 0; j min_cols; ++j)
misc/mdds_0.5.3/include/mdds/point_quad_tree.hpp 2011-07-13
13:26:27.0 -0600
-+++ misc/build/mdds_0.5.3/include/mdds/point_quad_tree.hpp 2011-07-20
02:04:36.088835900 -0600
-@@ -623,10 +623,10 @@
- templatetypename _Key, typename _Data
- void point_quad_tree_Key,_Data::insert(key_type x, key_type y, data_type
data)
- {
--m_xrange.first = ::std::min(m_xrange.first, x);
--m_xrange.second = ::std::max(m_xrange.second, x);
--m_yrange.first = ::std::min(m_yrange.first, y);
--m_yrange.second = ::std::max(m_yrange.second, y);
-+m_xrange.first = (::std::min)(m_xrange.first, x);
-+m_xrange.second = (::std::max)(m_xrange.second, x);
-+m_yrange.first = (::std::min)(m_yrange.first, y);
-+m_yrange.second = (::std::max)(m_yrange.second, y);
-
- if (!m_root)
- {
diff --git a/mdds/mdds_0.6.0.patch b/mdds/mdds_0.6.0.patch
new file mode 100644
index 000..fba1502
--- /dev/null
+++ b/mdds/mdds_0.6.0.patch
@@ -0,0 +1,54 @@
+--- misc/mdds_0.6.0/include/mdds/mixed_type_matrix_def.inl 2011-07-13
13:26:27.0 -0600
misc/build/mdds_0.6.0/include/mdds/mixed_type_matrix_def.inl
2011-07-20 02:02:21.164198900 -0600
+@@ -216,8 +216,8 @@
+ // assignment to self.
+ return;
+
+-size_t row_count = ::std::min(mp_storage-rows(), r.mp_storage-rows());
+-size_t col_count = ::std::min(mp_storage-cols(), r.mp_storage-cols());
++size_t row_count = (::std::min)(mp_storage-rows(), r.mp_storage-rows());
++size_t col_count = (::std::min)(mp_storage-cols(), r.mp_storage-cols());
+ for (size_t i = 0; i row_count; ++i)
+ for (size_t j = 0; j col_count; ++j)
+ mp_storage-get_element(i, j) = r.mp_storage-get_element(i, j);
+---
Re: mdds to be updated to 0.6.0
On 07/19/2012 11:13 AM, Kohei Yoshida wrote: I'll let you guys know when the work finishes. Done. Pushed to master. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW: 3-6 3-6-0] fdo#55241 updating of indexes is broken
On 19/07/12 14:52, Lubos Lunak wrote: On Thursday 19 of July 2012, David Tardon wrote: On Thu, Jul 19, 2012 at 02:36:48PM +0200, Lubos Lunak wrote: On Thursday 19 of July 2012, David Tardon wrote: Hi all, commit 859018061956b1937c7be3809a9858cbd610fa9c fixes yet another STL conversion bug +1 But I have no idea to which branch you have already committed this (git branch --contains doesn't list anything), so I haven't done anything more than this +1. It is only on master. I suppose I should have written 3-6 into subject too.. I had figured that out, but I didn't see it even on master (until I pulled again just now, I have no idea what went wrong before). I've cherry-picked to 3-6. +1, really should have seen that during review :( ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
