LibreOffice Gerrit News for core on 2014-07-30
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Convert PAGE_DBWIZARD_AUTHENTIFICATION and PAGE_DBWIZARD_LDAP to .ui in https://gerrit.libreoffice.org/10635 from Mihály Palenik about module dbaccess + javaunohelper: The assigned value is never used in https://gerrit.libreoffice.org/10624 from Robert Antoni Buj i Gelonch about module javaunohelper + fdo#70625 Add --cat parameter to make git diffs pretty in https://gerrit.libreoffice.org/10623 from Deena P. F. about module desktop + javaunohelper: String comparison in https://gerrit.libreoffice.org/10621 from Robert Antoni Buj i Gelonch about module javaunohelper + OSX: drop -malign-natural flag for non-clang compilers in https://gerrit.libreoffice.org/10479 from Douglas Mencken about module solenv + l10ntools: fixes and improvements for transex3 executable in https://gerrit.libreoffice.org/10212 from Douglas Mencken about module l10ntools + fix external/coinmp on OSX: bad symlinking in https://gerrit.libreoffice.org/10614 from Douglas Mencken about module external + Convert 3 tabpages to .ui in https://gerrit.libreoffice.org/10608 from Mihály Palenik about module dbaccess + Convert 5 tabpages to .ui in https://gerrit.libreoffice.org/10607 from Mihály Palenik about module dbaccess + vcl/source/opengl/OpenGLContext.cxx: fix build for OSX 10.6 in https://gerrit.libreoffice.org/10592 from Douglas Mencken about module vcl End of freshness + Remove redundant sal_Char * in https://gerrit.libreoffice.org/10634 from Joren De Cuyper about module sw + fdo#73151 Open Gallery in the sidebar in all applications in https://gerrit.libreoffice.org/10616 from Samuel Mehrbrodt about module include, sc, sd, svx, sw + Use OString::boolean in docxattributeoutput.cxx in https://gerrit.libreoffice.org/10622 from Joren De Cuyper about module sw + Improve Navigate by layout in https://gerrit.libreoffice.org/10613 from Samuel Mehrbrodt about module icon-themes, sw + Cleanup OUStrings in CustomShapes in https://gerrit.libreoffice.org/10594 from Joren De Cuyper about module svx * Merged changes on master for project core changed in the last 25 hours: + fdo#81812 Kill PIMPE and PIMPEE in https://gerrit.libreoffice.org/10611 from Joren De Cuyper + Fix indent + some extranous whitespace in https://gerrit.libreoffice.org/10625 from Joren De Cuyper + FontName - FontFamily error in https://gerrit.libreoffice.org/10612 from Joren De Cuyper + SVG test that sequences are equal in https://gerrit.libreoffice.org/10601 from Joren De Cuyper + bnc#862510: PPTX import: Properly show data labels in percent format. in https://gerrit.libreoffice.org/10543 from Matúš Kukan + simplify no delete logic in SvRefBase in https://gerrit.libreoffice.org/10286 from Noel Grandin + xmerge: The assigned value is never used in https://gerrit.libreoffice.org/10575 from Robert Antoni Buj i Gelonch + fdo#46037: remove unused comphelper/configurationhelper.hxx in https://gerrit.libreoffice.org/10603 from Alexandre Vicenzi + convert linked list to std::vector in SbxDimArray in https://gerrit.libreoffice.org/10298 from Noel Grandin + fdo#80580: LO crashes while opening the document on ubuntu build in https://gerrit.libreoffice.org/10532 from Yogesh Bharate + Remove some unused code in https://gerrit.libreoffice.org/10593 from Marcos Paulo de Souza + fdo#81486:Test case for patch that fixes bug 81486 in https://gerrit.libreoffice.org/10454 from Charu Tyagi + fdo#81486:custom property with the same name as Document Property not imp in https://gerrit.libreoffice.org/10381 from Charu Tyagi + Further OUString cleanup in xmloff/ in https://gerrit.libreoffice.org/10598 from Joren De Cuyper + Converted RID_SVX_MDLG_HANGULHANJA to Widget Layout. in https://gerrit.libreoffice.org/10595 from Rachit Gupta + PAGE_DBWIZARD_MYSQL_INTRO and PAGE_DBWIZARD_SPREADSHEET conversion to .ui in https://gerrit.libreoffice.org/10606 from Szymon Kłos + Cleanup OUString-use in filter/html in https://gerrit.libreoffice.org/10599 from Joren De Cuyper + Kill the libreofficekit static library / shim.c. in https://gerrit.libreoffice.org/10584 from Andrzej Hunt * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + fdo#78304:Image in header is not getting preserved. in https://gerrit.libreoffice.org/10386 from Sourav Mahajan + fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami + VS2013: Make 64 bit shell extensions optional in https://gerrit.libreoffice.org/10163 from David Ostrovsky + fdo#57950 Replace chained append( with operator+) in https://gerrit.libreoffice.org/10149 from Petr Vorel + fdo#79018: LO hangs while opening file. in
RE: export of Calc functions to OOXML
Hi Eike, There are already entry points that do something similar for the old non-ODFF (aka PODF) OOo-XML format, i.e. in formula/source/core/api/FormulaCompiler.cxx FormulaCompiler::CreateStringFromTokenArray() and in formula/source/core/api/token.cxx all functions with *Rewrite*() The MissingConvention and FormulaMissingContext need to handle also the OOXML cases, or probably better create a derived MissingConvention for the OOXML case so there are less explicit comparisons and/or switch cases to differentiate. I note that the PODF-handling is always done when saving, regardless of the file type being saved (e.g. ods, xlsx). The result is that e.g. the formula GAMMADIST(1,2,5) (4th argument is optional) is always extended to GAMMADIST(1,2,5,1). Whether this is a desired functionality or not may be a matter of taste, but it makes FormulaCompiler::CreateStringFromTokenArray() an unsuitable starting point for OOXML-modifications. Am I overlooking something? Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: javaunohelper/com
javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 192265720a0f83ceab58fe81a159df5f43a59bb5
Author: rbuj robert@gmail.com
Date: Tue Jul 29 21:34:00 2014 +0200
javaunohelper: String comparison
Change-Id: I52a7e456bef73824f64213c982052c61e54f7c76
Reviewed-on: https://gerrit.libreoffice.org/10621
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
index 32610a3..e8a4fad 100644
--- a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
+++ b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
@@ -46,7 +46,7 @@ public class SharedLibraryLoader {
public static final String DEFAULT_IMPLEMENTATION =
com.sun.star.comp.stoc.DLLComponentLoader;
static {
-if (System.getProperty(java.vendor) == The Android Project) {
+if (The Android Project.equals(System.getProperty(java.vendor))) {
// See corresponding code in
// javaunohelper/com/sun/star/comp/helper/Bootstrap.java for more
// comments.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: javaunohelper/com
javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
|4 ++--
javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
|2 +-
javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
|3 +--
javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
|6 +++---
4 files changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 3e9bddfe6879580353b712d61308852e637f2e3d
Author: rbuj robert@gmail.com
Date: Tue Jul 29 21:38:00 2014 +0200
javaunohelper: The assigned value is never used
Change-Id: Ia190a6784fceaf9607ba39f2ef9d5ea4151cfc16
Reviewed-on: https://gerrit.libreoffice.org/10624
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git
a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
index c598896..f4cda93 100644
---
a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
+++
b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
@@ -75,7 +75,7 @@ public class InputStreamToXInputStreamAdapter implements
XInputStream {
{
int count = 0;
try {
-long bytesRead=0;
+long bytesRead;
if (len iIn.available()) {
bytesRead = iIn.read(b[0], 0, iIn.available());
}
@@ -102,7 +102,7 @@ public class InputStreamToXInputStreamAdapter implements
XInputStream {
{
int count = 0;
try {
-long bytesRead=0;
+long bytesRead;
if (len iIn.available()) {
bytesRead = iIn.read(b[0], 0, iIn.available());
}
diff --git
a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
index a556bb0..7f4a623 100644
---
a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
+++
b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
@@ -111,7 +111,7 @@ public class XInputStreamToInputStreamAdapter extends
InputStream {
int count = 0;
byte [][] tmp = new byte [1][b.length];
try {
-long bytesRead=0;
+long bytesRead;
int av = xin.available();
if ( av != 0 len av) {
bytesRead = xin.readBytes(tmp, av);
diff --git
a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
index c2860db..8488e22 100644
---
a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
+++
b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
@@ -90,11 +90,10 @@ public class XOutputStreamToByteArrayAdapter
{
if ( externalBuffer )
throw new BufferSizeExceededException(out of buffer space,
cannot grow external buffer);
-byte[] newBuffer = null;
while ( values.length size-position )
size *= 2;
// System.err.println(new buffer size is +size+ bytes.);
-newBuffer = new byte[size];
+byte[] newBuffer = new byte[size];
System.arraycopy(buffer, 0, newBuffer, 0, position);
buffer = newBuffer;
}
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
index 8163963..c62b005 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
@@ -494,7 +494,7 @@ XMultiPropertySet
if ((prop.Attributes PropertyAttribute.READONLY) ==
PropertyAttribute.READONLY)
throw new com.sun.star.beans.PropertyVetoException();
// The value may be null only if MAYBEVOID attribute is set
-boolean bVoidValue= false;
+boolean bVoidValue;
if (value instanceof Any)
bVoidValue= ((Any) value).getObject() == null;
else
@@ -505,7 +505,7 @@ XMultiPropertySet
throw new DisposedException(Component is already disposed);
//Check if the argument is allowed
-boolean bValueOk= false;
+boolean bValueOk;
if (value instanceof Any)
bValueOk= checkType(((Any) value).getObject());
else
@@ -898,7 +898,7 @@ XMultiPropertySet
for (int i= 0; i nAffectedProps; i++)
{
// get the listener container for the property name
-InterfaceContainer lc= null;
+InterfaceContainer lc;
if (bVetoable)
lc= aVetoableLC.getContainer(arEvts[i].PropertyName);
else
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - editeng/CppunitTest_editeng_core.mk editeng/qa editeng/source
editeng/CppunitTest_editeng_core.mk |1
editeng/qa/unit/core-test.cxx | 100 +++-
editeng/source/editeng/editdoc.cxx | 173
editeng/source/editeng/editdoc.hxx | 12 ++
editeng/source/editeng/impedit4.cxx |6 -
5 files changed, 226 insertions(+), 66 deletions(-)
New commits:
commit 8220b70fe2dc270188751950ac6d872320db1aa2
Author: Michael Meeks michael.me...@collabora.com
Date: Sun Jul 27 00:21:50 2014 -0400
bnc#467459 - fix editeng text search with expanded fields.
(cherry picked from commit 274b628a2b523eb45e297352a85f0177c6e747f0)
Signed-off-by: Matúš Kukan matus.ku...@collabora.com
Conflicts:
editeng/source/editeng/editdoc.cxx
editeng/source/editeng/editdoc.hxx
Change-Id: If59d0e2f886e94148b81cb6cfcad067733fcb918
diff --git a/editeng/CppunitTest_editeng_core.mk
b/editeng/CppunitTest_editeng_core.mk
index 301c760..962fd8f 100644
--- a/editeng/CppunitTest_editeng_core.mk
+++ b/editeng/CppunitTest_editeng_core.mk
@@ -61,6 +61,7 @@ $(eval $(call gb_CppunitTest_use_components,editeng_core,\
configmgr/source/configmgr \
framework/util/fwk \
i18npool/util/i18npool \
+ i18npool/source/search/i18nsearch \
linguistic/source/lng \
sfx2/util/sfx \
ucb/source/core/ucb1 \
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 338a6cb7..4e3da9b 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -25,6 +25,9 @@
#include editeng/postitem.hxx
#include editeng/section.hxx
#include editeng/editobj.hxx
+#include editeng/flditem.hxx
+#include svl/srchitem.hxx
+#include rtl/strbuf.hxx
#include com/sun/star/text/textfield/Type.hpp
@@ -44,22 +47,22 @@ public:
void testConstruction();
-/**
- * Test UNO service class that implements text field items.
- */
+/// Test UNO service class that implements text field items.
void testUnoTextFields();
-/**
- * AutoCorrect tests
- */
+/// AutoCorrect tests
void testAutocorrect();
+/// Test hyperlinks
+void testHyperlinkSearch();
+
void testSectionAttributes();
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(testConstruction);
CPPUNIT_TEST(testUnoTextFields);
CPPUNIT_TEST(testAutocorrect);
+CPPUNIT_TEST(testHyperlinkSearch);
CPPUNIT_TEST(testSectionAttributes);
CPPUNIT_TEST_SUITE_END();
@@ -340,6 +343,91 @@ void Test::testAutocorrect()
}
}
+namespace {
+class UrlEditEngine : public EditEngine
+{
+public:
+UrlEditEngine(SfxItemPool *pPool) : EditEngine(pPool) {}
+
+virtual OUString CalcFieldValue( const SvxFieldItem, sal_Int32,
sal_uInt16, Color*, Color* )
+{
+return OUString(j...@bob.com); // a sophisticated view of value:
+}
+};
+}
+
+// Odd accounting for hyperlink position size etc.
+// https://bugzilla.novell.com/show_bug.cgi?id=467459
+void Test::testHyperlinkSearch()
+{
+UrlEditEngine aEngine(mpItemPool);
+EditDoc rDoc = aEngine.GetEditDoc();
+
+OUString aSampleText = Please write email to . if you find a fish(not a
dog).;
+aEngine.SetText(aSampleText);
+
+CPPUNIT_ASSERT_MESSAGE(set text, rDoc.GetParaAsString(sal_Int32(0)) ==
aSampleText);
+
+ContentNode *pNode = rDoc.GetObject(0);
+EditSelection aSel(EditPaM(pNode, 22), EditPaM(pNode, 22));
+SvxURLField aURLField(mailto:///j...@bob.com;, j...@bob.com,
+ SVXURLFORMAT_REPR);
+SvxFieldItem aField(aURLField, EE_FEATURE_FIELD);
+
+aEngine.InsertField(aSel, aField);
+aEngine.UpdateFields();
+
+OUString aContent = pNode-GetExpandedText();
+CPPUNIT_ASSERT_MESSAGE(get text, aContent ==
+ Please write email to j...@bob.com. if you find a
fish(not a dog).);
+CPPUNIT_ASSERT_MESSAGE(wrong length, rDoc.GetTextLen() ==
(sal_uLong)aContent.getLength());
+
+// Check expansion and positioning re-work
+CPPUNIT_ASSERT_MESSAGE(wrong length, pNode-GetExpandedLen() ==
+ (sal_uLong)aContent.getLength());
+for (sal_Int32 n = 0; n aContent.getLength(); n++)
+{
+sal_Int32 nStart = n, nEnd = n;
+pNode-UnExpandPositions(nStart,nEnd);
+CPPUNIT_ASSERT_MESSAGE(out of bound start, nStart pNode-Len());
+CPPUNIT_ASSERT_MESSAGE(out of bound end, nEnd = pNode-Len());
+}
+
+static const struct {
+sal_Int32 mnStart, mnEnd;
+sal_Int32 mnNewStart, mnNewEnd;
+} aTrickyOnes[] = {
+{ 0, 1, /* - */ 0, 1 },
+{ 21, 25, /* - */ 21, 23 }, // the field is really just one char
+{ 25, 27, /* - */ 22, 23 },
+{ 50, 56, /* - */ 40, 46 }
+};
+for (size_t n = 0; n SAL_N_ELEMENTS(aTrickyOnes); n++)
+{
+sal_Int32 nStart = aTrickyOnes[n].mnStart;
+sal_Int32 nEnd = aTrickyOnes[n].mnEnd;
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - editeng/CppunitTest_editeng_core.mk editeng/qa editeng/source
editeng/CppunitTest_editeng_core.mk |1
editeng/qa/unit/core-test.cxx | 100 +++--
editeng/source/editeng/editdoc.cxx | 170
editeng/source/editeng/editdoc.hxx |9 +
editeng/source/editeng/impedit4.cxx |6 -
5 files changed, 225 insertions(+), 61 deletions(-)
New commits:
commit e7c94a5ad8df0873cf7272206c7c0ae123a1e034
Author: Michael Meeks michael.me...@collabora.com
Date: Sun Jul 27 00:21:50 2014 -0400
bnc#467459 - fix editeng text search with expanded fields.
(cherry picked from commit 274b628a2b523eb45e297352a85f0177c6e747f0)
Change-Id: If59d0e2f886e94148b81cb6cfcad067733fcb918
Signed-off-by: Matúš Kukan matus.ku...@collabora.com
diff --git a/editeng/CppunitTest_editeng_core.mk
b/editeng/CppunitTest_editeng_core.mk
index 301c760..962fd8f 100644
--- a/editeng/CppunitTest_editeng_core.mk
+++ b/editeng/CppunitTest_editeng_core.mk
@@ -61,6 +61,7 @@ $(eval $(call gb_CppunitTest_use_components,editeng_core,\
configmgr/source/configmgr \
framework/util/fwk \
i18npool/util/i18npool \
+ i18npool/source/search/i18nsearch \
linguistic/source/lng \
sfx2/util/sfx \
ucb/source/core/ucb1 \
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index fb3d354..4e9b82b 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -25,6 +25,9 @@
#include editeng/postitem.hxx
#include editeng/section.hxx
#include editeng/editobj.hxx
+#include editeng/flditem.hxx
+#include svl/srchitem.hxx
+#include rtl/strbuf.hxx
#include com/sun/star/text/textfield/Type.hpp
@@ -44,22 +47,22 @@ public:
void testConstruction();
-/**
- * Test UNO service class that implements text field items.
- */
+/// Test UNO service class that implements text field items.
void testUnoTextFields();
-/**
- * AutoCorrect tests
- */
+/// AutoCorrect tests
void testAutocorrect();
+/// Test hyperlinks
+void testHyperlinkSearch();
+
void testSectionAttributes();
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(testConstruction);
CPPUNIT_TEST(testUnoTextFields);
CPPUNIT_TEST(testAutocorrect);
+CPPUNIT_TEST(testHyperlinkSearch);
CPPUNIT_TEST(testSectionAttributes);
CPPUNIT_TEST_SUITE_END();
@@ -340,6 +343,91 @@ void Test::testAutocorrect()
}
}
+namespace {
+class UrlEditEngine : public EditEngine
+{
+public:
+UrlEditEngine(SfxItemPool *pPool) : EditEngine(pPool) {}
+
+virtual OUString CalcFieldValue( const SvxFieldItem, sal_Int32,
sal_Int32, Color*, Color* )
+{
+return OUString(j...@bob.com); // a sophisticated view of value:
+}
+};
+}
+
+// Odd accounting for hyperlink position size etc.
+// https://bugzilla.novell.com/show_bug.cgi?id=467459
+void Test::testHyperlinkSearch()
+{
+UrlEditEngine aEngine(mpItemPool);
+EditDoc rDoc = aEngine.GetEditDoc();
+
+OUString aSampleText = Please write email to . if you find a fish(not a
dog).;
+aEngine.SetText(aSampleText);
+
+CPPUNIT_ASSERT_MESSAGE(set text, rDoc.GetParaAsString(sal_Int32(0)) ==
aSampleText);
+
+ContentNode *pNode = rDoc.GetObject(0);
+EditSelection aSel(EditPaM(pNode, 22), EditPaM(pNode, 22));
+SvxURLField aURLField(mailto:///j...@bob.com;, j...@bob.com,
+ SVXURLFORMAT_REPR);
+SvxFieldItem aField(aURLField, EE_FEATURE_FIELD);
+
+aEngine.InsertField(aSel, aField);
+aEngine.UpdateFields();
+
+OUString aContent = pNode-GetExpandedText();
+CPPUNIT_ASSERT_MESSAGE(get text, aContent ==
+ Please write email to j...@bob.com. if you find a
fish(not a dog).);
+CPPUNIT_ASSERT_MESSAGE(wrong length, rDoc.GetTextLen() ==
(sal_uLong)aContent.getLength());
+
+// Check expansion and positioning re-work
+CPPUNIT_ASSERT_MESSAGE(wrong length, pNode-GetExpandedLen() ==
+ (sal_uLong)aContent.getLength());
+for (sal_Int32 n = 0; n aContent.getLength(); n++)
+{
+sal_Int32 nStart = n, nEnd = n;
+pNode-UnExpandPositions(nStart,nEnd);
+CPPUNIT_ASSERT_MESSAGE(out of bound start, nStart pNode-Len());
+CPPUNIT_ASSERT_MESSAGE(out of bound end, nEnd = pNode-Len());
+}
+
+static const struct {
+sal_Int32 mnStart, mnEnd;
+sal_Int32 mnNewStart, mnNewEnd;
+} aTrickyOnes[] = {
+{ 0, 1, /* - */ 0, 1 },
+{ 21, 25, /* - */ 21, 23 }, // the field is really just one char
+{ 25, 27, /* - */ 22, 23 },
+{ 50, 56, /* - */ 40, 46 }
+};
+for (size_t n = 0; n SAL_N_ELEMENTS(aTrickyOnes); n++)
+{
+sal_Int32 nStart = aTrickyOnes[n].mnStart;
+sal_Int32 nEnd = aTrickyOnes[n].mnEnd;
+pNode-UnExpandPositions(nStart,nEnd);
+
+rtl::OStringBuffer aBuf;
+aBuf = bound check start is ;
+
Re: [GSoC] Copying content from one text box to another in svx/ - A failed attempt
On 07/15/2014 10:03 AM, Michael Stahl wrote: On 15/07/14 03:28, Matteo Campanelli wrote: The long string of nines looks like the result of reading freed memory in a debug build. valgrind may be able to tell you where the memory was freed, if you have the patience to wait for it. yep, something tends to overwrites freed memory with 0x99, at least in --enable-dbgutil builds. That would be ooenv's export MALLOC_PERTURB_=153 (unless you configure --disable-ooenv). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/filter/oox/revisionfragment.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 1f2d0f87e85375a86289b79dad7ed7d1b9014dc8
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Jul 29 10:33:04 2014 -0400
bnc#885548: Reset the default user to the document owner at the end.
Otherwise the user name is set to the name of the user in the last revision
record, which will be used when recording new revisions.
Change-Id: I9b5e39c3b3a85614af67f86db9ed2bb3509a9e2b
(cherry picked from commit 227d3e72b0b29b73440157b64d6fb56fa151e05e)
Reviewed-on: https://gerrit.libreoffice.org/10610
Reviewed-by: Matúš Kukan matus.ku...@collabora.com
Tested-by: Matúš Kukan matus.ku...@collabora.com
diff --git a/sc/source/filter/oox/revisionfragment.cxx
b/sc/source/filter/oox/revisionfragment.cxx
index dd8cc4b..463b663 100644
--- a/sc/source/filter/oox/revisionfragment.cxx
+++ b/sc/source/filter/oox/revisionfragment.cxx
@@ -249,6 +249,7 @@ void RevisionHeadersFragment::finalizeImport()
{
ScDocument rDoc = getScDocument();
o3tl::heap_ptrScChangeTrack pCT(new ScChangeTrack(rDoc));
+OUString aSelfUser = pCT-GetUser(); // owner of this document.
pCT-SetUseFixDateTime(true);
const oox::core::Relations rRels = getRelations();
@@ -268,6 +269,7 @@ void RevisionHeadersFragment::finalizeImport()
importOoxFragment(xFragment, *xParser);
}
+pCT-SetUser(aSelfUser); // set the default user to the document owner.
rDoc.SetChangeTrack(pCT.release());
// Turn on visibility of tracked changes.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/core/tool/token.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit a1f8f6055590330ed36fdae9d9a520d053b80923 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Jul 29 22:33:56 2014 -0400 fdo#81330: When moving to a different sheet, set 3D flag on. Change-Id: I16c6e687259635c4d0ac0e5dab0140941b409bc8 (cherry picked from commit 5e55d5ffb70437e917e4092f4030d5a454fd20d6) Reviewed-on: https://gerrit.libreoffice.org/10636 Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index f37f558..a036c5b 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -2837,6 +2837,8 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove( ScRange aOldRange = rCxt.maRange; aOldRange.Move(-rCxt.mnColDelta, -rCxt.mnRowDelta, -rCxt.mnTabDelta); +bool b3DFlag = rOldPos.Tab() != rNewPos.Tab(); + FormulaToken** p = pCode; FormulaToken** pEnd = p + static_castsize_t(nLen); for (; p != pEnd; ++p) @@ -2855,6 +2857,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove( } rRef.SetAddress(aAbs, rNewPos); +rRef.SetFlag3D(b3DFlag); } break; case svDoubleRef: @@ -2869,6 +2872,8 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove( } rRef.SetRange(aAbs, rNewPos); +if (b3DFlag) +rRef.Ref1.SetFlag3D(true); } break; case svIndex: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/tool/token.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit ca8a6d4ff366f0ad7c2da6b76f76f624c593592f Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Jul 29 22:33:56 2014 -0400 fdo#81330: When moving to a different sheet, set 3D flag on. Change-Id: I16c6e687259635c4d0ac0e5dab0140941b409bc8 (cherry picked from commit 5e55d5ffb70437e917e4092f4030d5a454fd20d6) Reviewed-on: https://gerrit.libreoffice.org/10637 Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index c289960..d392550 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -2827,6 +2827,8 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove( ScRange aOldRange = rCxt.maRange; aOldRange.Move(-rCxt.mnColDelta, -rCxt.mnRowDelta, -rCxt.mnTabDelta); +bool b3DFlag = rOldPos.Tab() != rNewPos.Tab(); + FormulaToken** p = pCode; FormulaToken** pEnd = p + static_castsize_t(nLen); for (; p != pEnd; ++p) @@ -2845,6 +2847,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove( } rRef.SetAddress(aAbs, rNewPos); +rRef.SetFlag3D(b3DFlag); } break; case svDoubleRef: @@ -2859,6 +2862,8 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove( } rRef.SetRange(aAbs, rNewPos); +if (b3DFlag) +rRef.Ref1.SetFlag3D(true); } break; case svIndex: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/undo/undobase.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b50f1343fb51baf244761c424f3bb64be8125e42 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Jul 29 17:19:28 2014 -0400 fdo#80846: Get the parameter order right. It's column, row, tab in this order, not tab, column row. Change-Id: I32e69a403feaf18532c7ac241fa2a98fc65a4ba7 (cherry picked from commit 1fcc30503549b47046c84333af542ed739f685ba) Reviewed-on: https://gerrit.libreoffice.org/10633 Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx index 6342910..bc7a5e3 100644 --- a/sc/source/ui/undo/undobase.cxx +++ b/sc/source/ui/undo/undobase.cxx @@ -170,7 +170,7 @@ public: if (!bVal) return; -ScRange aRange(mnCurTab, mnCurCol, nRow1, mnCurTab, mnCurCol, nRow2); +ScRange aRange(mnCurCol, nRow1, mnCurTab, mnCurCol, nRow2, mnCurTab); mrDoc.BroadcastCells(aRange, SC_HINT_DATACHANGED); }; }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/ui/undo/undobase.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ea67eca2ab1e3780551eadfa2d694bbd528d8ce4 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Jul 29 17:19:28 2014 -0400 fdo#80846: Get the parameter order right. It's column, row, tab in this order, not tab, column row. Change-Id: I32e69a403feaf18532c7ac241fa2a98fc65a4ba7 (cherry picked from commit 1fcc30503549b47046c84333af542ed739f685ba) Reviewed-on: https://gerrit.libreoffice.org/10632 Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx index 8a0ea2d..e723c11 100644 --- a/sc/source/ui/undo/undobase.cxx +++ b/sc/source/ui/undo/undobase.cxx @@ -173,7 +173,7 @@ public: if (!bVal) return; -ScRange aRange(mnCurTab, mnCurCol, nRow1, mnCurTab, mnCurCol, nRow2); +ScRange aRange(mnCurCol, nRow1, mnCurTab, mnCurCol, nRow2, mnCurTab); mrDoc.BroadcastCells(aRange, SC_HINT_DATACHANGED); }; }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/filter/oox/revisionfragment.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 202bbe56e23e737e36b122523678fb9be8f0282b
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Jul 29 10:33:04 2014 -0400
bnc#885548: Reset the default user to the document owner at the end.
Otherwise the user name is set to the name of the user in the last revision
record, which will be used when recording new revisions.
Change-Id: I9b5e39c3b3a85614af67f86db9ed2bb3509a9e2b
(cherry picked from commit 227d3e72b0b29b73440157b64d6fb56fa151e05e)
Reviewed-on: https://gerrit.libreoffice.org/10609
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/filter/oox/revisionfragment.cxx
b/sc/source/filter/oox/revisionfragment.cxx
index dd8cc4b..463b663 100644
--- a/sc/source/filter/oox/revisionfragment.cxx
+++ b/sc/source/filter/oox/revisionfragment.cxx
@@ -249,6 +249,7 @@ void RevisionHeadersFragment::finalizeImport()
{
ScDocument rDoc = getScDocument();
o3tl::heap_ptrScChangeTrack pCT(new ScChangeTrack(rDoc));
+OUString aSelfUser = pCT-GetUser(); // owner of this document.
pCT-SetUseFixDateTime(true);
const oox::core::Relations rRels = getRelations();
@@ -268,6 +269,7 @@ void RevisionHeadersFragment::finalizeImport()
importOoxFragment(xFragment, *xParser);
}
+pCT-SetUser(aSelfUser); // set the default user to the document owner.
rDoc.SetChangeTrack(pCT.release());
// Turn on visibility of tracked changes.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo78502.rtf | 12
sw/qa/extras/rtfimport/rtfimport.cxx |6 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx |7 ++-
3 files changed, 24 insertions(+), 1 deletion(-)
New commits:
commit 9f31376e9c55a00905da8f025083d307bc7afa42
Author: Michael Stahl mst...@redhat.com
Date: Fri Jul 18 23:40:40 2014 +0200
fdo#78502: writerfilter: RTF import: handle \u keyword inside levelnumbers
The ; terminates an entry and shall not be inserted as text,
even if some over-engineered producer encodes it as {\uc1 \u59 ?}.
Also, remove the special-casing of the \leveltext destination, since the
bugdoc does contain \uc inside it and it's not obvious why that should
be ignored.
(cherry picked from commit e93f0852477b44df986807860c821319a921b199)
fdo#78502: actually empty parameter to getParagraph() is not tested
(cherry picked from commit b9dca968c6fd0ab5ca140c65b0e54d153cd34986)
Change-Id: I1e19c9df39597cb1b22bbda97853c829d7812e29
Reviewed-on: https://gerrit.libreoffice.org/10398
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/rtfimport/data/fdo78502.rtf
b/sw/qa/extras/rtfimport/data/fdo78502.rtf
new file mode 100644
index 000..2a1baf3
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo78502.rtf
@@ -0,0 +1,12 @@
+{\rtf \ansi \ansicpg0 \deff0
+{\fonttbl {\f0 \froman \fcharset0 \fprq2 Times New Roman{\*\falt Times New
Roman};}{\f1 \fnil \fcharset134 \fprq0 {\uc1 \u23435 ?}{\uc1 \u20307 ?}{\*\falt
{\uc1 \u23435 ?}{\uc1 \u20307 ?}};}{\f2 \froman \fcharset0 \fprq0
Symbol{\*\falt Symbol};}}
+{\*\listtable
+{\list \listtemplateid300746803 \listhybrid
+{\listlevel \levelnfc23 \levelnfcn23 \leveljc0 \leveljcn0 \levelstartat1
\levelfollow0 \levelspace0 \levelindent0 \levellegal0 \levelnorestart0
{\leveltext {\uc1 \u1 ?}{\uc1 \u61623 ?}{\uc1 \u59 ?}}{\levelnumbers {\uc1 \u59
?}}\fs20 \dbch \af1 \hich \af2 \loch \f2 \li720 \lin720 \fi-360 \jclisttab
\tx720 }
+{\listlevel \levelnfc23 \levelnfcn23 \leveljc0 \leveljcn0 \levelstartat1
\levelfollow0 \levelspace0 \levelindent0 \levellegal0 \levelnorestart0
{\leveltext {\uc1 \u1 ?}{\uc1 \u61623 ?}{\uc1 \u59 ?}}{\levelnumbers {\uc1 \u59
?}}\fs20 \dbch \af1 \hich \af2 \loch \f2 \li1440 \lin1440 \fi-360 \jclisttab
\tx1440 }
+{\listlevel \levelnfc23 \levelnfcn23 \leveljc0 \leveljcn0 \levelstartat1
\levelfollow0 \levelspace0 \levelindent0 \levellegal0 \levelnorestart0
{\leveltext {\uc1 \u1 ?}{\uc1 \u61623 ?}{\uc1 \u59 ?}}{\levelnumbers {\uc1 \u59
?}}\fs20 \dbch \af1 \hich \af2 \loch \f2 \li2160 \lin2160 \fi-360 \jclisttab
\tx2160 }
+{\listname ;}
+\listid297210762 }
+}
+foo
+\par }
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 73ac0c9..ad23410 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -961,6 +961,12 @@ DECLARE_RTFIMPORT_TEST(testFdo58646line,
fdo58646line.rtf)
getParagraph(1, foo\nbar);
}
+DECLARE_RTFIMPORT_TEST(testFdo78502, fdo78502.rtf)
+{
+// ; separators were inserted as text
+getParagraph(1, foo);
+}
+
DECLARE_RTFIMPORT_TEST(testFdo58646, fdo58646.rtf)
{
// Page break was ignored inside a continous section, on title page.
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 73eb3f2..9a711d8 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3466,8 +3466,13 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
// static_cast() will do the right thing.
if ((SAL_MIN_INT16 = nParam) (nParam = SAL_MAX_UINT16))
{
+if (m_aStates.top().nDestinationState == DESTINATION_LEVELNUMBERS)
+{
+if (nParam != ';')
+m_aStates.top().aLevelNumbers.push_back(sal_Int32(nParam));
+}
+else
m_aUnicodeBuffer.append(static_castsal_Unicode(nParam));
-if (m_aStates.top().nDestinationState != DESTINATION_LEVELTEXT)
m_aStates.top().nCharsToSkip = m_aStates.top().nUc;
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - writerfilter/source
writerfilter/source/dmapper/DomainMapperTableManager.cxx |3 ---
writerfilter/source/dmapper/TablePropertiesHandler.cxx |5 -
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit ce65a47f6028879337e9e133053cc397b1b582bd
Author: Michael Stahl mst...@redhat.com
Date: Tue Jul 29 22:21:53 2014 +0200
fdo#81384: writerfilter: turn the horrible btLr cell text dir hack
... by 5 degrees to starboard, which lets the row in the bugdoc appear,
altough the height is a bit insufficient still. Why that works, is a
nautic mystery to me, i'd say this whole btLr emulation nonsense needs
to be keel-hauled, but after this patch i'll need some rum, a...
(regression from commit 0208ead70a9412ccd554fcef3e9308f8ca17037b
and commit 970160f78ef6cc7abacfa252daa8451e1f0117bb)
Change-Id: Ie0c6ec88b6d6635379b9127f6460647f14776aad
(cherry picked from commit 5893a7536a0bbce57c4a2f89680dcb4cff3d06d7)
Reviewed-on: https://gerrit.libreoffice.org/10627
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 8eaeccc..121ea21 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -357,10 +357,7 @@ bool DomainMapperTableManager::sprm(Sprm rSprm)
if (!getCellProps() ||
getCellProps()-find(PROP_VERTICAL_MERGE) == getCellProps()-end())
{
// Though in case there will be a vertical merge,
don't do this, it hides text that is supposed to be visible.
-TablePropertyMapPtr pRowPropMap( new
TablePropertyMap );
-pRowPropMap-Insert(PROP_SIZE_TYPE,
uno::makeAny(text::SizeType::FIX));
m_bRowSizeTypeInserted = true;
-insertRowProps(pRowPropMap);
}
m_bHasBtlrCell = true;
}
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index 0edbd71..64172a0 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -98,11 +98,14 @@ namespace dmapper {
DomainMapperTableManager* pManager =
dynamic_castDomainMapperTableManager*(m_pTableManager);
// In case any of the cells has the btLr cell direction,
then an explicit minimal size will just hide the whole row, don't do that.
-if (pMeasureHandler-GetRowHeightSizeType() !=
text::SizeType::MIN || !pManager || !pManager-HasBtlrCell())
+const int MINLAY = 23; // sw/inc/swtypes.hxx, minimal
possible size of frames.
+if (!pManager || !pManager-HasBtlrCell() ||
pMeasureHandler-getMeasureValue()
ConversionHelper::convertTwipToMM100(MINLAY))
{
// In case a cell already wanted fixed size, we should
not overwrite it here.
if (!pManager || !pManager-IsRowSizeTypeInserted())
pPropMap-Insert( PROP_SIZE_TYPE, uno::makeAny(
pMeasureHandler-GetRowHeightSizeType() ), false);
+else
+pPropMap-Insert( PROP_SIZE_TYPE,
uno::makeAny(text::SizeType::FIX), false);
pPropMap-Insert( PROP_HEIGHT,
uno::makeAny(pMeasureHandler-getMeasureValue() ));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - writerfilter/source
writerfilter/source/dmapper/DomainMapperTableManager.cxx |3 ---
writerfilter/source/dmapper/TablePropertiesHandler.cxx |5 -
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 546cd96371b5ae012e4f3bfe963ea299e1dcec54
Author: Michael Stahl mst...@redhat.com
Date: Tue Jul 29 22:21:53 2014 +0200
fdo#81384: writerfilter: turn the horrible btLr cell text dir hack
... by 5 degrees to starboard, which lets the row in the bugdoc appear,
altough the height is a bit insufficient still. Why that works, is a
nautic mystery to me, i'd say this whole btLr emulation nonsense needs
to be keel-hauled, but after this patch i'll need some rum, a...
(regression from commit 0208ead70a9412ccd554fcef3e9308f8ca17037b
and commit 970160f78ef6cc7abacfa252daa8451e1f0117bb)
Change-Id: Ie0c6ec88b6d6635379b9127f6460647f14776aad
(cherry picked from commit 5893a7536a0bbce57c4a2f89680dcb4cff3d06d7)
Reviewed-on: https://gerrit.libreoffice.org/10631
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 6a95be3..8271492 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -351,10 +351,7 @@ bool DomainMapperTableManager::sprm(Sprm rSprm)
if (!getCellProps() ||
getCellProps()-find(PROP_VERTICAL_MERGE) == getCellProps()-end())
{
// Though in case there will be a vertical merge,
don't do this, it hides text that is supposed to be visible.
-TablePropertyMapPtr pRowPropMap( new
TablePropertyMap );
-pRowPropMap-Insert(PROP_SIZE_TYPE,
uno::makeAny(text::SizeType::FIX));
m_bRowSizeTypeInserted = true;
-insertRowProps(pRowPropMap);
}
m_bHasBtlrCell = true;
}
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index 3aa4427..e6576e0 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -97,11 +97,14 @@ namespace dmapper {
DomainMapperTableManager* pManager =
dynamic_castDomainMapperTableManager*(m_pTableManager);
// In case any of the cells has the btLr cell direction,
then an explicit minimal size will just hide the whole row, don't do that.
-if (pMeasureHandler-GetRowHeightSizeType() !=
text::SizeType::MIN || !pManager || !pManager-HasBtlrCell())
+const int MINLAY = 23; // sw/inc/swtypes.hxx, minimal
possible size of frames.
+if (!pManager || !pManager-HasBtlrCell() ||
pMeasureHandler-getMeasureValue()
ConversionHelper::convertTwipToMM100(MINLAY))
{
// In case a cell already wanted fixed size, we should
not overwrite it here.
if (!pManager || !pManager-IsRowSizeTypeInserted())
pPropMap-Insert( PROP_SIZE_TYPE, uno::makeAny(
pMeasureHandler-GetRowHeightSizeType() ), false);
+else
+pPropMap-Insert( PROP_SIZE_TYPE,
uno::makeAny(text::SizeType::FIX), false);
pPropMap-Insert( PROP_HEIGHT,
uno::makeAny(pMeasureHandler-getMeasureValue() ));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 4a1efd50e28ed9a38820ff8e21a21475a9096ecc
Author: Joren De Cuyper jore...@libreoffice.org
Date: Wed Jul 30 00:11:51 2014 +0200
Remove redundant sal_Char *
Change-Id: I82c80134edaf34f1392d06b0bb68ff092652524b
Reviewed-on: https://gerrit.libreoffice.org/10634
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4661781..1b08aea 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6584,18 +6584,18 @@ static void impl_WriteTabElement( FSHelperPtr
pSerializer,
switch (rTab.GetAdjustment())
{
case SVX_TAB_ADJUST_RIGHT:
-pTabElementAttrList-add( FSNS( XML_w, XML_val ), OString( (sal_Char
*)right) );
+pTabElementAttrList-add( FSNS( XML_w, XML_val ), OString( right ) );
break;
case SVX_TAB_ADJUST_DECIMAL:
-pTabElementAttrList-add( FSNS( XML_w, XML_val ), OString( (sal_Char
*)decimal) );
+pTabElementAttrList-add( FSNS( XML_w, XML_val ), OString( decimal )
);
break;
case SVX_TAB_ADJUST_CENTER:
-pTabElementAttrList-add( FSNS( XML_w, XML_val ), OString( (sal_Char
*)center) );
+pTabElementAttrList-add( FSNS( XML_w, XML_val ), OString( center )
);
break;
case SVX_TAB_ADJUST_DEFAULT:
case SVX_TAB_ADJUST_LEFT:
default:
-pTabElementAttrList-add( FSNS( XML_w, XML_val ), OString( (sal_Char
*)left) );
+pTabElementAttrList-add( FSNS( XML_w, XML_val ), OString( left ) );
break;
}
@@ -6606,15 +6606,15 @@ static void impl_WriteTabElement( FSHelperPtr
pSerializer,
sal_Unicode cFillChar = rTab.GetFill();
if ('.' == cFillChar )
-pTabElementAttrList-add( FSNS( XML_w, XML_leader ), OString(
(sal_Char *) dot ) );
+pTabElementAttrList-add( FSNS( XML_w, XML_leader ), OString( dot )
);
else if ( '-' == cFillChar )
-pTabElementAttrList-add( FSNS( XML_w, XML_leader ), OString(
(sal_Char *) hyphen ) );
+pTabElementAttrList-add( FSNS( XML_w, XML_leader ), OString( hyphen
) );
else if ( sal_Unicode(0xB7) == cFillChar ) // middle dot
-pTabElementAttrList-add( FSNS( XML_w, XML_leader ), OString(
(sal_Char *) middleDot ) );
+pTabElementAttrList-add( FSNS( XML_w, XML_leader ), OString(
middleDot ) );
else if ( '_' == cFillChar )
-pTabElementAttrList-add( FSNS( XML_w, XML_leader ), OString(
(sal_Char *) underscore ) );
+pTabElementAttrList-add( FSNS( XML_w, XML_leader ), OString(
underscore ) );
else
-pTabElementAttrList-add( FSNS( XML_w, XML_leader ), OString(
(sal_Char *) none ) );
+pTabElementAttrList-add( FSNS( XML_w, XML_leader ), OString( none )
);
pSerializer-singleElementNS( XML_w, XML_tab, pTabElementAttrList );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Foss f...@openmailbox.org changed: What|Removed |Added Depends on||44621 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Foss f...@openmailbox.org changed: What|Removed |Added Depends on|44621 | -- 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] core.git: 15 commits - desktop/source include/LibreOfficeKit include/vcl libreofficekit/qa libreofficekit/source sd/source sw/inc sw/source
desktop/source/lib/init.cxx | 62 +++
include/LibreOfficeKit/LibreOfficeKit.h | 23 -
include/LibreOfficeKit/LibreOfficeKit.hxx |5 +
include/LibreOfficeKit/LibreOfficeKitGtk.h |5 +
include/vcl/ITiledRenderable.hxx| 32 +++-
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 80 +---
libreofficekit/source/gtk/lokdocview.c | 10 ++
sd/source/ui/inc/unomodel.hxx |2
sd/source/ui/unoidl/unomodel.cxx| 45 ++-
sw/inc/unotxdoc.hxx |3
sw/source/uibase/uno/unotxdoc.cxx | 15 ---
11 files changed, 242 insertions(+), 40 deletions(-)
New commits:
commit 77d083130948fa35f9f404656b8c170060e78043
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Wed Jul 30 07:33:54 2014 +0200
LokDocView: Update part selector when mode changes.
Change-Id: Ice754a46d07ce2714257c30e1aef27193b614cd3
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index c588993..9a40325 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -27,6 +27,7 @@ static int help()
static GtkWidget* pDocView;
static GtkWidget* pDocViewQuad;
static GtkWidget* pVBox;
+static GtkComboBoxText* pPartSelector;
static LibreOfficeKit* pOffice;
static char* pFileName;
@@ -121,20 +122,29 @@ void changeQuadView( GtkWidget* /*pButton*/, gpointer /*
pItem */ )
// GtkComboBox requires gtk 2.24 or later
#if ( GTK_MAJOR_VERSION == 2 GTK_MINOR_VERSION = 24 ) || GTK_MAJOR_VERSION
2
-void populatePartSelector( GtkComboBoxText* pSelector, LOKDocView* pView )
+void populatePartSelector()
{
+gtk_list_store_clear( GTK_LIST_STORE(
+ gtk_combo_box_get_model(
+ GTK_COMBO_BOX(pPartSelector) )) );
+
+if ( !pDocView )
+{
+return;
+}
+
const int nMaxLength = 50;
char sText[nMaxLength];
-int nParts = lok_docview_get_parts(pView);
+int nParts = lok_docview_get_parts( LOK_DOCVIEW(pDocView) );
for ( int i = 0; i nParts; i++ )
{
-char* pName = lok_docview_get_part_name( pView, i );
+char* pName = lok_docview_get_part_name( LOK_DOCVIEW(pDocView), i );
assert( pName );
snprintf( sText, nMaxLength, %i (%s), i+1, pName );
free( pName );
-gtk_combo_box_text_append_text( pSelector, sText );
+gtk_combo_box_text_append_text( pPartSelector, sText );
}
gtk_combo_box_set_active( GTK_COMBO_BOX(pPartSelector),
lok_docview_get_part( LOK_DOCVIEW(pDocView) ) );
@@ -174,6 +184,10 @@ void changePartMode( GtkWidget* pSelector, gpointer /*
pItem */ )
{
lok_docview_set_partmode( LOK_DOCVIEW(pDocView), ePartMode );
}
+
+// The number of items could change e.g. if we change from slide
+// to embeddede obj mode -- hence we should update the part list.
+populatePartSelector();
}
#endif
@@ -232,6 +246,8 @@ int main( int argc, char* argv[] )
gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pPartSelectorToolItem, -1 );
g_signal_connect( G_OBJECT(pComboBox), changed, G_CALLBACK(changePart),
NULL );
+pPartSelector = GTK_COMBO_BOX_TEXT(pComboBox);
+
GtkToolItem* pSeparator2 = gtk_separator_tool_item_new();
gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pSeparator2, -1);
@@ -265,7 +281,7 @@ int main( int argc, char* argv[] )
// GtkComboBox requires gtk 2.24 or later
#if ( GTK_MAJOR_VERSION == 2 GTK_MINOR_VERSION = 24 ) || GTK_MAJOR_VERSION
2
-populatePartSelector( GTK_COMBO_BOX_TEXT(pComboBox), LOK_DOCVIEW(pDocView)
);
+populatePartSelector();
populatePartModeSelector( GTK_COMBO_BOX_TEXT(pPartModeComboBox) );
#endif
commit df438e6ea260c1367fac0c2f195f1aff6311709f
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Wed Jul 30 07:33:35 2014 +0200
LokDocView: set current item for part selector.
Change-Id: Idbb3d63803bd60a182a9b8e26620d11b2d643cb6
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index a96e1e3..c588993 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -136,7 +136,8 @@ void populatePartSelector( GtkComboBoxText* pSelector,
LOKDocView* pView )
gtk_combo_box_text_append_text( pSelector, sText );
}
-gtk_combo_box_set_active( GTK_COMBO_BOX(pSelector), 0 );
+gtk_combo_box_set_active( GTK_COMBO_BOX(pPartSelector),
+ lok_docview_get_part( LOK_DOCVIEW(pDocView) ) );
}
void changePart( GtkWidget* pSelector, gpointer /* pItem */ )
commit ba520b9dbb911d32dd770f4548399b98dd80bd2c
[Libreoffice-commits] core.git: include/vcl
include/vcl/ITiledRenderable.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 56bd29136ceb32250c0acdce798be47c8f7e7b12
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Wed Jul 30 13:30:07 2014 +0200
Wrap in OUString: error: conversion from const char* to non-scalar...
Full error:
error: conversion from const char* to non-scalar type rtl::OUString
requested
This seems to be happening only where ITiledRenderable.hxx ends up being
included in an Objective C file.
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index a57053e..f07ccd5 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -76,7 +76,7 @@ public:
virtual OUString getPartName(int nPart)
{
(void) nPart;
-return ;
+return OUString();
}
virtual void setPartMode(LibreOfficeKitPartMode ePartMode)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||44621 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|44621 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: export of Calc functions to OOXML
Hi Winfried, On Wednesday, 2014-07-30 08:10:06 +0200, Winfried Donkers wrote: I note that the PODF-handling is always done when saving, regardless of the file type being saved (e.g. ods, xlsx). What do you mean? It is only done for .ods but not for .xlsx The result is that e.g. the formula GAMMADIST(1,2,5) (4th argument is optional) is always extended to GAMMADIST(1,2,5,1). Not for .xlsx Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpncCx9iusGr.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - sc/qa sc/source
sc/qa/unit/ucalc.cxx | 15 +++
sc/source/core/data/table4.cxx |1 +
sc/source/ui/inc/gridwin.hxx |2 +-
sc/source/ui/view/gridwin.cxx | 26 +-
4 files changed, 30 insertions(+), 14 deletions(-)
New commits:
commit 6e53a179bbaaba2c7ad8ad06890a94f9eaf8943a
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Jul 29 19:57:26 2014 +0200
fix wrong calculation for text size, fdo#81499
Change-Id: Ifd9e09dd9e1d843728e1874c48efdd127bffe11e
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 17b02f8..ed066b2 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -273,7 +273,7 @@ class ScGridWindow : public Window, public
DropTargetHelper, public DragSourceHe
boolGetEditUrl( const Point rPos,
OUString* pName=0, OUString* pUrl=0, OUString*
pTarget=0 );
-bool IsSpellErrorAtPos( const Point rPos, SCCOL nCol1, SCCOL nCol2, SCROW
nRow );
+bool IsSpellErrorAtPos( const Point rPos, SCCOL nCol1, SCROW nRow );
boolHitRangeFinder( const Point rMouse, RfCorner rCorner,
sal_uInt16* pIndex = NULL,
SCsCOL* pAddX = NULL, SCsROW* pAddY = NULL
);
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 5b7528c..bf777ae 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3010,7 +3010,7 @@ void ScGridWindow::Command( const CommandEvent rCEvt )
if (bSpellError)
{
// Check and see if a misspelled word is under the mouse
pointer.
-bSpellError = IsSpellErrorAtPos(aPosPixel, nColSpellError,
nCellX, nCellY);
+bSpellError = IsSpellErrorAtPos(aPosPixel, nColSpellError,
nCellY);
}
}
@@ -5334,7 +5334,7 @@ bool ScGridWindow::GetEditUrl( const Point rPos,
return false;
}
-bool ScGridWindow::IsSpellErrorAtPos( const Point rPos, SCCOL nCol1, SCCOL
nCol2, SCROW nRow )
+bool ScGridWindow::IsSpellErrorAtPos( const Point rPos, SCCOL nCol1, SCROW
nRow )
{
if (!mpSpellCheckCxt)
return false;
@@ -5359,17 +5359,6 @@ bool ScGridWindow::IsSpellErrorAtPos( const Point rPos,
SCCOL nCol1, SCCOL nCol
if (rPos.Y() aEditRect.Top())
return false;
-Rectangle aEditRect2 = pViewData-GetEditArea(eWhich, nCol2, nRow, this,
pPattern, false);
-long nWidth = aEditRect2.Right() - aEditRect.Left();
-aEditRect.setWidth(nWidth);
-
-MapMode aEditMode = pViewData-GetLogicMode(eWhich);
-Rectangle aLogicEdit = PixelToLogic(aEditRect, aEditMode);
-Point aLogicClick = PixelToLogic(rPos, aEditMode);
-
-if (!aLogicEdit.IsInside(aLogicClick))
-return false;
-
boost::shared_ptrScFieldEditEngine pEngine = createEditEngine(pDocSh,
*pPattern);
Size aPaperSize = Size(100, 100);
@@ -5380,6 +5369,17 @@ bool ScGridWindow::IsSpellErrorAtPos( const Point rPos,
SCCOL nCol1, SCCOL nCol
else
pEngine-SetText(aCell.mpString-getString());
+long nTextWidth = static_castlong(pEngine-CalcTextWidth());
+
+MapMode aEditMode = pViewData-GetLogicMode(eWhich);
+Rectangle aLogicEdit = PixelToLogic(aEditRect, aEditMode);
+Point aLogicClick = PixelToLogic(rPos, aEditMode);
+
+aLogicEdit.setWidth(nTextWidth + 1);
+
+if (!aLogicEdit.IsInside(aLogicClick))
+return false;
+
pEngine-SetControlWord(pEngine-GetControlWord() |
EE_CNTRL_ONLINESPELLING);
pEngine-SetAllMisspellRanges(*pRanges);
commit 7bff8e93eb98be4b621c3902de227a3c313cf5b4
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Jul 29 18:52:50 2014 +0200
the range has to be in the correct order, fdo#81803
Change-Id: Ia3907701857e22c11a2cefa5d35437c8f8219ff6
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 02d1664..0a90209 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1134,6 +1134,7 @@ void ScTable::FillFormulaVertical(
SCCOLROW nRowStart = -1, nRowEnd = -1;
std::vectorsc::RowSpan aSpans;
+PutInOrder(nRow1, nRow2);
for (rInner = nRow1; rInner = nRow2; ++rInner)
{
if (rInner nHiddenLast)
commit 896390d79133199910f857cf85004466171ca405
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Jul 29 18:52:14 2014 +0200
add test case for fdo#81803
Change-Id: I00c52bd1a8d949e3fd874c2dedbd9e2345aca74e
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 02950cf..ee5a0d8 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4576,6 +4576,21 @@ void Test::testAutoFill()
CPPUNIT_ASSERT_EQUAL(5.0, m_pDoc-GetValue(ScAddress(0,4,0)));
CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc-GetValue(ScAddress(0,5,0)));
+// test that filling formulas vertically up does the right thing
+
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 81803, which changed state. Bug 81803 Summary: EDITING: Cell content deleted when fill handle is used to fill formula in upward-wise direction https://bugs.freedesktop.org/show_bug.cgi?id=81803 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- 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] core.git: javaunohelper/com
javaunohelper/com/sun/star/comp/helper/Bootstrap.java |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c7c535351cec9089e232cc5cb3e59454cef27e17
Author: rbuj robert@gmail.com
Date: Wed Jul 30 10:57:19 2014 +0200
javaunohelper: String comparison
Change-Id: Ic0291e655525639b2f3cd33760d8f5f343b208f1
Reviewed-on: https://gerrit.libreoffice.org/10638
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index 6c40f7c..3bc5bde 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -199,7 +199,7 @@ public class Bootstrap {
if (! m_loaded_juh)
{
-if (System.getProperty(java.vendor) == The Android Project)
+if (The Android
Project.equals(System.getProperty(java.vendor)))
{
// Find out if we are configured with DISABLE_DYNLOADING or
// not. Try to load the lo-bootstrap shared library which
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: javaunohelper/com
javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java | 20 +
1 file changed, 9 insertions(+), 11 deletions(-)
New commits:
commit 84dbcaf91f34873d2ae02556c8a02f27401f8a5d
Author: rbuj robert@gmail.com
Date: Wed Jul 30 11:24:09 2014 +0200
javaunohelper: If statement is redundant
Change-Id: I204e3755cf07c7bb9634d02913e893179d6e81e8
Reviewed-on: https://gerrit.libreoffice.org/10640
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
index c62b005..3f84fb3 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
@@ -704,17 +704,15 @@ XMultiPropertySet
private boolean checkType(Object obj)
{
-if (obj == null
-|| obj instanceof Boolean
-|| obj instanceof Character
-|| obj instanceof Number
-|| obj instanceof String
-|| obj instanceof XInterface
-|| obj instanceof Type
-|| obj instanceof com.sun.star.uno.Enum
-|| obj.getClass().isArray())
-return true;
-return false;
+return obj == null
+|| obj instanceof Boolean
+|| obj instanceof Character
+|| obj instanceof Number
+|| obj instanceof String
+|| obj instanceof XInterface
+|| obj instanceof Type
+|| obj instanceof com.sun.star.uno.Enum
+|| obj.getClass().isArray();
}
// Param object can be an Any or other object. If obj is null then the
return value is null
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
New commits:
commit 77d2610012536fa2c31c55c3803a57c6eddd58f2
Author: Joren De Cuyper jore...@libreoffice.org
Date: Tue Jul 29 21:45:52 2014 +0200
Use OString::boolean in docxattributeoutput.cxx
Change-Id: I73b0c0ecd3ecf4e159f31e7ad9684c3e70b1ce5e
Reviewed-on: https://gerrit.libreoffice.org/10622
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 1b08aea..0ff219e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3361,13 +3361,12 @@ void DocxAttributeOutput::TableCanSplit(
ww8::WW8TableNodeInfoInner::Pointer_t p
const SwFrmFmt * pLineFmt = pTabLine-GetFrmFmt();
const SwFmtRowSplit rSplittable = pLineFmt-GetRowSplit( );
-const char* pCantSplit = ( !rSplittable.GetValue( ) ) ? true : false;
// if rSplittable is true then no need to write w:cantSplit
w:val=false/
// as default row prop is allow row to break across page.
if( !rSplittable.GetValue( ) )
-m_pSerializer-singleElementNS( XML_w, XML_cantSplit,
- FSNS( XML_w, XML_val ), pCantSplit,
- FSEND );
+m_pSerializer-singleElementNS( XML_w, XML_cantSplit,
+FSNS( XML_w, XML_val ), true,
+FSEND );
}
void DocxAttributeOutput::TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner )
@@ -6651,7 +6650,7 @@ void DocxAttributeOutput::ParaTabStop( const
SvxTabStopItem rTabStop )
void DocxAttributeOutput::ParaHyphenZone( const SvxHyphenZoneItem rHyphenZone
)
{
m_pSerializer-singleElementNS( XML_w, XML_suppressAutoHyphens,
-FSNS( XML_w, XML_val ), rHyphenZone.IsHyphen( ) ? false : true
,
+FSNS( XML_w, XML_val ), OString::boolean( !rHyphenZone.IsHyphen()
),
FSEND );
}
@@ -6669,21 +6668,21 @@ void DocxAttributeOutput::ParaNumRule_Impl( const
SwTxtNode* /*pTxtNd*/, sal_Int
void DocxAttributeOutput::ParaScriptSpace( const SfxBoolItem rScriptSpace )
{
m_pSerializer-singleElementNS( XML_w, XML_autoSpaceDE,
- FSNS( XML_w, XML_val ), rScriptSpace.GetValue( ) ? true: false,
+ FSNS( XML_w, XML_val ), OString::boolean( rScriptSpace.GetValue() ),
FSEND );
}
void DocxAttributeOutput::ParaHangingPunctuation( const SfxBoolItem rItem )
{
m_pSerializer-singleElementNS( XML_w, XML_overflowPunct,
- FSNS( XML_w, XML_val ), rItem.GetValue( ) ? true: false,
+ FSNS( XML_w, XML_val ), OString::boolean( rItem.GetValue() ),
FSEND );
}
void DocxAttributeOutput::ParaForbiddenRules( const SfxBoolItem rItem )
{
m_pSerializer-singleElementNS( XML_w, XML_kinsoku,
- FSNS( XML_w, XML_val ), rItem.GetValue( ) ? true: false,
+ FSNS( XML_w, XML_val ), OString::boolean( rItem.GetValue() ),
FSEND );
}
@@ -6717,7 +6716,7 @@ void DocxAttributeOutput::ParaVerticalAlign( const
SvxParaVertAlignItem rAlign
void DocxAttributeOutput::ParaSnapToGrid( const SvxParaGridItem rGrid )
{
m_pSerializer-singleElementNS( XML_w, XML_snapToGrid,
-FSNS( XML_w, XML_val ), rGrid.GetValue( ) ? true: false,
+FSNS( XML_w, XML_val ), OString::boolean( rGrid.GetValue() ),
FSEND );
}
@@ -7442,7 +7441,7 @@ void DocxAttributeOutput::FormatColumns_Impl( sal_uInt16
nCols, const SwFmtCol
bool bHasSep = (COLADJ_NONE != rCol.GetLineAdj());
-pColsAttrList-add( FSNS( XML_w, XML_sep ), bHasSep ? true : false );
+pColsAttrList-add( FSNS( XML_w, XML_sep ), OString::boolean( bHasSep ) );
// Write the element
m_pSerializer-startElementNS( XML_w, XML_cols, pColsAttrList );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: distro-pack-install do not install libsaxlo.so
Hi Tomáš, *,
On Mon, Jul 21, 2014 at 9:03 AM, Tomáš Chvátal tomas.chva...@gmail.com wrote:
Hello guys,
I found this out when packaging 4.3 for openSUSE and used following hack to
fix the problem:
make DESTDIR=%{buildroot} distro-pack-install
# FIXME: Hack add missing file
install -m755 instdir/program/libsaxlo.so
%{buildroot}/%{_libdir}/%{name}/program/libsaxlo.so
echo %{_libdir}/%{name}/program/libsaxlo.so file-lists/common_list.txt
That is distro-specific packaging... libsaxlo.so is included in the
libobasis{major}.{minor}-core04 packages in the universal builds.
ciao
Christian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - writerfilter/source
writerfilter/source/dmapper/FontTable.cxx |3 ---
writerfilter/source/dmapper/StyleSheetTable.cxx | 11 +++
writerfilter/source/filter/WriterFilter.cxx |2 +-
3 files changed, 4 insertions(+), 12 deletions(-)
New commits:
commit 20d08026218cf4257693c706c97030b8d518aa68
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 30 15:44:02 2014 +0200
Fix *_component_getFactory function type
Change-Id: If66efdb6a00c383ba72898f601ff3d674e153704
diff --git a/writerfilter/source/filter/WriterFilter.cxx
b/writerfilter/source/filter/WriterFilter.cxx
index d600e58..9d37117 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -45,7 +45,7 @@ static const struct ::cppu::ImplementationEntry
s_component_entries [] =
{ 0, 0, 0, 0, 0, 0 } // terminate with NULL
};
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL
writerfilter_component_getFactory(sal_Char const * implName,
::com::sun::star::lang::XMultiServiceFactory * xMgr,
::com::sun::star::registry::XRegistryKey * xRegistry )
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL
writerfilter_component_getFactory(sal_Char const * implName, void * xMgr, void
* xRegistry )
{
return ::cppu::component_getFactoryHelper(implName, xMgr, xRegistry,
s_component_entries );
}
commit a45d96e5970786528a74fd2063a6f9f25460
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 30 14:43:47 2014 +0200
Remove redundant casts to void
...leftovers from de02d221e104f74bfa595d5e6c41248093c640f3 printfs in
comments
Change-Id: I0125ac2b5ea0b4450e8f707f980959443a6c4d27
diff --git a/writerfilter/source/dmapper/FontTable.cxx
b/writerfilter/source/dmapper/FontTable.cxx
index 67c0aae..59cd5d0 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -113,9 +113,6 @@ void FontTable::lcl_sprm(Sprm rSprm)
return ;
sal_uInt32 nSprmId = rSprm.getId();
-Value::Pointer_t pValue = rSprm.getValue();
-sal_Int32 nIntValue = pValue-getInt();
-(void)nIntValue;
switch(nSprmId)
{
case NS_ooxml::LN_CT_Font_charset:
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 36f99ee..8f50037 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -411,7 +411,6 @@ void StyleSheetTable::lcl_attribute(Id Name, Value val)
if(!m_pImpl-m_pCurrentEntry)
return ;
int nIntValue = val.getInt();
-(void)nIntValue;
OUString sValue = val.getString();
// The default type is paragraph, and it needs to be processed first,
@@ -512,7 +511,6 @@ void StyleSheetTable::lcl_sprm(Sprm rSprm)
sal_uInt32 nSprmId = rSprm.getId();
Value::Pointer_t pValue = rSprm.getValue();
sal_Int32 nIntValue = pValue.get() ? pValue-getInt() : 0;
-(void)nIntValue;
OUString sStringValue = pValue.get() ? pValue-getString() : OUString();
switch(nSprmId)
@@ -1190,9 +1188,8 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr
rFontTable )
#endif
SAL_WARN(writerfilter, aMessage.getStr());
}
-catch( const uno::Exception rEx)
+catch( const uno::Exception )
{
-(void) rEx;
OSL_FAIL( Some style properties could not be
set);
}
}
@@ -1600,9 +1597,8 @@ OUString StyleSheetTable::getOrCreateCharStyle(
PropertyValueVector_t rCharProp
{
xStyleProps-setPropertyValue( aCharPropIter-Name,
aCharPropIter-Value );
}
-catch( const uno::Exception rEx )
+catch( const uno::Exception )
{
-(void)rEx;
OSL_FAIL( Exception in StyleSheetTable::getOrCreateCharStyle
- Style::setPropertyValue);
}
++aCharPropIter;
@@ -1610,9 +1606,8 @@ OUString StyleSheetTable::getOrCreateCharStyle(
PropertyValueVector_t rCharProp
xCharStyles-insertByName( sListLabel, uno::makeAny( xStyle) );
m_pImpl-m_aListCharStylePropertyVector.push_back(
ListCharStylePropertyMap_t( sListLabel, rCharProperties ));
}
-catch( const uno::Exception rEx )
+catch( const uno::Exception )
{
-(void)rEx;
OSL_FAIL( Exception in StyleSheetTable::getOrCreateCharStyle);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added Depends on||80466 --- Comment #52 from ign_christian ign_christ...@yahoo.com --- Nominating Bug 80466 : no quickstarter icon in systray (Win7), regression -- 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] core.git: Branch 'libreoffice-4-3' - svtools/source vcl/source
svtools/source/config/colorcfg.cxx |2 +-
vcl/source/app/settings.cxx|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 88f720db4ad5b0dfb922fcd2492276edd2340e62
Author: Adolfo Jayme Barrientos fit...@ubuntu.com
Date: Thu Jul 24 15:21:33 2014 -0500
Resolves fdo#79278: not too dark, not too bright background color
This patch is based on Caolán's one at
68075a61c28a5c72429f78776a822ed45fdcb4a7
I've chosen the background color used in Windows program Paint.NET as
our default background color. It's a nice compromise that doesn't look
out of place anywhere.
Change-Id: I5081201043be4a7ad6152d1ce59451daa4ece1ac
Reviewed-on: https://gerrit.libreoffice.org/10527
Reviewed-by: Stefan Knorr heinzless...@gmail.com
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
diff --git a/svtools/source/config/colorcfg.cxx
b/svtools/source/config/colorcfg.cxx
index 7a087c4..10c731c 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -418,7 +418,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
{
COL_WHITE, // DOCCOLOR
0xc0c0c0, // DOCBOUNDARIES
-0xA9A9A9, // APPBACKGROUND
+0xCFCFCF, // APPBACKGROUND
0xc0c0c0, // OBJECTBOUNDARIES
0xc0c0c0, // TABLEBOUNDARIES
COL_BLACK, // FONTCOLOR
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 97b05d0..b317b72 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -708,7 +708,7 @@ void ImplStyleData::SetStandardStyles()
maWindowTextColor = Color( COL_BLACK );
maDialogColor = Color( COL_LIGHTGRAY );
maDialogTextColor = Color( COL_BLACK );
-maWorkspaceColor= Color( 0xA9, 0xA9, 0xA9 );
+maWorkspaceColor= Color( 0xCF, 0xCF, 0xCF );
maMonoColor = Color( COL_BLACK );
maFieldColor= Color( COL_WHITE );
maFieldTextColor= Color( COL_BLACK );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: some clang plugins report bogus warnings (was: Re: GSoC Refactor god objects weekly report)
On Tuesday 29 of July 2014, Michael Stahl wrote: On 29/07/14 01:39, V wrote: The only thing bugging me is that the extern-and-not-defined plugin is not really werror compatible because it seems to warn in a lot of places. To disable it I moved into a disabled folder and told git to ignore it so I dont commit that changed, but it seems to reappear everytime I pull. interesting ... i've had the same problem with 2 of the clang plugins; at least with the clang packages on Fedora 20, they report warnings in _header_ files despite the plugins having a check that the offending statement isInMainFile() - perhaps it's some clang bug that does not occur with the clang versions the authors of the plugins used? well there is macro expansion involved in the problems i saw, argh... I think the call to isInMainFile() should not use spellingLocation, but just the location given by functionDecl-getLocation() . -- Lubos Lunak l.lu...@collabora.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang vcl/source
compilerplugins/clang/derefnullptr.cxx |2 +-
vcl/source/outdev/textline.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ff209b1446c7923c9e8675611a392c9d280d1440
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 30 16:21:17 2014 +0200
Avoid needless truncation to int
Change-Id: Ibb9088e73e3e48952ce7f2f4ec42392f7633e8a7
diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index 4e0add0..5cf5978 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -792,8 +792,8 @@ void OutputDevice::ImplDrawTextLines( SalLayout
rSalLayout, FontStrikeout eStri
else
{
Point aStartPt = rSalLayout.GetDrawPosition();
-int nWidth = rSalLayout.GetTextWidth() / rSalLayout.GetUnitsPerPixel();
-ImplDrawTextLine( aStartPt.X(), aStartPt.Y(), 0, nWidth,
+ImplDrawTextLine( aStartPt.X(), aStartPt.Y(), 0,
+ rSalLayout.GetTextWidth() /
rSalLayout.GetUnitsPerPixel(),
eStrikeout, eUnderline, eOverline, bUnderlineAbove );
}
}
commit 222c94f5a40a8bb4134b31ed6dbfb5e3913197a6
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 30 16:17:54 2014 +0200
Adapt loplugin:derefnullptr to old Clang versions
...where prior to r183883 Implement core issue 903: only integer literals
with
value 0 and prvalues of type std::nullptr_t are null pointer constants from
C++11 onwards, Expr::isNullPointerConstant with NPC_NeverValueDependent
could
go into an llvm_unreachable case.
Change-Id: I29cf093f18ece4cd83fd759e30f72c2a71f69554
diff --git a/compilerplugins/clang/derefnullptr.cxx
b/compilerplugins/clang/derefnullptr.cxx
index 5663e4f..83fa5c4 100644
--- a/compilerplugins/clang/derefnullptr.cxx
+++ b/compilerplugins/clang/derefnullptr.cxx
@@ -26,7 +26,7 @@ public:
bool DerefNullPtr::VisitUnaryDeref(UnaryOperator const * op) {
if (!ignoreLocation(op)
(op-getSubExpr()-IgnoreParenCasts()-isNullPointerConstant(
-compiler.getASTContext(),
Expr::NPC_NeverValueDependent/*TODO*/)
+compiler.getASTContext(),
Expr::NPC_ValueDependentIsNotNull/*TODO*/)
!= Expr::NPCK_NotNull))
{
report(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: some clang plugins report bogus warnings
On 07/30/2014 04:15 PM, Lubos Lunak wrote: On Tuesday 29 of July 2014, Michael Stahl wrote: On 29/07/14 01:39, V wrote: The only thing bugging me is that the extern-and-not-defined plugin is not really werror compatible because it seems to warn in a lot of places. To disable it I moved into a disabled folder and told git to ignore it so I dont commit that changed, but it seems to reappear everytime I pull. interesting ... i've had the same problem with 2 of the clang plugins; at least with the clang packages on Fedora 20, they report warnings in _header_ files despite the plugins having a check that the offending statement isInMainFile() - perhaps it's some clang bug that does not occur with the clang versions the authors of the plugins used? well there is macro expansion involved in the problems i saw, argh... I think the call to isInMainFile() should not use spellingLocation, but just the location given by functionDecl-getLocation() . I had the faint recollection that old clang::SourceManager::IsFromMainFile did require its SourceLocation argument to actually be a spelling location, and would otherwise trigger an assert in assert-enabled Clang builds. But I right now finished a build against old Clang 3.3 of full LO make check including http://cgit.freedesktop.org/libreoffice/core/commit/?id=145b0de1569229c797084040caa2386c8cf1ee4e fix for running externandnotdefined plugin on Ubuntu (i.e., no longer using spellingLocation) and at least that succeeded, so my memory may well be wrong. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source
svx/source/svdraw/svdotxed.cxx | 31 ---
1 file changed, 28 insertions(+), 3 deletions(-)
New commits:
commit 83fe0b18b0c37c859f123722d08e79fbe32e880b
Author: matteocam matteo.campane...@gmail.com
Date: Wed Jul 30 17:38:03 2014 +0300
Template of SdrTextObj actions for chaining after edit is over
Change-Id: I4b6edd5c28518d73623d2cb1fa16ee7f343eb5af
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 4c7754e..b8deb75 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -254,12 +254,29 @@ void SdrTextObj::EndTextEdit(SdrOutliner rOutl)
if(rOutl.IsModified())
{
OutlinerParaObject* pNewText = NULL;
+OutlinerParaObject* pOverflownText = NULL;
-// to make the gray field background vanish again
+// to make the gray field background vanish again
rOutl.UpdateFields();
-sal_Int32 nParaAnz = rOutl.GetParagraphCount();
-pNewText = rOutl.CreateParaObject( 0, nParaAnz );
+// FIXME(matteocam)
+if ( IsToBeChained() )
+{
+// set non overflow part of text to current box
+pNewText = rOutl.GetNotOverflowingParaObject();
+pNextText = rOutl.GetOverflowingParaObject();
+
+// XXX: should this SdrTextObj know how much text to ask by
CreateParaObject?
+// No, it must be the editengine (or outliner) to give it
since it is
+// a special case: we want to have something that may be
interrupted
+// within a paragraph itself.
+
+}
+else // standard case
+{
+sal_Int32 nParaAnz = rOutl.GetParagraphCount();
+pNewText = rOutl.CreateParaObject( 0, nParaAnz );
+}
// need to end edit mode early since SetOutlinerParaObject already
// uses GetCurrentBoundRect() which needs to take the text into account
@@ -274,6 +291,14 @@ void SdrTextObj::EndTextEdit(SdrOutliner rOutl)
nStat = ~EE_CNTRL_AUTOPAGESIZE;
rOutl.SetControlWord(nStat);
+// sets text to next box
+if (pNextText != NULL) {
+SdrTextObj *pNextTextObj = GetNextLinkInChain();
+pNextTextObj-SetOutlinerParaObject( pOverflownText );
+pNextTextObj-BegTextEdit( rOutl );
+// XXX: Also, will all those calls currently in impCopyTextInTextObj
be necessary too?
+}
+
mbInEditMode = false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sfx2/source
sfx2/source/appl/impldde.cxx | 72 ++-
1 file changed, 11 insertions(+), 61 deletions(-)
New commits:
commit b76427635b8f00ac5b3eeda4dbe77f1e6d56f29b
Author: Herbert Dürr h...@apache.org
Date: Mon Jul 14 07:17:59 2014 +
Related: #i125226# expect DDE servers to be already up
soffice is always up anyway and other DDE apps should be started manually
(cherry picked from commit e0bfdb26cef87c8d3b3435293116a33cf99c11f0)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: I52ebb26528952a4abf33ac95cb67c598f08b2790
(cherry picked from commit f4a8d7cd10cda57143b22519e16cdf8d5f19e759)
Reviewed-on: https://gerrit.libreoffice.org/10288
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 7ec637a..9fbe93d 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -198,9 +198,6 @@ bool SvDDEObject::GetData( ::com::sun::star::uno::Any
rData /*out param*/,
bool SvDDEObject::Connect( SvBaseLink * pSvLink )
{
-#if defined(WNT)
-static sal_Bool bInWinExec = sal_False;
-#endif
sal_uInt16 nLinkType = pSvLink-GetUpdateMode();
if( pConnection ) // Connection is already made
{
@@ -227,69 +224,22 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink )
pConnection = new DdeConnection( sServer, sTopic );
if( pConnection-GetError() )
{
- // Is it possible to address the system-Topic?
- // then the server is up, it just does not know the topic!
-if( sTopic.equalsIgnoreAsciiCase( SYSTEM ) )
+// check if the DDE server knows the SYSTEM topic
+bool bSysTopic = false;
+if (!sTopic.equalsIgnoreAsciiCase(SYSTEM))
{
-bool bSysTopic;
-{
-DdeConnection aTmp(sServer, OUString(SYSTEM));
-bSysTopic = !aTmp.GetError();
-}
-
-if( bSysTopic )
-{
-nError = DDELINK_ERROR_DATA;
-return false;
-}
-// otherwise in Win/WinNT, start the Application directly
+DdeConnection aTmp(sServer, OUString(SYSTEM));
+bSysTopic = !aTmp.GetError();
}
-#if defined(WNT)
-// check the suitability of starting the DDE server
-const SvtSecurityOptions aSecOpts;
-bool bForbidden = (aSecOpts.GetMacroSecurityLevel() == eNEVER_EXECUTE);
-bForbidden |= (comphelper::string::indexOfAny(sServer, L:./%\\) !=
-1);
-static const char* aBadServers[] = { cmd, rundll32 };
-for (size_t i = 0; i sizeof(aBadServers)/sizeof(*aBadServers); ++i)
-bForbidden |= sServer.equalsAscii(aBadServers[i]);
-
-// try to start the DDE server if it is not there already
-bForbidden |= (bInWinExec != false);
-if( !bForbidden )
+if( bSysTopic )
{
-OStringBuffer aCmdLine(OUStringToOString(sServer,
RTL_TEXTENCODING_ASCII_US));
-aCmdLine.append(.exe );
-aCmdLine.append(OUStringToOString(sTopic,
RTL_TEXTENCODING_ASCII_US));
-
-if( WinExec( aCmdLine.getStr(), SW_SHOWMINIMIZED ) 32 ) // TODO:
use CreateProcess() instead
-nError = DDELINK_ERROR_APP;
-else
-{
-sal_uInt16 i;
-for( i=0; i5; i++ )
-{
-bInWinExec = sal_True;
-Application::Reschedule();
-bInWinExec = sal_False;
-
-delete pConnection;
-pConnection = new DdeConnection( sServer, sTopic );
-if( !pConnection-GetError() )
-break;
-}
-
-if( i == 5 )
-{
-nError = DDELINK_ERROR_APP;
-}
-}
-}
-else
-#endif // WNT
-{
-nError = DDELINK_ERROR_APP;
+// if the system topic works then the server is up but just
doesn't know the original topic
+nError = DDELINK_ERROR_DATA;
+return false;
}
+
+nError = DDELINK_ERROR_APP;
}
if( LINKUPDATE_ALWAYS == nLinkType !pLink !pConnection-GetError() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/qa sc/source
sc/inc/column.hxx |1
sc/inc/table.hxx |5 ---
sc/qa/unit/ucalc.hxx |2 +
sc/qa/unit/ucalc_sharedformula.cxx | 56 +
sc/source/core/data/column.cxx | 27 -
sc/source/core/data/column4.cxx|3 +
sc/source/core/data/documen7.cxx | 40 +-
sc/source/core/data/table2.cxx |7
sc/source/core/data/table7.cxx | 10 ++
9 files changed, 110 insertions(+), 41 deletions(-)
New commits:
commit b2ee0235e88dc4da715b5766295ed88f27974fbd
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Jul 30 11:02:31 2014 -0400
fdo#80501: Ensure that we notify each listener only once.
Change-Id: If2ce4643ff58c7c2ba326d749698dd5196a108dc
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 1a08163..fb1eb97 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -484,7 +484,6 @@ public:
voidStartNeededListeners(); // only for cells where
NeedsListening()==true
voidSetDirtyIfPostponed();
void BroadcastRecalcOnRefMove();
-void BroadcastRefMoved( const sc::RefMovedHint rHint );
void TransferListeners( ScColumn rDestCol, SCROW nRow1, SCROW nRow2,
SCROW nRowDelta );
void CollectListeners( std::vectorSvtListener* rListeners, SCROW nRow1,
SCROW nRow2 );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 4486d42..9806a47 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -923,10 +923,7 @@ public:
*/
void BroadcastRecalcOnRefMove();
-/**
- * Broadcast all listeners of specified range that the range have moved.
- */
-void BroadcastRefMoved( const sc::RefMovedHint rHint );
+void CollectListeners( std::vectorSvtListener* rListeners, SCCOL nCol1,
SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
void TransferListeners(
ScTable rDestTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index c32fb01..e2cfc74 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -3052,33 +3052,6 @@ void ScColumn::BroadcastRecalcOnRefMove()
namespace {
-class BroadcastRefMovedHandler
-{
-const sc::RefMovedHint mrHint;
-public:
-BroadcastRefMovedHandler( const sc::RefMovedHint rHint ) : mrHint(rHint)
{}
-
-void operator() ( size_t, SvtBroadcaster* p )
-{
-p-Broadcast(mrHint);
-}
-};
-
-}
-
-void ScColumn::BroadcastRefMoved( const sc::RefMovedHint rHint )
-{
-const ScRange rRange = rHint.getRange();
-SCROW nRow1 = rRange.aStart.Row();
-SCROW nRow2 = rRange.aEnd.Row();
-
-// Notify all listeners within specified rows.
-BroadcastRefMovedHandler aFunc(rHint);
-sc::ProcessBroadcaster(maBroadcasters.begin(), maBroadcasters, nRow1,
nRow2, aFunc);
-}
-
-namespace {
-
class TransferListenersHandler
{
public:
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 131f8cc..3f26db1 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -950,6 +950,9 @@ public:
void ScColumn::CollectListeners( std::vectorSvtListener* rListeners, SCROW
nRow1, SCROW nRow2 )
{
+if (nRow2 nRow1 || !ValidRow(nRow1) || !ValidRow(nRow2))
+return;
+
ListenerCollector aFunc(rListeners);
sc::ProcessBroadcaster(maBroadcasters.begin(), maBroadcasters, nRow1,
nRow2, aFunc);
}
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index d973fc7..5a4df60f1 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -126,6 +126,22 @@ void ScDocument::BroadcastCells( const ScRange rRange,
sal_uLong nHint )
BroadcastUno(SfxSimpleHint(SC_HINT_DATACHANGED));
}
+namespace {
+
+class RefMovedNotifier : std::unary_functionSvtListener*, void
+{
+const sc::RefMovedHint mrHint;
+public:
+RefMovedNotifier( const sc::RefMovedHint rHint ) : mrHint(rHint) {}
+
+void operator() ( SvtListener* p )
+{
+p-Notify(mrHint);
+}
+};
+
+}
+
void ScDocument::BroadcastRefMoved( const sc::RefMovedHint rHint )
{
if (!pBASM)
@@ -146,6 +162,28 @@ void ScDocument::BroadcastRefMoved( const
sc::RefMovedHint rHint )
}
}
+// Collect all listeners listening into the range.
+std::vectorSvtListener* aListeners;
+for (SCTAB nTab = rSrcRange.aStart.Tab(); nTab = rSrcRange.aEnd.Tab();
++nTab)
+{
+ScTable* pTab = FetchTable(nTab);
+if (!pTab)
+continue;
+
+pTab-CollectListeners(
+aListeners,
+rSrcRange.aStart.Col(), rSrcRange.aStart.Row(),
+rSrcRange.aEnd.Col(), rSrcRange.aEnd.Row());
+}
+
+// Remove any duplicate listener entries. We must ensure that we notify
+// each unique listener only once.
+std::sort(aListeners.begin(), aListeners.end());
+
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 80501, which changed state. Bug 80501 Summary: Row Coloumn Indexes WRONG after: Select , Move - Undo by CRTL - Z https://bugs.freedesktop.org/show_bug.cgi?id=80501 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 66506, which changed state. Bug 66506 Summary: FORMATTING: Rendering date format not correct for xls and ods files in 4.1 LO https://bugs.freedesktop.org/show_bug.cgi?id=66506 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- 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] core.git: Branch 'libreoffice-4-3' - sw/qa writerfilter/source
sw/qa/core/data/ooxml/pass/fdo78904_fileHang.docx |binary
sw/qa/extras/ooxmlimport/data/fdo78904.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 11 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 23 --
4 files changed, 28 insertions(+), 6 deletions(-)
New commits:
commit 77ab92bfae9cd32f50e993e0fd8cdec4e6e4a2ff
Author: Umesh Kadam umesh.ka...@synerzip.com
Date: Fri Jun 13 17:26:19 2014 +0530
fdo#78904 : LO hangs while saving the document.
- In case of framePr attributes being omitted in original xml, LO defaults
such attributes to incorrect values.
- Correcting these values in this fix.
- This fix stops LO from getting hang while saving the document, the actual
fix needs to be somewhere in the table layout. We need to restrict the
frame from being considered as part of the table as MSO does not allow
frame to be part of a table.
Reviewed-on: https://gerrit.libreoffice.org/9774
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
(cherry picked from commit 75fc9e669f209472ec6a282848166d96d02d84d9)
This also fixes fdo#79391.
Change-Id: I4c35f7eff6ca1122901f5667fc26b849df527f60
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/qa/core/data/ooxml/pass/fdo78904_fileHang.docx
b/sw/qa/core/data/ooxml/pass/fdo78904_fileHang.docx
new file mode 100644
index 000..dce50f3
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo78904_fileHang.docx
differ
diff --git a/sw/qa/extras/ooxmlimport/data/fdo78904.docx
b/sw/qa/extras/ooxmlimport/data/fdo78904.docx
new file mode 100644
index 000..c171ae2
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo78904.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index de1e641..1dc6161 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1175,6 +1175,17 @@ DECLARE_OOXMLIMPORT_TEST(testToolsLineNumbering,
tools-line-numbering.docx)
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), nValue);
}
+DECLARE_OOXMLIMPORT_TEST(testfdo78904, fdo78904.docx)
+{
+uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
+if (xIndexAccess-getCount())
+{
+uno::Referencebeans::XPropertySet
xFrame(xIndexAccess-getByIndex(0), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(0)),
getPropertysal_Int32(xFrame, HoriOrientPosition));
+}
+}
+
DECLARE_OOXMLIMPORT_TEST(testFdo60922, fdo60922.docx)
{
// This was 0, not 100, due to wrong import of w:position w:val=0
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index bdad3b1..f6dc73e 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -42,6 +42,7 @@
#include com/sun/star/text/HoriOrientation.hpp
#include com/sun/star/text/VertOrientation.hpp
#include com/sun/star/text/ReferenceFieldPart.hpp
+#include com/sun/star/text/RelOrientation.hpp
#include com/sun/star/text/ReferenceFieldSource.hpp
#include com/sun/star/text/SizeType.hpp
#include com/sun/star/text/TextContentAnchorType.hpp
@@ -807,6 +808,8 @@ void lcl_AddRangeAndStyle(
//define some default frame width - 0cm ATM: this allow the frame to be
wrapped around the text
#define DEFAULT_FRAME_MIN_WIDTH 0
+#define DEFAULT_FRAME_MIN_HEIGHT 0
+#define DEFAULT_VALUE 0
void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
{
@@ -860,7 +863,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
pFrameProperties[1].Value =
rAppendContext.pLastParagraphProperties-Geth() 0 ?
rAppendContext.pLastParagraphProperties-Geth() :
-pStyleProperties-Geth();
+pStyleProperties-Geth() 0 ?
pStyleProperties-Geth() : DEFAULT_FRAME_MIN_HEIGHT;
pFrameProperties[2].Value = sal_Int16(
rAppendContext.pLastParagraphProperties-GethRule() = 0 ?
@@ -875,13 +878,17 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion(
)
pStyleProperties-GetxAlign() = 0 ?
pStyleProperties-GetxAlign() : text::HoriOrientation::NONE );
pFrameProperties[4].Value = nHoriOrient;
+//set a non negative default value
pFrameProperties[5].Value =
rAppendContext.pLastParagraphProperties-IsxValid() ?
-rAppendContext.pLastParagraphProperties-Getx() :
pStyleProperties-Getx();
+rAppendContext.pLastParagraphProperties-Getx() :
+
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 80849, which changed state. Bug 80849 Summary: FILESAVE: Insert Image as Link broken (PNG) https://bugs.freedesktop.org/show_bug.cgi?id=80849 What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |FIXED -- 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
Suspicious attribute style:repeat=scale
Hi all, insert an Image-control. In its properties choose a picture and set the value for the item Scale to Keep Ratio. Save the document. Look into the file text. You will find the attribute 'style:repeat=scale' in the style:graphic-properties element of the associated style. I do not find this attribute value in the ODF1.2 specification. For the attribute style:repeat only the values stretch, repeat and no-repeat are possible. Contentual such attribute value is useful. It covers the case that the picture is stretched to the size of the control while keeping the ratio of the picture. Such behavior would be useful too for background images and other fillings. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 39674] find / fix all German spellings in internal APIs
https://bugs.freedesktop.org/show_bug.cgi?id=39674 jonathan lucas jonathan.lu...@utu.fi changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #12 from jonathan lucas jonathan.lu...@utu.fi --- Hi, I would like to contribute (native German), as I just read on Micheal Meeks' blog that help is still needed. How/where can I start? Feel free to contact me! -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added Depends on|80466 | -- 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] core.git: include/sfx2
include/sfx2/objsh.hxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 85118169a5dccc3cd6f8260515f98ba3c4c91596 Author: Tor Lillqvist t...@collabora.com Date: Wed Jul 30 16:49:03 2014 +0300 ASPECT_ALL is unused Also add comment about the three sets of names for the same constants that must match. Change-Id: Id626b6f1cdaa4c2a8c391ae4f020186997ccb4d9 diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index aa767ff..3456fd8 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -74,11 +74,14 @@ class JobSetup; class Size; class Point; +// These values presumably must match exactly the corresponding +// css::embed::Aspects ones (in offapi/com/sun/star/embed/Aspects.idl) +// and the DVASPECT_* ones in the Win32 API. + #define ASPECT_CONTENT 1 #define ASPECT_THUMBNAIL2 /* 120 * 120, 6 Colors DIB in MetaFile */ #define ASPECT_ICON 4 #define ASPECT_DOCPRINT 8 -#define ASPECT_ALL (ASPECT_CONTENT | ASPECT_THUMBNAIL | ASPECT_ICON | ASPECT_DOCPRINT) // must be the same as in OLE2 #define SVOBJ_MISCSTATUS_NOTRESIZEABLE 512 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Suspicious attribute style:repeat=scale
After some Googling, I only found this: https://wiki.openoffice.org/wiki/User:Frank_Sch%C3%B6nheit/ODF_Proposals/Image_Control_Scale -- View this message in context: http://nabble.documentfoundation.org/Suspicious-attribute-style-repeat-scale-tp4117240p4117258.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] core.git: Branch 'libreoffice-4-3' - sw/uiconfig
sw/uiconfig/swriter/toolbar/previewobjectbar.xml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 995fd28f88a5122d4f649f7710501bcd752cf6b5 Author: Martin Owens docto...@gmail.com Date: Sun Jul 27 03:26:32 2014 + fdo#30425 - button should be print, not print preview Change-Id: I1b72fcc9d2134b9fb089db307d42d317017f4089 (cherry picked from commit 70599252873c3dbe03e36083ad093aedfdb8b923) diff --git a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml index 36db7df..771d40d 100644 --- a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml @@ -35,7 +35,7 @@ toolbar:toolbaritem xlink:href=.uno:ZoomMinus toolbar:helpid=10098/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:FullScreen toolbar:helpid=5627/ - toolbar:toolbaritem xlink:href=.uno:PrintPagePreview toolbar:helpid=21253/ + toolbar:toolbaritem xlink:href=.uno:Print toolbar:helpid=21253/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:ClosePreview toolbar:helpid=5325/ /toolbar:toolbar ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 30425] Making Icon Themes is Far too Difficult
https://bugs.freedesktop.org/show_bug.cgi?id=30425 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillScript TopicUi |SkillScript TopicUi |target:4.4.0|target:4.4.0 target:4.3.1 --- Comment #10 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Martin Owens committed a patch related to this issue. It has been pushed to libreoffice-4-3: http://cgit.freedesktop.org/libreoffice/core/commit/?id=995fd28f88a5122d4f649f7710501bcd752cf6b5h=libreoffice-4-3 fdo#30425 - button should be print, not print preview It will be available in LibreOffice 4.3.1. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source include/editeng include/svx svx/source
editeng/source/outliner/outliner.cxx |9 +
include/editeng/outliner.hxx |3 +++
include/svx/svdotext.hxx | 15 +++
svx/source/svdraw/svdotxed.cxx |3 ++-
4 files changed, 29 insertions(+), 1 deletion(-)
New commits:
commit 1f0d780c33958ea7b27f8c055d0c5d3fa369ae10
Author: matteocam matteo.campane...@gmail.com
Date: Wed Jul 30 21:54:36 2014 +0300
Sketched Outliner methods for (non)overflowing portions
Change-Id: If7a0295589747f99cc7a934b9dd276b414c08faa
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index 08f0b79..ff9217a 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2088,4 +2088,13 @@ bool Outliner::HasParaFlag( const Paragraph* pPara,
sal_uInt16 nFlag ) const
return pPara pPara-HasFlag( nFlag );
}
+OutlinerParaObject *Outliner::GetNonOverflowingParaObject() const
+{
+return NULL;
+}
+OutlinerParaObject *Outliner::GetOverflowingParaObject() const
+{
+return NULL;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index bcf1791..b00d8c7 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -758,6 +758,9 @@ public:
voidSetParaRemovingHdl(const Link
rLink){aParaRemovingHdl=rLink;}
LinkGetParaRemovingHdl() const { return aParaRemovingHdl; }
+OutlinerParaObject *GetNonOverflowingParaObject() const;
+OutlinerParaObject *GetOverflowingParaObject() const;
+
virtual voidDepthChangedHdl();
voidSetDepthChangedHdl(const Link
rLink){aDepthChangedHdl=rLink;}
LinkGetDepthChangedHdl() const { return aDepthChangedHdl; }
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index f0f917d..841bf54 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -346,7 +346,22 @@ public:
bool IsAutoFit() const;
/// returns true if the old feature for fitting shape content should into
shape is enabled. implies IsAutoFit()==false!
bool IsFitToSize() const;
+
+// Chaining
bool IsToBeChained() const;
+SdrTextObj *GetNextLinkInChain() const {
+/* FIXME(matteocam) return mpNextInChain; */
+if ( pPage pPage-GetObjCount() 1) {
+pNextTextObj = dynamic_cast SdrTextObj * ( pPage-GetObj(1) );
+if ( pNextTextObj == NULL)
+return NULL;
+return pNextTextObj;
+} else {
+fprintf(stderr, Make New Object please\n);
+return NULL;
+}
+}
+
SdrObjKind GetTextKind() const { return eTextKind; }
// #i121917#
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index b8deb75..af34e51 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -260,10 +260,11 @@ void SdrTextObj::EndTextEdit(SdrOutliner rOutl)
rOutl.UpdateFields();
// FIXME(matteocam)
+// TODO: move this to one level higher
if ( IsToBeChained() )
{
// set non overflow part of text to current box
-pNewText = rOutl.GetNotOverflowingParaObject();
+pNewText = rOutl.GetNonOverflowingParaObject();
pNextText = rOutl.GetOverflowingParaObject();
// XXX: should this SdrTextObj know how much text to ask by
CreateParaObject?
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Suspicious attribute style:repeat=scale
Hi Julien, julien2412 schrieb: After some Googling, I only found this: https://wiki.openoffice.org/wiki/User:Frank_Sch%C3%B6nheit/ODF_Proposals/Image_Control_Scale That proposal never arrived at OASIS. The situation is unpleasant. It would have been better, when an attribute in a private namespace had been used. But now we have this wrong value for approximately four years. We should try to get the value into ODF 1.3. Do you agree? Or does someone think, that it should be changed in LibreOffice (and AOO)? Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Add dougmencken to commiters group on gerrit
Hola, guys! Given that my patches (even trivial and obvious) are reviewed too slowly, and the special need for me to be able to test my stuff on baseline platforms (read: buildbots), and that already I made over 50 commits this year, and that I sometimes like to test other guys' stuff... Can you add me to commiters? Or at least ACL (acronym from #libreoffice-dev irc talk about this ;) --douglas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSoC] Improved Color Selection, Week 10
Hi Krisztian, the work youre doing is really impressive. I have a suggestion for a small improvement: The bevel around each color square seems superfluous. I think the palette would look cleaner without it. And I have one question. Are the dimensions of the palette variable? For example will a Gimp palette file with a Columns: 5 entry be displayed as intended? Thanks, Alexander Wilms -- View this message in context: http://nabble.documentfoundation.org/GSoC-Improved-Color-Selection-Week-10-tp4117028p4117270.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] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |9 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 11 +++
writerfilter/source/dmapper/DomainMapper_Impl.hxx |6 +-
writerfilter/source/dmapper/PropertyIds.cxx |1 +
writerfilter/source/dmapper/PropertyIds.hxx |1 +
5 files changed, 26 insertions(+), 2 deletions(-)
New commits:
commit 864d018a1a806b9861739f10649076d758af07cb
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Jul 30 21:42:01 2014 +0200
DOCX import: handle exact end of paragraph w:sdt tags
Testcase will be added when the export half of this is also in place.
Change-Id: Ic6ef8ea72a45424fcb5a473c74db9e30d6fd3be8
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index b305afd..37af96b 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -932,7 +932,10 @@ void DomainMapper::lcl_attribute(Id nName, Value val)
// It's not possible to insert the relevant property to the
character context here:
// the previous, already sent character context may be still
active, so the property would be lost.
-m_pImpl-setSdtEndDeferred(true);
+if (m_pImpl-m_pSdtHelper-isOutsideAParagraph())
+m_pImpl-setParaSdtEndDeferred(true);
+else
+m_pImpl-setSdtEndDeferred(true);
if (!m_pImpl-m_pSdtHelper-getDropDownItems().empty())
m_pImpl-m_pSdtHelper-createDropDownControl();
@@ -2607,10 +2610,14 @@ void DomainMapper::lcl_startParagraphGroup()
m_pImpl-GetTopContext()-Insert( PROP_BREAK_TYPE,
uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE) );
else if (m_pImpl-isBreakDeferred(COLUMN_BREAK))
m_pImpl-GetTopContext()-Insert( PROP_BREAK_TYPE, uno::makeAny(
com::sun::star::style::BreakType_COLUMN_BEFORE) );
+
+if (m_pImpl-isParaSdtEndDeferred())
+m_pImpl-GetTopContext()-Insert(PROP_PARA_SDT_END_BEFORE,
uno::makeAny(true), true, PARA_GRAB_BAG);
}
m_pImpl-SetIsFirstRun(true);
m_pImpl-SetIsOutsideAParagraph(false);
m_pImpl-clearDeferredBreaks();
+m_pImpl-setParaSdtEndDeferred(false);
}
void DomainMapper::lcl_endParagraphGroup()
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index dad72fa..2f5b441 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -165,6 +165,7 @@ DomainMapper_Impl::DomainMapper_Impl(
m_bIsColumnBreakDeferred( false ),
m_bIsPageBreakDeferred( false ),
m_bSdtEndDeferred(false),
+m_bParaSdtEndDeferred(false),
m_bStartTOC(false),
m_bStartTOCHeaderFooter(false),
m_bStartedTOC(false),
@@ -721,6 +722,16 @@ bool DomainMapper_Impl::isSdtEndDeferred()
return m_bSdtEndDeferred;
}
+void DomainMapper_Impl::setParaSdtEndDeferred(bool bParaSdtEndDeferred)
+{
+m_bParaSdtEndDeferred = bParaSdtEndDeferred;
+}
+
+bool DomainMapper_Impl::isParaSdtEndDeferred()
+{
+return m_bParaSdtEndDeferred;
+}
+
void lcl_MoveBorderPropertiesToFrame(comphelper::SequenceAsHashMap
rFrameProperties,
uno::Referencetext::XTextRange const xStartTextRange,
uno::Referencetext::XTextRange const xEndTextRange )
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 21c66af..e0d8259 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -331,8 +331,10 @@ private:
bool
m_bIsFirstSection;
bool
m_bIsColumnBreakDeferred;
bool
m_bIsPageBreakDeferred;
-/// If we want to set sdt end on the next character contet.
+/// If we want to set sdt end on the next character context.
bool
m_bSdtEndDeferred;
+/// If we want to set paragraph sdt end on the next paragraph context.
+bool
m_bParaSdtEndDeferred;
bool
m_bStartTOC;
bool
m_bStartTOCHeaderFooter;
/// If we got any text that is the pre-rendered result of the TOC field.
@@ -505,6 +507,8 @@ public:
void setSdtEndDeferred(bool bSdtEndDeferred);
bool isSdtEndDeferred();
+void setParaSdtEndDeferred(bool bParaSdtEndDeferred);
+bool isParaSdtEndDeferred();
[Libreoffice-commits] core.git: 4 commits - chart2/source
chart2/source/view/charttypes/GL3DBarChart.cxx | 226 -
chart2/source/view/inc/GL3DBarChart.hxx| 18 +
2 files changed, 201 insertions(+), 43 deletions(-)
New commits:
commit de674248740abbecc2a469d90aa61cba163bcd3f
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed Jul 30 21:42:54 2014 +0200
fix spelling error
Change-Id: Id9b7abfed70c33eb3cd12e0976f55be232ce3ca5
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index da0db01..6091137 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -215,7 +215,7 @@ void RenderBenchMarkThread::MoveCamera()
{
mnStep = 0;
mbExecuting = false;
-mpChart-maRenderEvent = EVENT_NON;
+mpChart-maRenderEvent = EVENT_NONE;
}
}
@@ -226,7 +226,7 @@ void RenderBenchMarkThread::MoveToDefault()
{
mnStep = 0;
mbExecuting = false;
-mpChart-maRenderEvent = EVENT_NON;
+mpChart-maRenderEvent = EVENT_NONE;
return;
}
if (!mbExecuting)
@@ -251,7 +251,7 @@ void RenderBenchMarkThread::MoveToBar()
std::mapsal_uInt32, const
GL3DBarChart::BarInformation::const_iterator itr =
mpChart-maBarMap.find(mpChart-mSelectBarId);
if(itr == mpChart-maBarMap.end())
{
-mpChart-maRenderEvent = EVENT_NON;
+mpChart-maRenderEvent = EVENT_NONE;
mpChart-maClickCond.set();
return;
}
@@ -286,7 +286,7 @@ void RenderBenchMarkThread::MoveToCorner()
void RenderBenchMarkThread::ProcessScroll()
{
//will add other process later
-mpChart-maRenderEvent = EVENT_NON;
+mpChart-maRenderEvent = EVENT_NONE;
}
@@ -348,7 +348,7 @@ GL3DBarChart::GL3DBarChart(
mbNeedsNewRender(true),
mbCameraInit(false),
mbRenderDie(false),
-maRenderEvent(EVENT_NON)
+maRenderEvent(EVENT_NONE)
{
Size aSize = mrWindow.GetSizePixel();
mpRenderer-SetSize(aSize);
@@ -622,7 +622,7 @@ void GL3DBarChart::moveToDefault()
if(BENCH_MARK_MODE)
{
// add correct handling here!!
-if (maRenderEvent != EVENT_NON)
+if (maRenderEvent != EVENT_NONE)
return;
{
@@ -663,7 +663,7 @@ void GL3DBarChart::clickedAt(const Point rPos, sal_uInt16
nButtons)
if (BENCH_MARK_MODE)
{
// add correct handling here !!
-if (maRenderEvent != EVENT_NON)
+if (maRenderEvent != EVENT_NONE)
return;
{
@@ -732,7 +732,7 @@ void GL3DBarChart::mouseDragMove(const Point rStartPos,
const Point rEndPos, s
{
long direction = rEndPos.X() - rStartPos.X();
osl::MutexGuard aGuard(maMutex);
-if (maRenderEvent == EVENT_NON)
+if (maRenderEvent == EVENT_NONE)
maRenderEvent = direction 0 ? EVENT_DRAG_RIGHT : EVENT_DRAG_LEFT;
if(direction 0)
{
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx
b/chart2/source/view/inc/GL3DBarChart.hxx
index 701d50b..1969290 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -40,7 +40,7 @@ class Camera;
enum RenderEventType
{
-EVENT_NON,
+EVENT_NONE,
EVENT_CLICK,
EVENT_MOVE_TO_DEFAULT,
EVENT_DRAG_LEFT,
commit 53cb769e2e1dd62b25787cf654b532a05b6b51b5
Author: weigao wei...@multicorewareinc.com
Date: Sat Jul 26 19:44:16 2014 +0800
add scroll animation for benchmark
Change-Id: I72416ee6bf6c314feb4c5a88742aedd515abc13b
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index cb48452..da0db01 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -189,6 +189,7 @@ private:
void MoveToBar();
void MoveToDefault();
void MoveToCorner();
+void ProcessScroll();
private:
glm::vec3 maStartPos;
glm::vec3 maEndPos;
@@ -282,6 +283,13 @@ void RenderBenchMarkThread::MoveToCorner()
MoveCamera();
}
+void RenderBenchMarkThread::ProcessScroll()
+{
+//will add other process later
+mpChart-maRenderEvent = EVENT_NON;
+}
+
+
void RenderBenchMarkThread::ProcessMouseEvent()
{
if (mpChart-maRenderEvent == EVENT_CLICK)
@@ -296,6 +304,10 @@ void RenderBenchMarkThread::ProcessMouseEvent()
{
MoveToCorner();
}
+else if (mpChart-maRenderEvent == EVENT_SCROLL)
+{
+ProcessScroll();
+}
}
void RenderBenchMarkThread::execute()
@@ -798,6 +810,8 @@ void GL3DBarChart::scroll(long nDelta)
glm::vec3 maDir = glm::normalize(maCameraPosition - maCameraDirection);
maCameraPosition -= (float((nDelta/10)) * maDir);
mpCamera-setPosition(maCameraPosition);
+if(BENCH_MARK_MODE)
+maRenderEvent = EVENT_SCROLL;
}
update();
commit 8828dbfa0870cb834efda035bc5e041a1434166b
Author: weigao
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-colors' - 2 commits - include/svx svx/source
include/svx/PaletteManager.hxx | 15 -
svx/source/tbxctrls/PaletteManager.cxx | 50 -
svx/source/tbxctrls/tbcontrl.cxx | 17 ++-
3 files changed, 54 insertions(+), 28 deletions(-)
New commits:
commit d1cd50957750a534d6ec1ba8a21bca1e3b8fe931
Author: Krisztian Pinter pin.termina...@gmail.com
Date: Wed Jul 30 19:45:37 2014 +0200
Change vectorPalette* to ptr_vectorPalette
Change-Id: I1f2832235e8d2ea3517efdce809970ed5f1c6769
diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx
index 9d40d48..e4144f9 100644
--- a/include/svx/PaletteManager.hxx
+++ b/include/svx/PaletteManager.hxx
@@ -25,12 +25,14 @@
#include svx/tbxcolorupdate.hxx
#include tools/urlobj.hxx
+#include comphelper/processfactory.hxx
#include com/sun/star/util/XURLTransformer.hpp
#include com/sun/star/util/URLTransformer.hpp
#include com/sun/star/frame/XDispatch.hpp
#include com/sun/star/frame/Desktop.hpp
#include com/sun/star/frame/XDispatchProvider.hpp
-#include comphelper/processfactory.hxx
+
+#include boost/ptr_container/ptr_vector.hpp
class PaletteManager
{
@@ -41,7 +43,7 @@ class PaletteManager
svx::ToolboxButtonColorUpdater* mpBtnUpdater;
Color mLastColor;
-std::vectorPalette* maPalettes;
+boost::ptr_vectorPalette maPalettes;
public:
PaletteManager();
~PaletteManager();
diff --git a/svx/source/tbxctrls/PaletteManager.cxx
b/svx/source/tbxctrls/PaletteManager.cxx
index da80f23..98ae0b2 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -41,20 +41,14 @@ PaletteManager::PaletteManager() :
PaletteManager::~PaletteManager()
{
-for( std::vectorPalette*::iterator it = maPalettes.begin();
- it != maPalettes.end();
- ++it)
-{
-delete *it;
-}
}
void PaletteManager::LoadPalettes()
{
+maPalettes.clear();
OUString aPalPath = SvtPathOptions().GetPalettePath();
osl::Directory aDir(aPalPath);
-maPalettes.clear();
osl::DirectoryItem aDirItem;
osl::FileStatus aFileStat( osl_FileStatus_Mask_FileName |
osl_FileStatus_Mask_FileURL |
@@ -116,7 +110,7 @@ void PaletteManager::ReloadColorSet(SvxColorValueSet
rColorSet)
}
else
{
-maPalettes[mnCurrentPalette-1]-LoadColorSet( rColorSet );
+maPalettes[mnCurrentPalette-1].LoadColorSet( rColorSet );
mnColorCount = rColorSet.GetItemCount();
}
}
@@ -127,11 +121,11 @@ std::vectorOUString PaletteManager::GetPaletteList()
aPaletteNames.push_back( STR_DEFAULT_PAL );
-for( std::vectorPalette*::iterator it = maPalettes.begin();
+for( boost::ptr_vectorPalette::iterator it = maPalettes.begin();
it != maPalettes.end();
++it)
{
-aPaletteNames.push_back( (*it)-GetName() );
+aPaletteNames.push_back( (*it).GetName() );
}
aPaletteNames.push_back( STR_DOC_COLORS );
@@ -161,7 +155,7 @@ OUString PaletteManager::GetPaletteName()
else if( mnCurrentPalette == mnNumOfPalettes - 1 )
return OUString( STR_DOC_COLORS );
else
-return maPalettes[mnCurrentPalette - 1]-GetName();
+return maPalettes[mnCurrentPalette - 1].GetName();
}
const Color PaletteManager::GetLastColor()
commit 0e72d33fca02f4eb965dd49a26f1a6f610196175
Author: Krisztian Pinter pin.termina...@gmail.com
Date: Wed Jul 30 17:15:49 2014 +0200
Make color picker apply color immediately
Change-Id: I38695a43ced63bd5207b631a072231d81aa7e0f9
diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx
index 1bd0bd1..9d40d48 100644
--- a/include/svx/PaletteManager.hxx
+++ b/include/svx/PaletteManager.hxx
@@ -24,6 +24,14 @@
#include rtl/ustring.hxx
#include svx/tbxcolorupdate.hxx
+#include tools/urlobj.hxx
+#include com/sun/star/util/XURLTransformer.hpp
+#include com/sun/star/util/URLTransformer.hpp
+#include com/sun/star/frame/XDispatch.hpp
+#include com/sun/star/frame/Desktop.hpp
+#include com/sun/star/frame/XDispatchProvider.hpp
+#include comphelper/processfactory.hxx
+
class PaletteManager
{
sal_uInt16 mnNumOfPalettes;
@@ -48,7 +56,8 @@ public:
const Color GetLastColor();
voidSetLastColor(const Color rLastColor);
voidSetBtnUpdater(svx::ToolboxButtonColorUpdater* pBtnUpdater);
-voidPopupColorPicker();
+voidPopupColorPicker(const OUString aCommand);
+static void DispatchColorCommand(const OUString aCommand, const Color
aColor);
};
#endif // INCLUDED_SVX_PALETTEMANAGER_HXX
diff --git a/svx/source/tbxctrls/PaletteManager.cxx
b/svx/source/tbxctrls/PaletteManager.cxx
index 95485ce..da80f23 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -21,7 +21,7 @@
#include osl/file.hxx
#include unotools/pathoptions.hxx
#include sfx2/objsh.hxx
-#include svx/drawitem.hxx
+#include
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/model.xml | 60 ++-- 1 file changed, 30 insertions(+), 30 deletions(-) New commits: commit 4131e8b63ba96ef3bc6a41daa6020262f6af5415 Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Jul 30 21:59:26 2014 +0200 writerfilter: remove unused namespace-alias id= attributes They are confusing and not used in practice: modelpreprocess.py always sets the id to a numeric value anyway. Change-Id: I5bdfd001bc0fe7ee376e2fe27fefecc3613bd1ab diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 0a5881b..83c2b01 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -17,36 +17,36 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- model xmlns:rng=http://relaxng.org/ns/structure/1.0; - namespace-alias name=http://www.w3.org/XML/1998/namespace; alias=xml id=xml/ - namespace-alias name=http://schemas.openxmlformats.org/officeDocument/2006/relationships; alias=relationships id=officeRel/ - namespace-alias name=http://purl.oclc.org/ooxml/officeDocument/relationships; alias=relationships id=officeRel/ - namespace-alias name=urn:schemas-microsoft-com:office:office alias=office id=vmlOffice/ - namespace-alias name=http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme; alias=theme id=officeRelTheme/ - namespace-alias name=http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing; alias=wordprocessingDrawing id=dmlWordDr/ - namespace-alias name=http://purl.oclc.org/ooxml/drawingml/wordprocessingDrawing; alias=wordprocessingDrawing id=dmlWordDr/ - namespace-alias name=http://schemas.openxmlformats.org/drawingml/2006/main; alias=drawingml id=dml/ - namespace-alias name=http://purl.oclc.org/ooxml/drawingml/main; alias=drawingml id=dml/ - namespace-alias name=urn:schemas-microsoft-com:vml alias=vml id=vml/ - namespace-alias name=http://schemas.openxmlformats.org/drawingml/2006/picture; alias=picture id=dmlPicture/ - namespace-alias name=http://purl.oclc.org/ooxml/drawingml/picture; alias=picture id=dmlPicture/ - namespace-alias name=http://schemas.openxmlformats.org/drawingml/2006/diagram; alias=diagram id=dmlDiagram/ - namespace-alias name=http://purl.oclc.org/ooxml/drawingml/diagram; alias=diagram id=dmlDiagram/ - namespace-alias name=http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas; alias=lockedCanvas id=dmlLockedCanvas/ - namespace-alias name=http://purl.oclc.org/ooxml/drawingml/lockedCanvas; alias=lockedCanvas id=dmlLockedCanvas/ - namespace-alias name=http://schemas.microsoft.com/office/word/2010/wordprocessingShape; alias=wps id=wps/ - namespace-alias name=http://schemas.microsoft.com/office/word/2010/wordprocessingGroup; alias=wpg id=wpg/ - namespace-alias name=http://schemas.openxmlformats.org/drawingml/2006/chart; alias=chart id=dmlChart/ - namespace-alias name=http://purl.oclc.org/ooxml/drawingml/chart; alias=chart id=dmlChart/ - namespace-alias name=urn:schemas-microsoft-com:office:word alias=vml_wordprocessingDrawing id=vmlWord/ - namespace-alias name=http://schemas.openxmlformats.org/wordprocessingml/2006/main; alias=wordprocessingml id=doc/ - namespace-alias name=http://purl.oclc.org/ooxml/wordprocessingml/main; alias=wordprocessingml id=doc/ - namespace-alias name=http://schemas.openxmlformats.org/officeDocument/2006/math; alias=math id=officeMath/ - namespace-alias name=http://purl.oclc.org/ooxml/officeDocument/math; alias=math id=officeMath/ - namespace-alias name=http://schemas.openxmlformats.org/schemaLibrary/2006/main; alias=schemaLibrary id=schema/ - namespace-alias name=http://schemas.openxmlformats.org/markup-compatibility/2006; alias=mce id=mce/ - namespace-alias name=http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing; alias=wp14 id=wp14/ - namespace-alias name=http://schemas.microsoft.com/office/word/2010/wordml; alias=w14 id=w14/ - namespace-alias name=http://schemas.microsoft.com/office/drawing/2010/main; alias=a14 id=a14/ + namespace-alias name=http://www.w3.org/XML/1998/namespace; alias=xml/ + namespace-alias name=http://schemas.openxmlformats.org/officeDocument/2006/relationships; alias=relationships/ + namespace-alias name=http://purl.oclc.org/ooxml/officeDocument/relationships; alias=relationships/ + namespace-alias name=urn:schemas-microsoft-com:office:office alias=office/ + namespace-alias name=http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme; alias=theme/ + namespace-alias name=http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing; alias=wordprocessingDrawing/ + namespace-alias name=http://purl.oclc.org/ooxml/drawingml/wordprocessingDrawing; alias=wordprocessingDrawing/ + namespace-alias name=http://schemas.openxmlformats.org/drawingml/2006/main; alias=drawingml/ + namespace-alias
[Libreoffice-commits] core.git: icon-themes/tango sw/uiconfig
icon-themes/tango/links.txt |8 sw/uiconfig/swriter/toolbar/findbar.xml |3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) New commits: commit 21bd05d61febe5e99df790fdad572ec731a15213 Author: Samuel Mehrbrodt s.mehrbr...@gmail.com Date: Tue Jul 29 17:21:53 2014 +0200 Improve Navigate by layout Implemented some suggestions from https://freedomsponsors.org/issue/391/navigation-button-icon-does-not-scale-and-gets-cut-off#comment-917 * Place the up/down arrows on the right of the button * Use up/down arrows instead of right/left * Added a separator between the navigation buttons and the search label Change-Id: I509756db2fc0c1f60a6b1d6f14e6ed9299d7e597 Reviewed-on: https://gerrit.libreoffice.org/10613 Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt index f4d5945..d20bfe0 100644 --- a/icon-themes/tango/links.txt +++ b/icon-themes/tango/links.txt @@ -262,20 +262,20 @@ res/lc06301.png cmd/lc_navigateback.png cmd/lc_browsebackward.png cmd/lc_navigateback.png cmd/lc_previouspage.png cmd/lc_navigateback.png cmd/lc_pageup.png cmd/lc_navigateback.png -cmd/lc_scrolltoprevious.png cmd/lc_navigateback.png +cmd/lc_scrolltoprevious.png cmd/lc_upsearch.png svtools/res/back_large.png cmd/lc_navigateback.png res/sc06301.png cmd/sc_navigateback.png cmd/sc_browsebackward.png cmd/sc_navigateback.png cmd/sc_previouspage.png cmd/sc_navigateback.png cmd/sc_pageup.png cmd/sc_navigateback.png -cmd/sc_scrolltoprevious.png cmd/sc_navigateback.png +cmd/sc_scrolltoprevious.png cmd/sc_upsearch.png svtools/res/back_small.png cmd/sc_navigateback.png -cmd/lc_scrolltonext.png cmd/lc_navigateforward.png +cmd/lc_scrolltonext.png cmd/lc_downsearch.png cmd/lc_browseforward.png cmd/lc_navigateforward.png cmd/lc_pagedown.png cmd/lc_navigateforward.png cmd/lc_nextpage.png cmd/lc_navigateforward.png res/lc06300.png cmd/lc_navigateforward.png -cmd/sc_scrolltonext.png cmd/sc_navigateforward.png +cmd/sc_scrolltonext.png cmd/sc_downsearch.png cmd/sc_browseforward.png cmd/sc_navigateforward.png cmd/sc_pagedown.png cmd/sc_navigateforward.png cmd/sc_nextpage.png cmd/sc_navigateforward.png diff --git a/sw/uiconfig/swriter/toolbar/findbar.xml b/sw/uiconfig/swriter/toolbar/findbar.xml index f0c1854..f6dfa42 100644 --- a/sw/uiconfig/swriter/toolbar/findbar.xml +++ b/sw/uiconfig/swriter/toolbar/findbar.xml @@ -27,8 +27,9 @@ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ toolbar:toolbarseparator/ - toolbar:toolbaritem xlink:href=.uno:ScrollToPrevious/ toolbar:toolbaritem xlink:href=.uno:NavigationPopup/ toolbar:toolbaritem xlink:href=.uno:ScrollToNext/ + toolbar:toolbaritem xlink:href=.uno:ScrollToPrevious/ + toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchLabel/ /toolbar:toolbar ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Suspicious attribute style:repeat=scale
On 30/07/14 21:28, Regina Henschel wrote:
Hi Julien,
julien2412 schrieb:
After some Googling, I only found this:
https://wiki.openoffice.org/wiki/User:Frank_Sch%C3%B6nheit/ODF_Proposals/Image_Control_Scale
That proposal never arrived at OASIS.
The situation is unpleasant. It would have been better, when an
attribute in a private namespace had been used. But now we have this
wrong value for approximately four years.
We should try to get the value into ODF 1.3. Do you agree? Or does
someone think, that it should be changed in LibreOffice (and AOO)?
you are right, regrettably this proposal never made it here:
https://wiki.oasis-open.org/office/List_of_Proposals
i agree it would be best to get this proposal into ODF 1.3.
xmloff/source/forms/formenums.cxx:{ XML_SCALE,
ImageScaleMode::ISOTROPIC },
the code apparently came in with this commit:
commit 7a5d79f2297a43d0a854e304b0792164272edfe0
Author: Release Engineers rel...@openoffice.org
AuthorDate: Mon Dec 1 12:31:27 2008 +
Commit: Release Engineers rel...@openoffice.org
CommitDate: Mon Dec 1 12:31:27 2008 +
CWS-TOOLING: integrate CWS dba31e
2008-11-19 12:36:23 +0100 msc r263980 : i96104
2008-11-19 12:31:19 +0100 msc r263979 : i96104
2008-11-19 12:21:55 +0100 msc r263977 : i96104
2008-11-19 12:18:53 +0100 msc r263976 : i96104
2008-11-18 09:09:45 +0100 oj r263746 : disable color entry when area is
set
2008-11-18 08:37:52 +0100 oj r263741 : #remove sub report entry
2008-11-17 11:20:25 +0100 fs r263708 : #i1#
2008-11-17 11:06:52 +0100 fs r263706 : minimal version now is 3.1
2008-11-12 22:25:59 +0100 fs r263621 : #i96150#
2008-11-12 22:20:02 +0100 fs r263620 : rebased to m34
2008-11-12 21:39:41 +0100 fs r263618 : MANUAL REBASE: rebase CWS dba31d
to DEV300_m34
2008-11-12 13:54:58 +0100 fs r263597 : #i96134# MediaDescriptor.URL is
to be preferred over MediaDescriptor.FileName. Nonetheless, ensure both are
handled
2008-11-12 13:53:40 +0100 fs r263596 : #i96134# re-enabled the code for
#i41897#, a better fix is to come
2008-11-12 12:48:21 +0100 fs r263585 : #i96134# disable saving URLs of
file-base databases relatively
2008-11-11 16:11:11 +0100 msc r263566 : #i96104#
2008-11-05 09:09:47 +0100 oj r263342 : #i88727# color noe added
2008-11-05 08:41:43 +0100 oj r263341 : #i77916# zoom added
2008-11-04 21:24:15 +0100 fs r263339 : disposing: call disposeAndClear
with out own mutex locked - some of our listeners insist on locking the
SolarMutex, which sometimes led to deadlocks on the complex test cases
2008-11-04 21:23:15 +0100 fs r263338 : remove SolarMutex locking - this
happned in CWS dba31c (in the CVS version), which this CWS was created from,
but seems to got lost during resync
2008-11-04 20:49:50 +0100 fs r263335 : docu formatting
2008-11-04 20:06:39 +0100 fs r263334 : #i95826# use m_aMutex, not a
DocumentGuard (wrongly resolved merge conflicts)
2008-11-04 17:36:29 +0100 fs r263332 : #i92688# properly revoke as
XEventListener from m_xActiveController when disposing
2008-11-04 14:49:34 +0100 fs r263324 : #i92322# enable Input Required if
EmptyIsNULL does not exist at the control
2008-10-31 11:10:04 +0100 oj r262857 : merge from cvs to svn
2008-10-31 09:46:45 +0100 oj r262853 : merge from cvs to svn
2008-10-31 08:46:37 +0100 oj r262849 : merge from cvs to svn
2008-10-31 08:44:24 +0100 oj r262848 : merge from cvs to svn
2008-10-31 08:43:33 +0100 oj r262847 : merge from cvs to svn
2008-10-31 08:42:28 +0100 oj r262846 : merge from cvs to svn
2008-10-31 08:41:58 +0100 oj r262845 : merge from cvs to svn
2008-10-31 08:41:32 +0100 oj r262844 : merge from cvs to svn
2008-10-28 12:19:50 +0100 oj r262733 : #iX#: migrate CWS dba31e to
SVN
2008-10-28 12:19:42 +0100 oj r262732 : #iX#: migrate CWS dba31e to
SVN
2008-10-28 12:19:36 +0100 oj r262731 : #iX#: migrate CWS dba31e to
SVN
2008-10-28 12:19:31 +0100 oj r262730 : #iX#: migrate CWS dba31e to
SVN
2008-10-28 12:19:22 +0100 oj r262729 : #iX#: migrate CWS dba31e to
SVN
2008-10-28 12:19:18 +0100 oj r262728 : #iX#: migrate CWS dba31e to
SVN
2008-10-28 12:19:10 +0100 oj r262727 : #iX#: migrate CWS dba31e to
SVN
2008-10-28 12:19:06 +0100 oj r262726 : #iX#: migrate CWS dba31e to
SVN
2008-10-28 12:19:05 +0100 oj r262725 : #iX#: migrate CWS dba31e to
SVN
2008-10-28 12:19:01 +0100 oj r262724 : #iX#: migrate CWS dba31e to
SVN
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - icon-themes/tango sw/uiconfig
icon-themes/tango/links.txt |8 sw/uiconfig/swriter/toolbar/findbar.xml |3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) New commits: commit 656899bb7b9653052d18b9e68dc7be112820431c Author: Samuel Mehrbrodt s.mehrbr...@gmail.com Date: Tue Jul 29 17:21:53 2014 +0200 Improve Navigate by layout Implemented some suggestions from https://freedomsponsors.org/issue/391/navigation-button-icon-does-not-scale-and-gets-cut-off#comment-917 * Place the up/down arrows on the right of the button * Use up/down arrows instead of right/left * Added a separator between the navigation buttons and the search label Change-Id: I509756db2fc0c1f60a6b1d6f14e6ed9299d7e597 Reviewed-on: https://gerrit.libreoffice.org/10613 Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com (cherry picked from commit 21bd05d61febe5e99df790fdad572ec731a15213) Reviewed-on: https://gerrit.libreoffice.org/10652 diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt index 6ea6ddc..3fbac61 100644 --- a/icon-themes/tango/links.txt +++ b/icon-themes/tango/links.txt @@ -243,20 +243,20 @@ res/lc06301.png cmd/lc_navigateback.png cmd/lc_browsebackward.png cmd/lc_navigateback.png cmd/lc_previouspage.png cmd/lc_navigateback.png cmd/lc_pageup.png cmd/lc_navigateback.png -cmd/lc_scrolltoprevious.png cmd/lc_navigateback.png +cmd/lc_scrolltoprevious.png cmd/lc_upsearch.png svtools/res/back_large.png cmd/lc_navigateback.png res/sc06301.png cmd/sc_navigateback.png cmd/sc_browsebackward.png cmd/sc_navigateback.png cmd/sc_previouspage.png cmd/sc_navigateback.png cmd/sc_pageup.png cmd/sc_navigateback.png -cmd/sc_scrolltoprevious.png cmd/sc_navigateback.png +cmd/sc_scrolltoprevious.png cmd/sc_upsearch.png svtools/res/back_small.png cmd/sc_navigateback.png -cmd/lc_scrolltonext.png cmd/lc_navigateforward.png +cmd/lc_scrolltonext.png cmd/lc_downsearch.png cmd/lc_browseforward.png cmd/lc_navigateforward.png cmd/lc_pagedown.png cmd/lc_navigateforward.png cmd/lc_nextpage.png cmd/lc_navigateforward.png res/lc06300.png cmd/lc_navigateforward.png -cmd/sc_scrolltonext.png cmd/sc_navigateforward.png +cmd/sc_scrolltonext.png cmd/sc_downsearch.png cmd/sc_browseforward.png cmd/sc_navigateforward.png cmd/sc_pagedown.png cmd/sc_navigateforward.png cmd/sc_nextpage.png cmd/sc_navigateforward.png diff --git a/sw/uiconfig/swriter/toolbar/findbar.xml b/sw/uiconfig/swriter/toolbar/findbar.xml index f0c1854..f6dfa42 100644 --- a/sw/uiconfig/swriter/toolbar/findbar.xml +++ b/sw/uiconfig/swriter/toolbar/findbar.xml @@ -27,8 +27,9 @@ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ toolbar:toolbarseparator/ - toolbar:toolbaritem xlink:href=.uno:ScrollToPrevious/ toolbar:toolbaritem xlink:href=.uno:NavigationPopup/ toolbar:toolbaritem xlink:href=.uno:ScrollToNext/ + toolbar:toolbaritem xlink:href=.uno:ScrollToPrevious/ + toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SearchLabel/ /toolbar:toolbar ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 Jorendc jore...@libreoffice.org changed: What|Removed |Added Depends on||81756 --- Comment #4 from Jorendc jore...@libreoffice.org --- Hereby I nominate Bug 81756 - Crasher in Format:Page... menu item. Mac OSX only so far. -- 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] core.git: sc/source
sc/source/ui/condformat/condformatdlg.cxx | 36 +
sc/source/ui/condformat/condformatdlgentry.cxx | 25 +
sc/source/ui/inc/condformatdlg.hxx |5 ++-
sc/source/ui/inc/condformatdlgentry.hxx| 10 --
4 files changed, 42 insertions(+), 34 deletions(-)
New commits:
commit fe5463fb7bc740bfec5d2eb7408b8ff3624d8c31
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Jul 30 23:29:26 2014 +0200
the dialog hierarchy changed iwith the ui format, fdo#81867
We need to be explicit now and can no longer rely on GetParent returning
the right object. Seems like sometimes you get punished for an ugly hack
a bit later than expected.
Change-Id: I145e97ae0ceee741c4128c29a6ca26fad2178cb5
diff --git a/sc/source/ui/condformat/condformatdlg.cxx
b/sc/source/ui/condformat/condformatdlg.cxx
index fd4efc5..f5cbf34 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -46,9 +46,11 @@ ScCondFormatList::ScCondFormatList(Window* pParent, WinBits
nStyle)
SetBackground(GetControlBackground());
}
-void ScCondFormatList::init(ScDocument* pDoc, const ScConditionalFormat*
pFormat,
-const ScRangeList rRanges, const ScAddress rPos,
condformat::dialog::ScCondFormatDialogType eType)
+void ScCondFormatList::init(ScDocument* pDoc, ScCondFormatDlg* pDialogParent,
+const ScConditionalFormat* pFormat, const ScRangeList rRanges,
+const ScAddress rPos, condformat::dialog::ScCondFormatDialogType
eType)
{
+mpDialogParent = pDialogParent;
mpDoc = pDoc;
maPos = rPos;
maRanges = rRanges;
@@ -65,9 +67,9 @@ void ScCondFormatList::init(ScDocument* pDoc, const
ScConditionalFormat* pFormat
{
const ScCondFormatEntry* pConditionEntry =
static_castconst ScCondFormatEntry*( pEntry );
if(pConditionEntry-GetOperation() != SC_COND_DIRECT)
-maEntries.push_back(new ScConditionFrmtEntry(
this, mpDoc, maPos, pConditionEntry ) );
+maEntries.push_back(new ScConditionFrmtEntry(
this, mpDoc, pDialogParent, maPos, pConditionEntry ) );
else
-maEntries.push_back(new ScFormulaFrmtEntry( this,
mpDoc, maPos, pConditionEntry ) );
+maEntries.push_back(new ScFormulaFrmtEntry( this,
mpDoc, pDialogParent, maPos, pConditionEntry ) );
}
break;
@@ -99,7 +101,7 @@ void ScCondFormatList::init(ScDocument* pDoc, const
ScConditionalFormat* pFormat
switch(eType)
{
case condformat::dialog::CONDITION:
-maEntries.push_back(new ScConditionFrmtEntry( this, mpDoc,
maPos ));
+maEntries.push_back(new ScConditionFrmtEntry( this, mpDoc,
pDialogParent, maPos ));
break;
case condformat::dialog::COLORSCALE:
maEntries.push_back(new ScColorScale3FrmtEntry( this, mpDoc,
maPos ));
@@ -258,7 +260,7 @@ IMPL_LINK(ScCondFormatList, ColFormatTypeHdl, ListBox*,
pBox)
default:
break;
}
-static_castScCondFormatDlg*(GetParent())-InvalidateRefData();
+mpDialogParent-InvalidateRefData();
itr-SetActive();
RecalcAll();
return 0;
@@ -302,23 +304,23 @@ IMPL_LINK(ScCondFormatList, AfterTypeListHdl, ListBox*,
pBox)
return 0;
}
maEntries.replace( itr, new ScColorScale3FrmtEntry(this, mpDoc,
maPos));
-static_castScCondFormatDlg*(GetParent())-InvalidateRefData();
+mpDialogParent-InvalidateRefData();
itr-SetActive();
break;
case 1:
if(itr-GetType() == condformat::entry::CONDITION)
return 0;
-maEntries.replace( itr, new ScConditionFrmtEntry(this, mpDoc,
maPos));
-static_castScCondFormatDlg*(GetParent())-InvalidateRefData();
+maEntries.replace( itr, new ScConditionFrmtEntry(this, mpDoc,
mpDialogParent, maPos));
+mpDialogParent-InvalidateRefData();
itr-SetActive();
break;
case 2:
if(itr-GetType() == condformat::entry::FORMULA)
return 0;
-maEntries.replace( itr, new ScFormulaFrmtEntry(this, mpDoc,
maPos));
-static_castScCondFormatDlg*(GetParent())-InvalidateRefData();
+maEntries.replace( itr, new ScFormulaFrmtEntry(this, mpDoc,
mpDialogParent, maPos));
+mpDialogParent-InvalidateRefData();
itr-SetActive();
break;
case 3:
@@ -326,7 +328,7 @@ IMPL_LINK(ScCondFormatList, AfterTypeListHdl, ListBox*,
pBox)
return 0;
maEntries.replace( itr, new ScDateFrmtEntry( this, mpDoc ));
-
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/ui/condformat/condformatdlg.cxx | 36 +
sc/source/ui/condformat/condformatdlgentry.cxx | 25 +
sc/source/ui/inc/condformatdlg.hxx |5 ++-
sc/source/ui/inc/condformatdlgentry.hxx| 10 --
4 files changed, 42 insertions(+), 34 deletions(-)
New commits:
commit 29803d51fe6db96d2a98475c059cd56f36e0da6b
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Jul 30 23:29:26 2014 +0200
the dialog hierarchy changed iwith the ui format, fdo#81867
We need to be explicit now and can no longer rely on GetParent returning
the right object. Seems like sometimes you get punished for an ugly hack
a bit later than expected.
Change-Id: I145e97ae0ceee741c4128c29a6ca26fad2178cb5
(cherry picked from commit fe5463fb7bc740bfec5d2eb7408b8ff3624d8c31)
Reviewed-on: https://gerrit.libreoffice.org/10653
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/source/ui/condformat/condformatdlg.cxx
b/sc/source/ui/condformat/condformatdlg.cxx
index 9c0a6d9..cb55ef7 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -46,9 +46,11 @@ ScCondFormatList::ScCondFormatList(Window* pParent, WinBits
nStyle)
SetBackground(GetControlBackground());
}
-void ScCondFormatList::init(ScDocument* pDoc, const ScConditionalFormat*
pFormat,
-const ScRangeList rRanges, const ScAddress rPos,
condformat::dialog::ScCondFormatDialogType eType)
+void ScCondFormatList::init(ScDocument* pDoc, ScCondFormatDlg* pDialogParent,
+const ScConditionalFormat* pFormat, const ScRangeList rRanges,
+const ScAddress rPos, condformat::dialog::ScCondFormatDialogType
eType)
{
+mpDialogParent = pDialogParent;
mpDoc = pDoc;
maPos = rPos;
maRanges = rRanges;
@@ -65,9 +67,9 @@ void ScCondFormatList::init(ScDocument* pDoc, const
ScConditionalFormat* pFormat
{
const ScCondFormatEntry* pConditionEntry =
static_castconst ScCondFormatEntry*( pEntry );
if(pConditionEntry-GetOperation() != SC_COND_DIRECT)
-maEntries.push_back(new ScConditionFrmtEntry(
this, mpDoc, maPos, pConditionEntry ) );
+maEntries.push_back(new ScConditionFrmtEntry(
this, mpDoc, pDialogParent, maPos, pConditionEntry ) );
else
-maEntries.push_back(new ScFormulaFrmtEntry( this,
mpDoc, maPos, pConditionEntry ) );
+maEntries.push_back(new ScFormulaFrmtEntry( this,
mpDoc, pDialogParent, maPos, pConditionEntry ) );
}
break;
@@ -99,7 +101,7 @@ void ScCondFormatList::init(ScDocument* pDoc, const
ScConditionalFormat* pFormat
switch(eType)
{
case condformat::dialog::CONDITION:
-maEntries.push_back(new ScConditionFrmtEntry( this, mpDoc,
maPos ));
+maEntries.push_back(new ScConditionFrmtEntry( this, mpDoc,
pDialogParent, maPos ));
break;
case condformat::dialog::COLORSCALE:
maEntries.push_back(new ScColorScale3FrmtEntry( this, mpDoc,
maPos ));
@@ -258,7 +260,7 @@ IMPL_LINK(ScCondFormatList, ColFormatTypeHdl, ListBox*,
pBox)
default:
break;
}
-static_castScCondFormatDlg*(GetParent())-InvalidateRefData();
+mpDialogParent-InvalidateRefData();
itr-SetActive();
RecalcAll();
return 0;
@@ -302,23 +304,23 @@ IMPL_LINK(ScCondFormatList, AfterTypeListHdl, ListBox*,
pBox)
return 0;
}
maEntries.replace( itr, new ScColorScale3FrmtEntry(this, mpDoc,
maPos));
-static_castScCondFormatDlg*(GetParent())-InvalidateRefData();
+mpDialogParent-InvalidateRefData();
itr-SetActive();
break;
case 1:
if(itr-GetType() == condformat::entry::CONDITION)
return 0;
-maEntries.replace( itr, new ScConditionFrmtEntry(this, mpDoc,
maPos));
-static_castScCondFormatDlg*(GetParent())-InvalidateRefData();
+maEntries.replace( itr, new ScConditionFrmtEntry(this, mpDoc,
mpDialogParent, maPos));
+mpDialogParent-InvalidateRefData();
itr-SetActive();
break;
case 2:
if(itr-GetType() == condformat::entry::FORMULA)
return 0;
-maEntries.replace( itr, new ScFormulaFrmtEntry(this, mpDoc,
maPos));
-static_castScCondFormatDlg*(GetParent())-InvalidateRefData();
+maEntries.replace( itr, new ScFormulaFrmtEntry(this, mpDoc,
mpDialogParent, maPos));
+mpDialogParent-InvalidateRefData();
itr-SetActive();
break;
case 3:
@@ -326,7 +328,7
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/inc sc/source
sc/inc/column.hxx|1
sc/inc/table.hxx |5
sc/source/core/data/column.cxx | 27 --
sc/source/core/data/column4.cxx |3 ++
sc/source/core/data/documen7.cxx | 40 +--
sc/source/core/data/table2.cxx |7 --
sc/source/core/data/table7.cxx | 10 +
7 files changed, 52 insertions(+), 41 deletions(-)
New commits:
commit ef32f401f27c394617df55114e912ffab3e6307a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Jul 30 11:02:31 2014 -0400
fdo#80501: Ensure that we notify each listener only once.
Change-Id: If2ce4643ff58c7c2ba326d749698dd5196a108dc
(cherry picked from commit b2ee0235e88dc4da715b5766295ed88f27974fbd)
Reviewed-on: https://gerrit.libreoffice.org/10645
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 09b1588..d2b7799 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -484,7 +484,6 @@ public:
voidStartNeededListeners(); // only for cells where
NeedsListening()==true
voidSetDirtyIfPostponed();
void BroadcastRecalcOnRefMove();
-void BroadcastRefMoved( const sc::RefMovedHint rHint );
void TransferListeners( ScColumn rDestCol, SCROW nRow1, SCROW nRow2,
SCROW nRowDelta );
void CollectListeners( std::vectorSvtListener* rListeners, SCROW nRow1,
SCROW nRow2 );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index e6289ec..537846d 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -923,10 +923,7 @@ public:
*/
void BroadcastRecalcOnRefMove();
-/**
- * Broadcast all listeners of specified range that the range have moved.
- */
-void BroadcastRefMoved( const sc::RefMovedHint rHint );
+void CollectListeners( std::vectorSvtListener* rListeners, SCCOL nCol1,
SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
void TransferListeners(
ScTable rDestTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 3e4c4ae..1676e1b 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -3108,33 +3108,6 @@ void ScColumn::BroadcastRecalcOnRefMove()
namespace {
-class BroadcastRefMovedHandler
-{
-const sc::RefMovedHint mrHint;
-public:
-BroadcastRefMovedHandler( const sc::RefMovedHint rHint ) : mrHint(rHint)
{}
-
-void operator() ( size_t, SvtBroadcaster* p )
-{
-p-Broadcast(mrHint);
-}
-};
-
-}
-
-void ScColumn::BroadcastRefMoved( const sc::RefMovedHint rHint )
-{
-const ScRange rRange = rHint.getRange();
-SCROW nRow1 = rRange.aStart.Row();
-SCROW nRow2 = rRange.aEnd.Row();
-
-// Notify all listeners within specified rows.
-BroadcastRefMovedHandler aFunc(rHint);
-sc::ProcessBroadcaster(maBroadcasters.begin(), maBroadcasters, nRow1,
nRow2, aFunc);
-}
-
-namespace {
-
class TransferListenersHandler
{
public:
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 131f8cc..3f26db1 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -950,6 +950,9 @@ public:
void ScColumn::CollectListeners( std::vectorSvtListener* rListeners, SCROW
nRow1, SCROW nRow2 )
{
+if (nRow2 nRow1 || !ValidRow(nRow1) || !ValidRow(nRow2))
+return;
+
ListenerCollector aFunc(rListeners);
sc::ProcessBroadcaster(maBroadcasters.begin(), maBroadcasters, nRow1,
nRow2, aFunc);
}
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index a4897d7..ec34b44 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -128,6 +128,22 @@ void ScDocument::BroadcastCells( const ScRange rRange,
sal_uLong nHint )
BroadcastUno(SfxSimpleHint(SC_HINT_DATACHANGED));
}
+namespace {
+
+class RefMovedNotifier : std::unary_functionSvtListener*, void
+{
+const sc::RefMovedHint mrHint;
+public:
+RefMovedNotifier( const sc::RefMovedHint rHint ) : mrHint(rHint) {}
+
+void operator() ( SvtListener* p )
+{
+p-Notify(mrHint);
+}
+};
+
+}
+
void ScDocument::BroadcastRefMoved( const sc::RefMovedHint rHint )
{
if (!pBASM)
@@ -148,6 +164,28 @@ void ScDocument::BroadcastRefMoved( const
sc::RefMovedHint rHint )
}
}
+// Collect all listeners listening into the range.
+std::vectorSvtListener* aListeners;
+for (SCTAB nTab = rSrcRange.aStart.Tab(); nTab = rSrcRange.aEnd.Tab();
++nTab)
+{
+ScTable* pTab = FetchTable(nTab);
+if (!pTab)
+continue;
+
+pTab-CollectListeners(
+aListeners,
+rSrcRange.aStart.Col(), rSrcRange.aStart.Row(),
+rSrcRange.aEnd.Col(), rSrcRange.aEnd.Row());
+}
+
+// Remove any duplicate listener entries. We must ensure
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - chart2/inc chart2/Library_chartcontroller.mk chart2/source
chart2/Library_chartcontroller.mk |1 chart2/inc/unonames.hxx|8 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx |1 chart2/source/controller/inc/TextLabelItemConverter.hxx| 74 + chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx | 16 chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx | 617 ++ chart2/source/controller/main/ChartController_Properties.cxx | 32 chart2/source/model/main/DataPointProperties.cxx | 65 - chart2/source/model/main/DataPointProperties.hxx | 14 chart2/source/view/inc/PropertyMapper.hxx |1 chart2/source/view/main/PropertyMapper.cxx | 21 11 files changed, 832 insertions(+), 18 deletions(-) New commits: commit 8e0c92c2ee46e90bdcceb641be267a9468968b0c Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Jul 23 15:49:11 2014 -0400 bnc#885825: Support borders around data labels. (cherry picked from commit f1531cdaaebe706d909dc6ddde439ccb5f4ad36d) Conflicts: chart2/inc/unonames.hxx chart2/source/model/main/DataPointProperties.cxx Change-Id: Ib141413e523cbf73746876f727e9f80dda9f5f7c Reviewed-on: https://gerrit.libreoffice.org/10561 Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index b7e86bf..f77ef70 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -154,6 +154,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\ chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter \ chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter \ chart2/source/controller/itemsetwrapper/StatisticsItemConverter \ +chart2/source/controller/itemsetwrapper/TextLabelItemConverter \ chart2/source/controller/itemsetwrapper/TitleItemConverter \ chart2/source/controller/main/ChartController \ chart2/source/controller/main/ChartController_EditData \ diff --git a/chart2/inc/unonames.hxx b/chart2/inc/unonames.hxx index 2b5f601..04cfba2 100644 --- a/chart2/inc/unonames.hxx +++ b/chart2/inc/unonames.hxx @@ -19,6 +19,14 @@ #define CHART_UNONAME_CURVE_RESOLUTION CurveResolution #define CHART_UNONAME_NUMFMTNumberFormat #define CHART_UNONAME_LINK_TO_SRC_NUMFMTLinkNumberFormatToSource +#define CHART_UNONAME_LABEL Label +#define CHART_UNONAME_LABEL_SEP LabelSeparator +#define CHART_UNONAME_LABEL_BORDER_STYLELabelBorderStyle +#define CHART_UNONAME_LABEL_BORDER_WIDTHLabelBorderWidth +#define CHART_UNONAME_LABEL_BORDER_COLORLabelBorderColor +#define CHART_UNONAME_LABEL_BORDER_DASH LabelBorderDash +#define CHART_UNONAME_LABEL_BORDER_DASHNAME LabelBorderDashName +#define CHART_UNONAME_LABEL_BORDER_TRANSLabelBorderTransparency #endif diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index b279f05..644e524 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -473,6 +473,7 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent, case OBJECTTYPE_DATA_LABEL: case OBJECTTYPE_DATA_LABELS: +AddTabPage(RID_SVXPAGE_LINE, SCH_RESSTR(STR_PAGE_BORDER)); AddTabPage(TP_DATA_DESCR, SCH_RESSTR(STR_OBJECT_DATALABELS), DataLabelsTabPage::Create, NULL); AddTabPage(RID_SVXPAGE_CHAR_NAME, SCH_RESSTR(STR_PAGE_FONT)); AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, SCH_RESSTR(STR_PAGE_FONT_EFFECTS)); diff --git a/chart2/source/controller/inc/TextLabelItemConverter.hxx b/chart2/source/controller/inc/TextLabelItemConverter.hxx new file mode 100644 index 000..405d459 --- /dev/null +++ b/chart2/source/controller/inc/TextLabelItemConverter.hxx @@ -0,0 +1,74 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the License); you may not use this file + * except in
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - include/oox oox/source
include/oox/export/chartexport.hxx |4
include/oox/export/utils.hxx |1
oox/source/drawingml/chart/seriesconverter.cxx | 28 +++
oox/source/export/chartexport.cxx | 219 +
oox/source/token/properties.txt|3
5 files changed, 115 insertions(+), 140 deletions(-)
New commits:
commit a7e5fc1485fc3a44a05168910430a57aee2b211e
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Jul 23 15:49:11 2014 -0400
bnc#885825: OOXML import and export of data label borders.
(cherry picked from commit 48f31a924280a418046f0c816f8a7d20b672dac6)
Conflicts:
oox/source/export/chartexport.cxx
Change-Id: I0fd808145aaeb0aa36d3ec30d7b977890642dcff
Reviewed-on: https://gerrit.libreoffice.org/10562
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/include/oox/export/chartexport.hxx
b/include/oox/export/chartexport.hxx
index 4252135..8d570ec 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -157,9 +157,7 @@ private:
void exportDataPoints(
const ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet xSeriesProperties,
sal_Int32 nSeriesLength );
-void exportDataLabels(
-const ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet xSeriesProperties,
-sal_Int32 nSeriesLength );
+void exportDataLabels( const
css::uno::Referencecss::chart2::XDataSeries xSeries, sal_Int32 nSeriesLength
);
void exportGrouping( bool isBar = false );
void exportTrendlines( ::com::sun::star::uno::Reference
::com::sun::star::chart2::XDataSeries xSeries );
void exportMarker( ::com::sun::star::uno::Reference
::com::sun::star::chart2::XDataSeries xSeries );
diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx
index 06ddfe3..588d231 100644
--- a/include/oox/export/utils.hxx
+++ b/include/oox/export/utils.hxx
@@ -23,6 +23,7 @@
#define I32S(x) OString::number( (sal_Int32) x ).getStr()
#define I64S(x) OString::number( (sal_Int64) x ).getStr()
#define IS(x) OString::number( x ).getStr()
+#define BS(x) (x ? 1:0)
#define USS(x) OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr()
#ifndef DBG
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx
b/oox/source/drawingml/chart/seriesconverter.cxx
index 0357114..bcb8d60 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -34,11 +34,13 @@
#include oox/drawingml/chart/typegroupconverter.hxx
#include oox/drawingml/chart/typegroupmodel.hxx
#include oox/helper/containerhelper.hxx
+#include oox/drawingml/lineproperties.hxx
namespace oox {
namespace drawingml {
namespace chart {
+using namespace com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::chart2;
using namespace ::com::sun::star::chart2::data;
@@ -162,6 +164,20 @@ void lclConvertLabelFormatting( PropertySet rPropSet,
ObjectFormatter rFormatt
}
}
+void importBorderProperties( PropertySet rPropSet, Shape rShape, const
GraphicHelper rGraphicHelper )
+{
+LineProperties rLP = rShape.getLineProperties();
+if (rLP.moLineWidth.has())
+{
+sal_Int32 nWidth = convertEmuToHmm(rLP.moLineWidth.get());
+rPropSet.setProperty(PROP_LabelBorderWidth, uno::makeAny(nWidth));
+rPropSet.setProperty(PROP_LabelBorderStyle,
uno::makeAny(drawing::LineStyle_SOLID));
+}
+const Color aColor = rLP.maLineFill.maFillColor;
+sal_Int32 nColor = aColor.getColor(rGraphicHelper);
+rPropSet.setProperty(PROP_LabelBorderColor, uno::makeAny(nColor));
+}
+
} // namespace
DataLabelConverter::DataLabelConverter( const ConverterRoot rParent,
DataLabelModel rModel ) :
@@ -175,7 +191,10 @@ DataLabelConverter::~DataLabelConverter()
void DataLabelConverter::convertFromModel( const Reference XDataSeries
rxDataSeries, const TypeGroupConverter rTypeGroup )
{
-if( rxDataSeries.is() ) try
+if (!rxDataSeries.is())
+return;
+
+try
{
PropertySet aPropSet( rxDataSeries-getDataPointByIndex(
mrModel.mnIndex ) );
lclConvertLabelFormatting( aPropSet, getFormatter(), mrModel,
rTypeGroup, false );
@@ -201,6 +220,9 @@ void DataLabelConverter::convertFromModel( const Reference
XDataSeries rxDat
aPropSet.setProperty( PROP_LabelPlacement,
aPositionsLookupTable[ simplifiedX+1 +
3*(simplifiedY+1) ] );
}
+
+if (mrModel.mxShapeProp)
+importBorderProperties(aPropSet, *mrModel.mxShapeProp,
getFilter().getGraphicHelper());
}
catch( Exception )
{
@@ -222,6 +244,10 @@ void DataLabelsConverter::convertFromModel( const
Reference XDataSeries rxDa
{
PropertySet aPropSet( rxDataSeries );
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - chart2/source include/xmloff xmloff/source
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 35
+-
include/xmloff/xmltoken.hxx |4 +
xmloff/source/chart/PropertyMap.hxx |7 ++
xmloff/source/chart/PropertyMaps.cxx| 21
++
xmloff/source/core/xmltoken.cxx |4 +
5 files changed, 70 insertions(+), 1 deletion(-)
New commits:
commit de58ba7b1ccb90633ca3e78187997f17b2a64d9e
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Sat Jul 26 14:44:38 2014 -0400
bnc#885825: Handle ODF import and export of data label border properties.
Change-Id: Ic8c7bc873768008537cd52a3fd4b11031b403139
(cherry picked from commit 6c2c974dd3f0b21a23bc3bc5560487d28bbe0fad)
Reviewed-on: https://gerrit.libreoffice.org/10563
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git
a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index f3c150e..1dc0cc9 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -80,7 +80,11 @@ enum
PROP_SERIES_DATAPOINT_LABEL_PLACEMENT,
//other series properties
PROP_SERIES_ATTACHED_AXIS,
-PROP_SERIES_DATAPOINT_TEXT_ROTATION
+PROP_SERIES_DATAPOINT_TEXT_ROTATION,
+PROP_SERIES_DATAPOINT_LABEL_BORDER_STYLE,
+PROP_SERIES_DATAPOINT_LABEL_BORDER_WIDTH,
+PROP_SERIES_DATAPOINT_LABEL_BORDER_COLOR,
+PROP_SERIES_DATAPOINT_LABEL_BORDER_TRANS
};
void lcl_AddPropertiesToVector_PointProperties(
@@ -142,6 +146,35 @@ void lcl_AddPropertiesToVector_PointProperties(
cppu::UnoTypesal_Int32::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
+
+rOutProperties.push_back(
+Property( CHART_UNONAME_LABEL_BORDER_STYLE,
+ PROP_SERIES_DATAPOINT_LABEL_BORDER_STYLE,
+ cppu::UnoTypedrawing::LineStyle::get(),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEDEFAULT ));
+
+rOutProperties.push_back(
+Property( CHART_UNONAME_LABEL_BORDER_WIDTH,
+ PROP_SERIES_DATAPOINT_LABEL_BORDER_WIDTH,
+ cppu::UnoTypesal_Int32::get(),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEDEFAULT ));
+
+rOutProperties.push_back(
+Property( CHART_UNONAME_LABEL_BORDER_COLOR,
+ PROP_SERIES_DATAPOINT_LABEL_BORDER_COLOR,
+ cppu::UnoTypesal_Int32::get(),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEVOID // maybe auto
+ | beans::PropertyAttribute::MAYBEDEFAULT ));
+
+rOutProperties.push_back(
+Property( CHART_UNONAME_LABEL_BORDER_TRANS,
+ PROP_SERIES_DATAPOINT_LABEL_BORDER_TRANS,
+ cppu::UnoTypesal_Int16::get(),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEDEFAULT ));
}
void lcl_AddPropertiesToVector_SeriesOnly(
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 9e206d8..e03dcfd 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -1067,6 +1067,10 @@ namespace xmloff { namespace token {
XML_LABEL_RANGE,
XML_LABEL_RANGES,
XML_LABEL_STRING,
+XML_LABEL_STROKE,
+XML_LABEL_STROKE_COLOR,
+XML_LABEL_STROKE_OPACITY,
+XML_LABEL_STROKE_WIDTH,
XML_LAMBDA,
XML_LANDSCAPE,
XML_LANGUAGE,
diff --git a/xmloff/source/chart/PropertyMap.hxx
b/xmloff/source/chart/PropertyMap.hxx
index c6b63e5..a876c2b 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -53,6 +53,8 @@
#define XML_SCH_TYPE_AXIS_POSITION_VALUE( XML_SCH_TYPES_START + 14 )
#define XML_SCH_TYPE_AXIS_LABEL_POSITION( XML_SCH_TYPES_START + 15 )
#define XML_SCH_TYPE_TICK_MARK_POSITION ( XML_SCH_TYPES_START + 16 )
+#define XML_SCH_TYPE_LABEL_BORDER_STYLE ( XML_SCH_TYPES_START + 17 )
+#define XML_SCH_TYPE_LABEL_BORDER_OPACITY ( XML_SCH_TYPES_START + 18 )
// context ids
#define XML_SCH_CONTEXT_USER_SYMBOL ( XML_SCH_CTF_START + 0 )
@@ -146,6 +148,11 @@ const XMLPropertyMapEntry aXMLChartPropMap[] =
// OpenGL 3D chart flags
MAP_ENTRY_ODF_EXT( RoundedEdge, LO_EXT, XML_ROUNDED_EDGE, XML_TYPE_BOOL),
+MAP_ENTRY_ODF_EXT( LabelBorderColor, LO_EXT, XML_LABEL_STROKE_COLOR,
XML_TYPE_COLOR ),
+MAP_ENTRY_ODF_EXT( LabelBorderStyle, LO_EXT, XML_LABEL_STROKE,
XML_SCH_TYPE_LABEL_BORDER_STYLE ),
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/core/data/table4.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit d6bf71cc649ca2f65eba3c88143573d9ca7f4cc5
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Jul 29 18:52:50 2014 +0200
the range has to be in the correct order, fdo#81803
Change-Id: Ia3907701857e22c11a2cefa5d35437c8f8219ff6
(cherry picked from commit 7bff8e93eb98be4b621c3902de227a3c313cf5b4)
Reviewed-on: https://gerrit.libreoffice.org/10654
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index e1e04d0..24effea 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1139,6 +1139,7 @@ void ScTable::FillFormulaVertical(
SCCOLROW nRowStart = -1, nRowEnd = -1;
std::vectorsc::RowSpan aSpans;
+PutInOrder(nRow1, nRow2);
for (rInner = nRow1; rInner = nRow2; ++rInner)
{
if (rInner nHiddenLast)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSoC] Improved Color Selection, Week 10
Hi! the work youre doing is really impressive. Thank you! I have a suggestion for a small improvement: The bevel around each color square seems superfluous. I think the palette would look cleaner without it. Yes, I can't say that this hasn't occurred to me as well. I'm using an already existing widget (SvxColorValueSet) which has this look, and I haven't looked into changing this so far. I'll look into it, at least to add an easy option for turning it off for UI designers later. And I have one question. Are the dimensions of the palette variable? For example will a Gimp palette file with a Columns: 5 entry be displayed as intended? The UI design of the popup palette window is not fixed yet, and I wasn't sure how a variable number of columns would work in any design, so I just discard the number of columns for now. I'm not sure if SvxColorValueSet supports a variable number of columns even, so that's something else to look into. Thank you for giving it a go! All the best, Krisztian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSoC] Improved Color Selection, Week 10
Hi! *sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml* I don't see any reason touching that file. I wanted to add a new color selection button, and this seems like the file that describes the toolbar buttons and their order, so that's why I thought I had to. Reading the other things you wrote, I probably won't have to. I mainly wanted to do it for testing purposes. The problem here is with the macro SFX_IMPL_TOOLBOX_CONTROL that can be found at the top of tbcontrl.cxx. It takes the class name and the type of the status item. Currently SvxColorToolBoxControl is registered with SvxColorItem as a type, which is fine for most of the color commands, but not for the line color that use XLineColorItem as a type. Thank you, this will be helpful! All the best, Krisztian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 30425] Making Icon Themes is Far too Difficult
https://bugs.freedesktop.org/show_bug.cgi?id=30425 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillScript TopicUi |SkillScript TopicUi |target:4.4.0 target:4.3.1 | --- Comment #11 from Adolfo Jayme f...@libreoffice.org --- The above patches are unrelated to this bug; it seems Martin got the bug number wrong. Removing “target” tags from whiteboard. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 77057, which changed state. Bug 77057 Summary: Installing/uninstalling LibreOffice messes up the KindMap in Windows 8.1 https://bugs.freedesktop.org/show_bug.cgi?id=77057 What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- -- 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] core.git: sc/source
sc/source/core/data/document.cxx | 60 ++-
1 file changed, 29 insertions(+), 31 deletions(-)
New commits:
commit 45db9b09767dfa76bdff3e89bc9a04607e648687
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Jul 29 18:24:57 2014 -0400
Scope reduction.
Change-Id: Ib77fccaf0c418e875816ed553f3540190ac0caee
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 549ab9c..3887f91 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1835,51 +1835,49 @@ void ScDocument::InitUndoSelected( ScDocument* pSrcDoc,
const ScMarkData rTabSe
void ScDocument::InitUndo( ScDocument* pSrcDoc, SCTAB nTab1, SCTAB nTab2,
bool bColInfo, bool bRowInfo )
{
-if (bIsUndo)
+if (!bIsUndo)
{
-Clear();
+OSL_FAIL(InitUndo);
+return;
+}
-// Undo document shares its pooled resources with the source document.
-SharePooledResources(pSrcDoc);
+Clear();
-if (pSrcDoc-pShell-GetMedium())
-maFileURL =
pSrcDoc-pShell-GetMedium()-GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI);
+// Undo document shares its pooled resources with the source document.
+SharePooledResources(pSrcDoc);
-OUString aString;
-if ( nTab2 = static_castSCTAB(maTabs.size()))
-maTabs.resize(nTab2 + 1, NULL);
-for (SCTAB nTab = nTab1; nTab = nTab2; nTab++)
-{
-ScTable* pTable = new ScTable(this, nTab, aString, bColInfo,
bRowInfo);
-maTabs[nTab] = pTable;
-}
-}
-else
+if (pSrcDoc-pShell-GetMedium())
+maFileURL =
pSrcDoc-pShell-GetMedium()-GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI);
+
+OUString aString;
+if ( nTab2 = static_castSCTAB(maTabs.size()))
+maTabs.resize(nTab2 + 1, NULL);
+for (SCTAB nTab = nTab1; nTab = nTab2; nTab++)
{
-OSL_FAIL(InitUndo);
+ScTable* pTable = new ScTable(this, nTab, aString, bColInfo, bRowInfo);
+maTabs[nTab] = pTable;
}
}
void ScDocument::AddUndoTab( SCTAB nTab1, SCTAB nTab2, bool bColInfo, bool
bRowInfo )
{
-if (bIsUndo)
+if (!bIsUndo)
{
-OUString aString;
-if (nTab2 = static_castSCTAB(maTabs.size()))
-{
-maTabs.resize(nTab2+1,NULL);
-}
-for (SCTAB nTab = nTab1; nTab = nTab2; nTab++)
-if (!maTabs[nTab])
-{
-maTabs[nTab] = new ScTable(this, nTab, aString, bColInfo,
bRowInfo);
-}
-
+OSL_FAIL(AddUndoTab);
+return;
}
-else
+
+OUString aString;
+if (nTab2 = static_castSCTAB(maTabs.size()))
{
-OSL_FAIL(InitUndo);
+maTabs.resize(nTab2+1,NULL);
}
+
+for (SCTAB nTab = nTab1; nTab = nTab2; nTab++)
+if (!maTabs[nTab])
+{
+maTabs[nTab] = new ScTable(this, nTab, aString, bColInfo,
bRowInfo);
+}
}
void ScDocument::SetCutMode( bool bVal )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] 4.2.6 not yet available for download
Hi Tommy, On Wed, Jul 30, 2014 at 7:06 AM, Tommy ba...@quipo.it wrote: I received the release announcement of 4.2.6 You saw an announcement for the rc2 - i.e. it is available on the prereleases page. http://www.libreoffice.org/download/pre-releases/ but I still don't see it available to download from LibO website where 4.2.5 is still shown. Yes, as 4.2.6 final announcement has not yet been sent. but you can download rc2 as well - as it looks now it will be the final version. ciao Christian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Toolbar Proposal Completed
Hi Jay, all, Le 30/07/2014 02:09, Jay Philips a écrit : Hi Joel, Well the UX team is already CCed in the bug report and i guess they will get around to it whenever they do, which i assume will take a while. Have my fingers crossed that some portions of the proposal lands in master or the release after that. Definitely think it will help differentiate LO's look from OOo/AOO. But I was mainly just sharing my work with the QA team, as it was a happy occasion for me that i was able to complete it, as this is the team i'm with and welcomed their constructive criticism of it. :D The UX team is currently migrating his work to Redmine, they will have a forum here, a wiki, and ticketing. May be you should open a ticket on Redmine in their area and link to your issue on BZ and then post on their forum. Let me know if you need my help :) Cheers Sophie ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] 4.2.6 not yet available for download
On Wed, 30 Jul 2014 08:27:31 +0200, Christian Lohmaier lohma...@googlemail.com wrote: Hi Tommy, On Wed, Jul 30, 2014 at 7:06 AM, Tommy ba...@quipo.it wrote: I received the release announcement of 4.2.6 You saw an announcement for the rc2 - i.e. it is available on the prereleases page. http://www.libreoffice.org/download/pre-releases/ but I still don't see it available to download from LibO website where 4.2.5 is still shown. Yes, as 4.2.6 final announcement has not yet been sent. sorry my bad... :-) I misunderstood the release mail. but you can download rc2 as well - as it looks now it will be the final version. ciao Christian ___ ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] 4.3 final on BSA
Hi all, Just a note that 4.3.0.4 or final is missing on BSA. Cheers Sophie ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] 700 unconfirmed bugs milestone broke
On Sun, Jul 27, 2014 at 09:58:56PM +0200, Tommy wrote: just to say that the count is now 699 https://bugs.freedesktop.org/report.cgi?y_axis_field=bug_statusquery_format=report-tableproduct=LibreOfficeformat=tableaction=wrap great job QA team!!! Indeed, congratulations everyone! Just before release, we were back to 713. But still: we are currently at an all-time low ever since unconfirmed is the default for new bugs: https://plus.google.com/101094190333184858950/posts/XToT8Qt3WXZ Best, Bjoern ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] 700 unconfirmed bugs milestone broke
Great job, guys ! On Sun, Jul 27, 2014 at 10:58 PM, Tommy ba...@quipo.it wrote: just to say that the count is now 699 https://bugs.freedesktop.org/report.cgi?y_axis_field=bug_ statusquery_format=report-tableproduct=LibreOffice format=tableaction=wrap some nice chart: https://bugs.freedesktop.org/reports.cgi?product=LibreOfficedatasets= UNCONFIRMEDdatasets=NEEDINFO great job QA team!!! -- Using Opera's revolutionary email client: http://www.opera.com/mail/ ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/ mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to- unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/ -- *Adam Fyne* Interoperability Team Leader Twitter http://www.twitter.com/cloudoninc | LinkedIn http://www.linkedin.com/company/cloudon | Facebook http://www.facebook.com/cloudoninc ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Bacchanaly around Bug 81041
Interesting things happen in LO QA community. Instead of reading 4.3 release notes, as an adequate person would, Jay Philips in comment 15 starts being rude (and authoritative) to me, which I —knowing about the dreck open source generally attracts— can look over; but than he snitches me over to the moderator, which is unacceptable. Fistly, is that 'person' going to excuse itself?, Secondly, I would like to get an official response: is LO a project where the adequate and sane people work, and it is safe for normal people to interact with, or is it some Gnome-like community of 1½ faggots in a circle? Providing a reputation of LO as a commercial-grade professional software, I would like to receive some explanations about faggots and snitches in its public-faced parts being the QA community. Thanks. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Bacchanaly around Bug 81041
I suggest everyone ignore this On 07/30/2014 10:38 AM, Urmas wrote: Interesting things happen in LO QA community. Instead of reading 4.3 release notes, as an adequate person would, Jay Philips in comment 15 starts being rude (and authoritative) to me, which I —knowing about the dreck open source generally attracts— can look over; but than he snitches me over to the moderator, which is unacceptable. Fistly, is that 'person' going to excuse itself?, Secondly, I would like to get an official response: is LO a project where the adequate and sane people work, and it is safe for normal people to interact with, or is it some Gnome-like community of 1½ faggots in a circle? Providing a reputation of LO as a commercial-grade professional software, I would like to receive some explanations about faggots and snitches in its public-faced parts being the QA community. Language like this is completely unacceptable and it's not the first time that you've been told this. With that, I have no other comment on any other part of this. Best, Joel ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Bacchanaly around Bug 81041
Hi Urmas, I'm not going to discuss the content of the bug itself. I'd like to discuss some other things: First of all: thanks for just bringing this to the list, instead of play cat and mouse in Bugzilla which result in a huge spam. Secondly, I'm not sure how you even can ask for an official reply on an email where hard working volunteers and our total community are called/questioned as morons and faggots. Kind regards, Joren Op 30-07-14 om 19:38 schreef Urmas: Interesting things happen in LO QA community. Instead of reading 4.3 release notes, as an adequate person would, Jay Philips in comment 15 starts being rude (and authoritative) to me, which I —knowing about the dreck open source generally attracts— can look over; but than he snitches me over to the moderator, which is unacceptable. Fistly, is that 'person' going to excuse itself?, Secondly, I would like to get an official response: is LO a project where the adequate and sane people work, and it is safe for normal people to interact with, or is it some Gnome-like community of 1½ faggots in a circle? Providing a reputation of LO as a commercial-grade professional software, I would like to receive some explanations about faggots and snitches in its public-faced parts being the QA community. Thanks. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/ ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Fwd: Re: Bacchanaly around Bug 81041
op 30-07-14 19:38, Urmas schreef: Interesting things happen in LO QA community. Instead of reading 4.3 release notes, as an adequate person would, Jay Philips in comment 15 starts being rude (and authoritative) to me, which I —knowing about the dreck open source generally attracts— can look over; but than he snitches me over to the moderator, which is unacceptable. Fistly, is that 'person' going to excuse itself?, Secondly, I would like to get an official response: is LO a project where the adequate and sane people work, and it is safe for normal people to interact with, or is it some Gnome-like community of 1½ faggots in a circle? Providing a reputation of LO as a commercial-grade professional software, I would like to receive some explanations about faggots and snitches in its public-faced parts being the QA community. Urmas, I checked bug 81041 trace. We are and will remain a respectful community. That is fixed in our foundation (TDF). If you disagree with others I´d advice: discuss via other means then bug reports + mailing lists. Look for the dialogue and discussion. Luc attachment: luc_castermans.vcf___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Testing for bug 81592: Bad Quality/Rendering of EPS graphics in LO 4.2 and 4.3 (regression)
Gerry T. wrote While the rendering quality of EPS in LO 4.0/4.1 was 'production quality', the rendering in 4.2 4.3 regressed and is unusable for publishing. It may be that there is a regression, but as pointed out in comment 4 and in this report: https://bugs.freedesktop.org/show_bug.cgi?id=67464 ... EPS rendering has never been production quality. It may have been /acceptable/ under an earlier version, but that may also have been due to luck or a hack, since there is no native rendering for EPS. Best wishes, Owen. - Best wishes, Owen. -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Testing-for-bug-81592-Bad-Quality-Rendering-of-EPS-graphics-in-LO-4-2-and-4-3-regress-tp4116895p4116948.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Bacchanaly around Bug 81041
On Wed, Jul 30, 2014 at 7:58 PM, Sophie gautier.sop...@gmail.com wrote: I would like to receive some explanations about faggots and snitches in its public-faced parts being the QA community. What sort of answer do you expect? You want us to escalate on non sense? OK sophie, I'm convinced... As I said before I can stomach quite a bit of trolling on users@ and discuss@ but BZ and libreoffice-qa@ are place where serious work is done and volunteer here should not have to waste their time dealing with that nonsense. Norbert --- Norbert Thiébaud, Deputy Board of Director, TDF Tel: +49 30 5557992-50 | Mail: flo...@documentfoundation.org The Document Foundation, Kurfürstendamm 188, 10707 Berlin, DE Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 81901] New: UI: Option for small-caps-icon in formatting-toolbar
https://bugs.freedesktop.org/show_bug.cgi?id=81901 Priority: medium Bug ID: 81901 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: UI: Option for small-caps-icon in formatting-toolbar Severity: normal Classification: Unclassified OS: All Reporter: pascal.fischer...@googlemail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.5.2 release Component: Writer Product: LibreOffice Problem description: The formatting-toolbar should also offer the possibilty to add an icon for small-caps. There is no option for that when you customize it. Some people need it regularly for person-names in scientific texts. Operating System: All Version: 4.2.5.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81902] New: UI: Navigator-window should be not floating but fixed on left side
https://bugs.freedesktop.org/show_bug.cgi?id=81902 Priority: medium Bug ID: 81902 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: UI: Navigator-window should be not floating but fixed on left side Severity: normal Classification: Unclassified OS: All Reporter: pascal.fischer...@googlemail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.5.2 release Component: Writer Product: LibreOffice Problem description: Navigator-window should be not floating but fixed on left side Steps to reproduce: 1. Open the navigator Current behavior: It is a floating-window. Expected behavior: It should be fixed on the left side, similar to MS-Office. (And it should integrate the search-function, similar to MS-Office.) Operating System: All Version: 4.2.5.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81904] New: Other: Wrong version number
https://bugs.freedesktop.org/show_bug.cgi?id=81904 Priority: medium Bug ID: 81904 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Other: Wrong version number Severity: normal Classification: Unclassified OS: Linux (All) Reporter: herbert.p...@gmail.com Hardware: Other Whiteboard: BSA PossibleRegression Status: UNCONFIRMED Version: 4.3.0.3 rc Component: Libreoffice Product: LibreOffice Problem description: After updating LibreOffice to 4.3 the version shown in all applications is still 4.2.5.2 Steps to reproduce: 1. Install the update LibreOffice_4.3.0_Linux_x86-64_deb.tar.gz LibreOffice_4.3.0_Linux_x86-64_deb_langpack_nl.tar.gz LibreOffice_4.3.0_Linux_x86-64_deb_helppack_nl.tar.gz 2. Run various libreoffice applications 3. Check version Current behavior: Shows version 4.2.5.2 Expected behavior: Should show 4.3.0.4 (like on OSx) Operating System: Ubuntu Version: 4.3.0.3 rc Last worked in: 4.2.5.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81905] New: Other: Quickstart freeze
https://bugs.freedesktop.org/show_bug.cgi?id=81905 Priority: medium Bug ID: 81905 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Other: Quickstart freeze Severity: normal Classification: Unclassified OS: Windows (All) Reporter: riccard...@gmail.com Hardware: Other Whiteboard: BSA PossibleRegression Status: UNCONFIRMED Version: 4.3.0.3 rc Component: Libreoffice Product: LibreOffice Problem description: if I activate the quickstart, during the next start of the application, the program freeze Steps to reproduce: 1. Open LibreOffice 2. Goto in Tools/Options/Memory menù and activate quick start option 3. Close LibreOffice and then restart it Current behavior: the program freeze (I waited several minutes, but then I had to terminate it). Expected behavior: it should load the quickstart icon in the main windows bar (and it should load it at every system restart) Operating System: Windows 7 Version: 4.3.0.3 rc Last worked in: 4.2.5.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81906] New: Data loss due to session management with roaming profiles
https://bugs.freedesktop.org/show_bug.cgi?id=81906 Priority: medium Bug ID: 81906 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Data loss due to session management with roaming profiles Severity: normal Classification: Unclassified OS: Linux (All) Reporter: glo...@fbihome.de Hardware: x86 (IA32) Status: NEW Version: 4.1.6.2 release Component: framework Product: LibreOffice The current session management temporarly stores modified user data in /var/tmp/tmpdir. This happens on logout without any user interaction. This is fine, as long as the user doesn't have a roaming profile. My guess is most of our users expect the LO to ask for actions for modified documents on logout. But as the data isn't lost, it should be sufficient to update the user documentation. OTOH if you remove LO from session management in KDE4, LO tries to get user feedback, but the logout process simply kills the application, which might result in data loss. I don't know if LO can distinguish between the shutdown from the session logout and a user triggered quit. From my POV for the first case the temporary save should be done and no user interaction requested. So I suggest to implement the following behaviour / options: 1. select the user profile (suggested subdir auto-restore) as the temporary storage dir, so roaming profiles can work. This will prevent data loss. 2. an new load/save option to restore the old behaviour to require user interaction on logout (yeah - I know about http://xkcd.com/1172/ ...) From my POV 1. is mandatory, while 2. would be nice to have. I'm not sure if the KDE4 logout process should wait for the application to quit, even if an application is removed from session management, so it won't be restored on login...? AFAIK MS Windows does this for stuck apps, providing some kind of information window, so the user can decide to abort logoff. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81877] Pictures are disappearing from Draw document
https://bugs.freedesktop.org/show_bug.cgi?id=81877 --- Comment #3 from Aurelien aurelien...@gmail.com --- Hi Christian, Thank you for your support. The bug you mentionned is exactly the same as my report here (sorry i did not found this report before filling mine). So i'm gonna do some test with latest daily build and go back to you. (In reply to comment #2) Hi Aurelien, please take a look at Bug 46447. I wonder if you're reporting same problem. If you mind testing daily build: http://dev-builds.libreoffice.org/daily/ and report the result here. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 45892] Concurrent use of MathType and LibreOffice Math in LibreOffice Writer can cause a MathType error
https://bugs.freedesktop.org/show_bug.cgi?id=45892 --- Comment #23 from Pierre Farrugia pierresan...@gmail.com --- Dear Joel, The steps to follow are these: 1. Open an document in Writer. 2. Insert a MathType equation using: Insert - OLE Object - Further Objects - Microsoft Equation 3.0 (or MathType; should be the same). Write something in it and close. 3. Repeat Step 2 eleven or more times. 4. Try to insert a Math (LibreOffice) formula. The error will appear at this point. Personally I use the following macro to insert the MathType more quickly, sub InsertMathTypeFormulaInWriter dim oTargetDocument as variant oTargetDocument = ThisComponent dim oCurrentController as variant oCurrentController = oTargetDocument.getCurrentController() dim oFormula as variant oFormula = oTargetDocument.createInstance(com.sun.star.text.TextEmbeddedObject) oFormula.CLSID = 0002CE03---C000-0046 oFormula.AnchorType = com.sun.star.text.TextContentAnchorType.AS_CHARACTER oFormula.attach(oCurrentController.Selection.getByIndex(0) ) dim oXCOEO as variant: oXCOEO = oFormula.ExtendedControlOverEmbeddedObject oXCOEO.doVerb(com.sun.star.embed.EmbedVerbs.MS_OLEVERB_PRIMARY) End Sub The error is reproducible both if you use the macro as well as if you insert manually the MathType instance. I am running LibreOffice 3.6.2.2 on XP at the moment. Hope this information is enough. If you need anything else just let me know. Cheers Pierre (In reply to comment #22) Hi Pierre - So I installed a 30 day trial of MathType - if you can give EXACT reproducible steps (give the steps both in MathType -- which I am unfamiliar with -- and LibreOffice). What does it mean to insert (you mean copy/paste). Be as specific as possible and then I will try to confirm the issue. Thanks for your tremendous patience on this one Also please don't respond via email, it makes reading the comments much harder. Thanks -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81906] Data loss due to session management with roaming profiles
https://bugs.freedesktop.org/show_bug.cgi?id=81906 Jan-Marek Glogowski glo...@fbihome.de changed: What|Removed |Added Whiteboard||lhm-limux -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76995] MAILMERGE: Wrong record Number in Mailing
https://bugs.freedesktop.org/show_bug.cgi?id=76995 --- Comment #3 from ClDc cldc.s...@wanadoo.fr --- still there with: Version: 4.2.5.2 Build ID: 6ff819b65674ae6c83f3cbab9e4a4c2b292a7a94 and even worse as, except I am wrong, standard Filter applied on data document doesn't work on list_mvt.ods the database, a filter should be applied: Nom not empty and Montant 0 But has no effect, and is not saved ( File -- print -- yes to question, do you wish to print type letters -- define and apply the filter). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68715] RTF import still screwing up some text and tables
https://bugs.freedesktop.org/show_bug.cgi?id=68715 --- Comment #4 from Robert spamt...@prino.net --- Current (4.3.0.4) issues: 1) Square brackets appear in lots of places 2) Page headings are not centred 3) Formulas in tables still don't work -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 79422] EDITING: Calc sluggish after find and replace due to large selection of replaced cells
https://bugs.freedesktop.org/show_bug.cgi?id=79422 --- Comment #9 from Seyeong Kim seyeong@canonical.com --- when I open SearchReplace Dialog timer what scan all of matched cell is triggered. ( at first this is not heavy ) after replacing large data, it's heavy and seems unlimited. at each timer, call Join function which also heavy with large data so. 1. ReplaceAll(or SearchAll) is slow because Join function is not good. 2. triggering timer causes problem after Replaceall i made that searchreplace dialog close if replaceall finished. then #2 problem has gone. but #1 still exists -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81905] Other: Quickstart freeze
https://bugs.freedesktop.org/show_bug.cgi?id=81905 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE --- Comment #1 from ign_christian ign_christ...@yahoo.com --- Hi Riccardo.. Problem has been known. Thanks for reporting *** This bug has been marked as a duplicate of bug 80927 *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80927] Win: crash with Quickstarter enabled
https://bugs.freedesktop.org/show_bug.cgi?id=80927 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added CC||riccard...@gmail.com --- Comment #21 from ign_christian ign_christ...@yahoo.com --- *** Bug 81905 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81906] Data loss due to session management with roaming profiles
https://bugs.freedesktop.org/show_bug.cgi?id=81906 --- Comment #1 from Jan-Marek Glogowski glo...@fbihome.de --- The origin of this bug is an additional problem with the current SM. When using the WollMux extension, LO is never really quit but continues to run headless in the background. But this instance is restored with a window on login, which disturbs the user. I don't know if this is fixable by LO SM, WollMux, the LO KDE integration or the KDE SM. Any pointers would be appreciated. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
