[Libreoffice-commits] .: xmlhelp/util
xmlhelp/util/main_transform.xsl |6 -- 1 file changed, 6 deletions(-) New commits: commit fb310927211aa911d5b3fe6e31c5b9db4d9a0497 Author: Niklas Johansson sleeping.pil...@gmail.com Date: Tue May 29 16:20:53 2012 +0200 Re-enable sort in help-files Sorting in helpfiles were disabled due to bug #i70462#. I belive this bug isn't valid any more and we should re-activate the sorting. diff --git a/xmlhelp/util/main_transform.xsl b/xmlhelp/util/main_transform.xsl index 0f5cb02..4385cf4 100644 --- a/xmlhelp/util/main_transform.xsl +++ b/xmlhelp/util/main_transform.xsl @@ -446,16 +446,10 @@ !-- SORT -- xsl:template match=sort - !-- sorting disabled due to #i70462# xsl:apply-templatesxsl:sort select=descendant::paragraph//xsl:apply-templates - //-- - xsl:apply-templates / /xsl:template xsl:template match=sort mode=embedded -!-- sorting disabled due to #i70462# xsl:apply-templatesxsl:sort select=descendant::paragraph//xsl:apply-templates - //-- - xsl:apply-templates / /xsl:template !-- SWITCH -- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW] [PUSHED] Reenable sorting in the Helpfiles
Thanks, pushed. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: how to use libreoffice library if not use UNO?
can I use libreoffice directly , such as use sw library , No. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on||45260 --- Comment #321 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 2012-05-29 23:29:59 PDT --- Add Bug 45260 - EDITING: Pasted object not same position w.r.t. original object if border thickness greater 0. This bug makes DRAW completely unusable for technical sketches. Although there is a simple workaround (use AOOo3.4) we need a fix for this bug. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/mozab/MDriver.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3a16d64b6d83d453442cd7891aaa0386dabf55fd Author: Julien Nabet serval2...@yahoo.fr Date: Wed May 30 08:30:57 2012 +0200 Fix misplaced parenthesis Change-Id: I32c3ca57cbe7994527dcf4658bd55f283488baaf diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx index 3eadfbe..89bb2de 100644 --- a/connectivity/source/drivers/mozab/MDriver.cxx +++ b/connectivity/source/drivers/mozab/MDriver.cxx @@ -196,7 +196,7 @@ Sequence DriverPropertyInfo SAL_CALL MozabDriver::getPropertyInfo( const ::rt ); aDriverInfo.push_back(DriverPropertyInfo( ::rtl::OUString(MaxRowCount) -,::rtl::OUString(Records (max.)) +,::rtl::OUString(Records (max.)) ,sal_False ,::rtl::OUString(100) ,Sequence ::rtl::OUString ()) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
blanket license statement ...
== All of my past and any future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license Gordon Lack (gordon.l...@dsl.pipex.com) - 30 May 2012 == Myprevious comment https://bugs.freedesktop.org/show_bug.cgi?id=38989#c9 was meant to imply that, but I can see how it cpoudl be construed to have only referred to that one patch. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - qadevOOo/tests toolkit/qa vcl/generic vcl/inc
qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java |6 --
toolkit/qa/unoapi/knownissues.xcl |4
vcl/generic/glyphs/gcach_layout.cxx |5 +
vcl/inc/generic/glyphcache.hxx |2 +-
4 files changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 8bafe38c569afa2e1055eb647cb7ff161ddd1230
Author: Michael Stahl mst...@redhat.com
Date: Wed May 30 08:53:00 2012 +0200
i#87757: do not create empty Rectangle bounding box for glyphs:
Enforce a minimum width and height of 1 in GlyphMetric::SetSize(),
preventing X11SalGraphics::GetGlyphBoundRect() from returning a
Rectangle that has one side set as RECT_EMPTY.
This problem has surfaced due to the change of the status bar in
ce14342c4292628a641a72d4f63d9c048e030c6a, causing the
AccessibleStatusBarItem to fail in getCharacterBounds() because
the text of the control, Words: 0, now contains a space, for which an
empty Rectangle bounding box is created, which results in a wrong
return value from getCharacterBounds():
LOG Character bounds outside component
LOG Character rect: 43, -566, 0, 0
LOG Component rect: 91, 2, 71, 18
It turns out that the following test was disabled due to this problem,
so re-enable it now:
toolkit.AccessibleFixedText::com::sun::star::accessibility::XAccessibleText
diff --git a/toolkit/qa/unoapi/knownissues.xcl
b/toolkit/qa/unoapi/knownissues.xcl
index e6880b8..a64fd8f 100644
--- a/toolkit/qa/unoapi/knownissues.xcl
+++ b/toolkit/qa/unoapi/knownissues.xcl
@@ -150,10 +150,6 @@ toolkit.UnoControlNumericField::com::sun::star::awt::XView
toolkit.UnoControlCheckBox::com::sun::star::awt::XView
toolkit.UnoScrollBarControl::com::sun::star::awt::XView
-
-### i87757 ###
-toolkit.AccessibleFixedText::com::sun::star::accessibility::XAccessibleText
-
### i37643 ###
toolkit.AccessibleStatusBarItem::com::sun::star::accessibility::XAccessibleEventBroadcaster
diff --git a/vcl/generic/glyphs/gcach_layout.cxx
b/vcl/generic/glyphs/gcach_layout.cxx
index ef03aa3..c1b5b10 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -43,6 +43,11 @@
namespace { struct SimpleLayoutEngine : public rtl::Static
ServerFontLayoutEngine, SimpleLayoutEngine {}; }
+void GlyphMetric::SetSize(const Size s)
+{
+maSize = Size(std::maxlong(1, s.Width()), std::maxlong(1, s.Height()));
+}
+
// ===
// layout implementation for ServerFont
// ===
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 1ab2a74..8c0f3b1 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -132,7 +132,7 @@ protected:
friend class GlyphData;
voidSetOffset( int nX, int nY ) { maOffset = Point(
nX, nY); }
voidSetDelta( int nX, int nY ) { maDelta = Point( nX,
nY); }
-voidSetSize( const Size s ){ maSize = s; }
+voidSetSize(const Size s);
voidSetCharWidth( long nW ) { mnAdvanceWidth = nW;
}
private:
commit 33050f597cef81162eede4360b011b41e10ab69f
Author: Michael Stahl mst...@redhat.com
Date: Wed May 30 08:48:36 2012 +0200
qadevOOo: _XAccessibleText._getTextBeforeIndex:
Do not check length of first word for AccessibleStatusBarItem, which
now contains Words: 0 since ce14342c4292628a641a72d4f63d9c048e030c6a,
but the test stupidly assumes that its text does not contain a space.
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
index c72c255..22626cf 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
@@ -956,7 +956,10 @@ public class _XAccessibleText extends MultiMethodTest {
}
try {
-if
(!tEnv.getTestCase().getObjectName().equals(SmGraphicAccessible)) {
+if
(!tEnv.getTestCase().getObjectName().equals(SmGraphicAccessible)
+// next one fails because the control actually contains 2 words
+
!tEnv.getTestCase().getObjectName().equals(AccessibleStatusBarItem))
+{
log.print(getTextBeforeIndex(chCount, +
AccessibleTextType.WORD):);
@@ -1192,4 +1195,4 @@ public class _XAccessibleText extends MultiMethodTest {
return res;
}
-}
\ No newline at end of file
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: filter/source
filter/source/msfilter/msdffimp.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit ddc36f8914640d6d75464ab26690b72504469fa0
Author: Kevin Hunter hunt...@earlham.edu
Date: Wed May 30 03:09:12 2012 -0400
cppcheck: Reduce variable scope
Change-Id: I11f7642346ccc1949d5716b32444df86541eabf8
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 9d5e1dc..b5c27bd 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4326,15 +4326,14 @@ SdrObject* SvxMSDffManager::ImportGroup( const
DffRecordHeader rHd, SvStream r
rSt aRecHd;
if ( aRecHd.nRecType == DFF_msofbtSpContainer )
{
-sal_Int32 nGroupRotateAngle = 0;
-sal_Int32 nSpFlags = 0;
mnFix16Angle = 0;
if (!aRecHd.SeekToBegOfRecord(rSt))
return pRet;
pRet = ImportObj( rSt, pClientData, rClientRect, rGlobalChildRect,
nCalledByGroup + 1, pShapeId );
if ( pRet )
{
-nSpFlags = nGroupShapeFlags;
+sal_Int32 nGroupRotateAngle = 0;
+sal_Int32 nSpFlags = nGroupShapeFlags;
nGroupRotateAngle = mnFix16Angle;
Rectangle aClientRect( rClientRect );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
How to improve our Bug tracking system
Hi all, it seems the original mail still is pending for moderation, so I try again with a direct mail to the list. As a consequence of our QA related discussions at Hackfest April 2012 in Hamburg http://rrbd.wordpress.com/2012/04/14/hackfest-hamburg-2012/ I now want to start to collect ideas how we can make a big step improving our (Bugzilla) Bug tracking system. The goal is that after we will have finished work (end 2012?) we will have a system what will work without bigger changes at least for the next 5 years for our growing contributors community. As a tool for that I created https://wiki.documentfoundation.org/How_to_Improve_Bugzilla, I hope that we so can get an overview what our needs are and how we can reach the goals. Your contribution to complete the contents on that page will be appreciated. Especially for the listed Problems we will need some expert knowledge I hope that end of July we will have finished research and a clear concept how we can reach most goals with acceptable costs. Best regards Rainer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Help
What is to do, to end this message? Please help and thanks. -- Mit den besten Grüßen Dietmar Voigt Bergweg 3 - D-36110 Schlitz Tel. 06642 40042 Fax 0321 23456791 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svx/Library_svxcore.mk
svx/Library_svxcore.mk |1 + 1 file changed, 1 insertion(+) New commits: commit bb0eaf4f0e3129a496a861daf96da1e1907758d5 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed May 30 09:35:19 2012 +0200 svxcore: needs also generated header from connectivity Change-Id: I4279f9e6024e7128286e8b2d6343deee944866b2 diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 7c021f7..beda9bd 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -384,6 +384,7 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))$(filter IOS,$(OS))) $(eval $(call gb_Library_use_packages,svxcore,\ connectivity_inc \ + connectivity_generated \ )) $(eval $(call gb_Library_add_exception_objects,svxcore,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/qa
sw/qa/extras/ooxmltok/data/n760764.docx |binary
sw/qa/extras/ooxmltok/ooxmltok.cxx | 21 +
2 files changed, 21 insertions(+)
New commits:
commit 3784063afcc344273821503694467100d3913d2d
Author: Miklos Vajna vmik...@suse.cz
Date: Wed May 30 09:38:27 2012 +0200
n#760764 testcase
Change-Id: I4d5cea0ae02fda751fb13b9c86684ccd70abf126
diff --git a/sw/qa/extras/ooxmltok/data/n760764.docx
b/sw/qa/extras/ooxmltok/data/n760764.docx
new file mode 100644
index 000..5e479e2
Binary files /dev/null and b/sw/qa/extras/ooxmltok/data/n760764.docx differ
diff --git a/sw/qa/extras/ooxmltok/ooxmltok.cxx
b/sw/qa/extras/ooxmltok/ooxmltok.cxx
index fb5e3d2..67d18ce 100644
--- a/sw/qa/extras/ooxmltok/ooxmltok.cxx
+++ b/sw/qa/extras/ooxmltok/ooxmltok.cxx
@@ -61,6 +61,7 @@ public:
void testN747461();
void testN750255();
void testN652364();
+void testN760764();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -76,6 +77,7 @@ public:
CPPUNIT_TEST(testN747461);
CPPUNIT_TEST(testN750255);
CPPUNIT_TEST(testN652364);
+CPPUNIT_TEST(testN760764);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -403,6 +405,25 @@ xray para2.PageStyleName
CPPUNIT_ASSERT_EQUAL( OUString( Standard ), pageStyle2 );
}
+void Test::testN760764()
+{
+load(n760764.docx);
+
+uno::Referencetext::XTextDocument xTextDocument(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XEnumerationAccess
xParaEnumAccess(xTextDocument-getText(), uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration
xParaEnum(xParaEnumAccess-createEnumeration());
+uno::Referencecontainer::XEnumerationAccess
xRunEnumAccess(xParaEnum-nextElement(), uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration
xRunEnum(xRunEnumAccess-createEnumeration());
+
+// Access the second run, which is a textfield
+xRunEnum-nextElement();
+uno::Referencebeans::XPropertySet xRun(xRunEnum-nextElement(),
uno::UNO_QUERY);
+float fValue;
+xRun-getPropertyValue(CharHeight) = fValue;
+// This used to be 11, as character properties were ignored.
+CPPUNIT_ASSERT_EQUAL(8.f, fValue);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/mspub' - writerperfect/source
writerperfect/source/filter/OdgGenerator.cxx | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 15520d8d7f1514153903d4ad985e50c250ddcf21
Author: Brennan Vincent brenn...@email.arizona.edu
Date: Tue May 29 19:17:51 2012 -0700
Handle opacity in gradients
diff --git a/writerperfect/source/filter/OdgGenerator.cxx
b/writerperfect/source/filter/OdgGenerator.cxx
index da6d64d..9704389 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -1347,16 +1347,27 @@ void OdgGeneratorPrivate::_writeGraphicsStyle()
if (mxStyle[svg:cy])
pDrawGradientElement-addAttribute(draw:cy,
mxStyle[svg:cy]-getStr());
if (mxGradient[1][svg:stop-opacity])
-pDrawGradientElement-addAttribute(draw:start-intensity,
mxGradient[1][svg:stop-opacity]-getStr());
+{
+pDrawOpacityElement-addAttribute(draw:start,
mxGradient[1][svg:stop-opacity]-getStr());
+bUseOpacityGradient = true;
+}
else
-pDrawGradientElement-addAttribute(draw:start-intensity,
100%);
+pDrawOpacityElement-addAttribute(draw:start, 100%);
if (mxGradient[0][svg:stop-opacity])
-pDrawGradientElement-addAttribute(draw:end-intensity,
mxGradient[0][svg:stop-opacity]-getStr());
+{
+pDrawOpacityElement-addAttribute(draw:end,
mxGradient[0][svg:stop-opacity]-getStr());
+bUseOpacityGradient = true;
+}
else
-pDrawGradientElement-addAttribute(draw:end-intensity,
100%);
+pDrawOpacityElement-addAttribute(draw:end, 100%);
pDrawGradientElement-addAttribute(draw:border, 0%);
mGraphicsGradientStyles.push_back(pDrawGradientElement);
mGraphicsGradientStyles.push_back(new
TagCloseElement(draw:gradient));
+if (bUseOpacityGradient)
+{
+mGraphicsGradientStyles.push_back(pDrawOpacityElement);
+mGraphicsGradientStyles.push_back(new
TagCloseElement(draw:opacity));
+}
}
if(!bUseOpacityGradient)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerperfect/source
writerperfect/source/filter/OdgGenerator.cxx | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 19b2134aeeeca1c90736b76ffda42ba9bb570fba
Author: Brennan Vincent brenn...@email.arizona.edu
Date: Tue May 29 19:17:51 2012 -0700
Handle opacity in gradients
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/writerperfect/source/filter/OdgGenerator.cxx
b/writerperfect/source/filter/OdgGenerator.cxx
index 79722e8..9fc3044 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -1204,16 +1204,27 @@ void OdgGeneratorPrivate::_writeGraphicsStyle()
if (mxStyle[svg:cy])
pDrawGradientElement-addAttribute(draw:cy,
mxStyle[svg:cy]-getStr());
if (mxGradient[1][svg:stop-opacity])
-pDrawGradientElement-addAttribute(draw:start-intensity,
mxGradient[1][svg:stop-opacity]-getStr());
+{
+pDrawOpacityElement-addAttribute(draw:start,
mxGradient[1][svg:stop-opacity]-getStr());
+bUseOpacityGradient = true;
+}
else
-pDrawGradientElement-addAttribute(draw:start-intensity,
100%);
+pDrawOpacityElement-addAttribute(draw:start, 100%);
if (mxGradient[0][svg:stop-opacity])
-pDrawGradientElement-addAttribute(draw:end-intensity,
mxGradient[0][svg:stop-opacity]-getStr());
+{
+pDrawOpacityElement-addAttribute(draw:end,
mxGradient[0][svg:stop-opacity]-getStr());
+bUseOpacityGradient = true;
+}
else
-pDrawGradientElement-addAttribute(draw:end-intensity,
100%);
+pDrawOpacityElement-addAttribute(draw:end, 100%);
pDrawGradientElement-addAttribute(draw:border, 0%);
mGraphicsGradientStyles.push_back(pDrawGradientElement);
mGraphicsGradientStyles.push_back(new
TagCloseElement(draw:gradient));
+if (bUseOpacityGradient)
+{
+mGraphicsGradientStyles.push_back(pDrawOpacityElement);
+mGraphicsGradientStyles.push_back(new
TagCloseElement(draw:opacity));
+}
}
if(!bUseOpacityGradient)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerperfect/source
writerperfect/source/filter/OdgGenerator.cxx | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 6c1107ad8fd6375ed02906e8700c24b471df2d97
Author: Brennan Vincent brenn...@email.arizona.edu
Date: Tue May 29 19:17:51 2012 -0700
Handle opacity in gradients
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/writerperfect/source/filter/OdgGenerator.cxx
b/writerperfect/source/filter/OdgGenerator.cxx
index da6d64d..9704389 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -1347,16 +1347,27 @@ void OdgGeneratorPrivate::_writeGraphicsStyle()
if (mxStyle[svg:cy])
pDrawGradientElement-addAttribute(draw:cy,
mxStyle[svg:cy]-getStr());
if (mxGradient[1][svg:stop-opacity])
-pDrawGradientElement-addAttribute(draw:start-intensity,
mxGradient[1][svg:stop-opacity]-getStr());
+{
+pDrawOpacityElement-addAttribute(draw:start,
mxGradient[1][svg:stop-opacity]-getStr());
+bUseOpacityGradient = true;
+}
else
-pDrawGradientElement-addAttribute(draw:start-intensity,
100%);
+pDrawOpacityElement-addAttribute(draw:start, 100%);
if (mxGradient[0][svg:stop-opacity])
-pDrawGradientElement-addAttribute(draw:end-intensity,
mxGradient[0][svg:stop-opacity]-getStr());
+{
+pDrawOpacityElement-addAttribute(draw:end,
mxGradient[0][svg:stop-opacity]-getStr());
+bUseOpacityGradient = true;
+}
else
-pDrawGradientElement-addAttribute(draw:end-intensity,
100%);
+pDrawOpacityElement-addAttribute(draw:end, 100%);
pDrawGradientElement-addAttribute(draw:border, 0%);
mGraphicsGradientStyles.push_back(pDrawGradientElement);
mGraphicsGradientStyles.push_back(new
TagCloseElement(draw:gradient));
+if (bUseOpacityGradient)
+{
+mGraphicsGradientStyles.push_back(pDrawOpacityElement);
+mGraphicsGradientStyles.push_back(new
TagCloseElement(draw:opacity));
+}
}
if(!bUseOpacityGradient)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/source
oox/source/shape/ShapeContextHandler.cxx | 26 ++
oox/source/shape/ShapeContextHandler.hxx |2 ++
2 files changed, 28 insertions(+)
New commits:
commit 467f335161d0d098c167612fb530f3abe3b2cef4
Author: Miklos Vajna vmik...@suse.cz
Date: Wed May 30 09:56:58 2012 +0200
oox: initial smartart text is imported into Writer, take two
The original commit (8c6fb76c2cc24c336a28702b5f7f31cb5964129a) broke the
sw_subsequent_ooxmltok test, as it threated getDiagramShapeContext() a
const method, but that's not true. Check mxDiagramShapeContext directly
instead.
Change-Id: Idd730787be41cc11e6c1fc962da60f05e024ee84
diff --git a/oox/source/shape/ShapeContextHandler.cxx
b/oox/source/shape/ShapeContextHandler.cxx
index 3234238..0643603 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -30,6 +30,7 @@
#include oox/vml/vmldrawingfragment.hxx
#include oox/vml/vmlshape.hxx
#include oox/vml/vmlshapecontainer.hxx
+#include oox/drawingml/diagram/diagram.hxx
namespace oox { namespace shape {
@@ -120,6 +121,19 @@ ShapeContextHandler::getDrawingShapeContext()
}
uno::Referencexml::sax::XFastContextHandler
+ShapeContextHandler::getDiagramShapeContext()
+{
+if (!mxDiagramShapeContext.is())
+{
+FragmentHandlerRef rFragmentHandler(new
ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath));
+mpShape.reset(new Shape());
+mxDiagramShapeContext.set(new
DiagramGraphicDataContext(*rFragmentHandler, mpShape));
+}
+
+return mxDiagramShapeContext;
+}
+
+uno::Referencexml::sax::XFastContextHandler
ShapeContextHandler::getContextHandler()
{
uno::Referencexml::sax::XFastContextHandler xResult;
@@ -130,6 +144,9 @@ ShapeContextHandler::getContextHandler()
case NMSP_vml:
xResult.set(getDrawingShapeContext());
break;
+case NMSP_dmlDiagram:
+xResult.set(getDiagramShapeContext());
+break;
default:
xResult.set(getGraphicShapeContext(mnStartToken));
break;
@@ -154,6 +171,9 @@ void SAL_CALL ShapeContextHandler::startFastElement
mpThemePtr.reset(new Theme());
+if (Element == DGM_TOKEN(relIds))
+createFastChildContext(Element, Attribs);
+
uno::ReferenceXFastContextHandler xContextHandler(getContextHandler());
if (xContextHandler.is())
@@ -247,6 +267,12 @@ ShapeContextHandler::getShape() throw
(uno::RuntimeException)
if( const ::oox::vml::ShapeBase* pShape =
mpDrawing-getShapes().takeLastShape() )
xResult = pShape-convertAndInsert( xShapes );
}
+else if (mxDiagramShapeContext.is())
+{
+basegfx::B2DHomMatrix aMatrix;
+mpShape-addShape( *mxFilterBase, mpThemePtr.get(), xShapes,
aMatrix );
+xResult = mpShape-getXShape();
+}
else if (mpShape.get() != NULL)
{
basegfx::B2DHomMatrix aTransformation;
diff --git a/oox/source/shape/ShapeContextHandler.hxx
b/oox/source/shape/ShapeContextHandler.hxx
index df9c398..95aee66 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -159,6 +159,7 @@ private:
GraphicShapeContextPtr;
css::uno::ReferenceXFastContextHandler mxDrawingFragmentHandler;
css::uno::ReferenceXFastContextHandler mxGraphicShapeContext;
+css::uno::ReferenceXFastContextHandler mxDiagramShapeContext;
core::XmlFilterRef mxFilterBase;
drawingml::ThemePtr mpThemePtr;
@@ -168,6 +169,7 @@ private:
css::uno::ReferenceXFastContextHandler
getGraphicShapeContext(::sal_Int32 Element);
css::uno::ReferenceXFastContextHandler getDrawingShapeContext();
+css::uno::ReferenceXFastContextHandler getDiagramShapeContext();
css::uno::ReferenceXFastContextHandler getContextHandler();
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Advice needed about some cppcheck reports
On 05/28/2012 06:03 PM, julien2412 wrote:
[sal/osl/unx/file.cxx:1261] - [sal/osl/unx/file.cxx:1261]: (style) Same
expression on both sides of '-'.
1257 if (nSize 0)
1258 {
1259 c^= pData[0];
1260 pData += nSize;
1261 nSize -= nSize;
1262 }
Just put nSize to 0 ?
Same thing here :
[sal/osl/w32/file.cxx:880] - [sal/osl/w32/file.cxx:880]: (style) Same
expression on both sides of '-'.
876 if (nSize 0)
877 {
878 c ^= pData[0];
879 pData += nSize;
880 nSize -= nSize;
881 }
In both of the above cases, the updates of both pData and nSize can be
removed completely from these overspill if-blocks, as the variables
are not used any more afterwards.
And here :
[filter/source/graphicfilter/icgm/cgm.cxx:269] -
[filter/source/graphicfilter/icgm/cgm.cxx:269]: (style) Same expression on
both sides of '-'.
267 if ( pLong[ nSwitch ] 0 )
268 {
269 nRetValue -= nRetValue;
270 }
271 nRetValue /= 65536;
I'd second Lubos here, that from looking at just the code in
CGM::ImplGetFloat (but not understanding any of the context), nRetValue
= -nRetValue is most likely what is meant instead.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help
Dietmar Voigt schrieb: What is to do, to end this message? Hi, this is the developers' mailing list and not appropriate for such questions. The message means that you might suffer from Bug 46155 - Errors using templates with an vanilla 3.4 profile in 3.5 https://bugs.freedesktop.org/show_bug.cgi?id=46155. If you have questions how to find a workaround or similar please ask on http://ask.libreoffice.org/questions/ Best regards Rainer Bielefeld ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help
Hi Dietmar, On Wed, 2012-05-30 at 09:37 +0200, Dietmar Voigt wrote: What is to do, to end this message? This is off-topic for the developers list, please ask the users list, and/or checkout this page: http://www.libreoffice.org/get-help/ 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: how to use libreoffice library if not use UNO?
On Wed, 2012-05-30 at 10:02 +0800, engine spot wrote: I am a newbie for libreoffice , I know if I want to custom a plugin , I need to use UNO , but when I use it , I find that it will boot a libreoffice instance , so my question is , can I use libreoffice directly , such as use sw library , but not boot a libreoffice instance? like poi(poi.apache.org) As Tor says - not really; on the other hand - there is no real reason why the soffice infrastructure cannot be loaded safely into your process execute there beyond a ton of UNO bootstrapping pain. If you want to work on making that easy to do, that'd be appreciated I think :-) Failing that, writing your code as an extension and triggering soffice to execute that (perhaps with some on-load signal) might be a grotesque but workable half-way-house. 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] .: solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5bdb1df4b009758c5f26b84acfc10f814ad77fd7
Author: David Tardon dtar...@redhat.com
Date: Wed May 30 10:10:50 2012 +0200
look for win x64 libs in $(OUTDIR)/lib/x64
Change-Id: I5388132b0dbb0d904a5b235139bfa1f0e078e5ba
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 3882327..23ccc7f 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -343,7 +343,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
$(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS,
-SUBSYSTEM:CONSOLE) \
$(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64, -MACHINE:IX86)
\
- $(if $(filter YES,$(LIBRARY_X64)),
-LIBPATH:$(COMPATH)/lib/amd64 -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64,) \
+ $(if $(filter YES,$(LIBRARY_X64)), -LIBPATH:$(OUTDIR)/lib/x64
-LIBPATH:$(COMPATH)/lib/amd64 -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64,) \
$(T_LDFLAGS) \
@$${RESPONSEFILE} \
$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_filename,$(lib))) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] Unify OUTPATH values
On 05/26/2012 12:59 PM, Francois Tigeot wrote: I don't think there's any good reason to have wildly different OUTPATH names for each specific platform variant. The various names also lead to unnecessary work when packaging, just to correctly handle LD_LIBRARY_PATH. The attached patch reduces OUTPATH to two possible values: unx and wnt. Since it is potentially intrusive, I prefer to show it here for review instead of committing it directly. As Norbert already wrote, the best course of action is probably to get to a state where building with a read-only source tree works (i.e., where all the build artefacts are generated to some distinct place). Then, differentiating on platform and .pro/non-pro can go away completely (why stop at unx vs. win, anyway?), and only some differentiation based on build and host is needed for cross compilation. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9ba256eac5fbeaa5fa5d69abff51be353aa2b3d0 Author: David Tardon dtar...@redhat.com Date: Wed May 30 10:20:46 2012 +0200 fix ldap library name Change-Id: Id1294ab2232821eaa9ca5fb37b0f504c828b6f48 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 731bad7..84e368a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1290,7 +1290,7 @@ $(call gb_LinkTarget_use_external,$(1),openssl) $(call gb_LinkTarget_use_libraries,$(1),\ secur32 \ ws2_32 \ - $(if $(filter YES,$(WITH_LDAP)),ldap) \ + $(if $(filter YES,$(WITH_LDAP)),ldap50) \ ) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW:3-5] fdo#45190 import of RTF_LI should reset inherited RTF_FI
Hi,
See http://cgit.freedesktop.org/libreoffice/core/commit/?id=bf123ee
Regression from 3.4; backported patch attached.
Thanks,
Miklos
From dd1ca47b23fce64a7150fed7ad858a303166641c Mon Sep 17 00:00:00 2001
From: Miklos Vajna vmik...@suse.cz
Date: Fri, 11 May 2012 14:45:59 +0200
Subject: [PATCH] fdo#45190 import of RTF_LI should reset inherited RTF_FI
Change-Id: I17c287fa4daa399876b34182c02d9cf928fe1b6f
---
writerfilter/source/rtftok/rtfdocumentimpl.cxx |8 +++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 1250855..063d94b 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2232,7 +2232,6 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
switch (nKeyword)
{
case RTF_FI: nSprm = NS_sprm::LN_PDxaLeft1; break;
-case RTF_LI: nSprm = NS_sprm::LN_PDxaLeft; break;
case RTF_LIN: nSprm = 0x845e; break;
case RTF_RI: nSprm = NS_sprm::LN_PDxaRight; break;
case RTF_RIN: nSprm = 0x845d; break;
@@ -2847,6 +2846,13 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
m_aStates.top().nInternalState = INTERNAL_BIN;
m_aStates.top().nBinaryToRead = nParam;
break;
+case RTF_LI:
+m_aStates.top().aParagraphSprms-push_back(make_pair(NS_sprm::LN_PDxaLeft, pIntValue));
+// It turns out \li should reset the \fi inherited from the stylesheet.
+// So set the direct formatting to zero, if we don't have such direct formatting yet.
+if (!m_aStates.top().aParagraphSprms.find(NS_sprm::LN_PDxaLeft1).get())
+m_aStates.top().aParagraphSprms-push_back(make_pair(NS_sprm::LN_PDxaLeft1, RTFValue::Pointer_t(new RTFValue(0;
+break;
default:
#if OSL_DEBUG_LEVEL 1
OSL_TRACE(%s: TODO handle value '%s', OSL_THIS_FUNC, lcl_RtfToString(nKeyword));
--
1.7.7
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ciruclar dependencies
On 05/29/2012 01:33 PM, Michael Stahl wrote: On 29/05/12 13:17, Tor Lillqvist wrote: the fastest way to start is still to load only the code that is necessary to start. Isn't there something called demand paging that takes care of that? it is supposed to do this, but falls short when it comes to startup performance on rotating storage, which is why we have various platform specific hacks to do linear reads of all libraries required at startup in order to hide the seek latencies incurred by demand paging. It also falls short on avoiding the runtime loader's work on relocations in data segments, execution of .init sections, etc. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: how to use libreoffice library if not use UNO?
hmm... I think it is a requirement , for example , I want to edit ods and also other office file in chrome browser , so I need to use a library to prase the ods file , and shown to the web , and I do not need to install many other software , such as microsoft office , open office , libreoffice , only a library enough , and it is very lightweight. On Wed, May 30, 2012 at 4:07 PM, Michael Meeks michael.me...@suse.comwrote: On Wed, 2012-05-30 at 10:02 +0800, engine spot wrote: I am a newbie for libreoffice , I know if I want to custom a plugin , I need to use UNO , but when I use it , I find that it will boot a libreoffice instance , so my question is , can I use libreoffice directly , such as use sw library , but not boot a libreoffice instance? like poi(poi.apache.org) As Tor says - not really; on the other hand - there is no real reason why the soffice infrastructure cannot be loaded safely into your process execute there beyond a ton of UNO bootstrapping pain. If you want to work on making that easy to do, that'd be appreciated I think :-) Failing that, writing your code as an extension and triggering soffice to execute that (perhaps with some on-load signal) might be a grotesque but workable half-way-house. 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
No-cost desktop software development is dead on Windows 8
Hi all, http://arstechnica.com/information-technology/2012/05/no-cost-desktop-software-development-is-dead-on-windows-8/ Some hightlights: If you want to develop desktop applications—anything that runs at the command line or on the conventional Windows desktop that remains a fully supported, integral, essential part of Windows 8—you'll have two options: stick with the current Visual C++ 2010 Express and Visual C# 2010 Express products, or pay about $400-500 for Visual Studio 11 Professional Visual Studio 11 Express will be able to produce HTML and JavaScript websites, and nothing more. Windows 8: the Windows SDK for windows 8 will not include a compiler toolchain at all The rules of the game are changing. -- Jesús Corrius jcorr...@documentfoundation.org Deputy of the Board of Directors The Document Foundation, Zimmerstr. 69, 10117 Berlin,Germany Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.in shell/Library_gconfbe.mk
configure.in |2 +- shell/Library_gconfbe.mk |1 - 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit 03b8f169eb02622aa18bc2b6e2307e6a1a0dcbe1 Author: David Tardon dtar...@redhat.com Date: Wed May 30 10:36:26 2012 +0200 fix linking with gconf on release machine Change-Id: Iec63ac2c1a128e800df92f583fe349526addec4e diff --git a/configure.in b/configure.in index f5088f9..d52f912 100644 --- a/configure.in +++ b/configure.in @@ -8807,7 +8807,7 @@ AC_MSG_CHECKING([whether to enable GConf support]) if test $_os != WINNT -a $_os != Darwin -a $enable_gconf = yes; then ENABLE_GCONF=TRUE AC_MSG_RESULT([yes]) -PKG_CHECK_MODULES( GCONF, gconf-2.0 ORBit-2.0 ) +PKG_CHECK_MODULES( GCONF, gconf-2.0 gobject-2.0 ORBit-2.0 ) else AC_MSG_RESULT([no]) fi diff --git a/shell/Library_gconfbe.mk b/shell/Library_gconfbe.mk index 9fb520d..0616898 100644 --- a/shell/Library_gconfbe.mk +++ b/shell/Library_gconfbe.mk @@ -40,7 +40,6 @@ $(eval $(call gb_Library_use_api,gconfbe1,\ $(eval $(call gb_Library_use_externals,gconfbe1,\ gconf \ - gobject \ )) $(eval $(call gb_Library_use_libraries,gconfbe1,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
1 sheet by default [was Re: Tinderbox failure, Linux-RHEL6-x86_64@14-with-check, MASTER, last success: 2012-05-15 18:12:02]
Hi Stephan, Stefan, On 2012-05-30 at 09:14 +0200, Stephan Bergmann wrote: (subsequent tests in sc mostly fail because somebody changed the number of sheets or something). Addressed with http://cgit.freedesktop.org/libreoffice/core/commit/?id=3e07bdfce6ef700a94868ccc03268aa005c295b8 Revert 'fdo#50183 Use one sheet as default in Calc.' Uh, ugly :-( Stefan - please, would you be able to have a look at the failing tests? Stephan, could you please help Stefan? I got used to the 1 sheet default immediately, it is s much better, would be a real pity not to have it in 3.6... Thank you, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: shell/Library_ooofilt_x64.mk shell/Library_propertyhdl_x64.mk shell/Library_shlxthdl_x64.mk
shell/Library_ooofilt_x64.mk |1 + shell/Library_propertyhdl_x64.mk |1 + shell/Library_shlxthdl_x64.mk|1 + 3 files changed, 3 insertions(+) New commits: commit 44863e68c1a517fb2179ab8d7f3fe29d68325633 Author: David Tardon dtar...@redhat.com Date: Wed May 30 10:50:00 2012 +0200 do not link with cmt by default It causes linker errors like: libcmt.lib(crt0dat.obj) : error LNK2005: _amsg_exit already defined in +msvcrt.lib(MSVCR90.dll) ... Change-Id: I54217859a7c4f6535eed5bca50ada68a8d5b095c diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk index 265672a..3ddaeec 100644 --- a/shell/Library_ooofilt_x64.mk +++ b/shell/Library_ooofilt_x64.mk @@ -86,6 +86,7 @@ $(eval $(call gb_Library_add_ldflags,ooofilt_x64,\ /EXPORT:DllGetClassObject \ /EXPORT:DllRegisterServer \ /EXPORT:DllUnregisterServer \ + /NODEFAULTLIB:libcmt.lib \ )) $(eval $(call gb_Library_add_x64_generated_exception_objects,ooofilt_x64,\ diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk index 46d24ff..323335f 100644 --- a/shell/Library_propertyhdl_x64.mk +++ b/shell/Library_propertyhdl_x64.mk @@ -85,6 +85,7 @@ $(eval $(call gb_Library_use_static_libraries,propertyhdl_x64,\ $(eval $(call gb_Library_add_ldflags,propertyhdl_x64,\ /EXPORT:DllCanUnloadNow \ /EXPORT:DllGetClassObject \ + /NODEFAULTLIB:libcmt.lib \ )) $(eval $(call gb_Library_add_x64_generated_exception_objects,propertyhdl_x64,\ diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk index f5c8c7c..2ba 100644 --- a/shell/Library_shlxthdl_x64.mk +++ b/shell/Library_shlxthdl_x64.mk @@ -88,6 +88,7 @@ $(eval $(call gb_Library_add_ldflags,shlxthdl_x64,\ /EXPORT:DllGetClassObject \ /EXPORT:DllRegisterServer \ /EXPORT:DllUnregisterServer \ + /NODEFAULTLIB:libcmt.lib \ )) $(eval $(call gb_Library_add_x64_generated_exception_objects,shlxthdl_x64,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ciruclar dependencies
Sigh, OK then, everything is already perfect. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: REMINDER: Release 3.6.0-alpha1 from master
Hi Rainer, first thanks for your valuable input. Rainer Bielefeld píše v Út 29. 05. 2012 v 19:45 +0200: Petr Mladek schrieb: we are one week from the feature freeze for 3.6 release. We are going to provide 3.6.0-alpha1 build from master this week. I would like to do the tag tomorrow. Hi, from WIN user's view I doubt that that alpha will be usable for intensive tests: Bug 48946 - not find JRE https://bugs.freedesktop.org/show_bug.cgi?id=48946 Even Help will be unusable, and my suspect is that there is some disastrous relation to some other crash problems we see. Ah, we need to fix this before beta1 build, definitely. Note that alpha1 is there to find exactly this kind of problems. Of course, it does not make sense to produce it if is would be completely unusable. On the other hand, we do not want to push it on mirrors. We will not widely announce it. It might help to find similar problems also on Linux or MAC. Also it is just a test of buildability with the release configuration. I still see the problem with a MinGW build pull time 2012-05-28 04:23:12 Bug 50344 - Basic Macro will not run because of missing Java https://bugs.freedesktop.org/show_bug.cgi?id=50344 Ah, it is not that critical if it works with the normal Windows build. Note that MinGW build is still experimental and it is not ready for production use. It is great that you test it but MinGW-specific bugs can't block the normal release. Additionally I still am not able to do intensive tests to find the reason for the frequent crashes hindering me from using daily Master builds for intensive tests. Ah, this scares me. We need a reproducible scenario and backtrace. I am afraid that we will not be able to locate this problem before releasing beta1. On the other hand, beta1 testing might bring more testers and more scenarios of the crashes. It might help to locate the problem. IMHO it's not useful to start an alpha before the Java detection problem has been solved. Thanks for pointing it out. It is indeed very important bug. We will try to solve it but I am not sure if it is a blocker for alpha build. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: REMINDER: Release 3.6.0-alpha1 from master
Petr Mladek schrieb: Note that alpha1 is there to find exactly this kind of problems. Of course, it does not make sense to produce it if is would be completely unusable. On the other hand, we do not want to push it on mirrors. Hi I see the problem that the alpha will not be tested enough, I (for example) do not plan to use it for normal work (more or less), and so the chance to find bugs decreases dramatically, because other (WIN?) users also can't use the alpha. I still see the problem with a MinGW build pull time 2012-05-28 04:23:12 Bug 50344 - Basic Macro will not run because of missing Java https://bugs.freedesktop.org/show_bug.cgi?id=50344 Ah, it is not that critical if it works Ah, some Misunderstanding. Java does not work anywhere. If that bug would be MinGW only I would have added that key work in the summary line. I only used MinGW for a quick test yesterday because that was the most current Master available (we still do not have a MVSC Master after 2012-05-26_02.43.54.) Best regards Rainer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: feature/gbuild_merge needs testing
On Wednesday 30 of May 2012, Noel Grandin wrote: Hi I'm still having issues building on Windows with cygwin. Build error log attached. The invalid argument 'long -I list' error is probably again the annoying command line argument length limitation. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - RepositoryExternal.mk shell/StaticLibrary_xmlparser_x64.mk
RepositoryExternal.mk|8 +++- shell/StaticLibrary_xmlparser_x64.mk |8 2 files changed, 15 insertions(+), 1 deletion(-) New commits: commit c1c295a6e8903025ee77c54b94af4566e0e0af8c Author: David Tardon dtar...@redhat.com Date: Wed May 30 12:08:56 2012 +0200 define XML_UNICODE for x64 lib too Change-Id: Idac89f9165058bfa40189ff4c4e8cd4b5bc78b79 diff --git a/shell/StaticLibrary_xmlparser_x64.mk b/shell/StaticLibrary_xmlparser_x64.mk index 1944380..845c31e 100644 --- a/shell/StaticLibrary_xmlparser_x64.mk +++ b/shell/StaticLibrary_xmlparser_x64.mk @@ -34,6 +34,14 @@ $(eval $(call gb_StaticLibrary_set_include,shell_xmlparser_x64,\ $$(INCLUDE) \ )) +$(eval $(call gb_StaticLibrary_add_defs,shell_xmlparser_x64,\ + -DXML_UNICODE \ +)) + +$(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser_x64,\ + expat_utf16 \ +)) + $(eval $(call gb_StaticLibrary_add_x64_generated_exception_objects,shell_xmlparser_x64,\ CustomTarget/shell/source/all/xml_parser \ )) commit 8af6aa628b863b7565d397042fccefb8d78835fa Author: David Tardon dtar...@redhat.com Date: Wed May 30 12:06:42 2012 +0200 really fix ldap lib. name Change-Id: If003a4283fb4d0f3edd127e77de6b812501fa65a diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 84e368a..67869be 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1290,8 +1290,14 @@ $(call gb_LinkTarget_use_external,$(1),openssl) $(call gb_LinkTarget_use_libraries,$(1),\ secur32 \ ws2_32 \ - $(if $(filter YES,$(WITH_LDAP)),ldap50) \ ) + +ifeq ($(WITH_LDAP),YES) +$(call gb_LinkTarget_add_libs,$(1),\ + nsldap32v50.lib \ +) +endif + endif endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: how to use libreoffice library if not use UNO?
On Wed, 2012-05-30 at 16:33 +0800, engine spot wrote: hmm... I think it is a requirement , for example , I want to edit ods and also other office file in chrome browser , so I need to use a library to prase the ods file , and shown to the web , and I do not need to install many other software , such as microsoft office , open office , libreoffice , only a library enough , and it is very lightweight. Fun - have you tried the LibreOffice on-line stuff ? of course, plenty of work is needed there, but - it might do what you want. If it is ODS only, then you could use POI or whatever other ODF parsing libraries there are out there for various languages. HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: i18npool/CustomTarget_localedata.mk
i18npool/CustomTarget_localedata.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit af1fe5e603b8fff6b35a759d9c558f6a49638e2e Author: Matúš Kukan matus.ku...@gmail.com Date: Wed May 30 12:20:48 2012 +0200 i18npool: depend on outdir target Change-Id: Ib94620f316899a77b3842989dd859625f6748ddc diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk index 37c9474..d8c260d 100644 --- a/i18npool/CustomTarget_localedata.mk +++ b/i18npool/CustomTarget_localedata.mk @@ -54,7 +54,7 @@ $(i18npool_LDDIR)/saxparser.rdb : $(i18npool_LDDIR)/saxparser.input \ $(gb_XSLTPROC) --nonet --stringparam prefix $(OUTDIR_FOR_BUILD)/xml/ \ -o $@ $(SOLARENV)/bin/packcomponents.xslt $) -$(i18npool_LDDIR)/saxparser.input : $(call gb_ComponentTarget_get_target,sax/source/expatwrap/expwrap) | $(i18npool_LDDIR)/.dir +$(i18npool_LDDIR)/saxparser.input : $(call gb_ComponentTarget_get_outdir_target,sax/source/expatwrap/expwrap) | $(i18npool_LDDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) echo 'listfilenamecomponent/sax/source/expatwrap/expwrap.component/filename/list' $@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - lingucomponent/source
lingucomponent/source/languageguessing/simpleguesser.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit f12f1b2afa5bbea5e62cab960ffe61925e5d96fd Author: Caolán McNamara caol...@redhat.com Date: Fri May 25 15:51:04 2012 +0100 this is supposed to just be the number of bytes Change-Id: Iecd376aba13f94c5c62fab2f3278c5f3efda20b4 Signed-off-by: Tomas Chvatal tchva...@suse.cz diff --git a/lingucomponent/source/languageguessing/simpleguesser.cxx b/lingucomponent/source/languageguessing/simpleguesser.cxx index 383ab3e..3346ef2 100644 --- a/lingucomponent/source/languageguessing/simpleguesser.cxx +++ b/lingucomponent/source/languageguessing/simpleguesser.cxx @@ -117,8 +117,7 @@ vectorGuess SimpleGuesser::GuessLanguage(const char* text) if (!h) return guesses; -//calculate le number of unicode charcters (symbols) -int len = utfstrlen(text); +int len = strlen(text); if (len MAX_STRING_LENGTH_TO_ANALYSE) len = MAX_STRING_LENGTH_TO_ANALYSE; ___ 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 Korrawit Pruegsanusak detective.conan.1...@gmail.com changed: What|Removed |Added Depends on||50137 --- Comment #12 from Korrawit Pruegsanusak detective.conan.1...@gmail.com 2012-05-30 04:10:56 PDT --- Adding bug 50137, LibO close after creating user profile. A recent regression on Windows. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - connectivity/Library_mozabdrv.mk shell/Library_ooofilt.mk shell/Library_propertyhdl.mk shell/Library_shlxthdl.mk
connectivity/Library_mozabdrv.mk |4 shell/Library_ooofilt.mk |1 + shell/Library_propertyhdl.mk |1 + shell/Library_shlxthdl.mk|1 + 4 files changed, 3 insertions(+), 4 deletions(-) New commits: commit 0f53247fa0c302b6794222fa4b104c6215cf7803 Author: David Tardon dtar...@redhat.com Date: Wed May 30 11:31:58 2012 +0200 do not link with cmt by default It causes linker errors like: libcmt.lib(crt0dat.obj) : error LNK2005: _amsg_exit already defined in msvcrt.lib(MSVCR90.dll) Change-Id: Ia7d9eec8dcbc9cbeb64f121f95c0b83d192bab20 diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk index af30efb..62c18ed 100644 --- a/shell/Library_ooofilt.mk +++ b/shell/Library_ooofilt.mk @@ -80,6 +80,7 @@ $(eval $(call gb_Library_add_ldflags,ooofilt,\ /EXPORT:DllGetClassObject \ /EXPORT:DllRegisterServer \ /EXPORT:DllUnregisterServer \ + /NODEFAULTLIB:libcmt.lib \ )) $(eval $(call gb_Library_add_exception_objects,ooofilt,\ diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk index 4d701cd..5ca9e91 100644 --- a/shell/Library_propertyhdl.mk +++ b/shell/Library_propertyhdl.mk @@ -76,6 +76,7 @@ $(eval $(call gb_Library_use_static_libraries,propertyhdl,\ $(eval $(call gb_Library_add_ldflags,propertyhdl,\ /EXPORT:DllCanUnloadNow \ /EXPORT:DllGetClassObject \ + /NODEFAULTLIB:libcmt.lib \ )) $(eval $(call gb_Library_add_exception_objects,propertyhdl,\ diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk index b8df8a9..e4794cf 100644 --- a/shell/Library_shlxthdl.mk +++ b/shell/Library_shlxthdl.mk @@ -78,6 +78,7 @@ $(eval $(call gb_Library_add_ldflags,shlxthdl,\ /EXPORT:DllGetClassObject \ /EXPORT:DllRegisterServer \ /EXPORT:DllUnregisterServer \ + /NODEFAULTLIB:libcmt.lib \ )) $(eval $(call gb_Library_add_exception_objects,shlxthdl,\ commit 796f1146ea886c7aa2e7de0d7d88c30351bca238 Author: David Tardon dtar...@redhat.com Date: Wed May 30 12:47:55 2012 +0200 throw away useless dependency Change-Id: I5988eccb675b9cb481161077a5b5310efb011389 diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk index e33e762..5448487 100644 --- a/connectivity/Library_mozabdrv.mk +++ b/connectivity/Library_mozabdrv.mk @@ -27,10 +27,6 @@ $(eval $(call gb_Library_Library,mozabdrv)) -$(eval $(call gb_Library_use_packages,calc,\ - connectivity_generated \ -)) - $(eval $(call gb_Library_set_include,mozabdrv,\ -I$(SRCDIR)/connectivity/source/drivers/mozab/bootstrap \ -I$(SRCDIR)/connectivity/source/drivers/mozab/mozillasrc \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - connectivity/Library_calc.mk connectivity/Library_dbase.mk connectivity/Library_evoab.mk connectivity/Library_file.mk connectivity/Library_flat.mk connectivity/Lib
connectivity/Library_calc.mk | 4 connectivity/Library_dbase.mk| 4 connectivity/Library_evoab.mk| 4 connectivity/Library_file.mk | 4 connectivity/Library_flat.mk | 4 connectivity/Library_jdbc.mk | 4 connectivity/Library_mozabdrv.mk | 2 -- connectivity/Library_mozbootstrap.mk | 2 +- connectivity/Library_odbcbase.mk | 4 connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx | 8 connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx | 2 +- connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx | 4 ++-- connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx | 4 ++-- connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx | 4 ++-- connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx| 4 ++-- 15 files changed, 14 insertions(+), 44 deletions(-) New commits: commit f04a44c5e1f632aecfc92dde13783722070de6ae Author: David Tardon dtar...@redhat.com Date: Wed May 30 14:13:42 2012 +0200 remove unneeded (and wrong :-) dependencies Change-Id: I6e0f777c878137f6c1bcbe253b37b8eda257ef01 diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk index 8ad6650..c9a83d1 100644 --- a/connectivity/Library_calc.mk +++ b/connectivity/Library_calc.mk @@ -27,10 +27,6 @@ $(eval $(call gb_Library_Library,calc)) -$(eval $(call gb_Library_use_packages,calc,\ - connectivity_generated \ -)) - $(eval $(call gb_Library_set_componentfile,calc,connectivity/source/drivers/calc/calc)) $(eval $(call gb_Library_use_api,calc,\ diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk index ef5402f..d26cc3b 100644 --- a/connectivity/Library_dbase.mk +++ b/connectivity/Library_dbase.mk @@ -27,10 +27,6 @@ $(eval $(call gb_Library_Library,dbase)) -$(eval $(call gb_Library_use_packages,calc,\ - connectivity_generated \ -)) - $(eval $(call gb_Library_set_componentfile,dbase,connectivity/source/drivers/dbase/dbase)) $(eval $(call gb_Library_use_api,dbase,\ diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk index 3f41de2..852685d 100644 --- a/connectivity/Library_evoab.mk +++ b/connectivity/Library_evoab.mk @@ -27,10 +27,6 @@ $(eval $(call gb_Library_Library,evoab)) -$(eval $(call gb_Library_use_packages,calc,\ - connectivity_generated \ -)) - $(eval $(call gb_Library_set_include,evoab,\ -I$(SRCDIR)/connectivity/source/inc \ $$(INCLUDE) \ diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk index 72abb7c..b1757c1 100644 --- a/connectivity/Library_file.mk +++ b/connectivity/Library_file.mk @@ -27,10 +27,6 @@ $(eval $(call gb_Library_Library,file)) -$(eval $(call gb_Library_use_packages,calc,\ - connectivity_generated \ -)) - $(eval $(call gb_Library_add_defs,file,\ -DOOO_DLLIMPLEMENTATION_FILE \ )) diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk index 02b1100..82885ce 100644 --- a/connectivity/Library_flat.mk +++ b/connectivity/Library_flat.mk @@ -27,10 +27,6 @@ $(eval $(call gb_Library_Library,flat)) -$(eval $(call gb_Library_use_packages,calc,\ - connectivity_generated \ -)) - $(eval $(call gb_Library_set_componentfile,flat,connectivity/source/drivers/flat/flat)) $(eval $(call gb_Library_use_api,flat,\ diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk index 04d4d39..470c19f 100644 --- a/connectivity/Library_jdbc.mk +++ b/connectivity/Library_jdbc.mk @@ -27,10 +27,6 @@ $(eval $(call gb_Library_Library,jdbc)) -$(eval $(call gb_Library_use_packages,calc,\ - connectivity_generated \ -)) - $(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc)) $(eval $(call gb_Library_use_api,jdbc,\ diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk index 8f34e6b..5336326 100644 --- a/connectivity/Library_odbcbase.mk +++ b/connectivity/Library_odbcbase.mk @@ -29,10 +29,6 @@ $(eval $(call gb_Library_Library,odbcbase)) $(eval $(call gb_Library_set_warnings_not_errors,odbcbase)) -$(eval $(call gb_Library_use_packages,calc,\ - connectivity_generated \ -)) - $(eval $(call gb_Library_use_api,odbcbase,\ offapi \ udkapi \ commit f3b3e7ab5f04d0598aa6c635b00aac1390d5f053 Author: David Tardon dtar...@redhat.com Date: Wed May 30 14:07:54 2012 +0200 clean mozab includes, so two include paths can be dropped Change-Id:
Re: Build Error (65280 in moz)
On 29/05/12 16:43, Joel Madero wrote: Hi All, Got this error about 85-90% into build last night: ERROR: error 65280 occurred while making ../libreoffice-core-3.5.3.2/moz it seems that the error is inside 'moz', please re-run build inside this module to isolate the error and/or test your fix: probably you don't need mozilla, it is only used for obscure functionality like address books, you can disable it with the --disable-mozilla option in configure. Furthermore, when I try to do as it says and run build inside of the module I get: build: command not found this is now done by make moz from the top-level directory. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - moz/prj RepositoryExternal.mk
RepositoryExternal.mk | 29 --- moz/prj/d.lst | 53 +- 2 files changed, 24 insertions(+), 58 deletions(-) New commits: commit 764fc4857edd1b78d504310554cf8dcc73bbca23 Author: David Tardon dtar...@redhat.com Date: Wed May 30 14:55:09 2012 +0200 $(OUTDIR_FOR_BUILD) is wrong Change-Id: I906696aa676ce50fd7214db5b7bb09b736e5faa6 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 9edbb29..780f4a4 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1276,7 +1276,7 @@ else # !SYSTEM_POSTGRESQL define gb_LinkTarget__use_postgresql $(call gb_LinkTarget_set_include,$(1),\ - -I$(OUTDIR_FOR_BUILD)/inc/postgresql \ + -I$(OUTDIR)/inc/postgresql \ $$(INCLUDE) \ ) @@ -1326,8 +1326,8 @@ $(call gb_LinkTarget_add_defs,$(1),\ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - -I$(OUTDIR_FOR_BUILD)/inc/mozilla/moz \ - -I$(OUTDIR_FOR_BUILD)/inc/mozilla/nspr \ + -I$(OUTDIR)/inc/mozilla/moz \ + -I$(OUTDIR)/inc/mozilla/nspr \ ) $(call gb_LinkTarget_use_libraries,$(1),\ @@ -1378,8 +1378,8 @@ $(call gb_LinkTarget_add_defs,$(1),\ endif $(call gb_LinkTarget_add_libs,$(1),\ - $(OUTDIR_FOR_BUILD)/lib/embed_base_s.lib \ - $(OUTDIR_FOR_BUILD)/lib/mozreg_s.lib \ + $(OUTDIR)/lib/embed_base_s.lib \ + $(OUTDIR)/lib/mozreg_s.lib \ ) endif commit fb97224c94a3e8d42b97a92a301253a4245bf931 Author: David Tardon dtar...@redhat.com Date: Wed May 30 14:51:20 2012 +0200 deliver all used mozilla headers into one dir This is to avoid problems with too long command lines on Windows. Change-Id: Ifc99bedd37aea7619e002145d4acbb7ec2a14246 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 67869be..9edbb29 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1326,27 +1326,8 @@ $(call gb_LinkTarget_add_defs,$(1),\ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - $(foreach subdir,\ - addrbook \ - chrome \ - content \ - embed_base \ - intl \ - locale \ - mime \ - mork \ - mozldap \ - msgbase \ - necko \ - nspr \ - pref \ - profile \ - rdf \ - string \ - uconv \ - xpcom \ - xpcom_obsolete \ - ,-I$(OUTDIR_FOR_BUILD)/inc/mozilla/$(subdir)) \ + -I$(OUTDIR_FOR_BUILD)/inc/mozilla/moz \ + -I$(OUTDIR_FOR_BUILD)/inc/mozilla/nspr \ ) $(call gb_LinkTarget_use_libraries,$(1),\ diff --git a/moz/prj/d.lst b/moz/prj/d.lst index 1835ea7..caceae6 100644 --- a/moz/prj/d.lst +++ b/moz/prj/d.lst @@ -1,24 +1,22 @@ mkdir: %_DEST%\inc\mozilla mkdir: %COMMON_DEST%\inc\mozilla +mkdir: %_DEST%\inc\mozilla\moz + mkdir: %_DEST%\inc\mozilla\absync mkdir: %_DEST%\inc\mozilla\accessibility mkdir: %_DEST%\inc\mozilla\AcctIdl -mkdir: %_DEST%\inc\mozilla\addrbook mkdir: %_DEST%\inc\mozilla\appcomps mkdir: %_DEST%\inc\mozilla\appshell mkdir: %_DEST%\inc\mozilla\appstartup mkdir: %_DEST%\inc\mozilla\bookmarks mkdir: %_DEST%\inc\mozilla\caps mkdir: %_DEST%\inc\mozilla\chardet -mkdir: %_DEST%\inc\mozilla\chrome -mkdir: %_DEST%\inc\mozilla\content mkdir: %_DEST%\inc\mozilla\content_xsl mkdir: %_DEST%\inc\mozilla\content_xul mkdir: %_DEST%\inc\mozilla\cookie mkdir: %_DEST%\inc\mozilla\docshell mkdir: %_DEST%\inc\mozilla\dom mkdir: %_DEST%\inc\mozilla\editor -mkdir: %_DEST%\inc\mozilla\embed_base mkdir: %_DEST%\inc\mozilla\expat mkdir: %_DEST%\inc\mozilla\exthandler mkdir: %_DEST%\inc\mozilla\find @@ -32,7 +30,6 @@ mkdir: %_DEST%\inc\mozilla\htmlparser mkdir: %_DEST%\inc\mozilla\imgicon mkdir: %_DEST%\inc\mozilla\imglib2 mkdir: %_DEST%\inc\mozilla\import -mkdir: %_DEST%\inc\mozilla\intl mkdir: %_DEST%\inc\mozilla\intlcmpt mkdir: %_DEST%\inc\mozilla\jar mkdir: %_DEST%\inc\mozilla\java @@ -45,19 +42,15 @@ mkdir: %_DEST%\inc\mozilla\layout_xul mkdir: %_DEST%\inc\mozilla\ldap mkdir: %_DEST%\inc\mozilla\ldap\ldap mkdir: %_DEST%\inc\mozilla\ldap-nspr -mkdir: %_DEST%\inc\mozilla\locale mkdir: %_DEST%\inc\mozilla\lwbrk mkdir: %_DEST%\inc\mozilla\mailnews -mkdir: %_DEST%\inc\mozilla\mime mkdir: %_DEST%\inc\mozilla\mimeemitter mkdir: %_DEST%\inc\mozilla\mimetype mkdir: %_DEST%\inc\mozilla\mng mkdir: %_DEST%\inc\mozilla\mork mkdir: %_DEST%\inc\mozilla\mozbrwsr -mkdir: %_DEST%\inc\mozilla\mozldap mkdir: %_DEST%\inc\mozilla\mozreg mkdir: %_DEST%\inc\mozilla\mpfilelocprovider -mkdir: %_DEST%\inc\mozilla\msgbase mkdir: %_DEST%\inc\mozilla\msgbaseutil mkdir: %_DEST%\inc\mozilla\msgcompo mkdir: %_DEST%\inc\mozilla\msgdb @@ -65,7 +58,6 @@ mkdir: %_DEST%\inc\mozilla\msgimap mkdir: %_DEST%\inc\mozilla\msglocal mkdir: %_DEST%\inc\mozilla\msgnews mkdir: %_DEST%\inc\mozilla\msgsearch
[Libreoffice-commits] .: Branch 'update' - check.php
check.php | 20
1 file changed, 12 insertions(+), 8 deletions(-)
New commits:
commit abbfa7ae111716e6fb458a8b17997f83bd57996c
Author: Jan Holesovsky ke...@suse.cz
Date: Wed May 30 15:00:05 2012 +0200
3.5.4 RC2 is Final, update everything earlier to that.
diff --git a/check.php b/check.php
index f27d870..7d87bca 100644
--- a/check.php
+++ b/check.php
@@ -113,8 +113,12 @@ $update_versions = array(
# 3.5.3 versions
'21cb047-d7e6025-9ba54fc-b4a51a8-f42372b' = 'LO-3.5', # 3.5.3 RC1
-# To be uncommented when 3.5.4 Final is out
-#'235ab8a-3802056-4a8fed3-2d66ea8-e241b80' = 'LO-3.5', # 3.5.3 RC2 /
Final
+'235ab8a-3802056-4a8fed3-2d66ea8-e241b80' = 'LO-3.5', # 3.5.3 RC2 / Final
+
+# 3.5.4 versions
+'7306755-f4f605c-738527d-1cf4bc1-9930dc8' = 'LO-3.5', # 3.5.4 RC1
+# To be uncommented when 3.5.5 Final is out
+#'165a79a-7059095-e13bb37-fef39a4-9503d18' = 'LO-3.5', # 3.5.4 RC2 /
Final
);
# Descriptions of the target versions
@@ -122,16 +126,16 @@ $update_versions = array(
# 'gitid' is the content of program/versionrc:buildid of the newest version
# 'id' is what is going to be shown in the update information dialog
$update_map = array(
-'LO-3.5' = array('gitid' =
'235ab8a-3802056-4a8fed3-2d66ea8-e241b80',
- 'id' = 'LibreOffice 3.5.3',
- 'version' = '3.5.3',
+'LO-3.5' = array('gitid' =
'165a79a-7059095-e13bb37-fef39a4-9503d18',
+ 'id' = 'LibreOffice 3.5.4',
+ 'version' = '3.5.4',
'update_type' = 'text/html',
'update_src' = 'http://www.libreoffice.org/download/'),
-# To be uncommented when 3.5.4 RC2 is out, to get updates from 3.5.4 RC1
+# To be uncommented when 3.5.5 RC2 is out, to get updates from 3.5.5 RC1
#'LO-3.5-pre' = array('gitid' = '',
-# 'id' = 'LibreOffice 3.5.4 RC2',
-# 'version' = '3.5.4 RC2',
+# 'id' = 'LibreOffice 3.5.5 RC2',
+# 'version' = '3.5.5 RC2',
# 'update_type' = 'text/html',
# 'update_src' =
'http://www.libreoffice.org/download/pre-releases/'),
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/source
extensions/source/update/check/updatehdl.src | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 7092be1a6faef392db495285a051fb0c4e60b682
Author: Jan Holesovsky ke...@suse.cz
Date: Wed May 30 15:12:59 2012 +0200
update bubble: Click here - Click the icon, to clearly point to the
icon.
Click here is annoying because one is used to the web pages where click
here usually means one should click the text here. The here here
always
costed me an unnecessary mouse move before I remembered I am supposed to
click
the icon ;-)
Change-Id: Ia9f5b359cb76813abbc9847e268e4241c5f6481f
diff --git a/extensions/source/update/check/updatehdl.src
b/extensions/source/update/check/updatehdl.src
index 6f1ae28..2036a3f 100644
--- a/extensions/source/update/check/updatehdl.src
+++ b/extensions/source/update/check/updatehdl.src
@@ -189,7 +189,7 @@ String RID_UPDATE_BUBBLE_T_UPDATE_AVAIL
String RID_UPDATE_BUBBLE_UPDATE_AVAIL
{
-Text [ en-US ] = Click here to start the download.;
+Text [ en-US ] = Click the icon to start the download.;
};
String RID_UPDATE_BUBBLE_T_UPDATE_NO_DOWN
@@ -199,7 +199,7 @@ String RID_UPDATE_BUBBLE_T_UPDATE_NO_DOWN
String RID_UPDATE_BUBBLE_UPDATE_NO_DOWN
{
-Text [ en-US ] = Click here for more information.;
+Text [ en-US ] = Click the icon for more information.;
};
String RID_UPDATE_BUBBLE_T_AUTO_START
@@ -229,7 +229,7 @@ String RID_UPDATE_BUBBLE_T_DOWNLOAD_PAUSED
String RID_UPDATE_BUBBLE_DOWNLOAD_PAUSED
{
-Text [ en-US ] = Click here to resume.;
+Text [ en-US ] = Click the icon to resume.;
};
String RID_UPDATE_BUBBLE_T_ERROR_DOWNLOADING
@@ -239,7 +239,7 @@ String RID_UPDATE_BUBBLE_T_ERROR_DOWNLOADING
String RID_UPDATE_BUBBLE_ERROR_DOWNLOADING
{
-Text [ en-US ] = Click here for more information.;
+Text [ en-US ] = Click the icon for more information.;
};
String RID_UPDATE_BUBBLE_T_DOWNLOAD_AVAIL
@@ -249,7 +249,7 @@ String RID_UPDATE_BUBBLE_T_DOWNLOAD_AVAIL
String RID_UPDATE_BUBBLE_DOWNLOAD_AVAIL
{
-Text [ en-US ] = Click here to start the installation.;
+Text [ en-US ] = Click the icon to start the installation.;
};
String RID_UPDATE_BUBBLE_T_EXT_UPD_AVAIL
@@ -259,6 +259,6 @@ String RID_UPDATE_BUBBLE_T_EXT_UPD_AVAIL
String RID_UPDATE_BUBBLE_EXT_UPD_AVAIL
{
-Text [ en-US ] = Click here for more information.;
+Text [ en-US ] = Click the icon for more information.;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: REMINDER: Release 3.6.0-alpha1 from master
Rainer Bielefeld píše v St 30. 05. 2012 v 11:57 +0200: Petr Mladek schrieb: Note that alpha1 is there to find exactly this kind of problems. Of course, it does not make sense to produce it if is would be completely unusable. On the other hand, we do not want to push it on mirrors. Hi I see the problem that the alpha will not be tested enough, I (for example) do not plan to use it for normal work (more or less), and so the chance to find bugs decreases dramatically, because other (WIN?) users also can't use the alpha. I am not sure if there are good expectations set about the alpha/beta builds. If they are perfectly usable and do not have bugs, we do not need them and we could do final release immediately. There is always risk to use them for normal work. I am a bit confused. I am not sure why missing java would break you from using the master build. IMHO, you do most of the work in Writer and Calc These should not be affected by missing java that much. IMHO, java is used there only for wizards. I guess that you are more concerned about the random crashers. Well, this is really bad problem. On the other hand, you are not able to provide a good scenario to reproduce or backtrace. I am afraid that we need to collect information from more people and alpha/beta builds are there for this purpose. Back to the expectation of the alpha build. We need to make sure that beta1 will install/start and be basically usable on many systems. If it crashes after half an hour of the work, it is pity but it is something that might be expected from the first beta. Of course, we need to warn people in the release notes and ask them to find a reproducible scenario and report it into bugzilla... What do you think? Is my view wrong in some way? I still see the problem with a MinGW build pull time 2012-05-28 04:23:12 Bug 50344 - Basic Macro will not run because of missing Java https://bugs.freedesktop.org/show_bug.cgi?id=50344 Ah, it is not that critical if it works Ah, some Misunderstanding. Java does not work anywhere. If that bug would be MinGW only I would have added that key work in the summary line. I only used MinGW for a quick test yesterday because that was the most current Master available (we still do not have a MVSC Master after 2012-05-26_02.43.54.) Sure. MinGW is perfectly fine for testing. On the other hand, the normal Windows build is what matters regarding release blockers. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sc/source
sc/source/filter/oox/drawingbase.cxx |1 +
sc/source/filter/oox/drawingfragment.cxx |4
2 files changed, 5 insertions(+)
New commits:
commit 1abc0695d770eebd21256a86aeee14a5384d84c7
Author: Noel Power noel.po...@novell.com
Date: Wed May 30 14:06:27 2012 +0100
don't rotate calc shapes if twoCellAnchor, partial fix bnc#762542
Change-Id: I3ccf6d87db2e9c33f2adaf92e138018f2e27528b
diff --git a/sc/source/filter/oox/drawingfragment.cxx
b/sc/source/filter/oox/drawingfragment.cxx
index f041287..9b7d07a 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -257,6 +257,10 @@ void DrawingFragment::onEndElement()
case XDR_TOKEN( twoCellAnchor ):
if( mxDrawPage.is() mxShape.get() mxAnchor.get() )
{
+// Rotation is decided by orientation of shape determined
+// by the anchor position given by 'twoCellAnchor'
+if ( getCurrentElement() == XDR_TOKEN( twoCellAnchor ) )
+mxShape-setRotation(0);
EmuRectangle aShapeRectEmu = mxAnchor-calcAnchorRectEmu(
getDrawPageSize() );
if( (aShapeRectEmu.X = 0) (aShapeRectEmu.Y = 0)
(aShapeRectEmu.Width = 0) (aShapeRectEmu.Height = 0) )
{
commit dbb385df0fc83c36cfc91b82979fabea868592c2
Author: Noel Power noel.po...@novell.com
Date: Wed May 30 13:59:52 2012 +0100
fix missing form control, partial fix for fdo#49430
Change-Id: I7a0dd3d6e25a48449941e258ea5a16a247a8fe05
diff --git a/sc/source/filter/oox/drawingbase.cxx
b/sc/source/filter/oox/drawingbase.cxx
index 4a30a15..1cf511c 100644
--- a/sc/source/filter/oox/drawingbase.cxx
+++ b/sc/source/filter/oox/drawingbase.cxx
@@ -161,6 +161,7 @@ void ShapeAnchor::setCellPos( sal_Int32 nElement, sal_Int32
nParentContext, cons
void ShapeAnchor::importVmlAnchor( const OUString rAnchor )
{
meAnchorType = ANCHOR_VML;
+meCellAnchorType = CELLANCHOR_PIXEL;
::std::vector OUString aTokens;
sal_Int32 nIndex = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: reportbuilder/Extension_reportbuilder.mk
reportbuilder/Extension_reportbuilder.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d77e777af82747dc5bd761d9fb4d5aa99cf7840e Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed May 30 15:35:40 2012 +0200 when building system jfreereport, version.mk is not delivered Change-Id: Ieffb063bd6300f415f958a617fef8b1122e1b7b1 diff --git a/reportbuilder/Extension_reportbuilder.mk b/reportbuilder/Extension_reportbuilder.mk index 03fdbe8..22cd0fb 100644 --- a/reportbuilder/Extension_reportbuilder.mk +++ b/reportbuilder/Extension_reportbuilder.mk @@ -43,7 +43,7 @@ $(eval $(call gb_Extension_add_files,report-builder,,\ endif ifneq ($(SYSTEM_JFREEREPORT),YES) -include $(OUTDIR)/bin/jfreereport_version.mk +include $(SRCDIR)/jfreereport/version.mk $(eval $(call gb_Extension_add_files,report-builder,,\ $(OUTDIR)/bin/flow-engine-$(FLOW_ENGINE_VERSION).jar \ $(OUTDIR)/bin/flute-$(FLUTE_VERSION).jar \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx| 64 +-
writerfilter/source/rtftok/rtfreferenceproperties.cxx |4 -
writerfilter/source/rtftok/rtfsdrimport.cxx |4 -
writerfilter/source/rtftok/rtfsprm.cxx|5 -
writerfilter/source/rtftok/rtfsprm.hxx| 10 ++
5 files changed, 44 insertions(+), 43 deletions(-)
New commits:
commit 8201c8a5f680947c2e855504be321afb1e5bc06a
Author: Caolán McNamara caol...@redhat.com
Date: Wed May 30 15:39:01 2012 +0200
don't overload operator- and just forward specific methods, take two
Change-Id: If66b0a5f1b0444d8f0a6dfed1b518a0033d61d2e
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 528a8b6..9f2e0f6 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -117,8 +117,8 @@ static bool lcl_eraseNestedAttribute(RTFSprms rSprms, Id
nParent, Id nId)
static RTFSprms lcl_getLastAttributes(RTFSprms rSprms, Id nId)
{
RTFValue::Pointer_t p = rSprms.find(nId);
-if (p.get() p-getSprms()-size())
-return p-getSprms()-back().second-getAttributes();
+if (p.get() p-getSprms().size())
+return p-getSprms().back().second-getAttributes();
else
{
SAL_WARN(writerfilter, trying to set property when no type is
defined);
@@ -713,7 +713,7 @@ int RTFDocumentImpl::resolvePict(bool bInline)
RTFValue::Pointer_t pExtentValue(new RTFValue(aExtentAttributes));
// docpr sprm
RTFSprms aDocprAttributes;
-for (RTFSprms::Iterator_t i =
m_aStates.top().aCharacterAttributes-begin(); i !=
m_aStates.top().aCharacterAttributes-end(); ++i)
+for (RTFSprms::Iterator_t i =
m_aStates.top().aCharacterAttributes.begin(); i !=
m_aStates.top().aCharacterAttributes.end(); ++i)
if (i-first == NS_ooxml::LN_CT_NonVisualDrawingProps_name || i-first
== NS_ooxml::LN_CT_NonVisualDrawingProps_descr)
aDocprAttributes.set(i-first, i-second);
RTFValue::Pointer_t pDocprValue(new RTFValue(aDocprAttributes));
@@ -732,14 +732,14 @@ int RTFDocumentImpl::resolvePict(bool bInline)
{
// wrap sprm
RTFSprms aAnchorWrapAttributes;
-for (RTFSprms::Iterator_t i =
m_aStates.top().aCharacterAttributes-begin(); i !=
m_aStates.top().aCharacterAttributes-end(); ++i)
+for (RTFSprms::Iterator_t i =
m_aStates.top().aCharacterAttributes.begin(); i !=
m_aStates.top().aCharacterAttributes.end(); ++i)
if (i-first == NS_ooxml::LN_CT_WrapSquare_wrapText)
aAnchorWrapAttributes.set(i-first, i-second);
RTFValue::Pointer_t pAnchorWrapValue(new
RTFValue(aAnchorWrapAttributes));
RTFSprms aAnchorAttributes;
RTFSprms aAnchorSprms;
aAnchorSprms.set(NS_ooxml::LN_CT_Anchor_extent, pExtentValue);
-if (aAnchorWrapAttributes-size())
+if (aAnchorWrapAttributes.size())
aAnchorSprms.set(NS_ooxml::LN_EG_WrapType_wrapSquare,
pAnchorWrapValue);
aAnchorSprms.set(NS_ooxml::LN_CT_Anchor_docPr, pDocprValue);
aAnchorSprms.set(NS_ooxml::LN_graphic_graphic, pGraphicValue);
@@ -1231,8 +1231,8 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
resolveSubstream(m_nGroupStartPos - 1, nId, aCustomMark);
if (bCustomMark)
{
-m_aStates.top().aCharacterAttributes-clear();
-m_aStates.top().aCharacterSprms-clear();
+m_aStates.top().aCharacterAttributes.clear();
+m_aStates.top().aCharacterSprms.clear();
RTFValue::Pointer_t pValue(new RTFValue(1));
m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_FtnEdnRef_customMarkFollows,
pValue);
text(aCustomMark);
@@ -2472,7 +2472,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
m_aStates.top().aTabAttributes.set(NS_ooxml::LN_CT_TabStop_pos, pIntValue);
RTFValue::Pointer_t pValue(new
RTFValue(m_aStates.top().aTabAttributes));
lcl_putNestedSprm(m_aStates.top().aParagraphSprms,
NS_ooxml::LN_CT_PPrBase_tabs, NS_ooxml::LN_CT_Tabs_tab, pValue);
-m_aStates.top().aTabAttributes-clear();
+m_aStates.top().aTabAttributes.clear();
}
break;
case RTF_ILVL:
@@ -3008,45 +3008,45 @@ int RTFDocumentImpl::pushState()
RTFSprms RTFDocumentImpl::mergeSprms()
{
RTFSprms aSprms;
-for (RTFSprms::Iterator_t i = m_aStates.top().aTableSprms-begin();
-i != m_aStates.top().aTableSprms-end(); ++i)
+for (RTFSprms::Iterator_t i = m_aStates.top().aTableSprms.begin();
+i != m_aStates.top().aTableSprms.end(); ++i)
aSprms.set(i-first, i-second);
-for (RTFSprms::Iterator_t i =
[PATCH] Re: 1 sheet by default [was Re: Tinderbox failure, Linux-RHEL6-x86_64@14-with-check, MASTER, last success: 2012-05-15 18:12:02]
Hello Kendy, Stephan, first: Stephan, I'm very sorry for breaking your tinderbox(es) for days and not noticing it. (I just assumed my 2-byte change of a commit was innocent enough. I'll do make check in the future as you advised.) With some dumbluck and [1], I've managed to get it down to 1 failing test. My approach so far was to just unconditionally add a sheet (in the case of the XMLStylesExporter and XMLSettingsExporter I just made sure these tests actually ran on Sheet 1 (=0), not Sheet 2 (=1)). Since I guess my approach is less than optimal, do tell me if I need to wrap stuff in try/catch or so. Or, if I should ask LibO how many sheets there are before creating a new one. Or something else. About the last failing test, sc_unoapi/ScModelObj, I am unsure where it needs the second sheet, so I didn't add anything yet. Advice appreciated. Astron. [1] http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/FirstSteps/Example:_Working_with_a_Spreadsheet_Document 0001-Fix-up-unit-tests-that-assumed-two-or-more-sheets-pe.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: how to use libreoffice library if not use UNO?
do you means use libreoffice in a Web Browser with gtk3 support ? I tried to compile libreoffice with gtk3 and succeed to run it in chrome and also firefox ,see my blog post http://blog.xrmplatform.org/compile-libreoffice-and-use-it-in-a-web-browser-ubuntu-12-04/ but when I tried it , I find that it is not easy to custom the interface , such as custom the style as google docs , and also there is only one js library broadway.js , for the client and the server ,the interactive is very frequently , if we think it as a cloud server , the performance will be very slow , so I do not think it a good idea. On Wed, May 30, 2012 at 6:19 PM, Michael Meeks michael.me...@suse.comwrote: On Wed, 2012-05-30 at 16:33 +0800, engine spot wrote: hmm... I think it is a requirement , for example , I want to edit ods and also other office file in chrome browser , so I need to use a library to prase the ods file , and shown to the web , and I do not need to install many other software , such as microsoft office , open office , libreoffice , only a library enough , and it is very lightweight. Fun - have you tried the LibreOffice on-line stuff ? of course, plenty of work is needed there, but - it might do what you want. If it is ODS only, then you could use POI or whatever other ODF parsing libraries there are out there for various languages. HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 39026, which changed state. Bug 39026 Summary: Recent Documents list does not work https://bugs.freedesktop.org/show_bug.cgi?id=39026 What|Old Value |New Value Resolution|FIXED | Status|RESOLVED|REOPENED -- 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
potentially dead code in sw/source/core/undo/undel.cxx?
Hi, While translating comments and cleaning up the files in sw/source/core/undo, I realized a piece of code which indentation was wrong. I tried to re-indent it but it seems as if there are too many braces in the function call... Could anyone else please also check the body of the function SwUndoDelete::UndoImpl(::sw::UndoRedoContext rContext) in the file sw/source/core/undo/undel.cxx (spanning approx. from line 750 to 900) and try to re-indent the respective parts? Because I get 7 LOC that are outside of the function body after doing this... Cheers, Philipp -- ASCII ribbon campaign ( ) against HTML e-mail X www.asciiribbon.org / \ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Problem with configuring build
Hi, I'm trying to configure build with ./autogen.sh --with-max-jobs=2 --with-num-cpus=2 --without-help --without-myspell-dicts --disable-gnome-vfs at the beginning it says can't create backup file. yet it runs... and after a while : checking for GCONF... no configure: error: Package requirements (gconf-2.0 ORBit-2.0 ) were not met: No package 'ORBit-2.0' found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables GCONF_CFLAGS and GCONF_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. Error running configure at ./autogen.sh line 190. The problem is, that I already have orbit2 and have no idea what to do with this, because set the environment variables doesn't seem to be an useful advice, because to set it I would have to know the value... I'm trying to figure out a way, but while there's no useful answer it's starting to be a waste of time. Maybe you know what's wrong, I'll appreciate any answer. Best regards, Artur ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - filter/Library_placeware.mk filter/source libexttextcat/android.patch libexttextcat/libexttextcat-visibility.patch libexttextcat/makefile.mk libexttextcat/prj ooo.
filter/Library_placeware.mk |2
filter/source/placeware/Base64Codec.cxx | 143 ---
filter/source/placeware/Base64Codec.hxx | 50 --
filter/source/placeware/exporter.cxx |4
libexttextcat/android.patch |4
libexttextcat/libexttextcat-visibility.patch | 10 -
libexttextcat/makefile.mk|8 -
libexttextcat/prj/d.lst |2
ooo.lst.in |2
package/Library_package2.mk |2
package/prj/build.lst|2
package/source/manifest/Base64Codec.cxx | 201 ---
package/source/manifest/Base64Codec.hxx | 48 --
package/source/manifest/ManifestExport.cxx |8 -
package/source/manifest/ManifestImport.cxx |8 -
15 files changed, 21 insertions(+), 473 deletions(-)
New commits:
commit 41961997bed0c607920df447848e690cc858ec5f
Author: Caolán McNamara caol...@redhat.com
Date: Wed May 30 15:10:25 2012 +0100
merge three base64 encoders/decoders together
Change-Id: Ic123c081fcf6ddcf5d61c5d5a3eab01db470014c
diff --git a/filter/Library_placeware.mk b/filter/Library_placeware.mk
index 9b2f09c..6976f3e 100644
--- a/filter/Library_placeware.mk
+++ b/filter/Library_placeware.mk
@@ -34,11 +34,11 @@ $(eval $(call gb_Library_use_libraries,placeware,\
cppuhelper \
cppu \
sal \
+ sax \
$(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,placeware,\
- filter/source/placeware/Base64Codec \
filter/source/placeware/exporter \
filter/source/placeware/filter \
filter/source/placeware/tempfile \
diff --git a/filter/source/placeware/Base64Codec.cxx
b/filter/source/placeware/Base64Codec.cxx
deleted file mode 100644
index 99b93ed..000
--- a/filter/source/placeware/Base64Codec.cxx
+++ /dev/null
@@ -1,143 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#include Base64Codec.hxx
-#include rtl/ustrbuf.hxx
-#include osl/diagnose.h
-using namespace osl;
-using namespace com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-const
- sal_Char aBase64EncodeTable[] =
-{ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
- 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
- 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
- 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
- '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/' };
-
-const
- sal_uInt8 aBase64DecodeTable[] =
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0-15
-
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 16-31
-
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 62, 0, 0, 0, 63, // 32-47
-//+ /
-
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 0, 0, 0, 0, 0, 0, // 48-63
-//0 1 2 3 4 5 6 7 8 9 =
-
- 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, // 64-79
-//A B C D E F G H I J K L M N O
-
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 0, 0, 0, 0, 0, // 80-95
-//P Q R S T U V W X Y Z
-
- 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, // 96-111
-//a b c d e f g h i j k l m n o
-
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 0, 0, 0, 0, 0, // 112-127
-//p q r s t u v w x y z
-
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
[Libreoffice-commits] .: sc/source vcl/source
sc/source/ui/app/inputwin.cxx |4 ++--
sc/source/ui/inc/inputwin.hxx |1 -
vcl/source/window/decoview.cxx | 16
3 files changed, 10 insertions(+), 11 deletions(-)
New commits:
commit be51f7ce59d5534cfda97badd4c02e2a4fe198e3
Author: Jan Holesovsky ke...@suse.cz
Date: Wed May 30 17:03:12 2012 +0200
calc input line: Fix the size on Windows.
Change-Id: Iac102ad3794b8959fb219094a9db6345990c4883
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 53c5962..37faa1d 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1139,7 +1139,6 @@ ScMultiTextWnd::ScMultiTextWnd( ScInputBarGroup* pParen,
ScTabViewShell* pViewSh
mnLastExpandedLines( INPUTWIN_MULTILINES ),
mbInvalidate( false )
{
-mnTextHeight = GetTextHeight();
Size aBorder;
aBorder = CalcWindowSize( aBorder);
mnBorderHeight = aBorder.Height();
@@ -1173,7 +1172,7 @@ EditView* ScMultiTextWnd::GetEditView()
long ScMultiTextWnd::GetPixelHeightForLines( long nLines )
{
// add padding ( for the borders of the window )
-return ( nLines * mnTextHeight ) + mnBorderHeight;
+return ( nLines * LogicToPixel( Size( 0, GetTextHeight() ) ).Height() ) +
mnBorderHeight;
}
void ScMultiTextWnd::SetNumLines( long nLines )
@@ -1463,6 +1462,7 @@ ScTextWnd::ScTextWnd( Window* pParent, ScTabViewShell*
pViewSh )
SetLineColor( COL_BLACK );
SetMapMode ( MAP_TWIP );
SetPointer ( POINTER_TEXT );
+SetFont( aTextFont );
}
ScTextWnd::~ScTextWnd()
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 84fb421..66e7eed 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -206,7 +206,6 @@ private:
ScInputBarGroup mrGroupBar;
long mnLines;
long mnLastExpandedLines;
-long mnTextHeight;
long mnBorderHeight;
bool mbInvalidate;
};
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index 20546e5..7dfc301 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -742,10 +742,10 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle
rRect,
case FRAME_DRAW_NWF:
// enough space for the native rendering
-rRect.Left() += 5;
-rRect.Top() += 5;
-rRect.Right() -= 5;
-rRect.Bottom() -= 5;
+rRect.Left() += 4;
+rRect.Top() += 4;
+rRect.Right() -= 4;
+rRect.Bottom() -= 4;
break;
}
}
@@ -841,10 +841,10 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle
rRect,
case FRAME_DRAW_NWF:
// no rendering, just enough space for the native rendering
-rRect.Left() += 5;
-rRect.Top() += 5;
-rRect.Right() -= 5;
-rRect.Bottom() -= 5;
+rRect.Left() += 4;
+rRect.Top() += 4;
+rRect.Right() -= 4;
+rRect.Bottom() -= 4;
break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 6e7657eb87cf97df3aa40cb662963d6d85816ad5
Author: Miklos Vajna vmik...@suse.cz
Date: Fri May 11 14:45:59 2012 +0200
fdo#45190 import of RTF_LI should reset inherited RTF_FI
Change-Id: I17c287fa4daa399876b34182c02d9cf928fe1b6f
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 1250855..063d94b 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2232,7 +2232,6 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
switch (nKeyword)
{
case RTF_FI: nSprm = NS_sprm::LN_PDxaLeft1; break;
-case RTF_LI: nSprm = NS_sprm::LN_PDxaLeft; break;
case RTF_LIN: nSprm = 0x845e; break;
case RTF_RI: nSprm = NS_sprm::LN_PDxaRight; break;
case RTF_RIN: nSprm = 0x845d; break;
@@ -2847,6 +2846,13 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
m_aStates.top().nInternalState = INTERNAL_BIN;
m_aStates.top().nBinaryToRead = nParam;
break;
+case RTF_LI:
+
m_aStates.top().aParagraphSprms-push_back(make_pair(NS_sprm::LN_PDxaLeft,
pIntValue));
+// It turns out \li should reset the \fi inherited from the
stylesheet.
+// So set the direct formatting to zero, if we don't have such
direct formatting yet.
+if
(!m_aStates.top().aParagraphSprms.find(NS_sprm::LN_PDxaLeft1).get())
+
m_aStates.top().aParagraphSprms-push_back(make_pair(NS_sprm::LN_PDxaLeft1,
RTFValue::Pointer_t(new RTFValue(0;
+break;
default:
#if OSL_DEBUG_LEVEL 1
OSL_TRACE(%s: TODO handle value '%s', OSL_THIS_FUNC,
lcl_RtfToString(nKeyword));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED][REVIEW:3-5] fdo#45190 import of RTF_LI should reset inherited RTF_FI
On Wed, 2012-05-30 at 10:28 +0200, Miklos Vajna wrote: Hi, See http://cgit.freedesktop.org/libreoffice/core/commit/?id=bf123ee Regression from 3.4; backported patch attached. pushed to 3-5. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Problem with configuring build
On Wed, 2012-05-30 at 16:46 +0200, Artur Dorda wrote: Hi, I'm trying to configure build with ./autogen.sh --with-max-jobs=2 --with-num-cpus=2 --without-help --without-myspell-dicts --disable-gnome-vfs at the beginning it says can't create backup file. yet it runs... and after a while : checking for GCONF... no configure: error: Package requirements (gconf-2.0 ORBit-2.0 ) were not met: run pkg-config --libs gconf-2.0 ORBit-2.0 on the command line and see if that fails, and fix that problem if it exists. No package 'ORBit-2.0' found The problem is, that I already have orbit2 But do you have the matching -devel/-dev package ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Password Protection (source file)
On Wed, May 30, 2012 at 7:59 AM, Stefan Knorr (Astron) heinzless...@googlemail.com wrote: Hi Joel, not that I am a very good person to answer this, but are you sure you are using the builtin file picker instead of the native one? AFAIK, the files in fpicker are specific to LibO's builtin file picker which can be activated under Tools Options... LibreOffice/General Open/Save dialogs. Maybe that helps, quite possibly it doesn't. Astron. Thanks for the suggestion. I went ahead and checked it out, unfortunately not the case. I did yet another search for Save with password with grep just to be positive there wasn't another instance of it and there isn't. I'm about as confused as someone can be about where that text that is located at the bottom of the Save As dialog box comes from. Ultimately I am trying to apply a similar method on another piece of software, that's why I need to track down the entire password protect method used by OOo/LO ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vcl/inc
vcl/inc/vcl/outdev.hxx |1 + 1 file changed, 1 insertion(+) New commits: commit 67a8150360ad0728a10c281dfa065bc094e139eb Author: Jan Holesovsky ke...@suse.cz Date: Wed May 30 17:09:32 2012 +0200 One line docu to save me code reading the next time ;-) Change-Id: I3998679c859c2a25933a879ae6412d7555350a62 diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index c1459c0..dd10eda 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -599,6 +599,7 @@ public: MetricVector* pVector = NULL, String* pDisplayText = NULL ); longGetTextWidth( const XubString rStr, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN ) const; +/// Height where any character of the current font fits; in logic coordinates. longGetTextHeight() const; voidDrawTextArray( const Point rStartPt, const XubString rStr, const sal_Int32* pDXAry = NULL, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Password Protection (source file)
On 2012-05-30 17:10, Joel Madero wrote: Thanks for the suggestion. I went ahead and checked it out, unfortunately not the case. I did yet another search for Save with password with grep just to be positive there wasn't another instance of it and there isn't. fpicker/source/office/iodlg.src:Text [ en-US ] = Save with password ; Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - connectivity/Library_postgresql-sdbc-impl.mk
connectivity/Library_postgresql-sdbc-impl.mk |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit 769e71ff8c06b9c23e25d7188f565d287955 Author: David Tardon dtar...@redhat.com Date: Wed May 30 17:25:07 2012 +0200 do not link with cmt by default Change-Id: I7ed9a25d3b113ae0bda4f8ce47153b54270916f1 diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index f412c7a..da6fe98 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -50,6 +50,13 @@ ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ shell32 \ )) + +ifeq ($(COM),MSC) +$(eval $(call gb_Library_add_ldflags,postgresql-sdbc-impl,\ + /NODEFAULTLIB:libcmt.lib \ +)) +endif + endif $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\ commit d3829143ff1ee10b4c33bbacae9b01a67905d1fe Author: David Tardon dtar...@redhat.com Date: Wed May 30 17:22:43 2012 +0200 $(OUTDIR_FOR_BUILD) is wrong Change-Id: Id0c7564d7355192842c0b0b248bf21379ef104cb diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index c31d225..f412c7a 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\ ifneq ($(SYSTEM_POSTGRESQL),YES) ifneq ($(GUI)$(COM),WNTMSC) -include $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk +include $(OUTDIR)/inc/postgresql/libpq-flags.mk $(eval $(call gb_Library_add_libs,postgresql-sdbc-impl,\ $(if $(filter-out MACOSX,$(OS)),-Wl$(COMMA)--as-needed) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Windows istallation MSIEXEC modules names
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi I am trying to distribute a lean localized install of LO and I need to remove the extra dictionaries and langpacks... I have a script with MSIEXEC but I need to identify the modules I need to remove or add, so where can I find the list of modules? ( also have ORCA to peek at the msi file, but it is not so clear to me) Any help is welcome. - -- Olivier Hallot Founder, Board of Directors Member - The Document Foundation The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Fundação responsável civilmente, de acordo com o direito civil Detalhes Legais: http://www.documentfoundation.org/imprint LibreOffice translation leader for Brazilian Portuguese +55-21-8822-8812 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJPxj2vAAoJEJp3R7nH3vLxx/sH/1oHVJ9XparH1HqHwtcBgGga N7ybxezvNiy0XUFpZWiYKrlyE7Or1Cx66CWiSstsgQzkYhVNWV/qmN8WYrFODSC/ IBeCqoGeCjfN1bEQLOvEN/2I4EmifWkI+M/ssOtY+gPczQggKS3ardipAprys7fA wkXCbTGFRCXHE10nXdOymJP/dNjMeuH8ogDvv2DKl6BEJlr7D2mgii8DWMkwYATB uOAlj1L82SGk3nD3gKJzRhGcoFdZBafK+RcaODzD0Cf8m291TVg6O7anm12t2k0d vDgMHNgALGGQePnzxpJqi/voa7Uu/EdbxHAP++ZoyZyJffYgS5lzWD5MHGo/soQ= =aX8f -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Password Protection (source file)
Yeah that's the only one I found as well but changing it doesn't change the text at all when you go to Save As (the bottom left corner where it says Save with password) which is the dilemma I'm facing :/ On Wed, May 30, 2012 at 8:26 AM, Noel Grandin n...@peralex.com wrote: On 2012-05-30 17:10, Joel Madero wrote: Thanks for the suggestion. I went ahead and checked it out, unfortunately not the case. I did yet another search for Save with password with grep just to be positive there wasn't another instance of it and there isn't. fpicker/source/office/iodlg.**src:Text [ en-US ] = Save with password ; Disclaimer: http://www.peralex.com/**disclaimer.htmlhttp://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Password Protection (source file)
there is another one here: sfx2/source/dialog/filedlghelper.src:Text [ en-US ] = Save with ~password ; And there is some code which may be using the native platform dialog: vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx:case FILESAVE_AUTOEXTENSION_PASSWORD: vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx:case FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS: vcl/unx/kde/UnxFilePicker.cxx:case FILESAVE_AUTOEXTENSION_PASSWORD: vcl/unx/kde/UnxFilePicker.cxx:case FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS: vcl/unx/kde4/KDE4FilePicker.cxx:case FILESAVE_AUTOEXTENSION_PASSWORD: vcl/unx/kde4/KDE4FilePicker.cxx:case FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS: in which case changing the LO source is not going to help :-( On 2012-05-30 17:35, Joel Madero wrote: Yeah that's the only one I found as well but changing it doesn't change the text at all when you go to Save As (the bottom left corner where it says Save with password) which is the dilemma I'm facing :/ On Wed, May 30, 2012 at 8:26 AM, Noel Grandin n...@peralex.com mailto:n...@peralex.com wrote: On 2012-05-30 17:10, Joel Madero wrote: Thanks for the suggestion. I went ahead and checked it out, unfortunately not the case. I did yet another search for Save with password with grep just to be positive there wasn't another instance of it and there isn't. fpicker/source/office/iodlg.src:Text [ en-US ] = Save with password ; Disclaimer: http://www.peralex.com/disclaimer.html Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: potentially dead code in sw/source/core/undo/undel.cxx?
On Wednesday 30 of May 2012, Philipp Riemer wrote: Hi, While translating comments and cleaning up the files in sw/source/core/undo, I realized a piece of code which indentation was wrong. I tried to re-indent it but it seems as if there are too many braces in the function call... Could anyone else please also check the body of the function SwUndoDelete::UndoImpl(::sw::UndoRedoContext rContext) in the file sw/source/core/undo/undel.cxx (spanning approx. from line 750 to 900) and try to re-indent the respective parts? Because I get 7 LOC that are outside of the function body after doing this... There is no problem with the code. The block with comment // code block so that SwPosition is detached when deleting a Node is a standalone compound statement that is not attached to anything, it is there just to limit the scope and lifetime of the aPos variable. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Password Protection (source file)
I'll look into that second src file, I wonder how I missed it. What grep command did you use and in what version of LO? Also, can you or someone tell me what this And there is some code which may be using the native platform dialog: means? Just starting to really delve into code like this, taking baby steps ;) On Wed, May 30, 2012 at 8:43 AM, Noel Grandin n...@peralex.com wrote: there is another one here: sfx2/source/dialog/filedlghelper.src:Text [ en-US ] = Save with ~password ; And there is some code which may be using the native platform dialog: vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx:case FILESAVE_AUTOEXTENSION_PASSWORD: vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx:case FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS: vcl/unx/kde/UnxFilePicker.cxx:case FILESAVE_AUTOEXTENSION_PASSWORD: vcl/unx/kde/UnxFilePicker.cxx:case FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS: vcl/unx/kde4/KDE4FilePicker.cxx:case FILESAVE_AUTOEXTENSION_PASSWORD: vcl/unx/kde4/KDE4FilePicker.cxx:case FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS: in which case changing the LO source is not going to help :-( On 2012-05-30 17:35, Joel Madero wrote: Yeah that's the only one I found as well but changing it doesn't change the text at all when you go to Save As (the bottom left corner where it says Save with password) which is the dilemma I'm facing :/ On Wed, May 30, 2012 at 8:26 AM, Noel Grandin n...@peralex.com wrote: On 2012-05-30 17:10, Joel Madero wrote: Thanks for the suggestion. I went ahead and checked it out, unfortunately not the case. I did yet another search for Save with password with grep just to be positive there wasn't another instance of it and there isn't. fpicker/source/office/iodlg.src:Text [ en-US ] = Save with password ; Disclaimer: http://www.peralex.com/disclaimer.html -- Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sdext/source
sdext/source/presenter/PresenterScreen.cxx |1
sdext/source/presenter/PresenterTimer.cxx | 83 +
2 files changed, 29 insertions(+), 55 deletions(-)
New commits:
commit fcab3edbac4985d7f110732dfdf67a449876ae01
Author: Michael Meeks michael.me...@suse.com
Date: Wed May 30 16:45:10 2012 +0100
presenter-console: cleanup and simplify threading mess around timers.
Change-Id: Ia8e3b59b4c158368d85ba52852c26c578017d10a
diff --git a/sdext/source/presenter/PresenterScreen.cxx
b/sdext/source/presenter/PresenterScreen.cxx
index 0a0ee29..1d8d8eb 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -465,6 +465,7 @@ sal_Int32 PresenterScreen::GetScreenNumber (
// displayed.
sal_Int32 nScreenNumber (0);
sal_Int32 nScreenCount (1);
+fprintf (stderr, New foo!\n);
try
{
Referencebeans::XPropertySet xProperties (rxPresentation, UNO_QUERY);
diff --git a/sdext/source/presenter/PresenterTimer.cxx
b/sdext/source/presenter/PresenterTimer.cxx
index 501f603..208f649 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -101,12 +101,12 @@ public:
private:
static ::boost::shared_ptrTimerScheduler mpInstance;
static ::osl::Mutex maInstanceMutex;
+::boost::shared_ptrTimerScheduler mpLateDestroy; // for clean exit
static sal_Int32 mnTaskId;
::osl::Mutex maTaskContainerMutex;
typedef ::std::setSharedTimerTask,TimerTaskComparator TaskContainer;
TaskContainer maScheduledTasks;
-bool mbIsRunning;
::osl::Mutex maCurrentTaskMutex;
SharedTimerTask mpCurrentTask;
@@ -118,7 +118,7 @@ private:
friend class Deleter;
virtual void SAL_CALL run (void);
-virtual void SAL_CALL onTerminated (void);
+virtual void SAL_CALL onTerminated (void) { mpLateDestroy.reset(); }
};
} // end of anonymous namespace
@@ -158,35 +158,18 @@ sal_Int32 TimerScheduler::mnTaskId =
PresenterTimer::NotAValidTaskId;
::boost::shared_ptrTimerScheduler TimerScheduler::Instance (void)
{
-::boost::shared_ptrTimerScheduler pInstance = mpInstance;
-if (pInstance.get() == NULL)
-{
-::osl::MutexGuard aGuard (maInstanceMutex);
-pInstance = mpInstance;
-if (pInstance.get() == NULL)
-{
-pInstance.reset(new TimerScheduler(), TimerScheduler::Deleter());
-OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
-mpInstance = pInstance;
-}
-}
-else
+::osl::MutexGuard aGuard (maInstanceMutex);
+if (mpInstance.get() == NULL)
{
-OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
+mpInstance.reset(new TimerScheduler(), TimerScheduler::Deleter());
+mpInstance-create();
}
-return pInstance;
-}
-
-void TimerScheduler::Release (void)
-{
-::osl::MutexGuard aGuard (maInstanceMutex);
-mpInstance.reset();
+return mpInstance;
}
TimerScheduler::TimerScheduler (void)
: maTaskContainerMutex(),
maScheduledTasks(),
- mbIsRunning(false),
maCurrentTaskMutex(),
mpCurrentTask()
{
@@ -211,13 +194,9 @@ void TimerScheduler::ScheduleTask (const SharedTimerTask
rpTask)
if (rpTask-mbIsCanceled)
return;
-osl::MutexGuard aGuard (maTaskContainerMutex);
-maScheduledTasks.insert(rpTask);
-
-if ( ! mbIsRunning)
{
-mbIsRunning = true;
-create();
+osl::MutexGuard aTaskGuard (maTaskContainerMutex);
+maScheduledTasks.insert(rpTask);
}
}
@@ -243,25 +222,19 @@ void TimerScheduler::CancelTask (const sal_Int32 nTaskId)
// The task that is to be canceled may be currently about to be
// processed. Mark it with a flag that a) prevents a repeating task
// from being scheduled again and b) tries to prevent its execution.
-if (mpCurrentTask.get() != NULL
- mpCurrentTask-mnTaskId == nTaskId)
{
-mpCurrentTask-mbIsCanceled = true;
+::osl::MutexGuard aGuard (maCurrentTaskMutex);
+if (mpCurrentTask.get() != NULL
+ mpCurrentTask-mnTaskId == nTaskId)
+mpCurrentTask-mbIsCanceled = true;
}
-// When the last active task was canceled then the timer can be
-// stopped.
-if (maScheduledTasks.empty())
-{
-mbIsRunning = false;
-resume();
-//join();
-}
+// Let the main-loop cleanup in it's own time
}
void SAL_CALL TimerScheduler::run (void)
{
-while (mbIsRunning)
+while (1)
{
// Get the current time.
TimeValue aCurrentTime;
@@ -299,7 +272,7 @@ void SAL_CALL TimerScheduler::run (void)
mpCurrentTask = pTask;
}
-if (mpCurrentTask.get() == NULL)
+if (pTask.get() == NULL)
{
// Wait until the first task becomes due.
TimeValue aTimeValue;
@@ -309,19 +282,19 @@ void SAL_CALL TimerScheduler::run
Re: Password Protection (source file)
On 2012-05-30 17:46, Joel Madero wrote: I'll look into that second src file, I wonder how I missed it. What grep command did you use and in what version of LO? git grep -i 'save.*password' on master Also, can you or someone tell me what this And there is some code which may be using the native platform dialog: means? Some platforms supply their own file load/save dialogs. (eg Mac, Windows). In which case LO will use that dialog. For platforms which do not supply their own load/save dialog, LO has it's own implementation. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Password Protection (source file)
Oh okay, I'm running this on *nix so hopefully that isn't the case. Thanks for the help, going to look into that other src file that you provided On Wed, May 30, 2012 at 8:52 AM, Noel Grandin n...@peralex.com wrote: On 2012-05-30 17:46, Joel Madero wrote: I'll look into that second src file, I wonder how I missed it. What grep command did you use and in what version of LO? git grep -i 'save.*password' on master Also, can you or someone tell me what this And there is some code which may be using the native platform dialog: means? Some platforms supply their own file load/save dialogs. (eg Mac, Windows). In which case LO will use that dialog. For platforms which do not supply their own load/save dialog, LO has it's own implementation. Disclaimer: http://www.peralex.com/**disclaimer.htmlhttp://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Re: [PATCH] [PUSHED] Re: fdo#45830 - Language/User Interface: current choice indicated as default
Hi Rob, On Tuesday, 2012-05-29 23:32:04 +0200, Rob Snelders wrote: The patch was reverted because it gave errors. I have changed the patch. Can anybody look if it is ok now? I'll take a look. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpYKrOonhn00.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Problem with configuring build
Hi, Thank you for answering so quick. But do you have the matching -devel/-dev package ? While trying to install, I get Dependency is not satisfiable: liborbit2 (= 1:2.14.19-0.1) Google keeps its mouth shut about it... but I guess it wants liborbit2. So I try to install also this package... And what I get? A later version is already installed No idea how to satisfy it. Best regards, Artur 2012/5/30 Caolán McNamara caol...@redhat.com: On Wed, 2012-05-30 at 16:46 +0200, Artur Dorda wrote: Hi, I'm trying to configure build with ./autogen.sh --with-max-jobs=2 --with-num-cpus=2 --without-help --without-myspell-dicts --disable-gnome-vfs at the beginning it says can't create backup file. yet it runs... and after a while : checking for GCONF... no configure: error: Package requirements (gconf-2.0 ORBit-2.0 ) were not met: run pkg-config --libs gconf-2.0 ORBit-2.0 on the command line and see if that fails, and fix that problem if it exists. No package 'ORBit-2.0' found The problem is, that I already have orbit2 But do you have the matching -devel/-dev package ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Windows istallation MSIEXEC modules names
Hi Olivier, 2012/5/30 Olivier Hallot olivier.hal...@documentfoundation.org: I am trying to distribute a lean localized install of LO and I need to remove the extra dictionaries and langpacks... I have a script with MSIEXEC but I need to identify the modules I need to remove or add, so where can I find the list of modules? ( also have ORCA to peek at the msi file, but it is not so clear to me) Look at the Feature table in ORCA. In the Level column you see numbers. Features that have level below 100 are installed by default. (The number 100 is defined in Property table, it is the INSTALLLEVEL.) You can set Level of gm_r_ex_Dictionary_* to 200. For the langpacks it may be easier to deselect them in Property table: IS=0, where is Locale ID of the language. Brazilian Portoguise is 1046, so you may want to keep IS1046=1. Best regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW-3.5] Various .doc/.docx fixes
Hello,
could somebody please review and pick for 3-5 the following changes from
master? They all have nice descriptive commit messages and testcases in
sw/qa/extras :) .
- http://cgit.freedesktop.org/libreoffice/core/commit/?id=04d600d4be7c
- http://cgit.freedesktop.org/libreoffice/core/commit/?id=5935a6db6483
- http://cgit.freedesktop.org/libreoffice/core/commit/?id=d4798414f270
- http://cgit.freedesktop.org/libreoffice/core/commit/?id=5845298e615a
- http://cgit.freedesktop.org/libreoffice/core/commit/?id=0a9161263b8e (does
not backport without conflicts, use the attached patch)
- the attached 0001-fix-UNO-ZOrder.patch, which is commits
http://cgit.freedesktop.org/libreoffice/core/commit/?id=e05e77f4b737 and
http://cgit.freedesktop.org/libreoffice/core/commit/?id=9365a3255875 merged
Thanks.
--
Lubos Lunak
l.lu...@suse.cz
From 9b909c372cd1e214a723aaae42bc3a0597ca5f86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= l.lu...@suse.cz
Date: Tue, 17 Apr 2012 13:53:17 +0200
Subject: [PATCH] implement relativeHeight (z-order) in .docx import (part of
bnc#747461)
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/PropertyIds.cxx
writerfilter/source/dmapper/PropertyIds.hxx
Change-Id: I0893014fab1caf0cee9a597e55b931b51b175b6c
---
writerfilter/inc/dmapper/DomainMapper.hxx |4 ++
writerfilter/source/dmapper/DomainMapper.cxx |8 +
writerfilter/source/dmapper/GraphicHelpers.cxx | 41
writerfilter/source/dmapper/GraphicHelpers.hxx | 10 ++
writerfilter/source/dmapper/GraphicImport.cxx | 12 ++-
writerfilter/source/dmapper/PropertyIds.cxx|1 +
writerfilter/source/dmapper/PropertyIds.hxx|1 +
7 files changed, 76 insertions(+), 1 deletions(-)
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/inc/dmapper/DomainMapper.hxx
index 4713763..95ddc6f 100644
--- a/writerfilter/inc/dmapper/DomainMapper.hxx
+++ b/writerfilter/inc/dmapper/DomainMapper.hxx
@@ -36,6 +36,7 @@
#include map
#include vector
+#include boost/scoped_ptr.hpp
namespace com{ namespace sun {namespace star{
namespace beans{
@@ -65,6 +66,7 @@ class PropertyMap;
class DomainMapper_Impl;
class ListsManager;
class StyleSheetTable;
+class GraphicZOrderHelper;
// different context types require different sprm handling (e.g. names)
enum SprmType
@@ -113,6 +115,7 @@ public:
::rtl::OUString getOrCreateCharStyle( PropertyValueVector_t rCharProperties );
boost::shared_ptr StyleSheetTable GetStyleSheetTable( );
+GraphicZOrderHelper* graphicZOrderHelper();
private:
// Stream
@@ -150,6 +153,7 @@ private:
sal_Unicode getFillCharFromValue(const sal_Int32 nIntValue);
sal_Int32 mnBackgroundColor;
bool mbIsHighlightSet;
+boost::scoped_ptr GraphicZOrderHelper zOrderHelper;
};
} // namespace dmapper
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 4bbba6d..99dbbf6 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -95,6 +95,7 @@
#endif
#include resourcemodel/TagLogger.hxx
+#include GraphicHelpers.hxx
using namespace ::com::sun::star;
using namespace ::rtl;
@@ -3774,6 +3775,13 @@ StyleSheetTablePtr DomainMapper::GetStyleSheetTable( )
return m_pImpl-GetStyleSheetTable( );
}
+GraphicZOrderHelper* DomainMapper::graphicZOrderHelper()
+{
+if( zOrderHelper.get() == NULL )
+zOrderHelper.reset( new GraphicZOrderHelper );
+return zOrderHelper.get();
+}
+
} //namespace dmapper
} //namespace writerfilter
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx
index cdafb8e..819dc6f 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -216,6 +216,47 @@ sal_Int32 WrapHandler::getWrapMode( )
return nMode;
}
+
+void GraphicZOrderHelper::addItem( uno::Reference beans::XPropertySet props, sal_Int32 relativeHeight )
+{
+items[ relativeHeight ] = props;
+}
+
+// The relativeHeight value in .docx is an arbitrary number, where only the relative ordering matters.
+// But in Writer, the z-order is index in 0..(numitems-1) range, so whenever a new item needs to be
+// added in the proper z-order, it is necessary to find the proper index.
+sal_Int32 GraphicZOrderHelper::findZOrder( sal_Int32 relativeHeight )
+{
+Items::const_iterator it = items.begin();
+while( it != items.end())
+{
+// std::map is iterated sorted by key
+if( it-first relativeHeight )
+break; // this is the first one higher, we belong right before it
+else
+++it;
+}
+if( it == items.end()) // we're topmost
+{
+if( items.empty())
+return 0;
+sal_Int32 itemZOrder;
+--it;
+if(
Re: [REVIEW-3.5] Various .doc/.docx fixes
On Wednesday 30 of May 2012, Lubos Lunak wrote: Hello, could somebody please review and pick for 3-5 the following changes from master? They all have nice descriptive commit messages and testcases in sw/qa/extras :) . - http://cgit.freedesktop.org/libreoffice/core/commit/?id=04d600d4be7c - http://cgit.freedesktop.org/libreoffice/core/commit/?id=5935a6db6483 - http://cgit.freedesktop.org/libreoffice/core/commit/?id=d4798414f270 - http://cgit.freedesktop.org/libreoffice/core/commit/?id=5845298e615a - http://cgit.freedesktop.org/libreoffice/core/commit/?id=0a9161263b8e (does not backport without conflicts, use the attached patch) - the attached 0001-fix-UNO-ZOrder.patch, which is commits http://cgit.freedesktop.org/libreoffice/core/commit/?id=e05e77f4b737 and http://cgit.freedesktop.org/libreoffice/core/commit/?id=9365a3255875 merged There's one more: - http://cgit.freedesktop.org/libreoffice/core/commit/?id=20a8768b1c6a -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/ui/src/optdlg.src | 32
1 file changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 80ded1ec85dec754ebee01f560ec2ca0c3dee9a6
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed May 30 12:38:37 2012 -0400
Pushing the controls in the Formula options page back up by 6 pts.
Apparently someone silently fixed this properly in the main Options
dialog code...
Change-Id: I90eaf09001f00fe177852d0b27bd96b0733550ef
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index 4e00b1d..da4d662 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -195,14 +195,14 @@ TabPage RID_SCPAGE_FORMULA
FixedLine FL_FORMULA_OPTIONS
{
-Pos = MAP_APPFONT ( 6 , 9 ) ;
+Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = Formula options;
};
FixedText FT_FORMULA_SYNTAX
{
-Pos = MAP_APPFONT ( 21, 22 ) ;
+Pos = MAP_APPFONT ( 21, 16 ) ;
Size = MAP_APPFONT ( 80, 8 ) ;
Text [ en-US ] = Formula ~syntax ;
};
@@ -210,28 +210,28 @@ TabPage RID_SCPAGE_FORMULA
ListBox LB_FORMULA_SYNTAX
{
Border = TRUE ;
-Pos = MAP_APPFONT ( 105, 20 ) ;
+Pos = MAP_APPFONT ( 105, 14 ) ;
Size = MAP_APPFONT ( 60, 46 ) ;
DropDown = TRUE ;
};
CheckBox CB_ENGLISH_FUNC_NAME
{
-Pos = MAP_APPFONT ( 12, 37 ) ;
+Pos = MAP_APPFONT ( 12, 31 ) ;
Size = MAP_APPFONT ( 120, 8 ) ;
Text [ en-US ] = Use English function names ;
};
FixedLine FL_FORMULA_SEPS
{
-Pos = MAP_APPFONT ( 6 , 52 ) ;
+Pos = MAP_APPFONT ( 6 , 46 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = Separators;
};
FixedText FT_FORMULA_SEP_ARG
{
-Pos = MAP_APPFONT ( 21, 65 );
+Pos = MAP_APPFONT ( 21, 59 );
Size = MAP_APPFONT ( 60, 8 );
Text [ en-US ] = ~Function;
};
@@ -239,13 +239,13 @@ TabPage RID_SCPAGE_FORMULA
Edit ED_FORMULA_SEP_ARG
{
Border = TRUE;
-Pos = MAP_APPFONT ( 85, 63 );
+Pos = MAP_APPFONT ( 85, 57 );
Size = MAP_APPFONT ( 10, 12 );
};
FixedText FT_FORMULA_SEP_ARRAY_C
{
-Pos = MAP_APPFONT ( 21, 83 );
+Pos = MAP_APPFONT ( 21, 77 );
Size = MAP_APPFONT ( 60, 8 );
Text [ en-US ] = Array co~lumn;
};
@@ -253,13 +253,13 @@ TabPage RID_SCPAGE_FORMULA
Edit ED_FORMULA_SEP_ARRAY_C
{
Border = TRUE;
-Pos = MAP_APPFONT ( 85, 81 );
+Pos = MAP_APPFONT ( 85, 75 );
Size = MAP_APPFONT ( 10, 12 );
};
FixedText FT_FORMULA_SEP_ARRAY_R
{
-Pos = MAP_APPFONT ( 21, 101 );
+Pos = MAP_APPFONT ( 21, 95 );
Size = MAP_APPFONT ( 60, 8 );
Text [ en-US ] = Array ~row;
};
@@ -267,41 +267,41 @@ TabPage RID_SCPAGE_FORMULA
Edit ED_FORMULA_SEP_ARRAY_R
{
Border = TRUE;
-Pos = MAP_APPFONT ( 85, 99 );
+Pos = MAP_APPFONT ( 85, 93 );
Size = MAP_APPFONT ( 10, 12 );
};
PushButton BTN_FORMULA_SEP_RESET
{
-Pos = MAP_APPFONT ( 21, 119 );
+Pos = MAP_APPFONT ( 21, 113 );
Size = MAP_APPFONT ( 50, 14 );
Text [ en-US ] = Rese~t;
};
FixedLine FL_CUSTOM_CALC_OPTIONS
{
-Pos = MAP_APPFONT ( 6 , 138 ) ;
+Pos = MAP_APPFONT ( 6 , 132 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = Detailed calculation settings;
};
RadioButton BTN_CUSTOM_CALC_DEFAULT
{
-Pos = MAP_APPFONT ( 21 , 153 ) ;
+Pos = MAP_APPFONT ( 21 , 147 ) ;
Size = MAP_APPFONT ( 60, 14 ) ;
Text [ en-US ] = Default;
};
RadioButton BTN_CUSTOM_CALC_CUSTOM
{
-Pos = MAP_APPFONT ( 21 , 167 ) ;
+Pos = MAP_APPFONT ( 21 , 161 ) ;
Size = MAP_APPFONT ( 60, 14 ) ;
Text [ en-US ] = Custom;
};
PushButton BTN_CUSTOM_CALC_DETAILS
{
-Pos = MAP_APPFONT ( 85 , 165 ) ;
+Pos = MAP_APPFONT ( 85 , 159 ) ;
Size = MAP_APPFONT ( 60, 14 ) ;
Text [ en-US ] = Details...;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] [PUSHED] fdo#39468: translate German comments (= writer)
Thanks. I pushed the first one, but the second one did not apply, severa patch hunks failed. Could you please check that? Probably your source code is out of sync and you need to do a git pull. You might run into merge conflicts when you do that because of slight changes needed to your patch(es) when they were committed by me (because files had changed slightly in some context lines since you had started editing them), so it might be best to first save your unpushed work, and then git reset --hard origin (hmm, I hope I remember that right), then git pull -r. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: basic/source chart2/source connectivity/source dbaccess/source editeng/source framework/source oox/source sc/source sdext/source sd/source sfx2/source shell/source svtools/sou
basic/source/classes/sbunoobj.cxx |2 --
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx |3 ---
chart2/source/view/main/ChartView.cxx |1 -
connectivity/source/commontools/TColumnsHelper.cxx |1 -
connectivity/source/commontools/TIndexes.cxx|1 -
connectivity/source/drivers/ado/AGroups.cxx |1 -
connectivity/source/drivers/ado/ATables.cxx |2 --
connectivity/source/drivers/ado/AUsers.cxx |2 --
connectivity/source/drivers/dbase/DColumns.cxx |1 -
connectivity/source/drivers/dbase/DIndexes.cxx |1 -
connectivity/source/drivers/dbase/DTables.cxx |1 -
connectivity/source/drivers/evoab2/NTables.cxx |1 -
connectivity/source/drivers/file/FColumns.cxx |2 --
connectivity/source/drivers/file/FTables.cxx|1 -
connectivity/source/drivers/hsqldb/HTables.cxx |1 -
connectivity/source/drivers/hsqldb/HUser.cxx|1 -
connectivity/source/drivers/hsqldb/HUsers.cxx |1 -
connectivity/source/drivers/mozab/MColumns.cxx |1 -
connectivity/source/drivers/mozab/MTables.cxx |1 -
connectivity/source/drivers/mysql/YTables.cxx |1 -
connectivity/source/drivers/mysql/YUser.cxx |1 -
connectivity/source/drivers/mysql/YUsers.cxx|1 -
dbaccess/source/core/api/table.cxx |2 --
editeng/source/editeng/impedit5.cxx |2 --
editeng/source/misc/unolingu.cxx|4
framework/source/uiconfiguration/imagemanager.cxx |2 --
oox/source/export/chartexport.cxx |2 --
sc/source/filter/excel/xename.cxx |1 -
sd/source/ui/view/sdview2.cxx |1 -
sdext/source/pdfimport/test/tests.cxx |3 ---
sfx2/source/menu/virtmenu.cxx |2 --
shell/source/win32/simplemail/smplmailclient.cxx|1 -
svtools/source/control/roadmap.cxx |1 -
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx |2 --
svx/source/form/datanavi.cxx|1 -
xmloff/source/style/XMLFontAutoStylePool.cxx|1 -
xmlscript/source/xml_helper/xml_impctx.cxx |1 -
37 files changed, 54 deletions(-)
New commits:
commit bb9f73045879293f5fcea1dd0e205efb84c07781
Author: Takeshi Abe t...@fixedpoint.jp
Date: Thu May 31 01:55:37 2012 +0900
nuke unused typedef
Change-Id: I8848d0e687c3b19be1a8bc1f41c2a0c94e13bbbf
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index f20c119..2fe5d8b 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -3248,8 +3248,6 @@ void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic,
SbxArray rPar, sal_Bool bWrit
refVar-PutBool( sal_True );
}
-typedef boost::unordered_map ::rtl::OUString, std::vector ::rtl::OUString ,
::rtl::OUStringHash, ::std::equal_to ::rtl::OUString ModuleHash;
-
// helper wrapper function to interact with TypeProvider and
// XTypeDescriptionEnumerationAccess.
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 0e29dfe..f85da83 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -69,7 +69,6 @@
#include UserDefinedProperties.hxx
#include SceneProperties.hxx
-#include map
#include algorithm
#include rtl/ustrbuf.hxx
#include com/sun/star/lang/XServiceName.hpp
@@ -497,8 +496,6 @@ sal_Int32 lcl_getNewAPIIndexForOldAPIIndex(
return nNewAPIIndex;
}
-typedef ::std::map OUString, OUString tChartTypeMap;
-
OUString lcl_getDiagramType( const OUString rTemplateServiceName )
{
const OUString aPrefix(com.sun.star.chart2.template.);
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 9020d7b..15133ee 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -455,7 +455,6 @@ VCoordinateSystem* lcl_getCooSysForPlotter( const
std::vector VCoordinateSystem
}
typedef std::pair sal_Int32, sal_Int32 tFullAxisIndex; //first index is the
dimension, second index is the axis index that indicates whether this is a main
or secondary axis
-typedef std::pair VCoordinateSystem* , tFullAxisIndex tFullCoordinateSystem;
typedef std::map VCoordinateSystem*, tFullAxisIndex tCoordinateSystemMap;
struct AxisUsage
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx
Re: Problem with configuring build
On 30/05/12 18:14, Artur Dorda wrote: Hi, But do you have the matching -devel/-dev package ? While trying to install, I get Dependency is not satisfiable: liborbit2 (= 1:2.14.19-0.1) Google keeps its mouth shut about it... but I guess it wants liborbit2. So I try to install also this package... And what I get? A later version is already installed No idea how to satisfy it. what distribution and which version are you using? what version of liborbit2 do you have installed, and from where? dpkg-query -l liborbit2 did you change your sources.lst since installing it? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: potentially dead code in sw/source/core/undo/undel.cxx?
Ah, I see. Thank you very much for your fast answer. 2012/5/30 Lubos Lunak l.lu...@suse.cz: On Wednesday 30 of May 2012, Philipp Riemer wrote: Hi, While translating comments and cleaning up the files in sw/source/core/undo, I realized a piece of code which indentation was wrong. I tried to re-indent it but it seems as if there are too many braces in the function call... Could anyone else please also check the body of the function SwUndoDelete::UndoImpl(::sw::UndoRedoContext rContext) in the file sw/source/core/undo/undel.cxx (spanning approx. from line 750 to 900) and try to re-indent the respective parts? Because I get 7 LOC that are outside of the function body after doing this... There is no problem with the code. The block with comment // code block so that SwPosition is detached when deleting a Node is a standalone compound statement that is not attached to anything, it is there just to limit the scope and lifetime of the aPos variable. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [PUSHED] fdo#39468: translate German comments (= writer)
Thank you. I will try that tomorrow and than re-send the patch. Philipp 2012/5/30 Tor Lillqvist t...@iki.fi: Thanks. I pushed the first one, but the second one did not apply, severa patch hunks failed. Could you please check that? Probably your source code is out of sync and you need to do a git pull. You might run into merge conflicts when you do that because of slight changes needed to your patch(es) when they were committed by me (because files had changed slightly in some context lines since you had started editing them), so it might be best to first save your unpushed work, and then git reset --hard origin (hmm, I hope I remember that right), then git pull -r. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cui/source
cui/source/options/connpooloptions.src |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit a9b70021724fa918f61d6e11ae72a19b02eb5e6b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed May 30 13:31:20 2012 -0400
Use TP_WIDTH TP_HEIGHT for the Connection options page.
Change-Id: I1142b691bc964e3fb12d25ca885dbc5c09cb85c7
diff --git a/cui/source/options/connpooloptions.src
b/cui/source/options/connpooloptions.src
index 89b4559..31d9adc 100644
--- a/cui/source/options/connpooloptions.src
+++ b/cui/source/options/connpooloptions.src
@@ -28,8 +28,8 @@
#include connpooloptions.hrc
#include cuires.hrc
-#define PAGE_SIZE_X 260
-#define PAGE_SIZE_Y 185
+#define PAGE_SIZE_X TP_WIDTH
+#define PAGE_SIZE_Y TP_HEIGHT
#define LIST_SIZE_Y 100
@@ -37,6 +37,7 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS
{
HelpID = cui:TabPage:RID_OFAPAGE_CONNPOOLOPTIONS;
OutputSize = TRUE ;
+Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( PAGE_SIZE_X, PAGE_SIZE_Y ) ;
SVLook = TRUE ;
Hide = TRUE ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 14
--
instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt | 12
++--
instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt |1
3 files changed, 4 insertions(+), 23 deletions(-)
New commits:
commit 5e01d13b84c1dbd82da54be3f25b522f825febfe
Author: Andras Timar ati...@suse.com
Date: Wed May 30 15:54:14 2012 +0200
fdo#46559 bypass CustomerInformation dialog in Windows installer
User name and Company asked here are useless, and misleading. Users
think that they are related to Tools - Options - LibreOffice -
User Data. Also per-user installation context makes little sense.
If anybody still wants to install LibreOffice only for the current
user, it is still possible with the ALLUSERS property.
Change-Id: I537b45ab77d6d227264e1dc0bcaf93a9cfa8ea71
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index 2c6b457..a7683a7 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -58,11 +58,11 @@ InstallChangeFolder Up DirectoryListUp 0 1 0
InstallWelcome BackNewDialog SplashBitmapDisplay_IsBitmapDlg
1
InstallWelcome Cancel SpawnDialog CancelSetup 1 0
InstallWelcome NextNewDialog LicenseAgreementHIDEEULA 1 0
-InstallWelcome NextNewDialog CustomerInformation HIDEEULA = 10
+InstallWelcome NextNewDialog SetupType HIDEEULA = 10
LanguageInfo1 OK EndDialog Return 1 0
LicenseAgreement BackNewDialog InstallWelcome 1 0
LicenseAgreement Cancel SpawnDialog CancelSetup 1 0
-LicenseAgreement NextNewDialog CustomerInformation
AgreeToLicense = Yes 0
+LicenseAgreement NextNewDialog SetupType AgreeToLicense
= Yes 0
MaintenanceTypeBackNewDialog MaintenanceWelcome 1 0
MaintenanceTypeCancel SpawnDialog CancelSetup 1 0
MaintenanceTypeNext[ProgressType0] Modify _IsMaintenance =
Change 2
@@ -127,7 +127,8 @@ SetupProgress Cancel SpawnDialog CancelSetup
1 0
SetupResumeCancel SpawnDialog CancelSetup 1 0
SetupResumeNextEndDialog Return OutOfNoRbDiskSpace 1 0
SetupResumeNextNewDialog OutOfSpace OutOfNoRbDiskSpace = 1 0
-SetupType BackNewDialog CustomerInformation 1 0
+SetupType BackNewDialog LicenseAgreementHIDEEULA 1
1
+SetupType BackNewDialog InstallWelcome HIDEEULA = 11
SetupType Cancel SpawnDialog CancelSetup 1 0
SetupType NextNewDialog CustomSetup _IsSetupTypeMin =
Custom 0
SetupType Next[FILETYPEDIALOGUSED]0 _IsSetupTypeMin
Custom 5
commit 0d30946780e9d86d9be92c3c6d30b33305c5830f
Author: Andras Timar ati...@suse.com
Date: Wed May 30 15:47:41 2012 +0200
MSI: remove unused DestinationFolder dialog
Change-Id: I43b360b417ba06daad55bf6ccfddaace1b55d47f
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 2a29390..5611333 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -98,20 +98,6 @@ CustomSetupTips InstallText Text60 105
300 20 3 OOO_CONTROL_69
CustomSetupTipsMenuTextText50 52 300 36
3 OOO_CONTROL_70
CustomSetupTipsOK PushButton 301 243 66 17
3 OOO_CONTROL_72
CustomSetupTipsPartialText Text60 130 300 20
3 OOO_CONTROL_73
-DestinationFolder BackPushButton 164 243 66 17
3 OOO_CONTROL_84 Next
-DestinationFolder Banner Bitmap 0 0 374 44 1
BannerBmp
-DestinationFolder BannerLine Line0 44 374 0
1
-DestinationFolder Branding1 Text4 229 88 13
3 {MSSWhiteSerif8}[ProductName]
-DestinationFolder Branding2 Text3 228 88 13
65537 [ProductName]
-DestinationFolder Cancel PushButton 301 243 66 17
3 OOO_CONTROL_87 ChangeFolder
-DestinationFolder ChangeFolderPushButton 301 65 66
[Libreoffice-commits] .: 2 commits - svtools/inc svtools/source
svtools/inc/svtools/svtreebx.hxx |2 ++
svtools/source/contnr/svlbitm.cxx |2 ++
svtools/source/contnr/svtreebx.cxx | 19 ++-
3 files changed, 22 insertions(+), 1 deletion(-)
New commits:
commit 61acb9beb2bd5c76df6136d4fb3871db7906a827
Author: Ivan Timofeev timofeev@gmail.com
Date: Wed May 30 21:44:40 2012 +0400
fdo#47752: first column of checkboxes is too small
Change-Id: I199276a99063d5a125be1f2cd5d71574f078a82e
diff --git a/svtools/inc/svtools/svtreebx.hxx b/svtools/inc/svtools/svtreebx.hxx
index 8f883c6..b6f1bab 100644
--- a/svtools/inc/svtools/svtreebx.hxx
+++ b/svtools/inc/svtools/svtreebx.hxx
@@ -78,6 +78,8 @@ class SVT_DLLPUBLIC SvTreeListBox : public SvLBox
short nFocusWidth;
sal_uInt16 aContextBmpMode;
+long mnCheckboxItemWidth;
+
#ifdef _SVTREEBX_CXX
DECL_DLLPRIVATE_LINK( CheckButtonClick, SvLBoxButtonData * );
diff --git a/svtools/source/contnr/svtreebx.cxx
b/svtools/source/contnr/svtreebx.cxx
index 074ce94..8ad020e 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -88,6 +88,7 @@ void SvTreeListBox::InitTreeView()
nFirstSelTab = 0;
nLastSelTab = 0;
nFocusWidth = -1;
+mnCheckboxItemWidth = 0;
Link* pLink = new Link( LINK(this,SvTreeListBox, DefaultCompare) );
pLBoxImpl-m_pLink = pLink;
@@ -212,9 +213,11 @@ void SvTreeListBox::SetTabs()
long nStartPos = TAB_STARTPOS;
long nNodeWidthPixel = GetExpandedNodeBmp().GetSizePixel().Width();
+// pCheckButtonData-Width() knows nothing about the native checkbox width,
+// so we have mnCheckboxItemWidth which becomes valid when something is
added.
long nCheckWidth = 0;
if( nTreeFlags TREEFLAG_CHKBTN )
-nCheckWidth = pCheckButtonData-aBmps[0].GetSizePixel().Width();
+nCheckWidth = mnCheckboxItemWidth;
long nCheckWidthDIV2 = nCheckWidth / 2;
long nContextWidth = nContextBmpWidthMax;
@@ -519,6 +522,20 @@ void SvTreeListBox::ImpEntryInserted( SvLBoxEntry* pEntry )
}
}
SetEntryHeight( (SvLBoxEntry*)pEntry );
+
+if( nTreeFlags TREEFLAG_CHKBTN )
+{
+SvLBoxButton* pItem =
(SvLBoxButton*)(pEntry-GetFirstItem(SV_ITEM_ID_LBOXBUTTON));
+if( pItem )
+{
+long nWidth = pItem-GetSize(this, pEntry).Width();
+if( mnCheckboxItemWidth nWidth )
+{
+mnCheckboxItemWidth = nWidth;
+nTreeFlags |= TREEFLAG_RECALCTABS;
+}
+}
+}
}
commit 628cec2afa41fa0cedc08bb5084e7b48e0d47918
Author: Ivan Timofeev timofeev@gmail.com
Date: Wed May 30 21:43:50 2012 +0400
fdo#47752: use native checkbox width
Change-Id: Iac8049c49520a5fd119c4617144af302f924475b
diff --git a/svtools/source/contnr/svlbitm.cxx
b/svtools/source/contnr/svlbitm.cxx
index ba1ee4b..00c619e 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -459,6 +459,8 @@ void SvLBoxButton::ImplAdjustBoxSize( Size io_rSize,
ControlType i_eType, Windo
// leave a little space around the box image (looks better)
if( aContentSize.Height() + 2 io_rSize.Height() )
io_rSize.Height() = aContentSize.Height() + 2;
+if( aContentSize.Width() + 2 io_rSize.Width() )
+io_rSize.Width() = aContentSize.Width() + 2;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sdext/source sd/source vcl/inc vcl/source vcl/unx vcl/win
sd/source/ui/dlg/present.cxx | 12
sd/source/ui/dlg/present.src |4 +-
sd/source/ui/inc/present.hrc |2 -
sd/source/ui/inc/present.hxx |2 -
sd/source/ui/slideshow/slideshow.cxx |2 -
sdext/source/presenter/PresenterScreen.cxx | 39 +-
sdext/source/presenter/PresenterScreen.hxx |7 ++--
vcl/inc/salsys.hxx |2 -
vcl/inc/unx/gtk/gtkdata.hxx|2 -
vcl/inc/unx/gtk/gtksys.hxx |4 +-
vcl/inc/unx/x11/x11sys.hxx |2 -
vcl/inc/vcl/svapp.hxx |6 +++-
vcl/inc/win/salsys.h |2 -
vcl/source/app/svapp.cxx |6 ++--
vcl/source/components/display.cxx | 42 +
vcl/unx/gtk/app/gtksys.cxx |2 -
vcl/unx/x11/x11sys.cxx |2 -
vcl/win/source/app/salinfo.cxx |2 -
18 files changed, 88 insertions(+), 52 deletions(-)
New commits:
commit 834eed7992c6b549bbd06fbbe6473bafc777c8e1
Author: Michael Meeks michael.me...@suse.com
Date: Wed May 30 16:48:20 2012 +0100
sdext: cleanup presenter screen handling pwrt. naming
Change-Id: I9400ca0a704cfdeb7f333be704ec5690bedcf0c6
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index b83cad7..3aea637 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -90,7 +90,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window*
pWindow,
rOutAttrs ( rInAttrs ),
mnMonitors ( 0 ),
-msPrimaryMonitor( SdResId(STR_PRIMARY_MONITOR ) ),
+msExternalMonitor( SdResId(STR_EXTERNAL_MONITOR ) ),
msMonitor( SdResId( STR_MONITOR ) ),
msAllMonitors( SdResId( STR_ALL_MONITORS ) )
{
@@ -200,14 +200,14 @@ void SdStartPresentationDlg::InitMonitorSettings()
else
{
sal_Bool bUnifiedDisplay = false;
-sal_Int32 nPrimaryIndex = 0;
+sal_Int32 nExternalIndex = 0;
Reference XPropertySet xMonProps( xMultiMon, UNO_QUERY );
if( xMonProps.is() ) try
{
const OUString sPropName1( IsUnifiedDisplay );
xMonProps-getPropertyValue( sPropName1 ) = bUnifiedDisplay;
-const OUString sPropName2( DefaultDisplay );
-xMonProps-getPropertyValue( sPropName2 ) = nPrimaryIndex;
+const OUString sPropName2( ExternalDisplay );
+xMonProps-getPropertyValue( sPropName2 ) = nExternalIndex;
}
catch( Exception )
{
@@ -216,7 +216,7 @@ void SdStartPresentationDlg::InitMonitorSettings()
const String sPlaceHolder( RTL_CONSTASCII_USTRINGPARAM( %1 ) );
for( sal_Int32 nDisplay = 0; nDisplay mnMonitors; nDisplay++ )
{
-String aName( nDisplay == nPrimaryIndex ? msPrimaryMonitor :
msMonitor );
+String aName( nDisplay == nExternalIndex ? msExternalMonitor :
msMonitor );
const String aNumber( String::CreateFromInt32( nDisplay + 1 )
);
aName.SearchAndReplace( sPlaceHolder, aNumber );
maLBMonitor.InsertEntry( aName );
@@ -227,7 +227,7 @@ void SdStartPresentationDlg::InitMonitorSettings()
sal_Int32 nSelected = ( ( const SfxInt32Item ) rOutAttrs.Get(
ATTR_PRESENT_DISPLAY ) ).GetValue();
if( nSelected = 0 )
-nSelected = nPrimaryIndex;
+nSelected = nExternalIndex;
else
nSelected--;
diff --git a/sd/source/ui/dlg/present.src b/sd/source/ui/dlg/present.src
index 6ee3fd8..3f3888f 100644
--- a/sd/source/ui/dlg/present.src
+++ b/sd/source/ui/dlg/present.src
@@ -274,9 +274,9 @@ ModalDialog DLG_START_PRESENTATION
ClipChildren = TRUE;
};
-String STR_PRIMARY_MONITOR
+String STR_EXTERNAL_MONITOR
{
-Text [ en-US ] = Display %1 (primary);
+Text [ en-US ] = Display %1 (external);
};
String STR_MONITOR
diff --git a/sd/source/ui/inc/present.hrc b/sd/source/ui/inc/present.hrc
index fc4d3b6..1d028be 100644
--- a/sd/source/ui/inc/present.hrc
+++ b/sd/source/ui/inc/present.hrc
@@ -59,7 +59,7 @@
#define FT_MONITOR 10
#define LB_MONITOR 11
-#define STR_PRIMARY_MONITOR 1
+#define STR_EXTERNAL_MONITOR 1
#define STR_MONITOR 2
#define STR_ALL_MONITORS 3
diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx
index e02f75d..2a19777 100644
--- a/sd/source/ui/inc/present.hxx
+++ b/sd/source/ui/inc/present.hxx
@@ -81,7 +81,7 @@ private:
const SfxItemSet rOutAttrs;
sal_Int32 mnMonitors;
-String msPrimaryMonitor;
+String msExternalMonitor;
String
Re: How to improve our Bug tracking system
Hello, thanks a lot for working on that, Rainer! I am copying Robert, who also has development experience, plus is one of our fellow admins, so he combines the best of both worlds. :-) Last year, I've played with self-hosting BugZilla and it worked like a charm, but I lack experience on what's needed, so when you have compiled the list of requirements, ping me, and I can provide a VM with BugZilla you can use for playing. Florian Rainer Bielefeld wrote on 2012-05-22 19:36: Hi all, as a consequence of our QA related discussions at Hackfest April 2012 in Hamburg http://rrbd.wordpress.com/2012/04/14/hackfest-hamburg-2012/ I now want to start to collect ideas how we can make a big step improving our (Bugzilla) Bug tracking system. The goal is that after we will have finished work (end 2012?) we will have a system what will work without bigger changes at least for the next 5 years for our growing contributors community. As a tool for that I created https://wiki.documentfoundation.org/How_to_Improve_Bugzilla, I hope that we so can get an overview what our needs are and how we can reach the goals. Your contribution to complete the contents on that page will be appreciated. Especially for the listed Problems we will need some expert knowledge I hope that end of July we will have finished research and a clear concept how we can reach most goals with acceptable costs. Best regards Rainer -- Florian Effenberger, Chairman of the Board Tel: +49 8341 99660880 | Mobile: +49 151 14424108 The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice: blanket license statement ...
Dear all, All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. With regards, Robert Sedak ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: filter/source sal/osl
filter/source/graphicfilter/icgm/cgm.cxx |2 +-
sal/osl/unx/file.cxx |2 --
sal/osl/w32/file.cxx |2 --
3 files changed, 1 insertion(+), 5 deletions(-)
New commits:
commit e519306d498208484b72d935a3923af4a9adbbcb
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed May 30 20:54:37 2012 +0200
Some cppcheck cleaning
More information on this thread:
http://nabble.documentfoundation.org/Advice-needed-about-some-cppcheck-reports-td3986408.html
Change-Id: Ib70532ad72e8418e1036bd52c07dc6452508cd12
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx
b/filter/source/graphicfilter/icgm/cgm.cxx
index 8023fa7..3dd2ccc 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -266,7 +266,7 @@ double CGM::ImplGetFloat( RealPrecision eRealPrecision,
sal_uInt32 nRealSize )
nRetValue += (double)nVal;
if ( pLong[ nSwitch ] 0 )
{
-nRetValue -= nRetValue;
+nRetValue = -nRetValue;
}
nRetValue /= 65536;
}
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 1d8ab6c..3a5dac5 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -1257,8 +1257,6 @@ SAL_CALL osl_mapFile (
if (nSize 0)
{
c^= pData[0];
-pData += nSize;
-nSize = 0;
}
}
}
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 341947f..70bca8b 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -876,8 +876,6 @@ SAL_CALL osl_mapFile(
if (nSize 0)
{
c ^= pData[0];
-pData += nSize;
-nSize -= nSize;
}
}
return osl_File_E_None;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
% error building instsetoo_native...
Hi Everbody : My Name is Jose Ortiz . I am a programmer from the ' Instituto Nacional de Estadistica y Geografia ( Mexico)' . In this moment, we are trying to change from Microsoft Office products to Libre Office. Actually, I'm building libre office core but I have the next problem building the instsetoo_native module ( the last in my list from libre office core) : : :: : ... languages en-US ... ... analyzing update database ... ** ERROR: ERROR: Missing files in function: remove_Files_Without_Sourcedirectory ** ** ERROR: Saved logfile: C:/libo/instsetoo_native/wntmsci12.pro/LibreOffice_Dev/native/logging/en -US/log_OOO350_en-US.log ** ... analyzing files ... ERROR: The following files could not be found: ERROR: File not found: dict-af.oxt ERROR: File not found: dict-an.oxt ERROR: File not found: dict-ar.oxt ERROR: File not found: dict-be.oxt ERROR: File not found: dict-bg.oxt ERROR: File not found: dict-bn.oxt ERROR: File not found: dict-br.oxt : :: : I have seen some links and... it appears related to the dictionaries. Is that right ? And ... If this is true, Is there any link with information about how to install dictionaries in a source code (core) directory ? . Thanks for all.. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/source
vcl/source/glyphs/graphite_layout.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 6b7bea515ef8e762829b25b97fd84559186dd92c
Author: Michael Stahl mst...@redhat.com
Date: Fri May 25 22:43:29 2012 +0200
fdo#50169: band-aid another crash in GraphiteLayout::expandOrCondense:
error: attempt to subscript container with out-of-bounds index 6,
but container only holds 6 elements.
(cherry picked from commit b8452a89ceaa9008558b83f3a8b6937d14b7c803)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/glyphs/graphite_layout.cxx
b/vcl/source/glyphs/graphite_layout.cxx
index 7a240bf..fd46d22 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -845,7 +845,11 @@ void GraphiteLayout::expandOrCondense(ImplLayoutArgs
rArgs)
nOffset = static_castint(fExtraPerCluster * nCluster);
int nCharIndex = mvGlyph2Char[i];
assert(nCharIndex -1);
-mvCharDxs[nCharIndex-mnMinCharPos] += nOffset;
+if (static_castsize_t(nCharIndex-mnMinCharPos)
+ mvCharDxs.size())
+{
+mvCharDxs[nCharIndex-mnMinCharPos] += nOffset;
+}
// adjust char dxs for rest of characters in cluster
while (++nCharIndex - mnMinCharPos
static_castint(mvChar2BaseGlyph.size()))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED][REVIEW][3-5] fdo#50169 crash in GraphiteLayout::expandOrCondense
On Fri, 2012-05-25 at 23:38 +0200, Michael Stahl wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=b8452a89ceaa9008558b83f3a8b6937d14b7c803 would be nice if somebody had the time to investigate whether these various vectors in this graphite code that i clearly don't understand are sized properly. pushed to 3-5 as-is rather than letting the great be enemy of the good. Someone needs to clarify if mvGlyph2Char is filled correctly and if that calculation is quite right, won't be me though :-) C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Problem with configuring build
Hello again, I've managed to do this. What was the issue? I was trying to install a 'precise' (current Ubuntu version) version of this package, liborbit2, but there was also 'precise-updates' version... And that was the right one :) Probably it was broken in 'precise' release and they improved it. Problem solved, however thanks for help :) Best regards, Artur 2012/5/30 Artur Dorda artur.do...@gmail.com: Hi, Thank you for answering so quick. But do you have the matching -devel/-dev package ? While trying to install, I get Dependency is not satisfiable: liborbit2 (= 1:2.14.19-0.1) Google keeps its mouth shut about it... but I guess it wants liborbit2. So I try to install also this package... And what I get? A later version is already installed No idea how to satisfy it. Best regards, Artur 2012/5/30 Caolán McNamara caol...@redhat.com: On Wed, 2012-05-30 at 16:46 +0200, Artur Dorda wrote: Hi, I'm trying to configure build with ./autogen.sh --with-max-jobs=2 --with-num-cpus=2 --without-help --without-myspell-dicts --disable-gnome-vfs at the beginning it says can't create backup file. yet it runs... and after a while : checking for GCONF... no configure: error: Package requirements (gconf-2.0 ORBit-2.0 ) were not met: run pkg-config --libs gconf-2.0 ORBit-2.0 on the command line and see if that fails, and fix that problem if it exists. No package 'ORBit-2.0' found The problem is, that I already have orbit2 But do you have the matching -devel/-dev package ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [PUSHED] fdo#39468: translate German comments (= writer)
Thanks! Pushed all three. I onlychanged the commit comments to be in present tense, as I think is better. (Instead of cleaned up comments, Clean up comments.) BTW, please start a new thread for each message with one or several patches attached. Otherwise our convention of finalizing the thread with a message that adds the [PUSHED] keyword to the Subject doesn't really work as intended, if you follow-up to that message with a new set of patches but keep the [PUSHED] already in the Subject... --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - android/experimental testtools/Module_testtools.mk
android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
| 111 +-
testtools/Module_testtools.mk
|4
2 files changed, 105 insertions(+), 10 deletions(-)
New commits:
commit 82f65054561020d38e37dd376e4f652dcd1bcca8
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed May 30 23:11:22 2012 +0300
Progress finally
Now I get (a page of) the document rendered into a
bitmap. Unfortunately css.awt.XBitmap::getDIB() provides an in-core
24-bit (BGR) BMP file. (Yes, despite the name, it's not just the DIB,
but is prefixed with a BMP file header.) Android's Image class wants
RGBA. Hmm.
Change-Id: Ie0effef20751e1959644861af358d81538b6d6ea
diff --git
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index ac95164..c39741e 100644
---
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -105,7 +105,7 @@ public class DocumentLoader
}
}
-static void dump(String objectName, Object object)
+static void dumpUNOObject(String objectName, Object object)
{
Log.i(TAG, objectName + is + (object != null ? object.toString() :
null));
@@ -128,6 +128,17 @@ public class DocumentLoader
Log.i(TAG,+ t.getTypeName());
}
+static void dumpBytes(byte[] image)
+{
+for (int i = 0; i 160; i += 16) {
+String s = ;
+for (int j = 0; j 16; j++)
+s = s + String.format( %02x, image[i+j]);
+
+Log.i(TAG, s);
+}
+}
+
@Override
public void onCreate(Bundle savedInstanceState)
{
@@ -207,7 +218,7 @@ public class DocumentLoader
xCompLoader.loadComponentFromURL
(sUrl, _blank, 0, loadProps);
-dump(oDoc, oDoc);
+dumpUNOObject(oDoc, oDoc);
// Test stuff, try creating various services, see what types
// they offer, stuff that is hard to find out by reading
@@ -219,12 +230,12 @@ public class DocumentLoader
xCompLoader.loadComponentFromURL
(private:factory/swriter, _blank, 0, loadProps);
-dump(swriter, swriter);
+dumpUNOObject(swriter, swriter);
Object frameControl = xMCF.createInstanceWithContext
(com.sun.star.frame.FrameControl, xContext);
-dump(frameControl, frameControl);
+dumpUNOObject(frameControl, frameControl);
com.sun.star.awt.XControl control = (com.sun.star.awt.XControl)
UnoRuntime.queryInterface(com.sun.star.awt.XControl.class,
frameControl);
@@ -232,14 +243,14 @@ public class DocumentLoader
Object toolkit = xMCF.createInstanceWithContext
(com.sun.star.awt.Toolkit, xContext);
-dump(toolkit, toolkit);
+dumpUNOObject(toolkit, toolkit);
com.sun.star.awt.XToolkit xToolkit =
(com.sun.star.awt.XToolkit)
UnoRuntime.queryInterface(com.sun.star.awt.XToolkit.class,
toolkit);
com.sun.star.awt.XDevice device =
xToolkit.createScreenCompatibleDevice(1024, 1024);
-dump(device, device);
+dumpUNOObject(device, device);
// I guess the XRenderable thing might be what we want to use,
// having the code pretend it is printing?
@@ -262,6 +273,14 @@ public class DocumentLoader
Log.i(TAG, getRendererCount: +
renderBabe.getRendererCount(oDoc, renderProps));
renderBabe.render(0, oDoc, renderProps);
+
+com.sun.star.awt.XBitmap bitmap = device.createBitmap(0, 0,
1024, 1024);
+
+byte[] image = bitmap.getDIB();
+
+Log.i(TAG, image is + image.length + bytes);
+
+dumpBytes(image);
}
}
catch (Exception e) {
commit d69bcc9979f56ab5dc59b9d10bbc601d38506873
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed May 30 20:25:01 2012 +0300
Getting closer, maybe
Change-Id: Ifcfdd33631c257d2cf6f54fe0d00444200f48335
diff --git
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index 5a45406..ac95164 100644
---
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -41,6
[Libreoffice-commits] .: stoc/Library_bootstrap.mk stoc/Library_introspection.mk stoc/Library_invocadapt.mk stoc/Library_invocation.mk stoc/Library_javaloader.mk stoc/Library_javavm.mk stoc/Library_na
stoc/Library_bootstrap.mk |6 -- stoc/Library_introspection.mk | 10 -- stoc/Library_invocadapt.mk| 10 -- stoc/Library_invocation.mk| 10 -- stoc/Library_javaloader.mk| 10 -- stoc/Library_javavm.mk| 10 -- stoc/Library_namingservice.mk | 10 -- stoc/Library_proxyfac.mk | 10 -- stoc/Library_reflection.mk| 10 -- stoc/Library_stocservices.mk | 10 -- 10 files changed, 96 deletions(-) New commits: commit 8016dced31517e1695af932efedcf9f83a28d741 Author: Tor Lillqvist tlillqv...@suse.com Date: Wed May 30 13:31:18 2012 +0300 Bin MSVC unknown option '-0b0' It was a typo, supposed to be -Ob0, but as stoc built fine anyway without that, presumably not needed. Change-Id: I866bd47c3d53bdf48581a3632d56fb3ac8b2ed5f diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk index efdaf4e..2676d47 100644 --- a/stoc/Library_bootstrap.mk +++ b/stoc/Library_bootstrap.mk @@ -35,12 +35,6 @@ $(eval $(call gb_Library_add_defs,bootstrap,\ $(if $(filter-out $(diag),cache),-D__DIAGNOSE)) \ )) -ifeq ($(COM),MSC) -$(eval $(call gb_Library_add_defs,bootstrap,\ --0b0 \ -)) -endif - endif $(eval $(call gb_Library_set_include,bootstrap,\ diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk index 2ef9c38..a6e9a9b 100644 --- a/stoc/Library_introspection.mk +++ b/stoc/Library_introspection.mk @@ -27,16 +27,6 @@ $(eval $(call gb_Library_Library,introspection)) -ifneq ($(debug),) - -ifeq ($(COM),MSC) -$(eval $(call gb_Library_add_defs,introspection,\ --0b0 \ -)) -endif - -endif - $(eval $(call gb_Library_use_internal_api,introspection,\ insp \ )) diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk index 356522c..ff6e3ec 100644 --- a/stoc/Library_invocadapt.mk +++ b/stoc/Library_invocadapt.mk @@ -27,16 +27,6 @@ $(eval $(call gb_Library_Library,invocadapt)) -ifneq ($(debug),) - -ifeq ($(COM),MSC) -$(eval $(call gb_Library_add_defs,invocadapt,\ --0b0 \ -)) -endif - -endif - $(eval $(call gb_Library_use_internal_api,invocadapt,\ invadp \ )) diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk index b73e22c..040463d 100644 --- a/stoc/Library_invocation.mk +++ b/stoc/Library_invocation.mk @@ -27,16 +27,6 @@ $(eval $(call gb_Library_Library,invocation)) -ifneq ($(debug),) - -ifeq ($(COM),MSC) -$(eval $(call gb_Library_add_defs,invocation,\ --0b0 \ -)) -endif - -endif - $(eval $(call gb_Library_use_internal_api,invocation,\ inv \ )) diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk index 8855eae..0822e4a 100644 --- a/stoc/Library_javaloader.mk +++ b/stoc/Library_javaloader.mk @@ -27,16 +27,6 @@ $(eval $(call gb_Library_Library,javaloader)) -ifneq ($(debug),) - -ifeq ($(COM),MSC) -$(eval $(call gb_Library_add_defs,javaloader,\ --0b0 \ -)) -endif - -endif - $(eval $(call gb_Library_use_internal_api,javaloader,\ javaloader \ )) diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk index 6cfc674..1934799 100644 --- a/stoc/Library_javavm.mk +++ b/stoc/Library_javavm.mk @@ -27,16 +27,6 @@ $(eval $(call gb_Library_Library,javavm)) -ifneq ($(debug),) - -ifeq ($(COM),MSC) -$(eval $(call gb_Library_add_defs,javavm,\ --0b0 \ -)) -endif - -endif - $(eval $(call gb_Library_use_internal_api,javavm,\ jen \ )) diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk index 68747b0..dcd7261 100644 --- a/stoc/Library_namingservice.mk +++ b/stoc/Library_namingservice.mk @@ -27,16 +27,6 @@ $(eval $(call gb_Library_Library,namingservice)) -ifneq ($(debug),) - -ifeq ($(COM),MSC) -$(eval $(call gb_Library_add_defs,namingservice,\ --0b0 \ -)) -endif - -endif - $(eval $(call gb_Library_use_internal_api,namingservice,\ namingservice \ )) diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk index ce3b23b..a2efdc2 100644 --- a/stoc/Library_proxyfac.mk +++ b/stoc/Library_proxyfac.mk @@ -27,16 +27,6 @@ $(eval $(call gb_Library_Library,proxyfac)) -ifneq ($(debug),) - -ifeq ($(COM),MSC) -$(eval $(call gb_Library_add_defs,proxyfac,\ --0b0 \ -)) -endif - -endif - $(eval $(call gb_Library_use_internal_api,proxyfac,\ proxyfac \ )) diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk index c14aaad..34a5fe6 100644 --- a/stoc/Library_reflection.mk +++ b/stoc/Library_reflection.mk @@ -27,16 +27,6 @@ $(eval $(call gb_Library_Library,reflection)) -ifneq ($(debug),) - -ifeq ($(COM),MSC) -$(eval $(call gb_Library_add_defs,reflection,\ --0b0 \ -)) -endif - -endif - $(eval $(call gb_Library_use_internal_api,reflection,\ corefl \ )) diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk index 6a0b5c6..d5741e6 100644 --- a/stoc/Library_stocservices.mk +++ b/stoc/Library_stocservices.mk @@ -27,16 +27,6 @@ $(eval $(call
[Libreoffice-commits] .: 2 commits - i18npool/source jvmfwk/source
i18npool/source/breakiterator/breakiteratorImpl.cxx |4
-
i18npool/source/breakiterator/xdictionary.cxx | 10
+-
i18npool/source/calendar/calendarImpl.cxx |6
-
i18npool/source/calendar/calendar_gregorian.cxx |4
-
i18npool/source/characterclassification/characterclassificationImpl.cxx |8
+-
i18npool/source/collator/chaptercollator.cxx|4
-
i18npool/source/collator/collatorImpl.cxx |8
+-
i18npool/source/collator/collator_unicode.cxx |4
-
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 38
+-
i18npool/source/indexentry/indexentrysupplier.cxx |4
-
i18npool/source/indexentry/indexentrysupplier_asian.cxx | 12
+--
i18npool/source/indexentry/indexentrysupplier_default.cxx |2
i18npool/source/inputchecker/inputsequencechecker.cxx |2
i18npool/source/localedata/LocaleNode.cxx | 26
+++---
i18npool/source/localedata/localedata.cxx |8
+-
i18npool/source/localedata/saxparser.cxx|4
-
i18npool/source/numberformatcode/numberformatcode.cxx | 26
+++---
i18npool/source/search/textsearch.cxx | 12
+--
i18npool/source/textconversion/textconversionImpl.cxx | 12
+--
i18npool/source/textconversion/textconversion_ko.cxx|8
+-
i18npool/source/textconversion/textconversion_zh.cxx|2
i18npool/source/transliteration/transliterationImpl.cxx |8
+-
jvmfwk/source/fwkutil.cxx | 10
+-
23 files changed, 111 insertions(+), 111 deletions(-)
New commits:
commit d79705d1dfea05745494cc00c5963f4b40628393
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Wed May 30 16:12:54 2012 -0500
targeted string re-work
Change-Id: I31c752d044774cf4cec4aaab9bb2e43570d41953
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index 670898c..a3976bf 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -69,7 +69,7 @@ bool isAccessibilitySupportDesired()
{
OUString sValue;
if ((sal_True == ::rtl::Bootstrap::get(
-
OUString(RTL_CONSTASCII_USTRINGPARAM(JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY)),
sValue)) sValue == 1
+OUString(JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY), sValue)) sValue
== 1
)
return false;
@@ -260,7 +260,7 @@ rtl::OUString findPlugin(
}
rtl::OUString retVal;
rtl::OUString sProgDir = getExecutableDirectory();
-sUrl = sProgDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/))
+sUrl = sProgDir + rtl::OUString(/)
+ plugin;
jfw::FileStatus s = checkFileURL(sUrl);
if (s == jfw::FILE_INVALID || s == jfw::FILE_DOES_NOT_EXIST)
@@ -272,11 +272,11 @@ rtl::OUString findPlugin(
rtl::OUString url;
#ifdef UNX
#if defined(MACOSX)
-rtl::OUString path =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DYLD_LIBRARY_PATH));
+rtl::OUString path = rtl::OUString(DYLD_LIBRARY_PATH);
#elif defined(AIX)
-rtl::OUString path =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(LIBPATH));
+rtl::OUString path = rtl::OUString(LIBPATH);
#else
-rtl::OUString path =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(LD_LIBRARY_PATH));
+rtl::OUString path = rtl::OUString(LD_LIBRARY_PATH);
#endif
rtl::OUString env_path;
oslProcessError err = osl_getEnvironment(path.pData,
env_path.pData);
commit 1488171272e5e9d11f751482e3e372e5db58418b
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Wed May 30 15:00:23 2012 -0500
targeted string re-work
Change-Id: I1efff8e09079267f4129c474872d3fc49adeb831
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx
b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index 8201453..adb80b7 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -555,7 +555,7 @@ sal_Bool SAL_CALL
BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUS
}
Reference uno::XInterface xI = xMSF-createInstance(
-
OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.i18n.BreakIterator_)) +
aLocaleName);
+OUString(com.sun.star.i18n.BreakIterator_) + aLocaleName);
if ( xI.is() ) {
xI-queryInterface( getCppuType((const Reference
XBreakIterator*)0) ) = xBI;
@@ -606,7 +606,7 @@ BreakIteratorImpl::getLocaleSpecificBreakIterator(const
Locale rLocale) throw (
// load service with name base_lang
About fdo#47044 crashed when accessing Proxy etc
Hello,
Quite recently, an interesting bt has been published by bfoman about this
bug (see https://bugs.freedesktop.org/attachment.cgi?id=62055) , here are
the top lines :
sal3!rtl_uString_newFromAscii+0x15
wininetbe1_uno!rtl::OUString::createFromAscii+0x40
wininetbe1_uno!WinInetBackend::WinInetBackend+0x1a0
Searching about createFromAscii in wininetbackend files, I found them in
wininetbackend.cxx
The only lines containing createFromAscii are :
157 rtl::OUString aProxyList =
rtl::OUString::createFromAscii( lpi-lpszProxy );
158 rtl::OUString aProxyBypassList =
rtl::OUString::createFromAscii( lpi-lpszProxyBypass );
Then I wonder what was lpi type and just read some lines above :
126 LPINTERNET_PROXY_INFO lpi = NULL;
Then searching about LPINTERNET_PROXY_INFO gave this url :
http://msdn.microsoft.com/en-us/library/windows/desktop/aa385148%28v=vs.85%29.aspx
typedef struct {
DWORD dwAccessType;
LPCTSTR lpszProxy;
LPCTSTR lpszProxyBypass;
} INTERNET_PROXY_INFO, * LPINTERNET_PROXY_INFO;
So kept on with attributes lpszProxy and lpszProxyBypass and its type
LPCTSTR, it gave this link :
http://msdn.microsoft.com/en-us/library/aa383751%28v=vs.85%29.aspx
This type is declared in WinNT.h as follows:
#ifdef UNICODE
typedef LPCWSTR LPCTSTR;
#else
typedef LPCSTR LPCTSTR;
#endif
On the same page, we can read :
for LPCSTR :
A pointer to a constant null-terminated string of 8-bit Windows (ANSI)
characters. For more information, see Character Sets Used By Fonts.
This type is declared in WinNT.h as follows:
typedef __nullterminated CONST CHAR *LPCSTR;
and for LPCWSTR :
A pointer to a constant null-terminated string of 16-bit Unicode characters.
For more information, see Character Sets Used By Fonts.
This type is declared in WinNT.h as follows:
typedef CONST WCHAR *LPCWSTR;
Then going back to createFromAscii to see if it could match with all this :
sal/inc/rtl/ustring.hxx: static OUString createFromAscii( const
sal_Char * value ) SAL_THROW(())
+
sal/inc/sal/types.h : typedef char sal_Char;
Now I wonder if it's ok to use createFromAscii to manage the attributes
lpszProxy and lpszProxyBypass ? (no ironical question here, just a
beginner question only :-))
Julien.
--
View this message in context:
http://nabble.documentfoundation.org/About-fdo-47044-crashed-when-accessing-Proxy-etc-tp3986891.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: setup_native/source
setup_native/source/win32/customactions/sellang/sellang.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 7c289cad0a896b092deb01d00618dcee8c8dff45 Author: Andras Timar ati...@suse.com Date: Wed May 30 23:41:10 2012 +0200 add Amharic language to SelectLanguage custom action Change-Id: I8562d1289b269ca7f3aa959907641fd70be0770f diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx index e0a775a..5c18dc0 100644 --- a/setup_native/source/win32/customactions/sellang/sellang.cxx +++ b/setup_native/source/win32/customactions/sellang/sellang.cxx @@ -66,6 +66,7 @@ langid_to_string( LANGID langid, int *have_default_lang ) #define CASE(name, primary) \ case LANG_##primary: return #name CASE(af, AFRIKAANS); +CASE(am, AMHARIC); CASE(ar, ARABIC); CASE(as, ASSAMESE); CASE(be, BELARUSIAN); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - framework/inc framework/source svtools/inc svtools/source
framework/inc/uielement/recentfilesmenucontroller.hxx|1
framework/source/uielement/recentfilesmenucontroller.cxx | 28 +++
svtools/inc/svtools/popupmenucontrollerbase.hxx |1
svtools/source/uno/popupmenucontrollerbase.cxx |2 +
4 files changed, 10 insertions(+), 22 deletions(-)
New commits:
commit c238c19d2fed00919e02c4bc268d99ceaa73aca1
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed May 30 18:33:46 2012 -0400
1) Don't pass filter name and 2) pass module name when opening file.
Passing the filter name bypasses the type detection, which is bad. Also,
the module name is needed in order for the type detection to intelligently
decide which app to open in case the file format type is generic, i.e.
.html, .xml, .txt etc.
Change-Id: If18f649b32e79fae58af088362b0b5f11adc8eb3
diff --git a/framework/inc/uielement/recentfilesmenucontroller.hxx
b/framework/inc/uielement/recentfilesmenucontroller.hxx
index 133a4ee..620820d 100644
--- a/framework/inc/uielement/recentfilesmenucontroller.hxx
+++ b/framework/inc/uielement/recentfilesmenucontroller.hxx
@@ -106,7 +106,6 @@ namespace framework
struct RecentFile
{
rtl::OUString aURL;
-rtl::OUString aFilter;
rtl::OUString aTitle;
rtl::OUString aPassword;
};
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx
b/framework/source/uielement/recentfilesmenucontroller.cxx
index 056d4e9..bbd00ab 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -148,8 +148,6 @@ void RecentFilesMenuController::fillPopupMenu( Reference
css::awt::XPopupMenu
if ( rPickListEntry[j].Name == HISTORY_PROPERTYNAME_URL )
a = aRecentFile.aURL;
-else if ( rPickListEntry[j].Name ==
HISTORY_PROPERTYNAME_FILTER )
-a = aRecentFile.aFilter;
else if ( rPickListEntry[j].Name ==
HISTORY_PROPERTYNAME_TITLE )
a = aRecentFile.aTitle;
else if ( rPickListEntry[j].Name ==
HISTORY_PROPERTYNAME_PASSWORD )
@@ -274,8 +272,6 @@ void RecentFilesMenuController::fillPopupMenu( Reference
css::awt::XPopupMenu
void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
{
-static int NUM_OF_PICKLIST_ARGS = 3;
-
Reference css::awt::XPopupMenu xPopupMenu;
Reference XDispatch xDispatch;
Reference XDispatchProvider xDispatchProvider;
@@ -298,7 +294,8 @@ void RecentFilesMenuController::executeEntry( sal_Int32
nIndex )
aTargetURL.Complete = rRecentFile.aURL;
m_xURLTransformer-parseStrict( aTargetURL );
-aArgsList.realloc( NUM_OF_PICKLIST_ARGS );
+sal_Int32 nSize = 2;
+aArgsList.realloc(nSize);
aArgsList[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
Referer ));
aArgsList[0].Value = makeAny(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER )));
@@ -306,25 +303,14 @@ void RecentFilesMenuController::executeEntry( sal_Int32
nIndex )
aArgsList[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
AsTemplate ));
aArgsList[1].Value = makeAny( (sal_Bool) sal_False );
-::rtl::OUString aFilter( rRecentFile.aFilter );
-sal_Int32 nPos = aFilter.indexOf( '|' );
-if ( nPos = 0 )
+if (!m_aModuleName.isEmpty())
{
-::rtl::OUString aFilterOptions;
-
-if ( nPos ( aFilter.getLength() - 1 ) )
-aFilterOptions = aFilter.copy( nPos+1 );
-
-aArgsList[2].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
FilterOptions ));
-aArgsList[2].Value = aFilterOptions;
-
-aFilter = aFilter.copy( 0, nPos-1 );
-aArgsList.realloc( ++NUM_OF_PICKLIST_ARGS );
+// Type detection needs to know which app we are opening it from.
+aArgsList.realloc(++nSize);
+aArgsList[nSize-1].Name = DocumentService;
+aArgsList[nSize-1].Value = m_aModuleName;
}
-aArgsList[NUM_OF_PICKLIST_ARGS-1].Name = ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( FilterName ));
-aArgsList[NUM_OF_PICKLIST_ARGS-1].Value = aFilter;
-
xDispatch = xDispatchProvider-queryDispatch( aTargetURL,
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(_default)), 0 );
}
commit e78b2fbc545c83b85b1a828bf65b455189c9dcb3
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed May 30 18:17:21 2012 -0400
Store the module name here. I need to use it in the recent files menu.
Change-Id: Ib074b6a4ac6c2fe89edf0a0e4b2faf2d8a8eae68
diff --git a/svtools/inc/svtools/popupmenucontrollerbase.hxx
b/svtools/inc/svtools/popupmenucontrollerbase.hxx
index 5bd15cf..3252b3a 100644
---
