LibreOffice Gerrit News for core on 2014-07-28
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + xmerge: Enhanced For-Loops in https://gerrit.libreoffice.org/10573 from Robert Antoni Buj i Gelonch about module xmerge + Code formating in https://gerrit.libreoffice.org/10580 from Robert Antoni Buj i Gelonch about module jurt + PAGE_DBWIZARD_TEXT, PAGE_TEXT, DLG_TEXT_CONNECTION_SETTINGS conversion to in https://gerrit.libreoffice.org/10579 from Szymon Kłos about module dbaccess, extras + xmerge: If statement is redundant in https://gerrit.libreoffice.org/10570 from Robert Antoni Buj i Gelonch about module xmerge + xmerge: @Override in https://gerrit.libreoffice.org/10577 from Robert Antoni Buj i Gelonch about module xmerge + xmerge: javadoc code../code fix in https://gerrit.libreoffice.org/10571 from Robert Antoni Buj i Gelonch about module xmerge + xmerge: remove String constructor invocation in https://gerrit.libreoffice.org/10576 from Robert Antoni Buj i Gelonch about module xmerge + xmerge: The assigned value is never used in https://gerrit.libreoffice.org/10575 from Robert Antoni Buj i Gelonch about module xmerge + xmerge: Unused assignment in https://gerrit.libreoffice.org/10574 from Robert Antoni Buj i Gelonch about module xmerge End of freshness + fdo#73151 Open Navigator and Gallery in the sidebar in Impress in https://gerrit.libreoffice.org/10582 from Samuel Mehrbrodt about module sd * Merged changes on master for project core changed in the last 25 hours: + xmerge: remove import from same package in https://gerrit.libreoffice.org/10578 from Robert Antoni Buj i Gelonch + xmerge: javadoc p../p fix in https://gerrit.libreoffice.org/10572 from Robert Antoni Buj i Gelonch + jurt: Enhanced For-Loops in https://gerrit.libreoffice.org/10553 from Robert Antoni Buj i Gelonch + fdo#75757: remove inheritance to std::vector in https://gerrit.libreoffice.org/10549 from Takeshi Abe * 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#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 https://gerrit.libreoffice.org/9564 from Yogesh Bharate + Use assert instead of OSL_ASSERT in sal/ in https://gerrit.libreoffice.org/10113 from Arnaud Versini + fdo#45286: Fix for saving a file as.xlsx destroys link to linked contents in https://gerrit.libreoffice.org/10104 from Robin Kumar + __arm and __arm64 don't exist when building for the simulator. in https://gerrit.libreoffice.org/10103 from Andrzej Hunt + fdo#78947 : The File gets corrupted when saved in LO in https://gerrit.libreoffice.org/9775 from BisalNayal + move OpenGLContext to SAL in https://gerrit.libreoffice.org/9429 from David Tardon + Changes for Wordml in https://gerrit.libreoffice.org/9013 from Michel Messak + fdo#64945 Remove inconvenient localized symbol code. in https://gerrit.libreoffice.org/8696 from Darshana Padmadas + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende + fdo#77121 Header / Footer positions not preserved after RT in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for submodules on 2014-07-28
Moin! ~~ Project dictionaries ~~ Nothing moved in the project for the last 25 hours ~~ Project translations ~~ Nothing moved in the project for the last 25 hours ~~ Project help ~~ * Open changes on master for project help changed in the last 25 hours: None * Merged changes on master for project help changed in the last 25 hours: + Fix fdo#80444: Help pages fo STDEV functions in https://gerrit.libreoffice.org/10568 from Olivier Hallot + Fix fdo#80443: Help pages for COVARIANCE functions in https://gerrit.libreoffice.org/10567 from Olivier Hallot + Fix fdo#80452, New CHISQ functions in https://gerrit.libreoffice.org/10566 from Olivier Hallot + Fix fdo#80445, help pages for VAR functions in https://gerrit.libreoffice.org/10560 from Olivier Hallot * Abandoned changes on master for project help changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: xmerge/source
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java
|2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7d06a0601ddccc50185ea97fddcdf2ea39299096
Author: rbuj robert@gmail.com
Date: Sun Jul 27 12:06:37 2014 +0200
xmerge: Unused assignment
Change-Id: Ie059c6689976c0a52fedaa6fdee2dd36d944eb56
Reviewed-on: https://gerrit.libreoffice.org/10574
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java
index d342daa..82977ea 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java
@@ -97,7 +97,7 @@ public class PalmDocument
PdbDecoder decoder = new PdbDecoder();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
byte[] buf = new byte[4096];
-int n = 0;
+int n;
while ((n = is.read(buf)) 0) {
baos.write(buf, 0, n);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmerge/source
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
| 20 --
1 file changed, 8 insertions(+), 12 deletions(-)
New commits:
commit 62ef93674b117773d2ec5e902c2a6561ffbf6c77
Author: rbuj robert@gmail.com
Date: Sun Jul 27 12:23:44 2014 +0200
xmerge: remove String constructor invocation
Change-Id: Ibd7a94c0f53be3b3a3e9ee764dbdeb6199857441
Reviewed-on: https://gerrit.libreoffice.org/10576
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
index 98858dc..f0c3a72 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
@@ -191,7 +191,7 @@ public class EmbeddedXMLObject extends EmbeddedObject {
builder = factory.newDocumentBuilder();
}
-byte[] data = zipFile.getNamedBytes(new String(objName + / +
name));
+byte[] data = zipFile.getNamedBytes((objName + / + name));
if (data != null) {
return OfficeDocument.parse(builder, data);
}
@@ -222,15 +222,15 @@ public class EmbeddedXMLObject extends EmbeddedObject {
void write(OfficeZip zip) throws IOException {
if (hasChanged == true) {
if (contentDOM != null) {
-zip.setNamedBytes(new String(objName + /content.xml),
+zip.setNamedBytes((objName + /content.xml),
OfficeDocument.docToBytes(contentDOM));
}
if (settingsDOM != null) {
-zip.setNamedBytes(new String(objName + /settings.xml),
+zip.setNamedBytes((objName + /settings.xml),
OfficeDocument.docToBytes(settingsDOM));
}
if (stylesDOM != null) {
-zip.setNamedBytes(new String(objName + /styles.xml),
+zip.setNamedBytes((objName + /styles.xml),
OfficeDocument.docToBytes(stylesDOM));
}
}
@@ -249,8 +249,7 @@ public class EmbeddedXMLObject extends EmbeddedObject {
Element contentNode =
manifestDoc.createElement(OfficeConstants.TAG_MANIFEST_FILE);
contentNode.setAttribute(OfficeConstants.ATTRIBUTE_MANIFEST_FILE_TYPE,
text/xml);
-
contentNode.setAttribute(OfficeConstants.ATTRIBUTE_MANIFEST_FILE_PATH,
-new String(objName + /content.xml));
+
contentNode.setAttribute(OfficeConstants.ATTRIBUTE_MANIFEST_FILE_PATH, (objName
+ /content.xml));
root.appendChild(contentNode);
}
@@ -259,8 +258,7 @@ public class EmbeddedXMLObject extends EmbeddedObject {
Element settingsNode =
manifestDoc.createElement(OfficeConstants.TAG_MANIFEST_FILE);
settingsNode.setAttribute(OfficeConstants.ATTRIBUTE_MANIFEST_FILE_TYPE,
text/xml);
-
settingsNode.setAttribute(OfficeConstants.ATTRIBUTE_MANIFEST_FILE_PATH,
-new String(objName + /settings.xml));
+
settingsNode.setAttribute(OfficeConstants.ATTRIBUTE_MANIFEST_FILE_PATH,
(objName + /settings.xml));
root.appendChild(settingsNode);
}
@@ -269,16 +267,14 @@ public class EmbeddedXMLObject extends EmbeddedObject {
Element stylesNode =
manifestDoc.createElement(OfficeConstants.TAG_MANIFEST_FILE);
stylesNode.setAttribute(OfficeConstants.ATTRIBUTE_MANIFEST_FILE_TYPE,
text/xml);
-
stylesNode.setAttribute(OfficeConstants.ATTRIBUTE_MANIFEST_FILE_PATH,
-new String(objName + /styles.xml));
+
stylesNode.setAttribute(OfficeConstants.ATTRIBUTE_MANIFEST_FILE_PATH, (objName
+ /styles.xml));
}
Element objectNode =
manifestDoc.createElement(OfficeConstants.TAG_MANIFEST_FILE);
objectNode.setAttribute(OfficeConstants.ATTRIBUTE_MANIFEST_FILE_TYPE,
objType);
-objectNode.setAttribute(OfficeConstants.ATTRIBUTE_MANIFEST_FILE_PATH,
-new String(objName + /));
+objectNode.setAttribute(OfficeConstants.ATTRIBUTE_MANIFEST_FILE_PATH,
(objName + /));
root.appendChild(objectNode);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmerge/source
xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java |
2 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java |
2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 34170ac810f4d8449af527564e661002f56a5ecb
Author: rbuj robert@gmail.com
Date: Sun Jul 27 11:53:43 2014 +0200
xmerge: javadoc code../code fix
Change-Id: I44b7014d01e481a69c514fc52ffb7e0bf0e5
Reviewed-on: https://gerrit.libreoffice.org/10571
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
index 883d137..7dff2f4 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
@@ -154,7 +154,7 @@ public class Convert implements Cloneable {
/**
* Clones a Convert object so another Convert object can
- * do the same conversion. codeInputStreamcode objects passed
+ * do the same conversion. codeInputStream/code objects passed
* in via calls to the codeaddInputStream/code method are not
* copied.
*
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
index 13a4b8b..b5438cd 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
@@ -26,7 +26,7 @@ import java.io.IOException;
* quot;Officequot; codeDocument/code format./p
*
* pThe codeDocumentDeserializer/code object is created by
- * the /codePluginFactory/code {@link
+ * the codePluginFactory/code {@link
*
org.openoffice.xmerge.DocumentDeserializerFactory#createDocumentDeserializer
* createDocumentDeserializer} method. When it is constructed, a
* codeConvertData/code object is passed in to be used as input./p
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild
config_host.mk.in |1
configure.ac| 36 +++-
solenv/gbuild/platform/com_MSC_class.mk |2 -
3 files changed, 28 insertions(+), 11 deletions(-)
New commits:
commit e23fa8db9fa4e6367d7bfcd34289ea10388783fa
Author: Tor Lillqvist t...@collabora.com
Date: Mon Jul 28 09:16:57 2014 +0300
Improvements for Windows build with only VS2013 installed
I thought it was possible now to build on Windows with Visual Studio
2013 as the only installed Visual Studio version, but no. I tried on a
fresh Windows 8.1 installation.
This commit fixes the configury a bit at least. (One needs to pass the
--with-visual-studio=2013 option. Otherwise configure gets confused by
the partial (?) VS2012 that seems to be installed, too, when
installing VS2013, and prefers that...)
The build fails at least in external/lcms2, but I'll leave sorting out
that for later.
Change-Id: I15942e4b088a3f0a62c3f7fa8f9b45f77beaff6f
diff --git a/config_host.mk.in b/config_host.mk.in
index 316f56a..8c38df6 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -594,6 +594,7 @@ export
WATCH_WINDOW_EXTENSION_PACK=@WATCH_WINDOW_EXTENSION_PACK@
export WGET=@WGET@
export WINDOWS_BUILD_SIGNING=@WINDOWS_BUILD_SIGNING@
export WINDOWS_SDK_HOME=@WINDOWS_SDK_HOME@
+export WINDOWS_SDK_LIB_SUBDIR=@WINDOWS_SDK_LIB_SUBDIR@
export WINDOWS_SDK_VERSION=@WINDOWS_SDK_VERSION@
export WINDOWS_SDK_WILANGID=@WINDOWS_SDK_WILANGID@
export WINDRES=@WINDRES@
diff --git a/configure.ac b/configure.ac
index 45f77ed..20049b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5317,9 +5317,9 @@ find_dotnetsdk()
find_winsdk_version()
{
# Args: $1 : SDK version as in 6.0A, 7.0 etc
-# Return value: $winsdktest
+# Return values: $winsdktest, $winsdklibsubdir
-unset winsdktest
+unset winsdktest winsdklibsubdir
# Why we look for them in this particular order I don't know. But OTOH I
case $1 in
@@ -5327,6 +5327,15 @@ find_winsdk_version()
reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/v${1}/InstallationFolder
if test -n $regvalue; then
winsdktest=$regvalue
+winsdklibsubdir=.
+return
+fi
+;;
+8.1)
+reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows
Kits/Installed Roots/KitsRoot81
+if test -n $regvalue; then
+winsdktest=$regvalue
+winsdklibsubdir=winv6.3
return
fi
;;
@@ -5334,6 +5343,7 @@ find_winsdk_version()
reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows
Kits/Installed Roots/KitsRoot
if test -n $regvalue; then
winsdktest=$regvalue
+winsdklibsubdir=win8
return
fi
;;
@@ -5463,13 +5473,13 @@ if test $build_os = cygwin; then
DOTNET_FRAMEWORK_HOME=$frametest
else
find_winsdk
-if test -f $winsdktest/lib/mscoree.lib -o -f
$winsdktest/lib/win8/um/$WINDOWS_SDK_ARCH/mscoree.lib; then
+if test -f $winsdktest/lib/mscoree.lib -o -f
$winsdktest/lib/$winsdklibsubdir/um/$WINDOWS_SDK_ARCH/mscoree.lib; then
DOTNET_FRAMEWORK_HOME=$winsdktest
fi
fi
-if test ! -f $DOTNET_FRAMEWORK_HOME/lib/mscoree.lib -a ! -f
$DOTNET_FRAMEWORK_HOME/lib/win8/um/$WINDOWS_SDK_ARCH/mscoree.lib; then
-AC_MSG_ERROR([mscoree.lib (.NET Framework) not found])
+if test ! -f $DOTNET_FRAMEWORK_HOME/lib/mscoree.lib -a ! -f
$DOTNET_FRAMEWORK_HOME/lib/$winsdklibsubdir/um/$WINDOWS_SDK_ARCH/mscoree.lib;
then
+AC_MSG_ERROR([mscoree.lib not found])
fi
AC_MSG_RESULT(found)
@@ -9729,6 +9739,8 @@ if test $_os = WINNT; then
WINDOWS_SDK_HOME=`cygpath -d $WINDOWS_SDK_HOME`
WINDOWS_SDK_HOME=`cygpath -u $WINDOWS_SDK_HOME`
fi
+
+WINDOWS_SDK_LIB_SUBDIR=$winsdklibsubdir
fi
if test -n $WINDOWS_SDK_HOME; then
@@ -9749,7 +9761,7 @@ if test $_os = WINNT; then
if test -f $WINDOWS_SDK_HOME/lib/user32.lib; then
have_windows_sdk_libs=yes
-elif test -f
$WINDOWS_SDK_HOME/lib/win8/um/$WINDOWS_SDK_ARCH/user32.lib; then
+elif test -f
$WINDOWS_SDK_HOME/lib/$winsdklibsubdir/um/$WINDOWS_SDK_ARCH/user32.lib; then
have_windows_sdk_libs=yes
else
have_windows_sdk_libs=no
@@ -9794,6 +9806,9 @@ the Windows SDK are installed.])
add_warning If a build created with VS 2012 should run on Windows
XP,
add_warning use --with-windows-sdk=7.1A (requires VS 2012 Update
1 or newer)
fi
+elif echo $WINDOWS_SDK_HOME | grep 8.1 /dev/null 2/dev/null; then
+WINDOWS_SDK_VERSION=81
+AC_MSG_RESULT([found Windows SDK 8.1 ($WINDOWS_SDK_HOME)])
else
AC_MSG_ERROR([Found legacy Windows Platform SDK ($WINDOWS_SDK_HOME)])
fi
[Libreoffice-commits] core.git: xmerge/source
xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
|1 +
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java
|1 +
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
|3 +++
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
|3 +++
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
|3 +++
5 files changed, 11 insertions(+)
New commits:
commit 9f803ee4b64e11e481ae9bf92ffac7cbf568675a
Author: rbuj robert@gmail.com
Date: Sun Jul 27 12:58:07 2014 +0200
xmerge: @Override
Change-Id: I9be006d018335dcbfad5ccba5f55648ba24f609c
Reviewed-on: https://gerrit.libreoffice.org/10577
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
index 7dff2f4..a67faf2 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
@@ -160,6 +160,7 @@ public class Convert implements Cloneable {
*
* @return The cloned codeConvert/code object.
*/
+@Override
public Object clone() {
Convert aClone = null;
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java
index 00c0bf1..78575d6 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java
@@ -112,6 +112,7 @@ public final class OfficeDocumentException extends
IOException {
*
* @return The message value for the codeException/code.
*/
+@Override
public String getMessage() {
return message.toString() + super.getMessage();
}
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
index 986e539..c47b235 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
@@ -381,6 +381,7 @@ public class ParaStyle extends Style implements Cloneable {
*
* @return The fully-resolved copy of the codeStyle/code in use.
*/
+@Override
public Style getResolved() {
ParaStyle resolved = null;
try {
@@ -493,6 +494,7 @@ public class ParaStyle extends Style implements Cloneable {
*
* @return The created codeNode/code.
*/
+@Override
public Node createNode(org.w3c.dom.Document parentDoc, String name) {
Element node = parentDoc.createElement(name);
writeAttributes(node);
@@ -509,6 +511,7 @@ public class ParaStyle extends Style implements Cloneable {
* @return true if codestyle/code is a subset, false
* otherwise.
*/
+@Override
public boolean isSubset(Style style) {
if (!super.isSubset(style))
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
index 57583d7..3e170b5 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
@@ -361,6 +361,7 @@ public class TextStyle extends Style implements Cloneable {
* @return The codeStyleCatalog/code in which to look up
* ancestors.
*/
+@Override
public Style getResolved() {
// Create a new object to return, which is a clone of this one.
TextStyle resolved = null;
@@ -506,6 +507,7 @@ public class TextStyle extends Style implements Cloneable {
*
* @return Created codeNode/code.
*/
+@Override
public Node createNode(org.w3c.dom.Document parentDoc, String name) {
Element node = parentDoc.createElement(name);
writeAttributes(node);
@@ -523,6 +525,7 @@ public class TextStyle extends Style implements Cloneable {
* @return true if codestyle/code is a subset, false
* otherwise.
*/
+@Override
public boolean isSubset(Style style) {
if (style.getClass() != this.getClass())
return false;
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
index d5f8859..5669537 100644
---
[Libreoffice-commits] core.git: editeng/qa
editeng/qa/unit/core-test.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 36e1a903c4783818f779a111dd13fe78805df54c
Author: Tor Lillqvist t...@collabora.com
Date: Mon Jul 28 09:29:35 2014 +0300
WaE: overriding virtual function declaration not marked 'override'
Change-Id: I18274d920865f8e28377acce8084eb1629ff8127
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 4e9b82b..4090db4 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -349,7 +349,7 @@ namespace {
public:
UrlEditEngine(SfxItemPool *pPool) : EditEngine(pPool) {}
-virtual OUString CalcFieldValue( const SvxFieldItem, sal_Int32,
sal_Int32, Color*, Color* )
+virtual OUString CalcFieldValue( const SvxFieldItem, sal_Int32,
sal_Int32, Color*, Color* ) SAL_OVERRIDE
{
return OUString(j...@bob.com); // a sophisticated view of value:
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmerge/source
xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java
|5 --
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java
| 19 ++
2 files changed, 6 insertions(+), 18 deletions(-)
New commits:
commit a8df51771d01903cbb06913f9bfa6ceb2b020d42
Author: rbuj robert@gmail.com
Date: Sun Jul 27 11:44:47 2014 +0200
xmerge: If statement is redundant
Change-Id: Ic36d66e376f6fca536a25db4b3b69b50e2b95ae2
Reviewed-on: https://gerrit.libreoffice.org/10570
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java
index 7003779..1b4c0d1 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java
@@ -55,10 +55,7 @@ public class ConverterFactory {
else
foundInfo = ConverterInfoMgr.findConverterInfo(mimeTypeOut,
mimeTypeIn);
-if (foundInfo != null)
-return true;
-else
-return false;
+return foundInfo != null;
}
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java
index 985bee0..b02efb6 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java
@@ -143,10 +143,7 @@ public class ColumnRowInfo {
*/
public boolean isRow() {
-if(type==ROW)
-return true;
-else
-return false;
+return type==ROW;
}
/**
@@ -156,10 +153,7 @@ public class ColumnRowInfo {
*/
public boolean isColumn() {
-if(type==COLUMN)
-return true;
-else
-return false;
+return type==COLUMN;
}
/**
@@ -179,11 +173,8 @@ public class ColumnRowInfo {
*/
public boolean isDefaultSize() {
-if( type==ROW
-dimensionDEFAULTROWSIZE_MIN
-dimensionDEFAULTROWSIZE_MAX)
-return true;
-else
-return false;
+return type==ROW
+dimensionDEFAULTROWSIZE_MIN
+dimensionDEFAULTROWSIZE_MAX;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - configure.ac sal/rtl
configure.ac| 14 +++---
sal/rtl/strtmpl.cxx |1 +
2 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit a1ff2bb9a881da6fa6ea148c0b06e7f23392f5de
Author: Tor Lillqvist t...@collabora.com
Date: Mon Jul 28 09:45:06 2014 +0300
Include algorithm for std::min
Change-Id: I012027c38a6d2b06a4bb0cb53743d350b124ccf4
diff --git a/sal/rtl/strtmpl.cxx b/sal/rtl/strtmpl.cxx
index 57c98e2..c50309e 100644
--- a/sal/rtl/strtmpl.cxx
+++ b/sal/rtl/strtmpl.cxx
@@ -22,6 +22,7 @@
/* String-Class*/
/* === */
+#include algorithm
#include cassert
#include limits
commit 0f89f655c0b08dbeba90c587078e803c0db6c4f9
Author: Tor Lillqvist t...@collabora.com
Date: Mon Jul 28 09:22:29 2014 +0300
It's called GNU Make, not gnumake
Change-Id: I54900e077d5325fb6bfad84a2afa37f3adf551bb
diff --git a/configure.ac b/configure.ac
index 20049b3..5ef2401 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,9 +183,9 @@ cd $BUILDDIR
x_Cygwin=[\#]
dnl ===
-dnl Search all the common names for GNU make
+dnl Search all the common names for GNU Make
dnl ===
-AC_MSG_CHECKING([for GNU make])
+AC_MSG_CHECKING([for GNU Make])
# try to use our own make if it is available and GNUMAKE was not already
defined
if test -z $GNUMAKE; then
@@ -215,10 +215,10 @@ for a in $MAKE $GNUMAKE make gmake gnumake; do
done
AC_MSG_RESULT($GNUMAKE)
if test -z $GNUMAKE; then
-AC_MSG_ERROR([not found. install GNU make.])
+AC_MSG_ERROR([not found. install GNU Make.])
else
if test $GNUMAKE_WIN_NATIVE = TRUE ; then
-AC_MSG_NOTICE([Using a native Win32 gnumake version.])
+AC_MSG_NOTICE([Using a native Win32 GNU Make version.])
fi
fi
@@ -5020,7 +5020,7 @@ AC_SUBST(ENABLE_PCH)
TAB=`printf '\t'`
-AC_MSG_CHECKING([the GNU make version])
+AC_MSG_CHECKING([the GNU Make version])
_make_version=`$GNUMAKE --version | grep GNU | $GREP -v GPL | $SED -e
's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`
_make_longver=`echo $_make_version | $AWK -F. '{ print \$1*1+\$2*100+\$3
}'`
if test $_make_longver -ge 038200; then
@@ -5041,7 +5041,7 @@ elif test $_make_longver -ge 038100; then
elif test $SHA1SUM = openssl; then
SHA1SUM=openssl sha1
fi
-AC_MSG_CHECKING([for GNU make bug 20033])
+AC_MSG_CHECKING([for GNU Make bug 20033])
TESTGMAKEBUG20033=`mktemp -d tmp.XX`
$SED -e s/TAB/$TAB/g $TESTGMAKEBUG20033/Makefile EOF
A := \$(wildcard *.a)
@@ -5081,7 +5081,7 @@ else
fi
# find if gnumake support file function
-AC_MSG_CHECKING([whether GNU make supports the 'file' function])
+AC_MSG_CHECKING([whether GNU Make supports the 'file' function])
TESTGMAKEFILEFUNC=`mktemp -d -t tst.XX`
if test $GNUMAKE_WIN_NATIVE = TRUE ; then
TESTGMAKEFILEFUNC=`cygpath -m $TESTGMAKEFILEFUNC`
___
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 Bug 65675 depends on bug 79441, which changed state. Bug 79441 Summary: Internal references to other sheets not sorted https://bugs.freedesktop.org/show_bug.cgi?id=79441 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
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 79441, which changed state. Bug 79441 Summary: Internal references to other sheets not sorted https://bugs.freedesktop.org/show_bug.cgi?id=79441 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
[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|79441 | -- 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: cppcanvas/qa
cppcanvas/qa/extras/emfplus/emfplus.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8124418d7add872924b6c04258260d3c88678dc0 Author: Arnaud Versini arnaud.vers...@gmail.com Date: Mon Jul 21 20:30:47 2014 +0200 Use better coordinates for unit test of fdo#77229 Change-Id: I5fae217687e12313451da5bf4b4e6f914551b628 Reviewed-on: https://gerrit.libreoffice.org/10447 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx b/cppcanvas/qa/extras/emfplus/emfplus.cxx index adfb11c..68694b4 100644 --- a/cppcanvas/qa/extras/emfplus/emfplus.cxx +++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx @@ -82,7 +82,7 @@ void Test::testFdo77229() Bitmap aBitmap = load(fdo77229.emf); Bitmap::ScopedReadAccess pAccess(aBitmap); // The green star was missing. -CPPUNIT_ASSERT_EQUAL(sal_uInt32(0x00fe00), Color(pAccess-GetPixel(140, 140)).GetColor()); +CPPUNIT_ASSERT_EQUAL(sal_uInt32(0x00fe00), Color(pAccess-GetPixel(142, 140)).GetColor()); } CPPUNIT_TEST_SUITE_REGISTRATION(Test); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
rtf filter detection order
Hi All, Can someone point out some informations about the rtf filter detection order? I know that Calc has its own rtf filter (https://bugs.freedesktop.org/show_bug.cgi?id=65017#c19). Steps to reproduce: 1) Start LibreOffice 2) open a rtf document test.rtf 2a) create a test.rtf document with Writer 3) close the document 4) open a new blank spreadsheet 5) now open the same test.rtf from File Open test.rtf is opened with Calc I can't do the same test with MS Office but AOO opens a rtf file only with Writer, even if an instance of AOO Calc is active. * AOO411m3(Build:9772) - Rev. 1611634 * 2014-07-18 15:06 - Linux x86_64 * AOO410m18(Build:9764) - Rev. 1589052 * 2014-04-22 12:11 - Linux x86_64 This is our bug or our feature? Tests done on Ubuntu 14.04 x86_64 with LibreOffice: * Version: 4.3.1.0.0+ * Build ID: 764fdb983d2fd0e24f56db987eba307ae5ae6eea * TinderBox: Linux-rpm_deb-x86_64@46-TDF, Branch:libreoffice-4-3, Time: 2014-07-24_16:46:54 * Version: 4.3.0.3 * Build ID: 08ebe52789a201dd7d38ef653ef7a48925e7f9f7 * Version: 4.3.0.2 * Build ID: 14ed55896fdfcb93ff437b85c4f3e1923d2b1409 * Version: 4.2.6.2 * Build ID: 185f2ce4dcc34af9bd97dec29e6d42c39557298f * Version: 4.2.6.1 * Build ID: 5fdddf655fba363e34f755715238d0943a44857e * Version: 4.1.6.2 * Build ID: 40ff705089295be5be0aae9b15123f687c05b0a Regards, Marina -- Marina Latini mar...@studiostorti.com Studio Storti Srl Viale Leonardo da Vinci, 18 36100 - Vicenza (VI) http://www.studiostorti.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/table.hxx |1 +
sc/source/core/data/table3.cxx |8
sc/source/core/data/table7.cxx |8
3 files changed, 17 insertions(+)
New commits:
commit 290d0d779551b84dfa42e0c026ce4d7c0f00ea7a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Sun Jul 27 14:35:37 2014 -0400
fdo#81617: Split formula groups at sort range boundaries.
Otherwise, partially sorting a range may crash, or at best incorrectly
update formula references.
Change-Id: Iefcb86d205d83ccc5b684048bfd9aadabf6e13eb
(cherry picked from commit a3fc7f20089062afa4f778e70ba8be84032a30a7)
Reviewed-on: https://gerrit.libreoffice.org/10583
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 97ee720..f8928de 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -888,6 +888,7 @@ public:
formula::FormulaTokenRef ResolveStaticReference( SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2 );
formula::VectorRefArray FetchVectorRefArray( SCCOL nCol, SCROW nRow1,
SCROW nRow2 );
+void SplitFormulaGroups( SCCOL nCol, std::vectorSCROW rRows );
void UnshareFormulaCells( SCCOL nCol, std::vectorSCROW rRows );
void RegroupFormulaCells( SCCOL nCol );
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 31cfe2e..3b63f7e 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -755,6 +755,14 @@ void ScTable::SortReorderByRow(
ScSortInfoArray::RowsType* pRows = pArray-GetDataRows();
assert(pRows); // In sort-by-row mode we must have data rows already
populated.
+// Split formula groups at the sort range boundaries (if applicable).
+std::vectorSCROW aRowBounds;
+aRowBounds.reserve(2);
+aRowBounds.push_back(nRow1);
+aRowBounds.push_back(nRow2+1);
+for (SCCOL nCol = nCol1; nCol = nCol2; ++nCol)
+SplitFormulaGroups(nCol, aRowBounds);
+
// Cells in the data rows only reference values in the document. Make
// a copy before updating the document.
diff --git a/sc/source/core/data/table7.cxx b/sc/source/core/data/table7.cxx
index f3528dd..b427617 100644
--- a/sc/source/core/data/table7.cxx
+++ b/sc/source/core/data/table7.cxx
@@ -79,6 +79,14 @@ bool ScTable::HasUniformRowHeight( SCROW nRow1, SCROW nRow2
) const
return nRow2 = aData.mnRow2;
}
+void ScTable::SplitFormulaGroups( SCCOL nCol, std::vectorSCROW rRows )
+{
+if (!ValidCol(nCol))
+return;
+
+sc::SharedFormulaUtil::splitFormulaCellGroups(aCol[nCol].maCells, rRows);
+}
+
void ScTable::UnshareFormulaCells( SCCOL nCol, std::vectorSCROW rRows )
{
if (!ValidCol(nCol))
___
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/inc sc/source
sc/inc/table.hxx |1 +
sc/source/core/data/table3.cxx |8
sc/source/core/data/table7.cxx |8
3 files changed, 17 insertions(+)
New commits:
commit 0cb7d753b6b51411ab8dd72eab79f855a1d21c4d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Sun Jul 27 14:35:37 2014 -0400
fdo#81617: Split formula groups at sort range boundaries.
Otherwise, partially sorting a range may crash, or at best incorrectly
update formula references.
Change-Id: Iefcb86d205d83ccc5b684048bfd9aadabf6e13eb
(cherry picked from commit a3fc7f20089062afa4f778e70ba8be84032a30a7)
Reviewed-on: https://gerrit.libreoffice.org/10581
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index c4ad09e..c5b58b5 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -884,6 +884,7 @@ public:
formula::FormulaTokenRef ResolveStaticReference( SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2 );
formula::VectorRefArray FetchVectorRefArray( SCCOL nCol, SCROW nRow1,
SCROW nRow2 );
+void SplitFormulaGroups( SCCOL nCol, std::vectorSCROW rRows );
void UnshareFormulaCells( SCCOL nCol, std::vectorSCROW rRows );
void RegroupFormulaCells( SCCOL nCol );
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index ecfd850..91d7290 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -756,6 +756,14 @@ void ScTable::SortReorderByRow(
ScSortInfoArray::RowsType* pRows = pArray-GetDataRows();
assert(pRows); // In sort-by-row mode we must have data rows already
populated.
+// Split formula groups at the sort range boundaries (if applicable).
+std::vectorSCROW aRowBounds;
+aRowBounds.reserve(2);
+aRowBounds.push_back(nRow1);
+aRowBounds.push_back(nRow2+1);
+for (SCCOL nCol = nCol1; nCol = nCol2; ++nCol)
+SplitFormulaGroups(nCol, aRowBounds);
+
// Cells in the data rows only reference values in the document. Make
// a copy before updating the document.
diff --git a/sc/source/core/data/table7.cxx b/sc/source/core/data/table7.cxx
index f39e529..6ff53de 100644
--- a/sc/source/core/data/table7.cxx
+++ b/sc/source/core/data/table7.cxx
@@ -118,6 +118,14 @@ bool ScTable::HasUniformRowHeight( SCROW nRow1, SCROW
nRow2 ) const
return nRow2 = aData.mnRow2;
}
+void ScTable::SplitFormulaGroups( SCCOL nCol, std::vectorSCROW rRows )
+{
+if (!ValidCol(nCol))
+return;
+
+sc::SharedFormulaUtil::splitFormulaCellGroups(aCol[nCol].maCells, rRows);
+}
+
void ScTable::UnshareFormulaCells( SCCOL nCol, std::vectorSCROW rRows )
{
if (!ValidCol(nCol))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: rtf filter detection order
Hi, On Monday 28 July 2014 10:14:15 Marina Latini wrote: This is our bug or our feature? It's a feature. Without it the user will always need to scroll the long list of types in order to select Calc's filter. AFAIK it's handled in http://opengrok.libreoffice.org/xref/core/filter/source/config/cache/typedetection.cxx#480. Maxim ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: RepositoryExternal.mk
RepositoryExternal.mk | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) New commits: commit 5b66024c117f2c354dda5c928f09d4cc21403b51 Author: David Tardon dtar...@redhat.com Date: Mon Jul 28 10:38:49 2014 +0200 make sure ICU libs are available when needed Change-Id: I56faa8f0b1567a4e45cafc8edff17423b1e29c35 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 15bd09b..f10c68f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3760,7 +3760,10 @@ else # ! SYSTEM_LIBXML_FOR_BUILD define gb_ExternalExecutable__register_xmllint $(call gb_ExternalExecutable_set_internal,xmllint,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xml2/$(if $(filter MSC,$(COM)),win32/bin.msvc)/xmllint$(gb_Executable_EXT_for_build),xml2) -$(call gb_ExternalExecutable_add_dependencies,xmllint,$(call gb_Package_get_target,xml2)) +$(call gb_ExternalExecutable_add_dependencies,xmllint,\ + $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,icu_ure)) \ + $(call gb_Package_get_target,xml2) \ +) endef @@ -3774,7 +3777,10 @@ else # ! SYSTEM_LIBXSLT_FOR_BUILD define gb_ExternalExecutable__register_xsltproc $(call gb_ExternalExecutable_set_internal,xsltproc,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xslt/$(if $(filter MSC,$(COM)),win32/bin.msvc,xsltproc)/xsltproc$(gb_Executable_EXT_for_build),xslt) -$(call gb_ExternalExecutable_add_dependencies,xsltproc,$(call gb_Package_get_target,xslt)) +$(call gb_ExternalExecutable_add_dependencies,xsltproc,\ + $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,icu_ure)) \ + $(call gb_Package_get_target,xslt) \ +) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/cmis/cmis_content.cxx | 63 +++
1 file changed, 50 insertions(+), 13 deletions(-)
New commits:
commit fb6e0da4d86ff71e523ab78156cc1938ef00d4db
Author: Mihai Varga mihai.m...@gmail.com
Date: Mon Jul 28 11:41:48 2014 +0300
UNO to CMIS properties conversion fix
The initial code always extracted Strings from the UNO instead of extracting
the same data type that was written into it. This patch extracts the
properties according to their data type and formats them to be reconstructed
into CMIS properties.
Change-Id: Ib160020e9d923a46e2c4f90924da847f2dac5e7a
Reviewed-on: https://gerrit.libreoffice.org/10586
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index 7cd9d3e..88b4784 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -48,6 +48,7 @@
#include ucbhelper/std_outputstream.hxx
#include ucbhelper/propertyvalueset.hxx
#include ucbhelper/proxydecider.hxx
+#include sax/tools/converter.hxx
#include auth_provider.hxx
#include certvalidation_handler.hxx
@@ -177,17 +178,66 @@ namespace
bool bMultiValued = prop.MultiValued;
bool bOpenChoice = prop.OpenChoice;
uno::Any value = prop.Value;
+std::vector std::string values;
+
libcmis::PropertyType::Type type = libcmis::PropertyType::String;
if ( prop.Type == CMIS_TYPE_STRING )
+{
+uno::Sequence OUString seqValue;
+value = seqValue;
+sal_Int32 m_nNumValue = seqValue.getLength( );
+for ( sal_Int32 i = 0; i m_nNumValue; ++i )
+{
+values.push_back( OUSTR_TO_STDSTR( seqValue[i] ) );
+}
type = libcmis::PropertyType::String;
+}
else if ( prop.Type == CMIS_TYPE_BOOL )
+{
+uno::Sequence sal_Bool seqValue;
+value = seqValue;
+sal_Int32 m_nNumValue = seqValue.getLength( );
+for ( sal_Int32 i = 0; i m_nNumValue; ++i )
+{
+values.push_back( OUSTR_TO_STDSTR( OUString::boolean(
seqValue[i] ) ) );
+}
type = libcmis::PropertyType::Bool;
+}
else if ( prop.Type == CMIS_TYPE_INTEGER )
+{
+uno::Sequence sal_Int64 seqValue;
+value = seqValue;
+sal_Int32 m_nNumValue = seqValue.getLength( );
+for ( sal_Int32 i = 0; i m_nNumValue; ++i )
+{
+values.push_back( OUSTR_TO_STDSTR( OUString::number(
seqValue[i] ) ) );
+}
type = libcmis::PropertyType::Integer;
+}
else if ( prop.Type == CMIS_TYPE_DECIMAL )
+{
+uno::Sequence double seqValue;
+value = seqValue;
+sal_Int32 m_nNumValue = seqValue.getLength( );
+for ( sal_Int32 i = 0; i m_nNumValue; ++i )
+{
+values.push_back( OUSTR_TO_STDSTR( OUString::number(
seqValue[i] ) ) );
+}
type = libcmis::PropertyType::Decimal;
+}
else if ( prop.Type == CMIS_TYPE_DATETIME )
+{
+uno::Sequence util::DateTime seqValue;
+value = seqValue;
+sal_Int32 m_nNumValue = seqValue.getLength( );
+for ( sal_Int32 i = 0; i m_nNumValue; ++i )
+{
+OUStringBuffer aBuffer;
+::sax::Converter::convertDateTime( aBuffer, seqValue[i], 0,
false );
+values.push_back( OUSTR_TO_STDSTR( aBuffer.makeStringAndClear(
) ) );
+}
type = libcmis::PropertyType::DateTime;
+}
propertyType-setId( OUSTR_TO_STDSTR( id ));
propertyType-setDisplayName( OUSTR_TO_STDSTR( name ) );
@@ -197,23 +247,10 @@ namespace
propertyType-setOpenChoice( bOpenChoice );
propertyType-setType( type );
-std::vector std::string values;
-
-// convert UNO value to string vector
-uno::Sequence OUString aStrings;
-value = aStrings;
-sal_Int32 len = aStrings.getLength( );
-for ( sal_Int32 i = 0; i len; i++ )
-{
-string str = OUSTR_TO_STDSTR( aStrings[i] );
-values.push_back( str );
-}
-
libcmis::PropertyPtr property( new libcmis::Property( propertyType,
values ) );
return property;
}
-
}
namespace cmis
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/dinfdlg.cxx | 49 +
1 file changed, 49 insertions(+)
New commits:
commit fc57915d1583c960f7574b5c4a67415854e974d1
Author: Mihai Varga mihai.m...@gmail.com
Date: Thu Jul 24 18:40:53 2014 +0300
Some properties in File-Properties-General Tab are not set for remote docs
This patch handles the case in which no meta information could be extracted
from
the file, so CMIS properties are displayed instead, if it is a CMIS
document.
Size and creation/modification dates are handled here.
Change-Id: I97f920172b15a76297d78a33ac3a07a8333ef8a6
Reviewed-on: https://gerrit.libreoffice.org/10511
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index f0fc12e..8e89b02 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1098,6 +1098,55 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet )
m_pInfoItem-getEditingCycles() ) );
}
+// Check for cmis properties where otherwise unavailable
+if ( m_pInfoItem-isCmisDocument( ) )
+{
+uno::Sequence document::CmisProperty aCmisProps =
m_pInfoItem-GetCmisProperties();
+for ( sal_Int32 i = 0; i aCmisProps.getLength(); i++ )
+{
+if ( aCmisProps[i].Id == cmis:contentStreamLength
+ aSizeText == m_aUnknownSize )
+{
+Sequence sal_Int64 seqValue;
+aCmisProps[i].Value = seqValue;
+SvNumberFormatter m_aNumberFormatter(
::comphelper::getProcessComponentContext(),
+
Application::GetSettings().GetLanguageTag().getLanguageType() );
+sal_uInt32 nIndex = m_aNumberFormatter.GetFormatIndex(
NF_NUMBER_SYSTEM );
+if ( seqValue.getLength( ) 0 )
+{
+OUString sValue;
+m_aNumberFormatter.GetInputLineString( seqValue[0],
nIndex, sValue );
+m_pShowSizeFT-SetText( CreateSizeText( sValue.toInt64( )
) );
+}
+}
+
+util::DateTime uDT;
+OUString emptyDate = ConvertDateTime_Impl( , uDT, rLocaleWrapper
);
+if ( aCmisProps[i].Id == cmis:creationDate
+ m_pCreateValFt-GetText( ) == emptyDate ||
+ m_pCreateValFt-GetText( ).isEmpty( ) )
+{
+Sequence util::DateTime seqValue;
+aCmisProps[i].Value = seqValue;
+if ( seqValue.getLength( ) 0 )
+{
+m_pCreateValFt-SetText( ConvertDateTime_Impl( ,
seqValue[0], rLocaleWrapper ) );
+}
+}
+if ( aCmisProps[i].Id == cmis:lastModificationDate
+ m_pChangeValFt-GetText( ) == emptyDate ||
+ m_pChangeValFt-GetText( ).isEmpty( ) )
+{
+Sequence util::DateTime seqValue;
+aCmisProps[i].Value = seqValue;
+if ( seqValue.getLength( ) 0 )
+{
+m_pChangeValFt-SetText( ConvertDateTime_Impl( ,
seqValue[0], rLocaleWrapper ) );
+}
+}
+}
+}
+
m_pUseUserDataCB-SetState( static_castTriState(m_bUseUserData) );
m_pUseUserDataCB-SaveValue();
m_pUseUserDataCB-Enable( bEnableUseUserData );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/Library_ucpcmis1.mk
ucb/Library_ucpcmis1.mk |1 + 1 file changed, 1 insertion(+) New commits: commit a227c575bbc595e9928f0269989cba226d157048 Author: Mihai Varga mihai.m...@gmail.com Date: Mon Jul 28 12:48:35 2014 +0300 Linked the sax library to CMIS This is needed for the use of DateTime converter. I forgot to add the makefile when I commited this patch: https://gerrit.libreoffice.org/#/c/10586/ Change-Id: I7cb9ab40fab549a95beb6818ab4ad4befdd3dea1 diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk index 57c3719..d3d3ae3 100644 --- a/ucb/Library_ucpcmis1.mk +++ b/ucb/Library_ucpcmis1.mk @@ -20,6 +20,7 @@ $(eval $(call gb_Library_use_libraries,ucpcmis1,\ cppuhelper \ sal \ salhelper \ + sax \ ucbhelper \ tl \ $(gb_UWINAPI) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/dinfdlg.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 42977e3ce7a65c5714a613a4e6af9aac6029bc32
Author: Michael Stahl mst...@redhat.com
Date: Mon Jul 28 12:02:38 2014 +0200
sfx2: -Werror=parentheses
Change-Id: I94973343bb3ec4a055d9a46ca7ac800dd08406ad
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 8e89b02..2e05124 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1123,8 +1123,8 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet )
util::DateTime uDT;
OUString emptyDate = ConvertDateTime_Impl( , uDT, rLocaleWrapper
);
if ( aCmisProps[i].Id == cmis:creationDate
- m_pCreateValFt-GetText( ) == emptyDate ||
- m_pCreateValFt-GetText( ).isEmpty( ) )
+ (m_pCreateValFt-GetText() == emptyDate ||
+ m_pCreateValFt-GetText().isEmpty()))
{
Sequence util::DateTime seqValue;
aCmisProps[i].Value = seqValue;
@@ -1134,8 +1134,8 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet )
}
}
if ( aCmisProps[i].Id == cmis:lastModificationDate
- m_pChangeValFt-GetText( ) == emptyDate ||
- m_pChangeValFt-GetText( ).isEmpty( ) )
+ (m_pChangeValFt-GetText() == emptyDate ||
+ m_pChangeValFt-GetText().isEmpty()))
{
Sequence util::DateTime seqValue;
aCmisProps[i].Value = seqValue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/customize/macropg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e221c954ea0b7c3846bd6971a06b6a28672a28c7
Author: Takeshi Abe t...@fixedpoint.jp
Date: Mon Jul 28 18:27:15 2014 +0900
fix a memory leak
Change-Id: I105f0ac40251122348ed86eaab5d99a023f5c09b
Reviewed-on: https://gerrit.libreoffice.org/10588
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index bd89250..8ab8d2b 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -658,7 +658,7 @@ long _SvxMacroTabPage::GenericHandler_Impl(
_SvxMacroTabPage* pThis, PushButton*
else if( bAssEnabled )
{
// assign pressed
-SvxScriptSelectorDialog* pDlg = new SvxScriptSelectorDialog( pThis,
false, pThis-GetFrame() );
+boost::scoped_ptrSvxScriptSelectorDialog pDlg(new
SvxScriptSelectorDialog( pThis, false, pThis-GetFrame() ));
if( pDlg )
{
short ret = pDlg-Execute();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmerge/source
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
|5 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
|5 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java
|4 -
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java
| 18 +++
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
|4 -
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
| 25 ++
6 files changed, 22 insertions(+), 39 deletions(-)
New commits:
commit a9a944eab5edae826767fabdbc12ee4e74d76d23
Author: rbuj robert@gmail.com
Date: Sun Jul 27 12:01:40 2014 +0200
xmerge: Enhanced For-Loops
Change-Id: Id9fbffbf74d7583bf1ac8239899abdf0c2347cf2
Reviewed-on: https://gerrit.libreoffice.org/10573
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
index cd362f7..5a24b43 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
@@ -353,8 +353,9 @@ public final class PalmDB {
out.writeShort(records.length);
// let each Record object write out its own info.
-for (int i = 0; i records.length; i++)
-records[i].write(out);
+for (Record record : records) {
+record.write(out);
+}
}
/**
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
index 3e170b5..cc45fa5 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
@@ -662,9 +662,10 @@ public class TextStyle extends Style implements Cloneable {
* otherwise false.
*/
private boolean isIgnored(String attribute) {
-for (int i = 0; i ignored.length; i++) {
-if (ignored[i].equals(attribute))
+for (String ignored1 : ignored) {
+if (ignored1.equals(attribute)) {
return true;
+}
}
return false;
}
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java
index f1cf6a1..255d8bf 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java
@@ -19,7 +19,6 @@
package org.openoffice.xmerge.converter.xml.sxc;
import java.util.ArrayList;
-import java.util.Iterator;
import org.openoffice.xmerge.converter.xml.OfficeConstants;
import org.openoffice.xmerge.util.Debug;
@@ -138,8 +137,7 @@ public class BookSettings implements OfficeConstants {
this.settings = settings;
Element configItemMapNamed =
settings.createElement(TAG_CONFIG_ITEM_MAP_NAMED);
configItemMapNamed.setAttribute(ATTRIBUTE_CONFIG_NAME, Tables);
-for(IteratorSheetSettings e =
worksheetSettings.iterator();e.hasNext();) {
-SheetSettings s = e.next();
+for (SheetSettings s : worksheetSettings) {
s.writeNode(settings, configItemMapNamed);
}
addConfigItem(root, ActiveTable, string, activeSheet);
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java
index 87dd1da..a4ba311 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java
@@ -64,18 +64,18 @@ public class DocumentMerge implements MergeAlgorithm {
int currentPosition = -1;
boolean haveDeleteOperation = false;
-for (int i = 0; i differences.length; i++) {
-if (differences[i].getOrgPosition() currentPosition) {
-currentPosition = differences[i].getOrgPosition();
-if (differences[i].getOperation() == Difference.DELETE) {
+for (Difference difference : differences) {
+if (difference.getOrgPosition() currentPosition) {
+currentPosition = difference.getOrgPosition();
+if (difference.getOperation() == Difference.DELETE) {
haveDeleteOperation = true;
} else {
haveDeleteOperation = false;
}
-} else if
[Libreoffice-commits] core.git: xmerge/source
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java
| 10 ++--
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java
|8 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
| 12 +++---
3 files changed, 9 insertions(+), 21 deletions(-)
New commits:
commit 2505225c6ff7ea4e53fa3ada3ab43affd0a4fd00
Author: rbuj robert@gmail.com
Date: Mon Jul 28 10:58:51 2014 +0200
xmerge: If statement is redundant
Change-Id: I62914ab65258de36790387b7a8865a32b0d7bca6
Reviewed-on: https://gerrit.libreoffice.org/10587
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java
index 23ba1d3..48d6347 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java
@@ -67,13 +67,9 @@ public final class ParaNodeIterator extends NodeIterator {
// can use an array later to check all possible tags for
// future expansion
-if (node.getNodeType() == Node.ELEMENT_NODE
-(node.getNodeName().equals(SUPPORTED_TAG1) ||
- node.getNodeName().equals(SUPPORTED_TAG2))) {
-return true;
-} else {
-return false;
-}
+return node.getNodeType() == Node.ELEMENT_NODE
+(node.getNodeName().equals(SUPPORTED_TAG1) ||
+node.getNodeName().equals(SUPPORTED_TAG2));
}
}
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java
index 779393e..02ac53f 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java
@@ -56,12 +56,8 @@ public final class RowIterator extends NodeIterator {
// can use an array later to check all possible tags for
// future expansion
-if (node.getNodeType() == Node.ELEMENT_NODE
-node.getNodeName().equals(OfficeConstants.TAG_TABLE_ROW)) {
-return true;
-} else {
-return false;
-}
+return node.getNodeType() == Node.ELEMENT_NODE
+node.getNodeName().equals(OfficeConstants.TAG_TABLE_ROW);
}
}
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
index 2450914..61b886b 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
@@ -60,14 +60,10 @@ public final class TextNodeIterator extends NodeIterator {
// can use an array later to check all possible tags for
// future expansion
-if (node.getNodeType() == Node.TEXT_NODE ||
-node.getNodeName().equals(OfficeConstants.TAG_SPACE) ||
-node.getNodeName().equals(OfficeConstants.TAG_TAB_STOP) ||
-node.getNodeName().equals(OfficeConstants.TAG_LINE_BREAK)) {
-return true;
-} else {
-return false;
-}
+return node.getNodeType() == Node.TEXT_NODE ||
+node.getNodeName().equals(OfficeConstants.TAG_SPACE) ||
+node.getNodeName().equals(OfficeConstants.TAG_TAB_STOP) ||
+node.getNodeName().equals(OfficeConstants.TAG_LINE_BREAK);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source
sw/inc/docary.hxx|3 +++
sw/source/core/doc/CntntIdxStore.cxx |6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit e8193627922ee328d17250ec518ecd4ba342c97d
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Jul 25 10:21:16 2014 +0200
use the Redline iterator
Change-Id: Ia15e5a376b2a7503f56f183a555e21d1122fe66f
diff --git a/sw/source/core/doc/CntntIdxStore.cxx
b/sw/source/core/doc/CntntIdxStore.cxx
index 56c554d..ee22f86 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -264,10 +264,9 @@ void CntntIdxStoreImpl::RestoreBkmks(SwDoc* pDoc,
updater_t rUpdater)
void CntntIdxStoreImpl::SaveRedlines(SwDoc* pDoc, sal_uLong nNode, sal_Int32
nCntnt)
{
-const SwRedlineTbl rRedlTbl = pDoc-GetRedlineTbl();
-for( long int nIdx = 0 ; static_castunsigned long int(nIdx)
rRedlTbl.size(); ++nIdx )
+long int nIdx = 0;
+BOOST_FOREACH(const SwRangeRedline* pRdl, pDoc-GetRedlineTbl())
{
-const SwRangeRedline* pRdl = rRedlTbl[ nIdx ];
int nPointPos = lcl_RelativePosition( *pRdl-GetPoint(), nNode, nCntnt
);
int nMarkPos = pRdl-HasMark() ? lcl_RelativePosition(
*pRdl-GetMark(), nNode, nCntnt ) :
nPointPos;
@@ -286,6 +285,7 @@ void CntntIdxStoreImpl::SaveRedlines(SwDoc* pDoc, sal_uLong
nNode, sal_Int32 nCn
const MarkEntry aEntry = { nIdx, true,
pRdl-GetMark()-nContent.GetIndex() };
m_aRedlineEntries.push_back(aEntry);
}
+++nIdx;
}
}
commit 46c3eca442c31663ac0a907769e65679af090920
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Jul 25 10:21:09 2014 +0200
a const_iterator for Redlines
Change-Id: I22481191d5cbc905a9af7530e075acda21fcbeba
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 94f8229..e9e3b6f 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -192,6 +192,9 @@ public:
*/
const SwRangeRedline* FindAtPosition( const SwPosition startPosition,
sal_uInt16 tableIndex, bool next = true ) const;
+using _SwRedlineTbl::const_iterator;
+using _SwRedlineTbl::begin;
+using _SwRedlineTbl::end;
using _SwRedlineTbl::size;
using _SwRedlineTbl::operator[];
using _SwRedlineTbl::empty;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/first-header-footer.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 31 +-
writerfilter/source/dmapper/DomainMapper_Impl.cxx |4 -
writerfilter/source/dmapper/PropertyMap.cxx| 52 +++--
4 files changed, 44 insertions(+), 43 deletions(-)
New commits:
commit b4ccde72b8e2e45e7276d5b08b182495a1b1a617
Author: Luke Deller l...@deller.id.au
Date: Sat Jul 12 21:49:50 2014 +1000
Copy first-header-footer test from ww8 to ooxml
The test document was converted from doc to docx using MS Word 2010.
Several fixes were required to make this test pass:
- Do not clear the FirstIsShared property on page styles, as the code
instead uses the old fashioned method of translating a Word section
with different first page header/footer: two page styles linked
together, the first page style and the follow page style.
(Also remove a wrong test case which checks the FirstIsShared property)
- Do not clear the HeaderIsShared/FooterIsShared properties on the
first page style, only on the follow page style.
- Actually set the FollowStyle property on the first page style to
link it to the follow page style. This didn't matter for the very
first Word section because it was mapped to the default page styles
First Page and Standard which are already linked, but it does
matter for subsequent Word sections.
- For some reason setting a new page style at a section break was
excluded in the case where the following section had a title page.
Remove this exclusion.
- The exclusion mentioned in the last point was masking that bnc#751077
was not entirely fixed. To resolve that issue:
When checking if the last paragraph of the section is empty, consider
not just text content but also shapes.
- Remove a workaround for bnc#780843 involving copying of headers and
footers from the Standard (first section) page style in the case
where the following section had a title page. This workaround is no
longer needed as the test case passes without it.
Change-Id: Iacc9bba0720c11414da3e852892cff301ebbc4fe
diff --git a/sw/qa/extras/ooxmlexport/data/first-header-footer.docx
b/sw/qa/extras/ooxmlexport/data/first-header-footer.docx
new file mode 100755
index 000..d18eea5
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/first-header-footer.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index eac281a..1fdc15e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -894,8 +894,14 @@ DECLARE_OOXMLEXPORT_TEST(testPageBorderSpacingExportCase2,
page-borders-export-
DECLARE_OOXMLEXPORT_TEST(testFdo66145, fdo66145.docx)
{
// The Writer ignored the 'First Is Shared' flag
-uno::Referencebeans::XPropertySet
xPropertySet(getStyles(PageStyles)-getByName(First Page), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(false, bool(getPropertysal_Bool(xPropertySet,
FirstIsShared)));
+CPPUNIT_ASSERT_EQUAL(OUString(This is the FIRST page header.),
+parseDump(/root/page[1]/header/txt/text()));
+CPPUNIT_ASSERT_EQUAL(
+OUString(This is the header for the REST OF THE FILE.),
+parseDump(/root/page[2]/header/txt/text()));
+CPPUNIT_ASSERT_EQUAL(
+OUString(This is the header for the REST OF THE FILE.),
+parseDump(/root/page[3]/header/txt/text()));
}
DECLARE_OOXMLEXPORT_TEST(testGrabBag, grabbag.docx)
@@ -3430,6 +3436,27 @@ DECLARE_OOXMLEXPORT_TEST(testFdo80902, fdo80902.docx)
assertXPath(pXmlDoc, /w:document/w:body/w:sectPr/w:docGrid, type,
lines);
}
+DECLARE_OOXMLEXPORT_TEST(testFirstHeaderFooter, first-header-footer.docx)
+{
+// Test import and export of a section's headerf/footerf properties.
+// (copied from a ww8export test, with doc converted to docx using Word)
+
+// The document has 6 pages. Note that we don't test if 4 or just 2 page
+// styles are created, the point is that layout should be correct.
+CPPUNIT_ASSERT_EQUAL(OUString(First page header),
parseDump(/root/page[1]/header/txt/text()));
+CPPUNIT_ASSERT_EQUAL(OUString(First page footer),
parseDump(/root/page[1]/footer/txt/text()));
+CPPUNIT_ASSERT_EQUAL(OUString(Even page header),
parseDump(/root/page[2]/header/txt/text()));
+CPPUNIT_ASSERT_EQUAL(OUString(Even page footer),
parseDump(/root/page[2]/footer/txt/text()));
+CPPUNIT_ASSERT_EQUAL(OUString(Odd page header),
parseDump(/root/page[3]/header/txt/text()));
+CPPUNIT_ASSERT_EQUAL(OUString(Odd page footer),
parseDump(/root/page[3]/footer/txt/text()));
+CPPUNIT_ASSERT_EQUAL(OUString(First page header2),
parseDump(/root/page[4]/header/txt/text()));
+CPPUNIT_ASSERT_EQUAL(OUString(First page footer 2),
[ANN] LIbreOffice 4.2.6 RC2 available
Dear Community, The Document Foundation is pleased to announce the second release candidate of LibreOffice 4.2.6. The upcoming 4.2.6 will be the sixth in a sequence of frequent bugfix releases for our feature-packed 4.2 line. Feel free to give it a try instead of 4.2.5. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Developers and QA might also be interested in the symbol server for windows debug information (see the release notes linked below for details) Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/community/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 4.2.6 RC2 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.2.6/RC2 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. On behalf of the Community, Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANN] LIbreOffice 4.3.0 RC4 available
Dear Community, The Document Foundation is pleased to announce the fourth release candidate of LibreOffice 4.3.0. The upcoming 4.3.0 will be the eighth major release of LibreOffice, coming with a bunch of new features beside the usual bugfixes. RC4 is in release configuration and can be be installed alongside the stable version on linux and Mac OS X, but will update an earlier version on Windows. RC4 is an unscheduled RC that fixes a problem with spellchecking on windows. A work-in-progress list of new features in LibreOffice 4.3 can be found at https://wiki.documentfoundation.org/ReleaseNotes/4.3 The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Developers and QA might also be interested in the symbol server for windows debug information (see the release notes linked below for details) Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/community/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 4.3.0 RC4 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.3.0/RC4 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. On behalf of the Community, Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: framework/source
framework/source/services/autorecovery.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8a406391b1af4bd4ae1b73806b80e11a58340351
Author: Maxim Monastirsky momonas...@gmail.com
Date: Mon Jul 28 15:00:40 2014 +0300
Recovery files can have an extension
Looks like unintentional change made in
c4a593b6b1732def0a21f455c0ca50f82a9bc40d
Change-Id: If314a3f290c79909e3a807f9c9c95791c26067e9
diff --git a/framework/source/services/autorecovery.cxx
b/framework/source/services/autorecovery.cxx
index 76d76d4..2c3f26b 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1984,7 +1984,7 @@ void
AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume
css::uno::Sequence OUString lExtensions =
lTypeProps.getUnpackedValueOrDefault(OUString(TYPE_PROP_EXTENSIONS),
css::uno::Sequence OUString ());
if (lExtensions.getLength())
{
-rInfo.Extension = lExtensions[0];
+rInfo.Extension = . + lExtensions[0];
}
else
rInfo.Extension = .unknown;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSOC] Tiled Rendering, ahunt, Weekly Report 10 / WK30
And finally, managed to miss the largest part of last weeks work: * Viewport / overlapping tile matching issues: ** Reverted the assert disabling. ** Revert the DocShell::SetVisArea hack -- using this seems to confuse the rest of sw, causing the viewport asserts (i.e. previous point). ** Instead used SwViewSh:VisPortChgd-- which works as expected (i.e. correct and matching output, no spurious asserts). ** Allows comparison of all tiles in the lok tiledrendering test. ** But the test is currently still disabled due to loading issues on some TBs (and ~useless debug output from framework/sfx2). For completeness sake, current branches: * feature/soffice_main: ** Enables the rendering of images for calc/impress. ** Could probably be merged -- but a review would be good, especially since I'm unsure of the naming. ** Also currently sometimes segfaulting on shutdown since rebasing on master at the weekend, still debugging that... (Seems to be about 50/50 reliability.) * feature/calctiledrendering5 ** All the calc tiled rendering work. ** (Still needs further work as to not break the usual UI.) Cheers, Andrzej On 28/07/14 10:23, Andrzej Hunt wrote: Hi All, * soffice_main LOK integration: ** Integrated configuration initialisation for unit tests into gbuild: we now run a simple LOK binary to ensure that the unit test doesn't have to deal with restarting itself instead. ( gb_CppunitTest_use_confpreinit ) ** Disabled Impress Remote for headless -- it's more or less useless, and could block a real LO instance from getting hold of the correct ports. ** Made CommandLineArgs ignore '--protector': soffice_main/Desktop init. fails if there are unknown arguments (which --protector previously was) -- this hasn't been an issue before as unit tests typically don't run soffice_main. ** Added --headless arg to lok_initialize: we already manually set headless on vcl/Application, but Desktop/CommandLineArgs has a separate concept of headless (which is used e.g. to decide whether or not to show document recovery dialogs) -- the latter is actually used to set the former (the vcl/Application headless is then used to cancel any later dialogs that might be shown). *** (Might be better to allow manual setting of the headless flag directly rather than by passing string arguments which are then parsed?) * Moved all this into feature/lok_sofficemain since it's probably not far off being mergeable. * Rebased calc work atop of that (feature/calctiledrendering5). * Moved lok_init from shim.c into LibreOfficeKit.h (i.e. killing the static library) ** https://gerrit.libreoffice.org/#/c/10584/ ** Made it a static function -- can't use inline since we need to support c89 -- since lok_init only exists on Linux we could potentially use c99 there, but I imagine it would be a can of worms to selectively enable c99 when virtually all the other LO C code has to stay c89 compatible anyways. ** And we have to use #pragma to disbale -Wunused-function... Some screens of calc/impress with images visible are attached. Cheers, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[GSoC] Varga Mihai - progress report week 10
Hello, Last week I finished the CMIS document representation for a SharePoint file and I've started to work on the folder representation. I also fixed a bug where CMIS properties were not well extracted from UNO any, they had to be extracted accordingly to the property tipe, string, int, datetime etc. And partially solved another bug (for the CMIS case) where the size property in File-Properties-General tab is not displayed for remote documents. The latter is still opened here https://bugs.freedesktop.org/show_bug.cgi?id=81718 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/AllLangResTarget_dbu.mk dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk extras/source
dbaccess/AllLangResTarget_dbu.mk |1
dbaccess/UIConfig_dbaccess.mk |4
dbaccess/source/ui/control/charsetlistbox.cxx | 18
dbaccess/source/ui/control/curledit.cxx | 13
dbaccess/source/ui/dlg/AutoControls_tmpl.hrc | 197 --
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 84 ++--
dbaccess/source/ui/dlg/ConnectionHelper.hxx | 10
dbaccess/source/ui/dlg/ConnectionPage.cxx | 62 +--
dbaccess/source/ui/dlg/ConnectionPage.hxx |4
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx| 61 ++-
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx|8
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx |8
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 282 +-
dbaccess/source/ui/dlg/TextConnectionHelper.hxx | 40 +-
dbaccess/source/ui/dlg/dbadmin.src| 42 +-
dbaccess/source/ui/dlg/dbadminsetup.hrc |2
dbaccess/source/ui/dlg/dbadminsetup.src | 29 -
dbaccess/source/ui/dlg/detailpages.cxx| 46 ++
dbaccess/source/ui/dlg/detailpages.hxx|2
dbaccess/source/ui/dlg/textconnectionsettings.cxx | 10
dbaccess/source/ui/dlg/textconnectionsettings.src | 55 --
dbaccess/source/ui/inc/charsetlistbox.hxx |1
dbaccess/source/ui/inc/curledit.hxx |1
dbaccess/source/ui/inc/dbu_dlg.hrc|6
dbaccess/source/ui/inc/dbu_resource.hrc |9
dbaccess/source/ui/inc/textconnectionsettings.hxx |3
dbaccess/uiconfig/ui/dbwiztextpage.ui | 166
dbaccess/uiconfig/ui/emptypage.ui | 16
dbaccess/uiconfig/ui/textconnectionsettings.ui| 84
dbaccess/uiconfig/ui/textpage.ui | 431 ++
extras/source/glade/libreoffice-catalog.xml.in|6
31 files changed, 1127 insertions(+), 574 deletions(-)
New commits:
commit 03fe3215e35d07319eac4a0e7a8d6e5563244492
Author: Szymon KÅos eszka...@gmail.com
Date: Sun Jul 27 13:56:58 2014 +0200
PAGE_DBWIZARD_TEXT, PAGE_TEXT, DLG_TEXT_CONNECTION_SETTINGS conversion to
.ui
Change-Id: Iea5105cc33b436e9c0728df799b1ceb63f20e46e
Reviewed-on: https://gerrit.libreoffice.org/10579
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index 9cc5850..11150f8 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
dbaccess/source/ui/dlg/indexdialog.src \
dbaccess/source/ui/dlg/paramdialog.src \
dbaccess/source/ui/dlg/sqlmessage.src \
-dbaccess/source/ui/dlg/textconnectionsettings.src \
dbaccess/source/ui/dlg/UserAdmin.src \
dbaccess/source/ui/misc/dbumiscres.src \
dbaccess/source/ui/misc/WizardPages.src \
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index cb76450..6a79a08 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -19,7 +19,9 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/colwidthdialog \
dbaccess/uiconfig/ui/copytablepage \
dbaccess/uiconfig/ui/dbaseindexdialog \
+dbaccess/uiconfig/ui/dbwiztextpage \
dbaccess/uiconfig/ui/directsqldialog \
+dbaccess/uiconfig/ui/emptypage \
dbaccess/uiconfig/ui/fielddialog \
dbaccess/uiconfig/ui/finalpagewizard \
dbaccess/uiconfig/ui/generalpagedialog \
@@ -42,6 +44,8 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/tablesfilterdialog \
dbaccess/uiconfig/ui/tablesfilterpage \
dbaccess/uiconfig/ui/tablesjoindialog \
+dbaccess/uiconfig/ui/textconnectionsettings \
+dbaccess/uiconfig/ui/textpage \
dbaccess/uiconfig/ui/useradmindialog \
))
diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx
b/dbaccess/source/ui/control/charsetlistbox.cxx
index e1578d0..371f372 100644
--- a/dbaccess/source/ui/control/charsetlistbox.cxx
+++ b/dbaccess/source/ui/control/charsetlistbox.cxx
@@ -39,6 +39,24 @@ namespace dbaui
}
}
+CharSetListBox::CharSetListBox( Window* _pParent, WinBits _nBits =
WB_DROPDOWN )
+:ListBox( _pParent, _nBits )
+{
+SetDropDownLineCount( 20 );
+
+OCharsetDisplay::const_iterator charSet = m_aCharSets.begin();
+while ( charSet != m_aCharSets.end() )
+{
+InsertEntry( (*charSet).getDisplayName() );
+++charSet;
+}
+}
+
+extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCharSetListBox(Window
*pParent)
+{
+return new CharSetListBox(pParent);
+}
+
CharSetListBox::~CharSetListBox()
{
}
diff --git a/dbaccess/source/ui/control/curledit.cxx
Re: Tinderbox 'Win-x86@42' seems stuck
Thanks all for the info, and Thorsten for the restart ... Looks like the MAC tinderbox is also stuck. Time for me to fire up that link =) On Mon, Jul 28, 2014 at 1:32 AM, Pedro pedl...@gmail.com wrote: Adam Fyne wrote Who is responsible for this machine and can maybe quickly check it out? FYI There is a table in the wikipedia with the contact person for each Tinderbox https://wiki.documentfoundation.org/Development/Tinderbox#List_of_registered_Tinderboxes Hope this helps ;) -- View this message in context: http://nabble.documentfoundation.org/Tinderbox-Win-x86-42-seems-stuck-tp4116885p4116923.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 -- *Adam Fyne* Interoperability Team Leader Twitter http://www.twitter.com/cloudoninc | LinkedIn http://www.linkedin.com/company/cloudon | Facebook http://www.facebook.com/cloudoninc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: rtf filter detection order
On Mon, 2014-07-28 at 10:14 +0200, Marina Latini wrote: Hi All, Can someone point out some informations about the rtf filter detection order? I know that Calc has its own rtf filter (https://bugs.freedesktop.org/show_bug.cgi?id=65017#c19). Steps to reproduce: 1) Start LibreOffice 2) open a rtf document test.rtf 2a) create a test.rtf document with Writer 3) close the document 4) open a new blank spreadsheet 5) now open the same test.rtf from File Open test.rtf is opened with Calc Yes, As Maxim already pointed out, it's intentional. Generic formats such as text, html and rtf are opened in the app it was opened from. It was a change made in LibreOffice as a feature. This is our bug or our feature? It's our (proud) feature, though as with any other features, some users may find it an annoying showstopper breaking their workflow yada yada yada, but we are not responsible for that. :-) Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: rtf filter detection order
- Messaggio originale - Da: Kohei Yoshida kohei.yosh...@collabora.com A: Marina Latini mar...@studiostorti.com Cc: libreoffice@lists.freedesktop.org Inviato: Lunedì, 28 luglio 2014 16:11:52 Oggetto: Re: rtf filter detection order It's our (proud) feature, though as with any other features, some users may find it an annoying showstopper breaking their workflow yada yada yada, but we are not responsible for that. :-) Hi Kohei, Maxim, All. Thank you for the informations. I'm happy to find out that this is a feature. :) Regards, Marina -- Marina Latini mar...@studiostorti.com Studio Storti Srl Viale Leonardo da Vinci, 18 36100 - Vicenza (VI) http://www.studiostorti.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/calctiledrendering5' - 2 commits - include/LibreOfficeKit libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk libreofficekit/Library_libreoffice
include/LibreOfficeKit/LibreOfficeKit.h | 89 +++-
libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk |4
libreofficekit/Library_libreofficekitgtk.mk |4
libreofficekit/Module_libreofficekit.mk |7
libreofficekit/StaticLibrary_libreofficekit.mk | 16 --
libreofficekit/source/shim.c| 82 ---
smoketest/Executable_libtest.mk |4
7 files changed, 91 insertions(+), 115 deletions(-)
New commits:
commit 3bf863a1935d1eaba0b074434d0a32e849034e68
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Mon Jul 28 09:02:25 2014 +0200
DO NOT MERGE: reenable LOK tiled rendering test (BRANCH ONLY).
Change-Id: Ica4e570cafa25f4c642016608d8d510e668ed701
diff --git a/libreofficekit/Module_libreofficekit.mk
b/libreofficekit/Module_libreofficekit.mk
index 075cbdd..256068d 100644
--- a/libreofficekit/Module_libreofficekit.mk
+++ b/libreofficekit/Module_libreofficekit.mk
@@ -15,9 +15,9 @@ $(eval $(call gb_Module_add_targets,libreofficekit,\
Executable_lokconf_init \
))
-# $(eval $(call gb_Module_add_check_targets,libreofficekit,\
-# CppunitTest_libreofficekit_tiledrendering \
-# ))
+$(eval $(call gb_Module_add_check_targets,libreofficekit,\
+CppunitTest_libreofficekit_tiledrendering \
+))
ifneq ($(ENABLE_GTK),)
$(eval $(call gb_Module_add_targets,libreofficekit,\
commit 45dd1ce04b5a684ea36f47111bc16cc3f2bbd7e6
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Mon Jul 28 09:01:59 2014 +0200
Kill the libreofficekit static library / shim.c.
It looks like the cleanest method of getting lok_init into
the LibreOfficeKit.h header (in a c89 compatible way) is to
have it as a static function. Unfortunately this provokes
unused function warnings where lok_init doesn't get used.
(inline is only available in C99 or later -- this is actually
available on Linux which is the only place that we can actually
use lok_init anyways currently, however given we have to keep
c89 for the C code (for MSVC) compatibility, selectively enabling
c99 would likely be more messy.)
Change-Id: I0493e7a68ed5397479220bb6ba8c3db870b6dd32
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h
b/include/LibreOfficeKit/LibreOfficeKit.h
index 675eabc..7d88528 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -105,7 +105,94 @@ struct _LibreOfficeKitDocumentClass
#endif // LOK_USE_UNSTABLE_API
};
-LibreOfficeKit* lok_init (const char* pInstallPath);
+#ifdef LINUX
+
+#include stdio.h
+#include stdlib.h
+#include string.h
+
+#include dlfcn.h
+#ifdef AIX
+# include sys/ldr.h
+#endif
+
+#define TARGET_LIBlib sofficeapp .so
+#define TARGET_MERGED_LIB lib mergedlo .so
+
+typedef LibreOfficeKit *(HookFunction)( const char *install_path);
+
+
+#if defined(__GNUC__)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored -Wunused-function
+#endif
+
+#if defined(__clang__)
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored -Wunused-function
+#endif
+
+static LibreOfficeKit *lok_init( const char *install_path )
+{
+char *imp_lib;
+size_t partial_length;
+void *dlhandle;
+HookFunction *pSym;
+
+if (!install_path)
+return NULL;
+
+// allocate large enough buffer
+partial_length = strlen(install_path);
+imp_lib = (char *) malloc(partial_length + sizeof(TARGET_LIB) +
sizeof(TARGET_MERGED_LIB) + 2);
+if (!imp_lib)
+{
+fprintf( stderr, failed to open library : not enough memory\n);
+return NULL;
+}
+
+strcpy(imp_lib, install_path);
+
+imp_lib[partial_length++] = '/';
+strcpy(imp_lib + partial_length, TARGET_LIB);
+
+dlhandle = dlopen(imp_lib, RTLD_LAZY);
+if (!dlhandle)
+{
+strcpy(imp_lib + partial_length, TARGET_MERGED_LIB);
+
+dlhandle = dlopen(imp_lib, RTLD_LAZY);
+if (!dlhandle)
+{
+fprintf(stderr, failed to open library '%s' or '%s' in '%s/'\n,
+TARGET_LIB, TARGET_MERGED_LIB, install_path);
+free(imp_lib);
+return NULL;
+}
+}
+
+pSym = (HookFunction *) dlsym( dlhandle, libreofficekit_hook );
+if (!pSym)
+{
+fprintf( stderr, failed to find hook in library '%s'\n, imp_lib );
+dlclose( dlhandle );
+free( imp_lib );
+return NULL;
+}
+
+free( imp_lib );
+return pSym( install_path );
+}
+
+#if defined(__GNUC__)
+# pragma GCC diagnostic pop
+#endif
+
+#if defined(__clang__)
+# pragma clang diagnostic pop
+#endif
+
+#endif // not LINUX = port me !
#ifdef __cplusplus
}
diff --git a/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
b/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
index 9159a24..acc708f 100644
---
[Libreoffice-commits] core.git: Branch 'feature/lok_sofficemain' - 4 commits - desktop/source libreofficekit/Module_libreofficekit.mk libreofficekit/qa libreofficekit/source
desktop/source/lib/init.cxx | 12
libreofficekit/Module_libreofficekit.mk |6 +++---
libreofficekit/qa/unit/tiledrendering.cxx |2 +-
libreofficekit/source/gtk/lokdocview.c| 22 ++
4 files changed, 30 insertions(+), 12 deletions(-)
New commits:
commit 51868fb309ceaf9d03949b0e33ad09e70bb72f02
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Mon Jul 28 09:02:25 2014 +0200
DO NOT MERGE: reenable LOK tiled rendering test (BRANCH ONLY).
Change-Id: Ica4e570cafa25f4c642016608d8d510e668ed701
diff --git a/libreofficekit/Module_libreofficekit.mk
b/libreofficekit/Module_libreofficekit.mk
index 8523b1a..071ea93 100644
--- a/libreofficekit/Module_libreofficekit.mk
+++ b/libreofficekit/Module_libreofficekit.mk
@@ -16,9 +16,9 @@ $(eval $(call gb_Module_add_targets,libreofficekit,\
Executable_lokconf_init \
))
-# $(eval $(call gb_Module_add_check_targets,libreofficekit,\
-# CppunitTest_libreofficekit_tiledrendering \
-# ))
+$(eval $(call gb_Module_add_check_targets,libreofficekit,\
+CppunitTest_libreofficekit_tiledrendering \
+))
ifneq ($(ENABLE_GTK),)
$(eval $(call gb_Module_add_targets,libreofficekit,\
commit a08d6ab6f0cfc00b578e39d7b107857af21d50e6
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Mon Jul 28 16:29:43 2014 +0200
Prevent LOK DocView crash if document too large.
There seems to be a maximum size that gdk's pixbuf
can handle, however I have been unable to find any
documentatation. Seeing as the current implementation
isn't realistically useable anyway, we might as well
set a hard limit here (in practice we'd have much smaller
tiles + compositing).
Specifically extras/source/shellnew/soffice.ods will fail
without this patch.
Change-Id: I6ac495adca8e15878989375ef8b2de472788279a
diff --git a/libreofficekit/source/gtk/lokdocview.c
b/libreofficekit/source/gtk/lokdocview.c
index cdc2339..e8fe526 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -108,12 +108,26 @@ void renderDocument( LOKDocView* pDocView )
pDocView-pDocument-pClass-getDocumentSize( pDocView-pDocument,
nWidth, nHeight );
-// Draw the whole document at once (for now)
-
// TODO: we really should scale by screen DPI here -- 10 seems to be a
vaguely
// correct factor for my screen at least.
-nRenderWidth = nWidth * pDocView-fZoom / 10;
-nRenderHeight = nHeight * pDocView-fZoom / 10;
+const float fScaleFactor = 0.1;
+
+// Various things blow up if we try to draw too large a tile,
+// this size seems to be safe. (Very rare/unlikely that
+const int nMaxWidth = 10;
+if ( nWidth * fScaleFactor nMaxWidth )
+{
+nWidth = nMaxWidth;
+}
+if ( nHeight * fScaleFactor nMaxWidth )
+{
+nHeight = nMaxWidth;
+}
+
+// Draw the whole document at once (for now)
+
+nRenderWidth = nWidth * pDocView-fZoom * fScaleFactor;
+nRenderHeight = nHeight * pDocView-fZoom * fScaleFactor;
pDocView-pPixBuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB,
TRUE, 8,
commit d88283829375fb920cb7f4e8d6b68b3461cd6256
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Mon Jul 28 16:22:47 2014 +0200
Use CPPUNIT_ASSERT instead of assert.
Change-Id: I24e7934002ebdde208db74ae3308b26875a3155b
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx
b/libreofficekit/qa/unit/tiledrendering.cxx
index b231eb0..9c035b4 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -77,7 +77,7 @@ void TiledRenderingTest::testOverlay()
scoped_ptr Office pOffice( lok_cpp_init(
sLOPath.c_str() ) );
-assert( pOffice.get() );
+CPPUNIT_ASSERT( pOffice.get() );
scoped_ptr Document pDocument( pOffice-documentLoad(
sDocPath.c_str() ) );
commit 6ee107e0ab3686977d299b47f5e44bbffde070dc
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Mon Jul 28 16:18:57 2014 +0200
LOK: do clean main thread shutdown cleanly.
Change-Id: If44971f67a489f6b50dee6c1683707c47e695de4
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b73e4e2..b17516c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -248,6 +248,7 @@ struct LibLibreOffice_Impl : public _LibreOfficeKit
{
OUString maLastExceptionMsg;
shared_ptr LibreOfficeKitClass m_pOfficeClass;
+pthread_t maThread;
LibLibreOffice_Impl()
{
@@ -600,7 +601,7 @@ static void* lo_startmain(void*)
static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath)
{
-(void) pThis;
+LibLibreOffice_Impl* pLib = static_castLibLibreOffice_Impl*(pThis);
static bool bInitialized = false;
if (bInitialized)
@@ -668,8 +669,7 @@ static int
[Libreoffice-commits] core.git: libreofficekit/source
libreofficekit/source/gtk/lokdocview.c | 22 ++
1 file changed, 18 insertions(+), 4 deletions(-)
New commits:
commit c1d9fe079a32a0515683236f91892c98ee837f8b
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Mon Jul 28 16:29:43 2014 +0200
Prevent LOK DocView crash if document too large.
There seems to be a maximum size that gdk's pixbuf
can handle, however I have been unable to find any
documentatation. Seeing as the current implementation
isn't realistically useable anyway, we might as well
set a hard limit here (in practice we'd have much smaller
tiles + compositing).
Specifically extras/source/shellnew/soffice.ods will fail
without this patch.
Change-Id: I6ac495adca8e15878989375ef8b2de472788279a
diff --git a/libreofficekit/source/gtk/lokdocview.c
b/libreofficekit/source/gtk/lokdocview.c
index cdc2339..e8fe526 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -108,12 +108,26 @@ void renderDocument( LOKDocView* pDocView )
pDocView-pDocument-pClass-getDocumentSize( pDocView-pDocument,
nWidth, nHeight );
-// Draw the whole document at once (for now)
-
// TODO: we really should scale by screen DPI here -- 10 seems to be a
vaguely
// correct factor for my screen at least.
-nRenderWidth = nWidth * pDocView-fZoom / 10;
-nRenderHeight = nHeight * pDocView-fZoom / 10;
+const float fScaleFactor = 0.1;
+
+// Various things blow up if we try to draw too large a tile,
+// this size seems to be safe. (Very rare/unlikely that
+const int nMaxWidth = 10;
+if ( nWidth * fScaleFactor nMaxWidth )
+{
+nWidth = nMaxWidth;
+}
+if ( nHeight * fScaleFactor nMaxWidth )
+{
+nHeight = nMaxWidth;
+}
+
+// Draw the whole document at once (for now)
+
+nRenderWidth = nWidth * pDocView-fZoom * fScaleFactor;
+nRenderHeight = nHeight * pDocView-fZoom * fScaleFactor;
pDocView-pPixBuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB,
TRUE, 8,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: libreofficekit/qa
libreofficekit/qa/unit/tiledrendering.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0f21977d1d17170913d49987f070b9581395d7dd Author: Andrzej Hunt andrzej.h...@collabora.com Date: Mon Jul 28 16:22:47 2014 +0200 Use CPPUNIT_ASSERT instead of assert. Change-Id: I24e7934002ebdde208db74ae3308b26875a3155b diff --git a/libreofficekit/qa/unit/tiledrendering.cxx b/libreofficekit/qa/unit/tiledrendering.cxx index b231eb0..9c035b4 100644 --- a/libreofficekit/qa/unit/tiledrendering.cxx +++ b/libreofficekit/qa/unit/tiledrendering.cxx @@ -77,7 +77,7 @@ void TiledRenderingTest::testOverlay() scoped_ptr Office pOffice( lok_cpp_init( sLOPath.c_str() ) ); -assert( pOffice.get() ); +CPPUNIT_ASSERT( pOffice.get() ); scoped_ptr Document pDocument( pOffice-documentLoad( sDocPath.c_str() ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/unwanted-section-break.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 15 ++
sw/source/filter/ww8/ww8atr.cxx |2 -
3 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 7146d8bcd96f844dc0239a5b29a6b36c3cb5a2cc
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Jul 28 16:58:38 2014 +0200
MSWordExportBase::OutputSectionBreaks: avoid fake section breaks
Regression from ee9f23bb94b4c2c8c4db6466ecca272a092e9492 (docx export:
invalid sectPr added at the beginning of the doc, 2013-01-10), the
problem was that we even tried to generate section breaks at places
where the two page styles are in practice the same.
Change-Id: Iccf91ce542d9b075b93da25bcd42236db667e3d4
diff --git a/sw/qa/extras/ooxmlexport/data/unwanted-section-break.docx
b/sw/qa/extras/ooxmlexport/data/unwanted-section-break.docx
new file mode 100644
index 000..a8565742
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/unwanted-section-break.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 1fdc15e..77d8b4c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2532,7 +2532,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo77718, fdo77718.docx)
DECLARE_OOXMLEXPORT_TEST(testTableCurruption, tableCurrupt.docx)
{
-xmlDocPtr pXmlDoc = parseExport(word/header4.xml);
+xmlDocPtr pXmlDoc = parseExport(word/header2.xml);
if (!pXmlDoc)
return;
CPPUNIT_ASSERT(pXmlDoc) ;
@@ -2635,7 +2635,7 @@ DECLARE_OOXMLEXPORT_TEST(testOLEObjectinHeader,
2129393649.docx)
// Problem was relationship entry for oleobject from header was
// exported into document.xml.rels file because of this rels file
// for headers were missing from document/word/rels.
-xmlDocPtr pXmlDoc = parseExport(word/_rels/header3.xml.rels);
+xmlDocPtr pXmlDoc = parseExport(word/_rels/header1.xml.rels);
if(!pXmlDoc)
return;
@@ -2971,12 +2971,12 @@ DECLARE_OOXMLEXPORT_TEST(testContentTypeOLE,
fdo77759.docx)
DECLARE_OOXMLEXPORT_TEST(testfdo78420, fdo78420.docx)
{
-xmlDocPtr pXmlHeader = parseExport(word/header3.xml);
+xmlDocPtr pXmlHeader = parseExport(word/header2.xml);
if (!pXmlHeader)
return;
-xmlDocPtr pXmlHeaderRels = parseExport(word/_rels/header3.xml.rels);
+xmlDocPtr pXmlHeaderRels = parseExport(word/_rels/header2.xml.rels);
if(!pXmlHeaderRels)
return;
@@ -3409,6 +3409,13 @@ DECLARE_OOXMLEXPORT_TEST(testPlausableBorder,
plausable-border.docx)
assertXPath(pXmlDoc, /w:document/w:body/w:p/w:r/w:br, 1);
}
+DECLARE_OOXMLEXPORT_TEST(testUnwantedSectionBreak,
unwanted-section-break.docx)
+{
+if (xmlDocPtr pXmlDoc = parseExport())
+// This was 2: an additional sectPr was added to the document.
+assertXPath(pXmlDoc, //w:sectPr, 1);
+}
+
DECLARE_OOXMLEXPORT_TEST(testfdo80897 , fdo80897.docx)
{
xmlDocPtr pXmlDoc = parseExport();
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 6de7aec..e831bf7 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -443,7 +443,7 @@ void MSWordExportBase::OutputSectionBreaks( const
SfxItemSet *pSet, const SwNode
if ( isCellOpen ( pAktPageDesc-GetName() !=
pPageDesc-GetName() ) )
pSet = NULL;
}
-else
+else if
(!sw::util::IsPlausableSingleWordSection(pAktPageDesc-GetFirstMaster(),
pPageDesc-GetMaster()))
{
bBreakSet = true;
bNewPageDesc = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSOC] Personas - Weekly Report #9
Hi all. This week, I succeeded in converting RID_SVX_MDLG_HANGULHANJA_EDIT to Widget Layout. This week I'll be working on converting RID_SVX_MDLG_HANGULHANJA, and then look for more work :-) -- Regards, Rachit Gupta ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: libreofficekit/source
libreofficekit/source/gtk/lokdocview.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 1cde56c3600b5b5b006609c24bfcaf66887167d3
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Jul 28 17:41:41 2014 +0200
-Werror=declaration-after-statement
Change-Id: I97b1d03410e98c5ff2ad3cc15cef692e9b994a6c
diff --git a/libreofficekit/source/gtk/lokdocview.c
b/libreofficekit/source/gtk/lokdocview.c
index e8fe526..07d07a1 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -98,6 +98,13 @@ void renderDocument( LOKDocView* pDocView )
int nRenderWidth, nRenderHeight;
unsigned char* pBuffer;
int nRowStride;
+// TODO: we really should scale by screen DPI here -- 10 seems to be a
vaguely
+// correct factor for my screen at least.
+const float fScaleFactor = 0.1;
+
+// Various things blow up if we try to draw too large a tile,
+// this size seems to be safe. (Very rare/unlikely that
+const int nMaxWidth = 10;
g_assert( pDocView-pDocument );
@@ -108,13 +115,6 @@ void renderDocument( LOKDocView* pDocView )
pDocView-pDocument-pClass-getDocumentSize( pDocView-pDocument,
nWidth, nHeight );
-// TODO: we really should scale by screen DPI here -- 10 seems to be a
vaguely
-// correct factor for my screen at least.
-const float fScaleFactor = 0.1;
-
-// Various things blow up if we try to draw too large a tile,
-// this size seems to be safe. (Very rare/unlikely that
-const int nMaxWidth = 10;
if ( nWidth * fScaleFactor nMaxWidth )
{
nWidth = nMaxWidth;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - writerfilter/qa writerfilter/source
writerfilter/qa/ooxml/watch-generated-code.sh | 47 ++ writerfilter/source/ooxml/factoryimpl_ns.py |8 +--- 2 files changed, 49 insertions(+), 6 deletions(-) New commits: commit 29813244afafa1721feb63dfeb055594053ce3f7 Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Jul 28 18:12:00 2014 +0200 writerfilter: unneeded whitespace tweak Change-Id: Ib25ae32be6132a9209eaa81db18b0659b73d5b82 diff --git a/writerfilter/source/ooxml/factoryimpl_ns.py b/writerfilter/source/ooxml/factoryimpl_ns.py index 4dc8ff0..38ffa51 100644 --- a/writerfilter/source/ooxml/factoryimpl_ns.py +++ b/writerfilter/source/ooxml/factoryimpl_ns.py @@ -420,12 +420,8 @@ def factoryAction(nsNode, action): switchblock1.append(case %s: % idForDefine(nsNode, resourceNode)) for actionNode in [i for i in getChildrenByName(resourceNode, action) if i.getAttribute(name) == action]: switchblock1.extend(factoryChooseAction(actionNode)) -if action == characters: -switchblock1.append(break;) -switchblock1.append() -else: -switchblock1[-1] += break; -switchblock1.append() +switchblock1.append(break;) +switchblock1.append() switchblock2 = [] if action == characters: commit 17969321130f293adfed6f9350faaa8e59e4aa8f Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Jul 28 18:09:56 2014 +0200 writerfilter: add script to detect generated code changes Change-Id: I340ef55dc9a09bd196469ed51848b22ba986de8c diff --git a/writerfilter/qa/ooxml/watch-generated-code.sh b/writerfilter/qa/ooxml/watch-generated-code.sh new file mode 100755 index 000..86acaf7 --- /dev/null +++ b/writerfilter/qa/ooxml/watch-generated-code.sh @@ -0,0 +1,47 @@ +#!/bin/bash + +if [ ! -e bin/get_config_variables ]; then +cd ../../.. +fi + +. bin/get_config_variables SRCDIR + +if [ $PWD != $SRCDIR ]; then +echo error: not in the expected SRCDIR +exit 1 +fi + +cd writerfilter +echo 'include Makefile' watch.mk +echo 'watch:' watch.mk +echo $'\techo $(writerfilter_ALL)' watch.mk +mydir=workdir/CustomTarget/writerfilter +writerfilter_ALL=$(make -sr -f watch.mk watch|sed s|$SRCDIR/$mydir/||g) +rm watch.mk +cd - /dev/null + +case $1 in +reference) +rm -rf $mydir-reference +mkdir -p $mydir-reference/source/ooxml +for i in $writerfilter_ALL +do +cp $mydir/$i $mydir-reference/$i +done +;; +compare) +for i in $writerfilter_ALL +do +diff -u $mydir-reference/$i $mydir/$i +done +;; +*) +echo usage: $0 [ reference | compare ] +echo +echo $0 first saves a reference output of all generated files by writerfilter, then +echo allows comparing against it. This helps seeing the effect of changes made on +echo the code generator scripts. +;; +esac + +# vi:set shiftwidth=4 expandtab: ___ 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 Bug 65675 depends on bug 80384, which changed state. Bug 80384 Summary: Chart Legend name lost on saving https://bugs.freedesktop.org/show_bug.cgi?id=80384 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |DUPLICATE -- 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: [GSOC] Tiled Rendering, ahunt, Weekly Report 10 / WK30
Hi Andrzej, Wow - some great work here =) On Mon, 2014-07-28 at 10:23 +0200, Andrzej Hunt wrote: * Moved lok_init from shim.c into LibreOfficeKit.h (i.e. killing the static library) ** https://gerrit.libreoffice.org/#/c/10584/ Nice idea; a few comments in the gerrit commit =) Some screens of calc/impress with images visible are attached. Beautiful stuff =) how are the APIs for determining number of pages / their page sizes; and toggling the various features there - sheet numbers, speaker notes etc. ? =) Anyhow - encouraging progress ! would like to get more of this merged into master; what are we blocking on there for calc eg. ? ATB, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo81033.rtf | 12
sw/qa/extras/rtfimport/rtfimport.cxx | 14 ++
writerfilter/source/dmapper/DomainMapper.cxx |5 -
writerfilter/source/dmapper/DomainMapper_Impl.hxx |9 +++--
4 files changed, 37 insertions(+), 3 deletions(-)
New commits:
commit c0b6aadedc9429eee4f4df85957e00e29ccb0c8f
Author: Michael Stahl mst...@redhat.com
Date: Mon Jul 28 18:14:16 2014 +0200
(related: fdo#81033) writerfilter: default tab fill character is space
This avoids an ugly Character box in the dialog with a null byte in it.
Change-Id: Iee35a8e1bd6b57fb4eb8ae06722bd79ee1d5d8de
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index f72c331f..bb9cbb4 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1388,7 +1388,7 @@ DECLARE_RTFIMPORT_TEST(testFdo81033, fdo81033.rtf)
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), tabs.getLength());
CPPUNIT_ASSERT_EQUAL(sal_Int32(5808), tabs[0].Position);
CPPUNIT_ASSERT_EQUAL(style::TabAlign_LEFT, tabs[0].Alignment);
-CPPUNIT_ASSERT_EQUAL(sal_Unicode(0), tabs[0].FillChar);
+CPPUNIT_ASSERT_EQUAL(sal_Unicode(' '), tabs[0].FillChar);
CPPUNIT_ASSERT_EQUAL(sal_Int32(16002), tabs[1].Position);
CPPUNIT_ASSERT_EQUAL(style::TabAlign_LEFT, tabs[1].Alignment);
CPPUNIT_ASSERT_EQUAL(sal_Unicode('_'), tabs[1].FillChar);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index ebf7426..21c66af 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -215,8 +215,13 @@ typedef std::stack AnchoredContext
TextContentStack;
struct DeletableTabStop : public ::com::sun::star::style::TabStop
{
bool bDeleted;
-DeletableTabStop() :
-bDeleted( false ){}
+DeletableTabStop()
+: bDeleted(false)
+{
+// same defaults as SvxXMLTabStopContext_Impl
+FillChar = ' ';
+DecimalChar = ',';
+}
DeletableTabStop( const ::com::sun::star::style::TabStop rTabStop ) :
TabStop( rTabStop ),
bDeleted( false ){}
commit 7f6e26917d4aa682ed9c422c83b1df20d78177d2
Author: Michael Stahl mst...@redhat.com
Date: Mon Jul 28 17:57:53 2014 +0200
fdo#81033: writerfilter: RTF import: fix tab stop inheritance from style
For RTF, the tab stops that are set directly on the paragraph are the
tab stops the paragraph has effectively; there is no equivalent of OOXML
w:tab w:val=clear w:pos=4536/ that would override a tab stop of
the applied style; that is done by simply omitting the tab stop.
It would perhaps be possible to implement something to synthesize a
NS_ooxml::LN_Value_ST_TabJc_clear in the RTF tokenizer for this case,
but it's simpler to just generally disable domain mapper's
InitTabStopFromStyle() for RTF.
Change-Id: I7b0581be8db19ffda81c8d1da290abf0a0f69529
diff --git a/sw/qa/extras/rtfimport/data/fdo81033.rtf
b/sw/qa/extras/rtfimport/data/fdo81033.rtf
new file mode 100644
index 000..500aeb7
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo81033.rtf
@@ -0,0 +1,12 @@
+{\rtf1
+{\stylesheet
+{\s15\ql \tqc\tx4536\tqr\tx9072 header;}
+}
+
+\deftab709
+\pard\plain \s15\ql \tx3293\tlul\tx9072
+\tab
+\tab
+
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index f7763b3..f72c331f 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1380,6 +1380,20 @@ DECLARE_RTFIMPORT_TEST(testGroupshape_notext,
groupshape-notext.rtf)
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xGroupshape-getCount());
}
+DECLARE_RTFIMPORT_TEST(testFdo81033, fdo81033.rtf)
+{
+// Number of tabstops in the paragraph should be 2, was 3.
+uno::Sequencestyle::TabStop tabs(
+getProperty uno::Sequencestyle::TabStop (getParagraph(1),
ParaTabStops));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), tabs.getLength());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(5808), tabs[0].Position);
+CPPUNIT_ASSERT_EQUAL(style::TabAlign_LEFT, tabs[0].Alignment);
+CPPUNIT_ASSERT_EQUAL(sal_Unicode(0), tabs[0].FillChar);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(16002), tabs[1].Position);
+CPPUNIT_ASSERT_EQUAL(style::TabAlign_LEFT, tabs[1].Alignment);
+CPPUNIT_ASSERT_EQUAL(sal_Unicode('_'), tabs[1].FillChar);
+}
+
DECLARE_RTFIMPORT_TEST(testFdo66565, fdo66565.rtf)
{
uno::Referencetext::XTextTablesSupplier xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index a6c71b1..7e598d7 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1718,7 +1718,10 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext )
[Libreoffice-commits] core.git: writerfilter/qa writerfilter/source
writerfilter/qa/ooxml/watch-generated-code.sh |3 +++
writerfilter/source/ooxml/modelpreprocess.py |9 -
2 files changed, 3 insertions(+), 9 deletions(-)
New commits:
commit 1b30426c818a7a45a3cb429b8b3c45b634ad2ab9
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Jul 28 18:23:46 2014 +0200
writerfilter: nobody reads the classfordefine attribute
Change-Id: I030137cb379de04968fb144516e90dbd1bdd97f6
diff --git a/writerfilter/qa/ooxml/watch-generated-code.sh
b/writerfilter/qa/ooxml/watch-generated-code.sh
index 86acaf7..d674573 100755
--- a/writerfilter/qa/ooxml/watch-generated-code.sh
+++ b/writerfilter/qa/ooxml/watch-generated-code.sh
@@ -32,6 +32,9 @@ reference)
compare)
for i in $writerfilter_ALL
do
+if [ $(basename $i) == model_preprocessed.xml ]; then
+continue
+fi
diff -u $mydir-reference/$i $mydir/$i
done
;;
diff --git a/writerfilter/source/ooxml/modelpreprocess.py
b/writerfilter/source/ooxml/modelpreprocess.py
index 022568f..82e5e3f 100644
--- a/writerfilter/source/ooxml/modelpreprocess.py
+++ b/writerfilter/source/ooxml/modelpreprocess.py
@@ -149,15 +149,6 @@ def preprocess(model):
j.setAttribute(prefix, prefix)
j.setAttribute(localname, localname)
-for j in i.getElementsByTagName(define) +
i.getElementsByTagName(ref):
-name = j.getAttribute(name)
-if name.startswith(CT_) or name.startswith(EG_) or
name.startswith(AG_):
-j.setAttribute(classfordefine, 1)
-elif name in startElements:
-j.setAttribute(classfordefine, 1)
-else:
-j.setAttribute(classfordefine, 0)
-
for i in model.getElementsByTagName(grammar):
if
i.getAttribute(ns).startswith(http://schemas.openxmlformats.org/;):
i.setAttribute(application,
i.getAttribute(ns).replace('http://schemas.openxmlformats.org/',
'').split('/')[0])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-colors' - 3 commits - include/svx sc/source svx/source svx/uiconfig sw/source
include/svx/Palette.hxx |2 +-
sc/source/core/data/document10.cxx |5 +++--
svx/source/tbxctrls/Palette.cxx |6 --
svx/source/tbxctrls/colorwindow.hxx |4 ++--
svx/source/tbxctrls/tbcontrl.cxx| 19 ---
svx/uiconfig/ui/colorwindow.ui | 23 ++-
sw/source/core/doc/docfmt.cxx |6 +++---
7 files changed, 35 insertions(+), 30 deletions(-)
New commits:
commit ccea0834d79545369af70a7240e3480e183a6102
Author: Krisztian Pinter pin.termina...@gmail.com
Date: Mon Jul 28 19:18:14 2014 +0200
Change palette selection ComboBox to ListBox
Change-Id: Id844781c06e37d66f3eebac9d905c58a62682cb0
diff --git a/svx/source/tbxctrls/colorwindow.hxx
b/svx/source/tbxctrls/colorwindow.hxx
index 2f2d318..70db254 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -30,7 +30,7 @@
#include com/sun/star/frame/XFrame.hpp
#include svx/SvxColorValueSet.hxx
#include svx/PaletteManager.hxx
-#include vcl/combobox.hxx
+#include vcl/lstbox.hxx
// class SvxColorWindow_Impl --
@@ -44,7 +44,7 @@ private:
const sal_uInt16theSlotId;
SvxColorValueSet* mpColorSet;
SizemaWindowSize;
-ComboBox* mpPaletteComboBox;
+ListBox*mpPaletteListBox;
PushButton* mpButtonPicker;
OUStringmaCommand;
LinkmaSelectedLink;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 591c51a..0574948 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1032,7 +1032,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString
rCommand,
mrPaletteManager( rPaletteManager )
{
-get(mpPaletteComboBox, palette_list_combobox);
+get(mpPaletteListBox, palette_listbox);
get(mpButtonPicker, color_picker_button);
get(mpColorSet, colorset);
@@ -1068,15 +1068,15 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const
OUStringrCommand,
mpColorSet-SetAccessibleName( SVX_RESSTR( RID_SVXSTR_LINECOLOR ) );
}
-mpPaletteComboBox-SetStyle( mpPaletteComboBox-GetStyle() | WB_BORDER |
WB_AUTOSIZE );
-mpPaletteComboBox-SetSelectHdl( LINK( this, SvxColorWindow_Impl,
SelectPaletteHdl ) );
-mpPaletteComboBox-AdaptDropDownLineCountToMaximum();
+mpPaletteListBox-SetStyle( mpPaletteListBox-GetStyle() | WB_BORDER |
WB_AUTOSIZE );
+mpPaletteListBox-SetSelectHdl( LINK( this, SvxColorWindow_Impl,
SelectPaletteHdl ) );
+mpPaletteListBox-AdaptDropDownLineCountToMaximum();
std::vectorOUString aPaletteList = mrPaletteManager.GetPaletteList();
-mpPaletteComboBox-SetText( aPaletteList[ mrPaletteManager.GetPalette() ]
);
for( std::vectorOUString::iterator it = aPaletteList.begin(); it !=
aPaletteList.end(); ++it )
{
-mpPaletteComboBox-InsertEntry( *it );
+mpPaletteListBox-InsertEntry( *it );
}
+mpPaletteListBox-SelectEntryPos(mrPaletteManager.GetPalette(), true);
mpButtonPicker-SetClickHdl( LINK( this, SvxColorWindow_Impl,
OpenPickerClickHdl ) );
@@ -1088,7 +1088,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString
rCommand,
AddStatusListener( maCommand );
mrPaletteManager.ReloadColorSet(*mpColorSet);
-mpPaletteComboBox-Show();
+mpPaletteListBox-Show();
mpButtonPicker-Show();
mpColorSet-Show();
}
@@ -1146,11 +1146,9 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectHdl)
IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectPaletteHdl)
{
-OUString sSrchTxt = mpPaletteComboBox-GetText();
-sal_Int32 nPos = mpPaletteComboBox-GetEntryPos( sSrchTxt );
+sal_Int32 nPos = mpPaletteListBox-GetSelectEntryPos();
mrPaletteManager.SetPalette( nPos );
mrPaletteManager.ReloadColorSet(*mpColorSet);
-Resize();
return 0;
}
@@ -1162,7 +1160,6 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, OpenPickerClickHdl)
void SvxColorWindow_Impl::Resize()
{
-mpColorSet-layoutAllVisible(mrPaletteManager.GetColorCount());
SetOutputSizePixel(maWindowSize);
}
diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index 54b8f49..0527e78 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -14,15 +14,9 @@
property name=visibleTrue/property
property name=can_focusFalse/property
child
- object class=GtkComboBox id=palette_list_combobox
+ object class=GtkComboBox id=palette_listbox
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=has_entryTrue/property
-child internal-child=entry
- object class=GtkEntry id=combobox-entry
-property name=can_focusFalse/property
-
[GSoC] Improved Color Selection, Week 10
Hi All! Last week I started looking into adding the new color palette to Draw/Impress, and merging *SvxLineColorToolBoxControl* into *SvxColorToolBoxControl* but I ran into some problems. I couldn't change the toolbar buttons in Draw. I changed things in *sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml* *sd/source/ui/app/sddll.cxx -- SdDLL::RegisterControllers()* and the toolbar button for *SvxLineColorToolBoxControl* stayed there but just stopped working. Other than this I updated my master, added support for loading .soc files and fixed small things about the UI. This week I'll probably work on small improvements, adding recent colors, and adding the new color palette to Draw. If anyone has any insights, please share them! Thank you! All the best, Krisztian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSOC] Tiled Rendering, ahunt, Weekly Report 10 / WK30
Hi Michael, On 28/07/14 18:29, Michael Meeks wrote: Hi Andrzej, Wow - some great work here =) On Mon, 2014-07-28 at 10:23 +0200, Andrzej Hunt wrote: * Moved lok_init from shim.c into LibreOfficeKit.h (i.e. killing the static library) ** https://gerrit.libreoffice.org/#/c/10584/ Nice idea; a few comments in the gerrit commit =) Yep, I'll try and get a new version prepared. Some screens of calc/impress with images visible are attached. Beautiful stuff =) how are the APIs for determining number of pages / their page sizes; and toggling the various features there - sheet numbers, speaker notes etc. ? =) Currently only sheet/slide number determination/selection, and document size determination is implemented (i.e. all the functions that are actually in LibreOfficeKit.h/.hxx are implemented), still to be added are: * Toggling between slides and combined slide + notes (there's no direct way to get /just/ the notes -- but I imagine that just needs a bit of digging). (Currently we show /just/ the slide.) * Sheet names * Getting embedded objects separately. Anyhow - encouraging progress ! would like to get more of this merged into master; what are we blocking on there for calc eg. ? * soffice_main: I think is more or less mergeable, but a review would be nice to make sure I'm not doing anything silly. (This enables images to be shown in impress and calc.) * Calc: still needs some more fixing to make sure the normal UI works (+ some border issues, this seems to be mostly a case of replacing a hardcoded 1 pixel with pixelToLogic(1)). I'm not really sure how long this will actually take as the code is quite complex here (but I've been concentrating on getting the various other pieces to make writer/impress work well recently). Also, for completeness sake, the other stuff I still need to do: * Deal with the lock-file issue: opening a locked file will currently cause failure (as the unlock dialog fails if cancelled, and headless mode cancels all dialogs). We'd either need to have separate handling for LOK, or open files read-only. Not quite sure what's cleverest. (LOK doesn't support any in place editing of files for now, but I suspect that's where we want to head with tiled rendering at least.) ** Maybe we could have some sort of callback, so we could show our own dialog and/or choose to ignore the locked-ness of the file? * Add better debug output to framework/sfx2, which currently seem to discard various exceptions, making it impossible to determine why document loading is failing on some TBs. * Calc: have some method of determining sheet size when we have text extending beyond a given cell: currently we take the sheet size as the max( [Area of cells with content], [Drawinglayer size]), but if we text that belongs to a cell extending beyond this area then it won't be counted as part of the sheet (i.e. simplest example is a single cell with a very long sentence, we will only see whatever fits into the cell and the rest is cut off / the tiled rendering client will be unaware that there is text outwith the document area). I think it's probably best to concentrate on getting what is in master working well (i.e. the remaining API surface + soffice_main), after which I could get back to making Calc mergeable -- not too sure how important the lock-file issue really is though for realistic use. ATB, Michael. ATB, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - external/glew external/lcms2
external/glew/ExternalProject_glew.mk |3 external/glew/UnpackedTarball_glew.mk |1 external/glew/glew-vc2013-project.patch.1 | 508 ++ external/lcms2/ExternalProject_lcms2.mk |3 external/lcms2/UnpackedTarball_lcms2.mk |1 external/lcms2/lcms2-vc2013-project.patch | 490 6 files changed, 1002 insertions(+), 4 deletions(-) New commits: commit 7f0e4cf20ede44240d48d327b3a58bc9d81426f5 Author: Tor Lillqvist t...@collabora.com Date: Mon Jul 28 21:54:06 2014 +0300 Add separate project file for VS2013 Easier than trying to figure out how to make the VC2010 project work with VS2013, it seems. Luckily it works fine tojust have VS2013 upgrade the old project file and then pass that to msbuild. Change-Id: I94c0248211767d97f2898f35b1b677aee372a329 diff --git a/external/glew/ExternalProject_glew.mk b/external/glew/ExternalProject_glew.mk index d7e553b..7eec3e8 100644 --- a/external/glew/ExternalProject_glew.mk +++ b/external/glew/ExternalProject_glew.mk @@ -18,8 +18,7 @@ $(call gb_ExternalProject_get_state_target,glew,build) : $(call gb_ExternalProject_run,build,\ msbuild.exe glew_shared.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \ - $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0) \ - ,build/vc10) + ,$(if $(filter 120,$(VCVER)),build/vc12,build/vc10)) else diff --git a/external/glew/UnpackedTarball_glew.mk b/external/glew/UnpackedTarball_glew.mk index 64cbc5c..242c73e 100644 --- a/external/glew/UnpackedTarball_glew.mk +++ b/external/glew/UnpackedTarball_glew.mk @@ -22,6 +22,7 @@ ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_UnpackedTarball_set_patchflags,glew,--binary)) $(eval $(call gb_UnpackedTarball_add_patches,glew,\ external/glew/glew-fix-rc-error.patch.1 \ + external/glew/glew-vc2013-project.patch.1 \ )) else $(eval $(call gb_UnpackedTarball_add_patches,glew,\ diff --git a/external/glew/glew-vc2013-project.patch.1 b/external/glew/glew-vc2013-project.patch.1 new file mode 100644 index 000..f56769c --- /dev/null +++ b/external/glew/glew-vc2013-project.patch.1 @@ -0,0 +1,508 @@ +-*- Mode:Diff -*- +--- /dev/null glew/build/vc12/common.props +@@ -0,0 +1,29 @@ ++?xml version=1.0 encoding=utf-8? ++Project ToolsVersion=4.0 xmlns=http://schemas.microsoft.com/developer/msbuild/2003; ++ ImportGroup Label=PropertySheets / ++ PropertyGroup Label=UserMacros ++INCLUDE_DIR../../include/INCLUDE_DIR ++LIB_DIR../../lib/LIB_DIR ++BIN_DIR../../bin/BIN_DIR ++ /PropertyGroup ++ PropertyGroup / ++ ItemDefinitionGroup ++ClCompile ++ AdditionalIncludeDirectories$(INCLUDE_DIR)/AdditionalIncludeDirectories ++/ClCompile ++ /ItemDefinitionGroup ++ ItemGroup ++BuildMacro Include=INCLUDE_DIR ++ Value$(INCLUDE_DIR)/Value ++ EnvironmentVariabletrue/EnvironmentVariable ++/BuildMacro ++BuildMacro Include=LIB_DIR ++ Value$(LIB_DIR)/Value ++ EnvironmentVariabletrue/EnvironmentVariable ++/BuildMacro ++BuildMacro Include=BIN_DIR ++ Value$(BIN_DIR)/Value ++ EnvironmentVariabletrue/EnvironmentVariable ++/BuildMacro ++ /ItemGroup ++/Project +--- /dev/null glew/build/vc12/glew_shared.vcxproj +@@ -0,0 +1,472 @@ ++?xml version=1.0 encoding=utf-8? ++Project DefaultTargets=Build ToolsVersion=12.0 xmlns=http://schemas.microsoft.com/developer/msbuild/2003; ++ ItemGroup Label=ProjectConfigurations ++ProjectConfiguration Include=Debug MX|Win32 ++ ConfigurationDebug MX/Configuration ++ PlatformWin32/Platform ++/ProjectConfiguration ++ProjectConfiguration Include=Debug MX|x64 ++ ConfigurationDebug MX/Configuration ++ Platformx64/Platform ++/ProjectConfiguration ++ProjectConfiguration Include=Debug|Win32 ++ ConfigurationDebug/Configuration ++ PlatformWin32/Platform ++/ProjectConfiguration ++ProjectConfiguration Include=Debug|x64 ++ ConfigurationDebug/Configuration ++ Platformx64/Platform ++/ProjectConfiguration ++ProjectConfiguration Include=Release MX|Win32 ++ ConfigurationRelease MX/Configuration ++ PlatformWin32/Platform ++/ProjectConfiguration ++ProjectConfiguration Include=Release MX|x64 ++ ConfigurationRelease MX/Configuration ++ Platformx64/Platform ++/ProjectConfiguration ++ProjectConfiguration Include=Release|Win32 ++ ConfigurationRelease/Configuration ++ PlatformWin32/Platform ++/ProjectConfiguration ++ProjectConfiguration Include=Release|x64 ++ ConfigurationRelease/Configuration ++ Platformx64/Platform ++/ProjectConfiguration ++ /ItemGroup ++ PropertyGroup Label=Globals ++SccProjectName / ++
Re: [GSoC] Improved Color Selection, Week 10
Hi Krisztian, On Monday 28 July 2014 19:48:51 Krisztian Pinter wrote: I changed things in *sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml* I don't see any reason touching that file. *sd/source/ui/app/sddll.cxx -- SdDLL::RegisterControllers()* That's right, and there are similar changes required in writer calc as well. and the toolbar button for *SvxLineColorToolBoxControl* stayed there but just stopped working. 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. Maxim ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
GSoC Refactor god objects weekly report
This week I refactored IDocumentFieldsAccess and
IDocumentLineNumberAccess. To have something more in here for a change,
a few weeks ago I started using Clang instead of gcc and I like it much
better. I remember the time where I got an error message longer than my
terminal's scroll buffer because I forgot a closing } with gcc ;) .
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.
Also when I started refactoring it was very tedious to move all the
methods call of from SwDoc::method to SwDoc::getInterface::method . I
removed them from doc.hxx and fixed all wrong calls as they popped up as
errors while compiling which is very slow. After some googling I found a
good way to do this faster while still looking at every line I change:
grep FROM -rl --include=*.cxx sw/ | parallel -j1 --tty vim -c
'%s/FROM/TO/gc' -c 'wq' {}
This uses gnu parallel and launches vim for every occurences which
shows me the surrounding code and asks for confirmation for every replace.
Valentin
___
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' - 3 commits - include/svx svx/source
include/svx/sdr/attribute/sdrtextattribute.hxx |4 +-
include/svx/svdotext.hxx |6 +++
svx/source/sdr/attribute/sdrtextattribute.cxx| 25 ---
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 12 ++-
svx/source/sdr/primitive2d/sdrdecompositiontools.cxx |5 ---
svx/source/svdraw/svdotext.cxx | 30 ++-
svx/source/svdraw/svdotextdecomposition.cxx |4 +-
7 files changed, 70 insertions(+), 16 deletions(-)
New commits:
commit b77be468428db23301b14a091bfa758f17789934
Author: matteocam matteo.campane...@gmail.com
Date: Tue Jul 29 03:04:15 2014 +0300
ToBeChained status added to SdrTextObj
Change-Id: If7c7bd4384aeb705ba52eee5465c2b5aee78b1d9
diff --git a/include/svx/sdr/attribute/sdrtextattribute.hxx
b/include/svx/sdr/attribute/sdrtextattribute.hxx
index 637b769..6d3b738 100644
--- a/include/svx/sdr/attribute/sdrtextattribute.hxx
+++ b/include/svx/sdr/attribute/sdrtextattribute.hxx
@@ -73,7 +73,8 @@ namespace drawinglayer
bool bScroll,
bool bInEditMode,
bool bFixedCellHeight,
-bool bWrongSpell);
+bool bWrongSpell,
+bool bToBeChained);
SdrTextAttribute();
SdrTextAttribute(const SdrTextAttribute rCandidate);
SdrTextAttribute operator=(const SdrTextAttribute rCandidate);
@@ -96,6 +97,7 @@ namespace drawinglayer
bool isScroll() const;
bool isInEditMode() const;
bool isFixedCellHeight() const;
+bool isToBeChained() const;
const SdrFormTextAttribute getSdrFormTextAttribute() const;
sal_Int32 getTextLeftDistance() const;
sal_Int32 getTextUpperDistance() const;
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 01c14ac..f0f917d 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -220,6 +220,9 @@ protected:
// the successor in a chain
SdrTextObj *mpNextInChain = NULL;
+// indicating the for its text to be chained to another text box
+bool mbToBeChained : 1;
+
// Fuer beschriftete Zeichenobjekte ist bTextFrame=FALSE. Der Textblock
// wird dann hoizontal und vertikal an aRect zentriert. Bei bTextFrame=
// sal_True wird der Text in aRect hineinformatiert. Der eigentliche
Textrahmen
@@ -343,6 +346,7 @@ 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;
+bool IsToBeChained() const;
SdrObjKind GetTextKind() const { return eTextKind; }
// #i121917#
@@ -524,6 +528,8 @@ public:
virtual bool IsVerticalWriting() const;
virtual void SetVerticalWriting(bool bVertical);
+void SetToBeChained(bool bToBeChained);
+
/** called from the SdrObjEditView during text edit when the status of the
edit outliner changes */
virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus );
diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx
b/svx/source/sdr/attribute/sdrtextattribute.cxx
index 0f29f07..de9a61f 100644
--- a/svx/source/sdr/attribute/sdrtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrtextattribute.cxx
@@ -90,7 +90,8 @@ namespace drawinglayer
bool bScroll,
bool bInEditMode,
bool bFixedCellHeight,
-bool bWrongSpell)
+bool bWrongSpell,
+bool bToBeChained)
: mnRefCount(0),
mpSdrText(pSdrText),
mpOutlinerParaObject(new
OutlinerParaObject(rOutlinerParaObject)),
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 4b3315b..2d135bc 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -521,6 +521,15 @@ namespace drawinglayer
{
const SdrTextObj rTextObj = rText.GetObject();
+// FIXME(matteocam)
+bool bToBeChained = rTextObj.IsToBeChained();
+// for resetting status
+// XXX
+if ( rTextObj.IsToBeChained() )
+{
+rTextObj.SetToBeChained( false );
+}
+
if(rText.GetOutlinerParaObject() rText.GetModel())
{
// added TextEdit text suppression
@@ -579,7 +588,8 @@ namespace drawinglayer
SDRTEXTANI_SCROLL == eAniKind || SDRTEXTANI_ALTERNATE ==
eAniKind || SDRTEXTANI_SLIDE == eAniKind,
bInEditMode,
((const
SdrTextFixedCellHeightItem)rSet.Get(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue(),
-bWrongSpell);
+bWrongSpell,
+bToBeChained);
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 2 commits - svx/source
svx/source/sdr/primitive2d/sdrattributecreator.cxx |6 +++---
svx/source/sdr/primitive2d/sdrdecompositiontools.cxx | 14 +-
svx/source/svdraw/svdotext.cxx | 12
3 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit e5535665a3bbd7bd876eb62d8d4517d0bf16fad9
Author: matteocam matteo.campane...@gmail.com
Date: Tue Jul 29 03:16:52 2014 +0300
Chained primitive is created only if there is chaining need
Change-Id: Ib8da3f48b8c7327769a7a35dc7af7deb984aa36a
diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
index f75354d..db79a85 100644
--- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
+++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
@@ -305,13 +305,17 @@ namespace drawinglayer
// isotrophically scaled text in range
pNew = new SdrAutoFitTextPrimitive2D(rText.getSdrText(),
rText.getOutlinerParaObject(), aAnchorTransform, bWordWrap);
}
+else if( rText.isToBeChained() ) // FIXME(matteocam)
+{
+//bool b = true; // XXX: Chained Text by default!
+//if (b)
+pNew = new SdrChainedTextPrimitive2D(
+rText.getSdrText(),
+rText.getOutlinerParaObject() );
+//else // end FIXME
+}
else // text in range
{
-// FIXME(matteocam)
-bool b = true; // XXX: Chained Text by default!
-if (b)
-pNew = new SdrChainedTextPrimitive2D(
rText.getSdrText(), rText.getOutlinerParaObject() );
-else // end FIXME
// build new primitive
pNew = new SdrBlockTextPrimitive2D(
rText.getSdrText(),
commit 13977e0e6163e348d8d65468a8788dd9a8a7abd0
Author: matteocam matteo.campane...@gmail.com
Date: Tue Jul 29 03:13:42 2014 +0300
Sets need for chaining in SdrTextObj when page overflow occurs
Change-Id: I2e4a1adbacf7cae8feebaa392957e98c717699c2
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 2d135bc..fc22e83 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -524,10 +524,10 @@ namespace drawinglayer
// FIXME(matteocam)
bool bToBeChained = rTextObj.IsToBeChained();
// for resetting status
-// XXX
+// XXX: may not work
if ( rTextObj.IsToBeChained() )
-{
-rTextObj.SetToBeChained( false );
+{ // XXX: hack
+const_castSdrTextObj*(rTextObj)-SetToBeChained( false );
}
if(rText.GetOutlinerParaObject() rText.GetModel())
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 09b8b8e..0b5e690 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1947,16 +1947,12 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus*
pEditStatus )
}
else if (/* TODO: IsChained() */ pEditStatus-IsPageOverflow())
{
+// FIXME(matteocam): should include check that the TextBox has a
next chain link
+
+// set the need for chaining
+SetToBeChained( true );
//impDecomposeChainedTextPrimitive();
-/*
- * XXX: Do nothing for now, later here we'll set the need for
chaining
- * How do you do such a thing?
- * TODO: Look at where text primitive creation methods are called.
- * Then what?
- * Store the state in SdrTextObj with something like needsChaingin?
- *
-*/
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSoC] Chained Text Boxes in Draw - Report 28/08/2014
Hi all, from last week there is some encouraging progress: - I implemented a suitable primitive2d class in svx/ for text needing to be chained; - when a page overflow occurs, the status need to be chained is set and text from one box is copied in another by creating the appropriate text primitive (text is still not truncated though). An immediate next action is to make the possibility of dealing with chains that have more than two text boxes. Cheers, Matteo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dev-tools.git: scripts/Bugzilla.pm scripts/esc-bug-stats.pl
scripts/Bugzilla.pm |1 +
scripts/esc-bug-stats.pl |8 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 9aee886ac125693808a14fa71ad37cd28c46033e
Author: Michael Meeks michael.me...@collabora.com
Date: Mon Jul 28 21:19:59 2014 -0400
Update blacklist, and prune migration.
diff --git a/scripts/Bugzilla.pm b/scripts/Bugzilla.pm
index 8093c8b..2a7715f 100644
--- a/scripts/Bugzilla.pm
+++ b/scripts/Bugzilla.pm
@@ -58,6 +58,7 @@ my %sadly_non_libreoffice = (
'Tom Stellard' = 1,
'almos' = 1,
'Andreas Boll' = 1,
+'Tapani Pälli' = 1,
);
sub get_url($)
diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
index 508a95b..3b299b0 100755
--- a/scripts/esc-bug-stats.pl
+++ b/scripts/esc-bug-stats.pl
@@ -81,8 +81,10 @@ print STDERR \n;
my %component_count;
+my %obsolete_components = ( 'Migration' = 1 );
+
# custom pieces
-$component_count{'Migration'} =
Bugzilla::get_deps(https://$Bugzilla::bugserver/showdependencytree.cgi?id=43489hide_resolved=1;);
+$component_count{'Migration'} = 0; #
aBugzilla::get_deps(https://$Bugzilla::bugserver/showdependencytree.cgi?id=43489hide_resolved=1;);
- kill for now.
$component_count{'Crashes'} =
Bugzilla::get_query(https://$Bugzilla::bugserver/buglist.cgi?keywords=regressionkeywords_type=allwordslist_id=296015short_desc=crashquery_based_on=CrashRegressionsquery_format=advancedbug_status=UNCONFIRMEDbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDbug_status=NEEDINFOshort_desc_type=allwordssubstrproduct=LibreOfficeknown_name=CrashRegressions;);
$component_count{'Borders'} =
Bugzilla::get_query(https://$Bugzilla::bugserver/buglist.cgi?keywords=regressionkeywords_type=allwordslist_id=296016short_desc=borderquery_based_on=BorderRegressionsquery_format=advancedbug_status=UNCONFIRMEDbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDbug_status=NEEDINFOshort_desc_type=allwordssubstrproduct=LibreOfficeknown_name=BorderRegressions;);
@@ -94,7 +96,9 @@ for my $component (@reg_toquery) {
print STDERR \t* ~Component count net *\n;
for my $component (sort { $component_count{$b} = $component_count{$a} } keys
%component_count) {
-printf STDERR \t %12s - %2d (+?)\n, $component,
$component_count{$component};
+if (!defined $obsolete_components{$component}) {
+ printf STDERR \t %12s - %2d (+?)\n, $component,
$component_count{$component};
+}
}
print EOF
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sc/inc sc/qa sc/source
sc/inc/column.hxx |6 ++-
sc/inc/document.hxx |8 +---
sc/inc/formulacell.hxx |1
sc/inc/table.hxx|6 ++-
sc/qa/unit/ucalc.hxx|2 +
sc/qa/unit/ucalc_sharedformula.cxx | 68
sc/source/core/data/column2.cxx | 22 ---
sc/source/core/data/column4.cxx | 43 +++---
sc/source/core/data/documen4.cxx| 11 -
sc/source/core/data/document10.cxx | 17 +++--
sc/source/core/data/formulacell.cxx | 51 ---
sc/source/core/data/table4.cxx |6 ---
sc/source/core/data/table7.cxx | 11 -
sc/source/ui/dbgui/dbnamdlg.cxx |7 ++-
sc/source/ui/docshell/dbdocfun.cxx | 51 +++
sc/source/ui/docshell/docfunc.cxx |4 +-
sc/source/ui/docshell/docsh5.cxx|4 +-
sc/source/ui/inc/dbdocfun.hxx |3 +
sc/source/ui/inc/dbfunc.hxx |2 -
sc/source/ui/undo/undocell.cxx |2 -
sc/source/ui/undo/undodat.cxx |8 ++--
sc/source/ui/undo/undorangename.cxx |2 -
sc/source/ui/unoobj/nameuno.cxx |2 -
sc/source/ui/view/dbfunc.cxx| 45 ---
sc/source/ui/view/viewfunc.cxx |2 -
25 files changed, 199 insertions(+), 185 deletions(-)
New commits:
commit 300845922eec7a28bc1da337acd21f138685d759
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Jul 28 21:34:40 2014 -0400
fdo#79578: Properly update formulas upon change in db collection.
Update it to handle formula groups correctly.
Change-Id: I009a7fcf3d3fb17ef6951c50534ca6bc1fffc259
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 6191577..1a08163 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -381,9 +381,12 @@ public:
void PreprocessRangeNameUpdate(
sc::EndListeningContext rEndListenCxt, sc::CompileFormulaContext
rCompileCxt );
-void PostprocessRangeNameUpdate(
+void CompileHybridFormula(
sc::StartListeningContext rStartListenCxt, sc::CompileFormulaContext
rCompileCxt );
+void PreprocessDBDataUpdate(
+sc::EndListeningContext rEndListenCxt, sc::CompileFormulaContext
rCompileCxt );
+
const SfxPoolItem* GetAttr( SCROW nRow, sal_uInt16 nWhich ) const;
const ScPatternAttr*GetPattern( SCROW nRow ) const;
const ScPatternAttr*GetMostUsedPattern( SCROW nStartRow, SCROW nEndRow
) const;
@@ -486,7 +489,6 @@ public:
void CollectListeners( std::vectorSvtListener* rListeners, SCROW nRow1,
SCROW nRow2 );
void CompileDBFormula( sc::CompileFormulaContext rCxt );
-void CompileDBFormula( sc::CompileFormulaContext rCxt, bool
bCreateFormulaString );
void CompileColRowNameFormula( sc::CompileFormulaContext rCxt );
sal_Int32 GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd,
rtl_TextEncoding eCharSet ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 44e88c0..c7b797b 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -519,11 +519,8 @@ public:
* Call this immediately before updating all named ranges.
*/
SC_DLLPUBLIC void PreprocessRangeNameUpdate();
-
-/**
- * Call this immediately after all named ranges have been updated.
- */
-SC_DLLPUBLIC void PostprocessRangeNameUpdate();
+SC_DLLPUBLIC void PreprocessDBDataUpdate();
+SC_DLLPUBLIC void CompileHybridFormula();
/**
* Insert a new named expression to the global scope.
@@ -1978,7 +1975,6 @@ public:
voidStartTrackTimer();
voidCompileDBFormula();
-voidCompileDBFormula( bool bCreateFormulaString );
voidCompileColRowNameFormula();
/** Maximum string length of a column, e.g. for dBase export.
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index cc234c9..b765ff0 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -309,7 +309,6 @@ public:
boolIsRunning() const { return bRunning;}
voidSetRunning( bool bVal );
void CompileDBFormula( sc::CompileFormulaContext rCxt );
-void CompileDBFormula( sc::CompileFormulaContext rCxt, bool
bCreateFormulaString );
void CompileColRowNameFormula( sc::CompileFormulaContext rCxt );
ScFormulaCell* GetPrevious() const { return pPrevious; }
ScFormulaCell* GetNext() const { return pNext; }
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 9701463..4486d42 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -860,9 +860,12 @@ public:
void PreprocessRangeNameUpdate(
sc::EndListeningContext rEndListenCxt, sc::CompileFormulaContext
rCompileCxt );
-void PostprocessRangeNameUpdate(
+void CompileHybridFormula(
sc::StartListeningContext rStartListenCxt, sc::CompileFormulaContext
rCompileCxt );
+void PreprocessDBDataUpdate(
+
[Bug 70625] Add --cat parameter to make git diffs pretty
https://bugs.freedesktop.org/show_bug.cgi?id=70625 --- Comment #5 from Deena P.F. deena.fran...@gmail.com --- I'd like to work on this as my first open source contribution. -- 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/LibreOfficeKit libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk libreofficekit/Library_libreofficekitgtk.mk libreofficekit/Module_libreofficekit.mk l
include/LibreOfficeKit/LibreOfficeKit.h |2
include/LibreOfficeKit/LibreOfficeKitInit.h | 96
libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk |4
libreofficekit/Library_libreofficekitgtk.mk |4
libreofficekit/Module_libreofficekit.mk |4
libreofficekit/StaticLibrary_libreofficekit.mk | 16 --
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |1
libreofficekit/qa/unit/tiledrendering.cxx |1
libreofficekit/source/shim.c| 82 --
smoketest/Executable_libtest.mk |4
smoketest/libtest.cxx |1
11 files changed, 99 insertions(+), 116 deletions(-)
New commits:
commit 9e7bdb422d12d8be4b76eaf065e3aea8f9055f12
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Mon Jul 28 20:23:03 2014 +0200
Kill the libreofficekit static library / shim.c.
It looks like the cleanest method of getting lok_init into
a LibreOfficeKitInit.h header (in a c89 compatible way) is to
have it as a static function.
(inline is only available in C99 or later -- this is actually
available on Linux which is the only place that we can actually
use lok_init anyways currently, however given we have to keep
c89 for the C code (for MSVC) compatibility, selectively enabling
c99 would likely be more messy.)
Change-Id: I0493e7a68ed5397479220bb6ba8c3db870b6dd32
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h
b/include/LibreOfficeKit/LibreOfficeKit.h
index 675eabc..9c74634 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -105,8 +105,6 @@ struct _LibreOfficeKitDocumentClass
#endif // LOK_USE_UNSTABLE_API
};
-LibreOfficeKit* lok_init (const char* pInstallPath);
-
#ifdef __cplusplus
}
#endif
diff --git a/libreofficekit/source/shim.c
b/include/LibreOfficeKit/LibreOfficeKitInit.h
similarity index 80%
rename from libreofficekit/source/shim.c
rename to include/LibreOfficeKit/LibreOfficeKitInit.h
index b533a61..ef01b1c 100644
--- a/libreofficekit/source/shim.c
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -7,17 +7,24 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifdef LINUX
+#ifndef INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_INIT_H
+#define INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_INIT_H
+
+#include LibreOfficeKit.h
+
+#ifdef __cplusplus
+extern C
+{
+#endif
+
+#if defined(__linux__) || defined(_AIX)
#include stdio.h
#include stdlib.h
#include string.h
-#include sal/types.h
-#include LibreOfficeKit/LibreOfficeKit.h
-
#include dlfcn.h
-#ifdef AIX
+#ifdef _AIX
# include sys/ldr.h
#endif
@@ -26,7 +33,7 @@
typedef LibreOfficeKit *(HookFunction)( const char *install_path);
-SAL_DLLPUBLIC_EXPORT LibreOfficeKit *lok_init( const char *install_path )
+static LibreOfficeKit *lok_init( const char *install_path )
{
char *imp_lib;
size_t partial_length;
@@ -58,7 +65,8 @@ SAL_DLLPUBLIC_EXPORT LibreOfficeKit *lok_init( const char
*install_path )
dlhandle = dlopen(imp_lib, RTLD_LAZY);
if (!dlhandle)
{
-fprintf(stderr, failed to open library '%s' or '%s' in '%s/'\n,
TARGET_LIB, TARGET_MERGED_LIB, install_path);
+fprintf(stderr, failed to open library '%s' or '%s' in '%s/'\n,
+TARGET_LIB, TARGET_MERGED_LIB, install_path);
free(imp_lib);
return NULL;
}
@@ -77,6 +85,12 @@ SAL_DLLPUBLIC_EXPORT LibreOfficeKit *lok_init( const char
*install_path )
return pSym( install_path );
}
-#endif // not LINUX = port me !
+#endif // defined(__linux__) || defined(_AIX)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
b/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
index 4b77fbf..cd03abe 100644
--- a/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
+++ b/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
@@ -42,10 +42,6 @@ endif
$(eval $(call gb_CppunitTest_use_sdk_api,libreofficekit_tiledrendering))
-$(eval $(call
gb_CppunitTest_use_static_libraries,libreofficekit_tiledrendering,\
-libreofficekit \
-))
-
$(eval $(call gb_CppunitTest_use_ure,libreofficekit_tiledrendering))
#$(eval $(call gb_CppunitTest_use_vcl,libreofficekit_tiledrendering))
diff --git a/libreofficekit/Library_libreofficekitgtk.mk
b/libreofficekit/Library_libreofficekitgtk.mk
index be485cd..bcf1a5b 100644
--- a/libreofficekit/Library_libreofficekitgtk.mk
+++ b/libreofficekit/Library_libreofficekitgtk.mk
@@ -14,10 +14,6 @@ $(eval $(call gb_Library_use_externals,libreofficekitgtk,\
gtk \
))
-$(eval $(call gb_Library_use_static_libraries,libreofficekitgtk,\
-libreofficekit \
[Libreoffice-commits] core.git: libreofficekit/README
libreofficekit/README | 15 +++ 1 file changed, 11 insertions(+), 4 deletions(-) New commits: commit 879c1e3edc3fd9b92f5b7cafad996b68c098a864 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Tue Jul 29 07:16:08 2014 +0200 Update LOK Readme to use LibreOfficeKitInit.h diff --git a/libreofficekit/README b/libreofficekit/README index 3242ae0..8b18b36 100644 --- a/libreofficekit/README +++ b/libreofficekit/README @@ -10,14 +10,19 @@ tiled rendering API). Integrating LOK into other software --- -You will need to integrate shim.c into your program, e.g. as a static library, -in order to be able to use LOK. You will then be able to access LOK via -the functions in LibreOfficeKit.h[xx]. +LOK functionality can be accessed by including LibreOfficeKit.h[xx] in your +program. + +LOK initialisation (lok_init) requires the inclusion of LibreOfficeKitInit.h +in your program. Should you be using the C++ LibreOfficeKit.hxx header you +must first include LibreOfficeKitInit.h followed by LibreOfficeKit.hxx in any +files where you need to use lok_cpp_init. (LibreOfficeKit.hxx is a simple and fully inlined C++ wrapper for the same functionality as in LibreOfficeKit.h.) -An example program can be seen on: +An example program (currently using the older shim.c/static library +integration) can be seen on: https://github.com/ojwb/lloconv Tiled Rendering @@ -26,6 +31,8 @@ Tiled Rendering To use LOK Tiled Rendering you will need the following before the LOK includes: #define LOK_USE_UNSTABLE_API +(This must be define before ANY LOK header, i.e. including the Init header.) + Currently only bitmap-buffer rendering is supported, with a 32-bit RGBA colourspace (further alternatives could feasibly be implemented as needed). Scanlines are ordered top-down (whereas LibreOffice will internally default ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/lok_sofficemain' - 2 commits - include/LibreOfficeKit libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk libreofficekit/Library_libreofficekitg
Rebased ref, commits from common ancestor:
commit cd79bf9cbffaf1a00e0eea5a66a10d5992887749
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Tue Jul 29 07:18:28 2014 +0200
Upgrade lokconf_init to LibreOfficeKitInit.h
Change-Id: I0581a107c3eefd33c25b003afe9f7be217598441
diff --git a/libreofficekit/qa/lokconf_init/lokconf_init.cxx
b/libreofficekit/qa/lokconf_init/lokconf_init.cxx
index 9677159..aa12bc9 100644
--- a/libreofficekit/qa/lokconf_init/lokconf_init.cxx
+++ b/libreofficekit/qa/lokconf_init/lokconf_init.cxx
@@ -14,6 +14,7 @@
#include sal/main.h
#include LibreOfficeKit/LibreOfficeKit.h
+#include LibreOfficeKit/LibreOfficeKitInit.h
using namespace std;
commit e6c75f1c9d589df8b0b2cee3ee2be90ac76647bb
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Mon Jul 28 20:23:03 2014 +0200
Kill the libreofficekit static library / shim.c.
It looks like the cleanest method of getting lok_init into
a LibreOfficeKitInit.h header (in a c89 compatible way) is to
have it as a static function.
(inline is only available in C99 or later -- this is actually
available on Linux which is the only place that we can actually
use lok_init anyways currently, however given we have to keep
c89 for the C code (for MSVC) compatibility, selectively enabling
c99 would likely be more messy.)
Conflicts:
libreofficekit/Module_libreofficekit.mk
Change-Id: I0493e7a68ed5397479220bb6ba8c3db870b6dd32
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h
b/include/LibreOfficeKit/LibreOfficeKit.h
index 675eabc..9c74634 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -105,8 +105,6 @@ struct _LibreOfficeKitDocumentClass
#endif // LOK_USE_UNSTABLE_API
};
-LibreOfficeKit* lok_init (const char* pInstallPath);
-
#ifdef __cplusplus
}
#endif
diff --git a/libreofficekit/source/shim.c
b/include/LibreOfficeKit/LibreOfficeKitInit.h
similarity index 80%
rename from libreofficekit/source/shim.c
rename to include/LibreOfficeKit/LibreOfficeKitInit.h
index b533a61..ef01b1c 100644
--- a/libreofficekit/source/shim.c
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -7,17 +7,24 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifdef LINUX
+#ifndef INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_INIT_H
+#define INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_INIT_H
+
+#include LibreOfficeKit.h
+
+#ifdef __cplusplus
+extern C
+{
+#endif
+
+#if defined(__linux__) || defined(_AIX)
#include stdio.h
#include stdlib.h
#include string.h
-#include sal/types.h
-#include LibreOfficeKit/LibreOfficeKit.h
-
#include dlfcn.h
-#ifdef AIX
+#ifdef _AIX
# include sys/ldr.h
#endif
@@ -26,7 +33,7 @@
typedef LibreOfficeKit *(HookFunction)( const char *install_path);
-SAL_DLLPUBLIC_EXPORT LibreOfficeKit *lok_init( const char *install_path )
+static LibreOfficeKit *lok_init( const char *install_path )
{
char *imp_lib;
size_t partial_length;
@@ -58,7 +65,8 @@ SAL_DLLPUBLIC_EXPORT LibreOfficeKit *lok_init( const char
*install_path )
dlhandle = dlopen(imp_lib, RTLD_LAZY);
if (!dlhandle)
{
-fprintf(stderr, failed to open library '%s' or '%s' in '%s/'\n,
TARGET_LIB, TARGET_MERGED_LIB, install_path);
+fprintf(stderr, failed to open library '%s' or '%s' in '%s/'\n,
+TARGET_LIB, TARGET_MERGED_LIB, install_path);
free(imp_lib);
return NULL;
}
@@ -77,6 +85,12 @@ SAL_DLLPUBLIC_EXPORT LibreOfficeKit *lok_init( const char
*install_path )
return pSym( install_path );
}
-#endif // not LINUX = port me !
+#endif // defined(__linux__) || defined(_AIX)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
b/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
index 9159a24..acc708f 100644
--- a/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
+++ b/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
@@ -41,10 +41,6 @@ endif
$(eval $(call gb_CppunitTest_use_sdk_api,libreofficekit_tiledrendering))
-$(eval $(call
gb_CppunitTest_use_static_libraries,libreofficekit_tiledrendering,\
-libreofficekit \
-))
-
$(eval $(call gb_CppunitTest_use_ure,libreofficekit_tiledrendering))
#$(eval $(call gb_CppunitTest_use_vcl,libreofficekit_tiledrendering))
diff --git a/libreofficekit/Library_libreofficekitgtk.mk
b/libreofficekit/Library_libreofficekitgtk.mk
index be485cd..bcf1a5b 100644
--- a/libreofficekit/Library_libreofficekitgtk.mk
+++ b/libreofficekit/Library_libreofficekitgtk.mk
@@ -14,10 +14,6 @@ $(eval $(call gb_Library_use_externals,libreofficekitgtk,\
gtk \
))
-$(eval $(call gb_Library_use_static_libraries,libreofficekitgtk,\
-libreofficekit \
-))
-
$(eval $(call gb_Library_add_cobjects,libreofficekitgtk,\
[Libreoffice-commits] core.git: libreofficekit/Executable_gtktiledviewer.mk
libreofficekit/Executable_gtktiledviewer.mk |4 1 file changed, 4 deletions(-) New commits: commit a97457db2c570b18c3c0e4717eb09210c1287ce8 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Tue Jul 29 07:49:40 2014 +0200 One final removal of libreofficekit static library. (Seems you need a clean build to notice this...) diff --git a/libreofficekit/Executable_gtktiledviewer.mk b/libreofficekit/Executable_gtktiledviewer.mk index d4ef643..153d7a0 100644 --- a/libreofficekit/Executable_gtktiledviewer.mk +++ b/libreofficekit/Executable_gtktiledviewer.mk @@ -22,10 +22,6 @@ $(eval $(call gb_Executable_use_libraries,gtktiledviewer,\ libreofficekitgtk \ )) -$(eval $(call gb_Executable_use_static_libraries,gtktiledviewer,\ -libreofficekit \ -)) - $(eval $(call gb_Executable_add_libs,gtktiledviewer,\ -lX11 \ -lXext \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/lok_sofficemain' - libreofficekit/Executable_gtktiledviewer.mk
libreofficekit/Executable_gtktiledviewer.mk |4 1 file changed, 4 deletions(-) New commits: commit 818b2b79d1ab6c2b7b211c0f70c8c23af4f346c5 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Tue Jul 29 07:49:40 2014 +0200 One final removal of libreofficekit static library. (Seems you need a clean build to notice this...) diff --git a/libreofficekit/Executable_gtktiledviewer.mk b/libreofficekit/Executable_gtktiledviewer.mk index d4ef643..153d7a0 100644 --- a/libreofficekit/Executable_gtktiledviewer.mk +++ b/libreofficekit/Executable_gtktiledviewer.mk @@ -22,10 +22,6 @@ $(eval $(call gb_Executable_use_libraries,gtktiledviewer,\ libreofficekitgtk \ )) -$(eval $(call gb_Executable_use_static_libraries,gtktiledviewer,\ -libreofficekit \ -)) - $(eval $(call gb_Executable_add_libs,gtktiledviewer,\ -lX11 \ -lXext \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] [ANN] LIbreOffice 4.3.0 RC4 available
Dear Community, The Document Foundation is pleased to announce the fourth release candidate of LibreOffice 4.3.0. The upcoming 4.3.0 will be the eighth major release of LibreOffice, coming with a bunch of new features beside the usual bugfixes. RC4 is in release configuration and can be be installed alongside the stable version on linux and Mac OS X, but will update an earlier version on Windows. RC4 is an unscheduled RC that fixes a problem with spellchecking on windows. A work-in-progress list of new features in LibreOffice 4.3 can be found at https://wiki.documentfoundation.org/ReleaseNotes/4.3 The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Developers and QA might also be interested in the symbol server for windows debug information (see the release notes linked below for details) Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/community/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 4.3.0 RC4 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.3.0/RC4 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. On behalf of the Community, 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] [ANN] LIbreOffice 4.2.6 RC2 available
Dear Community, The Document Foundation is pleased to announce the second release candidate of LibreOffice 4.2.6. The upcoming 4.2.6 will be the sixth in a sequence of frequent bugfix releases for our feature-packed 4.2 line. Feel free to give it a try instead of 4.2.5. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Developers and QA might also be interested in the symbol server for windows debug information (see the release notes linked below for details) Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/community/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 4.2.6 RC2 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.2.6/RC2 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. On behalf of the Community, 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] Windows Mobile Needed
Hi All, Anyone with Windows Mobile installed? https://bugs.freedesktop.org/show_bug.cgi?id=50090list_id=450303 Best, joel -- *Joel Madero* LibreOffice QA Volunteer jmadero@gmail.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] Windows Mobile Needed
Hi, IMHO we can close this as NOTOURBUG as import is crappy (Wordpad is a Windows built in editor with a very limited set of functions [referring to last comment]). If MS - MS is not working... Well... Your opinion? Liebe Grüße, / Yours, Florian Reisinger Am 28.07.2014 um 22:04 schrieb Joel Madero jmadero@gmail.com: Hi All, Anyone with Windows Mobile installed? https://bugs.freedesktop.org/show_bug.cgi?id=50090list_id=450303 Best, joel -- Joel Madero LibreOffice QA Volunteer jmadero@gmail.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/ ___ 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 81829] New: VIEWING: Can't page down accurately in Entire Page view Windows 7
https://bugs.freedesktop.org/show_bug.cgi?id=81829 Priority: medium Bug ID: 81829 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: VIEWING: Can't page down accurately in Entire Page view Windows 7 Severity: normal Classification: Unclassified OS: Windows (All) Reporter: warrenm...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.5.2 release Component: Writer Product: LibreOffice Problem description: It is not possible to use Writer to read a long document properly because it does not align pages properly when page down pressed. Steps to reproduce: 1. Open a large document in Writer under Windows 7. 2. Select Entire Page from View/Zoom 3. Press page down. Current behavior: Page down will align the document so that the interpage break is roughly in the middle of the viewing area. The top of the area will show the end of the previous page and the bottom of the area will show the start of the current page. Continued pressing of page down will continue to align the page break in the approximate centre of the viewing area. Expected behavior: Page down should align the document so that the top of the page is at the top of the viewing area and only that page should be visible. Continued pressing of page down should display each successive page taking up the entire viewing area. Further information: This is the same bug that was listed earlier as FDO#65885 and wrongly closed by James a year ago with WORKSFORME when he used LO 4.1.0.1 on OS X 10.8.4. This is a Windows Bug and should not be closed by an Apple user. Operating System: Windows 7 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 77363] Impress, formatting of pptx: position of elements appears to be wrong
https://bugs.freedesktop.org/show_bug.cgi?id=77363 --- Comment #6 from tommy27 ba...@quipo.it --- slide 6 formula position looks fine in 4.4.x see attachment 103560 I'll recheck slide 11 under 4.2.5.2 and 4.4.x master this evening. -- 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 61228] TABLE: Function summe() does not sum up but returns last item
https://bugs.freedesktop.org/show_bug.cgi?id=61228 Thomas Arnhold thomas-l...@arnhold.org changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #7 from Thomas Arnhold thomas-l...@arnhold.org --- Mike, ah your explanation maked it clear to me. summe is not the problem. You cat try anything else, like foo. Writer only interprets the A1:A3 part of =summe(A1:A3). Looks like the angle brackets are some shortcut to sum?! The issue is, that writer should not silently ignore the wrong function name, but display an error, that the function was not found. Then it would be clear to everyone. As that is clarified I set it to NEW. -- 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 81799] Clang 3.2 Fails to build LO 4.4
https://bugs.freedesktop.org/show_bug.cgi?id=81799 David Tardon dtar...@redhat.com changed: What|Removed |Added CC||dtar...@redhat.com --- Comment #2 from David Tardon dtar...@redhat.com --- Does adding cppuhelper to the gb_CppunitTest_use_libraries list in cppcanvas/CppunitTest_cppcanvas_empflus.mk help? -- 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 80859] FILEOPEN: error opening MS Excel 2003 XML document
https://bugs.freedesktop.org/show_bug.cgi?id=80859 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added CC||ign_christ...@yahoo.com, ||momonas...@gmail.com Summary|LO Calc: error opening MS |FILEOPEN: error opening MS |Excel 2003 XML document |Excel 2003 XML document --- Comment #2 from ign_christian ign_christ...@yahoo.com --- Odd problem.. @Maxim, would you mind have a quick look 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 81567] FILESAVE: DOCX caption of image is shown at top instead of bottom in Word
https://bugs.freedesktop.org/show_bug.cgi?id=81567 --- Comment #8 from Tushar Bende tushar.be...@synerzip.com --- Joren: I checked the issue document on latest build.I can work on this issue you no one is working on it please assign it to me. Thanks, Tushar -- 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 81741] Orientation should be a button, not a menu
https://bugs.freedesktop.org/show_bug.cgi?id=81741 Mirek2 maz...@gmail.com changed: What|Removed |Added Priority|medium |low --- Comment #6 from Mirek2 maz...@gmail.com --- (In reply to comment #5) No, it would be Portrait or Landscape, based on what the current setting is. Such UI 'ideas' are called 'bullshit'. Please explain. The choice is always going to be binary. It doesn't make sense to use a menu in this case. -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 79441, which changed state. Bug 79441 Summary: Internal references to other sheets not sorted https://bugs.freedesktop.org/show_bug.cgi?id=79441 What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |FIXED -- 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 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 79441, which changed state. Bug 79441 Summary: Internal references to other sheets not sorted https://bugs.freedesktop.org/show_bug.cgi?id=79441 What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. 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 --- Comment #20 from Kiss-Kálmán Dániel kisskalmandan...@gmail.com --- 4.3.0.4: the error still exists both on 32 and 64 bit win8.1 -- 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 75353] [UI] Show a spinner while loading presentation thumbnails/notes
https://bugs.freedesktop.org/show_bug.cgi?id=75353 Andrzej Hunt andr...@ahunt.org changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |andr...@ahunt.org |desktop.org | CC||andr...@ahunt.org -- 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 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|79441 | -- You are receiving this mail because: You are on the CC list for the bug. 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 81830] New: FILEOPEN: LibreOffice hangs on opening .ods file
https://bugs.freedesktop.org/show_bug.cgi?id=81830 Priority: medium Bug ID: 81830 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILEOPEN: LibreOffice hangs on opening .ods file Severity: normal Classification: Unclassified OS: Linux (All) Reporter: bugzi...@1e3.de Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.1.6.2 release Component: Spreadsheet Product: LibreOffice Created attachment 103577 -- https://bugs.freedesktop.org/attachment.cgi?id=103577action=edit .ods file that LO does not open. Any other .ods would have done. Problem description: Steps to reproduce: 1. LibreOffice working fine. Possibly: (a) work with a LibreOffice draw document in between -- this was one instance when this happened or (b) saving spreadsheet as an .xlsx-file. 2. Original .ods nor any other .ods can load anymore. LibreOffice just hangs. 3. Creating new .ods works, saving it works, all other components work, opening previous .xlsx works. Current behavior: Hanging upon fileopen. Both from command line as well as from menu, and for *any* .ods document. Expected behavior: Just open file. Had this in previous version and only solution was a reinstallation of LibreOffice! Now this happened again with 4.1.6.2 build 410m0 (Build 2). I attach a very simple .ods file that was created with the same LO build, but like any other .ods doesn't open. I did try to delete my profile the first time I had this problem. No change. Operating System: openSUSE Version: 4.1.6.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 80859] FILEOPEN: error opening MS Excel 2003 XML document
https://bugs.freedesktop.org/show_bug.cgi?id=80859 --- Comment #3 from Maxim Monastirsky momonas...@gmail.com --- The console output says it all. The attached file has invalid XML syntax. All the issues described here are already covered by Bug 38361 Bug 68742, so I see no point in keeping this bug open. -- 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 81827] LibreOffice Draw import all connections in VSD file as figures
https://bugs.freedesktop.org/show_bug.cgi?id=81827 David Tardon dtar...@redhat.com changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||dtar...@redhat.com Component|Drawing |filters and storage Ever confirmed|0 |1 --- Comment #2 from David Tardon dtar...@redhat.com --- That was a known limitation of the formerly used libwpg API. librevenge has support for connectors, but nobody has updated libvisio to take advantage of that (and libodfgen to produce appropriate ODF output). -- 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 67779] IMPORT: Wrong spacing in cells (XLS, XLSX)
https://bugs.freedesktop.org/show_bug.cgi?id=67779 Vitaly Bevsky delph...@i.ua changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #10 from Vitaly Bevsky delph...@i.ua --- The problem is resolved in LO 4.3. I mark as fixed -- 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 65454] HTML PDF Conversion Hangs When HTML Table Contains Large Number of Rows with Formatting Info
https://bugs.freedesktop.org/show_bug.cgi?id=65454 Owen Genat owen.ge...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #14 from Owen Genat owen.ge...@gmail.com --- (In reply to comment #13) Does 4.3RC3 improve anything? I have tested attachment 80391 under GNU/Linux x86_64 (Debian 7 / Crunchbang 11) using: - v3.5.7.2 Build ID: 3215f89-f603614-ab984f2-7348103-1225a5b - v4.1.6.2 Build ID: 40ff705089295be5be0aae9b15123f687c05b0a - v4.2.5.2 Build ID: 61cb170a04bb1f12e77c884eab9192be736ec5f5 - v4.3.0.3 Build ID: 08ebe52789a201dd7d38ef653ef7a48925e7f9f7 - v4.4.0.0.alpha0+ Build ID: 4aa9b041de3129f19b48e66d349f48657b73f33e (2014-07-19) All versions apart from v4162 (oddly) hang as described - v4162 produces valid PDF output. I can provide straces if anyone feels it will add anything further to this report. Status set to NEW. -- 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 73139] PRINTING: Content of Tablecontrols isn't printed, when the whole Fonts are formatted black
https://bugs.freedesktop.org/show_bug.cgi?id=73139 Owen Genat owen.ge...@gmail.com changed: What|Removed |Added Attachment #91320|application/pdf |application/postscript mime type|| -- 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 80907] avoid unnecessary allocations in OpenXML import filter
https://bugs.freedesktop.org/show_bug.cgi?id=80907 David Tardon dtar...@redhat.com changed: What|Removed |Added Whiteboard|EasyHack|EasyHack DifficultyBeginner |DifficultyInteresting |SkillCpp TopicCleanup |SkillCpp TopicCleanup |target:4.4.0 |target:4.4.0| Summary|improve performance of |avoid unnecessary |OpenXML import filter |allocations in OpenXML ||import filter --- Comment #8 from David Tardon dtar...@redhat.com --- Eh, there had been a specific easy hack for that? I did not notice; sorry I hijacked this one then (but the description was rather generic)... Let's move this back to a simple avoid double allocation on creating new values then. -- 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 81349] LibreOffice Impress crashes with Failed to add _impressremote._tcp service: Not permitted
https://bugs.freedesktop.org/show_bug.cgi?id=81349 --- Comment #1 from Marina Latini mar...@studiostorti.com --- Can't reproduce on LibO: * Version: 4.2.5.2 * Build ID: 61cb170a04bb1f12e77c884eab9192be736ec5f5 * Version: 4.2.6.2 * Build ID: 185f2ce4dcc34af9bd97dec29e6d42c39557298f * Version: 4.3.1.0.0+ * Build ID: 764fdb983d2fd0e24f56db987eba307ae5ae6eea * TinderBox: Linux-rpm_deb-x86_64@46-TDF, Branch:libreoffice-4-3, Time: 2014-07-24_16:46:54 Tested on Ubuntu 14.04 X86_64 with avahi-daemon 0.6.31 Can you try again with a fresh user profile? https://wiki.documentfoundation.org/UserProfile -- 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 73139] PRINTING: Content of Tablecontrols isn't printed, when the whole Fonts are formatted black
https://bugs.freedesktop.org/show_bug.cgi?id=73139 Owen Genat owen.ge...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #5 from Owen Genat owen.ge...@gmail.com --- Under GNU/Linux x86_64 using v4.3.0.3 Build ID: 08ebe52789a201dd7d38ef653ef7a48925e7f9f7 these are the results from following the instructions in comment 0: - Form Transactions_Currency_black prints to PDF as indicated i.e., without any content showing in the Budget 1, Budget 2, Budget 3, Amount, or Account columns (despite values being shown in these fields in the form). - Form Transactions_Currency_negativ_red prints to PDF as indicated i.e., without any content showing in first row for the Budget 1, Budget 2, and Budget 3 columns (despite values being shown in these fields in the form). Confirmed. Status set to NEW. -- 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 Owen Genat owen.ge...@gmail.com changed: What|Removed |Added Attachment #73005|0 |1 is obsolete|| -- 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 Owen Genat owen.ge...@gmail.com changed: What|Removed |Added Attachment #73006|0 |1 is obsolete|| --- Comment #21 from Owen Genat owen.ge...@gmail.com --- Comment on attachment 73006 -- https://bugs.freedesktop.org/attachment.cgi?id=73006 attachment-22014-1.dat HTML and DAT attachments made obsolete as they appeared to all be part of a single attempt to attach a webpage containing a screenshot to the bug. Screenshot is still attached, although an example document containing a dozen or so MathType equations for others to test would be more helpful. -- 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 65017] FILEOPEN : Menu File Recent Documents opens rtf file as a Calc document instead of in Writer
https://bugs.freedesktop.org/show_bug.cgi?id=65017 Maxim Monastirsky momonas...@gmail.com changed: What|Removed |Added Status|REOPENED|NEW -- 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 65017] FILEOPEN : Menu File Recent Documents opens rtf file as a Calc document instead of in Writer
https://bugs.freedesktop.org/show_bug.cgi?id=65017 Maxim Monastirsky momonas...@gmail.com changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|NOTABUG |--- Severity|major |enhancement Summary|FILEOPEN : Menu File |FILEOPEN : Menu File |Recent Documents opens|Recent Documents opens |rtf file as a Calc document |rtf file as a Calc document |in stead of in Writer |instead of in Writer --- Comment #20 from Maxim Monastirsky momonas...@gmail.com --- (In reply to comment #19) This is the desired result Thinking of it again, when it comes to the recent documents list it does make sense to open in the same component the user used to create that file. Surely we could find a way to store the last used document service for each document in the recent list. So I'll reopen this, and set as enhancement. -- 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 63570] FILESAVE Writer does not evaluate formulas when converting to pdf or printing by command line
https://bugs.freedesktop.org/show_bug.cgi?id=63570 --- Comment #6 from under_the_line supp...@untermstrich.com --- Hi, I've tested with 4.2.5.2 (WIN) 4.2.4.2(Ubuntu 14.04) PHP $msg = @shell_exec($cmd_prefix.escapeshellarg($libreoffice_path).' --headless --nodefault --nofirststartwizard --nolockcheck --nologo --norestore --invisible --convert-to pdf '.escapeshellarg($path).' --outdir '.escapeshellarg($temp_file_dir)); Command Line soffice.exe --headless --nodefault --nofirststartwizard --nolockcheck --nologo --norestore --invisible --convert-to pdf test.pdf --outdir test; /usr/bin/libreoffice --headless --nodefault --nofirststartwizard --nolockcheck --nologo --norestore --invisible --convert-to pdf /home/xxx/test.pdf --outdir /home/xxx/temp -- Chris -- 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 80869] FILEOPEN: DOC with floating table opens with wrong left margin
https://bugs.freedesktop.org/show_bug.cgi?id=80869 Xisco Faulí aniste...@gmail.com changed: What|Removed |Added Whiteboard|BSA bisected|BSA bibisected CC||aniste...@gmail.com -- 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 80859] FILEOPEN: error opening MS Excel 2003 XML document
https://bugs.freedesktop.org/show_bug.cgi?id=80859 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #4 from ign_christian ign_christ...@yahoo.com --- Thanks Maxim. Marking this as dup to Bug 68742 *** This bug has been marked as a duplicate of bug 68742 *** -- 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 68742] FILEOPEN: XML Calc import ignore leading spaces the same way as MSO2003
https://bugs.freedesktop.org/show_bug.cgi?id=68742 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added CC||bob...@ukr.net --- Comment #4 from ign_christian ign_christ...@yahoo.com --- *** Bug 80859 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 81833] New: EDITING: ProtectForm attribute in settings.xml cannot be changed in Writer.
https://bugs.freedesktop.org/show_bug.cgi?id=81833 Priority: medium Bug ID: 81833 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING: ProtectForm attribute in settings.xml cannot be changed in Writer. Severity: normal Classification: Unclassified OS: Linux (All) Reporter: nikoa...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.5.2 release Component: Writer Product: LibreOffice Problem description: In some documents (I'm working with [1]) there is a ProtectForm attribute set, which persists after saving .doc to .odt, which disables editing of any content outside of some kind of form fields. Design mode doesn't work, and Format Sections menu item is greyed out. Nothing else worked, and I've found a mention of this ([2],[3]) and a fix in [3] which works. This implies that there is no method (or no easily visible one) to change that flag inside of Writer. Steps to reproduce: 1. Open a document 2. Try to edit something outside of fields 3. Try to disable this protection Current behavior: Editing is prohibited, and there is no visible way to disable protection without manual editing of .odt. Expected behavior: There is a way to do this. [1]: http://www.brave.ru/upload/brave/anketa_visa.doc [2]: http://nabble.documentfoundation.org/How-to-unprotect-readonly-parts-of-a-document-td4056306.html [3]: http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.user/21694 Operating System: Linux (Other) 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
