LibreOffice Gerrit News for core on 2014-08-13
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#81426 : Data from header and footer is getting lost. in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji about module sw End of freshness + fdo#63154: Rearrange some solar.h includes in https://gerrit.libreoffice.org/10892 from Marcos Paulo de Souza about module chart2, connectivity, dbaccess, editeng, extensions, filter, idl, include, linguistic, lotuswordpro, rsc, sc, sd, sfx2, svl, svtools, svx, sw, tools, unotools, xmloff + fdo#75757: remove inheritance to std::vector in https://gerrit.libreoffice.org/10891 from Takeshi Abe about module include, sfx2 + Access2Base - non-Base components in https://gerrit.libreoffice.org/10883 from Jean-Pierre Ledure about module wizards + create clang plugin to warn about C-style casts in https://gerrit.libreoffice.org/10367 from Noel Grandin about module compilerplugins, include + vcl: use enum for complex text layout constants in https://gerrit.libreoffice.org/10676 from Noel Grandin about module canvas, cppcanvas, drawinglayer, editeng, include, sc, starmath, svx, sw, vcl * Merged changes on master for project core changed in the last 25 hours: + Help on how-to add autotext in https://gerrit.libreoffice.org/10889 from Laurent BP + Simplify make file for autocorr and autotext in https://gerrit.libreoffice.org/10887 from Laurent BP + Related: fdo#82259 list Apple Color Emoji as a symbol font. in https://gerrit.libreoffice.org/10812 from Adolfo Jayme Barrientos + javaunohelper: Fix Bootstrap_Test.java add warning messages in https://gerrit.libreoffice.org/10863 from Robert Antoni Buj i Gelonch + Let building lpsolve fail when its ccc script fails in https://gerrit.libreoffice.org/10879 from Stephan Bergmann + fdo#39477: Mac Keyboard shortcut Option key ko in Customize dialog in https://gerrit.libreoffice.org/10600 from Julien Nabet + fdo#41350 Expand Single Word only shown active for Last line: Justifie in https://gerrit.libreoffice.org/10656 from Joren De Cuyper + fdo#75757: remove inheritance to std::vector in https://gerrit.libreoffice.org/10868 from Takeshi Abe + Add reference to 'DomainMapper' to some DOCX import classes in https://gerrit.libreoffice.org/10870 from Adam CloudOn * 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#79541 :Corrupt: Shape enclosed within a floating table in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji + fdo#79422 Fix hang problem After ReplaceAll by closing Search Dialog in https://gerrit.libreoffice.org/10643 from Seyeong Kim + Rel fdo#48068: fix errors when 2 decimals in svg path position in https://gerrit.libreoffice.org/10544 from Joren De Cuyper + fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami + 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 + move OpenGLContext to SAL in https://gerrit.libreoffice.org/9429 from David Tardon + 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-commits] core.git: solenv/bin
solenv/bin/native-code.py |8
1 file changed, 8 insertions(+)
New commits:
commit 369b84e847802d77e7469f4ed71400c20e23039f
Author: Tor Lillqvist t...@collabora.com
Date: Wed Aug 13 09:14:51 2014 +0300
We don't build libxsec_xmlsec for Android currently
(Because we don't build NSS for Android, so it would be pointless to build
libxsec_xmlsec. Or something like that. No doubt at some stage somebody will
get the great idea that we need to build NSS for Android, too. But postpone
the pain.)
Python experts, feel free to generate the ifdefs in this script in a more
elegant fashion. Surely it would be better to somehow mark those entries in
the table that should be optional with the corresponding condition, instead
of
hardcoding tests for 'sb_component_getFactory' and
'xsec_xmlsec_component_getFactory' in four places.
Change-Id: I69255ab4966605849a2f3335d45a2bc0366f3ab9
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 6054065..24cdde3 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -198,9 +198,13 @@ if options.groups:
for (factory_name,factory_function) in factory_map[factory_group]:
if factory_function == 'sb_component_getFactory':
print ('#ifdef ANDROID')
+if factory_function == 'xsec_xmlsec_component_getFactory':
+print ('#ifndef ANDROID')
print ('void * '+factory_function+'( const char* , void* , void*
);')
if factory_function == 'sb_component_getFactory':
print ('#endif')
+if factory_function == 'xsec_xmlsec_component_getFactory':
+print ('#endif')
print ('')
if options.groups:
@@ -219,9 +223,13 @@ if options.groups:
for (factory_name,factory_function) in factory_map[factory_group]:
if factory_function == 'sb_component_getFactory':
print ('#ifdef ANDROID')
+if factory_function == 'xsec_xmlsec_component_getFactory':
+print ('#ifndef ANDROID')
print ('{ '+factory_name+', '+factory_function+' },')
if factory_function == 'sb_component_getFactory':
print ('#endif')
+if factory_function == 'xsec_xmlsec_component_getFactory':
+print ('#endif')
print (
{ 0, 0 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/inc/GL3DBarChart.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cd0bbdaf379d646c94e6771f3358d7e3a8f206ad Author: Tor Lillqvist t...@collabora.com Date: Wed Aug 13 09:46:24 2014 +0300 '' should be ' ' within a nested template argument list Change-Id: I469174dc23cdca871e41a3500bede3c941fcaca4 diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx index 3f8ea1d..4e9f7ca 100644 --- a/chart2/source/view/inc/GL3DBarChart.hxx +++ b/chart2/source/view/inc/GL3DBarChart.hxx @@ -164,7 +164,7 @@ private: TimeValue maFPSRenderEndTime; TimeValue maDataUpdateStartTime; TimeValue maDataUpdateEndTime; -std::mapsal_uInt32, std::listfloat maBarHistory; +std::mapsal_uInt32, std::listfloat maBarHistory; std::vectorsal_uInt32 maVectorNearest; std::mapsal_uInt32, float maDistanceMap; }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 7 commits - bean/com bean/qa bridges/source cli_ure/qa connectivity/com connectivity/qa dbaccess/qa filter/qa forms/qa framework/qa nlpsolver/src nlpsolver/ThirdParty o
bean/com/sun/star/beans/JavaWindowPeerFake.java |4 bean/com/sun/star/beans/LocalOfficeWindow.java | 12 - bean/com/sun/star/comp/beans/JavaWindowPeerFake.java |4 bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 12 - bean/com/sun/star/comp/beans/LocalOfficeWindow.java |2 bean/com/sun/star/comp/beans/OOoBean.java | 14 - bean/qa/complex/bean/ScreenComparer.java | 12 - bean/qa/complex/bean/WriterFrame.java |2 bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java | 18 - cli_ure/qa/climaker/ClimakerTestCase.java |2 connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java |2 connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java |6 connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java |2 connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java |6 connectivity/qa/connectivity/tools/AbstractDatabase.java |4 connectivity/qa/connectivity/tools/FlatFileDatabase.java |4 connectivity/qa/connectivity/tools/QueryDefinition.java |2 dbaccess/qa/complex/dbaccess/CopyTableWizard.java |6 dbaccess/qa/complex/dbaccess/DatabaseDocument.java |6 dbaccess/qa/complex/dbaccess/RowSet.java | 10 - dbaccess/qa/complex/dbaccess/RowSetEventListener.java |4 filter/qa/complex/filter/detection/typeDetection/Helper.java | 20 +- forms/qa/complex/forms/CheckOGroupBoxModel.java |6 forms/qa/integration/forms/DocumentHelper.java |6 forms/qa/integration/forms/DocumentViewHelper.java |4 forms/qa/integration/forms/FormComponent.java |2 forms/qa/org/openoffice/xforms/Instance.java |4 framework/qa/complex/framework/autosave/AutoSave.java |8 framework/qa/complex/framework/autosave/Protocol.java | 28 +- framework/qa/complex/framework/recovery/CrashThread.java |4 framework/qa/complex/framework/recovery/RecoveryTools.java |2 framework/qa/complex/imageManager/CheckImageManager.java |2 framework/qa/complex/imageManager/_XComponent.java | 22 +- framework/qa/complex/imageManager/_XImageManager.java | 10 - framework/qa/complex/imageManager/_XInitialization.java |4 framework/qa/complex/imageManager/_XTypeProvider.java |8 framework/qa/complex/imageManager/_XUIConfiguration.java |6 framework/qa/complex/imageManager/_XUIConfigurationPersistence.java |4 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java | 20 +- nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java |6 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java |6 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalStruct.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java | 44 ++--
Re: v4.3.0.4 not working on SSE1 CPUs anymore
Hi, Le 08/08/2014 03:10, Maniaxx a écrit : Hallo, LibreOffice v4.3.0.4 doesn't work on SSE1 CPUs anymore. Tested on AMD AthlonXP (AMD K7) with Windows7 32Bit. Previous version was v4.1.0 that worked properly. The problem has been reported here: https://bugs.freedesktop.org/show_bug.cgi?id=82430 I think we need a decision between FIX or WontFix Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - android/experimental desktop/source sd/source
android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
| 10 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
| 25 ++-
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
| 10 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
| 38 ++--
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
| 12 +
android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
|7
android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
|2
desktop/source/lib/init.cxx
| 39 ++---
sd/source/ui/inc/unomodel.hxx
|4
sd/source/ui/unoidl/unomodel.cxx
| 78 ++
sd/source/ui/view/drviewsa.cxx
| 17 +-
11 files changed, 159 insertions(+), 83 deletions(-)
New commits:
commit c5581d19c6c5d857c4117e72cb022dcfc9561409
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Wed Aug 13 09:21:21 2014 +0200
android: Add logic to change document parts from sidebar
Add click listener for list elements (parts) in drawer layout
side bar, add new LOEvent - change parts, propagate the change event
up to TileProvider, call setPart on LOK facade, clean all tiles and
redraw.
Change-Id: I711e0fb5e7e867cef87f97b96f1292d7c6801083
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
index 436e37e..e014e13 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
@@ -2,13 +2,19 @@ package org.libreoffice;
public class DocumentPartView {
-private String partName;
+private final int partIndex;
+private final String partName;
-public DocumentPartView(String partName) {
+public DocumentPartView(int partIndex, String partName) {
+this.partIndex = partIndex;
this.partName = partName;
}
public String getPartName() {
return partName;
}
+
+public int getPartIndex() {
+return partIndex;
+}
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
index 2814730..746ceb5 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
@@ -11,17 +11,16 @@ public class LOEvent {
public static final int TILE_SIZE = 2;
public static final int VIEWPORT = 3;
public static final int DRAW = 4;
-
-private ViewportMetrics mViewportMetrics;
-
+public static final int CHANGE_PART = 5;
public int mType;
-private String mTypeString;
-
ViewportMetrics viewportMetrics;
+private ViewportMetrics mViewportMetrics;
+private String mTypeString;
+private int mPartIndex;
public LOEvent(int type, int widthPixels, int heightPixels, int tileWidth,
int tileHeight) {
mType = type;
-mTypeString = Size Changed: + widthPixels + + heightPixels;
+mTypeString = Size Changed: + widthPixels + + heightPixels;
}
public LOEvent(int type, IntSize tileSize) {
@@ -40,6 +39,12 @@ public class LOEvent {
mTypeString = Draw;
}
+public LOEvent(int type, int partIndex) {
+mType = type;
+mPartIndex = partIndex;
+mTypeString = Change part;
+}
+
public static LOEvent draw(Rect rect) {
return new LOEvent(DRAW, rect);
}
@@ -56,6 +61,10 @@ public class LOEvent {
return new LOEvent(VIEWPORT, viewportMetrics);
}
+public static LOEvent changePart(int part) {
+return new LOEvent(CHANGE_PART, part);
+}
+
public String getTypeString() {
return mTypeString;
}
@@ -63,4 +72,8 @@ public class LOEvent {
public ViewportMetrics getViewport() {
return mViewportMetrics;
}
+
+public int getPartIndex() {
+return mPartIndex;
+}
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index d56f451..a831a55 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -115,6 +115,13 @@ public class LOKitThread extends Thread {
return true;
}
+private void changePart(int partIndex) throws
[Libreoffice-commits] core.git: 3 commits - nlpsolver/Jar_nlpsolver.mk odk/examples odk/Package_examples.mk reportbuilder/Jar_reportbuilder.mk reportbuilder/java ucb/qa wizards/com wizards/Jar_commonw
nlpsolver/Jar_nlpsolver.mk |1
odk/Package_examples.mk|1
odk/examples/java/Inspector/XMethodParametersDialog.java | 37
--
reportbuilder/Jar_reportbuilder.mk |1
reportbuilder/java/org/libreoffice/report/ReportFunction.java | 35 -
ucb/qa/complex/ucb/UCB.java|4 -
wizards/Jar_commonwizards.mk |1
wizards/com/sun/star/wizards/common/Desktop.java | 26 ---
wizards/com/sun/star/wizards/ui/XCommandSelectionListener.java | 24 --
9 files changed, 130 deletions(-)
New commits:
commit b20a5c7be0769c05c645d20b765726b279b4245d
Author: Noel Grandin n...@peralex.com
Date: Wed Aug 13 09:43:19 2014 +0200
fix makefile
after my commit cc6bd12 java: remove unused enum values
Change-Id: I9f2f151c0c9a40f39fc235fa65b8324b9cb40027
diff --git a/nlpsolver/Jar_nlpsolver.mk b/nlpsolver/Jar_nlpsolver.mk
index e116be8..5dca8ac 100644
--- a/nlpsolver/Jar_nlpsolver.mk
+++ b/nlpsolver/Jar_nlpsolver.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Jar_add_sourcefiles,nlpsolver,\
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/ProgressBar \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/Button \
-nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/TextAlign \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/LabeledControl \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/Label \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/ModalState \
commit d01a7e744016a1f28ccb4376dcc6db16e6fc18d9
Author: Noel Grandin n...@peralex.com
Date: Fri Aug 8 13:31:17 2014 +0200
java: remove unused member class
found by UCDetector
Change-Id: Id02478d3d151bd01cea50aeb454c02c2bc4d1baf
diff --git a/wizards/com/sun/star/wizards/common/Desktop.java
b/wizards/com/sun/star/wizards/common/Desktop.java
index fc6d158..ad0e161 100644
--- a/wizards/com/sun/star/wizards/common/Desktop.java
+++ b/wizards/com/sun/star/wizards/common/Desktop.java
@@ -327,32 +327,6 @@ public class Desktop
}
}
-/**
- * @deprecated used to retrieve the most common paths used in the office
application
- */
-public class OfficePathRetriever
-{
-
-public String TemplatePath;
-public String BitmapPath;
-public String UserTemplatePath;
-public String WorkPath;
-
-public OfficePathRetriever(XMultiServiceFactory xMSF)
-{
-try
-{
-TemplatePath = FileAccess.getOfficePath(xMSF, Template,
share, /wizard);
-UserTemplatePath = FileAccess.getOfficePath(xMSF, Template,
user, PropertyNames.EMPTY_STRING);
-BitmapPath = FileAccess.combinePaths(xMSF, TemplatePath,
/../wizard/bitmap);
-WorkPath = FileAccess.getOfficePath(xMSF, Work,
PropertyNames.EMPTY_STRING, PropertyNames.EMPTY_STRING);
-}
-catch (NoValidPathException nopathexception)
-{
-}
-}
-}
-
private static String getTemplatePath(XMultiServiceFactory _xMSF)
{
try
commit 4155c28ae1700e853d598077a08a6ba6c1a94e06
Author: Noel Grandin n...@peralex.com
Date: Wed Aug 13 09:29:24 2014 +0200
java: remove unused interfaces
found by UCDetector
Change-Id: Ide8b3b5c9969048aff84eed16b9eea096abad349
diff --git a/odk/Package_examples.mk b/odk/Package_examples.mk
index 4463c8f..80577e9 100644
--- a/odk/Package_examples.mk
+++ b/odk/Package_examples.mk
@@ -468,7 +468,6 @@ $(eval $(call
gb_Package_add_files_with_dir,odk_examples,$(SDKDIRNAME)/examples,
java/Inspector/XDialogProvider.java \
java/Inspector/XInstanceInspector.idl \
java/Inspector/XLanguageSourceCodeGenerator.java \
-java/Inspector/XMethodParametersDialog.java \
java/Inspector/XTreeControlProvider.java \
java/Inspector/XTreePathProvider.java \
java/Inspector/XUnoFacetteNode.java \
diff --git a/odk/examples/java/Inspector/XMethodParametersDialog.java
b/odk/examples/java/Inspector/XMethodParametersDialog.java
deleted file mode 100644
index 8bad4f1..000
--- a/odk/examples/java/Inspector/XMethodParametersDialog.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *
- * The Contents of this file are made available subject to the terms of
- * the BSD license.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must
[Libreoffice-commits] core.git: writerperfect/source
writerperfect/source/common/DocumentHandler.cxx | 103 +++-
1 file changed, 102 insertions(+), 1 deletion(-)
New commits:
commit 46f52010e08ebc03c8a8efacd887b0ab526efaed
Author: osnola alo...@loria.fr
Date: Wed Aug 13 09:52:05 2014 +0200
fdo#81787 attrs are already XML-encoded by libodfgen
Change-Id: Icee62e1ec9cee71930bcd52dbab850396fc96efa
diff --git a/writerperfect/source/common/DocumentHandler.cxx
b/writerperfect/source/common/DocumentHandler.cxx
index be62978..d1224bf 100644
--- a/writerperfect/source/common/DocumentHandler.cxx
+++ b/writerperfect/source/common/DocumentHandler.cxx
@@ -20,6 +20,90 @@
namespace writerperfect
{
+static const unsigned char librvng_utf8_skip_data[256] =
+{
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1
+};
+
+#define librvng_utf8_next_char(p) (char const *)((p) +
librvng_utf8_skip_data[*((unsigned char const *)p)])
+
+static void unescapeXML(const char *s, const unsigned long sz,
librevenge::RVNGString res)
+{
+const char *p = s;
+const char *const end = p + sz;
+while (p != end)
+{
+const char *const next = librvng_utf8_next_char(p);
+if (next end)
+{
+// oops, the string is invalid
+break;
+}
+if (p+4 = end p+1==next *p=='')
+{
+// look for amp; , lt; , gt; , apos; , quot;
+bool escapedChar=false;
+switch(*(p+1))
+{
+case 'a':
+if (p+5 = end strncmp(p,amp;,5)==0)
+{
+res.append('');
+p+=5;
+escapedChar=true;
+}
+else if (p+6 = end strncmp(p,apos;,6)==0)
+{
+res.append('\'');
+p+=6;
+escapedChar=true;
+}
+break;
+case 'g':
+if (strncmp(p,gt;,4)==0)
+{
+res.append('');
+p+=4;
+escapedChar=true;
+}
+break;
+case 'l':
+if (strncmp(p,lt;,4)==0)
+{
+res.append('');
+p+=4;
+escapedChar=true;
+}
+break;
+case 'q':
+if (p+6 = end strncmp(p,quot;,6)==0)
+{
+res.append('');
+p+=6;
+escapedChar=true;
+}
+break;
+default:
+break;
+}
+if (escapedChar) continue;
+}
+
+while (p != next) {
+res.append(*p);
+++p;
+}
+p = next;
+}
+}
+
using com::sun::star::uno::Reference;
using com::sun::star::xml::sax::XAttributeList;
using com::sun::star::xml::sax::XDocumentHandler;
@@ -49,8 +133,25 @@ void DocumentHandler::startElement(const char *psName,
const librevenge::RVNGPro
// filter out librevenge elements
if (strncmp(i.key(), librevenge, 10) != 0)
{
-OUString sName(i.key(), strlen(i.key()), RTL_TEXTENCODING_UTF8);
+size_t keyLength=strlen(i.key());
+OUString sName(i.key(), keyLength, RTL_TEXTENCODING_UTF8);
OUString sValue(i()-getStr().cstr(),
strlen(i()-getStr().cstr()), RTL_TEXTENCODING_UTF8);
+
+// libodfgen xml-encodes some attribute's value, so check if the
value is encoded or not
+for (int j=0; j9; ++j) {
+// list of the encoded attributes followed by their lengths
+static char const *(listEncoded[9])={
+draw:name, svg:font-family, style:condition,
style:num-prefix, style:num-suffix,
+table:formula, text:bullet-char, text:label,
xlink:href
+};
+static size_t const
(listEncodedLength[9])={9,15,15,16,16,13,16,10,10};
+if (keyLength==listEncodedLength[j] strncmp(i.key(),
listEncoded[j], keyLength)==0) {
+librevenge::RVNGString decodedValue();
+unescapeXML(i()-getStr().cstr(), (unsigned long)
strlen(i()-getStr().cstr()), decodedValue);
+sValue=OUString(decodedValue.cstr(),
strlen(decodedValue.cstr()), RTL_TEXTENCODING_UTF8);
+break;
+
[Libreoffice-commits] core.git: 34 commits - basic/inc chart2/inc cli_ure/source configmgr/inc connectivity/inc connectivity/source cui/inc dbaccess/inc desktop/inc desktop/source extensions/source fi
basic/inc/pch/precompiled_sb.hxx|3 - chart2/inc/ChartModel.hxx |2 chart2/inc/pch/precompiled_chartcontroller.hxx |1 chart2/inc/pch/precompiled_chartcore.hxx|3 + chart2/inc/pch/precompiled_chartopengl.hxx |1 cli_ure/source/native/native_bootstrap.cxx |2 configmgr/inc/pch/precompiled_configmgr.hxx |1 connectivity/inc/pch/precompiled_dbtools.hxx|2 connectivity/inc/pch/precompiled_file.hxx |2 connectivity/inc/pch/precompiled_flat.hxx |1 connectivity/source/inc/ado/adoimp.hxx |1 cui/inc/pch/precompiled_cui.hxx |4 + dbaccess/inc/pch/precompiled_dbaxml.hxx |2 dbaccess/inc/pch/precompiled_dbu.hxx|1 desktop/inc/pch/precompiled_sofficeapp.hxx |6 ++ desktop/source/splash/splash.cxx|4 - extensions/source/ole/oleobjw.cxx |1 extensions/source/plugin/base/multiplx.cxx |2 filter/source/svg/svgwriter.cxx |4 + forms/inc/pch/precompiled_frm.hxx |1 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 30 +- framework/inc/pch/precompiled_fwi.hxx |1 framework/inc/pch/precompiled_fwk.hxx |1 hwpfilter/inc/pch/precompiled_hwp.hxx |1 include/osl/file.hxx|2 lotuswordpro/inc/pch/precompiled_lwpft.hxx |1 oox/inc/pch/precompiled_oox.hxx |6 ++ package/inc/pch/precompiled_xstor.hxx |1 reportdesign/inc/pch/precompiled_rpt.hxx|4 + reportdesign/inc/pch/precompiled_rptxml.hxx |2 reportdesign/source/ui/misc/UITools.cxx |5 + sal/inc/pch/precompiled_sal.hxx |1 sal/qa/rtl/textenc/rtl_tencinfo.cxx | 12 +++- sc/inc/docuno.hxx |2 sc/inc/pch/precompiled_sc.hxx |2 sc/inc/pch/precompiled_scfilt.hxx |3 - sc/inc/pch/precompiled_vbaobj.hxx |1 sc/qa/unit/subsequent_filters-test.cxx |2 sc/source/ui/optdlg/tpusrlst.cxx|2 sd/inc/pch/precompiled_sd.hxx |4 + sd/inc/pch/precompiled_sdui.hxx |1 setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx |2 sfx2/inc/pch/precompiled_sfx.hxx|1 sfx2/source/control/thumbnailview.cxx |2 shell/qa/zip/ziptest.cxx|2 shell/source/win32/zipfile/zipfile.cxx | 13 slideshow/inc/pch/precompiled_slideshow.hxx |2 solenv/gbuild/platform/com_MSC_defs.mk | 14 sot/inc/pch/precompiled_sot.hxx |2 starmath/source/document.cxx|2 svl/inc/pch/precompiled_svl.hxx |6 ++ svtools/inc/pch/precompiled_svt.hxx |1 svtools/source/uno/unoimap.cxx |4 - svx/inc/pch/precompiled_svx.hxx |5 + svx/inc/pch/precompiled_svxcore.hxx |6 +- sw/inc/htmltbl.hxx |4 - sw/inc/pch/precompiled_msword.hxx |1 sw/inc/pch/precompiled_sw.hxx | 25 ++-- sw/inc/pch/precompiled_swui.hxx |2 sw/inc/pch/precompiled_vbaswobj.hxx |1 sw/qa/core/Test-BigPtrArray.cxx | 11 ++- sw/source/filter/ww8/ww8par.cxx |6 +- tools/inc/pch/precompiled_tl.hxx|5 + vcl/inc/pch/precompiled_vcl.hxx |4 +
[Libreoffice-commits] core.git: vcl/qa vcl/source
vcl/qa/cppunit/graphicfilter/data/gif/pass/sf_3e0068c9b19bb548826bed0599f65745-15940-minimized.gif
|binary
vcl/source/filter/igif/decode.cxx
| 11 ++
2 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit ddc178e07d92bef3d0ca3cc6de5917d8ebe10dc9
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 13 09:12:26 2014 +0100
valgrind + bff: don't add 0x oldcode
Invalid read of size 1
at 0x9DC6247: GIFLZWDecompressor::AddToTable(unsigned short, unsigned
short) (decode.cxx:117)
Change-Id: I9cea8dcd4a5eeaa1e793b9be96f82854b9d088af
diff --git
a/vcl/qa/cppunit/graphicfilter/data/gif/pass/sf_3e0068c9b19bb548826bed0599f65745-15940-minimized.gif
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/sf_3e0068c9b19bb548826bed0599f65745-15940-minimized.gif
new file mode 100644
index 000..47f5d43
Binary files /dev/null and
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/sf_3e0068c9b19bb548826bed0599f65745-15940-minimized.gif
differ
diff --git a/vcl/source/filter/igif/decode.cxx
b/vcl/source/filter/igif/decode.cxx
index f53c005..85b417c 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -156,10 +156,13 @@ bool GIFLZWDecompressor::ProcessOneCode()
}
else if ( ( nCode nEOICode ) ( nCode = nTableSize ) )
{
-if ( nCode == nTableSize )
-AddToTable( nOldCode, nOldCode );
-else
-AddToTable( nOldCode, nCode );
+if ( nOldCode != 0x )
+{
+if ( nCode == nTableSize )
+AddToTable( nOldCode, nOldCode );
+else
+AddToTable( nOldCode, nCode );
+}
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools svtools/source unusedcode.easy
include/svtools/wizdlg.hxx|1 -
svtools/source/dialogs/wizdlg.cxx | 12
unusedcode.easy |1 +
3 files changed, 1 insertion(+), 13 deletions(-)
New commits:
commit a498fb83318308427414103c158e186c6b20ff73
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 13 08:44:17 2014 +0100
callcatcher: another round of ResId ctor removals
Change-Id: I2d074133172a2641d735efd2a007d18a65b4d9e9
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index 4efca16..6ee3deb 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -253,7 +253,6 @@ private:
public:
WizardDialog( Window* pParent, WinBits nStyle = WB_STDTABDIALOG );
-WizardDialog( Window* pParent, const ResId rResId );
WizardDialog( Window* pParent, const OString rID, const OUString
rUIXMLDescription );
virtual ~WizardDialog();
diff --git a/svtools/source/dialogs/wizdlg.cxx
b/svtools/source/dialogs/wizdlg.cxx
index 51bd143..2c8b752 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -359,8 +359,6 @@ TabPage* WizardDialog::ImplGetPage( sal_uInt16 nLevel )
const
return NULL;
}
-
-
WizardDialog::WizardDialog( Window* pParent, WinBits nStyle ) :
ModalDialog( pParent, nStyle )
{
@@ -369,22 +367,12 @@ WizardDialog::WizardDialog( Window* pParent, WinBits
nStyle ) :
-WizardDialog::WizardDialog( Window* pParent, const ResId rResId ) :
-ModalDialog( pParent, rResId )
-{
-ImplInitData();
-}
-
-
-
WizardDialog::WizardDialog( Window* pParent, const OString rID, const
OUString rUIXMLDescription ) :
ModalDialog( pParent, rID, rUIXMLDescription )
{
ImplInitData();
}
-
-
WizardDialog::~WizardDialog()
{
maWizardLayoutTimer.Stop();
diff --git a/unusedcode.easy b/unusedcode.easy
index dc8ae96..7ce6296 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -217,5 +217,6 @@ svt::CheckInvariants(void const*)
svt::table::TableControl_Impl::impl_checkInvariants() const
svt::table::UnoControlTableModel::checkInvariants() const
vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
+writerfilter::dmapper::DomainMapper::IsStyleSheetImport() const
writerfilter::dmapper::StyleSheetTable::GetStyleIdFromIndex(unsigned int)
writerfilter::ooxml::OOXMLBooleanValue::OOXMLBooleanValue(char const*)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/native-code.py |1 + 1 file changed, 1 insertion(+) New commits: commit 347926e8e57c1825261daa46c1886aa2ebf9571b Author: Tor Lillqvist t...@collabora.com Date: Wed Aug 13 11:17:40 2014 +0300 We seem to need the tdoc UCP for saving Change-Id: I2d721c62a0fd7497f90a0613b4383949220795de diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 24cdde3..f67d030 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -41,6 +41,7 @@ core_factory_list = [ (libucb1.a, ucb_component_getFactory), (libucpfile1.a, ucpfile_component_getFactory), (libucphier1.a, ucphier1_component_getFactory), +(libucptdoc1lo.a, ucptdoc1_component_getFactory), (libunordflo.a, unordf_component_getFactory), (libunoxmllo.a, unoxml_component_getFactory), (libutllo.a, utl_component_getFactory), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - bean/com bean/Jar_officebean.mk connectivity/com connectivity/qa extensions/qa forms/qa framework/qa nlpsolver/src nlpsolver/ThirdParty odk/examples qadevOO
bean/Jar_officebean.mk |1 bean/com/sun/star/beans/ContainerFactory.java |7 bean/com/sun/star/beans/LocalOfficeConnection.java | 13 bean/com/sun/star/beans/LocalOfficeWindow.java |2 bean/com/sun/star/beans/OfficeConnection.java | 20 bean/com/sun/star/beans/OfficeWindow.java | 46 - bean/com/sun/star/comp/beans/ContainerFactory.java |7 bean/com/sun/star/comp/beans/Controller.java |8 bean/com/sun/star/comp/beans/OOoBean.java | 187 - bean/com/sun/star/comp/beans/OfficeConnection.java |8 connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java | 11 connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java |4 connectivity/qa/connectivity/tools/sdb/Connection.java | 18 extensions/qa/integration/extensions/MethodHandler.java |5 forms/qa/complex/forms/CheckOGroupBoxModel.java |5 forms/qa/integration/forms/DocumentHelper.java | 21 forms/qa/integration/forms/DocumentType.java | 17 forms/qa/integration/forms/DocumentViewHelper.java | 30 forms/qa/integration/forms/FormComponent.java | 18 forms/qa/integration/forms/FormLayer.java | 41 - forms/qa/org/openoffice/xforms/Instance.java | 39 - forms/qa/org/openoffice/xforms/Model.java |5 framework/qa/complex/framework/autosave/ConfigHelper.java | 15 framework/qa/complex/framework/autosave/Protocol.java | 65 - framework/qa/complex/framework/recovery/RecoveryTools.java | 28 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java | 14 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java | 16 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java | 22 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/OutputMethods.java | 13 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java | 44 - nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java |7 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java | 13 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignDim.java |5 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java | 50 - nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java |5 nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java | 11 odk/examples/DevelopersGuide/Charts/Helper.java |5 odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java | 66 - odk/examples/DevelopersGuide/Database/RowSet.java | 12 odk/examples/DevelopersGuide/Database/Sales.java | 64 - odk/examples/DevelopersGuide/Drawing/PageHelper.java | 32 odk/examples/DevelopersGuide/Forms/DocumentHelper.java |6 odk/examples/DevelopersGuide/Forms/DocumentType.java | 16 odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java | 10 odk/examples/DevelopersGuide/Forms/FLTools.java | 58 - odk/examples/DevelopersGuide/Forms/FormLayer.java | 16
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/column.hxx|1
sc/inc/table.hxx |5
sc/source/core/data/column.cxx | 27 --
sc/source/core/data/column4.cxx |3 ++
sc/source/core/data/documen7.cxx | 40 +--
sc/source/core/data/table2.cxx |7 --
sc/source/core/data/table7.cxx | 10 +
7 files changed, 52 insertions(+), 41 deletions(-)
New commits:
commit 5f9e7ee1cc330f3b08596db0d13ad01e4dea7880
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Jul 30 11:02:31 2014 -0400
fdo#80501: Ensure that we notify each listener only once.
Change-Id: If2ce4643ff58c7c2ba326d749698dd5196a108dc
(cherry picked from commit b2ee0235e88dc4da715b5766295ed88f27974fbd)
Reviewed-on: https://gerrit.libreoffice.org/10647
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 8962422..66cd524 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -478,7 +478,6 @@ public:
voidStartNeededListeners(); // only for cells where
NeedsListening()==true
voidSetDirtyIfPostponed();
void BroadcastRecalcOnRefMove();
-void BroadcastRefMoved( const sc::RefMovedHint rHint );
void TransferListeners( ScColumn rDestCol, SCROW nRow1, SCROW nRow2,
SCROW nRowDelta );
void CollectListeners( std::vectorSvtListener* rListeners, SCROW nRow1,
SCROW nRow2 );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 9d36a1e..191a360 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -927,10 +927,7 @@ public:
*/
void BroadcastRecalcOnRefMove();
-/**
- * Broadcast all listeners of specified range that the range have moved.
- */
-void BroadcastRefMoved( const sc::RefMovedHint rHint );
+void CollectListeners( std::vectorSvtListener* rListeners, SCCOL nCol1,
SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
void TransferListeners(
ScTable rDestTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 2d0a018..10da725 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -3119,33 +3119,6 @@ void ScColumn::BroadcastRecalcOnRefMove()
namespace {
-class BroadcastRefMovedHandler
-{
-const sc::RefMovedHint mrHint;
-public:
-BroadcastRefMovedHandler( const sc::RefMovedHint rHint ) : mrHint(rHint)
{}
-
-void operator() ( size_t, SvtBroadcaster* p )
-{
-p-Broadcast(mrHint);
-}
-};
-
-}
-
-void ScColumn::BroadcastRefMoved( const sc::RefMovedHint rHint )
-{
-const ScRange rRange = rHint.getRange();
-SCROW nRow1 = rRange.aStart.Row();
-SCROW nRow2 = rRange.aEnd.Row();
-
-// Notify all listeners within specified rows.
-BroadcastRefMovedHandler aFunc(rHint);
-sc::ProcessBroadcaster(maBroadcasters.begin(), maBroadcasters, nRow1,
nRow2, aFunc);
-}
-
-namespace {
-
class TransferListenersHandler
{
public:
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index bf3b817..d1aacdd 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -533,6 +533,9 @@ public:
void ScColumn::CollectListeners( std::vectorSvtListener* rListeners, SCROW
nRow1, SCROW nRow2 )
{
+if (nRow2 nRow1 || !ValidRow(nRow1) || !ValidRow(nRow2))
+return;
+
ListenerCollector aFunc(rListeners);
sc::ProcessBroadcaster(maBroadcasters.begin(), maBroadcasters, nRow1,
nRow2, aFunc);
}
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 02a75fb..a960c5a 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -130,6 +130,22 @@ void ScDocument::BroadcastCells( const ScRange rRange,
sal_uLong nHint )
BroadcastUno(SfxSimpleHint(SC_HINT_DATACHANGED));
}
+namespace {
+
+class RefMovedNotifier : std::unary_functionSvtListener*, void
+{
+const sc::RefMovedHint mrHint;
+public:
+RefMovedNotifier( const sc::RefMovedHint rHint ) : mrHint(rHint) {}
+
+void operator() ( SvtListener* p )
+{
+p-Notify(mrHint);
+}
+};
+
+}
+
void ScDocument::BroadcastRefMoved( const sc::RefMovedHint rHint )
{
if (!pBASM)
@@ -150,6 +166,28 @@ void ScDocument::BroadcastRefMoved( const
sc::RefMovedHint rHint )
}
}
+// Collect all listeners listening into the range.
+std::vectorSvtListener* aListeners;
+for (SCTAB nTab = rSrcRange.aStart.Tab(); nTab = rSrcRange.aEnd.Tab();
++nTab)
+{
+ScTable* pTab = FetchTable(nTab);
+if (!pTab)
+continue;
+
+pTab-CollectListeners(
+aListeners,
+rSrcRange.aStart.Col(), rSrcRange.aStart.Row(),
+rSrcRange.aEnd.Col(), rSrcRange.aEnd.Row());
+}
+
+// Remove any duplicate listener entries. We must ensure that we notify
+// each unique
[Libreoffice-commits] core.git: sal/qa
sal/qa/rtl/textenc/rtl_tencinfo.cxx | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 2358ccec7e4842cdf95f82373dfc521bbaf44e8c
Author: Tor Lillqvist t...@collabora.com
Date: Wed Aug 13 11:47:48 2014 +0300
WaE: Unreferenced function definition
Change-Id: I1b5d3f881e82cea90fcc4e97c837251e340abffe
diff --git a/sal/qa/rtl/textenc/rtl_tencinfo.cxx
b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
index 5d22a01..001b694 100644
--- a/sal/qa/rtl/textenc/rtl_tencinfo.cxx
+++ b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
@@ -1082,12 +1082,12 @@ namespace
{
check( RTL_TEXTENCODING_ISO_8859_1, RTL_TEXTENCODING_MS_1252 );
}
-
+#if 0
void WindowsCharsetFromTextEncoding_ISO_8859_2()
{
check( RTL_TEXTENCODING_ISO_8859_2, RTL_TEXTENCODING_MS_1252 );
}
-
+#endif
void WindowsCharsetFromTextEncoding_ISO_8859_3()
{
check( RTL_TEXTENCODING_ISO_8859_3, RTL_TEXTENCODING_MS_1252 );
@@ -1097,7 +1097,7 @@ namespace
{
check( RTL_TEXTENCODING_ISO_8859_4, RTL_TEXTENCODING_MS_1257 );
}
-
+#if 0
void WindowsCharsetFromTextEncoding_ISO_8859_5()
{
check( RTL_TEXTENCODING_ISO_8859_5, RTL_TEXTENCODING_MS_1252 );
@@ -1122,7 +1122,7 @@ namespace
{
check( RTL_TEXTENCODING_ISO_8859_9, RTL_TEXTENCODING_MS_1252 );
}
-
+#endif
void WindowsCharsetFromTextEncoding_ISO_8859_14()
{
check( RTL_TEXTENCODING_ISO_8859_14, RTL_TEXTENCODING_MS_1252 );
@@ -1132,7 +1132,7 @@ namespace
{
check( RTL_TEXTENCODING_ISO_8859_15, RTL_TEXTENCODING_MS_1252 );
}
-
+#if 0
void WindowsCharsetFromTextEncoding_IBM_737()
{
check( RTL_TEXTENCODING_IBM_737, RTL_TEXTENCODING_MS_1252 );
@@ -1272,12 +1272,12 @@ namespace
{
check( RTL_TEXTENCODING_APPLE_HEBREW, RTL_TEXTENCODING_MS_1252 );
}
-
+#endif
void WindowsCharsetFromTextEncoding_APPLE_ICELAND()
{
check( RTL_TEXTENCODING_APPLE_ICELAND, RTL_TEXTENCODING_MS_1252 );
}
-
+#if 0
void WindowsCharsetFromTextEncoding_APPLE_ROMANIAN()
{
check( RTL_TEXTENCODING_APPLE_ROMANIAN, RTL_TEXTENCODING_MS_1252 );
@@ -1392,7 +1392,7 @@ namespace
{
check( RTL_TEXTENCODING_KOI8_R, RTL_TEXTENCODING_MS_1252 );
}
-
+#endif
void WindowsCharsetFromTextEncoding_UTF7()
{
check( RTL_TEXTENCODING_UTF7, RTL_TEXTENCODING_MS_1252 );
@@ -1402,7 +1402,7 @@ namespace
{
check( RTL_TEXTENCODING_UTF8, RTL_TEXTENCODING_MS_1252 );
}
-
+#if 0
void WindowsCharsetFromTextEncoding_ISO_8859_10()
{
check( RTL_TEXTENCODING_ISO_8859_10, RTL_TEXTENCODING_MS_1252 );
@@ -1467,7 +1467,7 @@ namespace
{
check( RTL_TEXTENCODING_ISCII_DEVANAGARI, RTL_TEXTENCODING_MS_1252
);
}
-
+#endif
void WindowsCharsetFromTextEncoding_JAVA_UTF8()
{
check( RTL_TEXTENCODING_JAVA_UTF8, RTL_TEXTENCODING_MS_1252 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - canvas/source configure.ac
canvas/source/directx/dx_surfacebitmap.cxx |4 ++--
configure.ac |7 +--
2 files changed, 3 insertions(+), 8 deletions(-)
New commits:
commit 0ea59fd0bb19dafabcfdacf16fcc27f46796df4c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Aug 13 11:36:52 2014 +0200
clean configure.ac enable-opengl for windows
It works now and should get the same treatment as the linux version.
Change-Id: I382cc7cae9358ce26e0c2d85acc6a67e991d8118
diff --git a/configure.ac b/configure.ac
index 1c204b6..ff89d60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10487,12 +10487,7 @@ AC_MSG_CHECKING([whether to build the OpenGL
Transitions component])
ENABLE_OPENGL=
if test -z $enable_opengl; then
-if test $_os = WINNT; then
-# By default disable the OpenGL transitions for Windows (the code
compiles but works very
-# badly and crashes). In other words, use --enable-opengl only if you
plan to hack on that
-# code for Windows.
-enable_opengl=yes
-elif test $_os = iOS; then
+if test $_os = iOS; then
# As such with some suitable minor tweaks the Mac OpenGL transitions
code would presumably
# build fine for iOS, too, but let's leave that for later
enable_opengl=no
commit 2f0259d73f78e6a5ec08d2fe4941612a5b9fdb0e
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Aug 13 11:34:48 2014 +0200
fix invalid memory access in dx bitmap code
Change-Id: If3a495ab2db068f37dcee184e61c0c1e66f09666
diff --git a/canvas/source/directx/dx_surfacebitmap.cxx
b/canvas/source/directx/dx_surfacebitmap.cxx
index e61ad20..084361a 100644
--- a/canvas/source/directx/dx_surfacebitmap.cxx
+++ b/canvas/source/directx/dx_surfacebitmap.cxx
@@ -552,7 +552,7 @@ namespace dxcanvas
sal_uInt8 *pSrc = (sal_uInt8 *)BYTE
*)aSurfaceDesc.lpSurface)+(rect.Y1*aSurfaceDesc.lPitch))+rect.X1);
sal_uInt8 *pDst = (sal_uInt8 *)aRes.getArray();
-sal_uInt32 nSegmentSizeInBytes = nWidth4;
+sal_uInt32 nSegmentSizeInBytes = nWidth*4;
for(sal_uInt32 y=0; ynHeight; ++y)
{
memcpy(pDst,pSrc,nSegmentSizeInBytes);
@@ -568,7 +568,7 @@ namespace dxcanvas
sal_uInt8 *pSrc = (sal_uInt8 *)BYTE
*)aLockedRect.pBits)+(rect.Y1*aLockedRect.Pitch))+rect.X1);
sal_uInt8 *pDst = (sal_uInt8 *)aRes.getArray();
-sal_uInt32 nSegmentSizeInBytes = nWidth4;
+sal_uInt32 nSegmentSizeInBytes = nWidth*4;
for(sal_uInt32 y=0; ynHeight; ++y)
{
memcpy(pDst,pSrc,nSegmentSizeInBytes);
commit 5bad93f5d5f9ace2c8bd0a30acbee51f56bd73e8
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Aug 13 02:15:20 2014 +0200
enable opengl by default on windows
Change-Id: I04cd67cce88563c0e1d82af984ccd3e6516b69cb
diff --git a/configure.ac b/configure.ac
index 9ae3d24..1c204b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10491,7 +10491,7 @@ if test -z $enable_opengl; then
# By default disable the OpenGL transitions for Windows (the code
compiles but works very
# badly and crashes). In other words, use --enable-opengl only if you
plan to hack on that
# code for Windows.
-enable_opengl=no
+enable_opengl=yes
elif test $_os = iOS; then
# As such with some suitable minor tweaks the Mac OpenGL transitions
code would presumably
# build fine for iOS, too, but let's leave that for later
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source ios/experimental
desktop/source/app/sofficemain.cxx | 32
++
ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m |4 +
ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m | 10 +++
3 files changed, 46 insertions(+)
New commits:
commit 09f5922baf2cb43d08a96d0576f7f8a45d16
Author: Tor Lillqvist t...@collabora.com
Date: Wed Aug 13 12:27:44 2014 +0300
Add code to test encryption and export to .docx on iOS
Conditional on the environment variable
PTYL_TEST_ENCRYPTION_AND_EXPORT, eek. The document is written out
using the name of the input document with .new.docx appended.
I placed the function that handles it, somewhat arbitrarily, in
sofficemain.cxx. The invocation of this function is, also somewhat
arbitrarily, placed in TiledView's drawLayer:inContext: method.
Quite possibly this test functionality occasionally causes solar mutex
deadlocks or whatever, but at least in Xcode, when one has placed some
breakpoints in it, it seems to work. Which is what matters, as this is
code for manual testing, not invoked normally.
Change-Id: I38bb4b406edf47f0f24857b6044e3bf4eaf17c34
diff --git a/desktop/source/app/sofficemain.cxx
b/desktop/source/app/sofficemain.cxx
index baf6a1b..ef7d172 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -26,10 +26,19 @@
#include cmdlineargs.hxx
#include cmdlinehelp.hxx
+#include osl/file.hxx
#include rtl/bootstrap.hxx
#include tools/extendapplicationenvironment.hxx
#include vcl/svmain.hxx
+#include com/sun/star/beans/NamedValue.hpp
+#include com/sun/star/frame/Desktop.hpp
+#include com/sun/star/frame/XComponentLoader.hpp
+#include com/sun/star/frame/XStorable2.hpp
+#include comphelper/storagehelper.hxx
+#include cppuhelper/bootstrap.hxx
+#include unotools/mediadescriptor.hxx
+
#ifdef ANDROID
# include jni.h
@@ -114,6 +123,29 @@ touch_lo_runMain()
}
+extern C void PtylTestEncryptionAndExport(const char *pathname)
+{
+OUString sUri(pathname, strlen(pathname), RTL_TEXTENCODING_UTF8);
+sUri = file:// + sUri;
+
+css::uno::Referencecss::frame::XComponentLoader
loader(css::frame::Desktop::create(cppu::defaultBootstrap_InitialComponentContext()),
css::uno::UNO_QUERY);
+css::uno::Referencecss::lang::XComponent component;
+component.set(loader-loadComponentFromURL(sUri, _default, 0, {}));
+
+utl::MediaDescriptor media;
+media[utl::MediaDescriptor::PROP_FILTERNAME()] = OUString(MS Word 2007
XML);
+css::uno::Sequencecss::beans::NamedValue encryptionData =
comphelper::OStorageHelper::CreatePackageEncryptionData(myPassword);
+media[utl::MediaDescriptor::PROP_ENCRYPTIONDATA()] = encryptionData;
+
+css::uno::Referencecss::frame::XModel model(component,
css::uno::UNO_QUERY);
+css::uno::Referencecss::frame::XStorable2 storable2(model,
css::uno::UNO_QUERY);
+OUString saveAsUri(sUri + .new.docx);
+SAL_INFO(desktop.app, Trying to store as saveAsUri);
+OUString testPathName;
+osl::File::getSystemPathFromFileURL(saveAsUri+.txt, testPathName);
+storable2-storeToURL(saveAsUri, media.getAsConstPropertyValueList());
+}
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m
index 10e5d70..8bad26b 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m
@@ -55,11 +55,15 @@
return YES;
}
+const char *ptyl_test_encryption_pathname;
+
- (void)startDisplaying:(NSString*)documentPath;
{
ViewController *vc = [[ViewController alloc] init];
self.window.rootViewController = vc;
+ptyl_test_encryption_pathname = [documentPath UTF8String];
+
[[[NSThread alloc] initWithTarget:self
selector:@selector(threadMainMethod:) object:documentPath] start];
vc.view = [[View alloc] initWithFrame:[self.window frame]];
}
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
index aafbd43..1b8b8c2 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
@@ -132,12 +132,22 @@ static bool tileMatches(const char *spec, CGRect bb)
y == (int) (bb.origin.y / bb.size.height));
}
+extern void PtylTestEncryptionAndExport(const char *pathname);
+extern const char *ptyl_test_encryption_pathname;
+
- (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)ctx
{
// Even if I set the CATL's tileSize to 512x512 above, this is
// called initially with a clip bbox of 128x128. Odd, I would have
// expected it to be called with a bbox of 256x256.
+static bool once = false;
+if (!once) {
+once =
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/filter/excel/xeescher.cxx |5 ++
sc/source/filter/inc/xeescher.hxx |2 +
sc/source/filter/xcl97/xcl97rec.cxx | 68 +++-
3 files changed, 66 insertions(+), 9 deletions(-)
New commits:
commit ed1be52c508914c7cbe30f325042f54fd18c70b1
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Aug 12 21:24:17 2014 -0400
bnc#822170: Let's not even try to export invalid chart objects.
If we do, at best, Excel will complain about the document needing
repair. At worst Excel will skip some of the other valid drawing
objects from being loaded.
(cherry picked from commit 692878e3bb83c0fc104c5cca946c25ccf2d84ab2)
Conflicts:
sc/source/filter/xcl97/xcl97rec.cxx
Change-Id: If3794d0ae9d8b44b124020bb12b5369dfebc95ae
Reviewed-on: https://gerrit.libreoffice.org/10899
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/filter/excel/xeescher.cxx
b/sc/source/filter/excel/xeescher.cxx
index d91e15d..a1f6350 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1189,6 +1189,11 @@ void XclExpChartObj::WriteShapeTransformation(
sax_fastparser::FSHelperPtr pFS,
pFS-endElementNS( XML_xdr, XML_xfrm );
}
+const css::uno::Referencecss::chart::XChartDocument
XclExpChartObj::GetChartDoc() const
+{
+return mxChartDoc;
+}
+
XclExpNote::XclExpNote( const XclExpRoot rRoot, const ScAddress rScPos,
const ScPostIt* pScNote, const OUString rAddText ) :
XclExpRecord( EXC_ID_NOTE ),
diff --git a/sc/source/filter/inc/xeescher.hxx
b/sc/source/filter/inc/xeescher.hxx
index 599cc5e..490a779 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -304,6 +304,8 @@ public:
virtual voidWriteChartObj( sax_fastparser::FSHelperPtr pDrawing,
XclExpXmlStream rStrm );
void WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, const
XShapeRef rXShape, bool bFlipH = false, bool bFlipV = false, sal_Int32
nRotation = 0 );
+const css::uno::Referencecss::chart::XChartDocument GetChartDoc() const;
+
private:
typedef boost::shared_ptr XclExpChart XclExpChartRef;
XclExpChartRef mxChart;/// The chart itself (BOF/EOF
substream data).
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx
b/sc/source/filter/xcl97/xcl97rec.cxx
index bb4eb8c..3b76edd 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -72,6 +72,8 @@
#include com/sun/star/sheet/XCellAddressable.hpp
#include com/sun/star/sheet/XCellRangeAddressable.hpp
#include com/sun/star/embed/Aspects.hpp
+#include com/sun/star/chart2/XCoordinateSystemContainer.hpp
+#include com/sun/star/chart2/XChartTypeContainer.hpp
#include oox/token/tokens.hxx
#include oox/export/shapes.hxx
#include oox/export/utils.hxx
@@ -164,6 +166,8 @@ void XclExpObjList::Save( XclExpStream rStrm )
pSolverContainer-Save( rStrm );
}
+namespace {
+
static bool IsVmlObject( const XclObj *rObj )
{
switch( rObj-GetObjType() )
@@ -188,11 +192,61 @@ static sal_Int32 GetVmlObjectCount( XclExpObjList rList )
return nNumVml;
}
+bool IsValidObject( const XclObj rObj )
+{
+if (rObj.GetObjType() == EXC_OBJTYPE_CHART)
+{
+// Chart object. Make sure it's a valid chart object. We skip
+// invalid chart objects from exporting to prevent Excel from
+// complaining on load.
+
+const XclExpChartObj rChartObj = static_castconst
XclExpChartObj(rObj);
+uno::Referencechart2::XChartDocument
xChartDoc(rChartObj.GetChartDoc(), uno::UNO_QUERY);
+if (!xChartDoc.is())
+return false;
+
+uno::Referencechart2::XDiagram xDiagram =
xChartDoc-getFirstDiagram();
+if (!xDiagram.is())
+return false;
+
+uno::Referencechart2::XCoordinateSystemContainer
xCooSysContainer(xDiagram, uno::UNO_QUERY);
+if (!xCooSysContainer.is())
+return false;
+
+uno::Sequenceuno::Referencechart2::XCoordinateSystem xCooSysSeq =
xCooSysContainer-getCoordinateSystems();
+if (!xCooSysSeq.getLength())
+return false;
+
+for (sal_Int32 nCooSys = 0; nCooSys xCooSysSeq.getLength();
++nCooSys)
+{
+Referencechart2::XChartTypeContainer
xChartTypeCont(xCooSysSeq[nCooSys], uno::UNO_QUERY);
+if (!xChartTypeCont.is())
+return false;
+
+uno::Sequenceuno::Referencechart2::XChartType xChartTypeSeq =
xChartTypeCont-getChartTypes();
+if (!xChartTypeSeq.getLength())
+// No chart type. Not good.
+return false;
+}
+}
+
+return true;
+}
static void SaveDrawingMLObjects( XclExpObjList rList, XclExpXmlStream
rStrm, sal_Int32 nDrawingMLCount )
{
-sal_Int32 nVmlObjects = GetVmlObjectCount( rList );
-if( (rList.size() -
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/filter/excel/xeescher.cxx |5 ++
sc/source/filter/inc/xeescher.hxx |2 +
sc/source/filter/xcl97/xcl97rec.cxx | 68 +++-
3 files changed, 65 insertions(+), 10 deletions(-)
New commits:
commit f1d36a5eaaff6404fee0865947040e92026c7996
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Aug 12 21:24:17 2014 -0400
bnc#822170: Let's not even try to export invalid chart objects.
If we do, at best, Excel will complain about the document needing
repair. At worst Excel will skip some of the other valid drawing
objects from being loaded.
(cherry picked from commit 692878e3bb83c0fc104c5cca946c25ccf2d84ab2)
Conflicts:
sc/source/filter/xcl97/xcl97rec.cxx
sc/source/filter/excel/xeescher.cxx
Change-Id: If3794d0ae9d8b44b124020bb12b5369dfebc95ae
Reviewed-on: https://gerrit.libreoffice.org/10900
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/filter/excel/xeescher.cxx
b/sc/source/filter/excel/xeescher.cxx
index 241182c..bb3a2a5 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1207,7 +1207,10 @@ void XclExpChartObj::WriteShapeTransformation(
sax_fastparser::FSHelperPtr pFS,
pFS-endElementNS( XML_xdr, XML_xfrm );
}
-//
+const css::uno::Referencecss::chart::XChartDocument
XclExpChartObj::GetChartDoc() const
+{
+return mxChartDoc;
+}
XclExpNote::XclExpNote( const XclExpRoot rRoot, const ScAddress rScPos,
const ScPostIt* pScNote, const OUString rAddText ) :
diff --git a/sc/source/filter/inc/xeescher.hxx
b/sc/source/filter/inc/xeescher.hxx
index 4d7be77..cce4c66 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -324,6 +324,8 @@ public:
virtual voidWriteChartObj( sax_fastparser::FSHelperPtr pDrawing,
XclExpXmlStream rStrm );
void WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, const
XShapeRef rXShape, sal_Bool bFlipH = false, sal_Bool bFlipV = false, sal_Int32
nRotation = 0 );
+const css::uno::Referencecss::chart::XChartDocument GetChartDoc() const;
+
private:
typedef boost::shared_ptr XclExpChart XclExpChartRef;
XclExpChartRef mxChart;/// The chart itself (BOF/EOF
substream data).
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx
b/sc/source/filter/xcl97/xcl97rec.cxx
index d61383a..24624cb 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -71,6 +71,8 @@
#include com/sun/star/sheet/XCellAddressable.hpp
#include com/sun/star/sheet/XCellRangeAddressable.hpp
#include com/sun/star/embed/Aspects.hpp
+#include com/sun/star/chart2/XCoordinateSystemContainer.hpp
+#include com/sun/star/chart2/XChartTypeContainer.hpp
#include oox/token/tokens.hxx
#include oox/export/shapes.hxx
#include oox/export/utils.hxx
@@ -162,6 +164,8 @@ void XclExpObjList::Save( XclExpStream rStrm )
pSolverContainer-Save( rStrm );
}
+namespace {
+
static bool IsVmlObject( const XclObj *rObj )
{
switch( rObj-GetObjType() )
@@ -186,11 +190,61 @@ static sal_Int32 GetVmlObjectCount( XclExpObjList rList )
return nNumVml;
}
+bool IsValidObject( const XclObj rObj )
+{
+if (rObj.GetObjType() == EXC_OBJTYPE_CHART)
+{
+// Chart object. Make sure it's a valid chart object. We skip
+// invalid chart objects from exporting to prevent Excel from
+// complaining on load.
+
+const XclExpChartObj rChartObj = static_castconst
XclExpChartObj(rObj);
+uno::Referencechart2::XChartDocument
xChartDoc(rChartObj.GetChartDoc(), uno::UNO_QUERY);
+if (!xChartDoc.is())
+return false;
+
+uno::Referencechart2::XDiagram xDiagram =
xChartDoc-getFirstDiagram();
+if (!xDiagram.is())
+return false;
+
+uno::Referencechart2::XCoordinateSystemContainer
xCooSysContainer(xDiagram, uno::UNO_QUERY);
+if (!xCooSysContainer.is())
+return false;
+
+uno::Sequenceuno::Referencechart2::XCoordinateSystem xCooSysSeq =
xCooSysContainer-getCoordinateSystems();
+if (!xCooSysSeq.getLength())
+return false;
+
+for (sal_Int32 nCooSys = 0; nCooSys xCooSysSeq.getLength();
++nCooSys)
+{
+Referencechart2::XChartTypeContainer
xChartTypeCont(xCooSysSeq[nCooSys], uno::UNO_QUERY);
+if (!xChartTypeCont.is())
+return false;
+
+uno::Sequenceuno::Referencechart2::XChartType xChartTypeSeq =
xChartTypeCont-getChartTypes();
+if (!xChartTypeSeq.getLength())
+// No chart type. Not good.
+return false;
+}
+}
+
+return true;
+}
static void SaveDrawingMLObjects( XclExpObjList rList, XclExpXmlStream
rStrm, sal_Int32
[GSOC] Tiled Rendering, ahunt, Weekly Report 12 / WK32
Hi All, This week was primarily work on the Calc Tiled Rendering: * Realised on Friday that my current approach was probably a huge waste of time. ** Using logic mapping makes cell sizes etc. correct, but breaks lots of assumptions meaning that the usual Calc UI is quite broken (problems/corruption with repainting when scrolling etc.) ** Requires lots of debugging/digging to adjust those parts (the code is quite complex...). ** Instead we can keep pixel mapping, but use the LogicToPixel/PixelToLogic( Object, MapMode) methods to do our own conversion directly before painting in the appropriate places (allowing use of pixel-based adjustments as needed), and meaning that most code (around scrolling/repainting) can stay with pixel coordinates as before. * But fortunately a large portion of the commits are vaguely reusable (with some adjustment) for the new approach, i.e. they indicate most of the relevant places in the code that still need adjusting. ** Started this work on a new branch: feature/calctiledrendering_simpler. Cheers, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: v4.3.0.4 not working on SSE1 CPUs anymore
Hi, Le 08/08/2014 03:10, Maniaxx a écrit : Hallo, LibreOffice v4.3.0.4 doesn't work on SSE1 CPUs anymore. Tested on AMD AthlonXP (AMD K7) with Windows7 32Bit. Previous version was v4.1.0 that worked properly. The problem has been reported here: https://bugs.freedesktop.org/show_bug.cgi?id=82430 I think we need a decision between FIX or WontFix Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Libreoffice 4 Android Size Reduction
On Mon, Aug 11, 2014 at 8:17 AM, Mohammad Deeb kbh...@yahoo.com wrote: Dear Sir, I'd like to assist you in reducing libreoffice 4 android package size. kindly provide me link with latest apk file. Hi Deeb, Thanks for your interest in LibreOffice 4 Android. We have a pair of Android tinderboxes[1], but they don't currently appear to be producing/uploading builds, perhaps because we've had a couple of different ports started for the Android platform. I believe that Tomaž Vajngerl has been doing the most recent work on getting LibreOffice working on Android[2], and he can probably give you some pointers on how to build the latest dev branch. Good luck! --R [1] http://dev-builds.libreoffice.org/daily/master/ [2] http://tomazvajngerl.blogspot.de/2014/07/libreoffice-on-android.html -- Robinson Tryon QA Engineer - The Document Foundation Volunteer Coordinator - LibreOffice Community Outreach qu...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/qa vcl/source
vcl/qa/cppunit/graphicfilter/data/gif/pass/sf_3e0068c9b19bb548826bed0599f65745-15940-minimized.gif
|binary
vcl/source/filter/igif/decode.cxx
| 11 ++
2 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 5ae1557de992382ad945d61102326d5a61b6850a
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 13 09:12:26 2014 +0100
valgrind + bff: don't add 0x oldcode
Invalid read of size 1
at 0x9DC6247: GIFLZWDecompressor::AddToTable(unsigned short, unsigned
short) (decode.cxx:117)
Change-Id: I9cea8dcd4a5eeaa1e793b9be96f82854b9d088af
Reviewed-on: https://gerrit.libreoffice.org/10905
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git
a/vcl/qa/cppunit/graphicfilter/data/gif/pass/sf_3e0068c9b19bb548826bed0599f65745-15940-minimized.gif
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/sf_3e0068c9b19bb548826bed0599f65745-15940-minimized.gif
new file mode 100644
index 000..47f5d43
Binary files /dev/null and
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/sf_3e0068c9b19bb548826bed0599f65745-15940-minimized.gif
differ
diff --git a/vcl/source/filter/igif/decode.cxx
b/vcl/source/filter/igif/decode.cxx
index f53c005..85b417c 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -156,10 +156,13 @@ bool GIFLZWDecompressor::ProcessOneCode()
}
else if ( ( nCode nEOICode ) ( nCode = nTableSize ) )
{
-if ( nCode == nTableSize )
-AddToTable( nOldCode, nOldCode );
-else
-AddToTable( nOldCode, nCode );
+if ( nOldCode != 0x )
+{
+if ( nCode == nTableSize )
+AddToTable( nOldCode, nOldCode );
+else
+AddToTable( nOldCode, nCode );
+}
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/qa vcl/source
vcl/qa/cppunit/graphicfilter/data/gif/pass/sf_3e0068c9b19bb548826bed0599f65745-15940-minimized.gif
|binary
vcl/source/filter/igif/decode.cxx
| 11 ++
2 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 902436078cb8df65d06617d5980cd8834ec8f8c9
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 13 09:12:26 2014 +0100
valgrind + bff: don't add 0x oldcode
Invalid read of size 1
at 0x9DC6247: GIFLZWDecompressor::AddToTable(unsigned short, unsigned
short) (decode.cxx:117)
Change-Id: I9cea8dcd4a5eeaa1e793b9be96f82854b9d088af
Reviewed-on: https://gerrit.libreoffice.org/10906
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git
a/vcl/qa/cppunit/graphicfilter/data/gif/pass/sf_3e0068c9b19bb548826bed0599f65745-15940-minimized.gif
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/sf_3e0068c9b19bb548826bed0599f65745-15940-minimized.gif
new file mode 100644
index 000..47f5d43
Binary files /dev/null and
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/sf_3e0068c9b19bb548826bed0599f65745-15940-minimized.gif
differ
diff --git a/vcl/source/filter/igif/decode.cxx
b/vcl/source/filter/igif/decode.cxx
index bf29328..5900b4c 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -166,10 +166,13 @@ bool GIFLZWDecompressor::ProcessOneCode()
}
else if ( ( nCode nEOICode ) ( nCode = nTableSize ) )
{
-if ( nCode == nTableSize )
-AddToTable( nOldCode, nOldCode );
-else
-AddToTable( nOldCode, nCode );
+if ( nOldCode != 0x )
+{
+if ( nCode == nTableSize )
+AddToTable( nOldCode, nOldCode );
+else
+AddToTable( nOldCode, nCode );
+}
}
else
{
___
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' - sw/qa vcl/generic
sw/qa/core/data/ooxml/pass/fdo78906.docx |binary
vcl/generic/glyphs/scrptrun.cxx |9 -
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit fbb9bdef45d3a013b5027acc1ceb7faa77f531a4
Author: Umesh Kadam umesh.ka...@synerzip.com
Date: Thu May 29 12:59:13 2014 +0530
fdo#78906 (+dup fdo#82484): File crashes while opening.
Handled a memory corruption.
Cherry-picked from 14ce4b337232f8fb21cc67e7a2844a7de81dfc4c
Change-Id: I195d17bcd0a9a86bcc96cc7ad14f1d5f2908cf8c
Reviewed-on: https://gerrit.libreoffice.org/9545
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/10897
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sw/qa/core/data/ooxml/pass/fdo78906.docx
b/sw/qa/core/data/ooxml/pass/fdo78906.docx
new file mode 100644
index 000..1a6c6ea
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo78906.docx differ
diff --git a/vcl/generic/glyphs/scrptrun.cxx b/vcl/generic/glyphs/scrptrun.cxx
index 9e8eef0..f72d296 100644
--- a/vcl/generic/glyphs/scrptrun.cxx
+++ b/vcl/generic/glyphs/scrptrun.cxx
@@ -207,7 +207,14 @@ UBool ScriptRun::next()
// pop it from the stack
if (pairIndex = 0 (pairIndex 1) != 0 parenSP = 0) {
parenSP -= 1;
-startSP -= 1;
+/* decrement startSP only if it is = 0,
+ decrementing it unnecessarily will lead to memory corruption
+ while processing the above while block.
+ e.g. startSP = -4 , parenSP = -1
+*/
+if (startSP = 0) {
+startSP -= 1;
+}
}
} else {
// if the run broke on a surrogate pair,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/headless
vcl/headless/svpgdi.cxx | 21 +++--
1 file changed, 11 insertions(+), 10 deletions(-)
New commits:
commit 947edda9871881161d2b59d7b041156a03cd47fd
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 13 11:57:40 2014 +0100
m_aDevice may be null
Change-Id: Ibd4666bd185198e0702a498d5648f1e4d5580e11
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 9c1d4e5..75c34ef 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -111,7 +111,7 @@ void SvpSalGraphics::setDevice(
basebmp::BitmapDeviceSharedPtr rDevice )
ResetClipRegion();
// determine matching bitmap format for masks
-basebmp::Format nDeviceFmt = m_aDevice-getScanlineFormat();
+basebmp::Format nDeviceFmt = m_aDevice ? m_aDevice-getScanlineFormat() :
basebmp::FORMAT_EIGHT_BIT_GREY;
switch( nDeviceFmt )
{
case basebmp::FORMAT_EIGHT_BIT_GREY:
@@ -414,7 +414,7 @@ void SvpSalGraphics::drawLine( long nX1, long nY1, long
nX2, long nY2 )
void SvpSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight )
{
-if( m_bUseLineColor || m_bUseFillColor )
+if ((m_bUseLineColor || m_bUseFillColor) m_aDevice)
{
basegfx::B2DPolygon aRect = basegfx::tools::createPolygonFromRect(
basegfx::B2DRectangle( nX, nY, nX+nWidth, nY+nHeight ) );
ensureClip(); // FIXME: for ...
@@ -431,7 +431,7 @@ void SvpSalGraphics::drawRect( long nX, long nY, long
nWidth, long nHeight )
void SvpSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
-if( m_bUseLineColor nPoints )
+if (m_bUseLineColor nPoints m_aDevice)
{
basegfx::B2DPolygon aPoly;
aPoly.append( basegfx::B2DPoint( pPtAry-mnX, pPtAry-mnY ), nPoints );
@@ -446,7 +446,7 @@ void SvpSalGraphics::drawPolyLine( sal_uInt32 nPoints,
const SalPoint* pPtAry )
void SvpSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
-if( ( m_bUseLineColor || m_bUseFillColor ) nPoints )
+if ((m_bUseLineColor || m_bUseFillColor) nPoints m_aDevice)
{
basegfx::B2DPolygon aPoly;
aPoly.append( basegfx::B2DPoint( pPtAry-mnX, pPtAry-mnY ), nPoints );
@@ -471,7 +471,7 @@ void SvpSalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32* pPointCounts,
PCONSTSALPOINT* pPtAry )
{
-if( ( m_bUseLineColor || m_bUseFillColor ) nPoly )
+if ((m_bUseLineColor || m_bUseFillColor) nPoly m_aDevice)
{
basegfx::B2DPolyPolygon aPolyPoly;
for( sal_uInt32 nPolygon = 0; nPolygon nPoly; nPolygon++ )
@@ -620,7 +620,7 @@ void SvpSalGraphics::drawBitmap( const SalTwoRect rPosAry,
rPosAry.mnDestX+rPosAry.mnDestWidth,
rPosAry.mnDestY+rPosAry.mnDestHeight );
SvpSalGraphics::ClipUndoHandle aUndo( this );
-if( !isClippedSetup( aDestRect, aUndo ) )
+if (!isClippedSetup(aDestRect, aUndo) m_aDevice)
m_aDevice-drawMaskedBitmap( rSrc.getBitmap(), rSrcTrans.getBitmap(),
aSrcRect, aDestRect,
basebmp::DrawMode_PAINT, m_aClipMap );
dbgOut( m_aDevice );
@@ -659,14 +659,15 @@ void SvpSalGraphics::drawMask( const SalTwoRect rPosAry,
SalBitmap* SvpSalGraphics::getBitmap( long nX, long nY, long nWidth, long
nHeight )
{
-basebmp::BitmapDeviceSharedPtr aCopy =
-cloneBitmapDevice( basegfx::B2IVector( nWidth, nHeight ),
- m_aDevice );
+basebmp::BitmapDeviceSharedPtr aCopy;
+if (m_aDevice)
+aCopy = cloneBitmapDevice(basegfx::B2IVector(nWidth, nHeight),
+ m_aDevice);
basegfx::B2IBox aSrcRect( nX, nY, nX+nWidth, nY+nHeight );
basegfx::B2IBox aDestRect( 0, 0, nWidth, nHeight );
SvpSalGraphics::ClipUndoHandle aUndo( this );
-if( !isClippedSetup( aDestRect, aUndo ) )
+if (!isClippedSetup(aDestRect, aUndo) aCopy)
aCopy-drawBitmap( m_aOrigDevice, aSrcRect, aDestRect,
basebmp::DrawMode_PAINT );
SvpSalBitmap* pBitmap = new SvpSalBitmap();
___
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/ooxmlexport.cxx |3 +++
sw/source/filter/ww8/docxattributeoutput.cxx |7 +--
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 1cb2573cd3a7082e68aae03779f9bc08d9d13d8c
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Aug 13 12:54:18 2014 +0200
DOCX export: write qFormat for style names having an STI number
Change-Id: I1f1bf0cf14bbd7b6253489f27753bdb2ec81fe35
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 6cd31bc..2d47c8c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -341,6 +341,9 @@ DECLARE_OOXMLEXPORT_TEST(testTable, table.odt)
int nInsideV = getXPathPosition(pXmlDoc,
/w:document/w:body/w:tbl/w:tblPr/w:tblBorders, insideV);
CPPUNIT_ASSERT(nEnd nInsideH);
CPPUNIT_ASSERT(nInsideH nInsideV);
+
+// Make sure we write qFormat for well-known style names.
+assertXPath(parseExport(word/styles.xml),
//w:style[@w:styleId='Normal']/w:qFormat, 1);
}
DECLARE_OOXMLEXPORT_TEST(testTablePosition, table-position.docx)
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index e382c1b..30c0596 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5055,7 +5055,7 @@ oox::drawingml::DrawingML
DocxAttributeOutput::GetDrawingML()
}
void DocxAttributeOutput::StartStyle( const OUString rName, StyleType eType,
-sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 /*nWwId*/, sal_uInt16
nId, bool bAutoUpdate )
+sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 nWwId, sal_uInt16 nId,
bool bAutoUpdate )
{
bool bQFormat = false, bUnhideWhenUsed = false, bSemiHidden = false,
bLocked = false, bDefault = false, bCustomStyle = false;
OUString aLink, aRsid, aUiPriority;
@@ -5147,7 +5147,10 @@ void DocxAttributeOutput::StartStyle( const OUString
rName, StyleType eType,
m_pSerializer-singleElementNS(XML_w, XML_semiHidden, FSEND);
if (bUnhideWhenUsed)
m_pSerializer-singleElementNS(XML_w, XML_unhideWhenUsed, FSEND);
-if (bQFormat)
+
+// If the style has a dedicated STI number, then chances are high that Word
+// will have qFormat enabled for it, so let's do the same.
+if (bQFormat || nWwId != ww::stiUser)
m_pSerializer-singleElementNS(XML_w, XML_qFormat, FSEND);
if (bLocked)
m_pSerializer-singleElementNS(XML_w, XML_locked, FSEND);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - forms/qa framework/qa nlpsolver/ThirdParty qadevOOo/runner reportbuilder/java wizards/com xmerge/source
forms/qa/integration/forms/MasterDetailForms.java
| 33
framework/qa/complex/loadAllDocuments/StatusIndicator.java
| 14 --
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalElement.java
|2
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/CompareValue.java
|1
qadevOOo/runner/convwatch/FilenameHelper.java
|2
qadevOOo/runner/convwatch/GraphicalTestArguments.java
|2
qadevOOo/runner/graphical/PropertyName.java
|7 -
reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java
|2
wizards/com/sun/star/wizards/common/NumericalHelper.java
|2
wizards/com/sun/star/wizards/text/TextDocument.java
|2
wizards/com/sun/star/wizards/ui/UIConsts.java
| 14 --
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java
| 70 --
12 files changed, 11 insertions(+), 140 deletions(-)
New commits:
commit 5ce80c9728ac53ef4e1c8f68d6ef4b7be1f7bf1c
Author: Noel Grandin n...@peralex.com
Date: Mon Aug 11 09:40:12 2014 +0200
remove dead java constants
found by UCDetector
Change-Id: I1f8f5ba4f3ab1a1ef134dd0988f913dab7501351
diff --git a/framework/qa/complex/loadAllDocuments/StatusIndicator.java
b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
index 691b4c7..c682c4f 100644
--- a/framework/qa/complex/loadAllDocuments/StatusIndicator.java
+++ b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
@@ -31,20 +31,6 @@ package complex.loadAllDocuments;
public class StatusIndicator implements com.sun.star.task.XStatusIndicator
{
-
-/**
- * @const SHOWSTATUS_NO don't show the status - but save
information about using of this indicator object
- * @const SHOWSTATUS_LOGthe possible set protocol object will be
used (it covers STDOUT, STDERR automatically too)
- * @const SHOWSTATUS_DIALOG the status will be shown inside a java
dialog
- * @const SHOWSTATUS_LINK the status will be notified to interested
listener (one listener only!)
- */
-public static final int SHOWSTATUS_NO = 0;
-public static final int SHOWSTATUS_LOG = 1;
-public static final int SHOWSTATUS_DIALOG = 4;
-public static final int SHOWSTATUS_LINK = 8;
-
-
-
private boolean m_bWasUsed ;
diff --git
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/CompareValue.java
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/CompareValue.java
index 7bfe6df..be7f00c 100644
---
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/CompareValue.java
+++
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/CompareValue.java
@@ -16,5 +16,4 @@ public class CompareValue {
public static final int LARGER_THAN = 2;
public static final int EQUAL_TO = 1;
public static final int LESS_THAN = 0;
- public static final int INVALID = -1;
}
diff --git a/qadevOOo/runner/graphical/PropertyName.java
b/qadevOOo/runner/graphical/PropertyName.java
index 66f4d46..1c25b75 100644
--- a/qadevOOo/runner/graphical/PropertyName.java
+++ b/qadevOOo/runner/graphical/PropertyName.java
@@ -33,13 +33,6 @@ public interface PropertyName
final public static String DOC_COMPARATOR_HTML_OUTPUT_PREFIX =
DOC_COMPARATOR_HTML_OUTPUT_PREFIX;
-final public static String DOC_CONVERTER_EXPORT_FILTER_NAME =
DOC_CONVERTER_EXPORT_FILTER_NAME;
-
-
-
-
-
-
final public static String OFFICE_VIEWABLE =
OFFICE_VIEWABLE;
final public static String NO_SMALL_PICTURES = NoSmallPictures;
diff --git a/wizards/com/sun/star/wizards/ui/UIConsts.java
b/wizards/com/sun/star/wizards/ui/UIConsts.java
index 9c4d77c..058b785 100644
--- a/wizards/com/sun/star/wizards/ui/UIConsts.java
+++ b/wizards/com/sun/star/wizards/ui/UIConsts.java
@@ -27,9 +27,7 @@ public interface UIConsts
public static final int RID_QUERY = 2300;
public static final int RID_REPORT = 2400;
public static final int RID_TABLE = 2600;
-public static final int RID_IMG_REPORT = 1000;
public static final int RID_IMG_FORM = 1100;
-public static final int RID_IMG_WEB = 1200;
public static final Integer INVISIBLESTEP = 99;
public static final String INFOIMAGEURL =
private:resource/dbu/image/19205;
public static final String INFOIMAGEURL_HC =
private:resource/dbu/image/19230;
@@ -38,23 +36,13 @@ public interface UIConsts
* high tabindex because on every step their taborder must appear at the
end
*/
public static final short SOFIRSTWIZARDNAVITABINDEX = 3;
-public static final Integer INTEGER_8
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source
sw/source/core/unocore/unotext.cxx | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
New commits:
commit f75e494ad9b9a3ef6257e8eda452ab2cb9c7d6ad
Author: Caolán McNamara caol...@redhat.com
Date: Tue Aug 12 12:06:49 2014 +0100
Resolves: fdo#81046 don't crash on compilers that enforce exception specs
bit of a hammer here, the offending property is IsSplitAllowed if someone
wants to attempt a more subtle fix
Change-Id: I37ed623a9947473fcb5c9e2b987d7a3dd9147ffa
(cherry picked from commit b59931d8a62f761022929f58f27d7ba22536b570)
Reviewed-on: https://gerrit.libreoffice.org/10885
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index 93952c8..cd31f50 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2136,12 +2136,20 @@ lcl_ApplyCellProperties(
xCellCurs-gotoEnd( sal_True );
const uno::Reference beans::XPropertyState
xCellTextPropState(xCellCurs, uno::UNO_QUERY);
-const beans::PropertyState state =
xCellTextPropState-getPropertyState(rName);
-if (state == beans::PropertyState_DEFAULT_VALUE)
+try
{
-const uno::Reference beans::XPropertySet
-xCellTextProps(xCellCurs, uno::UNO_QUERY);
-xCellTextProps-setPropertyValue(rName, rValue);
+const beans::PropertyState state =
xCellTextPropState-getPropertyState(rName);
+if (state == beans::PropertyState_DEFAULT_VALUE)
+{
+const uno::Reference beans::XPropertySet
+xCellTextProps(xCellCurs, uno::UNO_QUERY);
+xCellTextProps-setPropertyValue(rName, rValue);
+}
+}
+catch (const uno::Exception e)
+{
+SAL_WARN( sw.uno, Exception when getting PropertyState:
++ rName + . Message: + e.Message );
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 77485, which changed state. Bug 77485 Summary: CONFIGURATION: macro-warning: path for trusted locations from previous LibreOffice, is corrupted by update https://bugs.freedesktop.org/show_bug.cgi?id=77485 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- 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: 3 commits - external/libmwaw sw/qa writerfilter/source
external/libmwaw/0001-MWAWDocument.cxx-remove-an-useless-debug-message.patch |
24 ++
external/libmwaw/UnpackedTarball_libmwaw.mk |
1
sw/qa/extras/rtfimport/data/behind-doc.rtf |
19 +++
sw/qa/extras/rtfimport/rtfimport.cxx |
9 +++
writerfilter/source/ooxml/model.xml |
2
writerfilter/source/rtftok/rtfdocumentimpl.cxx |
19 ---
writerfilter/source/rtftok/rtfdocumentimpl.hxx |
2
7 files changed, 67 insertions(+), 9 deletions(-)
New commits:
commit 37ecf082378a94d28d90b6f7639b0815484d9e3e
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Aug 13 14:39:40 2014 +0200
RTF import: fix handling of RTF_SHPFBLWTXT
Commit 6cac123a8de8357cf11d9b5f818233889d729939 (fdo#45183 import
RTF_SHPFBLWTXT, 2012-12-27) fixed this already once in the past -- fix
it again, this time with a testcase.
Change-Id: I0cbbfb1ba4eef42b2ee32f6f77065afaad3ddc1b
diff --git a/sw/qa/extras/rtfimport/data/behind-doc.rtf
b/sw/qa/extras/rtfimport/data/behind-doc.rtf
new file mode 100644
index 000..d9996bc
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/behind-doc.rtf
@@ -0,0 +1,19 @@
+{\rtf1
+{\shp
+{\*\shpinst\shpleft-7\shptop-7\shpright1274\shpbottom1274\shpfhdr0\shpbxcolumn\shpbxignore\shpbypara\shpbyignore\shpwr3\shpwrk0\shpfblwtxt1\shpz0\shplid1026
+{\sp
+{\sn shapeType}
+{\sv 75}
+}
+{\sp
+{\sn pib}
+{\sv
+{\pict\picscalex100\picscaley100\piccropl0\piccropr0\piccropt0\piccropb0\picw2258\pich2258\picwgoal1280\pichgoal1280\pngblip\bliptag1974568719
+{\*\blipuid 75b1870fd12614068d19954c8cfee5d1}
+47494638396110001000d5ffffc0c0c0555f00aafcfcfcf6f6f6eaeaeae6e6e6e4e4e4e3e3e3c2c2c2c1c1c1bcbcbcb5b5b5b3b3b3b0b0b0adadada5a5a5a2a2a2a1a1a19f9f9f9494948a8a8a888686867b7b7b6c6c6c5c5c5c4e4e4e4b4b4b4747474646463d3d3d3c3c3c2e2e2e2525251b1b1b1818181010100909090606060303030021f9040102002c1000100684408170482c0a06c8a4728924389f506833b281302a8e6b164b18103024c52111504cca67332102e0042e9a40d9319f8300a343c1200f54e47f7e2a1e0b0a7d0d728a010d838400261a7c0d94947784252700127e9d159f6c8411140019080ea7a9a85f842122281612b1b3b25d6b1f29291d0fbbbdbc5d5e51c34e4cc64a46c94341003b}
+}
+}
+}
+}
+aaa\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 2dc99ce..36b29c7 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1893,6 +1893,15 @@ DECLARE_RTFIMPORT_TEST(testFdo82106, fdo82106.rtf)
getParagraph(2, before\tafter);
}
+DECLARE_RTFIMPORT_TEST(testBehindDoc, behind-doc.rtf)
+{
+// The problem was that behind doc didn't result in the shape being in
the background, only in being wrapped as through.
+uno::Referencedrawing::XShape xShape = getShape(1);
+CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_THROUGHT,
getPropertytext::WrapTextMode(xShape, Surround));
+// This was true.
+CPPUNIT_ASSERT_EQUAL(false, getPropertybool(xShape, Opaque));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 52d8993..fc0a988 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -887,20 +887,25 @@ int RTFDocumentImpl::resolvePict(bool const bInline,
uno::Referencedrawing::XSh
// wrap sprm
RTFSprms aAnchorWrapAttributes;
RTFSprms aAnchorAttributes;
+aAnchorAttributes.set(NS_ooxml::LN_CT_Anchor_behindDoc,
RTFValue::Pointer_t(new RTFValue(m_aStates.top().aShape.bInBackground)));
RTFSprms aAnchorSprms;
for (RTFSprms::Iterator_t i =
m_aStates.top().aCharacterAttributes.begin(); i !=
m_aStates.top().aCharacterAttributes.end(); ++i)
{
if (i-first == NS_ooxml::LN_CT_WrapSquare_wrapText)
aAnchorWrapAttributes.set(i-first, i-second);
}
+sal_Int32 nWrap = -1;
for (RTFSprms::Iterator_t i = m_aStates.top().aCharacterSprms.begin();
i != m_aStates.top().aCharacterSprms.end(); ++i)
{
if (i-first == NS_ooxml::LN_EG_WrapType_wrapNone)
+{
+nWrap = NS_ooxml::LN_EG_WrapType_wrapNone;
aAnchorSprms.set(i-first, i-second);
+}
}
RTFValue::Pointer_t pAnchorWrapValue(new
RTFValue(aAnchorWrapAttributes));
aAnchorSprms.set(NS_ooxml::LN_CT_Anchor_extent, pExtentValue);
-if (aAnchorWrapAttributes.size())
+if (aAnchorWrapAttributes.size() nWrap !=
NS_ooxml::LN_EG_WrapType_wrapNone)
[Libreoffice-commits] core.git: 2 commits - winaccessibility/source
winaccessibility/source/UAccCOM/AccTable.cxx |1 -
winaccessibility/source/service/AccTopWindowListener.cxx |2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 5ba86251c08ea9a9297afd2c1d8f57adaecc3d03
Author: Tor Lillqvist t...@collabora.com
Date: Wed Aug 13 16:00:27 2014 +0300
WaE: C4189: 'isTRUE' : local variable is initialized but not referenced
Change-Id: I84859c105c5f91ec66f075dd96be865ddeb71e33
diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx
b/winaccessibility/source/UAccCOM/AccTable.cxx
index c945ad7..472b968 100644
--- a/winaccessibility/source/UAccCOM/AccTable.cxx
+++ b/winaccessibility/source/UAccCOM/AccTable.cxx
@@ -539,7 +539,6 @@ STDMETHODIMP CAccTable::get_summary(IUnknown * * accessible)
ReferenceXAccessible pRAcc = GetXInterface()-getAccessibleSummary();
IAccessible* pRet = NULL;
-BOOL isTRUE = CMAccessible::get_IAccessibleFromXAccessible(pRAcc.get(),
pRet);
if(pRet)
{
commit 450f6a177b93c3417fbc73a99f1de3f5c28376d2
Author: Tor Lillqvist t...@collabora.com
Date: Wed Aug 13 15:56:33 2014 +0300
WaE: C4245: 'argument' : conversion from 'int' to 'unsigned short'
Change-Id: I2631ff653377b58dde5ae135571fd669cfbf9d30
diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx
b/winaccessibility/source/service/AccTopWindowListener.cxx
index 4f4bf54..a3df23b 100644
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -78,7 +78,7 @@ void AccTopWindowListener::HandleWindowOpened(
com::sun::star::accessibility::XA
AddAllListeners(pAccessible,NULL,(HWND)systemdata-hWnd);
if( window-GetStyle() WB_MOVEABLE )
-accManagerAgent.IncreaseState( pAccessible, -1 /* U_MOVEBLE */ );
+accManagerAgent.IncreaseState( pAccessible, (unsigned short) -1 /*
U_MOVEBLE */ );
short role = pAccessibleContext-getAccessibleRole();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: winaccessibility/source
winaccessibility/source/UAccCOM/AccTable.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 6e4ab42cd036886e7198c084ab69ae8cb44ceb2b
Author: Tor Lillqvist t...@collabora.com
Date: Wed Aug 13 16:23:18 2014 +0300
Oops, partial revert of 5ba86251c08ea9a9297afd2c1d8f57adaecc3d03
Change-Id: I180aa42ff2d97bad921603c20a0834aa3315526b
diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx
b/winaccessibility/source/UAccCOM/AccTable.cxx
index 472b968..e739300 100644
--- a/winaccessibility/source/UAccCOM/AccTable.cxx
+++ b/winaccessibility/source/UAccCOM/AccTable.cxx
@@ -539,6 +539,7 @@ STDMETHODIMP CAccTable::get_summary(IUnknown * * accessible)
ReferenceXAccessible pRAcc = GetXInterface()-getAccessibleSummary();
IAccessible* pRet = NULL;
+CMAccessible::get_IAccessibleFromXAccessible(pRAcc.get(), pRet);
if(pRet)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source
svx/source/svdraw/svdotext.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 6ce8728ce5a17f073c5bace982f08acef79b72dd
Author: matteocam matteo.campane...@gmail.com
Date: Wed Aug 13 15:36:16 2014 +0200
Added debugging output to onEditOutlinerStatusEvent
Change-Id: I838af5c0531b57a608c64ebf71eb50dc0e9c5239
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 01ea84b..7bdbda4 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1956,6 +1956,8 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus*
pEditStatus )
{
// set the need for chaining
SetToBeChained( pEditStatus-IsPageOverflow() );
+fprintf(stderr, [CHAINING] Need for Chaining is %s\n,
+pEditStatus-IsPageOverflow() ? TRUE : FALSE);
//impDecomposeChainedTextPrimitive();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/com_MSC_defs.mk |7 +++ 1 file changed, 7 insertions(+) New commits: commit a8c503a69c467526ef80ec36b7916e7b931f9101 Author: Michael Stahl mst...@redhat.com Date: Wed Aug 13 15:37:28 2014 +0200 gbuild: MSVC: disable warning C4373 again Making our code acceptable for ancient compilers that we don't use and that don't actually support C++ is a complete waste of time. (partially reverts 856b7f5f783471388cd811d92172cc1d2da7e331) Change-Id: I26a1a67d8c4beb31d6c0c301a56a948552683422 diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 1526172..380b2c5 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -96,6 +96,12 @@ gb_AFLAGS := $(AFLAGS) # C4355: 'this' : used in base member initializer list +# C4373: '%$S': virtual function overrides '%$pS', previous versions +# of the compiler did not override when parameters only differed by +# const/volatile qualifiers. +# [translation: ancient compilers that don't actually support C++ do +# stupid things] + # C4481: nonstandard extension used: override specifier 'override' # (MSVC 2010 warns about this, even though it's C++11 keyword) @@ -161,6 +167,7 @@ gb_CXXFLAGS := \ -wd4290 \ -wd4351 \ -wd4355 \ + -wd4373 \ -wd4481 \ -wd4505 \ -wd4512 \ ___ 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' - accessibility/source
accessibility/source/standard/vclxaccessiblelist.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit bd6048bf5ab668f59a950a41b6bddc5d862cfdce
Author: Niklas Johansson sleeping.pil...@gmail.com
Date: Fri Jul 4 19:25:09 2014 +0200
Notify screen readers when selection changes in listboxes
When you change selections in listboxes without dropdown fuctionality
an accessilble event needs to be sent, this does not happen today.
An example of such listbox is the Suggestions in the Spelling and
Grammar dialog.
Change-Id: I6100c88ae5398d8bf3f511aee7b35e88fbf151f5
Reviewed-on: https://gerrit.libreoffice.org/10087
Tested-by: Norbert Thiebaud nthieb...@gmail.com
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/10893
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx
b/accessibility/source/standard/vclxaccessiblelist.cxx
index beb252c..d54d515 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -300,8 +300,13 @@ void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool
b_IsDropDownList)
}
else if (m_aBoxType == LISTBOX !b_IsDropDownList)
{
-if ( aNewValue.hasValue())
+if ( aNewValue.hasValue() || aOldValue.hasValue() )
{
+NotifyAccessibleEvent(
+AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
+aOldValue,
+aNewValue );
+
NotifyListItem(aNewValue);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/inc sfx2/source
include/sfx2/app.hxx| 20 +++
include/sfx2/module.hxx |5
sfx2/inc/arrdecl.hxx| 41
sfx2/source/appl/appchild.cxx |7 ++
sfx2/source/appl/appmisc.cxx| 25
sfx2/source/appl/appreg.cxx |7 ++
sfx2/source/appl/childwin.cxx |9 +++-
sfx2/source/appl/module.cxx |9 +++-
sfx2/source/appl/workwin.cxx|5 +---
sfx2/source/inc/appdata.hxx |8 ---
sfx2/source/menu/mnuitem.cxx| 17 +++-
sfx2/source/statbar/stbitem.cxx | 17 +++-
sfx2/source/toolbox/tbxitem.cxx | 17 +++-
13 files changed, 54 insertions(+), 133 deletions(-)
New commits:
commit a247b8257a904372fcc2330bd8820176d4a71ebd
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Aug 12 23:58:14 2014 +0900
fdo#75757: remove inheritance to std::vector
... by replacing the following 3 classes with typedefs of std::vector:
SfxObjectShellArr_Impl / SfxViewFrameArr_Impl / SfxViewShellArr_Impl
and the following 4 with typedefs of boost::ptr_vector:
SfxChildWinFactArr_Impl / SfxMenuCtrlFactArr_Impl /
SfxStbCtrlFactArr_Impl / SfxTbxCtrlFactArr_Impl
Change-Id: I1754bd19ec418a3e7ba5c47fb6d8568e8fca9b29
Reviewed-on: https://gerrit.libreoffice.org/10891
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 0a11a06..ca22000 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -35,7 +35,12 @@
// header file because in former times SfxApplication was derived from it
#include vcl/svapp.hxx
+#include sfx2/childwin.hxx
+#include sfx2/mnuitem.hxx
#include sfx2/shell.hxx
+#include sfx2/stbitem.hxx
+#include sfx2/tbxctrl.hxx
+#include boost/ptr_container/ptr_vector.hpp
#include vector
class Timer;
@@ -51,32 +56,31 @@ class AppSettings;
struct SfxChildWinContextFactory;
class SfxAppData_Impl;
class SfxBindings;
-class SfxChildWinFactArr_Impl;
+typedef boost::ptr_vectorSfxChildWinFactory SfxChildWinFactArr_Impl;
class SfxChildWindow;
class SfxDispatcher;
class SfxEventConfiguration;
class SfxEventHint;
class SfxItemSet;
class SfxMedium;
-class SfxMenuCtrlFactArr_Impl;
+typedef boost::ptr_vectorSfxMenuCtrlFactory SfxMenuCtrlFactArr_Impl;
class SfxNewFileDialog;
class SfxObjectShell;
-class SfxObjectShellArr_Impl;
+typedef ::std::vectorSfxObjectShell* SfxObjectShellArr_Impl;
class SfxProgress;
class SfxSlotPool;
-class SfxStbCtrlFactArr_Impl;
-class SfxTbxCtrlFactArr_Impl;
+typedef boost::ptr_vectorSfxStbCtrlFactory SfxStbCtrlFactArr_Impl;
+typedef boost::ptr_vectorSfxTbxCtrlFactory SfxTbxCtrlFactArr_Impl;
class SfxTemplateDialog;
class SfxViewFrame;
-class SfxViewFrameArr_Impl;
+typedef ::std::vectorSfxViewFrame* SfxViewFrameArr_Impl;
class SfxViewShell;
-class SfxViewShellArr_Impl;
+typedef ::std::vectorSfxViewShell* SfxViewShellArr_Impl;
class StarBASIC;
class SfxWorkWindow;
class SfxFilterMatcher;
class SfxModule;
class SfxModule;
-typedef ::std::vectorSfxModule* SfxModuleArr_Impl;
class Window;
struct SfxChildWinFactory;
struct SfxMenuCtrlFactory;
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 9dbfbad..cf9130f 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -21,6 +21,7 @@
#define _SFXMOD_HXX // external
#include sal/config.h
+#include sfx2/app.hxx
#include sfx2/dllapi.h
#include sfx2/shell.hxx
#include svtools/imgdef.hxx
@@ -44,10 +45,6 @@ struct SfxChildWinFactory;
struct SfxMenuCtrlFactory;
struct SfxStbCtrlFactory;
struct SfxTbxCtrlFactory;
-class SfxTbxCtrlFactArr_Impl;
-class SfxChildWinFactArr_Impl;
-class SfxMenuCtrlFactArr_Impl;
-class SfxStbCtrlFactArr_Impl;
class SfxTabPage;
class Window;
diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx
index 1ce03bc..31cd354 100644
--- a/sfx2/inc/arrdecl.hxx
+++ b/sfx2/inc/arrdecl.hxx
@@ -21,47 +21,6 @@
#include vector
-class SfxObjectShell;
-class SfxObjectShellArr_Impl : public std::vectorSfxObjectShell* {};
-
-class SfxViewFrame;
-class SfxViewFrameArr_Impl : public std::vectorSfxViewFrame* {};
-
-class SfxViewShell;
-class SfxViewShellArr_Impl : public std::vectorSfxViewShell* {};
-
-struct SfxTbxCtrlFactory;
-class SfxTbxCtrlFactArr_Impl : public std::vectorSfxTbxCtrlFactory*
-{
-public:
-// de-allocates child objects
-~SfxTbxCtrlFactArr_Impl();
-};
-
-struct SfxStbCtrlFactory;
-class SfxStbCtrlFactArr_Impl : public std::vectorSfxStbCtrlFactory*
-{
-public:
-// de-allocates child objects
-~SfxStbCtrlFactArr_Impl();
-};
-
-struct SfxMenuCtrlFactory;
-class SfxMenuCtrlFactArr_Impl : public std::vectorSfxMenuCtrlFactory*
-{
-public:
-// de-allocates child objects
-~SfxMenuCtrlFactArr_Impl();
-};
-
-struct SfxChildWinFactory;
-class SfxChildWinFactArr_Impl : public std::vectorSfxChildWinFactory*
-{
-public:
-
[Bug 75757] remove inheritance to std::map and std::vector
https://bugs.freedesktop.org/show_bug.cgi?id=75757 --- Comment #21 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Takeshi Abe committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=a247b8257a904372fcc2330bd8820176d4a71ebd fdo#75757: remove inheritance to std::vector The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: salhelper/qa
salhelper/qa/test_api.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit 0201156f938af5bede5e3935048e81e88534ca10
Author: Michael Stahl mst...@redhat.com
Date: Wed Aug 13 15:51:20 2014 +0200
salhelper: work around spurious warning C4189
Change-Id: If919ca6da332bb94419a25253a5d6dec7243def9
diff --git a/salhelper/qa/test_api.cxx b/salhelper/qa/test_api.cxx
index 5892b2c..f016a88 100644
--- a/salhelper/qa/test_api.cxx
+++ b/salhelper/qa/test_api.cxx
@@ -120,6 +120,13 @@ void Test::testCondition() {
CPPUNIT_ASSERT(typeid (salhelper::Condition *) == getConditionTypeInfo());
}
+#ifdef _MSC_VER
+// MSVC 2012 warns about the p being unused
+#pragma warning (push, 1)
+#pragma warning (disable: 4189)
+#endif
+
+
void Test::testConditionModifier() {
salhelper::ConditionModifier * p = 0;
CPPUNIT_ASSERT(typeid (*p) == typeid (salhelper::ConditionModifier));
@@ -184,6 +191,10 @@ void Test::testORealDynamicLoader() {
== getORealDynamicLoaderTypeInfo());
}
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif
+
void Test::testSimpleReferenceObject() {
salhelper::SimpleReferenceObject * p = new DerivedSimpleReferenceObject;
try {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source
editeng/source/outliner/outliner.cxx | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
New commits:
commit 891d6e558e9b78a6e40980bc8cda3903c05126f5
Author: matteocam matteo.campane...@gmail.com
Date: Wed Aug 13 16:11:07 2014 +0200
Check that overflowing paragraphs are within indices
Change-Id: I0937753facfa051b4fc6b5d21479855879ba64a1
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index 1ecef6b..50fa881 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2103,6 +2103,15 @@ OutlinerParaObject
*Outliner::GetNonOverflowingParaObject() const
sal_Int32 nCount = pEditEngine-GetOverflowingParaNum();
//sal_Int32 nCount = 1;
+// Defensive check: oveflowing para index beyond actual # of paragraphs?
+if ( nCount GetParagraphCount()-1) {
+fprintf(stderr,
+[Overflowing] Ops, trying to retrieve para %d when max index
is %d\n,
+nCount,
+GetParagraphCount()-1);
+return NULL;
+}
+
if ( nCount == 0 ) // Only overflowing text
return NULL;
else if (nCount 0) // No overflowing Text
@@ -2130,8 +2139,17 @@ OutlinerParaObject
*Outliner::GetNonOverflowingParaObject() const
}
OutlinerParaObject *Outliner::GetOverflowingParaObject() const
{
-if ( pEditEngine-GetOverflowingParaNum() = 0)
+if ( pEditEngine-GetOverflowingParaNum() = 0) {
+// Defensive check: oveflowing para index beyond actual # of
paragraphs?
+if ( pEditEngine-GetOverflowingParaNum() GetParagraphCount()-1) {
+fprintf(stderr,
+[Overflowing] Ops, trying to retrieve para %d when max
index is %d\n,
+nCount,
+GetParagraphCount()-1);
+return NULL;
+}
return CreateParaObject( pEditEngine-GetOverflowingParaNum() );
+}
return NULL;
/*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: l10ntools/source
l10ntools/source/po.cxx |8 1 file changed, 8 insertions(+) New commits: commit 1cf299efcce79c686544d2ff034f916f93f69920 Author: Michael Stahl mst...@redhat.com Date: Wed Aug 13 16:14:58 2014 +0200 l10ntools: suppress warning C4245 from boost/crc.hpp Change-Id: I2ed53b4f902ae694fc064375e8a9cfeba32f9d1c diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index 5b40e8c..bc599a0 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -16,7 +16,15 @@ #include vector #include string +#ifdef _MSC_VER +#pragma warning (push, 1) +#pragma warning (disable: 4245) +#endif #include boost/crc.hpp +#ifdef _MSC_VER +#pragma warning (pop) +#endif + #include po.hxx #include helper.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: v4.3.0.4 not working on SSE1 CPUs anymore
On Wed, 2014-08-13 at 06:52 +0200, Jean-Baptiste Faure wrote: The problem has been reported here: https://bugs.freedesktop.org/show_bug.cgi?id=82430 I think we need a decision between FIX or WontFix I don't think SSE2 is likely to give us significant wins - most real perf. problems are algorithmic. In the area where it might - heavy duty compilation, then assuming you have a sensible OpenCL compiler that will detect use whatever 31337 CPU features it can for bulk computation and yet work on older machines. At least that's the theory; so I guess we'd want to back-down to SSE1 etc. (Michael S. has a nice patch) 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: sc/source
sc/source/ui/dbgui/scuiasciiopt.cxx | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
New commits:
commit a8525fe5cf2ba834ae39e7bfe078911d94957a70
Author: David Tardon dtar...@redhat.com
Date: Wed Aug 13 16:50:56 2014 +0200
fdo#82418 prefer UTF-8 over UTF-16
Change-Id: Id2c990d24dc942a6d061146ea88cf53ee29a1c3d
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 512cc55..a625ecb 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -387,8 +387,19 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent, const
OUString aDatName,
// Insert one SYSTEM entry for compatibility in AsciiOptions and system
// independent document linkage.
pLbCharSet-InsertTextEncoding( RTL_TEXTENCODING_DONTKNOW, aCharSetUser );
-pLbCharSet-SelectTextEncoding( ePreselectUnicode ==
RTL_TEXTENCODING_DONTKNOW ?
-osl_getThreadTextEncoding() : ePreselectUnicode );
+if ( ePreselectUnicode == RTL_TEXTENCODING_DONTKNOW )
+{
+rtl_TextEncoding eSystemEncoding = osl_getThreadTextEncoding();
+// Prefer UTF-8, as UTF-16 would have already been detected from the
stream.
+// This gives a better chance that the file is going to be opened
correctly.
+if ( ( eSystemEncoding == RTL_TEXTENCODING_UNICODE ) mpDatStream )
+eSystemEncoding = RTL_TEXTENCODING_UTF8;
+pLbCharSet-SelectTextEncoding( eSystemEncoding );
+}
+else
+{
+pLbCharSet-SelectTextEncoding( ePreselectUnicode );
+}
if( nCharSet = 0 ePreselectUnicode == RTL_TEXTENCODING_DONTKNOW )
pLbCharSet-SelectEntryPos( static_castsal_uInt16(nCharSet) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bbcbfd515b188f641abcc80307a7213baf6a76a1
Author: Michael Stahl mst...@redhat.com
Date: Wed Aug 13 17:16:26 2014 +0200
[loplugin:implicitboolconversion]
Change-Id: Icb50487eb466f547f6b382155f6ce9099fb32aaa
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index fc0a988..67a6710 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -887,7 +887,7 @@ int RTFDocumentImpl::resolvePict(bool const bInline,
uno::Referencedrawing::XSh
// wrap sprm
RTFSprms aAnchorWrapAttributes;
RTFSprms aAnchorAttributes;
-aAnchorAttributes.set(NS_ooxml::LN_CT_Anchor_behindDoc,
RTFValue::Pointer_t(new RTFValue(m_aStates.top().aShape.bInBackground)));
+aAnchorAttributes.set(NS_ooxml::LN_CT_Anchor_behindDoc,
RTFValue::Pointer_t(new RTFValue((m_aStates.top().aShape.bInBackground) ? 1 :
0)));
RTFSprms aAnchorSprms;
for (RTFSprms::Iterator_t i =
m_aStates.top().aCharacterAttributes.begin(); i !=
m_aStates.top().aCharacterAttributes.end(); ++i)
{
___
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-1' - xmlhelp/source
xmlhelp/source/cxxhelp/provider/urlparameter.hxx | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 3434aceb1cdb306c339201e9e67d3920b338f9b3
Author: Caolán McNamara caol...@redhat.com
Date: Mon Aug 11 11:27:53 2014 +0100
Resolves: fdo#82025 use strlen instead of stored length byte
Change-Id: I58cf2391d7bf2480cd12d2b1b4cf73f346f4f95f
(cherry picked from commit ad40561d13e004ca4c532afb406675eea3c6a663)
Reviewed-on: https://gerrit.libreoffice.org/10878
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Eike Rathke er...@redhat.com
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index ba8f29c..05bca6d 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -43,7 +43,6 @@ namespace chelp {
{
}
-
OUString getHash()
{
if( m_ptr )
@@ -88,11 +87,15 @@ namespace chelp {
if( ! m_ptr )
return OUString();
-sal_Int32 sizeOfTitle =
-( sal_Int32 ) m_ptr[ 2 + m_ptr[0] + ( sal_Int32 ) m_ptr[ 1+
( sal_Int32 ) m_ptr[0] ] ];
-return OUString( m_ptr + 3 + m_ptr[0] + ( sal_Int32 ) m_ptr[ 1+ (
sal_Int32 ) m_ptr[0] ],
- sizeOfTitle,
- RTL_TEXTENCODING_UTF8 );
+//fdo#82025 - use strlen instead of stored length byte to
determine string len
+//There is a one byte length field at m_ptr[2 + m_ptr[0] + m_ptr[1
+//+ m_ptr[0]]] but by default sal_Char is signed so anything larger
+//than 127 defaults to a negative value, casting it would allow up
+//to 255 but instead make use of the null termination to avoid
+//running into a later problem with strings = 255
+const sal_Char* pTitle = m_ptr + 3 + m_ptr[0] + ( sal_Int32 )
m_ptr[ 1+ ( sal_Int32 ) m_ptr[0] ];
+
+return OUString(pTitle, rtl_str_getLength(pTitle),
RTL_TEXTENCODING_UTF8);
}
___
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-1' - dbaccess/source
dbaccess/source/ui/dlg/dlgattr.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 7829f390995c663a7d7d9c14def46f0de70e2598
Author: Caolán McNamara caol...@redhat.com
Date: Tue Aug 12 09:01:28 2014 +0100
Resolves: fdo#82413 crash in format-column
Change-Id: I3af776c14ec0f224884488fdc99ee26ebbba7cb8
(cherry picked from commit e2d2fa4f0663cf990c0595f8827ff9123c88d41a)
Reviewed-on: https://gerrit.libreoffice.org/10877
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Eike Rathke er...@redhat.com
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx
b/dbaccess/source/ui/dlg/dlgattr.cxx
index 0a83ba3..8af7569 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -39,13 +39,14 @@ SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const
SfxItemSet* pCellAttrs,
: SfxTabDialog(pParent, FieldDialog, dbaccess/ui/fielddialog.ui,
pCellAttrs)
, m_nNumberFormatId(0)
{
-
pNumberInfoItem = new SvxNumberInfoItem( pFormatter, 0 );
if (bRow)
SetText(getFixedText(alttitle)-GetText());
if (bHasFormat)
m_nNumberFormatId = AddTabPage(format, RID_SVXPAGE_NUMBERFORMAT);
+else
+RemoveTabPage(format);
AddTabPage(alignment, RID_SVXPAGE_ALIGNMENT);
}
___
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-1' - comphelper/source include/comphelper sfx2/source svtools/source
comphelper/source/container/embeddedobjectcontainer.cxx | 36
include/comphelper/embeddedobjectcontainer.hxx |3 +
sfx2/source/appl/linkmgr2.cxx | 12 -
svtools/source/misc/embedhlp.cxx| 29
4 files changed, 62 insertions(+), 18 deletions(-)
New commits:
commit a1910529662accd48460b9761293fef0583fb6fe
Author: Armin Le Grand a...@apache.org
Date: Thu Aug 7 09:59:26 2014 +
Resolves: #i125386# secured user request and changed some bools to bitfield
(cherry picked from commit 5e3cbe056c19bea5018dbf1fd4b2bc8f8b030ff3)
Conflicts:
comphelper/inc/comphelper/embeddedobjectcontainer.hxx
comphelper/source/container/embeddedobjectcontainer.cxx
sfx2/source/appl/linkmgr2.cxx
svtools/source/misc/embedhlp.cxx
Change-Id: I7e9b20a87ca6afe8cb91c577860a6c6b72368ee9
(cherry picked from commit d005acae3aa315921f2c331612131626c470bd22)
Reviewed-on: https://gerrit.libreoffice.org/10884
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Eike Rathke er...@redhat.com
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx
b/comphelper/source/container/embeddedobjectcontainer.cxx
index 9437893..d7813d7 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -85,7 +85,10 @@ struct EmbedImpl
uno::WeakReference uno::XInterface m_xModel;
//EmbeddedObjectContainerNameMap maTempObjectContainer;
//uno::Reference embed::XStorage mxTempStorage;
-bool bOwnsStorage;
+
+/// bitfield
+bool mbOwnsStorage : 1;
+bool mbUserAllowsLinkUpdate : 1;
const uno::Reference embed::XStorage GetReplacements();
};
@@ -116,7 +119,8 @@ EmbeddedObjectContainer::EmbeddedObjectContainer()
{
pImpl = new EmbedImpl;
pImpl-mxStorage = ::comphelper::OStorageHelper::GetTemporaryStorage();
-pImpl-bOwnsStorage = true;
+pImpl-mbOwnsStorage = true;
+pImpl-mbUserAllowsLinkUpdate = true;
pImpl-mpTempObjectContainer = 0;
}
@@ -124,7 +128,8 @@ EmbeddedObjectContainer::EmbeddedObjectContainer( const
uno::Reference embed::
{
pImpl = new EmbedImpl;
pImpl-mxStorage = rStor;
-pImpl-bOwnsStorage = false;
+pImpl-mbOwnsStorage = false;
+pImpl-mbUserAllowsLinkUpdate = true;
pImpl-mpTempObjectContainer = 0;
}
@@ -132,7 +137,8 @@ EmbeddedObjectContainer::EmbeddedObjectContainer( const
uno::Reference embed::
{
pImpl = new EmbedImpl;
pImpl-mxStorage = rStor;
-pImpl-bOwnsStorage = false;
+pImpl-mbOwnsStorage = false;
+pImpl-mbUserAllowsLinkUpdate = true;
pImpl-mpTempObjectContainer = 0;
pImpl-m_xModel = xModel;
}
@@ -141,11 +147,11 @@ void EmbeddedObjectContainer::SwitchPersistence( const
uno::Reference embed::X
{
ReleaseImageSubStorage();
-if ( pImpl-bOwnsStorage )
+if ( pImpl-mbOwnsStorage )
pImpl-mxStorage-dispose();
pImpl-mxStorage = rStor;
-pImpl-bOwnsStorage = false;
+pImpl-mbOwnsStorage = false;
}
bool EmbeddedObjectContainer::CommitImageSubStorage()
@@ -201,7 +207,7 @@ EmbeddedObjectContainer::~EmbeddedObjectContainer()
{
ReleaseImageSubStorage();
-if ( pImpl-bOwnsStorage )
+if ( pImpl-mbOwnsStorage )
pImpl-mxStorage-dispose();
delete pImpl-mpTempObjectContainer;
@@ -1360,7 +1366,7 @@ bool EmbeddedObjectContainer::StoreAsChildren(bool
_bOasisFormat,bool _bCreateEm
xStream = GetGraphicStream( xObj, aMediaType );
}
-if ( !xStream.is() )
+if ( !xStream.is() getUserAllowsLinkUpdate() )
{
// the image must be regenerated
// TODO/LATER: another aspect could be used
@@ -1649,6 +1655,20 @@ bool EmbeddedObjectContainer::SetPersistentEntries(const
uno::Reference embed::
}
return bError;
}
+
+bool EmbeddedObjectContainer::getUserAllowsLinkUpdate() const
+{
+return pImpl-mbUserAllowsLinkUpdate;
+}
+
+void EmbeddedObjectContainer::setUserAllowsLinkUpdate(bool bNew)
+{
+if(pImpl-mbUserAllowsLinkUpdate != bNew)
+{
+pImpl-mbUserAllowsLinkUpdate = bNew;
+}
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/embeddedobjectcontainer.hxx
b/include/comphelper/embeddedobjectcontainer.hxx
index 8895a8d..2c8e25f 100644
--- a/include/comphelper/embeddedobjectcontainer.hxx
+++ b/include/comphelper/embeddedobjectcontainer.hxx
@@ -181,6 +181,9 @@ public:
* \return FALSE/ if no error occurred, otherwise TRUE/.
*/
bool SetPersistentEntries(const
com::sun::star::uno::Reference com::sun::star::embed::XStorage
_xStorage,bool _bClearModifedFlag = true);
+
+bool
[Libreoffice-commits] core.git: 2 commits - slideshow/source
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx |5
-
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |6
+++---
2 files changed, 3 insertions(+), 8 deletions(-)
New commits:
commit b409ca53a59b5fb9978a81f6e395775b3577e179
Author: Michael Stahl mst...@redhat.com
Date: Wed Aug 13 17:47:53 2014 +0200
warning C4189 local variable initialized but not referenced
Change-Id: I7bea7063d924318eed07a2fad4ec88ea942302a0
diff --git
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 673d72a..949dc36 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -442,10 +442,10 @@ void OGLTransitionerImpl::impl_prepareSlides()
mbUseLeavingPixmap = false;
mbUseEnteringPixmap = false;
-GLWindow rGLWindow(mpContext-getOpenGLWindow());
-
#if defined( GLX_EXT_texture_from_pixmap )
+GLWindow rGLWindow(mpContext-getOpenGLWindow());
+
if( mbTextureFromPixmap xLeavingSet.is() xEnteringSet.is()
mbHasTFPVisual ) {
Sequence Any leaveArgs;
Sequence Any enterArgs;
@@ -1245,9 +1245,9 @@ void OGLTransitionerImpl::disposeTextures()
{
mpContext-makeCurrent();
+#if defined( GLX_EXT_texture_from_pixmap )
GLWindow rGLWindow(mpContext-getOpenGLWindow());
-#if defined( GLX_EXT_texture_from_pixmap )
PFNGLXRELEASETEXIMAGEEXTPROC myglXReleaseTexImageEXT =
(PFNGLXRELEASETEXIMAGEEXTPROC) glXGetProcAddress( (const GLubyte*)
glXReleaseTexImageEXT );
if( mbUseLeavingPixmap ) {
myglXReleaseTexImageEXT( rGLWindow.dpy, maLeavingPixmapGL,
GLX_FRONT_LEFT_EXT );
commit 6f2472e8d1451837500d76c7e705331b28fd33d9
Author: Michael Stahl mst...@redhat.com
Date: Wed Aug 13 17:46:09 2014 +0200
slideshow: prewin.h/postwin.h included twice
Builds for me without that...
Change-Id: I6db654098ee8f93a0cad80e7534c694971aebf5d
diff --git
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
index 4288bbf..80c4b41 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
@@ -33,11 +33,6 @@
#include boost/noncopyable.hpp
#include boost/shared_ptr.hpp
-#ifdef _WIN32
-#include prewin.h
-#include postwin.h
-#endif
-
#include GL/gl.h
#include basegfx/vector/b2dvector.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Insert Bug version 4.0.3.4
I'm using version 4.0.3.4 on windows 7 x 64 LibreOffice Calc When I'm clicking a cell and then move the cursor into the text field of the formula editor seting the cursor anywhere in existing text (in my case after I copy pasted in, dunno about that's relevant) after shifting the cursor to behind the last letter after activated the insert key and then moving with the arrow keys the cursor in frotn of the last letter whilest the insert functionallty is still active and now pressing any character the behaving in the formular editor text is as expected. But after confirming this, the confirmed text does differ. as if I review the submitted column everywhere I used the insert the letteres weren't repalced, isntead they got merged. Can someone confirm this? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source svx/source
editeng/source/editeng/impedit3.cxx |1 +
editeng/source/outliner/outliner.cxx |2 +-
svx/source/svdraw/svdotext.cxx |3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 9f61bda430ff71ea509697ba33014fb77150676a
Author: matteocam matteo.campane...@gmail.com
Date: Wed Aug 13 18:39:04 2014 +0200
Change in status word when text overflowing
Change-Id: I92439e46b72b757f396f9116d46a646e0314f43a
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 8751d05..7ea5a51 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -554,6 +554,7 @@ void ImpEditEngine::CheckAutoPageSize()
// which paragraph is the first to cause higher size of the box?
UpdateOverflowingParaNum( nBoxHeight /*aPrevPaperSize.Height()*/ ); //
XXX: currently only for horizontal text
aStatus.SetPageOverflow(true);
+aStatus.GetStatusWord() |= 0x0100;
} else
{
// No overflow if withing box boundaries
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index 50fa881..38f66f2 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2144,7 +2144,7 @@ OutlinerParaObject *Outliner::GetOverflowingParaObject()
const
if ( pEditEngine-GetOverflowingParaNum() GetParagraphCount()-1) {
fprintf(stderr,
[Overflowing] Ops, trying to retrieve para %d when max
index is %d\n,
-nCount,
+pEditEngine-GetOverflowingParaNum(),
GetParagraphCount()-1);
return NULL;
}
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 7bdbda4..fe9dcd6 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1935,7 +1935,8 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus*
pEditStatus )
const sal_uInt32 nStat = pEditStatus-GetStatusWord();
const bool bGrowX=(nStat EE_STAT_TEXTWIDTHCHANGED) !=0;
const bool bGrowY=(nStat EE_STAT_TEXTHEIGHTCHANGED) !=0;
-if(bTextFrame (bGrowX || bGrowY))
+const bool bOverflow = (nStat 0x0100) != 0;
+if(bTextFrame (bGrowX || bGrowY || bOverflow))
{
if ((bGrowX IsAutoGrowWidth()) || (bGrowY IsAutoGrowHeight()))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/impedit2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 885506bafbab12db992ac79d921101b412257cae
Author: Tor Lillqvist t...@collabora.com
Date: Wed Aug 13 19:21:34 2014 +0300
WaE: C4245: 'argument' : conversion from 'int' to 'size_t'
Change-Id: I43d15b84f78d9904b09e8df9e36013878e7a4147
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 339b102..63ccd0e 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2225,7 +2225,7 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode*
pLeft, ContentNode* pR
{
sal_Int32 nEnd = pLeft-Len();
sal_Int32 nInv = nEnd ? nEnd-1 : nEnd;
-pLeft-GetWrongList()-ClearWrongs( nInv, -1, pLeft ); // Possibly
remove one
+pLeft-GetWrongList()-ClearWrongs( nInv, static_castsize_t(-1),
pLeft ); // Possibly remove one
pLeft-GetWrongList()-SetInvalidRange(nInv, nEnd+1);
// Take over misspelled words
WrongList* pRWrongs = pRight-GetWrongList();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/AllLangResTarget_sc.mk sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/AllLangResTarget_sc.mk |1
sc/UIConfig_scalc.mk |1
sc/source/ui/dbgui/dapidata.cxx |1
sc/source/ui/dbgui/dapitype.cxx | 40 +---
sc/source/ui/dbgui/dapitype.hrc | 36 ---
sc/source/ui/dbgui/dapitype.src | 131 --
sc/source/ui/inc/dapitype.hxx | 19 --
sc/uiconfig/scalc/ui/dapiservicedialog.ui | 280 ++
8 files changed, 300 insertions(+), 209 deletions(-)
New commits:
commit 5cb5c24cc6087e8fc692b5c45248a574801bc2c3
Author: Szymon KÅos eszka...@gmail.com
Date: Wed Aug 13 17:31:57 2014 +0200
RID_SCDLG_DAPISERVICE conversion to .ui
Change-Id: I4194af3033f6591c7a8ca219aebf2ef816edcd63
Reviewed-on: https://gerrit.libreoffice.org/10915
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 4f8a080..d41a13f 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/navipi/navipi.src \
sc/source/ui/styleui/scstyles.src \
sc/source/ui/dbgui/pvfundlg.src \
-sc/source/ui/dbgui/dapitype.src \
sc/source/ui/drawfunc/drformsh.src \
sc/source/ui/drawfunc/objdraw.src \
sc/source/ui/miscdlgs/retypepassdlg.src \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 0833dc1..1dc9bc4 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -76,6 +76,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/correlationdialog \
sc/uiconfig/scalc/ui/covariancedialog \
sc/uiconfig/scalc/ui/createnamesdialog \
+ sc/uiconfig/scalc/ui/dapiservicedialog \
sc/uiconfig/scalc/ui/databaroptions \
sc/uiconfig/scalc/ui/datafielddialog \
sc/uiconfig/scalc/ui/datafieldoptionsdialog \
diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index a8e4765..95ca794 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -35,7 +35,6 @@ using namespace com::sun::star;
#include dapidata.hxx
#include scresid.hxx
#include sc.hrc
-#include dapitype.hrc
#include miscuno.hxx
#include dpsdbtab.hxx
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index 29c418d..4d50ebd 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -22,7 +22,6 @@
#include dapitype.hxx
#include scresid.hxx
#include sc.hrc
-#include dapitype.hrc
using namespace com::sun::star;
@@ -96,33 +95,22 @@ IMPL_LINK( ScDataPilotSourceTypeDlg, RadioClickHdl,
RadioButton*, pBtn )
ScDataPilotServiceDlg::ScDataPilotServiceDlg( Window* pParent,
const uno::SequenceOUString rServices ) :
-ModalDialog ( pParent, ScResId( RID_SCDLG_DAPISERVICE ) ),
-
-aFlFrame( this, ScResId( FL_FRAME ) ),
-aFtService ( this, ScResId( FT_SERVICE ) ),
-aLbService ( this, ScResId( LB_SERVICE ) ),
-aFtSource ( this, ScResId( FT_SOURCE ) ),
-aEdSource ( this, ScResId( ED_SOURCE ) ),
-aFtName ( this, ScResId( FT_NAME ) ),
-aEdName ( this, ScResId( ED_NAME ) ),
-aFtUser ( this, ScResId( FT_USER ) ),
-aEdUser ( this, ScResId( ED_USER ) ),
-aFtPasswd ( this, ScResId( FT_PASSWD ) ),
-aEdPasswd ( this, ScResId( ED_PASSWD ) ),
-aBtnOk ( this, ScResId( BTN_OK ) ),
-aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
-aBtnHelp( this, ScResId( BTN_HELP ) )
+ModalDialog ( pParent, DapiserviceDialog,
modules/scalc/ui/dapiservicedialog.ui )
{
+get(m_pLbService, service);
+get(m_pEdSource, source);
+get(m_pEdName, name);
+get(m_pEdUser, user);
+get(m_pEdPasswd, password);
+
long nCount = rServices.getLength();
const OUString* pArray = rServices.getConstArray();
for (long i=0; inCount; i++)
{
OUString aName = pArray[i];
-aLbService.InsertEntry( aName );
+m_pLbService-InsertEntry( aName );
}
-aLbService.SelectEntryPos( 0 );
-
-FreeResource();
+m_pLbService-SelectEntryPos( 0 );
}
ScDataPilotServiceDlg::~ScDataPilotServiceDlg()
@@ -131,27 +119,27 @@ ScDataPilotServiceDlg::~ScDataPilotServiceDlg()
OUString ScDataPilotServiceDlg::GetServiceName() const
{
-return aLbService.GetSelectEntry();
+return m_pLbService-GetSelectEntry();
}
OUString ScDataPilotServiceDlg::GetParSource() const
{
-return aEdSource.GetText();
+return m_pEdSource-GetText();
}
OUString ScDataPilotServiceDlg::GetParName() const
{
-return aEdName.GetText();
+return m_pEdName-GetText();
}
OUString ScDataPilotServiceDlg::GetParUser() const
{
-return aEdUser.GetText();
+return m_pEdUser-GetText();
}
OUString
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b907e110e6effb9def6d380b8c615904ea8f4cdc Author: David Tardon dtar...@redhat.com Date: Wed Aug 13 19:07:39 2014 +0200 Updated core Project: help 1fbcc737e36231426bedfdca0b172bbb90279d64 diff --git a/helpcontent2 b/helpcontent2 index 12bab40..1fbcc73 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 12bab40167e179cb6e65f6ba76a3eb5b098d4216 +Subproject commit 1fbcc737e36231426bedfdca0b172bbb90279d64 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst
helpers/help_hid.lst |6 -- 1 file changed, 6 deletions(-) New commits: commit 1fbcc737e36231426bedfdca0b172bbb90279d64 Author: David Tardon dtar...@redhat.com Date: Wed Aug 13 19:07:39 2014 +0200 drop unused help ids Change-Id: I27648bc90f0067d2f9cf708a77893a7332f2d029 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 55fd9df..f2b9826 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -963,7 +963,6 @@ HID_DAI_FUNC_DIFFYEARS,59193, HID_DAI_FUNC_ROT13,59194, HID_DAI_FUNC_WEEKSINYEAR,59190, HID_DATABROWSE_HEADER,38785, -HID_DATAPILOT_SERVICE,58997, HID_DATA_NAVIGATOR_WIN,38107, HID_DBPATH_CTL_PATH,35153, HID_DBPATH_HEADERBAR,35154, @@ -5038,10 +5037,6 @@ sc_CheckBox_RID_SCPAGE_CALC_BTN_LOOKUP,957252627, sc_CheckBox_RID_SCPAGE_CALC_BTN_MATCH,957252626, sc_CheckBox_RID_SCPAGE_CALC_BTN_REGEX,957252628, sc_Edit_RID_SCDLG_CHANGES_ED_ASSIGN,2568898575, -sc_Edit_RID_SCDLG_DAPISERVICE_ED_NAME,1495336973, -sc_Edit_RID_SCDLG_DAPISERVICE_ED_PASSWD,1495336977, -sc_Edit_RID_SCDLG_DAPISERVICE_ED_SOURCE,1495336971, -sc_Edit_RID_SCDLG_DAPISERVICE_ED_USER,1495336975, sc_Edit_RID_SCPAGE_CALC_ED_EPS,957253637, sc_FloatingWindow_RID_SCDLG_TEAM,231304704, sc_ImageButton_FID_FUNCTION_BOX_IMB_INSERT,3651284481, @@ -5049,7 +5044,6 @@ sc_ImageButton_RID_SCDLG_CHANGES_RB_ASSIGN,2568908304, sc_ListBox_FID_FUNCTION_BOX_CB_CAT,3651276289, sc_ListBox_FID_FUNCTION_BOX_DDLB_FUNC,3651276291, sc_ListBox_FID_FUNCTION_BOX_LB_FUNC,3651276290, -sc_ListBox_RID_SCDLG_DAPISERVICE_LB_SERVICE,1495338505, sc_ListBox_RID_SCDLG_MOVETAB_LB_DEST,1493454338, sc_ListBox_RID_SCDLG_MOVETAB_LB_INSERT,1493454340, sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT1,956435972, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - bridges/source external/nss
bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx |4 ++-- external/nss/ExternalProject_nss.mk |2 ++ external/nss/nss-ios.patch| 11 +++ 3 files changed, 15 insertions(+), 2 deletions(-) New commits: commit 142d527a6be9d21631253477cf06c03f54657ef9 Author: Tor Lillqvist t...@collabora.com Date: Wed Aug 13 20:07:27 2014 +0300 Make NSS build also as 64-bit ARM code for iOS Change-Id: I03cda6ca1886a3cfad87cc438282eeea8c2a5299 diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 3bf851b..9bff2c5 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -61,6 +61,8 @@ else # OS!=WNT $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_ExternalProject_run,build,\ $(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \ + $(if $(filter IOS,$(OS)),\ + $(if $(filter arm64,$(CC)),USE_64=1)) \ $(if $(filter MACOSX,$(OS)),\ $(if $(filter-out POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \ $(if $(filter-out 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),NSS_USE_SYSTEM_SQLITE=1)) \ diff --git a/external/nss/nss-ios.patch b/external/nss/nss-ios.patch index 8e883f9..0601573 100644 --- a/external/nss/nss-ios.patch +++ b/external/nss/nss-ios.patch @@ -77,6 +77,17 @@ endif MKDEPEND_DIR= $(CORE_DEPTH)/coreconf/mkdepend +--- a/a/nspr/pr/include/md/_darwin.h a/a/nspr/pr/include/md/_darwin.h +@@ -26,6 +26,8 @@ + #define _PR_SI_ARCHITECTURE ppc + #elif defined(__arm__) + #define _PR_SI_ARCHITECTURE arm ++#elif defined(__arm64__) ++#define _PR_SI_ARCHITECTURE arm64 + #else + #error Unknown CPU architecture + #endif --- a/a/nspr/pr/src/Makefile.in +++ a/a/nspr/pr/src/Makefile.in @@ -180,7 +180,7 @@ commit 1f14417bb0418adcdb267632f064ccde151792af Author: Tor Lillqvist t...@collabora.com Date: Wed Aug 13 20:05:52 2014 +0300 Clearly we should be moving 64 bit values here Change-Id: Ide34abab9417b849ea58aafab386e13e67d240be diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx index 788b98e..6639814 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx @@ -253,7 +253,7 @@ static void cpp_call( // push this void * pAdjustedThisPtr = reinterpret_cast void ** (pThis-getCppI()) + aVtableSlot.offset; -INSERT_INT32( pAdjustedThisPtr, nGPR, pGPR, pStack ); +INSERT_INT64( pAdjustedThisPtr, nGPR, pGPR, pStack ); // stack space // args @@ -339,7 +339,7 @@ static void cpp_call( // no longer needed TYPELIB_DANGER_RELEASE( pParamTypeDescr ); } -INSERT_INT32( (pCppArgs[nPos]), nGPR, pGPR, pStack ); +INSERT_INT64( (pCppArgs[nPos]), nGPR, pGPR, pStack ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Insert Bug version 4.0.3.4
On Wed, Aug 13, 2014 at 8:32 AM, Domenik Hein domenik.h...@ubm.de wrote: I'm using version 4.0.3.4 on windows 7 x 64 LibreOffice Calc When I'm clicking a cell and then move the cursor into the text field [...] Hi Domenik, This is the LibreOffice mailing list for discussing development, code patches, etc. If you're experiencing a problem with LibreOffice, I suggest that you take a look at our community support resources: https://www.libreoffice.org/get-help/community-support/ If you think that you've found a bug in LibreOffice, please feel free to file a report: https://www.libreoffice.org/get-help/bug As a quick note, v4.0.3 is a bit out of date. Current builds of LibreOffice 4.3 and 4.2 are available here: https://www.libreoffice.org/download/ Best, --R -- Robinson Tryon QA Engineer - The Document Foundation Volunteer Coordinator - LibreOffice Community Outreach qu...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xestream.cxx |2 +-
sc/source/filter/excel/xeview.cxx|2 +-
sc/source/filter/excel/xihelper.cxx |2 +-
sc/source/filter/excel/xladdress.cxx | 18 +-
sc/source/filter/inc/xladdress.hxx | 16 ++--
5 files changed, 26 insertions(+), 14 deletions(-)
New commits:
commit 03889338f65ece7cac8e881b883db454e95e8fd7
Author: Takeshi Abe t...@fixedpoint.jp
Date: Thu Aug 14 02:00:31 2014 +0900
fdo#75757: remove inheritance to std::vector
Change-Id: I265d3a51a4eabee734e7ac15841f56bcae0807e4
Reviewed-on: https://gerrit.libreoffice.org/10916
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sc/source/filter/excel/xestream.cxx
b/sc/source/filter/excel/xestream.cxx
index 7aaf648..6f36440 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -788,7 +788,7 @@ OString XclXmlUtils::ToOString( const XclRange rRange )
OString XclXmlUtils::ToOString( const XclRangeList rRanges )
{
ScRangeList aRanges;
-for( XclRangeList::const_iterator i = rRanges.begin(), end = rRanges.end();
+for( XclRangeVector::const_iterator i = rRanges.begin(), end =
rRanges.end();
i != end; ++i )
{
aRanges.Append( lcl_ToRange( *i ) );
diff --git a/sc/source/filter/excel/xeview.cxx
b/sc/source/filter/excel/xeview.cxx
index 82d69ef..5e5ded5 100644
--- a/sc/source/filter/excel/xeview.cxx
+++ b/sc/source/filter/excel/xeview.cxx
@@ -208,7 +208,7 @@ XclExpSelection::XclExpSelection( const XclTabViewData
rData, sal_uInt8 nPane )
// find the cursor position in the selection list (or add it)
XclRangeList rXclSel = maSelData.maXclSelection;
bool bFound = false;
-for( XclRangeList::const_iterator aIt = rXclSel.begin(), aEnd =
rXclSel.end(); !bFound (aIt != aEnd); ++aIt )
+for( XclRangeVector::const_iterator aIt = rXclSel.begin(), aEnd =
rXclSel.end(); !bFound (aIt != aEnd); ++aIt )
if( (bFound = aIt-Contains( maSelData.maXclCursor )) == true )
maSelData.mnCursorIdx = static_cast sal_uInt16 ( aIt -
rXclSel.begin() );
/* Cursor cell not found in list? (e.g. inactive pane, or removed in
diff --git a/sc/source/filter/excel/xihelper.cxx
b/sc/source/filter/excel/xihelper.cxx
index 0af9836..7e95368 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -125,7 +125,7 @@ void XclImpAddressConverter::ConvertRangeList( ScRangeList
rScRanges,
const XclRangeList rXclRanges, SCTAB nScTab, bool bWarn )
{
rScRanges.RemoveAll();
-for( XclRangeList::const_iterator aIt = rXclRanges.begin(), aEnd =
rXclRanges.end(); aIt != aEnd; ++aIt )
+for( XclRangeVector::const_iterator aIt = rXclRanges.begin(), aEnd =
rXclRanges.end(); aIt != aEnd; ++aIt )
{
ScRange aScRange( ScAddress::UNINITIALIZED );
if( ConvertRange( aScRange, *aIt, nScTab, nScTab, bWarn ) )
diff --git a/sc/source/filter/excel/xladdress.cxx
b/sc/source/filter/excel/xladdress.cxx
index 0fec068..c73618b 100644
--- a/sc/source/filter/excel/xladdress.cxx
+++ b/sc/source/filter/excel/xladdress.cxx
@@ -72,9 +72,9 @@ void XclRange::Write( XclExpStream rStrm, bool bCol16Bit )
const
XclRange XclRangeList::GetEnclosingRange() const
{
XclRange aXclRange;
-if( !empty() )
+if( !mRanges.empty() )
{
-const_iterator aIt = begin(), aEnd = end();
+XclRangeVector::const_iterator aIt = mRanges.begin(), aEnd =
mRanges.end();
aXclRange = *aIt;
for( ++aIt; aIt != aEnd; ++aIt )
{
@@ -94,29 +94,29 @@ void XclRangeList::Read( XclImpStream rStrm, bool
bCol16Bit, sal_uInt16 nCountI
nCount = nCountInStream;
else
rStrm nCount;
-size_t nOldSize = size();
-resize( nOldSize + nCount );
-for( iterator aIt = begin() + nOldSize; rStrm.IsValid() (nCount 0);
--nCount, ++aIt )
+size_t nOldSize = mRanges.size();
+mRanges.resize( nOldSize + nCount );
+for( XclRangeVector::iterator aIt = mRanges.begin() + nOldSize;
rStrm.IsValid() (nCount 0); --nCount, ++aIt )
aIt-Read( rStrm, bCol16Bit );
}
void XclRangeList::Write( XclExpStream rStrm, bool bCol16Bit, sal_uInt16
nCountInStream ) const
{
-WriteSubList( rStrm, 0, size(), bCol16Bit, nCountInStream );
+WriteSubList( rStrm, 0, mRanges.size(), bCol16Bit, nCountInStream );
}
void XclRangeList::WriteSubList( XclExpStream rStrm, size_t nBegin, size_t
nCount, bool bCol16Bit,
sal_uInt16 nCountInStream ) const
{
-OSL_ENSURE( nBegin = size(), XclRangeList::WriteSubList - invalid start
position );
-size_t nEnd = ::std::min size_t ( nBegin + nCount, size() );
+OSL_ENSURE( nBegin = mRanges.size(), XclRangeList::WriteSubList -
invalid start position );
+size_t nEnd = ::std::min size_t ( nBegin + nCount, mRanges.size() );
if (!nCountInStream)
{
sal_uInt16 nXclCount
[Bug 75757] remove inheritance to std::map and std::vector
https://bugs.freedesktop.org/show_bug.cgi?id=75757 --- Comment #22 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Takeshi Abe committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=03889338f65ece7cac8e881b883db454e95e8fd7 fdo#75757: remove inheritance to std::vector The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/sidebar/area/AreaPropertyPanel.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 7659d1b6330631c6bd3e6a83006865708b905da5 Author: Tor Lillqvist t...@collabora.com Date: Wed Aug 13 20:37:26 2014 +0300 WaE: C4245: signed/unsigned mismatch Change-Id: I070123efc658484a54800743cdd447a1cd2f89d3 diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index ac7cafd..885a408 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -64,7 +64,7 @@ AreaPropertyPanel::AreaPropertyPanel( const cssu::Referencecss::frame::XFrame rxFrame, SfxBindings* pBindings) : PanelLayout(pParent, AreaPropertyPanel, svx/ui/sidebararea.ui, rxFrame), - meLastXFS(-1), + meLastXFS(static_castsal_uInt16(-1)), maLastColor(Color(COL_DEFAULT_SHAPE_FILLING)), mnLastPosGradient(0), mnLastPosHatch(0), @@ -808,7 +808,7 @@ void AreaPropertyPanel::NotifyItemUpdate( mpLbFillAttr-Disable(); mpLbFillAttr-SetNoSelection(); mpToolBoxColor-Hide(); -meLastXFS = -1; +meLastXFS = static_castsal_uInt16(-1); mpStyleItem.reset(); } @@ -841,7 +841,7 @@ void AreaPropertyPanel::NotifyItemUpdate( mpLbFillAttr-Disable(); mpLbFillAttr-SetNoSelection(); mpToolBoxColor-Hide(); -meLastXFS = -1; +meLastXFS = static_castsal_uInt16(-1); mpStyleItem.reset(); break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
On the use of C++ exception handling
Dear all, I've been investigating the use of C++ exception handling constructs in open-source C++ projects (including LibreOffice). Currently, I am conducting a survey on this subject and I would really appreciate if you could contribute to this research by answering a few questions. The survey is available on-line: https://pt.surveymonkey.com/s/exceptionHandling All the best, Rodrigo.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - writerfilter/source
writerfilter/source/ooxml/model.xml|4 +---
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 13 +
2 files changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 487c48b8b5369df224657b3ceb745102747c2163
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Aug 13 19:55:24 2014 +0200
Remove unused action element
There are other action elements directly under resource, those are
used, but not this one.
Change-Id: Iba0f844230fa91fc33ff3b1f2a40a651819fa2cb
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 8baefe1..23fcf9b 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -18897,9 +18897,7 @@
element name=proofErr tokenid=ooxml:EG_RunLevelElts_proofErr/
element name=permStart tokenid=ooxml:EG_RunLevelElts_permStart/
element name=permEnd tokenid=ooxml:EG_RunLevelElts_permEnd/
- element name=ins tokenid=ooxml:EG_RunLevelElts_ins
-action name=newProperty id=ooxml:ins value=1/
- /element
+ element name=ins tokenid=ooxml:EG_RunLevelElts_ins/
element name=del tokenid=ooxml:EG_RunLevelElts_del/
element name=moveFrom tokenid=ooxml:EG_RunLevelElts_moveFrom/
element name=moveTo tokenid=ooxml:EG_RunLevelElts_moveTo/
commit 4dd5338f3836a0ed8b72f47bf90929fb376ea04e
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Aug 13 19:52:25 2014 +0200
RTF import: let SHPRW == 4 imply ooxml:EG_WrapType_wrapTight
This does not have an effect on the resulting document yet, but handling
tight properly is necessary to support wrap polygons in the future.
Change-Id: Iff057a1f9aff792b9c0ad5e601f2024bc60383cf
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 67a6710..431ab54 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -897,15 +897,15 @@ int RTFDocumentImpl::resolvePict(bool const bInline,
uno::Referencedrawing::XSh
sal_Int32 nWrap = -1;
for (RTFSprms::Iterator_t i = m_aStates.top().aCharacterSprms.begin();
i != m_aStates.top().aCharacterSprms.end(); ++i)
{
-if (i-first == NS_ooxml::LN_EG_WrapType_wrapNone)
+if (i-first == NS_ooxml::LN_EG_WrapType_wrapNone || i-first ==
NS_ooxml::LN_EG_WrapType_wrapTight)
{
-nWrap = NS_ooxml::LN_EG_WrapType_wrapNone;
+nWrap = i-first;
aAnchorSprms.set(i-first, i-second);
}
}
RTFValue::Pointer_t pAnchorWrapValue(new
RTFValue(aAnchorWrapAttributes));
aAnchorSprms.set(NS_ooxml::LN_CT_Anchor_extent, pExtentValue);
-if (aAnchorWrapAttributes.size() nWrap !=
NS_ooxml::LN_EG_WrapType_wrapNone)
+if (aAnchorWrapAttributes.size() nWrap == -1)
aAnchorSprms.set(NS_ooxml::LN_EG_WrapType_wrapSquare,
pAnchorWrapValue);
// See OOXMLFastContextHandler::positionOffset(), we can't just put
offset values in an RTFValue.
@@ -3956,7 +3956,11 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
break;
}
RTFValue::Pointer_t pValue(new RTFValue(nValue));
-
m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_WrapSquare_wrapText,
pValue);
+RTFValue::Pointer_t pTight =
m_aStates.top().aCharacterSprms.find(NS_ooxml::LN_EG_WrapType_wrapTight);
+if (pTight)
+pTight-getAttributes().set(NS_ooxml::LN_CT_WrapTight_wrapText,
pValue);
+else
+
m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_WrapSquare_wrapText,
pValue);
}
break;
case RTF_SHPWR:
@@ -3975,6 +3979,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
break;
case 4:
m_aStates.top().aShape.nWrap =
com::sun::star::text::WrapTextMode_PARALLEL;
+
m_aStates.top().aCharacterSprms.set(NS_ooxml::LN_EG_WrapType_wrapTight,
RTFValue::Pointer_t(new RTFValue()));
break;
case 5:
m_aStates.top().aShape.nWrap =
com::sun::star::text::WrapTextMode_THROUGHT;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/model.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 84abae8c5253b1d87740a9db6eba6bbaa444c3a0 Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Aug 13 20:29:00 2014 +0200 Sync oox - writerfilter alias for relationships See 656ab07b2924dd2703f31f460c8586c375c7878a (Sync oox - writerfilter alias for wordprocessingml, 2014-08-10). Change-Id: Iaa28855fbef836768a21d5b3153a1d5c2cd0d685 diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 23fcf9b..7eda0a6 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -18,8 +18,8 @@ -- model xmlns:rng=http://relaxng.org/ns/structure/1.0; namespace-alias name=http://www.w3.org/XML/1998/namespace; alias=xml/ - namespace-alias name=http://schemas.openxmlformats.org/officeDocument/2006/relationships; alias=relationships/ - namespace-alias name=http://purl.oclc.org/ooxml/officeDocument/relationships; alias=relationships/ + namespace-alias name=http://schemas.openxmlformats.org/officeDocument/2006/relationships; alias=officeRel/ + namespace-alias name=http://purl.oclc.org/ooxml/officeDocument/relationships; alias=officeRel/ namespace-alias name=urn:schemas-microsoft-com:office:office alias=office/ namespace-alias name=http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme; alias=theme/ namespace-alias name=http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing; alias=wordprocessingDrawing/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/openssl
external/openssl/UnpackedTarball_openssl.mk |1
external/openssl/openssl-1.0.1h-win64.patch.1 | 47 ++
2 files changed, 48 insertions(+)
New commits:
commit 38f259e79cb2784834f1f5d4ea196f46826c5164
Author: Thomas Arnhold tho...@arnhold.org
Date: Sun Aug 10 04:08:27 2014 +0200
win64: make openssl work
fix windows style path separator to unix style, needed for cygwin.
Change-Id: I4de78d6901378644857c28a59467b59ef886f47b
Reviewed-on: https://gerrit.libreoffice.org/10855
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/external/openssl/UnpackedTarball_openssl.mk
b/external/openssl/UnpackedTarball_openssl.mk
index 8c3f419..98844b9 100644
--- a/external/openssl/UnpackedTarball_openssl.mk
+++ b/external/openssl/UnpackedTarball_openssl.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,openssl,\
$(if $(filter WNTGCC,$(OS)$(COM)),external/openssl/opensslmingw.patch) \
$(if $(filter MSC,$(COM)),external/openssl/opensslwnt.patch) \
$(if $(filter
MSC,$(COM)),external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1) \
+ $(if $(filter
MSC,$(COM)),external/openssl/openssl-1.0.1h-win64.patch.1) \
$(if $(filter SOLARIS,$(OS)),external/openssl/opensslsol.patch) \
$(if $(filter IOS,$(OS)),external/openssl/opensslios.patch) \
$(if $(filter
MACOSXPOWERPC,$(OS)$(CPUNAME)),external/openssl/opensslosxppc.patch) \
diff --git a/external/openssl/openssl-1.0.1h-win64.patch.1
b/external/openssl/openssl-1.0.1h-win64.patch.1
new file mode 100644
index 000..aea9146
--- /dev/null
+++ b/external/openssl/openssl-1.0.1h-win64.patch.1
@@ -0,0 +1,47 @@
+diff --git a/ms/do_win64a.bat b/ms/do_win64a.bat
+index 8768dc6..6772390 100755
+--- a/ms/do_win64a.bat
b/ms/do_win64a.bat
+@@ -1,19 +1,19 @@
+-perl util\mkfiles.pl MINFO
++perl util/mkfiles.pl MINFO
+
+ cmd /c nasm -f win64 -v NUL 21
+ if %errorlevel% neq 0 goto ml64
+
+-perl ms\uplink-x86_64.pl nasm ms\uptable.asm
+-nasm -f win64 -o ms\uptable.obj ms\uptable.asm
++perl ms/uplink-x86_64.pl nasm ms/uptable.asm
++nasm -f win64 -o ms/uptable.obj ms/uptable.asm
+ goto proceed
+
+ :ml64
+-perl ms\uplink-x86_64.pl masm ms\uptable.asm
+-ml64 -c -Foms\uptable.obj ms\uptable.asm
++perl ms/uplink-x86_64.pl masm ms/uptable.asm
++ml64 -c -Foms/uptable.obj ms/uptable.asm
+
+ :proceed
+-perl util\mk1mf.pl VC-WIN64A ms\nt.mak
+-perl util\mk1mf.pl dll VC-WIN64A ms\ntdll.mak
++perl util/mk1mf.pl VC-WIN64A ms/nt.mak
++perl util/mk1mf.pl dll VC-WIN64A ms/ntdll.mak
+
+-perl util\mkdef.pl 32 libeay ms\libeay32.def
+-perl util\mkdef.pl 32 ssleay ms\ssleay32.def
++perl util/mkdef.pl 32 libeay ms/libeay32.def
++perl util/mkdef.pl 32 ssleay ms/ssleay32.def
+diff --git a/util/mk1mf.pl b/util/mk1mf.pl
+index 72fa089..d98def1 100755
+--- a/util/mk1mf.pl
b/util/mk1mf.pl
+@@ -233,6 +233,9 @@ else
+ $cflags.=' -DTERMIO';
+ }
+
++# force unix style path separator
++${o} = /;
++
+ $fipsdir =~ s/\//${o}/g;
+
+ $out_dir=(defined($VARS{'OUT'}))?$VARS{'OUT'}:$out_def.($debug?.dbg:);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 45618] Implement 3d slideshow transition framework also for windows
https://bugs.freedesktop.org/show_bug.cgi?id=45618 Markus Mohrhard markus.mohrh...@googlemail.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED Assignee|libreoffice-b...@lists.free |markus.mohrhard@googlemail. |desktop.org |com --- Comment #10 from Markus Mohrhard markus.mohrh...@googlemail.com --- This has been implemented and seems to be working correctly. I'll open a new easy hack to go through the code and switch to modern (2.0+) OpenGL. At least the efforts will benefit Windows and Linux from now on. -- 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 82577] New: get rid of prex.h / postx.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82577 Priority: medium Bug ID: 82577 CC: libreoffice@lists.freedesktop.org Assignee: libreoffice-b...@lists.freedesktop.org Summary: get rid of prex.h / postx.h wrapper headers Severity: normal Classification: Unclassified OS: Linux (All) Reporter: mst...@redhat.com Hardware: Other Status: NEW Version: Inherited From OOo Component: Libreoffice Product: LibreOffice includes of X11 headers in LO are wrapped with #include prex.h and #include postx.h this is because old LO code, especially in tools and vcl, defines types that have the same names as X11 types, so the headers do a bunch of stupid macro hackery to rename the X11 types so they don't collide with LO types. it would be obviously much simpler if the LO types simply had names that don't collide with X11 types. git grep or ctags or opengrok.libreoffice.org should find the definitions of types in LO that are re-defined in the wrapper headers. there are several ways to clean up collisions: 1) if there is no equivalent in LO of the redefined type, it can just be removed from the wrapper header 2) in some cases it can be avoided to have the X11 type and the LO type visible in the same LO source file by not including both the defining LO and X11 headers 3) if the X11 type is not a macro, then putting the LO type into a namespace and namespace-qualifying the uses should avoid the collisions 4) if the X11 type is a macro, then adding a namespace prefix to the LO type is probably required -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/ui/dbgui/scuiasciiopt.cxx | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
New commits:
commit e11d89ce6404194f7d38c1e8e8f7af62297ca91b
Author: David Tardon dtar...@redhat.com
Date: Wed Aug 13 16:50:56 2014 +0200
fdo#82418 prefer UTF-8 over UTF-16
Change-Id: Id2c990d24dc942a6d061146ea88cf53ee29a1c3d
(cherry picked from commit a8525fe5cf2ba834ae39e7bfe078911d94957a70)
Reviewed-on: https://gerrit.libreoffice.org/10913
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 9d6cb86..6fa864d 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -390,8 +390,19 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent, const
OUString aDatName,
// Insert one SYSTEM entry for compatibility in AsciiOptions and system
// independent document linkage.
pLbCharSet-InsertTextEncoding( RTL_TEXTENCODING_DONTKNOW, aCharSetUser );
-pLbCharSet-SelectTextEncoding( ePreselectUnicode ==
RTL_TEXTENCODING_DONTKNOW ?
-osl_getThreadTextEncoding() : ePreselectUnicode );
+if ( ePreselectUnicode == RTL_TEXTENCODING_DONTKNOW )
+{
+rtl_TextEncoding eSystemEncoding = osl_getThreadTextEncoding();
+// Prefer UTF-8, as UTF-16 would have already been detected from the
stream.
+// This gives a better chance that the file is going to be opened
correctly.
+if ( ( eSystemEncoding == RTL_TEXTENCODING_UNICODE ) mpDatStream )
+eSystemEncoding = RTL_TEXTENCODING_UTF8;
+pLbCharSet-SelectTextEncoding( eSystemEncoding );
+}
+else
+{
+pLbCharSet-SelectTextEncoding( ePreselectUnicode );
+}
if( nCharSet = 0 ePreselectUnicode == RTL_TEXTENCODING_DONTKNOW )
pLbCharSet-SelectEntryPos( static_castsal_uInt16(nCharSet) );
___
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-1' - vcl/source
vcl/source/filter/igif/decode.cxx | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 1fb8c4dbd504cbacf748ec4564370ba5250834c0
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 13 09:12:26 2014 +0100
valgrind + bff: don't add 0x oldcode
Invalid read of size 1
at 0x9DC6247: GIFLZWDecompressor::AddToTable(unsigned short, unsigned
short) (decode.cxx:117)
Reviewed-on: https://gerrit.libreoffice.org/10905
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
(cherry picked from commit 5ae1557de992382ad945d61102326d5a61b6850a)
Change-Id: I9cea8dcd4a5eeaa1e793b9be96f82854b9d088af
Reviewed-on: https://gerrit.libreoffice.org/10911
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/vcl/source/filter/igif/decode.cxx
b/vcl/source/filter/igif/decode.cxx
index f53c005..85b417c 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -156,10 +156,13 @@ bool GIFLZWDecompressor::ProcessOneCode()
}
else if ( ( nCode nEOICode ) ( nCode = nTableSize ) )
{
-if ( nCode == nTableSize )
-AddToTable( nOldCode, nOldCode );
-else
-AddToTable( nOldCode, nCode );
+if ( nOldCode != 0x )
+{
+if ( nCode == nTableSize )
+AddToTable( nOldCode, nOldCode );
+else
+AddToTable( nOldCode, nCode );
+}
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 82579] New: get rid of premac.h / postmac.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82579 Priority: medium Bug ID: 82579 CC: libreoffice@lists.freedesktop.org Assignee: libreoffice-b...@lists.freedesktop.org Summary: get rid of premac.h / postmac.h wrapper headers Severity: normal Classification: Unclassified OS: Mac OS X (All) Reporter: mst...@redhat.com Hardware: Other Status: NEW Version: Inherited From OOo Component: Libreoffice Product: LibreOffice includes of Mac OS X headers in LO are wrapped with #include premac.h and #include postmac.h this is because old LO code, especially in tools and vcl, defines types that have the same names as Mac OS X types, so the headers do a bunch of stupid macro hackery to rename the Mac OS X types so they don't collide with LO types. it would be obviously much simpler if the LO types simply had names that don't collide with Mac OS X types. git grep or ctags or opengrok.libreoffice.org should find the definitions of types in LO that are re-defined in the wrapper headers. there are several ways to clean up collisions: 1) if there is no equivalent in LO of the redefined type, it can just be removed from the wrapper header 2) in some cases it can be avoided to have the Mac OS X type and the LO type visible in the same LO source file by not including both the defining LO and Mac OS X headers 3) if the Mac OS X type is not a macro, then putting the LO type into a namespace and namespace-qualifying the uses should avoid the collisions 4) if the Mac OS X type is a macro, then adding a namespace-like prefix to the LO type is probably required -- 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 82580] New: get rid of prewin.h / postwin.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82580 Priority: medium Bug ID: 82580 CC: libreoffice@lists.freedesktop.org Assignee: libreoffice-b...@lists.freedesktop.org Summary: get rid of prewin.h / postwin.h wrapper headers Severity: normal Classification: Unclassified OS: Windows (All) Reporter: mst...@redhat.com Hardware: Other Status: NEW Version: Inherited From OOo Component: Libreoffice Product: LibreOffice includes of Win32 headers in LO are wrapped with #include prewin.h and #include postwin.h this is because old LO code, especially in tools and vcl, defines types that have the same names as Win32 types, so the headers do a bunch of stupid macro hackery to rename the Win32 types so they don't collide with LO types. it would be obviously much simpler if the LO types simply had names that don't collide with Win32 types. git grep or ctags or opengrok.libreoffice.org should find the definitions of types in LO that are re-defined in the wrapper headers. there are several ways to clean up collisions: 1) if there is no equivalent in LO of the redefined type, it can just be removed from the wrapper header 2) in some cases it can be avoided to have the Win32 type and the LO type visible in the same LO source file by not including both the defining LO and Win32 headers 3) if the Win32 type is not a macro, then putting the LO type into a namespace and namespace-qualifying the uses should avoid the collisions 4) if the Win32 type is a macro, then adding a namespace-like prefix to the LO type is probably required -- 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 82580] get rid of prewin.h / postwin.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82580 Michael Stahl mst...@redhat.com changed: What|Removed |Added Whiteboard||EasyHack DifficultyBeginner ||SkillCpp TopicCleanup -- 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 82577] get rid of prex.h / postx.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82577 Michael Stahl mst...@redhat.com changed: What|Removed |Added Whiteboard||EasyHack DifficultyBeginner ||SkillCpp TopicCleanup -- 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 82579] get rid of premac.h / postmac.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82579 Michael Stahl mst...@redhat.com changed: What|Removed |Added Whiteboard||EasyHack DifficultyBeginner ||SkillCpp TopicCleanup -- 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: sw/qa
sw/qa/python/check_table.py | 248 ++-- 1 file changed, 124 insertions(+), 124 deletions(-) New commits: commit 0cddb93eb4dda90b646fe099c44cd1f6bc8645f4 Author: Thomas Arnhold tho...@arnhold.org Date: Wed Aug 13 22:23:28 2014 +0200 check_table.py: use assertEqual() To fix DeprecationWarning: Please use assertEqual instead. Change-Id: Iae7cb50dd968d055b106e35baa7eee526a50bf6d diff --git a/sw/qa/python/check_table.py b/sw/qa/python/check_table.py index 2760e7c..9ec6187 100644 --- a/sw/qa/python/check_table.py +++ b/sw/qa/python/check_table.py @@ -32,43 +32,43 @@ class CheckTable(unittest.TestCase): border = xTable.getPropertyValue(TableBorder) self.assertTrue(border.IsTopLineValid) -self.assertEquals(0, border.TopLine.InnerLineWidth) -self.assertEquals(2, border.TopLine.OuterLineWidth) -self.assertEquals(0, border.TopLine.LineDistance) -self.assertEquals(0, border.TopLine.Color) +self.assertEqual(0, border.TopLine.InnerLineWidth) +self.assertEqual(2, border.TopLine.OuterLineWidth) +self.assertEqual(0, border.TopLine.LineDistance) +self.assertEqual(0, border.TopLine.Color) self.assertTrue(border.IsBottomLineValid) -self.assertEquals(0, border.BottomLine.InnerLineWidth) -self.assertEquals(2, border.BottomLine.OuterLineWidth) -self.assertEquals(0, border.BottomLine.LineDistance) -self.assertEquals(0, border.BottomLine.Color) +self.assertEqual(0, border.BottomLine.InnerLineWidth) +self.assertEqual(2, border.BottomLine.OuterLineWidth) +self.assertEqual(0, border.BottomLine.LineDistance) +self.assertEqual(0, border.BottomLine.Color) self.assertTrue(border.IsLeftLineValid) -self.assertEquals(0, border.LeftLine.InnerLineWidth) -self.assertEquals(2, border.LeftLine.OuterLineWidth) -self.assertEquals(0, border.LeftLine.LineDistance) -self.assertEquals(0, border.LeftLine.Color) +self.assertEqual(0, border.LeftLine.InnerLineWidth) +self.assertEqual(2, border.LeftLine.OuterLineWidth) +self.assertEqual(0, border.LeftLine.LineDistance) +self.assertEqual(0, border.LeftLine.Color) self.assertTrue(border.IsRightLineValid) -self.assertEquals(0, border.RightLine.InnerLineWidth) -self.assertEquals(2, border.RightLine.OuterLineWidth) -self.assertEquals(0, border.RightLine.LineDistance) -self.assertEquals(0, border.RightLine.Color) +self.assertEqual(0, border.RightLine.InnerLineWidth) +self.assertEqual(2, border.RightLine.OuterLineWidth) +self.assertEqual(0, border.RightLine.LineDistance) +self.assertEqual(0, border.RightLine.Color) self.assertTrue(border.IsHorizontalLineValid) -self.assertEquals(0, border.HorizontalLine.InnerLineWidth) -self.assertEquals(2, border.HorizontalLine.OuterLineWidth) -self.assertEquals(0, border.HorizontalLine.LineDistance) -self.assertEquals(0, border.HorizontalLine.Color) +self.assertEqual(0, border.HorizontalLine.InnerLineWidth) +self.assertEqual(2, border.HorizontalLine.OuterLineWidth) +self.assertEqual(0, border.HorizontalLine.LineDistance) +self.assertEqual(0, border.HorizontalLine.Color) self.assertTrue(border.IsVerticalLineValid) -self.assertEquals(0, border.VerticalLine.InnerLineWidth) -self.assertEquals(2, border.VerticalLine.OuterLineWidth) -self.assertEquals(0, border.VerticalLine.LineDistance) -self.assertEquals(0, border.VerticalLine.Color) +self.assertEqual(0, border.VerticalLine.InnerLineWidth) +self.assertEqual(2, border.VerticalLine.OuterLineWidth) +self.assertEqual(0, border.VerticalLine.LineDistance) +self.assertEqual(0, border.VerticalLine.Color) self.assertTrue(border.IsDistanceValid) -self.assertEquals(97, border.Distance) +self.assertEqual(97, border.Distance) # set border border.TopLine= BorderLine(0, 11, 19, 19) border.BottomLine = BorderLine(0xFF, 00, 11, 00) @@ -78,95 +78,95 @@ class CheckTable(unittest.TestCase): border = xTable.getPropertyValue(TableBorder) self.assertTrue(border.IsTopLineValid) -self.assertEquals(11, border.TopLine.InnerLineWidth) -self.assertEquals(19, border.TopLine.OuterLineWidth) -self.assertEquals(19, border.TopLine.LineDistance) -self.assertEquals(0, border.TopLine.Color) +self.assertEqual(11, border.TopLine.InnerLineWidth) +self.assertEqual(19, border.TopLine.OuterLineWidth) +self.assertEqual(19, border.TopLine.LineDistance) +self.assertEqual(0, border.TopLine.Color) self.assertTrue(border.IsBottomLineValid) -self.assertEquals(0,
[Libreoffice-commits] core.git: cui/source helpcontent2
cui/source/options/optgenrl.cxx |2 +- helpcontent2|2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit fb9927d7cbfe26215990bc8cce8f31e14bbb3c0a Author: Thomas Arnhold tho...@arnhold.org Date: Wed Aug 13 22:51:28 2014 +0200 WaE: C4245: signed/unsigned mismatch Change-Id: I91546defcc514649f9ef388838af2d40d82c7b67 diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 33177c6..c20b73b 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -66,7 +66,7 @@ namespace Lang unsigned const Russian = 2; unsigned const Eastern = 4; unsigned const US = 8; -unsigned const All = -1; +unsigned const All = static_castunsigned(-1); } diff --git a/helpcontent2 b/helpcontent2 index 1fbcc73..577577f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1fbcc737e36231426bedfdca0b172bbb90279d64 +Subproject commit 577577fd7006327a85f420360c769ca70e96b50c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - helpcontent2 oox/source sc/source
helpcontent2 |2 +-
oox/source/crypto/CryptTools.cxx |2 +-
sc/source/core/tool/formulagroup.cxx |4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit cada99ef062a5676fe27c8933fb4a585b694807c
Author: Michael Stahl mst...@redhat.com
Date: Wed Aug 13 23:00:13 2014 +0200
helpcontent2: somebody messed up the submodule again...
Change-Id: I7c7888ffcc613c1627ad2ed69db68ff64f596a85
diff --git a/helpcontent2 b/helpcontent2
index 577577f..1fbcc73 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 577577fd7006327a85f420360c769ca70e96b50c
+Subproject commit 1fbcc737e36231426bedfdca0b172bbb90279d64
commit 57c59b2466afbff92bd50daa27dbe3234fb3a192
Author: Michael Stahl mst...@redhat.com
Date: Wed Aug 13 22:49:32 2014 +0200
warning C4245 signed/unsigned mismatch
Change-Id: Ibff6c806c287a2303cdf3b1942d5d5014a73bd30
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index 997d8b7..a862b0c 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -702,8 +702,8 @@ void
FormulaGroupInterpreter::getOpenCLDeviceInfo(sal_Int32 rDeviceId, sal_Int3
#if HAVE_FEATURE_OPENCL
-size_t aDeviceId = -1;
-size_t aPlatformId = -1;
+size_t aDeviceId = static_castsize_t(-1);
+size_t aPlatformId = static_castsize_t(-1);
#ifndef DISABLE_DYNLOADING
osl::Module* pModule = getOpenCLModule();
commit c980d4970b7c19463739d6584632304f9a5d536d
Author: Michael Stahl mst...@redhat.com
Date: Wed Aug 13 22:37:21 2014 +0200
warning C4245 signed/unsigned mismatch
Change-Id: If28543252ee2265e9edd7d7963c1751bd21e754d
diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx
index 1d8a432..4e0d189 100644
--- a/oox/source/crypto/CryptTools.cxx
+++ b/oox/source/crypto/CryptTools.cxx
@@ -63,7 +63,7 @@ const EVP_CIPHER* Crypto::getCipher(CryptoType type)
#if USE_TLS_NSS
void Crypto::setupContext(vectorsal_uInt8 key, vectorsal_uInt8 iv,
CryptoType type, CK_ATTRIBUTE_TYPE operation)
{
-CK_MECHANISM_TYPE mechanism = -1;
+CK_MECHANISM_TYPE mechanism = static_castCK_ULONG(-1);
SECItem ivItem;
ivItem.type = siBuffer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/core/PageListWatcher.cxx |3 ---
sd/source/core/PageListWatcher.hxx |1 -
2 files changed, 4 deletions(-)
New commits:
commit 6ec885c9ff4f074f7b163c314cebda1da32d7057
Author: Michael Stahl mst...@redhat.com
Date: Wed Aug 13 23:09:39 2014 +0200
warning C4245 signed/unsigned mismatch
Turns out that mnVisiblePageCount is actually never read.
Change-Id: I6bded733bb551525a6143976ad4c4447a5a56773
diff --git a/sd/source/core/PageListWatcher.cxx
b/sd/source/core/PageListWatcher.cxx
index 590f8ed..77b7da9 100644
--- a/sd/source/core/PageListWatcher.cxx
+++ b/sd/source/core/PageListWatcher.cxx
@@ -29,7 +29,6 @@ void ImpPageListWatcher::ImpRecreateSortedPageListOnDemand()
maPageVectorStandard.clear();
maPageVectorNotes.clear();
mpHandoutPage = 0L;
-mnVisiblePageCount = -1;
// build up vectors again
const sal_uInt32 nPageCount(ImpGetPageCount());
@@ -44,7 +43,6 @@ void ImpPageListWatcher::ImpRecreateSortedPageListOnDemand()
case PK_STANDARD:
{
maPageVectorStandard.push_back(pCandidate);
-if (!pCandidate-IsExcluded()) mnVisiblePageCount++;
break;
}
case PK_NOTES:
@@ -69,7 +67,6 @@ ImpPageListWatcher::ImpPageListWatcher(const SdrModel rModel)
: mrModel(rModel)
, mpHandoutPage(0L)
, mbPageListValid(false)
-, mnVisiblePageCount(0)
{
}
diff --git a/sd/source/core/PageListWatcher.hxx
b/sd/source/core/PageListWatcher.hxx
index 26b3a96..9158078 100644
--- a/sd/source/core/PageListWatcher.hxx
+++ b/sd/source/core/PageListWatcher.hxx
@@ -43,7 +43,6 @@ protected:
SdPage* mpHandoutPage;
boolmbPageListValid;
-sal_uInt32 mnVisiblePageCount;
void ImpRecreateSortedPageListOnDemand();
virtual sal_uInt32 ImpGetPageCount() const = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sd/source sw/source
sd/source/ui/remotecontrol/WINNetworkService.cxx |3 +++
sw/source/core/bastyp/swregion.cxx |8 +---
2 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 288d12ba9733443c96f92c42da26edaabd831b66
Author: Michael Stahl mst...@redhat.com
Date: Wed Aug 13 23:43:00 2014 +0200
warning C4245 signed/unsigned mismatch
Change-Id: If6222d61a6c75996ce5c40b3eae7895982c49b4a
diff --git a/sw/source/core/bastyp/swregion.cxx
b/sw/source/core/bastyp/swregion.cxx
index dcd2eb3..1f57fe1 100644
--- a/sw/source/core/bastyp/swregion.cxx
+++ b/sw/source/core/bastyp/swregion.cxx
@@ -143,8 +143,9 @@ inline SwTwips CalcArea( const SwRect rRect )
// combine all adjacent rectangles
void SwRegionRects::Compress( bool bFuzzy )
{
-for ( size_type i = 0; i size(); ++i )
+for (size_type i = 0; i size(); )
{
+bool bRestart(false);
for ( size_type j = i+1; j size(); ++j )
{
// If one rectangle contains a second completely than the latter
@@ -158,7 +159,7 @@ void SwRegionRects::Compress( bool bFuzzy )
{
(*this)[i] = (*this)[j];
erase( begin() + j );
-i = -1;
+bRestart = true;
break;
}
else
@@ -180,11 +181,12 @@ void SwRegionRects::Compress( bool bFuzzy )
{
(*this)[i] = aUnion;
erase( begin() + j );
-i = -1;
+bRestart = true;
break;
}
}
}
+i = (bRestart) ? 0 : i+1;
}
}
commit d7e5ad0bb2ef455254261f2f30a13de6a948f1ed
Author: Michael Stahl mst...@redhat.com
Date: Wed Aug 13 23:38:13 2014 +0200
warning C4189 local variable initialized but not referenced
Change-Id: I6047e0fc10bb6de0009da40855a97df89904cb0c
diff --git a/sd/source/ui/remotecontrol/WINNetworkService.cxx
b/sd/source/ui/remotecontrol/WINNetworkService.cxx
index 144b33a..8f6885e 100644
--- a/sd/source/ui/remotecontrol/WINNetworkService.cxx
+++ b/sd/source/ui/remotecontrol/WINNetworkService.cxx
@@ -7,6 +7,9 @@ void sd::WINNetworkService::setup()
{
DNSServiceErrorType err = DNSServiceRegister(client, 0, 0, NULL,
kREG_TYPE, local, NULL, 1599, 1, , NULL, this );
+if (kDNSServiceErr_NoError != err)
+SAL_WARN(sdremote.wifi, DNSServiceRegister failed: err);
+
// Fail silently
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
sw/source/filter/ww8/rtfsdrexport.cxx|5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit d5642fe00cfd23d1470fa2062a93b30a612bbadd
Author: Michael Stahl mst...@redhat.com
Date: Thu Aug 14 00:01:42 2014 +0200
warning C4702: unreachable code
that's a real bug in f6e7b94042070241cd1cfb1d7f8610fe1801b4f2
Change-Id: I46b9f6000b4c5e3b4aec44d96100cb41b6a8b41e
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 30c0596..f8f2d00 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4030,8 +4030,8 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
if (SdtEndBefore == aGrabBag[nProp].Name
m_bStartedCharSdt !m_bEndCharSdt)
{
aGrabBag[nProp].Value = m_bEndCharSdt;
+break;
}
-break;
}
}
}
commit 62f9179110482b97fa0ffe3218b3e9da9644292f
Author: Michael Stahl mst...@redhat.com
Date: Wed Aug 13 23:59:24 2014 +0200
spurious warning C4189 local variable initialized but not referenced
Change-Id: I67ac7757a05dfba5724f8f73856e0a23194adaf8
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx
b/sw/source/filter/ww8/rtfsdrexport.cxx
index d8706a2..b32dae2 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -451,8 +451,9 @@ void RtfSdrExport::impl_writeGraphic()
return;
}
OString aURLBS(OUStringToOString(sGraphicURL, RTL_TEXTENCODING_UTF8));
-const char aURLBegin[] = vnd.sun.star.GraphicObject:;
-Graphic aGraphic =
GraphicObject(aURLBS.copy(RTL_CONSTASCII_LENGTH(aURLBegin))).GetTransformedGraphic();
+Graphic aGraphic = GraphicObject(
+aURLBS.copy(RTL_CONSTASCII_LENGTH(vnd.sun.star.GraphicObject:)))
+.GetTransformedGraphic();
// Export it to a stream.
SvMemoryStream aStream;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 82183] DDE()-related segfault (reproducible)
https://bugs.freedesktop.org/show_bug.cgi?id=82183 raal r...@post.cz changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #6 from raal r...@post.cz --- Tested again, I can reproduce with Version: 4.3.0.3 Build ID: 08ebe52789a201dd7d38ef653ef7a48925e7f9f7 -- 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 82476] Crash in presentation with 3D animated model
https://bugs.freedesktop.org/show_bug.cgi?id=82476 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added Status|UNCONFIRMED |NEW Keywords||have-backtrace Ever confirmed|0 |1 --- Comment #3 from Julien Nabet serval2...@yahoo.fr --- It seems linked to accessibility part. I'll give a try with accessibility option enabled. If you have some time, you can give a try with accessibility disabled. Anyway, let's put this to NEW since there's a bt. -- 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 82359] Deprecate/Drop gstreamer 0.10 support
https://bugs.freedesktop.org/show_bug.cgi?id=82359 --- Comment #5 from David Tardon dtar...@redhat.com --- (In reply to comment #4) (and build machine upgrade possibilities).. It is not as easy as that. We want the release packages to be runnable on as wide spectrum of linux systems as possible. So the base line system must be the least common denominator for various system libraries - it must be relatively old. -- 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 82370] PRINTING: can't print #10 envelope
https://bugs.freedesktop.org/show_bug.cgi?id=82370 --- Comment #5 from Jay Philips philip...@hotmail.com --- The user who reported the issue was mistaken with those words and further clarified that the 6 x 9 only showed up in the print dialog. -- 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 81787] MS Works Spreadsheet: quotes in formulas created as quot;
https://bugs.freedesktop.org/show_bug.cgi?id=81787 David Tardon dtar...@redhat.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED Assignee|libreoffice-b...@lists.free |alo...@loria.fr |desktop.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 82214] SVG image causes UI freeze when scrolling and slow export of PDF
https://bugs.freedesktop.org/show_bug.cgi?id=82214 --- Comment #12 from Jay Philips philip...@hotmail.com --- Thanks Michael for the SVG background as it will help with the regression testing i'm always doing for bugs. :) -- 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 82223] chart can not be hided after swith spreadsheet
https://bugs.freedesktop.org/show_bug.cgi?id=82223 Markus Mohrhard markus.mohrh...@googlemail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||markus.mohrhard@googlemail. ||com Ever confirmed|0 |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 76239] VIEWING: Strange symbols instead of normal ones
https://bugs.freedesktop.org/show_bug.cgi?id=76239 Ulrich Windl ulrich.wi...@rz.uni-regensburg.de changed: What|Removed |Added CC||ulrich.wi...@rz.uni-regensb ||urg.de --- Comment #21 from Ulrich Windl ulrich.wi...@rz.uni-regensburg.de --- I also discovered the bug in my LibreOffice 4.2.6.2 installation on Windows 7 (64 bit). However another Windows 7 (64 bit) installation with 4.2.6.2 also doesn't show the effect. The difference was this: The first was a new install of some 4.2 release (then updating to the current release) while the other was an update from an earlier version ( 4.2, I don't know the initially installed version, maybe 3.2 or so). Is this issue really resolved, or are there just work-arounds? -- 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 76239] VIEWING: Strange symbols instead of normal ones
https://bugs.freedesktop.org/show_bug.cgi?id=76239 --- Comment #22 from Ulrich Windl ulrich.wi...@rz.uni-regensburg.de --- Created attachment 104546 -- https://bugs.freedesktop.org/attachment.cgi?id=104546action=edit Partial Screen Shot: Examples in formula editor are badly broken due to wrong font being used -- 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 82547] New: Main drop down menu freezes libreoffice and whole system
https://bugs.freedesktop.org/show_bug.cgi?id=82547 Priority: medium Bug ID: 82547 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Main drop down menu freezes libreoffice and whole system Severity: normal Classification: Unclassified OS: Linux (All) Reporter: lee.fi...@gmail.com Hardware: x86-64 (AMD64) Status: NEW Version: 4.3.0.4 release Component: UI Product: LibreOffice Yesterday worked round a system freeze problem on libreoffice system: xubuntu 14.04 (all patches/updates applied) x64 graphics: amd (tried 2 different cards cards) processor: core 2 duo (dell 745) ram: 3gb Cause: seems to be recent documents list. Temp Resolution: clear the recent documents list (did via an extension) Other Info: most of recent documents located on samba over a vpn, vpn was active and responsive. (openvpn xubuntu stock) Libreoffice versions tested: 4.2 (xubuntu repo) and 4.3 from the fresh ppa. Description: Open a libreoffice app (i tried calc and writer), do some typing on the doc or in a cell, all seems fine. As soon as you click a menu item be it Help, Tools, Edit or File etc, the system locks / freezes for a long period of time (maybe a minute or more). You cannot tab between applications, or move between apps using the mouse. Mouse pointer does move around the screen. I recreated with a terminal visible on half the screen and top running, load goes high (2) but the cpu use is low, memory looks ok and io wait blips maybe to 0.5 but not constant. The system recovers after a period of time (say a minute, sometimes longer), and the menu appears, but as soon as you click either a menu item (or one with sub menu) or another main menu the process repeats. My efforts to find a resolution included changing the graphics card and upgrading from the stock 4.2 libreoffice supplied with xubuntu to 4.3 from the ppa. It was resolved using an addon/extension (name elludes me) which clears the recent documents list. Performance then returned to normal. The system has been working fine since it was installed in May 2014 and has always stored its documents on samba over the vpn. It is used most days for either calc or writer. VPN performance was fine and tested. -- 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 82526] UI: Database first step of dialog wizard broken on MacOs
https://bugs.freedesktop.org/show_bug.cgi?id=82526 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||ipla...@yahoo.co.uk Ever confirmed|0 |1 --- Comment #2 from Alex Thurgood ipla...@yahoo.co.uk --- Reproduced on my master 4.4.0 daily build. In addition, along with other dialogs containing text, there is a huge amount of blank space drawn with the text. These are due to the UI conversions that are ongoing - who is managing that ? -- 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 82526] UI: Database first step of dialog wizard broken on MacOs
https://bugs.freedesktop.org/show_bug.cgi?id=82526 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added CC||caol...@redhat.com, ||palenik.mih...@gmail.com --- Comment #3 from Julien Nabet serval2...@yahoo.fr --- Thank you Alex for having confirmed this one. Palenik/Caolan: could it be due to http://cgit.freedesktop.org/libreoffice/core/commit/?id=803b9cb047958ecb9ad3e61c0e29a1466f59f1e1 Convert DLG_DATABASE_WIZARD dialog to .ui ? BTW, I don't reproduce this on Linux (forget the wrong description, I had put Debian in the bug assistant forgetting I was on Mac for this one) Also, there's no error/warning message on console (I also build in debug mode on MacOs) and it's a brand new profile since I regularly do: make clean make postprocess.clean ./g pull -r make to be sure there's nothing wrong due to previous wrong things. -- 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 82549] New: Other: connection form with subform
https://bugs.freedesktop.org/show_bug.cgi?id=82549 Priority: medium Bug ID: 82549 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Other: connection form with subform Severity: normal Classification: Unclassified OS: Linux (All) Reporter: codi...@tiscalinet.it Hardware: Other Whiteboard: BSA PossibleRegression Status: UNCONFIRMED Version: 4.3.0.4 release Component: Database Product: LibreOffice Created attachment 104548 -- https://bugs.freedesktop.org/attachment.cgi?id=104548action=edit screenshot Problem description: Steps to reproduce: 1. create main form 2. create subform 3. connect subform with main form Current behavior: after you insert data in main form when you insert data in subform, it doesn't pass data automatically on columns connected with main forms Expected behavior: column connected with main forms take data from it Operating System: Linux (Other) Version: 4.3.0.4 release Last worked in: 4.2.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 82526] UI: Database first step of dialog wizard broken on MacOs
https://bugs.freedesktop.org/show_bug.cgi?id=82526 --- Comment #4 from Alex Thurgood ipla...@yahoo.co.uk --- Julien, the extra space problem also applies to at least the Java classpath archive dialog, the About dialog and others (haven't checked all of them). Currently, the about dialog takes up roughly a third of the horizontal screen estate on a 15 monitor - all of these seem related to some coordinate definition problem of the rectangle on which the text message is drawn. -- 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 82526] UI: Database first step of dialog wizard broken on MacOs
https://bugs.freedesktop.org/show_bug.cgi?id=82526 --- Comment #5 from Alex Thurgood ipla...@yahoo.co.uk --- Obviously, this is a separate problem from the lack of db wizard steps in the main dialog window - will open separate report. -- 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 82526] UI: Database first step of dialog wizard broken on MacOs
https://bugs.freedesktop.org/show_bug.cgi?id=82526 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Whiteboard|BSA PossibleRegression | Keywords||regression --- Comment #6 from Alex Thurgood ipla...@yahoo.co.uk --- However, current bug clearly a regression over 4.3 and 4.2.x -- 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 82550] UI - dialog message boxes drawn out of proportion on OSX
https://bugs.freedesktop.org/show_bug.cgi?id=82550 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Status|UNCONFIRMED |NEW Severity|critical|blocker Priority|medium |highest Keywords||regression Ever confirmed|0 |1 --- Comment #1 from Alex Thurgood ipla...@yahoo.co.uk --- Regression over 4.3 and 4.2.x -- 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 82550] New: UI - dialog message boxes drawn out of proportion on OSX
https://bugs.freedesktop.org/show_bug.cgi?id=82550 Priority: medium Bug ID: 82550 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: UI - dialog message boxes drawn out of proportion on OSX Severity: critical Classification: Unclassified OS: Mac OS X (All) Reporter: ipla...@yahoo.co.uk Hardware: x86-64 (AMD64) Status: UNCONFIRMED Version: 4.4.0.0.alpha0+ Master Component: UI Product: LibreOffice Using a more or less daily build from master, on OSX, the new dialog UI changes have caused message boxes to be incorrectly displayed, with a larger than life baox containing text that is generally right at the bottom of the rectangle and pushed to the right hand side. Apparent in at least : - Java classpath add archive dialog - About window - DB creation wizard main pane - Extension manager when clicking on a registered extension -- 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 82549] Other: connection form with subform
https://bugs.freedesktop.org/show_bug.cgi?id=82549 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE CC||serval2...@yahoo.fr --- Comment #1 from Julien Nabet serval2...@yahoo.fr --- For the test, you can give a try to daily build of master sources (future 4.4.0). If you still reproduce this problem, don't hesitate to reopen this tracker. *** This bug has been marked as a duplicate of bug 82151 *** -- 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 82430] LO 4.3.0 for Windows crashes on CPUs that do not support SSE2: Application Error soffice.bin, version 4.3.0.4, module sal3.dll, version 4.3.0.4, address 0x000268d5.
https://bugs.freedesktop.org/show_bug.cgi?id=82430 Michael Stahl mst...@redhat.com changed: What|Removed |Added CC||lohma...@gmx.de, ||mst...@redhat.com Summary|Application Error |LO 4.3.0 for Windows |soffice.bin, version|crashes on CPUs that do not |4.3.0.4, module sal3.dll, |support SSE2: Application |version 4.3.0.4, address|Error soffice.bin, version |0x000268d5. |4.3.0.4, module sal3.dll, ||version 4.3.0.4, address ||0x000268d5. --- Comment #5 from Michael Stahl mst...@redhat.com --- potential patch for this is here, don't have hardware to test it though and also nobody knows what sort of performance impact will result from not using SSE2: https://gerrit.libreoffice.org/#/c/10838/ -- 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 82430] LO 4.3.0 for Windows crashes on CPUs that do not support SSE2: Application Error soffice.bin, version 4.3.0.4, module sal3.dll, version 4.3.0.4, address 0x000268d5.
https://bugs.freedesktop.org/show_bug.cgi?id=82430 Michael Stahl mst...@redhat.com changed: What|Removed |Added Keywords||regression -- 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 82450] Other: About window much too large
https://bugs.freedesktop.org/show_bug.cgi?id=82450 Foss f...@openmailbox.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #3 from Foss f...@openmailbox.org --- setting to dupe of 82550 since that one has moe detailed info. *** This bug has been marked as a duplicate of bug 82550 *** -- 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
