LibreOffice Gerrit News for core on 2014-08-21
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + wizards: Enhancements in JavaTools.java in https://gerrit.libreoffice.org/11049 from Robert Antoni Buj i Gelonch about module wizards + wizards: EffectiveMax EffectiveMin of TINYINT in https://gerrit.libreoffice.org/11044 from Robert Antoni Buj i Gelonch about module wizards End of freshness + Resolves: fdo#82747 Crash on opening wikipedia ODT Book in https://gerrit.libreoffice.org/11050 from Julien Nabet about module starmath + Treeview may lose focus when left/right arrow is used in https://gerrit.libreoffice.org/10956 from Niklas Johansson about module svtools + java: when rethrowing exceptions, store the original cause in https://gerrit.libreoffice.org/11039 from Noel Grandin about module bean, bridges, framework, javaunohelper, jurt, qadevOOo, ridljar, scripting, xmerge, xmlsecurity * Merged changes on master for project core changed in the last 25 hours: + Remove more useless includes of tools/debug.hxx in https://gerrit.libreoffice.org/11020 from Marcos Paulo de Souza + wizards: Number parsing in https://gerrit.libreoffice.org/11041 from Robert Antoni Buj i Gelonch + fdo#75757: remove inheritance to std::vector in https://gerrit.libreoffice.org/11042 from Takeshi Abe + vcl: use enum for complex text layout constants in https://gerrit.libreoffice.org/10676 from Noel Grandin + DLG_FILTER_SELECT and DLG_SIMPLE_NAME_CLASH conversion to .ui in https://gerrit.libreoffice.org/11040 from Szymon Kłos + Convert RID_TP_GENERAL tabpage to .ui in https://gerrit.libreoffice.org/10989 from Mihály Palenik + Use COMMONS_LOGGING_VERSION vble in https://gerrit.libreoffice.org/10993 from Robert Antoni Buj i Gelonch + Fixed size of 'formula' dialog in Calc in https://gerrit.libreoffice.org/11035 from Szymon Kłos + jurt: Throwable.getCause() instead of Throwable.getTargetException() in https://gerrit.libreoffice.org/11027 from Robert Antoni Buj i Gelonch + xmerge: Convert a primitive type into a string in https://gerrit.libreoffice.org/11026 from Robert Antoni Buj i Gelonch * 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#63154: Rearrange some solar.h includes in https://gerrit.libreoffice.org/10892 from Marcos Paulo de Souza + VS2013: Make 64 bit shell extensions optional in https://gerrit.libreoffice.org/10163 from David Ostrovsky + fdo#82290: Perform write(2) and read(2) concurrently to avoid pipe deadlo in https://gerrit.libreoffice.org/10825 from Jan Holesovsky + 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 + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende + fdo#77121 Header / Footer positions not preserved after RT in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for submodules on 2014-08-21
Moin! ~~ Project dictionaries ~~ Nothing moved in the project for the last 25 hours ~~ Project translations ~~ Nothing moved in the project for the last 25 hours ~~ Project help ~~ * Open changes on master for project help changed in the last 25 hours: + Fix fdo#80338 Help pages for Data Statistics in https://gerrit.libreoffice.org/11051 from Olivier Hallot * Merged changes on master for project help changed in the last 25 hours: None * Abandoned changes on master for project help changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] Suggestion for the use of pre-written responses
Hi, Le 20/08/2014 14:35, Jay Philips a écrit : Hi All, Over the months of doing triaging, i've found that the best means of communicating with bug reporters is to have a set of pre-written responses to suit various common situations like confirming a bug, requesting a sample document, and asking for clear steps. These responses are very handy for the initial comment between me and the bug reporter, but do come in handy at other times as well, like requesting they reset their profile or send in a screencast. These responses have a simple and short format, similar to the below. If you are using Firefox you can use the extension Clippings which allow you to reuse frequently inserted text fragments. There is a version of this extension for Thunderbird too. The database of the extension is an .rdf (xml) file. Perhaps it is not too hard to merge a published database with an existing private database, and QA-team could publish such a database of pre-written answers. https://addons.mozilla.org/fr/firefox/addon/clippings/?src=search 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: wizards/com
wizards/com/sun/star/wizards/document/DatabaseControl.java |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e189fa400ec4fcafae5e3b04f054cec851f81dd8 Author: rbuj robert@gmail.com Date: Wed Aug 20 16:37:43 2014 +0200 wizards: EffectiveMax EffectiveMin of TINYINT http://docs.oracle.com/javase/1.5.0/docs/api/constant-values.html#java.lang.Byte.MIN_VALUE Change-Id: I702f1354eaddc37e6321c3cdc0126a78945d0754 Reviewed-on: https://gerrit.libreoffice.org/11044 Reviewed-by: Noel Grandin noelgran...@gmail.com Tested-by: Noel Grandin noelgran...@gmail.com diff --git a/wizards/com/sun/star/wizards/document/DatabaseControl.java b/wizards/com/sun/star/wizards/document/DatabaseControl.java index 7e98a87..6995fdc 100644 --- a/wizards/com/sun/star/wizards/document/DatabaseControl.java +++ b/wizards/com/sun/star/wizards/document/DatabaseControl.java @@ -199,8 +199,8 @@ public class DatabaseControl extends Control xPropertySet.setPropertyValue(EffectiveMin, new Double(Short.MIN_VALUE)); break; case DataType.TINYINT: -xPropertySet.setPropertyValue(EffectiveMax, new Double(127)); -xPropertySet.setPropertyValue(EffectiveMin, new Double(-128)); +xPropertySet.setPropertyValue(EffectiveMax, new Double(Byte.MAX_VALUE)); +xPropertySet.setPropertyValue(EffectiveMin, new Double(Byte.MIN_VALUE)); break; case DataType.FLOAT: case DataType.REAL: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 17 commits - comphelper/source connectivity/source filter/source forms/source include/comphelper include/unotools svtools/source svx/source unotools/source
comphelper/source/container/enumhelper.cxx | 54 +- comphelper/source/misc/numbers.cxx | 33 ++ comphelper/source/misc/sequence.cxx |8 - comphelper/source/property/property.cxx |2 comphelper/source/streaming/basicio.cxx | 38 +++ comphelper/source/streaming/oslfile2streamwrap.cxx | 50 - comphelper/source/streaming/streamsection.cxx |6 - connectivity/source/commontools/dbexception.cxx |4 connectivity/source/drivers/jdbc/CallableStatement.cxx | 52 - connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx |4 connectivity/source/drivers/jdbc/JConnection.cxx|2 connectivity/source/drivers/jdbc/JStatement.cxx |2 connectivity/source/drivers/jdbc/ResultSet.cxx |2 connectivity/source/drivers/jdbc/SQLException.cxx |8 - connectivity/source/inc/dbase/DTables.hxx |1 connectivity/source/inc/flat/ETables.hxx|1 connectivity/source/inc/java/sql/SQLException.hxx |6 - connectivity/source/inc/java/sql/SQLWarning.hxx |3 filter/source/flash/swffilter.cxx |2 filter/source/xmlfilteradaptor/streamwrap.cxx |8 - filter/source/xmlfilteradaptor/streamwrap.hxx | 13 -- forms/source/component/Button.cxx |2 forms/source/component/CheckBox.cxx |6 - forms/source/component/ComboBox.cxx |6 - forms/source/component/File.cxx |4 forms/source/component/FormComponent.cxx| 30 ++--- forms/source/component/GroupBox.cxx |4 forms/source/component/RadioButton.cxx |2 forms/source/component/RadioButton.hxx |2 forms/source/component/Time.hxx |2 forms/source/inc/FormComponent.hxx | 10 - forms/source/inc/property.hxx |6 - forms/source/xforms/submission/serialization.hxx| 10 - forms/source/xforms/submission/serialization_app_xml.cxx| 10 - forms/source/xforms/submission/serialization_app_xml.hxx|6 - forms/source/xforms/submission/serialization_urlencoded.cxx | 10 - forms/source/xforms/submission/serialization_urlencoded.hxx |6 - forms/source/xforms/submission/submission.hxx | 28 ++--- forms/source/xforms/submission/submission_get.cxx | 22 ++-- forms/source/xforms/submission/submission_get.hxx |6 - forms/source/xforms/submission/submission_post.cxx | 16 +-- forms/source/xforms/submission/submission_post.hxx |4 forms/source/xforms/submission/submission_put.cxx | 16 +-- forms/source/xforms/submission/submission_put.hxx |4 include/comphelper/basicio.hxx | 37 +++--- include/comphelper/enumhelper.hxx | 56 -- include/comphelper/numbers.hxx | 15 -- include/comphelper/oslfile2streamwrap.hxx | 27 ++--- include/comphelper/proparrhlp.hxx |7 - include/comphelper/property.hxx | 24 +--- include/comphelper/sequence.hxx | 18 +-- include/comphelper/streamsection.hxx| 13 -- include/comphelper/types.hxx| 61 +-- include/unotools/datetime.hxx | 20 +-- include/unotools/streamhelper.hxx | 24 ++-- include/unotools/streamsection.hxx | 17 +-- include/unotools/streamwrap.hxx | 64 +--- svtools/source/uno/genericunodialog.cxx |2 svx/source/xml/xmleohlp.cxx |2 unotools/source/misc/datetime.cxx | 24 ++-- unotools/source/streaming/streamhelper.cxx | 34 +++--- unotools/source/streaming/streamwrap.cxx| 48 - 62 files changed, 466 insertions(+), 538 deletions(-) New commits: commit 46bf3068de40192e0b69ef5f6ab3b2f43c71ef71 Author: Thomas Arnhold tho...@arnhold.org Date: Thu Aug 21 08:18:38 2014 +0200 remove commented out namespace aliases Change-Id: I2895204753f3302b5c7cbcce6f4d01d6bdd0694e diff --git a/connectivity/source/inc/dbase/DTables.hxx b/connectivity/source/inc/dbase/DTables.hxx index 33319f6..cccd8a2 100644 --- a/connectivity/source/inc/dbase/DTables.hxx +++ b/connectivity/source/inc/dbase/DTables.hxx @@ -26,7 +26,6 @@
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Jay Philips philip...@hotmail.com changed: What|Removed |Added Depends on||79269 --- Comment #212 from Jay Philips philip...@hotmail.com --- Adding bug 79269. ODF file isnt being saved with the footer option of having different footers on the first and other pages, resulting in dataloss. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cppcanvas/source drawinglayer/source include/vcl test/source vcl/source
cppcanvas/source/inc/implrenderer.hxx |2
cppcanvas/source/inc/outdevstate.hxx|2
cppcanvas/source/mtfrenderer/implrenderer.cxx |2
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 14 ++--
include/vcl/metaact.hxx |6 +-
include/vcl/outdev.hxx |2
include/vcl/outdevstate.hxx | 45 ++--
include/vcl/pdfwriter.hxx |2
test/source/mtfxmldump.cxx |8 +-
vcl/source/filter/wmf/wmfwr.hxx |2
vcl/source/gdi/gdimetafiletools.cxx |6 +-
vcl/source/gdi/gdimtf.cxx |6 +-
vcl/source/gdi/metaact.cxx |8 +-
vcl/source/gdi/pdfwriter.cxx|2
vcl/source/gdi/pdfwriter_impl.cxx | 14 ++--
vcl/source/gdi/pdfwriter_impl.hxx |6 +-
vcl/source/outdev/outdevstate.cxx |2
17 files changed, 72 insertions(+), 57 deletions(-)
New commits:
commit a69f8ea61ce274a5839f1904d1eba9ea91ce6676
Author: Noel Grandin n...@peralex.com
Date: Thu Aug 21 07:31:11 2014 +0200
vcl: convert push flags to type-safe enum-like class
Change-Id: Ib49a0dd5ecee0225f51bea2ff1c0ab5326595a47
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index 7ff185e..deb3765 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -68,7 +68,7 @@ namespace cppcanvas
public:
OutDevState getState();
const OutDevState getState() const;
-void pushState(sal_uInt16 nFlags);
+void pushState(PushFlags nFlags);
void popState();
void clearStateStack();
private:
diff --git a/cppcanvas/source/inc/outdevstate.hxx
b/cppcanvas/source/inc/outdevstate.hxx
index d1e8c1f..15d33ec 100644
--- a/cppcanvas/source/inc/outdevstate.hxx
+++ b/cppcanvas/source/inc/outdevstate.hxx
@@ -100,7 +100,7 @@ namespace cppcanvas
double
fontRotation;
sal_uInt16
textEmphasisMarkStyle;
-sal_uInt16
pushFlags;
+PushFlags
pushFlags;
sal_Int8
textDirection;
sal_Int8
textAlignment;
sal_Int8
textReliefStyle;
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 63cb370..837609a 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -261,7 +261,7 @@ namespace cppcanvas
return m_aStates.back();
}
-void VectorOfOutDevStates::pushState(sal_uInt16 nFlags)
+void VectorOfOutDevStates::pushState(PushFlags nFlags)
{
m_aStates.push_back( getState() );
getState().pushFlags = nFlags;
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 8f77949..052d43a 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -91,7 +91,7 @@ namespace
RasterOpmaRasterOp;
ComplexTextLayoutMode mnLayoutMode;
LanguageTypemaLanguageType;
-sal_uInt16 mnPushFlags;
+PushFlags mnPushFlags;
/// bitfield
/// contains all active markers
@@ -118,7 +118,7 @@ namespace
maRasterOp(ROP_OVERPAINT),
mnLayoutMode(TEXT_LAYOUT_DEFAULT),
maLanguageType(0),
-mnPushFlags(0),
+mnPushFlags(PUSH_NONE),
mbLineColor(false),
mbFillColor(false),
mbTextColor(true),
@@ -190,8 +190,8 @@ namespace
LanguageType getLanguageType() const { return maLanguageType; }
void setLanguageType(LanguageType aNew) { if(aNew != maLanguageType)
maLanguageType = aNew; }
-sal_uInt16 getPushFlags() const { return mnPushFlags; }
-void setPushFlags(sal_uInt16 nNew) { if(nNew != mnPushFlags)
mnPushFlags = nNew; }
+PushFlags getPushFlags() const { return mnPushFlags; }
+void setPushFlags(PushFlags nNew) { if(nNew !=
[Libreoffice-commits] core.git: writerfilter/qa writerfilter/source
writerfilter/qa/cppunittests/rtftok/data/fail/sf_edeb1eb341ad4c8608af9396952724a0-128299-minimized.rtf
| 57 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx
| 31 ++---
2 files changed, 74 insertions(+), 14 deletions(-)
New commits:
commit b3698a6ac2642777ef0c25688e5dd5acde9594ba
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 21 08:29:03 2014 +0100
NS_ooxml::LN_CT_LevelText_val might be missing
Change-Id: I2683dd30d521b91cf026b3553ed4f75ee4172b3a
diff --git
a/writerfilter/qa/cppunittests/rtftok/data/fail/sf_edeb1eb341ad4c8608af9396952724a0-128299-minimized.rtf
b/writerfilter/qa/cppunittests/rtftok/data/fail/sf_edeb1eb341ad4c8608af9396952724a0-128299-minimized.rtf
new file mode 100644
index 000..45597c085
--- /dev/null
+++
b/writerfilter/qa/cppunittests/rtftok/data/fail/sf_edeb1eb341ad4c8608af9396952724a0-128299-minimized.rtf
@@ -0,0 +1,57 @@
+{\rtf1\ansi\ansicpg1252\deff0
+{\fonttbl
+{\f0\fnil\fcharset0\fprq0\fttruetype Times New Roman;}
+{\f1\fnil\fcharset0\fprq0\fttruetype Nimbus Sans L;}
+{\f2\fnil\fcharset0\fprq0\fttruetype Dingbats;}
+{\f3\fnil\fcharset0\fprq0\fttruetype Symbol;}
+{\f4\fnil\fcharset0\fprq0\fttruetype Courier New;}}
+{\colortbl
+\red0\green0\blue0;
+\red255\green255\blue255;}
+{\stylesheet
+{\s1\fi-431\li720\sbasedon28\snext28 Contents 1;}
+{\s2\fi-431\li1440\sbasedon28\snext28 Contents 2;}
+{\s3\fi-431\li2160\sbasedon28\snext28 Contents 3;}
+{\s8\fi-431\li720\sbasedon28 Lower Roman List;}
+{\s5\tx431\sbasedon24\snext28 Numbered Heading 1;}
+{\s6\tx431\sbasedon25\snext28 Numbered Heading 2;}
+{\s7\fi-431\li720 Square List;}
+{\*\cs11\sbasedon28 Endnote Text;}
+{\s4\fi-431\li2880\sbasedon28\snext28 Contents 4;}
+{\s9\fi-431\li720 Diamond List;}
+{\s10\fi-431\li720 Numbered List;}
+{\*\cs12\fs20\super Endnote Reference;}
+{\s13\fi-431\li720 Triangle List;}
+{\s14\tx431\sbasedon26\snext28 Numbered Heading 3;}
+{\s15\fi-431\li720 Dashed List;}
+{\s16\fi-431\li720\sbasedon10 Upper Roman List;}
+{\s17\sb440\sa60\f1\fs24\b\sbasedon28\snext28 Heading 4;}
+{\s18\fi-431\li720 Heart List;}
+{\s34\fi-431\li720 Box List;}
+{\s20\fi-431\li720\sbasedon10 Upper Case List;}
+{\s21\fi-431\li720 Bullet List;}
+{\s22\fi-431\li720 Hand List;}
+{\*\cs23\fs20\sbasedon28 Footnote Text;}
+{\s24\sb440\sa60\f1\fs34\b\sbasedon28\snext28 Heading 1;}
+{\s25\sb440\sa60\f1\fs28\b\sbasedon28\snext28 Heading 2;}
+{\s19\qc\sb240\sa120\f1\fs32\b\sbasedon28\snext28 Contents Header;}
+{\s27\fi-431\li720 Tick List;}
+{\s26\sb440\sa60\f1\fs24\b\sbasedon28\snext28 Heading 3;}
+{\s29\fi-431\li720\sbasedon10 Lower Case List;}
+{\s30\li1440\ri1440\sa120\sbasedon28 Block Text;}
+{\s36\f4\sbasedon28 Plain Text;}
+{\s32\tx1584\sbasedon5\snext28 Section Heading;}
+{\s33\fi-431\li720 Implies List;}
+{\s28\f0\fs24\lang1033 Normal;}
+{\s35\fi-431\li720 Star List;}
+{\*\cs31\fs20\super Footnote Reference;}
+{\s37\tx1584\sbasedon5\snext28 Chapter Heading;}}
+{\*\listtable
+{\list\listtemplateid1002\listsimple{\listlevel\levelnfc0\levelstartat1\levelspAce0\levelfollow0\fi-431\li720{\leveltext\'02\'00.{}{\levelnumbers\'01;}}\listid1000}}
+{\*\listoverridetable
+{\listoverride\listoverridecount0\listid1000\levelnfc0\levelstartat1\levelspace0\levelfollow0\fi-431\li720{\leveltext\'02\'00.;}{\levelnumbers\'01;}\ls1}}
+
+\kerning0\cf0\ftnbj\fet2\ftnstart1\ftnnar\aftnnar\ftnstart1\aftnstart1\aenddoc\facingp\titlepg\revprop3{\info}\deftab720\viewkind1\paperw12240\paperh15840\margl1440\margr1440\widowctl
+\sectd\sbknone\colsx360\pgncont\ltrsect
+{\listtext\pard\fi-431\li720 1.
}\pard\plain{\ltrpar\ql\fi-431\li720\s28{\*\abilist\abilistid1000\abilistparentid0\abilistlevel1\abistartat1{\abifieldfont
NULL}{\abilistdecimal .}{\abilistdelim %L.}{\abiliststyle Numbered
List}}{\*\pn\pnql\pnstart1\pnlvlbody\pndec{\pntxtb
}{\pntxta
.}}\fn-431\li720\ls1\ilvl0\itap0{\s28\f0\fs24\lang1033{\*\listtag0}\abinodiroverride\ltrch
[Libreoffice-commits] core.git: bridges/source configure.ac desktop/source jvmfwk/plugins
bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx | 17 ++--
configure.ac|7 ++
desktop/source/deployment/misc/dp_platform.cxx |3 ++
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx|6 -
4 files changed, 26 insertions(+), 7 deletions(-)
New commits:
commit 170109708e6a082252efba3d2f1726bbd82b6452
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 21 08:52:16 2014 +0100
Related: rhbz#1125588 first steps for ppc64le
almost certainly won't get us too far, but a start
Change-Id: Ic20b97a97b6d506c32322173bd8332d15c3a4555
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index a4a08c5..1190507 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -31,6 +31,11 @@
#include stdio.h
#include string.h
+#ifdef OSL_BIGENDIAN
+#define IS_BIG_ENDIAN 1
+#else
+#define IS_BIG_ENDIAN 0
+#endif
using namespace ::com::sun::star::uno;
@@ -139,13 +144,13 @@ static typelib_TypeClass cpp2uno_call(
case typelib_TypeClass_BOOLEAN:
if (ng ppc64::MAX_GPR_REGS)
{
-pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)gpreg) +
(sizeof(void*)-1));
+pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)gpreg) +
7*IS_BIG_ENDIAN);
ng++;
gpreg++;
}
else
{
-pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)ovrflw) +
(sizeof(void*)-1));
+pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)ovrflw) +
7*IS_BIG_ENDIAN);
bOverflowUsed = true;
}
if (bOverflowUsed) ovrflw++;
@@ -155,13 +160,13 @@ static typelib_TypeClass cpp2uno_call(
case typelib_TypeClass_UNSIGNED_SHORT:
if (ng ppc64::MAX_GPR_REGS)
{
-pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)gpreg) +
(sizeof(void*)-2));
+pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)gpreg) +
6*IS_BIG_ENDIAN);
ng++;
gpreg++;
}
else
{
-pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)ovrflw) +
(sizeof(void*)-2));
+pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)ovrflw) +
6*IS_BIG_ENDIAN);
bOverflowUsed = true;
}
if (bOverflowUsed) ovrflw++;
@@ -171,13 +176,13 @@ static typelib_TypeClass cpp2uno_call(
case typelib_TypeClass_UNSIGNED_LONG:
if (ng ppc64::MAX_GPR_REGS)
{
-pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)gpreg) +
(sizeof(void*)-4));
+pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)gpreg) +
4*IS_BIG_ENDIAN);
ng++;
gpreg++;
}
else
{
-pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)ovrflw) +
(sizeof(void*)-4));
+pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)ovrflw) +
4*IS_BIG_ENDIAN);
bOverflowUsed = true;
}
if (bOverflowUsed) ovrflw++;
diff --git a/configure.ac b/configure.ac
index bc823c7..ac3051d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4380,6 +4380,13 @@ linux-gnu*)
PLATFORMID=linux_powerpc64
OUTPATH=unxlngppc64
;;
+powerpc64le)
+CPUNAME=POWERPC64
+RTL_ARCH=PowerPC_64_LE
+LIB64=lib64
+PLATFORMID=linux_powerpc64le
+OUTPATH=unxlngppc64
+;;
sparc)
CPUNAME=SPARC
RTL_ARCH=SPARC
diff --git a/desktop/source/deployment/misc/dp_platform.cxx
b/desktop/source/deployment/misc/dp_platform.cxx
index 6b5215a..6e69359 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -35,6 +35,7 @@
#define PLATFORM_LINUX_SPARClinux_sparc
#define PLATFORM_LINUX_POWERPC linux_powerpc
#define PLATFORM_LINUX_POWERPC64linux_powerpc64
+#define PLATFORM_LINUX_POWERPC64_LE linux_powerpc64_le
#define PLATFORM_LINUX_ARM_EABI linux_arm_eabi
#define PLATFORM_LINUX_ARM_OABI linux_arm_oabi
#define PLATFORM_LINUX_MIPS_EL linux_mips_el
@@ -129,6 +130,8 @@ namespace
ret = checkOSandCPU(Linux, PowerPC);
else if (token == PLATFORM_LINUX_POWERPC64)
ret = checkOSandCPU(Linux, PowerPC_64);
+else if (token == PLATFORM_LINUX_POWERPC64_LE)
+ret =
[Libreoffice-commits] core.git: download.lst external/libpagemaker
download.lst |4 - external/libpagemaker/0001-define-M_PI-if-not-available.patch | 35 - external/libpagemaker/0002-add-missing-typedef-on-windows.patch| 24 -- external/libpagemaker/0003-round-is-not-available-on-windows.patch | 37 -- external/libpagemaker/UnpackedTarball_libpagemaker.mk |8 -- 5 files changed, 2 insertions(+), 106 deletions(-) New commits: commit bf2c2ec5d8fb6bf4b49015f8a68e8f3dd058c965 Author: David Tardon dtar...@redhat.com Date: Thu Aug 21 10:03:48 2014 +0200 upload libpagemaker 0.0.1 Change-Id: I287d4947735b82bb13bb6b18880dca594b17e38b diff --git a/download.lst b/download.lst index bd66376..43a828c 100644 --- a/download.lst +++ b/download.lst @@ -114,8 +114,8 @@ export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz export OPENSSL_MD5SUM := c8dc151a671b9b92ff3e4c118b174972 export OPENSSL_TARBALL := openssl-1.0.1i.tar.gz export ORCUS_TARBALL := 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 -export PAGEMAKER_MD5SUM := f4e44d2b3a67b5d5a18dce50366156f4 -export PAGEMAKER_TARBALL := libpagemaker-0.0.0.tar.bz2 +export PAGEMAKER_MD5SUM := 3572175bd4e7d134f26b6762d322a1d1 +export PAGEMAKER_TARBALL := libpagemaker-0.0.1.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 export PNG_MD5SUM := 5266905cef49d1224437465ad4d67fd9 export PNG_TARBALL := libpng-1.5.18.tar.gz diff --git a/external/libpagemaker/0001-define-M_PI-if-not-available.patch b/external/libpagemaker/0001-define-M_PI-if-not-available.patch deleted file mode 100644 index 0fe043e..000 --- a/external/libpagemaker/0001-define-M_PI-if-not-available.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ae6e41e1026a2a84641bb42aa7fb89a9a30a9114 Mon Sep 17 00:00:00 2001 -From: David Tardon dtar...@redhat.com -Date: Fri, 27 Jun 2014 11:30:38 +0200 -Subject: [PATCH 1/3] define M_PI if not available - - src/lib/libpagemaker_utils.h | 5 + - 1 file changed, 5 insertions(+) - -diff --git a/src/lib/libpagemaker_utils.h b/src/lib/libpagemaker_utils.h -index fed5f3d..ab070b5 100644 a/src/lib/libpagemaker_utils.h -+++ b/src/lib/libpagemaker_utils.h -@@ -10,6 +10,7 @@ - #ifndef __LIBPAGEMAKER_UTILS_H__ - #define __LIBPAGEMAKER_UTILS_H__ - -+#include cmath - #include cstdio - - #include string -@@ -19,6 +20,10 @@ - #include librevenge-stream/librevenge-stream.h - #include librevenge/librevenge.h - -+#ifndef M_PI -+#define M_PI 3.14159265358979323846 -+#endif -+ - #ifdef _MSC_VER - - typedef unsigned char uint8_t; --- -1.9.3 - diff --git a/external/libpagemaker/0002-add-missing-typedef-on-windows.patch b/external/libpagemaker/0002-add-missing-typedef-on-windows.patch deleted file mode 100644 index 7f566b9..000 --- a/external/libpagemaker/0002-add-missing-typedef-on-windows.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 7c9cc06fecd69e88428ee5b0cf5a3a3cf40db44b Mon Sep 17 00:00:00 2001 -From: David Tardon dtar...@redhat.com -Date: Fri, 27 Jun 2014 11:30:50 +0200 -Subject: [PATCH 2/3] add missing typedef on windows - - src/lib/libpagemaker_utils.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lib/libpagemaker_utils.h b/src/lib/libpagemaker_utils.h -index ab070b5..73d2a59 100644 a/src/lib/libpagemaker_utils.h -+++ b/src/lib/libpagemaker_utils.h -@@ -27,6 +27,7 @@ - #ifdef _MSC_VER - - typedef unsigned char uint8_t; -+typedef signed char int8_t; - typedef unsigned short uint16_t; - typedef short int16_t; - typedef unsigned uint32_t; --- -1.9.3 - diff --git a/external/libpagemaker/0003-round-is-not-available-on-windows.patch b/external/libpagemaker/0003-round-is-not-available-on-windows.patch deleted file mode 100644 index e13d705..000 --- a/external/libpagemaker/0003-round-is-not-available-on-windows.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e5700eff3f09a6c0b78663b397c141f677c5b16b Mon Sep 17 00:00:00 2001 -From: David Tardon dtar...@redhat.com -Date: Fri, 27 Jun 2014 11:33:09 +0200 -Subject: [PATCH 3/3] round is not available on windows - - src/lib/PMDParser.cpp | 7 +++ - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/lib/PMDParser.cpp b/src/lib/PMDParser.cpp -index 7c9ff2d..736ea1c 100644 a/src/lib/PMDParser.cpp -+++ b/src/lib/PMDParser.cpp -@@ -12,7 +12,6 @@ - #include cassert - #include vector - #include limits --#include math.h - #include librevenge/librevenge.h - #include boost/optional.hpp - #include boost/shared_ptr.hpp -@@ -608,9 +607,9 @@ void PMDParser::parseColors(const PMDRecordContainer container) - - uint16_t max = (std::numeric_limitsuint16_t::max)(); - -- red = 255* round((1 - std::min(1.0, (double)cyan/max + (double)black/max))); -- green = 255*round((1 - std::min(1.0, (double)magenta/max + (double)black/max))); -- blue = 255*round((1 - std::min(1.0, (double)yellow/max + (double)black/max))); -+ red = 255* std::floor((1 -
[Libreoffice-commits] core.git: Branch 'feature/chart_opengl_window' - 2 commits - chart2/source
chart2/source/view/main/ChartView.cxx | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 975cb15af3b9ff220276cac015db916b794c487d
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Thu Aug 21 10:47:31 2014 +0200
Fix rendering of GL3DBarCharts after ODF import
OpenGL window need to have a valid size before
rendering.
Change-Id: I3ce3dbf653f0dc101de3acc4d634d7fe6c3be9ad
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 99fe65d..fa7f415 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -3160,6 +3160,12 @@ void ChartView::createShapes3D()
if(!pWindow)
return;
+if( pWindow-GetSizePixel().Width() == 0 ||
pWindow-GetSizePixel().Height() == 0 )
+{
+awt::Size aPageSize = mrChartModel.getVisualAreaSize(
embed::Aspects::MSOLE_CONTENT );
+Size aSize = pWindow-LogicToPixel(
Size(aPageSize.Width,aPageSize.Height), MapUnit(MAP_100TH_MM) );
+pWindow-SetSizePixel(aSize);
+}
pWindow-Show();
uno::Reference XDiagram xDiagram( mrChartModel.getFirstDiagram() );
uno::Reference XCoordinateSystemContainer xCooSysContainer( xDiagram,
uno::UNO_QUERY );
commit b79b862927d937d695b31df4bdb85d1fc8774f39
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Mon Aug 18 15:16:46 2014 +0200
Stop flickering in rendering of charts in Writer
Change-Id: I52efa9cd7851f480ee2abcaa1646735c6f518f3a
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index c857299..99fe65d 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2495,11 +2495,6 @@ void ChartView::createShapes()
else
{
m_pGL3DPlotter.reset();
-
-// hide OpenGL window for now in normal charts
-OpenGLWindow* pWindow = mrChartModel.getOpenGLWindow();
-if(pWindow)
-pWindow-Show(false);
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - configure.ac cui/source jvmfwk/plugins
configure.ac |2 +-
cui/source/customize/cfg.cxx |4 ++--
cui/source/customize/cfg.hrc |1 -
cui/source/customize/cfg.src |6 ++
cui/source/inc/cuires.hrc|2 ++
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx |6 +-
6 files changed, 8 insertions(+), 13 deletions(-)
New commits:
commit 632e4095ad92196480ad82cfa1f106c4c08ae1cc
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 21 10:14:06 2014 +0100
openjdk appears to use ppc64/server/libjvm.so and not
ppc64le/server/libjvm.so
Change-Id: Iff9e2e0ac9921b0d9d36a49fdcd2323d5dd124ee
diff --git a/configure.ac b/configure.ac
index ac3051d..5304644 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7223,7 +7223,7 @@ then
powerpc)
my_java_arch=ppc
;;
-powerpc64)
+powerpc64*)
my_java_arch=ppc64
;;
x86_64)
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
index fee2430..25baaee5 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
@@ -40,11 +40,7 @@ namespace jfw_plugin
#elif defined INTEL
#define JFW_PLUGIN_ARCH i386
#elif defined POWERPC64
-#ifdef OSL_BIGENDIAN
-# define JFW_PLUGIN_ARCH ppc64
-#else
-# define JFW_PLUGIN_ARCH ppc64le
-#endif
+#define JFW_PLUGIN_ARCH ppc64
#elif defined POWERPC
#define JFW_PLUGIN_ARCH ppc
#elif defined MIPS
commit 24e76b6506a309c5564cf46dc23df06993a002c7
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 21 10:04:53 2014 +0100
QueryBox QBX_CONFIRM_DELETE_TOOLBAR - MessageDialog + string
Change-Id: If03a966ab6519d1335903b7d76cb44c38113a4a3
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 79dba76..21fced9 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2995,8 +2995,8 @@ bool SvxToolbarConfigPage::DeleteSelectedContent()
if ( m_pContentsListBox-GetEntryCount() == 0
GetTopLevelSelection()-IsDeletable() )
{
-QueryBox qbox( this,
-CUI_RES( QBX_CONFIRM_DELETE_TOOLBAR ) );
+MessageDialog qbox(this,
+CUI_RES(RID_SXVSTR_CONFIRM_DELETE_TOOLBAR),
VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO);
if ( qbox.Execute() == RET_YES )
{
diff --git a/cui/source/customize/cfg.hrc b/cui/source/customize/cfg.hrc
index 44d8f87..5fc6d73 100644
--- a/cui/source/customize/cfg.hrc
+++ b/cui/source/customize/cfg.hrc
@@ -38,6 +38,5 @@
#define MODIFY_TOOLBAR_CONTENT (61 + CFG_OFFSET)
#define QBX_CONFIRM_RESTORE_DEFAULT (66 + CFG_OFFSET)
-#define QBX_CONFIRM_DELETE_TOOLBAR (67 + CFG_OFFSET)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index a61a82c..08f1c72 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -217,11 +217,9 @@ String RID_SVXSTR_TOOLBAR_NAME
Text [ en-US ] = Toolbar Name ;
};
-QueryBox QBX_CONFIRM_DELETE_TOOLBAR
+String RID_SXVSTR_CONFIRM_DELETE_TOOLBAR
{
-Message [ en-US ] = There are no more commands on the toolbar. Do you
want to delete the toolbar?;
-BUTTONS = WB_YES_NO ;
-DEFBUTTON = WB_DEF_NO ;
+Text [ en-US ] = There are no more commands on the toolbar. Do you want
to delete the toolbar?;
};
/* Translators: Do not translate %SAVE IN SELECTION% It is a placeholder
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index a948b27..b0e48e5 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -408,6 +408,8 @@
#define RID_SVXSTR_NORESULTS(RID_SVX_START +
1281)
#define RID_SVXSTR_APPLYPERSONA (RID_SVX_START +
1282)
+#define RID_SXVSTR_CONFIRM_DELETE_TOOLBAR (RID_SVX_START +
1283)
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source include/filter sd/source svx/workben
filter/source/msfilter/svdfppt.cxx | 20 ++-- include/filter/msfilter/svdfppt.hxx | 20 ++-- sd/source/filter/ppt/pptin.cxx |6 +++--- svx/workben/msview/msview.xml |8 4 files changed, 27 insertions(+), 27 deletions(-) New commits: commit f8bf090bbba61e8cd198a936dcc25f35fdf23c10 Author: Tor Lillqvist t...@collabora.com Date: Thu Aug 21 10:45:39 2014 +0300 These newly added record types are publicly documented nowadays Use symbolic names from the MS-PPT RecordType documentation, http://msdn.microsoft.com/en-us/library/dd945336(v=office.12).aspx Change-Id: I1deecfc69dd3360ef982f144d5ff5348a2953280 diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index cacf65c..f2c915e 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -3230,12 +3230,12 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport rMan, SvStream rSt, const OSL_FAIL( PPTExParaProv::PPTExParaProv - unknown atom reading ppt2000 num rules (SJ) ); case PPT_PST_MasterText : // first seen in: ms-tt02.ppt case PPT_PST_SrKinsoku : -case PPT_PST_NewlyAddedAtom4016 : -case PPT_PST_NewlyAddedAtomByPPT2000_6010 : -case PPT_PST_NewlyAddedAtomByPPT2000_6011 : -case PPT_PST_NewlyAddedAtomByXP1037 : -case PPT_PST_NewlyAddedAtomByXP12004 : -case PPT_PST_NewlyAddedAtomByXP14001 : +case PPT_PST_TextDefaults9Atom : +case PPT_PST_PresentationAdvisorFlags9Atom : +case PPT_PST_HtmlDocInfo9Atom : +case PPT_PST_GridSpacing10Atom : +case PPT_PST_CommentIndex10 : +case PPT_PST_DocToolbarStates10Atom : break; #endif } @@ -3283,10 +3283,10 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport rMan, SvStream rSt, const break; default : OSL_FAIL( PPTExParaProv::PPTExParaProv - unknown atom, assuming PPT_PST_ExtendedParagraphMasterAtom (SJ) ); -case PPT_PST_NewlyAddedAtomByXP11008 : -case PPT_PST_NewlyAddedAtomByXP11010 : -case PPT_PST_NewlyAddedAtomByXP12010 : -case PPT_PST_NewlyAddedAtomByXP12011 : +case PPT_PST_HashCodeAtom : +case PPT_PST_BuildList : +case PPT_PST_SlideFlags10Atom : +case PPT_PST_SlideTime10Atom : case 0xf144 : break; } diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 809b96a..cd3b65b 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -1366,7 +1366,7 @@ public : #define PPT_PST_ExObjListAtom 1034 #define PPT_PST_PPDrawingGroup 1035 #define PPT_PST_PPDrawing 1036 -#define PPT_PST_NewlyAddedAtomByXP1037 1037 +#define PPT_PST_GridSpacing10Atom 1037 #define PPT_PST_NamedShows 1040 #define PPT_PST_NamedShow 1041 #define PPT_PST_NamedShowSlides 1042 @@ -1420,7 +1420,7 @@ public : #define PPT_PST_ExtendedPresRuleContainer 4014// consist of 4012, 4015, #define PPT_PST_ExtendedParagraphHeaderAtom 4015// the instance of this atom indices the current presobj // the first sal_uInt32 in this atom indices the current slideId -#define PPT_PST_NewlyAddedAtom4016 4016 +#define PPT_PST_TextDefaults9Atom 4016 #define PPT_PST_FontEntityAtom 4023 #define PPT_PST_FontEmbedData 4024 @@ -1497,8 +1497,8 @@ public : #define PPT_PST_PersistPtrIncrementalBlock 6002 // these atoms first was seen in ppt2000 in a private Tag atom -#define PPT_PST_NewlyAddedAtomByPPT2000_60106010 -#define PPT_PST_NewlyAddedAtomByPPT2000_60116011 +#define PPT_PST_PresentationAdvisorFlags9Atom 6010 +#define PPT_PST_HtmlDocInfo9Atom6011 #define PPT_PST_RulerIndentAtom 1 #define PPT_PST_GscalingAtom10001 @@ -1506,14 +1506,14 @@ public : #define PPT_PST_GLPointAtom 10003 #define PPT_PST_GlineAtom 10004 -#define PPT_PST_NewlyAddedAtomByXP11008 11008 -#define PPT_PST_NewlyAddedAtomByXP11010 11010 +#define PPT_PST_HashCodeAtom11008 +#define PPT_PST_BuildList 11010 #define PPT_PST_Comment10 12000 #define PPT_PST_CommentAtom10 12001 -#define PPT_PST_NewlyAddedAtomByXP12004 12004 -#define PPT_PST_NewlyAddedAtomByXP12010 12010
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/exportdata/ooxml/pass/textframe-in-shape.docx |binary
sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f97583711b0c5159ba6d1144395489cdfe9a7ac8
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Aug 21 11:43:41 2014 +0200
DOCX export: handle anchored TextFrames inside shapes
The exporter already handled TextFrames inside TextFrames, a feature
supported by Writer, and not by Word.
Similarly, if DocxSdrExport::writeDMLAndVMLDrawing() starts a shape,
then anchored TextFrames should be posponed till the end of that shape.
Change-Id: I597a8a46b1cf2348a8ccb9af668ea5afab27541b
diff --git a/sw/qa/core/exportdata/ooxml/pass/textframe-in-shape.docx
b/sw/qa/core/exportdata/ooxml/pass/textframe-in-shape.docx
new file mode 100644
index 000..23f40f1
Binary files /dev/null and
b/sw/qa/core/exportdata/ooxml/pass/textframe-in-shape.docx differ
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 05a22ba..5e59bcc 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -442,7 +442,7 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
// Write the anchored frame if any
// Word can't handle nested text boxes, so write them on the same level.
++m_nTextFrameLevel;
-if( m_nTextFrameLevel == 1 )
+if( m_nTextFrameLevel == 1
!m_rExport.SdrExporter().IsDMLAndVMLDrawingOpen() )
{
comphelper::FlagRestorationGuard
aStartedParaSdtGuard(m_bStartedParaSdt, false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aef9d5e6fba3a934d6e0babc5f08409a9d5d3e99 Author: Andras Timar andras.ti...@collabora.com Date: Thu Aug 21 12:15:09 2014 +0200 Updated core Project: help 356a862f1cac3c528c53be0bc31ed4063444681c diff --git a/helpcontent2 b/helpcontent2 index 9a8ca9e..356a862 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9a8ca9edc790d35cafbb1b7eb1b0465b806e428f +Subproject commit 356a862f1cac3c528c53be0bc31ed4063444681c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/guide/macro_recording.xhp | 14 ++ 1 file changed, 2 insertions(+), 12 deletions(-) New commits: commit 356a862f1cac3c528c53be0bc31ed4063444681c Author: Andras Timar andras.ti...@collabora.com Date: Thu Aug 21 12:15:09 2014 +0200 remove conditional text, because wiki conversion fails on it Change-Id: I184d58b0c58feee11010cd174e31641f4dc170ed diff --git a/source/text/shared/guide/macro_recording.xhp b/source/text/shared/guide/macro_recording.xhp index db5e208..c6c3481 100644 --- a/source/text/shared/guide/macro_recording.xhp +++ b/source/text/shared/guide/macro_recording.xhp @@ -35,8 +35,6 @@ /bookmark paragraph role=heading id=hd_id3093440 xml-lang=en-US level=1 l10n=U oldref=1variable id=macro_recordinglink href=text/shared/guide/macro_recording.xhp name=Recording a MacroRecording a Macro/link /variable/paragraph -switch select=appl -case select=WRITERsection id=macrorecorder list type=ordered listitem paragraph role=listitem id=par_id3154749 xml-lang=en-US l10n=U oldref=4Open the document for which you want to record a macro./paragraph @@ -92,14 +90,6 @@ /list embed href=text/shared/00/0004.xhp#related/ paragraph role=paragraph id=par_id3156422 xml-lang=en-US l10n=Clink href=text/shared/01/0613.xhp name=MacroMacro/link/paragraph -paragraph role=paragraph id=par_id3147576 xml-lang=en-US l10n=U oldref=2link href=text/shared/main0600.xhp name=macro programming in $[officename]Programming in %PRODUCTNAME/link/paragraphcommenthow-to running a macro/commentcommenthow-to testing and debugging a macro/comment/section -/case -case select=CALCembed href=text/shared/guide/macro_recording.xhp#macrorecorder/ -/case -case select=BASICembed href=text/shared/guide/macro_recording.xhp#macrorecorder/ -/case -default -paragraph role=paragraph id=par_id7797242 xml-lang=en-US l10n=NEWThe macro recording functionality is only available for text documents in %PRODUCTNAME Writer and for spreadsheets in %PRODUCTNAME Calc./paragraph -/default -/switch/body +paragraph role=paragraph id=par_id3147576 xml-lang=en-US l10n=U oldref=2link href=text/shared/main0600.xhp name=macro programming in $[officename]Programming in %PRODUCTNAME/link/paragraph +/body /helpdocument ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: m4/ax_boost_base.m4
m4/ax_boost_base.m4 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2d48c52da712f8fa3c4a579494c824491afb8515 Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 21 11:59:05 2014 +0100 need to accept ppc64le as a lib64 using platform in ax_boost_base.m4 Change-Id: I86ef068661082addbd165629d3d6905695090a6b diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4 index 7a0cf52..55de0c4 100644 --- a/m4/ax_boost_base.m4 +++ b/m4/ax_boost_base.m4 @@ -91,7 +91,7 @@ if test x$want_boost = xyes; then dnl are found, e.g. when only header-only libraries are installed! libsubdirs=lib ax_arch=`uname -m` -if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64 -o $ax_arch = aarch64; then +if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = ppc64le -o $ax_arch = s390x -o $ax_arch = sparc64 -o $ax_arch = aarch64; then libsubdirs=lib64 lib lib64 fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/frmtool.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 98fba3ab3675e19a1260d4e2cddd4bfd6c005118 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Aug 21 13:27:08 2014 +0200 Check pTmpFrm-GetType(), not nFrmType, for FRM_FLY ...as nFrmType need not match pTmpFrm-GetType() exactly, but can e.g. be USHORT_MAX when GetFrmOfModify is called from SwFrmFmt::FindLayoutRect (sw/source/core/layout/atrfrm.cxx). It is probably good luck that the two comparisons against FAR_AWAY made it too unlikely for the if's true branch to ever be taken for a pTmpFrm that is not actually a SwFlyFrm. Found the bug when running CppunitTest_sw_ooxmlexport2 under -fsanitize=undefined, where ((SwFlyFrm*)pTmpFrm)-GetAnchorFrm() was called for a pTmpFrm of type SwTabFrm. Change-Id: Ia886a809bdb82488c3f410be66cf827b3f723c55 diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 663551f..aabdd39 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -3279,7 +3279,7 @@ SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const rMod, sal_uInt1 } // for Flys go via the parent if the Fly is not yet formatted -if( !bCalcFrm nFrmType FRM_FLY +if( !bCalcFrm pTmpFrm-GetType() FRM_FLY ((SwFlyFrm*)pTmpFrm)-GetAnchorFrm() FAR_AWAY == pTmpFrm-Frm().Pos().getX() FAR_AWAY == pTmpFrm-Frm().Pos().getY() ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 5a2123376dc010ca4e3f0a19d7dbbfaeb25ea963 Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 21 12:59:50 2014 +0100 avoid crash on document ending before contained table ends Change-Id: I003b7e00673cd5a4b4f0ed5218e2d30cfef04ffb diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 0029154..c065d8f 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5350,6 +5350,8 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition rPos) UpdatePageDescs(rDoc, nPageDescOffset); +SAL_WARN_IF(mpTableEndPaM, sw.ww8, document ended without table ending); +mpTableEndPaM.reset(); //ensure this is deleted before pPaM delete pPaM, pPaM = 0; return nErrRet; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source forms/source
extensions/source/bibliography/framectr.cxx |1 -
extensions/source/propctrlr/browserview.cxx |6 --
extensions/source/propctrlr/buttonnavigationhandler.cxx |2 --
extensions/source/propctrlr/editpropertyhandler.cxx |1 -
extensions/source/propctrlr/formgeometryhandler.cxx |2 --
extensions/source/propctrlr/formmetadata.cxx|4
extensions/source/propctrlr/handlerhelper.cxx |1 -
extensions/source/propctrlr/stringrepresentation.cxx|1 -
forms/source/component/CheckBox.cxx |1 -
forms/source/component/Currency.cxx |2 --
forms/source/component/Date.cxx |1 -
forms/source/component/Edit.cxx |2 --
forms/source/component/FixedText.cxx|2 --
forms/source/component/FormsCollection.cxx |1 -
forms/source/component/GroupManager.cxx |1 -
forms/source/component/ImageButton.cxx |1 -
forms/source/component/Numeric.cxx |2 --
forms/source/component/RadioButton.cxx |1 -
forms/source/component/Time.cxx |3 ---
forms/source/xforms/datatyperepository.cxx |3 ---
20 files changed, 38 deletions(-)
New commits:
commit f7a65a109691616ff28bfe4917f3865d954bb00f
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date: Mon Aug 18 19:02:40 2014 -0300
Remove useless include tools/debug.hxx from forms and extensions
Change-Id: Idc8ecbb65c7c4c63950d8b249e0d0d91788d6d3b
Reviewed-on: https://gerrit.libreoffice.org/11012
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/extensions/source/bibliography/framectr.cxx
b/extensions/source/bibliography/framectr.cxx
index 3eeacbb..7f997e5 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -20,7 +20,6 @@
#include vcl/waitobj.hxx
#include com/sun/star/util/URL.hpp
#include vcl/msgbox.hxx
-#include tools/debug.hxx
#include vcl/stdtext.hxx
#include comphelper/types.hxx
#include comphelper/sequence.hxx
diff --git a/extensions/source/propctrlr/browserview.cxx
b/extensions/source/propctrlr/browserview.cxx
index 8da7baa..3ce6501 100644
--- a/extensions/source/propctrlr/browserview.cxx
+++ b/extensions/source/propctrlr/browserview.cxx
@@ -20,19 +20,13 @@
#include browserview.hxx
#include propertyeditor.hxx
#include propctrlr.hrc
-#include tools/debug.hxx
#include boost/scoped_ptr.hpp
-
namespace pcr
{
-
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-
-
//= class OPropertyBrowserView
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx
b/extensions/source/propctrlr/buttonnavigationhandler.cxx
index d78194e..0dc7532 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.cxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx
@@ -24,8 +24,6 @@
#include pushbuttonnavigation.hxx
#include com/sun/star/form/inspection/FormComponentPropertyHandler.hpp
-#include tools/debug.hxx
-
extern C void SAL_CALL createRegistryInfo_ButtonNavigationHandler()
{
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx
b/extensions/source/propctrlr/editpropertyhandler.cxx
index 2f2429a..1126cb4 100644
--- a/extensions/source/propctrlr/editpropertyhandler.cxx
+++ b/extensions/source/propctrlr/editpropertyhandler.cxx
@@ -23,7 +23,6 @@
#include pcrservices.hxx
#include com/sun/star/inspection/XObjectInspectorUI.hpp
-#include tools/debug.hxx
#define TEXTTYPE_SINGLELINE 0
#define TEXTTYPE_MULTILINE 1
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx
b/extensions/source/propctrlr/formgeometryhandler.cxx
index f8e8ae7..6e16c37 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -42,10 +42,8 @@
#include cppuhelper/interfacecontainer.hxx
#include comphelper/componentbase.hxx
-#include tools/debug.hxx
#include tools/diagnose_ex.h
-
namespace pcr
{
diff --git a/extensions/source/propctrlr/formmetadata.cxx
b/extensions/source/propctrlr/formmetadata.cxx
index f9dca52..4dcd046 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -22,17 +22,13 @@
#include formresid.hrc
#include propctrlr.hrc
#include svtools/localresaccess.hxx
-#include tools/debug.hxx
#include comphelper/extract.hxx
#include sal/macros.h
#include algorithm
#include functional
-
namespace pcr
{
-
-
using namespace ::com::sun::star::uno;
diff --git a/extensions/source/propctrlr/handlerhelper.cxx
b/extensions/source/propctrlr/handlerhelper.cxx
index 2451b31..5859c1e 100644
---
[Libreoffice-commits] core.git: sc/source
sc/source/ui/src/scfuncs.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c08fea639ca1a757df086ffe34f2bd5cf6573b6c Author: Eike Rathke er...@redhat.com Date: Thu Aug 21 13:52:41 2014 +0200 add missing parameter flag in dbgutil build gave: warn:legacy.osl:27022:1:tools/source/rc/resmgr.cxx:701: file:///build/libo/dev/instdir/program/../program/resource/scen-US.res Class: 272, Id: 436. Classpointer not at the end! Resource Stack Class: 272, Id: 25044 and the following value of the suppress flag was taken in place of the parameter flag, which was identical and didn't harm in this case, but ... Change-Id: I951381ef2a5c2d7d7d44892ad5c34ea77ace51ce diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src index c34785c..305835e 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -8149,7 +8149,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_HYP_GEOM_DIST_MS ); -5; 0; 0; 0; 0; +5; 0; 0; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 ___ 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/OOXMLFastContextHandler.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit c52e417505f1ab7193a17bf24348e5962436ea26
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 21 14:13:27 2014 +0200
Avoid invalid downcasts
Change-Id: I1666321916d08b326bb0c1c1f21273d568523691
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index d8673c0..1942b90 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1982,14 +1982,12 @@
OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
bool bInNamespaces = mMyNamespaces.find(nNameSpace) != mMyNamespaces.end();
bool bInTokens = mMyTokens.find( Element ) != mMyTokens.end( );
-OOXMLFastContextHandlerShape* pShapeCtx =
(OOXMLFastContextHandlerShape*)mpParent;
-
// We have methods to _add_ individual tokens or whole namespaces to be
// processed by writerfilter (instead of oox), but we have no method to
// filter out a single token. Just hardwire the wrap token here till we
// need a more generic solution.
bool bIsWrap = Element == static_castsal_Int32(NMSP_vmlWord | XML_wrap);
-if ( bInNamespaces ((pShapeCtx-isShapeSent() bIsWrap) || !bIsWrap) )
+if ( bInNamespaces
((static_castOOXMLFastContextHandlerShape*(mpParent)-isShapeSent()
bIsWrap) || !bIsWrap) )
xResult.set(OOXMLFactory::getInstance()-createFastChildContextFromStart(this,
Element));
else if (mxContext.is())
{
@@ -2004,7 +2002,7 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
xResult.set(this);
if ( bInTokens )
-pShapeCtx-sendShape( Element );
+static_castOOXMLFastContextHandlerShape*(mpParent)-sendShape(
Element );
return xResult;
}
___
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' - framework/inc framework/source
framework/inc/services/pathsettings.hxx|4 +--
framework/source/services/pathsettings.cxx | 32 ++---
2 files changed, 31 insertions(+), 5 deletions(-)
New commits:
commit 0d7dee3c85cb0a7e85214432cd4b13328d77d497
Author: Tor Lillqvist t...@collabora.com
Date: Tue Aug 19 20:16:53 2014 +0300
bnc#529470: I can't remove a path in AutoText dialog
This is, not surprisingly, somewhat weird code, but I think this patch does
what is necessary, it does fix the bug.
Change-Id: Ie1947b311f1455ba48a904f5ef42ad92899fac31
Reviewed-on: https://gerrit.libreoffice.org/11032
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/framework/inc/services/pathsettings.hxx
b/framework/inc/services/pathsettings.hxx
index 34e65f5..352e824 100644
--- a/framework/inc/services/pathsettings.hxx
+++ b/framework/inc/services/pathsettings.hxx
@@ -372,8 +372,8 @@ class PathSettings : // base classes
So real user defined paths can be extracted from the list of
fix internal paths !
*/
-void impl_purgeKnownPaths(const PathSettings::PathInfo rPath,
- OUStringList lList);
+void impl_purgeKnownPaths(PathSettings::PathInfo rPath,
+ OUStringList lList);
/** rebuild the member m_lPropDesc using the path list m_lPaths. */
void impl_rebuildPropertyDescriptor();
diff --git a/framework/source/services/pathsettings.cxx
b/framework/source/services/pathsettings.cxx
index 15fb3c0..77d2224 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -694,10 +694,13 @@ OUStringList
PathSettings::impl_convertOldStyle2Path(const OUString sOldStylePa
}
//-
-void PathSettings::impl_purgeKnownPaths(const PathSettings::PathInfo rPath,
- OUStringList lList)
+void PathSettings::impl_purgeKnownPaths(PathSettings::PathInfo rPath,
+OUStringList lList)
{
-OUStringList::const_iterator pIt;
+OUStringList::iterator pIt;
+
+// Erase items in the internal path list from lList.
+// Also erase items in the internal path list from the user path list.
for ( pIt = rPath.lInternalPaths.begin();
pIt != rPath.lInternalPaths.end() ;
++pIt )
@@ -706,7 +709,29 @@ void PathSettings::impl_purgeKnownPaths(const
PathSettings::PathInfo rPath,
OUStringList::iterator pItem = lList.find(rItem);
if (pItem != lList.end())
lList.erase(pItem);
+pItem = rPath.lUserPaths.find(rItem);
+if (pItem != rPath.lUserPaths.end())
+rPath.lUserPaths.erase(pItem);
+}
+
+// Erase itsems not in lList from the user path list.
+pIt = rPath.lUserPaths.begin();
+while ( pIt != rPath.lUserPaths.end() )
+{
+const OUString rItem = *pIt;
+OUStringList::iterator pItem = lList.find(rItem);
+if ( pItem == lList.end() )
+{
+rPath.lUserPaths.erase(pIt);
+pIt = rPath.lUserPaths.begin();
+}
+else
+{
+++pIt;
+}
}
+
+// Erase items in the user path list from lList.
for ( pIt = rPath.lUserPaths.begin();
pIt != rPath.lUserPaths.end() ;
++pIt )
@@ -717,6 +742,7 @@ void PathSettings::impl_purgeKnownPaths(const
PathSettings::PathInfo rPath,
lList.erase(pItem);
}
+// Erase the write path from lList
OUStringList::iterator pItem = lList.find(rPath.sWritePath);
if (pItem != lList.end())
lList.erase(pItem);
___
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' - filter/source
filter/source/config/fragments/filters/Beagle_Works.xcu |2 +- filter/source/config/fragments/filters/Beagle_Works_Calc.xcu |2 +- filter/source/config/fragments/filters/Beagle_Works_Draw.xcu |2 +- filter/source/config/fragments/filters/ClarisWorks.xcu |2 +- filter/source/config/fragments/filters/ClarisWorks_Calc.xcu |2 +- filter/source/config/fragments/filters/ClarisWorks_Draw.xcu |2 +- filter/source/config/fragments/filters/Great_Works.xcu |2 +- filter/source/config/fragments/filters/Great_Works_Calc.xcu |2 +- filter/source/config/fragments/filters/Great_Works_Draw.xcu |2 +- filter/source/config/fragments/filters/Mac_Works.xcu |2 +- filter/source/config/fragments/filters/Mac_Works_Calc.xcu|2 +- filter/source/config/fragments/filters/Mac_Works_Draw.xcu|2 +- 12 files changed, 12 insertions(+), 12 deletions(-) New commits: commit 2c3f33f5d08458f50276da114bda8457d99c94b3 Author: Maxim Monastirsky momonas...@gmail.com Date: Sun Aug 3 15:58:37 2014 +0300 Fix showing calc/draw types in some file pickers Having the same UIName for several filters, causes some file pickers (gtk generic) to drop the whole group. Change-Id: I6d18a751cb77a6a83e8e2a46338e41b7c72180ff Reviewed-on: https://gerrit.libreoffice.org/10730 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com Reviewed-by: Andras Timar andras.ti...@collabora.com diff --git a/filter/source/config/fragments/filters/Beagle_Works.xcu b/filter/source/config/fragments/filters/Beagle_Works.xcu index 7d1a90f..a0cd6bc 100644 --- a/filter/source/config/fragments/filters/Beagle_Works.xcu +++ b/filter/source/config/fragments/filters/Beagle_Works.xcu @@ -15,7 +15,7 @@ valuecom.sun.star.comp.Writer.MWAWImportFilter/value /prop prop oor:name=UIName -value xml:lang=en-USBeagleWorks/WordPerfect Works v1 Document/value +value xml:lang=en-USBeagleWorks/WordPerfect Works v1 Text Document/value /prop prop oor:name=FileFormatVersion value0/value diff --git a/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu b/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu index 3d70268..4471531 100644 --- a/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu +++ b/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu @@ -15,7 +15,7 @@ valuecom.sun.star.comp.Calc.MWAWCalcImportFilter/value /prop prop oor:name=UIName -value xml:lang=en-USBeagleWorks/WordPerfect Works v1 Document/value +value xml:lang=en-USBeagleWorks/WordPerfect Works v1 Spreadsheet/value /prop prop oor:name=FileFormatVersion value0/value diff --git a/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu b/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu index 57b5879..0dad311 100644 --- a/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu +++ b/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu @@ -15,7 +15,7 @@ valuecom.sun.star.comp.Draw.MWAWDrawImportFilter/value /prop prop oor:name=UIName -value xml:lang=en-USBeagleWorks/WordPerfect Works v1 Document/value +value xml:lang=en-USBeagleWorks/WordPerfect Works v1 Drawing/value /prop prop oor:name=FileFormatVersion value0/value diff --git a/filter/source/config/fragments/filters/ClarisWorks.xcu b/filter/source/config/fragments/filters/ClarisWorks.xcu index 7fc8f99..f429d00 100644 --- a/filter/source/config/fragments/filters/ClarisWorks.xcu +++ b/filter/source/config/fragments/filters/ClarisWorks.xcu @@ -21,7 +21,7 @@ prop oor:name=FilterServicevaluecom.sun.star.comp.Writer.MWAWImportFilter/value/prop prop oor:name=UserDatavalue/value/prop prop oor:name=UIName -value xml:lang=en-USClarisWorks/AppleWorks Document/value +value xml:lang=en-USClarisWorks/AppleWorks Text Document/value /prop prop oor:name=FileFormatVersionvalue0/value/prop prop oor:name=Typevaluewriter_ClarisWorks/value/prop diff --git a/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu b/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu index 77e6fdb..aa6edbb 100644 --- a/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu +++ b/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu @@ -21,7 +21,7 @@ prop oor:name=FilterServicevaluecom.sun.star.comp.Calc.MWAWCalcImportFilter/value/prop prop oor:name=UserDatavalue/value/prop prop oor:name=UIName -value xml:lang=en-USClarisWorks/AppleWorks Document/value +value xml:lang=en-USClarisWorks/AppleWorks Spreadsheet/value /prop prop oor:name=FileFormatVersionvalue0/value/prop prop oor:name=Typevaluecalc_ClarisWorks/value/prop diff --git
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - framework/source
framework/source/services/pathsettings.cxx | 36 -
1 file changed, 31 insertions(+), 5 deletions(-)
New commits:
commit eab1b92ac3aee59ad45919d00bc63a4acba42ba8
Author: Tor Lillqvist t...@collabora.com
Date: Tue Aug 19 20:16:53 2014 +0300
bnc#529470: I can't remove a path in AutoText dialog
This is, not surprisingly, somewhat weird code, but I think this patch does
what is necessary, it does fix the bug.
Change-Id: Ie1947b311f1455ba48a904f5ef42ad92899fac31
Reviewed-on: https://gerrit.libreoffice.org/11031
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/framework/source/services/pathsettings.cxx
b/framework/source/services/pathsettings.cxx
index 7639388..11c5630 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -402,8 +402,8 @@ private:
So real user defined paths can be extracted from the list of
fix internal paths !
*/
-void impl_purgeKnownPaths(const PathSettings::PathInfo rPath,
- OUStringList lList);
+void impl_purgeKnownPaths(PathSettings::PathInfo rPath,
+ OUStringList lList);
/** rebuild the member m_lPropDesc using the path list m_lPaths. */
void impl_rebuildPropertyDescriptor();
@@ -1042,10 +1042,13 @@ OUStringList
PathSettings::impl_convertOldStyle2Path(const OUString sOldStylePa
return lList;
}
-void PathSettings::impl_purgeKnownPaths(const PathSettings::PathInfo rPath,
- OUStringList lList)
+void PathSettings::impl_purgeKnownPaths(PathSettings::PathInfo rPath,
+OUStringList lList)
{
-OUStringList::const_iterator pIt;
+OUStringList::iterator pIt;
+
+// Erase items in the internal path list from lList.
+// Also erase items in the internal path list from the user path list.
for ( pIt = rPath.lInternalPaths.begin();
pIt != rPath.lInternalPaths.end();
++pIt )
@@ -1054,7 +1057,29 @@ void PathSettings::impl_purgeKnownPaths(const
PathSettings::PathInfo rPath,
OUStringList::iterator pItem = lList.find(rItem);
if (pItem != lList.end())
lList.erase(pItem);
+pItem = rPath.lUserPaths.find(rItem);
+if (pItem != rPath.lUserPaths.end())
+rPath.lUserPaths.erase(pItem);
+}
+
+// Erase itsems not in lList from the user path list.
+pIt = rPath.lUserPaths.begin();
+while ( pIt != rPath.lUserPaths.end() )
+{
+const OUString rItem = *pIt;
+OUStringList::iterator pItem = lList.find(rItem);
+if ( pItem == lList.end() )
+{
+rPath.lUserPaths.erase(pIt);
+pIt = rPath.lUserPaths.begin();
+}
+else
+{
+++pIt;
+}
}
+
+// Erase items in the user path list from lList.
for ( pIt = rPath.lUserPaths.begin();
pIt != rPath.lUserPaths.end();
++pIt )
@@ -1065,6 +1090,7 @@ void PathSettings::impl_purgeKnownPaths(const
PathSettings::PathInfo rPath,
lList.erase(pItem);
}
+// Erase the write path from lList
OUStringList::iterator pItem = lList.find(rPath.sWritePath);
if (pItem != lList.end())
lList.erase(pItem);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/unodraw/UnoGraphicExporter.cxx |1 + svx/source/unogallery/unogalthemeprovider.cxx |1 + 2 files changed, 2 insertions(+) New commits: commit 569fbba46b41f1fe1b1e9d6a86f4d7849d537d53 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Aug 21 14:21:40 2014 +0200 Avoid incomplete type in fn sig to keep ubsan's RTTI-based checks happy Change-Id: I52fa4656248dc67d85a81271c0dcef127d5869c5 diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 71a2f82..87a1ce6 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -32,6 +32,7 @@ #include com/sun/star/task/XStatusIndicator.hpp #include com/sun/star/task/XInteractionHandler.hpp #include com/sun/star/task/XInteractionContinuation.hpp +#include com/sun/star/uno/XComponentContext.hpp #include comphelper/interaction.hxx #include framework/interaction.hxx diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index 3ccebbb..dc17c12 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -29,6 +29,7 @@ #include cppuhelper/supportsservice.hxx #include com/sun/star/gallery/XGalleryTheme.hpp #include com/sun/star/beans/PropertyValue.hpp +#include com/sun/star/uno/XComponentContext.hpp using namespace ::com::sun::star; ___ 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/OOXMLFastContextHandler.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0eabc890ccec6cf428d7e05ad994b24924596b81
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 21 14:27:38 2014 +0200
Avoid invalid downcasts
Change-Id: I8550da2c6afb4e7de394879ef75312a0c9c2df25
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 1942b90..2f7f709 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1987,7 +1987,7 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
// filter out a single token. Just hardwire the wrap token here till we
// need a more generic solution.
bool bIsWrap = Element == static_castsal_Int32(NMSP_vmlWord | XML_wrap);
-if ( bInNamespaces
((static_castOOXMLFastContextHandlerShape*(mpParent)-isShapeSent()
bIsWrap) || !bIsWrap) )
+if ( bInNamespaces ((bIsWrap
static_castOOXMLFastContextHandlerShape*(mpParent)-isShapeSent()) ||
!bIsWrap) )
xResult.set(OOXMLFactory::getInstance()-createFastChildContextFromStart(this,
Element));
else if (mxContext.is())
{
___
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/OOXMLFastContextHandler.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 67c98f6f643e8653490174fcbb7aa618b19b27e2
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 21 14:30:39 2014 +0200
Simplify ((A B) || !A) to (!A || B)
Change-Id: Iae4f45f1e64effa1369e9aba13b6b972a5ba76a0
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 2f7f709..268400d 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1987,7 +1987,7 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
// filter out a single token. Just hardwire the wrap token here till we
// need a more generic solution.
bool bIsWrap = Element == static_castsal_Int32(NMSP_vmlWord | XML_wrap);
-if ( bInNamespaces ((bIsWrap
static_castOOXMLFastContextHandlerShape*(mpParent)-isShapeSent()) ||
!bIsWrap) )
+if ( bInNamespaces (!bIsWrap ||
static_castOOXMLFastContextHandlerShape*(mpParent)-isShapeSent()) )
xResult.set(OOXMLFactory::getInstance()-createFastChildContextFromStart(this,
Element));
else if (mxContext.is())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/escherex.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1f65b5539872890197718364455c5c0aca083f12
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 21 14:34:24 2014 +0200
Avoid undefined left shift of negative values
Change-Id: I428b2401f59930e115f4b0d205f6c1db779b16f9
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 299e851..8394eb6 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2623,7 +2623,7 @@ void ConvertEnhancedCustomShapeEquation(
SdrObjCustomShape* pCustoShape,
std::vector EnhancedCustomShapeEquation ::iterator aEnd (
rEquations.end() );
while( aIter != aEnd )
{
-sal_Int32 nMask = 0x2000;
+sal_uInt32 nMask = 0x2000;
for( i = 0; i 3; i++ )
{
if ( aIter-nOperation nMask )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source include/svx
filter/source/msfilter/msdffimp.cxx |2 +-
include/svx/msdffdef.hxx|3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 60eeeb9d2fae66f2f2e85ef05feda8022a5af1cf
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 21 14:51:11 2014 +0200
Avoid undefined MSO_LineStyle values outside the enum's value range
Change-Id: Ie9eee91374818cbfbb10a7d91e0fb2114ce140b4
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 4764533..9f01e10 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5357,7 +5357,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream rSt,
? (MSO_LineStyle)GetPropertyValue(
DFF_Prop_lineStyle,
mso_lineSimple )
-: (MSO_LineStyle)USHRT_MAX;
+: MSO_LineStyle_NONE;
pTextImpRec-eLineStyle = pImpRec-eLineStyle;
pImpRec-eLineDashing = (MSO_LineDashing)GetPropertyValue(
diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx
index 924ac98..420b247 100644
--- a/include/svx/msdffdef.hxx
+++ b/include/svx/msdffdef.hxx
@@ -1002,7 +1002,8 @@ enum MSO_LineStyle {
mso_lineDouble, // Double lines of equal width
mso_lineThickThin, // Double lines, one thick, one thin
mso_lineThinThick, // Double lines, reverse order
- mso_lineTriple // Three lines, thin, thick, thin
+ mso_lineTriple, // Three lines, thin, thick, thin
+ MSO_LineStyle_NONE = USHRT_MAX
};
// MSO_LINETYPE - how to fill the line contour
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/common/JavaTools.java | 127 ++---
1 file changed, 41 insertions(+), 86 deletions(-)
New commits:
commit d14a4dc996bca209a013a89dd2bffe9301bed3dd
Author: rbuj robert@gmail.com
Date: Wed Aug 20 19:14:10 2014 +0200
wizards: Enhancements in JavaTools.java
Change-Id: Ie25b4772b34170b8ea200f1bfe6884feac49a414
Reviewed-on: https://gerrit.libreoffice.org/11049
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/wizards/com/sun/star/wizards/common/JavaTools.java
b/wizards/com/sun/star/wizards/common/JavaTools.java
index f4bb359..4f81e43 100644
--- a/wizards/com/sun/star/wizards/common/JavaTools.java
+++ b/wizards/com/sun/star/wizards/common/JavaTools.java
@@ -42,83 +42,61 @@ public class JavaTools
return sRetArray;
}
-
-
/**converts a list of Integer values included in an Integer vector to a
list of int values
*/
-public static int[] IntegerTointList(java.util.ListInteger
_aIntegerVector)
-{
-try
-{
-Integer[] nIntegerValues = new Integer[_aIntegerVector.size()];
-int[] nintValues = new int[_aIntegerVector.size()];
-_aIntegerVector.toArray(nIntegerValues);
-for (int i = 0; i nIntegerValues.length; i++)
-{
-nintValues[i] = nIntegerValues[i].intValue();
+public static int[] IntegerTointList(java.util.ListInteger
_aIntegerVector) {
+int[] nintValues = null;
+if (_aIntegerVector.size() 0) {
+int i = 0;
+nintValues = new int[_aIntegerVector.size()];
+for (Integer nIntegerValue : _aIntegerVector) {
+nintValues[i++] = nIntegerValue.intValue();
}
-return nintValues;
-}
-catch (RuntimeException e)
-{
-e.printStackTrace(System.err);
-return null;
}
+return nintValues;
}
/**converts a list of Boolean values included in a Boolean vector to a
list of boolean values
*/
-public static boolean[] BooleanTobooleanList(java.util.ListBoolean
_aBooleanVector)
-{
-try
-{
-Boolean[] bBooleanValues = new Boolean[_aBooleanVector.size()];
-boolean[] bbooleanValues = new boolean[_aBooleanVector.size()];
-_aBooleanVector.toArray(bBooleanValues);
-for (int i = 0; i bBooleanValues.length; i++)
-{
-bbooleanValues[i] = bBooleanValues[i].booleanValue();
+public static boolean[] BooleanTobooleanList(java.util.ListBoolean
_aBooleanVector) {
+boolean[] bbooleanValues = null;
+if (_aBooleanVector.size() 0) {
+int i = 0;
+bbooleanValues = new boolean[_aBooleanVector.size()];
+for (Boolean bBooleanValue : _aBooleanVector) {
+bbooleanValues[i++] = bBooleanValue.booleanValue();
}
-return bbooleanValues;
-}
-catch (RuntimeException e)
-{
-e.printStackTrace(System.err);
-return null;
}
+return bbooleanValues;
}
-
-
public static String getlongestArrayItem(String[] StringArray)
{
String sLongestItem = PropertyNames.EMPTY_STRING;
-int FieldCount = StringArray.length;
+int iCurLength;
int iOldLength = 0;
-int iCurLength = 0;
-for (int i = 0; i FieldCount; i++)
+for (String str : StringArray)
{
-iCurLength = StringArray[i].length();
+iCurLength = str.length();
if (iCurLength iOldLength)
{
iOldLength = iCurLength;
-sLongestItem = StringArray[i];
+sLongestItem = str;
}
}
return sLongestItem;
}
-public static String ArraytoString(String[] LocArray)
-{
+public static String ArraytoString(String[] LocArray) {
StringBuilder ResultString = new
StringBuilder(PropertyNames.EMPTY_STRING);
-int iLen = LocArray.length;
-for (int i = 0; i iLen; i++)
-{
-ResultString.append(LocArray[i]);
-if (i iLen - 1)
-{
+boolean bActive = false;
+for (String str : LocArray) {
+if (bActive) {
ResultString.append(PropertyNames.SEMI_COLON);
+} else {
+bActive = true;
}
+ResultString.append(str);
}
return ResultString.toString();
}
@@ -127,14 +105,10 @@ public class JavaTools
* @return the index of the field that contains the string 'SearchString'
or '-1' if not it is
* not contained within the array
*/
-public static int FieldInList(String[] SearchList, String SearchString)
-{
-int FieldLen = SearchList.length;
+public static
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/node.cxx | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
New commits:
commit de6fd1b90f6ab41b93bc15f2feb72ef0e3eb70c2
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 21 15:06:16 2014 +0200
Avoid invalid downcasts to SwFmtHeader instead of SwFmtFooter
...which only happened to work because the two classes have very similar
layout
Change-Id: Ie4bde807a2442a95ff515b065d4f45f257a32f34
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index ed224d4..bfb6d2c 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -609,12 +609,14 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
for( ; nStt nLast; ++nStt, pFmt = rPgDsc.GetLeft() )
{
-const SwFmtHeader rHdFt = (SwFmtHeader)
-pFmt-GetFmtAttr( nId );
-if( rHdFt.GetHeaderFmt() )
+const SwFrmFmt * pHdFtFmt = nId == RES_HEADER
+? static_castSwFmtHeader const (
+pFmt-GetFmtAttr(nId)).GetHeaderFmt()
+: static_castSwFmtFooter const (
+pFmt-GetFmtAttr(nId)).GetFooterFmt();
+if( pHdFtFmt )
{
-const SwFmtCntnt rCntnt =
-rHdFt.GetHeaderFmt()-GetCntnt();
+const SwFmtCntnt rCntnt =
pHdFtFmt-GetCntnt();
if( rCntnt.GetCntntIdx()
rCntnt.GetCntntIdx()-GetNode() ==
(SwNode*)pSttNd )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 6 commits - cui/source dbaccess/source include/sfx2
cui/source/customize/cfg.cxx|4 ++--
cui/source/customize/cfg.hrc|2 --
cui/source/customize/cfg.src|6 ++
cui/source/inc/cuires.hrc |8 +---
cui/source/options/dbregister.cxx |7 +--
cui/source/options/doclinkdialog.src|5 ++---
cui/source/options/optcolor.cxx |4 ++--
cui/source/options/optcolor.src |8 +++-
cui/source/options/optdict.cxx | 10 +-
cui/source/options/optdict.src |8 +++-
dbaccess/source/ui/app/AppControllerGen.cxx |3 ++-
dbaccess/source/ui/app/app.src |6 ++
dbaccess/source/ui/browser/brwctrlr.cxx |3 ++-
dbaccess/source/ui/browser/sbabrw.src |5 ++---
dbaccess/source/ui/inc/dbu_resource.hrc |7 +++
include/sfx2/sfx.hrc|2 +-
16 files changed, 37 insertions(+), 51 deletions(-)
New commits:
commit 2b65832b5853dfea1f970141acfeee46177e3799
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 21 13:27:11 2014 +0100
QueryBox QUERY_BRW_DELETE_ROWS - MessageDialog + string
Change-Id: Ifb6fb8a09cda0c868a3b4f510f6b04665cfe7597
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx
b/dbaccess/source/ui/browser/brwctrlr.cxx
index 6378211..328d0ee 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -82,6 +82,7 @@
#include svx/svxdlg.hxx
#include tools/diagnose_ex.h
#include osl/diagnose.h
+#include vcl/layout.hxx
#include vcl/msgbox.hxx
#include vcl/waitobj.hxx
@@ -1386,7 +1387,7 @@ void SbaXDataBrowserController::resetted(const
::com::sun::star::lang::EventObje
sal_Bool SbaXDataBrowserController::confirmDelete(const
::com::sun::star::sdb::RowChangeEvent /*aEvent*/) throw( RuntimeException,
std::exception )
{
-if (QueryBox(getBrowserView(), ModuleRes(QUERY_BRW_DELETE_ROWS)).Execute()
!= RET_YES)
+if (MessageDialog(getBrowserView(), ModuleRes(STR_QUERY_BRW_DELETE_ROWS),
VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO).Execute() != RET_YES)
return sal_False;
return sal_True;
diff --git a/dbaccess/source/ui/browser/sbabrw.src
b/dbaccess/source/ui/browser/sbabrw.src
index ba2620e..ba326e0 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -29,10 +29,9 @@ QueryBox QUERY_BRW_SAVEMODIFIED
Message [ en-US ] = The current record has been changed.\nDo you want to
save the changes? ;
};
-QueryBox QUERY_BRW_DELETE_ROWS
+String STR_QUERY_BRW_DELETE_ROWS
{
-Buttons = WB_YES_NO ;
-Message [ en-US ] = Do you want to delete the selected data? ;
+Text[ en-US ] = Do you want to delete the selected data? ;
};
String RID_STR_DATABROWSER_FILTERED
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc
b/dbaccess/source/ui/inc/dbu_resource.hrc
index d0d56b6..3c099f0 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -62,7 +62,7 @@
#define RID_STR_UNO_END RID_STR_UNO_START + 20// 414
- 433
#define RID_STR_GEN_START RID_STR_UNO_END
-#define RID_STR_GEN_END RID_STR_GEN_START + 61// 434
- 493
+#define RID_STR_GEN_END RID_STR_GEN_START + 62// 434
- 493
#define RID_STR_APP_START RID_STR_GEN_END
#define RID_STR_APP_END RID_STR_APP_START + 40//
494 - 533
@@ -100,7 +100,6 @@
// query boxes
-#define QUERY_BRW_DELETE_ROWS RID_QUERYBOX_START + 0
#define QUERY_BRW_SAVEMODIFIED RID_QUERYBOX_START + 1
#define QUERY_CONNECTION_LOST RID_QUERYBOX_START + 2
#define TABLE_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 5
@@ -223,7 +222,7 @@
#define STR_QRY_ORDERBY_ON_ASTERISK RID_STR_GEN_START + 58
#define STR_NEED_INDEX_FIELDS RID_STR_GEN_START + 59
#define STR_QUERY_CLOSEDOCUMENTSRID_STR_GEN_START + 60
-
+#define STR_QUERY_BRW_DELETE_ROWS RID_STR_GEN_START + 61
// untyped resources
commit 54758555e11e01eb2fcfe7c7df6feae215821029
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 21 13:19:05 2014 +0100
QueryBox APP_CLOSEDOCUMENTS - MessageDialog + string
Change-Id: Id87de082167ab775fa7072f0c96159261011e898
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx
b/dbaccess/source/ui/app/AppControllerGen.cxx
index cb3cd70..c119ced 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -61,6 +61,7 @@
#include tools/diagnose_ex.h
#include osl/diagnose.h
#include unotools/bootstrap.hxx
+#include vcl/layout.hxx
#include vcl/mnemonic.hxx
#include vcl/svapp.hxx
#include vcl/waitobj.hxx
@@ -533,7 +534,7 @@ void OApplicationController::askToReconnect()
bool bClear = true;
if ( !m_pSubComponentManager-empty() )
[Libreoffice-commits] core.git: formula/source sc/source
formula/source/core/resource/core_resource.src |3 ++-
sc/source/core/tool/compiler.cxx |1 +
sc/source/filter/excel/xlformula.cxx |3 ++-
sc/source/filter/oox/formulabase.cxx |3 ++-
4 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 7c6a82d66ebe55fa5ce106bf60f841dd7758d2bc
Author: Eike Rathke er...@redhat.com
Date: Thu Aug 21 15:06:46 2014 +0200
write COLOR function with extension namespace
and add to Excel import/export maps so it survives saving in that format
Change-Id: I3a8e07fdd1bded77d4bad60eefffeb0b1dbdd734
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 259eda0..6f7f8d5 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -423,7 +423,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
/* END defined ERROR.TYPE() values. */
String SC_OPCODE_FILTERXML { Text = COM.MICROSOFT.FILTERXML;};
String SC_OPCODE_WEBSERVICE{ Text = COM.MICROSOFT.WEBSERVICE; };
-String SC_OPCODE_COLOR { Text = COLOR; };
+String SC_OPCODE_COLOR { Text = ORG.LIBREOFFICE.COLOR; };
String SC_OPCODE_ERF_MS { Text = COM.MICROSOFT.ERF.PRECISE ; };
String SC_OPCODE_ERFC_MS { Text = COM.MICROSOFT.ERFC.PRECISE ; };
};
@@ -830,6 +830,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
/* END defined ERROR.TYPE() values. */
String SC_OPCODE_FILTERXML { Text = _xlfn.FILTERXML;};
String SC_OPCODE_WEBSERVICE{ Text = _xlfn.WEBSERVICE; };
+String SC_OPCODE_COLOR { Text = _xlfn.ORG.LIBREOFFICE.COLOR; };
String SC_OPCODE_ERF_MS { Text = _xlfn.ERF.PRECISE ; };
String SC_OPCODE_ERFC_MS { Text = _xlfn.ERFC.PRECISE ; };
};
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 2d7694d..788dd0e 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2424,6 +2424,7 @@ bool ScCompiler::IsOpCode( const OUString rName, bool
bInArray )
{ TDIST, ocTDist }, // TDIST - LEGACY.TDIST
{ EASTERSUNDAY, ocEasterSunday }, // EASTERSUNDAY -
ORG.OPENOFFICE.EASTERSUNDAY
{ ZGZ,ocZGZ },// ZGZ - RRI
+{ COLOR, ocColor }, // COLOR -
ORG.LIBREOFFICE.COLOR
// Renamed new names, prepare to read future names:
{ ORG.OPENOFFICE.GOALSEEK, ocBackSolver } // GOALSEEK -
ORG.OPENOFFICE.GOALSEEK
};
diff --git a/sc/source/filter/excel/xlformula.cxx
b/sc/source/filter/excel/xlformula.cxx
index 3944c57..abb9c2d 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -589,7 +589,8 @@ static const XclFunctionInfo saFuncTable_Odf[] =
/** Functions defined by Calc, but not in OpenFormula nor supported by Excel.
*/
static const XclFunctionInfo saFuncTable_OOoLO[] =
{
-EXC_FUNCENTRY_OOO( ocConvert, 3, 3, 0, ORG.OPENOFFICE.CONVERT )
+EXC_FUNCENTRY_OOO( ocConvert, 3, 3, 0, ORG.OPENOFFICE.CONVERT ),
+EXC_FUNCENTRY_OOO( ocColor, 3, 4, 0, ORG.LIBREOFFICE.COLOR )
};
#undef EXC_FUNCENTRY_OOO
diff --git a/sc/source/filter/oox/formulabase.cxx
b/sc/source/filter/oox/formulabase.cxx
index b866a77..2459791 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -917,7 +917,8 @@ static const FunctionData saFuncTableOOoLO[] =
{ ORG.OPENOFFICE.WEEKSINYEAR,
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETWEEKSINYEAR, NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
{ ORG.OPENOFFICE.ROT13,
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETROT13, NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
// Other functions.
-{ ORG.OPENOFFICE.CONVERT, ORG.OPENOFFICE.CONVERT, NOID, NOID,
3, 3, V, { VR }, FUNCFLAG_MACROCALL_NEW }
+{ ORG.OPENOFFICE.CONVERT, ORG.OPENOFFICE.CONVERT, NOID, NOID,
3, 3, V, { VR }, FUNCFLAG_MACROCALL_NEW },
+{ ORG.LIBREOFFICE.COLOR, ORG.LIBREOFFICE.COLOR,NOID, NOID,
3, 4, V, { VR }, FUNCFLAG_MACROCALL_NEW }
};
const sal_Unicode API_TOKEN_OPEN= '(';
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/ui/src/scfuncs.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4282b6455c76cadd39961ed85c26cad2e2757248 Author: Eike Rathke er...@redhat.com Date: Thu Aug 21 13:52:41 2014 +0200 add missing parameter flag in dbgutil build gave: warn:legacy.osl:27022:1:tools/source/rc/resmgr.cxx:701: file:///build/libo/dev/instdir/program/../program/resource/scen-US.res Class: 272, Id: 436. Classpointer not at the end! Resource Stack Class: 272, Id: 25044 and the following value of the suppress flag was taken in place of the parameter flag, which was identical and didn't harm in this case, but ... Change-Id: I951381ef2a5c2d7d7d44892ad5c34ea77ace51ce (cherry picked from commit c08fea639ca1a757df086ffe34f2bd5cf6573b6c) Reviewed-on: https://gerrit.libreoffice.org/11058 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src index f8e1264..c4a9d6c 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -8149,7 +8149,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 0; ID_FUNCTION_GRP_STATISTIC; U2S( HID_FUNC_HYP_GEOM_DIST_MS ); -5; 0; 0; 0; 0; +5; 0; 0; 0; 0; 0; 0; }; String 2 // Name of Parameter 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/xmlsourcedialog.ui | 28 ++-- 1 file changed, 22 insertions(+), 6 deletions(-) New commits: commit e903d3ab049237b3588d1baea23b4c5ada17c34c Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Thu Aug 21 08:50:47 2014 -0300 fdo#80367 (part) help pages fo Calc XML source Implement help button for Calc Data-XML Source Change-Id: Ic1097b13c1d2266a8a1f21a4cbc9d416aacba892 Reviewed-on: https://gerrit.libreoffice.org/11055 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/sc/uiconfig/scalc/ui/xmlsourcedialog.ui b/sc/uiconfig/scalc/ui/xmlsourcedialog.ui index 9f2ed4b..700dc56 100644 --- a/sc/uiconfig/scalc/ui/xmlsourcedialog.ui +++ b/sc/uiconfig/scalc/ui/xmlsourcedialog.ui @@ -1,7 +1,13 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.16.1 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ !-- interface-requires LibreOffice 1.0 -- + object class=GtkImage id=image1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixbufsc/res/file.png/property + /object object class=GtkDialog id=XMLSourceDialog property name=can_focusFalse/property property name=border_width6/property @@ -233,6 +239,21 @@ property name=position1/property /packing /child +child + object class=GtkButton id=help +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property +property name=yalign0.5501192092896/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child /object packing property name=expandFalse/property @@ -248,9 +269,4 @@ action-widget response=0cancel/action-widget /action-widgets /object - object class=GtkImage id=image1 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=pixbufsc/res/file.png/property - /object /interface ___ 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' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3d765cb9fde4f2bd10f04f694e6e23fa8bc1ceae Author: Andras Timar andras.ti...@collabora.com Date: Thu Aug 21 12:15:09 2014 +0200 Updated core Project: help 888531eda1e60931d7bf6923710cea396de9166d remove conditional text, because wiki conversion fails on it Change-Id: I184d58b0c58feee11010cd174e31641f4dc170ed Reviewed-on: https://gerrit.libreoffice.org/11053 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index df7ec41..888531e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit df7ec418465546ee71f8855a44759918b8f362db +Subproject commit 888531eda1e60931d7bf6923710cea396de9166d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'libreoffice-4-3' - source/text
source/text/shared/guide/macro_recording.xhp | 14 ++ 1 file changed, 2 insertions(+), 12 deletions(-) New commits: commit 888531eda1e60931d7bf6923710cea396de9166d Author: Andras Timar andras.ti...@collabora.com Date: Thu Aug 21 12:15:09 2014 +0200 remove conditional text, because wiki conversion fails on it Change-Id: I184d58b0c58feee11010cd174e31641f4dc170ed Reviewed-on: https://gerrit.libreoffice.org/11053 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/source/text/shared/guide/macro_recording.xhp b/source/text/shared/guide/macro_recording.xhp index db5e208..c6c3481 100644 --- a/source/text/shared/guide/macro_recording.xhp +++ b/source/text/shared/guide/macro_recording.xhp @@ -35,8 +35,6 @@ /bookmark paragraph role=heading id=hd_id3093440 xml-lang=en-US level=1 l10n=U oldref=1variable id=macro_recordinglink href=text/shared/guide/macro_recording.xhp name=Recording a MacroRecording a Macro/link /variable/paragraph -switch select=appl -case select=WRITERsection id=macrorecorder list type=ordered listitem paragraph role=listitem id=par_id3154749 xml-lang=en-US l10n=U oldref=4Open the document for which you want to record a macro./paragraph @@ -92,14 +90,6 @@ /list embed href=text/shared/00/0004.xhp#related/ paragraph role=paragraph id=par_id3156422 xml-lang=en-US l10n=Clink href=text/shared/01/0613.xhp name=MacroMacro/link/paragraph -paragraph role=paragraph id=par_id3147576 xml-lang=en-US l10n=U oldref=2link href=text/shared/main0600.xhp name=macro programming in $[officename]Programming in %PRODUCTNAME/link/paragraphcommenthow-to running a macro/commentcommenthow-to testing and debugging a macro/comment/section -/case -case select=CALCembed href=text/shared/guide/macro_recording.xhp#macrorecorder/ -/case -case select=BASICembed href=text/shared/guide/macro_recording.xhp#macrorecorder/ -/case -default -paragraph role=paragraph id=par_id7797242 xml-lang=en-US l10n=NEWThe macro recording functionality is only available for text documents in %PRODUCTNAME Writer and for spreadsheets in %PRODUCTNAME Calc./paragraph -/default -/switch/body +paragraph role=paragraph id=par_id3147576 xml-lang=en-US l10n=U oldref=2link href=text/shared/main0600.xhp name=macro programming in $[officename]Programming in %PRODUCTNAME/link/paragraph +/body /helpdocument ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2ced4d39cc1b8de233cd886d3ef991b3079500d2 Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 21 14:16:13 2014 +0100 linux_powerpc64le-linux_powerpc64_le to match dp_platform.cxx Change-Id: Ib63e5a28d7ff12780a1051d94c5976244eab1814 diff --git a/configure.ac b/configure.ac index 5304644..03d08f5 100644 --- a/configure.ac +++ b/configure.ac @@ -4384,7 +4384,7 @@ linux-gnu*) CPUNAME=POWERPC64 RTL_ARCH=PowerPC_64_LE LIB64=lib64 -PLATFORMID=linux_powerpc64le +PLATFORMID=linux_powerpc64_le OUTPATH=unxlngppc64 ;; sparc) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/sdt-company-multipara.docx |binary
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx|9
sw/source/filter/ww8/docxattributeoutput.cxx | 16 ++-
sw/source/filter/ww8/docxattributeoutput.hxx |2 +
writerfilter/source/ooxml/modelpreprocess.py |5
5 files changed, 26 insertions(+), 6 deletions(-)
New commits:
commit 60974f5643745b7714b5a8629d9c574224b67e8c
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Aug 21 15:09:29 2014 +0200
DOCX export: prevent multiple paragraphs in some SDT containers
E.g. Word doesn't do anything if you hit return in the middle of a
title; if that's so, then we should handle this situation on export as
well.
Change-Id: Ib5b52a59250b09c97023b53906b8046f530d0e31
diff --git a/sw/qa/extras/ooxmlexport/data/sdt-company-multipara.docx
b/sw/qa/extras/ooxmlexport/data/sdt-company-multipara.docx
new file mode 100644
index 000..96d25ff
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/sdt-company-multipara.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index d52423f..9a8951d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -628,6 +628,15 @@ DECLARE_OOXMLEXPORT_TEST(testSdtHeader, sdt-header.docx)
assertXPath(pXmlDoc, //w:sdt/w:sdtPr/w:date, 1);
}
+DECLARE_OOXMLEXPORT_TEST(testSdtCompanyMultipara, sdt-company-multipara.docx)
+{
+if (xmlDocPtr pXmlDoc = parseExport(word/document.xml))
+{
+// This was 3, but multiple paragraphs inside Company SDT is now
allowed.
+assertXPath(pXmlDoc, //w:sdtContent/w:p, 1);
+}
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 5e59bcc..f6ec6e3 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -223,6 +223,12 @@ void DocxAttributeOutput::RTLAndCJKState( bool bIsRTL,
sal_uInt16 /*nScript*/ )
m_pSerializer-singleElementNS( XML_w, XML_rtl, FSNS( XML_w, XML_val
), true, FSEND );
}
+/// Are multiple paragraphs disallowed inside this type of SDT?
+static bool lcl_isOnelinerSdt(const OUString rName)
+{
+return rName == Title || rName == Subtitle || rName == Company;
+}
+
void DocxAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t
pTextNodeInfo )
{
if ( m_nColBreakStatus == COLBRK_POSTPONE )
@@ -292,12 +298,15 @@ void DocxAttributeOutput::StartParagraph(
ww8::WW8TableNodeInfo::Pointer_t pText
bEndParaSdt = m_bStartedParaSdt rMap.find(ParaSdtEndBefore)
!= rMap.end();
}
}
-if (bEndParaSdt || (m_bStartedParaSdt m_bHadSectPr))
+// TODO also avoid multiline paragarphs in those SDT types for shape text
+bool bOneliner = m_bStartedParaSdt
!m_rExport.SdrExporter().IsDMLAndVMLDrawingOpen()
lcl_isOnelinerSdt(m_aStartedParagraphSdtPrAlias);
+if (bEndParaSdt || (m_bStartedParaSdt m_bHadSectPr) || bOneliner)
{
// This is the common case: close sdt before the current paragraph
was requrested by the next paragraph.
EndSdtBlock();
bEndParaSdt = false;
m_bStartedParaSdt = false;
+m_aStartedParagraphSdtPrAlias = ;
}
m_bHadSectPr = false;
@@ -7951,6 +7960,7 @@ void DocxAttributeOutput::ParaGrabBag(const
SfxGrabBagItem rItem)
{
if (!(aPropertyValue.Value = m_aParagraphSdtPrAlias))
SAL_WARN(sw.ww8, DocxAttributeOutput::ParaGrabBag:
unexpected sdt alias value);
+m_aStartedParagraphSdtPrAlias = m_aParagraphSdtPrAlias;
}
else if (aPropertyValue.Name == ooxml:CT_SdtPr_checkbox)
{
@@ -8007,6 +8017,10 @@ void DocxAttributeOutput::ParaGrabBag(const
SfxGrabBagItem rItem)
uno::Sequencebeans::PropertyValue aAttributes = i-second.get
uno::Sequencebeans::PropertyValue ();
m_pTableStyleExport-CnfStyle(aAttributes);
}
+else if (i-first == ParaSdtEndBefore)
+{
+// Handled already in StartParagraph().
+}
else
SAL_WARN(sw.ww8, DocxAttributeOutput::ParaGrabBag: unhandled
grab bag property i-first );
}
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index d0bfe92..1277203 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -911,6 +911,8 @@ private:
::sax_fastparser::FastAttributeList *m_pRunSdtPrDataBindingAttrs;
/// Value of the w:alias paragraph SDT element.
OUString m_aParagraphSdtPrAlias;
+/// Same as m_aParagraphSdtPrAlias, but its content is aviailable till the
SDT is closed.
[Libreoffice-commits] core.git: formula/source sc/source
formula/source/core/resource/core_resource.src |2 +-
sc/source/core/tool/compiler.cxx |3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit fe4d72b56319fe7820d973794fc937d79aeec64a
Author: Eike Rathke er...@redhat.com
Date: Thu Aug 21 15:41:03 2014 +0200
it's about time to write GOALSEEK as ODFF ORG.OPENOFFICE.GOALSEEK
Change-Id: Ie5a0464b49baae62e217e87f4d0040151f3aa8a5
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 6f7f8d5..b6816c7 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -287,7 +287,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_MAT_MULT { Text = MMULT ; };
String SC_OPCODE_MAT_TRANS { Text = TRANSPOSE ; };
String SC_OPCODE_MATRIX_UNIT { Text = MUNIT ; };
-String SC_OPCODE_BACK_SOLVER { Text = GOALSEEK ; };
+String SC_OPCODE_BACK_SOLVER { Text = ORG.OPENOFFICE.GOALSEEK ; };
String SC_OPCODE_HYP_GEOM_DIST { Text = HYPGEOMDIST ; };
String SC_OPCODE_HYP_GEOM_DIST_MS { Text = COM.MICROSOFT.HYPGEOM.DIST ;
};
String SC_OPCODE_LOG_NORM_DIST { Text = LOGNORMDIST ; };
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 788dd0e..93d8f19 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2425,8 +2425,9 @@ bool ScCompiler::IsOpCode( const OUString rName, bool
bInArray )
{ EASTERSUNDAY, ocEasterSunday }, // EASTERSUNDAY -
ORG.OPENOFFICE.EASTERSUNDAY
{ ZGZ,ocZGZ },// ZGZ - RRI
{ COLOR, ocColor }, // COLOR -
ORG.LIBREOFFICE.COLOR
+{ GOALSEEK, ocBackSolver } // GOALSEEK -
ORG.OPENOFFICE.GOALSEEK
// Renamed new names, prepare to read future names:
-{ ORG.OPENOFFICE.GOALSEEK, ocBackSolver } // GOALSEEK -
ORG.OPENOFFICE.GOALSEEK
+//{ ORG.OPENOFFICE.XXX, ocXXX } // XXX -
ORG.OPENOFFICE.XXX
};
static const size_t nOdffAliases = sizeof(aOdffAliases) /
sizeof(aOdffAliases[0]);
for (size_t i=0; inOdffAliases; ++i)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/app.cxx|7 +++
sfx2/source/appl/appserv.cxx| 21 +++--
sfx2/source/dialog/dinfdlg.cxx |4 ++--
sfx2/source/dialog/templdlg.cxx |3 +--
sfx2/source/dialog/versdlg.cxx | 11 ---
sfx2/source/doc/objserv.cxx | 20 +++-
sfx2/source/view/viewprn.cxx|6 +++---
7 files changed, 27 insertions(+), 45 deletions(-)
New commits:
commit 24c1a1b38b68cf5357dcc2d4c799378ccc6d34f5
Author: Takeshi Abe t...@fixedpoint.jp
Date: Thu Aug 21 22:54:27 2014 +0900
Avoid possible memory leaks in case of exceptions
Change-Id: I95a769fe436a79a1e236c5504d1d5b288b3da71a
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 848c7a4..72e2a0f 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -116,6 +116,7 @@
#include unotools/extendedsecurityoptions.hxx
#include rtl/instance.hxx
#include rtl/strbuf.hxx
+#include boost/scoped_ptr.hpp
using namespace ::com::sun::star;
@@ -561,8 +562,8 @@ SfxApplication::ChooseScript()
const SfxFrame* pFrame = pViewFrame ? pViewFrame-GetFrame() : NULL;
uno::Reference frame::XFrame xFrame( pFrame ?
pFrame-GetFrameInterface() : uno::Reference frame::XFrame () );
- AbstractScriptSelectorDialog* pDlg =
-pFact-CreateScriptSelectorDialog( NULL, false, xFrame );
+boost::scoped_ptrAbstractScriptSelectorDialog pDlg(
+pFact-CreateScriptSelectorDialog( NULL, false, xFrame ));
SAL_INFO( sfx.appl, done, now exec it);
@@ -574,8 +575,6 @@ SfxApplication::ChooseScript()
{
aScriptURL = pDlg-GetScriptURL();
}
-
- delete pDlg;
}
#endif
return aScriptURL;
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 08adac7..2de745f 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -118,6 +118,7 @@
#include officecfg/Office/Common.hxx
#include officecfg/Setup.hxx
+#include boost/scoped_ptr.hpp
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
@@ -357,9 +358,9 @@ void SfxApplication::MiscExec_Impl( SfxRequest rReq )
if ( pFrameItem )
xFrame = pFrameItem-GetFrame();
-SfxAbstractTabDialog* pDlg = pFact-CreateTabDialog(
+boost::scoped_ptrSfxAbstractTabDialog
pDlg(pFact-CreateTabDialog(
RID_SVXDLG_CUSTOMIZE,
-NULL, aSet, xFrame );
+NULL, aSet, xFrame ));
if ( pDlg )
{
@@ -367,8 +368,6 @@ void SfxApplication::MiscExec_Impl( SfxRequest rReq )
if ( nRet )
bDone = true;
-
-delete pDlg;
}
}
break;
@@ -529,9 +528,8 @@ void SfxApplication::MiscExec_Impl( SfxRequest rReq )
SfxAbstractDialogFactory* pFact =
SfxAbstractDialogFactory::Create();
if ( pFact )
{
-VclAbstractDialog* pDlg = pFact-CreateVclDialog( 0,
RID_DEFAULTABOUT );
+boost::scoped_ptrVclAbstractDialog
pDlg(pFact-CreateVclDialog( 0, RID_DEFAULTABOUT ));
pDlg-Execute();
-delete pDlg;
bDone = true;
}
break;
@@ -1163,8 +1161,8 @@ void SfxApplication::OfaExec_Impl( SfxRequest rReq )
do // artificial loop for flow control
{
-AbstractScriptSelectorDialog* pDlg =
pFact-CreateScriptSelectorDialog(
-lcl_getDialogParent( xFrame, GetTopWindow() ), false,
xFrame );
+boost::scoped_ptrAbstractScriptSelectorDialog
pDlg(pFact-CreateScriptSelectorDialog(
+lcl_getDialogParent( xFrame, GetTopWindow() ), false,
xFrame ));
OSL_ENSURE( pDlg, SfxApplication::OfaExec_Impl( SID_RUNMACRO
): no dialog! );
if ( !pDlg )
break;
@@ -1172,10 +1170,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest rReq )
short nDialogResult = pDlg-Execute();
if ( !nDialogResult )
-{
-delete pDlg;
break;
-}
Sequence Any args;
Sequence sal_Int16 outIndex;
@@ -1193,7 +1188,6 @@ void SfxApplication::OfaExec_Impl( SfxRequest rReq )
xScriptContext = xController;
SfxObjectShell::CallXScript( xScriptContext,
pDlg-GetScriptURL(), args, ret, outIndex, outArgs );
-delete pDlg;
}
while ( false );
rReq.Done();
@@ -1259,9 +1253,8 @@ void SfxApplication::OfaExec_Impl( SfxRequest rReq )
if ( pSet pSet-GetItemState( pSetPool-GetWhich(
SID_AUTO_CORRECT_DLG ), false, pItem ) == SFX_ITEM_SET )
aSet.Put( *pItem );
-
[Libreoffice-commits] core.git: 3 commits - dbaccess/source
dbaccess/source/ui/browser/sbabrw.src|5 ++---
dbaccess/source/ui/dlg/UserAdmin.cxx |3 +--
dbaccess/source/ui/dlg/UserAdmin.src |5 ++---
dbaccess/source/ui/inc/dbu_resource.hrc |8
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx |6 +++---
dbaccess/source/ui/tabledesign/TableController.cxx |4 ++--
dbaccess/source/ui/tabledesign/table.src |6 ++
7 files changed, 16 insertions(+), 21 deletions(-)
New commits:
commit 7e61e4f32aed3822b1f1e08db460085536a0ca28
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 21 14:25:22 2014 +0100
QueryBox QUERY_SAVE_TABLE_EDIT_INDEXES - MessageDialog + string
Change-Id: I36e6d376936caa847e68a43f64c8fe892afba1ca
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc
b/dbaccess/source/ui/inc/dbu_resource.hrc
index 62fc267..dae43c4 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -62,7 +62,7 @@
#define RID_STR_UNO_END RID_STR_UNO_START + 20// 414
- 433
#define RID_STR_GEN_START RID_STR_UNO_END
-#define RID_STR_GEN_END RID_STR_GEN_START + 64// 434
- 493
+#define RID_STR_GEN_END RID_STR_GEN_START + 65// 434
- 493
#define RID_STR_APP_START RID_STR_GEN_END
#define RID_STR_APP_END RID_STR_APP_START + 40//
494 - 533
@@ -103,7 +103,6 @@
#define QUERY_BRW_SAVEMODIFIED RID_QUERYBOX_START + 1
#define TABLE_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 5
#define QUERY_SAVE_CURRENT_INDEXRID_QUERYBOX_START + 7
-#define QUERY_SAVE_TABLE_EDIT_INDEXES RID_QUERYBOX_START + 8
#define RELATION_DESIGN_SAVEMODIFIEDRID_QUERYBOX_START + 9
#define TABLE_DESIGN_ALL_ROWS_DELETED RID_QUERYBOX_START + 13
@@ -223,6 +222,7 @@
#define STR_QUERY_BRW_DELETE_ROWS RID_STR_GEN_START + 61
#define STR_QUERY_CONNECTION_LOST RID_STR_GEN_START + 62
#define STR_QUERY_USERADMIN_DELETE_USER RID_STR_GEN_START + 63
+#define STR_QUERY_SAVE_TABLE_EDIT_INDEXES RID_STR_GEN_START + 64
// untyped resources
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx
b/dbaccess/source/ui/tabledesign/TableController.cxx
index f95f098..b2565c9 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -65,7 +65,7 @@
#include cppuhelper/exc_hlp.hxx
#include sfx2/sfxsids.hrc
#include tools/diagnose_ex.h
-#include vcl/msgbox.hxx
+#include vcl/layout.hxx
#include boost/mem_fn.hpp
#include boost/bind.hpp
@@ -447,7 +447,7 @@ void OTableController::doEditIndexes()
// table needs to be saved before editing indexes
if (m_bNew || isModified())
{
-QueryBox aAsk(getView(), ModuleRes(QUERY_SAVE_TABLE_EDIT_INDEXES));
+MessageDialog aAsk(getView(),
ModuleRes(STR_QUERY_SAVE_TABLE_EDIT_INDEXES), VCL_MESSAGE_QUESTION,
VCL_BUTTONS_YES_NO);
if (RET_YES != aAsk.Execute())
return;
diff --git a/dbaccess/source/ui/tabledesign/table.src
b/dbaccess/source/ui/tabledesign/table.src
index ffe5403..dcc6d51 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -343,11 +343,9 @@ String STR_TABLEDESIGN_DATASOURCE_DELETED
Text [ en-US ] = The table filter could not be adjusted because the data
source has been deleted.;
};
-QueryBox QUERY_SAVE_TABLE_EDIT_INDEXES
+String STR_QUERY_SAVE_TABLE_EDIT_INDEXES
{
-Message [ en-US ] = Before you can edit the indexes of a table, you have
to save it.\nDo you want to save the changes now?;
-
-Buttons = WB_YES_NO ;
+Text [ en-US ] = Before you can edit the indexes of a table, you have to
save it.\nDo you want to save the changes now?;
};
String STR_TABLEDESIGN_NO_PRIM_KEY_HEAD
commit 650bdfb2df1c0cb908b48d7f8419cafbc06447aa
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 21 14:20:31 2014 +0100
QueryBox QUERY_USERADMIN_DELETE_USER - MessageDialog + string
Change-Id: Iedccb1ace9f74d92f09cc6ca23f9aaf004fa05f2
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx
b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 83be777..d6dc4f2 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -37,7 +37,6 @@
#include dbadmin.hxx
#include moduledbu.hxx
#include vcl/layout.hxx
-#include vcl/msgbox.hxx
#include sfx2/passwd.hxx
using namespace ::com::sun::star::container;
@@ -239,7 +238,7 @@ IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton )
ReferenceXDrop xDrop(m_xUsers,UNO_QUERY);
if(xDrop.is())
{
-QueryBox aQry(this,
ModuleRes(QUERY_USERADMIN_DELETE_USER));
+MessageDialog aQry(this,
ModuleRes(STR_QUERY_USERADMIN_DELETE_USER), VCL_MESSAGE_QUESTION,
[Libreoffice-commits] core.git: icon-themes/galaxy
icon-themes/galaxy/brand_dev/intro.png |binary 1 file changed New commits: commit 7aac7d175605e1bb94c3967c294ed7f915a5603a Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Sat Aug 2 15:24:21 2014 -0500 Resolves: fdo#79172 dev builds were misleadingly labeled 'beta' ... but actual beta builds have no label. This commit GIMPs development branding so that it reads 'development build' instead of 'beta'. Change-Id: I5a7a7f480b97bec5afe54c366bf21e93e49b320b Reviewed-on: https://gerrit.libreoffice.org/10313 Reviewed-by: Tor Lillqvist t...@collabora.com Tested-by: Tor Lillqvist t...@collabora.com diff --git a/icon-themes/galaxy/brand_dev/intro.png b/icon-themes/galaxy/brand_dev/intro.png index 28bc099..7d0eda1 100644 Binary files a/icon-themes/galaxy/brand_dev/intro.png and b/icon-themes/galaxy/brand_dev/intro.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java | 16 +---
1 file changed, 1 insertion(+), 15 deletions(-)
New commits:
commit 8daebc0c343f79e6ded1f35a19ed83358ec3fcb3
Author: rbuj robert@gmail.com
Date: Thu Aug 21 13:04:37 2014 +0200
jvmfwk: Removes the checking for W98 in JREProperties.java
Change-Id: Ia5be6b5893abef084b5e4203f9f02919289ce055
Reviewed-on: https://gerrit.libreoffice.org/11054
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
b/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
index 525fb22..3f7bc48 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
+++ b/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
@@ -43,27 +43,13 @@ public class JREProperties
bNoAccess = true;
}
-//Find out on what operation system we are running. On Windows 98
-//we must not call getDefaultToolkit, because the office may freeze
-//#i44608.
-boolean bW98 = false;
-String os = System.getProperty(os.name);
-
-if (os != null)
-{
-os = os.trim();
-if (os.equalsIgnoreCase(Windows 98) ||
-os.indexOf(Windows 98) != -1)
-bW98 = true;
-}
-
//We need to be able to switch this part off because
//it causes an exception if the DISPLAY variable has
//a false value. Setting the noaccessibility argument
//can be done by providing a sunjavaplugin.ini with
//the bootstrap parameter JFW_PLUGIN_NO_NOT_CHECK_ACCESSIBILITY
//set to 1
-if (!bNoAccess ! bW98)
+if (!bNoAccess)
{
try{
//This line is needed to get the accessibility properties
___
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' - solenv/gdb
solenv/gdb/libreoffice/sw.py |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit 1a3dc6f8051060588eb242e377efc5c67e51bf67 Author: Michael Stahl mst...@redhat.com Date: Tue Aug 19 15:48:31 2014 +0200 gdb: print the SwNodeIndex properly if there are multiple blocks Change-Id: I178d365e71ef3377b1a2cfc115bb297640161efe (cherry picked from commit 4f211a0d0c4ef0c248fd3d4493994c1a122c2eb9) Reviewed-on: https://gerrit.libreoffice.org/11045 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py index 515718e..97cba13 100644 --- a/solenv/gdb/libreoffice/sw.py +++ b/solenv/gdb/libreoffice/sw.py @@ -19,8 +19,10 @@ class SwPositionPrinter(object): def to_string(self): node = self.value['nNode']['pNd'].dereference(); +block = node['pBlock'].dereference(); +nodeindex = block['nStart'] + node['nOffset'] offset = self.value['nContent']['m_nIndex'] -return %s (node %d, offset %d) % (self.typename, node['nOffset'], offset) +return %s (node %d, offset %d) % (self.typename, nodeindex, offset) class SwNodeIndexPrinter(object): '''Prints SwNodeIndex.''' @@ -31,7 +33,9 @@ class SwNodeIndexPrinter(object): def to_string(self): node = self.value['pNd'].dereference(); -return %s (node %d) % (self.typename, node['nOffset']) +block = node['pBlock'].dereference(); +nodeindex = block['nStart'] + node['nOffset'] +return %s (node %d) % (self.typename, nodeindex) class SwIndexPrinter(object): '''Prints SwIndex.''' ___ 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' - solenv/gdb
solenv/gdb/libreoffice/sw.py |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit 32b385b99346e5bb0e5b1c514a52496cd0e5a646 Author: Michael Stahl mst...@redhat.com Date: Tue Aug 19 15:48:31 2014 +0200 gdb: print the SwNodeIndex properly if there are multiple blocks Change-Id: I178d365e71ef3377b1a2cfc115bb297640161efe (cherry picked from commit 4f211a0d0c4ef0c248fd3d4493994c1a122c2eb9) Reviewed-on: https://gerrit.libreoffice.org/11047 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py index 515718e..97cba13 100644 --- a/solenv/gdb/libreoffice/sw.py +++ b/solenv/gdb/libreoffice/sw.py @@ -19,8 +19,10 @@ class SwPositionPrinter(object): def to_string(self): node = self.value['nNode']['pNd'].dereference(); +block = node['pBlock'].dereference(); +nodeindex = block['nStart'] + node['nOffset'] offset = self.value['nContent']['m_nIndex'] -return %s (node %d, offset %d) % (self.typename, node['nOffset'], offset) +return %s (node %d, offset %d) % (self.typename, nodeindex, offset) class SwNodeIndexPrinter(object): '''Prints SwNodeIndex.''' @@ -31,7 +33,9 @@ class SwNodeIndexPrinter(object): def to_string(self): node = self.value['pNd'].dereference(); -return %s (node %d) % (self.typename, node['nOffset']) +block = node['pBlock'].dereference(); +nodeindex = block['nStart'] + node['nOffset'] +return %s (node %d) % (self.typename, nodeindex) class SwIndexPrinter(object): '''Prints SwIndex.''' ___ 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/source
sw/source/filter/ww8/ww8par.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit efe7ae87c98eb472f5fb8cb3be9c1e00864d8f09 Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 21 12:59:50 2014 +0100 avoid crash on document ending before contained table ends Change-Id: I003b7e00673cd5a4b4f0ed5218e2d30cfef04ffb (cherry picked from commit 5a2123376dc010ca4e3f0a19d7dbbfaeb25ea963) Reviewed-on: https://gerrit.libreoffice.org/11056 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index d9335411..a775e71 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5348,6 +5348,8 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition rPos) UpdatePageDescs(rDoc, nPageDescOffset); +SAL_WARN_IF(mpTableEndPaM, sw.ww8, document ended without table ending); +mpTableEndPaM.reset(); //ensure this is deleted before pPaM delete pPaM, pPaM = 0; return nErrRet; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
sw/source/filter/ww8/ww8par.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit da1b74b4d8707948740d37059b1ea49b6cff9364 Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 21 12:59:50 2014 +0100 avoid crash on document ending before contained table ends Change-Id: I003b7e00673cd5a4b4f0ed5218e2d30cfef04ffb (cherry picked from commit 5a2123376dc010ca4e3f0a19d7dbbfaeb25ea963) Reviewed-on: https://gerrit.libreoffice.org/11057 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 21ba56d..b07a5d0 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5323,6 +5323,8 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition rPos) UpdatePageDescs(rDoc, nPageDescOffset); +SAL_WARN_IF(mpTableEndPaM, sw.ww8, document ended without table ending); +mpTableEndPaM.reset(); //ensure this is deleted before pPaM delete pPaM, pPaM = 0; return nErrRet; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart_opengl_window' - 2 commits - chart2/source
chart2/source/controller/main/ChartWindow.cxx | 18 +++---
chart2/source/view/charttypes/GL3DBarChart.cxx |7 +++
2 files changed, 18 insertions(+), 7 deletions(-)
New commits:
commit a17fc5252bedac1eadbad8f68adea043a27c84ac
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Thu Aug 21 17:02:32 2014 +0200
Reinitialize GL3D renderer when OpenGL window is changed
Without it when we switch sheets in Calc or slides in Impress
and go back to that page where the GL3DBar chart is then the
renderer does not work.
Change-Id: I9aa6203ed5aa7f94627d886b2f2e5ad34d493843
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 75449b4..af6f20c 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -939,7 +939,14 @@ void GL3DBarChart::contextDestroyed()
void GL3DBarChart::setOpenGLWindow(OpenGLWindow* pWindow)
{
if (mpWindow != pWindow)
+{
mpWindow = pWindow;
+Size aSize = mpWindow-GetSizePixel();
+mpRenderer-SetSize(aSize);
+mpWindow-setRenderer(this);
+mpRenderer-init();
+mbValidContext = true;
+}
}
}
commit 1c42b785884eb97daeb861f958a4d84457a44e71
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Thu Aug 21 16:00:14 2014 +0200
Don't create an OpenGL window in case of normal charts.
Change-Id: Idb4506712d3902c12aa881a85ddf69a281edff82
diff --git a/chart2/source/controller/main/ChartWindow.cxx
b/chart2/source/controller/main/ChartWindow.cxx
index 40e6933..dde5006 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -49,7 +49,7 @@ ChartWindow::ChartWindow( ChartController* pController,
Window* pParent, WinBits
: Window(pParent, nStyle)
, m_pWindowController( pController )
, m_bInPaint(false)
-, m_pOpenGLWindow(new OpenGLWindow(this))
+, m_pOpenGLWindow(getenv(CHART_DUMMY_FACTORY) ? new
OpenGLWindow(this) : 0)
{
this-SetHelpId( HID_SCH_WIN_DOCUMENT );
this-SetMapMode( MapMode(MAP_100TH_MM) );
@@ -60,11 +60,14 @@ ChartWindow::ChartWindow( ChartController* pController,
Window* pParent, WinBits
if( pParent )
pParent-EnableRTL( false );// #i96215# necessary for a correct
position of the context menu in rtl mode
-m_pOpenGLWindow-Show();
-uno::Reference chart2::X3DChartWindowProvider
x3DWindowProvider(pController-getModel(), uno::UNO_QUERY_THROW);
-sal_uInt64 nWindowPtr = reinterpret_castsal_uInt64(m_pOpenGLWindow);
-x3DWindowProvider-setWindow(nWindowPtr);
-x3DWindowProvider-update();
+if( m_pOpenGLWindow )
+{
+m_pOpenGLWindow-Show();
+uno::Reference chart2::X3DChartWindowProvider
x3DWindowProvider(pController-getModel(), uno::UNO_QUERY_THROW);
+sal_uInt64 nWindowPtr = reinterpret_castsal_uInt64(m_pOpenGLWindow);
+x3DWindowProvider-setWindow(nWindowPtr);
+x3DWindowProvider-update();
+}
}
ChartWindow::~ChartWindow()
@@ -150,7 +153,8 @@ void ChartWindow::Resize()
else
Window::Resize();
-m_pOpenGLWindow-SetSizePixel(GetSizePixel());
+if( m_pOpenGLWindow )
+m_pOpenGLWindow-SetSizePixel(GetSizePixel());
}
void ChartWindow::Activate()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
minutes of ESC call ...
* Present: + Cloph, Stephan, Andras, David, Michael M, Eike, Caolan, Robinson, Norbert, Bjoern, Fridrich, Thorsten, Lionel, Miklos, Markus, Michael S, Adam, Muthu * Completed Action Items: + Ask for 1-2 more dev-list moderators re-visit next-week (Michael) [ currently quite quiet - large wave has vanished ]. + help Cloph with the quickstarter disabling (Andras) https://bugs.freedesktop.org/show_bug.cgi?id=80927 https://gerrit.libreoffice.org/#/c/10817/ https://gerrit.libreoffice.org/#/c/10669/ Patches in gerrit to disable quickstarter completely. No objections to have that included; all merged - will be in 4.3.1 release. * Pending Action Items: + ask UX advise wrt. wrench icons (revert or not ?) (Astron) + blog about the sad realities of web plugins (Bjoern) + open-source newer Synezip tests / speak at the conference (Umesh) + contact Michael / the list when students show up (Jan Marek) * GSOC Update (Fridrich) + Evaluation deadline is tomorrow - but everything is filed already + 100% pass-rate, should be grateful for that. + not a bad year at all. AI: + Get work / screenshots into the 4.4 feature list (Students) https://wiki.documentfoundation.org/ReleaseNotes/4.4 + Integrated PageMaker filter, 0.0.1 release + Linked frames - looking good + refactor huge objects -- looking fine, good progress there + Tiled rendering excellent - for calc still pending * Release Engineering update (Christian) + 4.3.1 RC2 somewhat delayed / tagging tomorrow + 4.2.7 - due in week 40 - 29th Sept freeze. + Potential for new incremental releases sooner. + Android Remote * FOSDEM room + deadline for dev room proposal, September, 15th AI: + reach out to work out what to do (Thorsten) * OSX 10.6 for 4.4 ? (Michael) + need 10.8 for OpenGL support (Markus) + Goal is to go there (Norbert) AI: + fix the 4.4 feature page (Norbert): + https://wiki.documentfoundation.org/ReleaseNotes/4.4#Mac_OS_X * Crashtest update (Markus) + http://dev-builds.libreoffice.org/crashtest/66c6d1ef204f3507e7663a1b8b1be05b9ec71092/ + new results look quite good, fixing appreciated. + script will from now on mail the dev list when it finishes + Caolan old CVE documents through CERT's 'Basic File Fuzzer' + doing a number of fixes there. + option to run these in an automated way + need someone to tend Markus' builds while he's away - 5x weeks. + check that the VM is still running, not hanging in an infinite loop etc. AI: + take care of crash-test / VM maintenance in September/October (Miklos) * Certification Committee (Stephan/Bjoern/Kendy) + waiting until ~September after the conf. * USA Hackfest update (Michael) + Boston Hackfest + Amazon / VMs were awesome - thanks Cloph. + great way to ge started. * Hackfests (Bjoern) + Seattle 'Libre-Fest' (Robinson) https://wiki.documentfoundation.org/Events/2014/Seattle_LibreFest + October 26, 2014 + Bug-triaging/Intro-to-community event + Following SeaGL conference + Munich hack-fest (Jan-Marek): http://www.it-muenchen-blog.de/2014/07/bug-squashing-party-2014/ + will have a BSP come-together; if someone says they're coming just show up etc. + November 21st-23rd, 2014 https://wiki.debian.org/BSP/2014/11/de/Munich + we should drop by with 2 or 3 developers, if possible + Toulouse Hackfest ... + Confirmed for Nov. 15-16th + more details: https://wiki.documentfoundation.org/Hackfest/Toulouse2014 + Be great to have -really- easy easy hacks for devs (Bjoern) * ~25 LiMux Mail Merge patches: + https://gerrit.libreoffice.org/#/q/owner:%22Jan-Marek+Glogowski%22+status:open,n,z + volunteer reviewers wanted ;) + is it sufficiently bad it can't get worse ? (Michael) + nearly - except its so bad it is also fragile (Bjoern) + Bjoern + Michael S to have a look at some stage. * QA (Robinson) + UNCONFIRMED count increasing. Recruiting again. + Multiple q's/bugs filed re: video playback support in Impress https://bugs.freedesktop.org/show_bug.cgi?id=79546 - OSX (plays in QT, not in LO) + Do we document our policy for video/audio playback? (using system framework) + Status of VLC support? + https://wiki.documentfoundation.org/Development/GSoC/Successfully_Implemented_Ideas#VLC_integration + Different support on different distros (Bjoern) + VLC is not ideal - not a multimedia framework; eg. playing live video to thumbnail etc. + We use the native platform multimedia framework (Michael) + There is no good cross-platform mm format that works with all codecs out of the box. +
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx | 17 1 file changed, 17 insertions(+) New commits: commit 4c5bbbf059924f3aa24620a4cbbc35816978a606 Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 21 15:44:03 2014 +0100 Related: rhbz#1125588 get as far as privateSnippetExecutor Change-Id: Icc386083ecd9faefbedebbb9d2496a4eddfa0b2b diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx index 1190507..479444a 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx @@ -588,7 +588,11 @@ extern C void privateSnippetExecutor( ... ) } } +#if _CALL_ELF == 2 +const int codeSnippetSize = 32; +#else const int codeSnippetSize = 24; +#endif unsigned char * codeSnippet( unsigned char * code, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, bool simpleRetType) @@ -603,9 +607,22 @@ unsigned char * codeSnippet( unsigned char * code, sal_Int32 nFunctionIndex, sa if ( !simpleRetType ) nOffsetAndIndex |= 0x8000; +#if _CALL_ELF == 2 +unsigned int *raw = (unsigned int *)code[0]; + +raw[0] = 0xe96c0018;/* 0: ld 11,2f-0b(12)*/ +raw[1] = 0xe98c0010;/* ld 12,1f-0b(12)*/ +raw[2] = 0x7d8903a6;/* mtctr 12 */ +raw[3] = 0x4e800420;/* bctr*/ +/* 1: .quad function_addr */ +/* 2: .quad context */ +*(void **)raw[4] = (void *)privateSnippetExecutor; +*(void **)raw[6] = (void*)nOffsetAndIndex; +#else void ** raw = (void **)code[0]; memcpy(raw, (char*) privateSnippetExecutor, 16); raw[2] = (void*) nOffsetAndIndex; +#endif #if OSL_DEBUG_LEVEL 2 fprintf(stderr, in: offset/index is %x %x %d, %lx\n, nFunctionIndex, nVtableOffset, !simpleRetType, raw[2]); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/vba/service.cxx | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
New commits:
commit 6006747f0e728b162c433185c46e6bf74a26b395
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 21 17:22:20 2014 +0200
Fix *_component_getFactory function type
Change-Id: I0f2fedc544349a69f29df5e83bec30ea510125f5
diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx
index 8b3dc9e..d7e84d67 100644
--- a/sw/source/ui/vba/service.cxx
+++ b/sw/source/ui/vba/service.cxx
@@ -23,9 +23,6 @@
// component exports
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-
namespace sdecl = comphelper::service_decl;
namespace globals
@@ -54,11 +51,13 @@ extern sdecl::ServiceDecl const serviceDecl;
}
extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL vbaswobj_component_getFactory(
-const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
-registry::XRegistryKey * pRegistryKey )
+const sal_Char * pImplName, void * pServiceManager,
+void * pRegistryKey )
{
-void* pRet = component_getFactoryHelper(pImplName, pServiceManager,
-pRegistryKey, globals::serviceDecl, ::document::serviceDecl,
+void* pRet = component_getFactoryHelper(pImplName,
+static_castcss::lang::XMultiServiceFactory *(pServiceManager),
+static_castcss::registry::XRegistryKey *(pRegistryKey),
+globals::serviceDecl, ::document::serviceDecl,
wrapformat::serviceDecl, vbaeventshelper::serviceDecl );
OSL_TRACE(Ret is 0x%p, pRet);
return pRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/dispatchwatcher.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 495fe3bc22cfd09b79db1d822ef25ad5145a281d
Author: Maxim Monastirsky momonas...@gmail.com
Date: Wed Aug 20 02:01:56 2014 +0300
queryTypeByURL returns type name not filter name
Change-Id: Iad8f2b718af0c947d151f4bbfdcb575440396ff2
diff --git a/desktop/source/app/dispatchwatcher.cxx
b/desktop/source/app/dispatchwatcher.cxx
index 01d082e..eba914d 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -133,10 +133,10 @@ const SfxFilter* impl_getExportFilterFromUrl( const
rtl::OUString rUrl, const r
const Reference document::XTypeDetection xTypeDetector(
xContext-getServiceManager()-createInstanceWithContext(
com.sun.star.document.TypeDetection, xContext ),
UNO_QUERY_THROW );
-const rtl::OUString aFilterName( xTypeDetector-queryTypeByURL( rUrl ) );
+const rtl::OUString aTypeName( xTypeDetector-queryTypeByURL( rUrl ) );
-const SfxFilter* pFilter( SfxFilter::GetFilterByName( aFilterName ) );
-if ( !pFilter || !pFilter-CanExport() )
+const SfxFilter* pFilter( SfxGetpApp()-GetFilterMatcher().GetFilter4EA(
aTypeName, SFX_FILTER_EXPORT ) );
+if ( !pFilter )
pFilter = impl_lookupExportFilterForUrl( rUrl, rFactory );
if ( !pFilter )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit d8fcd8ca9af087e98a2f6d9cbcf6eb42cddd0c74 Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 21 16:33:47 2014 +0100 Related: rhbz#1125588 get to the end of cpp_mediate on ppc64le Change-Id: Id3928ef5ac68ea13a7aa8723bc8b068ecf8075a0 diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx index 479444a..c0ca97f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx @@ -326,7 +326,11 @@ static typelib_TypeClass cpp2uno_call( } } - +#if _CALL_ELF == 2 +# define PARAMSAVE 32 +#else +# define PARAMSAVE 48 +#endif static typelib_TypeClass cpp_mediate( sal_uInt64 nOffsetAndIndex, @@ -339,7 +343,7 @@ static typelib_TypeClass cpp_mediate( sal_Int32 nFunctionIndex = (nOffsetAndIndex 0x); long sf = *(long*)sp; -void ** ovrflw = (void**)(sf + 112); +void ** ovrflw = (void**)(sf + PARAMSAVE + 64); // gpreg: [ret *], this, [other gpr params] // fpreg: [fpr params] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/source
scripting/source/provider/MasterScriptProvider.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit bf640ba048704220292411e4f2bcc0d3c62caa32
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 21 17:44:40 2014 +0200
Fix *_component_getFactory function type
Change-Id: Id16c653554f5573dc862e0798747b7337ff74d44
diff --git a/scripting/source/provider/MasterScriptProvider.cxx
b/scripting/source/provider/MasterScriptProvider.cxx
index 8d0385c..8f59d97 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -900,8 +900,8 @@ extern C
*/
SAL_DLLPUBLIC_EXPORT void * SAL_CALL scriptframe_component_getFactory(
const sal_Char * pImplName,
-lang::XMultiServiceFactory * pServiceManager,
-registry::XRegistryKey * pRegistryKey )
+void * pServiceManager,
+void * pRegistryKey )
{
return ::cppu::component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey, ::scripting_runtimemgr::s_entries );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/source
scripting/source/basprov/basprov.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c7d7582452e8a6ebbe337d8083e8f660f63d6a96
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 21 17:49:13 2014 +0200
Fix *_component_getFactory function type
Change-Id: I966824af73effed95d975c09cb8a7f9ae022843f
diff --git a/scripting/source/basprov/basprov.cxx
b/scripting/source/basprov/basprov.cxx
index 0f27e92..843beef 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -535,8 +535,8 @@ namespace basprov
extern C
{
SAL_DLLPUBLIC_EXPORT void * SAL_CALL basprov_component_getFactory(
-const sal_Char * pImplName, lang::XMultiServiceFactory *
pServiceManager,
-registry::XRegistryKey * pRegistryKey )
+const sal_Char * pImplName, void * pServiceManager,
+void * pRegistryKey )
{
return ::cppu::component_getFactoryHelper(
pImplName, pServiceManager, pRegistryKey,
::basprov::s_component_entries );
___
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
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8a6a1e8ba291302c44067cd5c40063f9d76ee48c
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Thu Aug 21 18:18:28 2014 +0200
fix(?) windows build
Change-Id: Idc57210f23f1a053fc21d47e85206f55704c5880
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index fdcab8a..5590246 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3628,8 +3628,6 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80898, fdo80898.docx)
/word/embeddings/oleObject1.doc);
}
-#endif
-
DECLARE_OOXMLEXPORT_TEST(testFirstHeaderFooter, first-header-footer.docx)
{
// Test import and export of a section's headerf/footerf properties.
@@ -3658,6 +3656,8 @@ DECLARE_OOXMLEXPORT_TEST(testFooterBodyDistance,
footer-body-distance.docx)
assertXPath(pXmlDoc, /w:document/w:body/w:p/w:r/w:br, 1);
}
+#endif
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/css1atr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2e13f4e3df13d44c549467d4a9aaa1f3ff83d567
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 21 18:42:57 2014 +0200
RES_PARATR_ORPHANS comes before RES_PARATR_WIDOWS
Change-Id: Iaf1891738fb3673c41b3af724f8494306578c512
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index 4fbe398..4251557 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -3556,8 +3556,8 @@ SwAttrFnTab aCSS1AttrFnTab = {
/* RES_PARATR_LINESPACING */ OutCSS1_SvxLineSpacing,
/* RES_PARATR_ADJUST*/ OutCSS1_SvxAdjust,
/* RES_PARATR_SPLIT */ OutCSS1_SvxFmtSplit,
-/* RES_PARATR_WIDOWS*/ OutCSS1_SvxWidows,
/* RES_PARATR_ORPHANS */ OutCSS1_SvxOrphans,
+/* RES_PARATR_WIDOWS*/ OutCSS1_SvxWidows,
/* RES_PARATR_TABSTOP */ 0,
/* RES_PARATR_HYPHENZONE*/ 0,
/* RES_PARATR_DROP */ OutCSS1_SwFmtDrop,
___
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' - formula/source sc/source
formula/source/core/resource/core_resource.src |3 ++-
sc/source/core/tool/compiler.cxx |1 +
sc/source/filter/excel/xlformula.cxx |3 ++-
sc/source/filter/oox/formulabase.cxx |3 ++-
4 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit ad592d8fbc7797641c4ca9c967aad47ab22e6f9c
Author: Eike Rathke er...@redhat.com
Date: Thu Aug 21 15:06:46 2014 +0200
write COLOR function with extension namespace
and add to Excel import/export maps so it survives saving in that format
Change-Id: I3a8e07fdd1bded77d4bad60eefffeb0b1dbdd734
(cherry picked from commit 7c6a82d66ebe55fa5ce106bf60f841dd7758d2bc)
Reviewed-on: https://gerrit.libreoffice.org/11059
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 259eda0..6f7f8d5 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -423,7 +423,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
/* END defined ERROR.TYPE() values. */
String SC_OPCODE_FILTERXML { Text = COM.MICROSOFT.FILTERXML;};
String SC_OPCODE_WEBSERVICE{ Text = COM.MICROSOFT.WEBSERVICE; };
-String SC_OPCODE_COLOR { Text = COLOR; };
+String SC_OPCODE_COLOR { Text = ORG.LIBREOFFICE.COLOR; };
String SC_OPCODE_ERF_MS { Text = COM.MICROSOFT.ERF.PRECISE ; };
String SC_OPCODE_ERFC_MS { Text = COM.MICROSOFT.ERFC.PRECISE ; };
};
@@ -830,6 +830,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
/* END defined ERROR.TYPE() values. */
String SC_OPCODE_FILTERXML { Text = _xlfn.FILTERXML;};
String SC_OPCODE_WEBSERVICE{ Text = _xlfn.WEBSERVICE; };
+String SC_OPCODE_COLOR { Text = _xlfn.ORG.LIBREOFFICE.COLOR; };
String SC_OPCODE_ERF_MS { Text = _xlfn.ERF.PRECISE ; };
String SC_OPCODE_ERFC_MS { Text = _xlfn.ERFC.PRECISE ; };
};
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 0af9ad3..cd9bc4d 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2372,6 +2372,7 @@ bool ScCompiler::IsOpCode( const OUString rName, bool
bInArray )
{ TDIST, ocTDist }, // TDIST - LEGACY.TDIST
{ EASTERSUNDAY, ocEasterSunday }, // EASTERSUNDAY -
ORG.OPENOFFICE.EASTERSUNDAY
{ ZGZ,ocZGZ },// ZGZ - RRI
+{ COLOR, ocColor }, // COLOR -
ORG.LIBREOFFICE.COLOR
// Renamed new names, prepare to read future names:
{ ORG.OPENOFFICE.GOALSEEK, ocBackSolver } // GOALSEEK -
ORG.OPENOFFICE.GOALSEEK
};
diff --git a/sc/source/filter/excel/xlformula.cxx
b/sc/source/filter/excel/xlformula.cxx
index ff3d1c7..675cee4 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -593,7 +593,8 @@ static const XclFunctionInfo saFuncTable_Odf[] =
/** Functions defined by Calc, but not in OpenFormula nor supported by Excel.
*/
static const XclFunctionInfo saFuncTable_OOoLO[] =
{
-EXC_FUNCENTRY_OOO( ocConvert, 3, 3, 0, ORG.OPENOFFICE.CONVERT )
+EXC_FUNCENTRY_OOO( ocConvert, 3, 3, 0, ORG.OPENOFFICE.CONVERT ),
+EXC_FUNCENTRY_OOO( ocColor, 3, 4, 0, ORG.LIBREOFFICE.COLOR )
};
#undef EXC_FUNCENTRY_OOO
diff --git a/sc/source/filter/oox/formulabase.cxx
b/sc/source/filter/oox/formulabase.cxx
index 590384c..7a1e78c 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -918,7 +918,8 @@ static const FunctionData saFuncTableOOoLO[] =
{ ORG.OPENOFFICE.WEEKSINYEAR,
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETWEEKSINYEAR, NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
{ ORG.OPENOFFICE.ROT13,
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETROT13, NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
// Other functions.
-{ ORG.OPENOFFICE.CONVERT, ORG.OPENOFFICE.CONVERT, NOID, NOID,
3, 3, V, { VR }, FUNCFLAG_MACROCALL_NEW }
+{ ORG.OPENOFFICE.CONVERT, ORG.OPENOFFICE.CONVERT, NOID, NOID,
3, 3, V, { VR }, FUNCFLAG_MACROCALL_NEW },
+{ ORG.LIBREOFFICE.COLOR, ORG.LIBREOFFICE.COLOR,NOID, NOID,
3, 4, V, { VR }, FUNCFLAG_MACROCALL_NEW }
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 62 commits - bin/lo-pack-sources chart2/source comphelper/source configure.ac connectivity/source cui/source editeng/CppunitTest_edit
bin/lo-pack-sources |4 chart2/source/view/main/ChartView.cxx | 33 - comphelper/source/container/embeddedobjectcontainer.cxx | 36 +- configure.ac | 16 connectivity/source/drivers/dbase/DTable.cxx | 15 connectivity/source/parse/sqlbison.y |4 cui/source/tabpages/numfmt.cxx | 18 - editeng/CppunitTest_editeng_core.mk |1 editeng/qa/unit/core-test.cxx | 100 + editeng/source/editeng/editdoc.cxx | 173 ++ editeng/source/editeng/editdoc.hxx | 12 editeng/source/editeng/impedit4.cxx |6 filter/source/graphicfilter/itiff/itiff.cxx | 60 ++- framework/inc/services/pathsettings.hxx |4 framework/source/services/pathsettings.cxx | 32 + i18npool/source/localedata/localedata.cxx |2 include/comphelper/embeddedobjectcontainer.hxx |3 include/oox/helper/graphichelper.hxx |3 include/sfx2/styledlg.hxx |3 oox/source/drawingml/chart/chartspaceconverter.cxx |9 oox/source/drawingml/chart/modelbase.cxx |3 oox/source/drawingml/chart/objectformatter.cxx | 11 oox/source/drawingml/chart/seriesconverter.cxx |5 oox/source/drawingml/textbodypropertiescontext.cxx |6 oox/source/helper/graphichelper.cxx |5 oox/source/ppt/pptimport.cxx |6 sc/inc/column.hxx |7 sc/inc/document.hxx |8 sc/inc/formulacell.hxx |1 sc/inc/table.hxx | 12 sc/source/core/data/column.cxx | 27 - sc/source/core/data/column2.cxx | 22 - sc/source/core/data/column4.cxx | 46 +- sc/source/core/data/documen4.cxx | 11 sc/source/core/data/documen7.cxx | 40 ++ sc/source/core/data/document10.cxx | 17 sc/source/core/data/formulacell.cxx | 51 -- sc/source/core/data/table2.cxx |7 sc/source/core/data/table3.cxx |8 sc/source/core/data/table4.cxx |6 sc/source/core/data/table7.cxx | 29 + sc/source/core/tool/token.cxx |5 sc/source/filter/excel/excrecds.cxx |5 sc/source/filter/excel/xeescher.cxx |5 sc/source/filter/inc/xeescher.hxx |2 sc/source/filter/oox/revisionfragment.cxx
[Libreoffice-commits] core.git: sw/CppunitTest_sw_tox.mk sw/CppunitTest_sw_uwriter.mk sw/Module_sw.mk sw/qa
sw/CppunitTest_sw_tox.mk | 87 --- sw/CppunitTest_sw_uwriter.mk |3 sw/Module_sw.mk |4 - sw/qa/cppunit/tox/test_ToxWhitespaceStripper.cxx |3 4 files changed, 3 insertions(+), 94 deletions(-) New commits: commit d2a4e7c7f70a0ff0769ed228320833fa6b29bff9 Author: Michael Stahl mst...@redhat.com Date: Thu Aug 21 20:44:03 2014 +0200 sw: _one_ unit test with use_library_objects sw ought to be enough Linking those things takes a lot of RAM. Change-Id: I4db9ee3f07f97601d526ab3f905ecadbf4c552ca diff --git a/sw/CppunitTest_sw_tox.mk b/sw/CppunitTest_sw_tox.mk deleted file mode 100644 index 25ab0fc..000 --- a/sw/CppunitTest_sw_tox.mk +++ /dev/null @@ -1,87 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -# This file contains the unit test definition for class in the sources/core/tox subfolder -# The macro which defines the main method is contained in test_ToxWhitespaceStripper.cxx - -$(eval $(call gb_CppunitTest_CppunitTest,sw_tox)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sw_tox, \ - sw/qa/cppunit/tox/test_ToxWhitespaceStripper \ - sw/qa/cppunit/tox/test_ToxLinkProcessor \ - sw/qa/cppunit/tox/test_ToxTextGenerator \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sw_tox, \ - $(call gb_Helper_optional,AVMEDIA,avmedia) \ - basegfx \ - comphelper \ - cppu \ - cppuhelper \ - drawinglayer \ - editeng \ - i18nlangtag \ - i18nutil \ - lng \ - sal \ - salhelper \ - sax \ - sb \ - sfx \ - sot \ - svl \ - svt \ - svx \ - svxcore \ - test \ - unotest \ - vcl \ - tk \ - tl \ - ucbhelper \ - utl \ - xmlreader \ - xo \ - $(gb_UWINAPI) \ -)) - -$(eval $(call gb_CppunitTest_use_library_objects,sw_tox, \ - sw \ -)) - -$(eval $(call gb_CppunitTest_use_externals,sw_tox, \ - boost_headers \ - icuuc \ - libxml2 \ -)) - -$(eval $(call gb_CppunitTest_use_api,sw_tox,\ - offapi \ - udkapi \ -)) - -$(eval $(call gb_CppunitTest_use_components,sw_tox, \ - configmgr/source/configmgr \ - framework/util/fwk \ - i18npool/util/i18npool \ - ucb/source/core/ucb1 \ - ucb/source/ucp/file/ucpfile1 \ -)) - -$(eval $(call gb_CppunitTest_use_configuration,sw_tox)) -$(eval $(call gb_CppunitTest_use_ure,sw_tox)) -$(eval $(call gb_CppunitTest_use_vcl,sw_tox)) - -$(eval $(call gb_CppunitTest_set_include,sw_tox,\ --I$(SRCDIR)/sw/inc \ --I$(SRCDIR)/sw/source/core/inc \ -$$(INCLUDE) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk index 495d088..287399a 100644 --- a/sw/CppunitTest_sw_uwriter.mk +++ b/sw/CppunitTest_sw_uwriter.mk @@ -14,6 +14,9 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_uwriter)) $(eval $(call gb_CppunitTest_add_exception_objects,sw_uwriter, \ sw/qa/core/uwriter \ sw/qa/core/Test-BigPtrArray \ + sw/qa/cppunit/tox/test_ToxWhitespaceStripper \ + sw/qa/cppunit/tox/test_ToxLinkProcessor \ + sw/qa/cppunit/tox/test_ToxTextGenerator \ )) $(eval $(call gb_CppunitTest_use_library_objects,sw_uwriter,sw)) diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index 7e645c8..33ea3f7 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -46,10 +46,6 @@ $(eval $(call gb_Module_add_targets,sw,\ endif -$(eval $(call gb_Module_add_check_targets,sw,\ -CppunitTest_sw_tox \ -)) - $(eval $(call gb_Module_add_slowcheck_targets,sw,\ CppunitTest_sw_uwriter \ CppunitTest_sw_htmlexport \ diff --git a/sw/qa/cppunit/tox/test_ToxWhitespaceStripper.cxx b/sw/qa/cppunit/tox/test_ToxWhitespaceStripper.cxx index adaffd9..30da0bd 100644 --- a/sw/qa/cppunit/tox/test_ToxWhitespaceStripper.cxx +++ b/sw/qa/cppunit/tox/test_ToxWhitespaceStripper.cxx @@ -18,7 +18,6 @@ #include cppunit/TestAssert.h #include cppunit/TestFixture.h #include cppunit/extensions/HelperMacros.h -#include cppunit/plugin/TestPlugIn.h using namespace sw; @@ -145,6 +144,4 @@ ToxWhitespaceStripperTest::PositionAfterStringCanBeRequested() // Put the test suite in the registry CPPUNIT_TEST_SUITE_REGISTRATION(ToxWhitespaceStripperTest); -CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - desktop/source
desktop/source/app/dispatchwatcher.cxx | 50 +
1 file changed, 15 insertions(+), 35 deletions(-)
New commits:
commit 9df3a83c304f3dd0e0233d234dc6036ab5eefb77
Author: Maxim Monastirsky momonas...@gmail.com
Date: Thu Aug 21 22:01:19 2014 +0300
Base the convert-to detection on the actual service
There is no need to run a type detection on the input
file (for a second time!), just to get the document service.
This also simplifies the conversion of some generic formats
like HTML and RTF, using Calc export filters. Previously
setting both input and output filters was required. Now it's
enough to set the input filter, or simply use --calc.
Change-Id: I825e0fe3e7368d6649acb434b13de53a4523064a
diff --git a/desktop/source/app/dispatchwatcher.cxx
b/desktop/source/app/dispatchwatcher.cxx
index 318fe67..f26d17c 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -151,41 +151,14 @@ catch ( const Exception )
return 0;
}
-
-static OUString impl_GetFilterFromExt( const OUString aUrl, SfxFilterFlags
nFlags,
-const OUString aAppl )
+OUString impl_GuessFilter( const OUString rUrlOut, const OUString
rDocService )
{
-OUString aFilter;
-SfxMedium* pMedium = new SfxMedium( aUrl,
-STREAM_STD_READ );
-
-const SfxFilter *pSfxFilter = NULL;
-if( nFlags == SFX_FILTER_EXPORT )
-{
-pSfxFilter = impl_getExportFilterFromUrl( aUrl, aAppl );
-}
-else
-{
-SfxGetpApp()-GetFilterMatcher().GuessFilter( *pMedium, pSfxFilter,
nFlags );
-}
-
-if( pSfxFilter )
-{
-if (nFlags == SFX_FILTER_EXPORT)
-aFilter = pSfxFilter-GetFilterName();
-else
-aFilter = pSfxFilter-GetServiceName();
-}
+OUString aOutFilter;
+const SfxFilter* pOutFilter = impl_getExportFilterFromUrl( rUrlOut,
rDocService );
+if (pOutFilter)
+aOutFilter = pOutFilter-GetFilterName();
-delete pMedium;
-return aFilter;
-}
-static OUString impl_GuessFilter( const OUString aUrlIn, const OUString
aUrlOut )
-{
-/* aAppl can also be set to Factory like scalc, swriter... */
-OUString aAppl;
-aAppl = impl_GetFilterFromExt( aUrlIn, SFX_FILTER_IMPORT, aAppl );
-return impl_GetFilterFromExt( aUrlOut, SFX_FILTER_EXPORT, aAppl );
+return aOutFilter;
}
}
@@ -545,7 +518,14 @@ bool DispatchWatcher::executeDispatchRequests( const
DispatchList aDispatchRequ
if ( bGuess )
{
-aFilter = impl_GuessFilter( aName, aOutFile );
+OUString aDocService;
+Reference XModel xModel( xDoc, UNO_QUERY );
+if ( xModel.is() )
+{
+utl::MediaDescriptor aMediaDesc(
xModel-getArgs() );
+aDocService =
aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTSERVICE(),
OUString() );
+}
+aFilter = impl_GuessFilter( aOutFile,
aDocService );
}
sal_Int32 nFilterOptionsIndex = aFilter.indexOf(
':' );
commit cebfcbd456ddfbd7291c85c6a6c329df165ccd3c
Author: Maxim Monastirsky momonas...@gmail.com
Date: Thu Aug 21 22:47:52 2014 +0300
Better to use an instance with a doc service specified
...to avoid detection of filter from other services, and to
additionally check for filters other than the preferred
by the type (see SfxFilterMatcher::GetFilterForProps).
Change-Id: I64609b32f6aac7553b4b6b96db88acfcad0ce000
diff --git a/desktop/source/app/dispatchwatcher.cxx
b/desktop/source/app/dispatchwatcher.cxx
index eba914d..318fe67 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -135,7 +135,7 @@ const SfxFilter* impl_getExportFilterFromUrl( const
rtl::OUString rUrl, const r
UNO_QUERY_THROW );
const rtl::OUString aTypeName( xTypeDetector-queryTypeByURL( rUrl ) );
-const SfxFilter* pFilter( SfxGetpApp()-GetFilterMatcher().GetFilter4EA(
aTypeName, SFX_FILTER_EXPORT ) );
+const SfxFilter* pFilter( SfxFilterMatcher( rFactory ).GetFilter4EA(
aTypeName, SFX_FILTER_EXPORT ) );
if ( !pFilter )
pFilter = impl_lookupExportFilterForUrl( rUrl, rFactory );
if ( !pFilter )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/compiler.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 07b18860ae03ecb66b5605201f34c2aef3a55ad6
Author: Eike Rathke er...@redhat.com
Date: Fri Aug 22 00:11:18 2014 +0200
out-of-bounds string access
... when parsing ='foo'# with no character following.
Change-Id: Id65fce721cb47a4d3c947c677323bdcaa2ce957f
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 93d8f19..8c3e485 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -426,7 +426,7 @@ static bool lcl_isValidQuotedText( const OUString
rFormula, sal_Int32 nSrcPos,
// but '' marks an escaped '
// We've earlier guaranteed that a string containing '' will be
// surrounded by '
-if (rFormula[nSrcPos] == '\'')
+if (nSrcPos rFormula.getLength() rFormula[nSrcPos] == '\'')
{
sal_Int32 nPos = nSrcPos+1;
while (nPos rFormula.getLength())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: formula/source sc/source
formula/source/ui/dlg/formula.cxx |2 -
sc/source/filter/oox/workbookhelper.cxx |2 +
sc/source/ui/app/scmod.cxx |6 ++-
sc/source/ui/docshell/docsh.cxx |2 +
sc/source/ui/docshell/docsh3.cxx|2 -
sc/source/ui/docshell/docsh6.cxx| 54
sc/source/ui/inc/docsh.hxx |2 -
7 files changed, 46 insertions(+), 24 deletions(-)
New commits:
commit c0aba5007b6e468336b41138f099914c32f4b0cf
Author: Eike Rathke er...@redhat.com
Date: Thu Aug 21 23:14:52 2014 +0200
fdo#82183 do not reset globals while loading a document
Destroying the function list while an instance of the Formula Wizard is
still open is a bad idea. Workaround not doing this when loading a
document due to a DDE function or external reference being entered in
the wizard.
Change-Id: I6fa00fb4f442bf7c9410679e446ff460289e4b16
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index 3377565..5a2710c 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -1831,7 +1831,7 @@ void FormulaDlg::StoreFormEditData(FormEditData* pData)
const IFunctionDescription* FormulaDlg::getCurrentFunctionDescription() const
{
-OSL_VERIFY(!m_pImpl-pFuncDesc ||
m_pImpl-pFuncDesc-getSuppressedArgumentCount() == m_pImpl-nArgs);
+//OSL_VERIFY(!m_pImpl-pFuncDesc ||
m_pImpl-pFuncDesc-getSuppressedArgumentCount() == m_pImpl-nArgs);
return m_pImpl-pFuncDesc;
}
diff --git a/sc/source/filter/oox/workbookhelper.cxx
b/sc/source/filter/oox/workbookhelper.cxx
index 048f754..bfe360e 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -675,6 +675,8 @@ void WorkbookGlobals::recalcFormulaCells()
officecfg::Office::Calc::Formula::Load::OOXMLRecalcMode::set(sal_Int32(0),
batch);
ScFormulaOptions aOpt = SC_MOD()-GetFormulaOptions();
aOpt.SetOOXMLRecalcOptions(bHardRecalc ? RECALC_ALWAYS :
RECALC_NEVER);
+/** XXX is this really supposed to set the ScModule options?
+Not the ScDocShell options? */
SC_MOD()-SetFormulaOptions(aOpt);
batch-commit();
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 84eddf0..040e16e 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1034,13 +1034,15 @@ void ScModule::ModifyOptions( const SfxItemSet rOptSet
)
if (pFormulaCfg pFormulaCfg-GetCalcConfig() !=
rOpt.GetCalcConfig())
bCalcAll = true;
-SetFormulaOptions( rOpt );
-
if ( pDocSh )
{
pDocSh-SetFormulaOptions( rOpt );
pDocSh-SetDocumentModified();
}
+
+// ScDocShell::SetFormulaOptions() may check for changed settings, so
+// set the new options here after that has been called.
+SetFormulaOptions( rOpt );
}
// ViewOptions
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 92cc36c..bc1d284 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -484,6 +484,8 @@ bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const
::com::sun::star::uno::R
officecfg::Office::Calc::Formula::Load::ODFRecalcMode::set(sal_Int32(0), batch);
ScFormulaOptions aOpt = SC_MOD()-GetFormulaOptions();
aOpt.SetODFRecalcOptions(bHardRecalc ? RECALC_ALWAYS :
RECALC_NEVER);
+/** XXX is this really supposed to set the ScModule options?
+Not the ScDocShell options? */
SC_MOD()-SetFormulaOptions(aOpt);
batch-commit();
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 8544435..8424ef5 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -417,7 +417,7 @@ void ScDocShell::InitOptions(bool bForLoading) //
called from InitNew and L
aDocument.SetDocOptions( aDocOpt );
aDocument.SetViewOptions( aViewOpt );
-SetFormulaOptions( aFormulaOpt );
+SetFormulaOptions( aFormulaOpt, bForLoading );
// Druck-Optionen werden jetzt direkt vor dem Drucken gesetzt
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index c6b3dc6..78228eb 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -445,32 +445,48 @@ bool ScDocShell::ReloadTabLinks()
return true;//! Fehler erkennen
}
-void ScDocShell::SetFormulaOptions(const ScFormulaOptions rOpt )
+void ScDocShell::SetFormulaOptions( const ScFormulaOptions rOpt, bool
bForLoading )
{
aDocument.SetGrammar( rOpt.GetFormulaSyntax() );
-// This needs to be called first since it may re-initialize the entire
-// opcode map.
-if (rOpt.GetUseEnglishFuncName())
+
OSL process.cxx question
Hi folks, In sal/osl/unx/process.cxx there is an #ifdef NO_CHILD_PROCESSES http://opengrok.libreoffice.org/xref/core/sal/osl/unx/process.cxx#207 Does anyone know what this does? Chris Sent from my iPhone ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - formula/source sc/source
formula/source/ui/dlg/formula.cxx |2 +-
sc/source/filter/oox/workbookhelper.cxx |4 ++--
sc/source/ui/docshell/docsh.cxx |4 ++--
sc/source/ui/docshell/docsh6.cxx| 14 ++
4 files changed, 15 insertions(+), 9 deletions(-)
New commits:
commit 10b6bda51c9da5429ca562c70ce75ee03e5f4e56
Author: Eike Rathke er...@redhat.com
Date: Fri Aug 22 04:29:06 2014 +0200
init formula options once, fdo#82183
Change-Id: I1db4816f4693e35024c6dc6c70585d7b72e68c32
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index a752fef..c4b25ac 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -459,9 +459,15 @@ void ScDocShell::SetFormulaOptions( const
ScFormulaOptions rOpt, bool bForLoadi
/* TODO: bForLoading is a workaround, rather get rid of setting any
* globals from per document instances like ScDocShell. */
-if (!bForLoading)
+/* XXX this is utter crap, we rely on the options being set here at least
+ * once, for the very first document, empty or loaded. */
+static bool bInitOnce = true;
+
+if (!bForLoading || bInitOnce)
{
-if (rOpt.GetUseEnglishFuncName() !=
SC_MOD()-GetFormulaOptions().GetUseEnglishFuncName())
+bool bForceInit = bInitOnce;
+bInitOnce = false;
+if (bForceInit || rOpt.GetUseEnglishFuncName() !=
SC_MOD()-GetFormulaOptions().GetUseEnglishFuncName())
{
// This needs to be called first since it may re-initialize the
entire
// opcode map.
commit 9344af955b68143b362a586a50543c5f05467c63
Author: Eike Rathke er...@redhat.com
Date: Fri Aug 22 02:59:38 2014 +0200
nitpick on comment form
Change-Id: I023f79187aaf6eb943a50516dace2aa229c5a87b
diff --git a/sc/source/filter/oox/workbookhelper.cxx
b/sc/source/filter/oox/workbookhelper.cxx
index bfe360e..3b9665a 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -675,8 +675,8 @@ void WorkbookGlobals::recalcFormulaCells()
officecfg::Office::Calc::Formula::Load::OOXMLRecalcMode::set(sal_Int32(0),
batch);
ScFormulaOptions aOpt = SC_MOD()-GetFormulaOptions();
aOpt.SetOOXMLRecalcOptions(bHardRecalc ? RECALC_ALWAYS :
RECALC_NEVER);
-/** XXX is this really supposed to set the ScModule options?
-Not the ScDocShell options? */
+/* XXX is this really supposed to set the ScModule options?
+ * Not the ScDocShell options? */
SC_MOD()-SetFormulaOptions(aOpt);
batch-commit();
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index bc1d284..29f6e5a 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -484,8 +484,8 @@ bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const
::com::sun::star::uno::R
officecfg::Office::Calc::Formula::Load::ODFRecalcMode::set(sal_Int32(0), batch);
ScFormulaOptions aOpt = SC_MOD()-GetFormulaOptions();
aOpt.SetODFRecalcOptions(bHardRecalc ? RECALC_ALWAYS :
RECALC_NEVER);
-/** XXX is this really supposed to set the ScModule options?
-Not the ScDocShell options? */
+/* XXX is this really supposed to set the ScModule options?
+ * Not the ScDocShell options? */
SC_MOD()-SetFormulaOptions(aOpt);
batch-commit();
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index 78228eb..a752fef 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -456,8 +456,8 @@ void ScDocShell::SetFormulaOptions( const ScFormulaOptions
rOpt, bool bForLoadi
// Wizard when loading the second document.
// Do the stupid stuff only when we're not called while loading a document.
-/** TODO: bForLoading is a workaround, rather get rid of setting any
-globals from per document instances like ScDocShell. */
+/* TODO: bForLoading is a workaround, rather get rid of setting any
+ * globals from per document instances like ScDocShell. */
if (!bForLoading)
{
commit 0be29a469c565ec134cdc0b7cb5594cc65206ccc
Author: Eike Rathke er...@redhat.com
Date: Fri Aug 22 02:52:13 2014 +0200
reactivate the verify
Missed this earlier. Should be a SAL_WARN, but postponed.
Change-Id: Ia6b178702461c8a0fa5ded3e1c47795b95da7d98
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index 5a2710c..3377565 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -1831,7 +1831,7 @@ void FormulaDlg::StoreFormEditData(FormEditData* pData)
const IFunctionDescription* FormulaDlg::getCurrentFunctionDescription() const
{
-
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/core/tool/compiler.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0a9fb15268c938cc4e3cc69c222cec1849064679
Author: Eike Rathke er...@redhat.com
Date: Fri Aug 22 00:11:18 2014 +0200
out-of-bounds string access
... when parsing ='foo'# with no character following.
Change-Id: Id65fce721cb47a4d3c947c677323bdcaa2ce957f
(cherry picked from commit 07b18860ae03ecb66b5605201f34c2aef3a55ad6)
Reviewed-on: https://gerrit.libreoffice.org/11062
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index cd9bc4d..8031f8e 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -426,7 +426,7 @@ static bool lcl_isValidQuotedText( const OUString
rFormula, sal_Int32 nSrcPos,
// but '' marks an escaped '
// We've earlier guaranteed that a string containing '' will be
// surrounded by '
-if (rFormula[nSrcPos] == '\'')
+if (nSrcPos rFormula.getLength() rFormula[nSrcPos] == '\'')
{
sal_Int32 nPos = nSrcPos+1;
while (nPos rFormula.getLength())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] minutes of ESC call ...
* Present: + Cloph, Stephan, Andras, David, Michael M, Eike, Caolan, Robinson, Norbert, Bjoern, Fridrich, Thorsten, Lionel, Miklos, Markus, Michael S, Adam, Muthu * Completed Action Items: + Ask for 1-2 more dev-list moderators re-visit next-week (Michael) [ currently quite quiet - large wave has vanished ]. + help Cloph with the quickstarter disabling (Andras) https://bugs.freedesktop.org/show_bug.cgi?id=80927 https://gerrit.libreoffice.org/#/c/10817/ https://gerrit.libreoffice.org/#/c/10669/ Patches in gerrit to disable quickstarter completely. No objections to have that included; all merged - will be in 4.3.1 release. * Pending Action Items: + ask UX advise wrt. wrench icons (revert or not ?) (Astron) + blog about the sad realities of web plugins (Bjoern) + open-source newer Synezip tests / speak at the conference (Umesh) + contact Michael / the list when students show up (Jan Marek) * GSOC Update (Fridrich) + Evaluation deadline is tomorrow - but everything is filed already + 100% pass-rate, should be grateful for that. + not a bad year at all. AI: + Get work / screenshots into the 4.4 feature list (Students) https://wiki.documentfoundation.org/ReleaseNotes/4.4 + Integrated PageMaker filter, 0.0.1 release + Linked frames - looking good + refactor huge objects -- looking fine, good progress there + Tiled rendering excellent - for calc still pending * Release Engineering update (Christian) + 4.3.1 RC2 somewhat delayed / tagging tomorrow + 4.2.7 - due in week 40 - 29th Sept freeze. + Potential for new incremental releases sooner. + Android Remote * FOSDEM room + deadline for dev room proposal, September, 15th AI: + reach out to work out what to do (Thorsten) * OSX 10.6 for 4.4 ? (Michael) + need 10.8 for OpenGL support (Markus) + Goal is to go there (Norbert) AI: + fix the 4.4 feature page (Norbert): + https://wiki.documentfoundation.org/ReleaseNotes/4.4#Mac_OS_X * Crashtest update (Markus) + http://dev-builds.libreoffice.org/crashtest/66c6d1ef204f3507e7663a1b8b1be05b9ec71092/ + new results look quite good, fixing appreciated. + script will from now on mail the dev list when it finishes + Caolan old CVE documents through CERT's 'Basic File Fuzzer' + doing a number of fixes there. + option to run these in an automated way + need someone to tend Markus' builds while he's away - 5x weeks. + check that the VM is still running, not hanging in an infinite loop etc. AI: + take care of crash-test / VM maintenance in September/October (Miklos) * Certification Committee (Stephan/Bjoern/Kendy) + waiting until ~September after the conf. * USA Hackfest update (Michael) + Boston Hackfest + Amazon / VMs were awesome - thanks Cloph. + great way to ge started. * Hackfests (Bjoern) + Seattle 'Libre-Fest' (Robinson) https://wiki.documentfoundation.org/Events/2014/Seattle_LibreFest + October 26, 2014 + Bug-triaging/Intro-to-community event + Following SeaGL conference + Munich hack-fest (Jan-Marek): http://www.it-muenchen-blog.de/2014/07/bug-squashing-party-2014/ + will have a BSP come-together; if someone says they're coming just show up etc. + November 21st-23rd, 2014 https://wiki.debian.org/BSP/2014/11/de/Munich + we should drop by with 2 or 3 developers, if possible + Toulouse Hackfest ... + Confirmed for Nov. 15-16th + more details: https://wiki.documentfoundation.org/Hackfest/Toulouse2014 + Be great to have -really- easy easy hacks for devs (Bjoern) * ~25 LiMux Mail Merge patches: + https://gerrit.libreoffice.org/#/q/owner:%22Jan-Marek+Glogowski%22+status:open,n,z + volunteer reviewers wanted ;) + is it sufficiently bad it can't get worse ? (Michael) + nearly - except its so bad it is also fragile (Bjoern) + Bjoern + Michael S to have a look at some stage. * QA (Robinson) + UNCONFIRMED count increasing. Recruiting again. + Multiple q's/bugs filed re: video playback support in Impress https://bugs.freedesktop.org/show_bug.cgi?id=79546 - OSX (plays in QT, not in LO) + Do we document our policy for video/audio playback? (using system framework) + Status of VLC support? + https://wiki.documentfoundation.org/Development/GSoC/Successfully_Implemented_Ideas#VLC_integration + Different support on different distros (Bjoern) + VLC is not ideal - not a multimedia framework; eg. playing live video to thumbnail etc. + We use the native platform multimedia framework (Michael) + There is no good cross-platform mm format that works with all codecs out of the box. +
[Libreoffice-bugs] [Bug 82777] EDITING: CRASH when select all on page with picture or object anchored to page
https://bugs.freedesktop.org/show_bug.cgi?id=82777 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added CC||mst...@redhat.com --- Comment #5 from Julien Nabet serval2...@yahoo.fr --- Michael: one for you? -- 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 47882] FILESAVE: crash when closing document created whith dcom when visible=false, no problem when visible=true
https://bugs.freedesktop.org/show_bug.cgi?id=47882 raal r...@post.cz changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |WORKSFORME --- Comment #13 from raal r...@post.cz --- No bug in actual version, closing as worksforme. -- 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 80650] lower case greek alphabet missing in localized Math symbol table
https://bugs.freedesktop.org/show_bug.cgi?id=80650 --- Comment #14 from Bernard SIAUD li...@siaud.org --- With Mageia 5 ( Build ID: 4.3.1.1-1.mga5 ), I have this problem. -- 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 76709] Err:520 when using external link in ods format
https://bugs.freedesktop.org/show_bug.cgi?id=76709 raal r...@post.cz changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||r...@post.cz Ever confirmed|0 |1 --- Comment #5 from raal r...@post.cz --- Hello Mike, I opened both of your files and doesn't see any 'Err:520'. Please, where you see 'Err:520' in your files (column H,file stock)? Thank you Tested with LO version 4.2.4.2, Linux; Version: 4.3.0.4, Windows 7 -- 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 77872] FILEOPEN: DOCX file with table - last paragraph gets bumped to second page
https://bugs.freedesktop.org/show_bug.cgi?id=77872 todven...@suomi24.fi changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from todven...@suomi24.fi --- Tested and this is fixed in 4.3.0.4. Cheers! -- 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 82681] EDITING: Draw crashes when copying table row
https://bugs.freedesktop.org/show_bug.cgi?id=82681 Katarina Behrens bu...@bubli.org changed: What|Removed |Added Assignee|bu...@bubli.org |libreoffice-b...@lists.free ||desktop.org --- Comment #4 from Katarina Behrens bu...@bubli.org --- sfxitemsets are hard -- 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 54684] FILEOPEN Anchored pictures jump to second page
https://bugs.freedesktop.org/show_bug.cgi?id=54684 --- Comment #3 from todven...@suomi24.fi --- Problem persists in 4.3.0.4. -- 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 79269] FILESAVE: ODF - Unchecking 'same content on first page' footer option doesnt work
https://bugs.freedesktop.org/show_bug.cgi?id=79269 Jay Philips philip...@hotmail.com changed: What|Removed |Added Whiteboard||filter:odt odf DataLoss Summary|Footers not saved (again) |FILESAVE: ODF - Unchecking ||'same content on first ||page' footer option doesnt ||work -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 79269] FILESAVE: ODF - Unchecking 'same content on first page' footer option doesnt work
https://bugs.freedesktop.org/show_bug.cgi?id=79269 Jay Philips philip...@hotmail.com changed: What|Removed |Added Blocks||65675 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Jay Philips philip...@hotmail.com changed: What|Removed |Added Depends on||79269 --- Comment #212 from Jay Philips philip...@hotmail.com --- Adding bug 79269. ODF file isnt being saved with the footer option of having different footers on the first and other pages, resulting in dataloss. -- 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 82893] New: multiple column auto width
https://bugs.freedesktop.org/show_bug.cgi?id=82893 Priority: medium Bug ID: 82893 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: multiple column auto width Severity: normal Classification: Unclassified OS: All Reporter: andrej8anu...@gmail.com Hardware: Other Status: UNCONFIRMED Version: 4.2.5.2 release Component: Spreadsheet Product: LibreOffice Created attachment 105005 -- https://bugs.freedesktop.org/attachment.cgi?id=105005action=edit test document If I select multiple columns and double click in between of them to rearrange column with as appropriate for each column, the first column gets too small. Please see a test document and picture before and after. Thank you very much! -- 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 82893] multiple column auto width
https://bugs.freedesktop.org/show_bug.cgi?id=82893 --- Comment #2 from andrej8anu...@gmail.com --- Created attachment 105009 -- https://bugs.freedesktop.org/attachment.cgi?id=105009action=edit after rearrangement -- 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 82893] multiple column auto width
https://bugs.freedesktop.org/show_bug.cgi?id=82893 --- Comment #1 from andrej8anu...@gmail.com --- Created attachment 105007 -- https://bugs.freedesktop.org/attachment.cgi?id=105007action=edit before rearrangement -- 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 82890] Crash by segmentation fault when trying to select something
https://bugs.freedesktop.org/show_bug.cgi?id=82890 --- Comment #3 from Jean-Baptiste Faure jbfa...@libreoffice.org --- Thank you Julien, you are surely right. Indeed, if I anchor the frame on the first page to the paragraph, LO does not crash. If I anchor the frame back to the page, the crash comes back. Best regards. JBF -- 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 82890] Crash by segmentation fault when trying to select something
https://bugs.freedesktop.org/show_bug.cgi?id=82890 --- Comment #4 from Julien Nabet serval2...@yahoo.fr --- You're welcome Jean-Baptiste. Would you mind copy paste your interesting remark on fdo#82777 ? Indeed, I asked Michael Stahl if he could take a look at it, perhaps your information may help him. -- 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 82895] New: FILEOPEN: RTF - box appears on page
https://bugs.freedesktop.org/show_bug.cgi?id=82895 Priority: medium Bug ID: 82895 Assignee: libreoffice-bugs@lists.freedesktop.org Blocks: 81234 Summary: FILEOPEN: RTF - box appears on page Severity: normal Classification: Unclassified OS: All Reporter: philip...@hotmail.com Hardware: Other Status: UNCONFIRMED Version: Inherited From OOo Component: Writer Product: LibreOffice Created attachment 105012 -- https://bugs.freedesktop.org/attachment.cgi?id=105012action=edit sample file Steps: 1) Open attached file 2) Save as RTF, close and reopen 3) On page 1, there will be a box that wasnt there before saving I assume this is a fileopen issue as opening the RTF in Kingsoft or MS Word doesnt show this box. Its in 3.3, 4.2.6 and 4.3.2 on Linux. -- 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 81234] [META] RTF filter issues
https://bugs.freedesktop.org/show_bug.cgi?id=81234 Jay Philips philip...@hotmail.com changed: What|Removed |Added Depends on||82895 -- 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 82774] Other: Base crashes during form design -Table Control
https://bugs.freedesktop.org/show_bug.cgi?id=82774 --- Comment #21 from Prakash chitnis7...@gmail.com --- Created attachment 105014 -- https://bugs.freedesktop.org/attachment.cgi?id=105014action=edit attachment-5797-1.dat --- Comment #22 from Prakash chitnis7...@gmail.com --- Created attachment 105015 -- https://bugs.freedesktop.org/attachment.cgi?id=105015action=edit chitnis.zip -- 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 82774] Other: Base crashes during form design -Table Control
https://bugs.freedesktop.org/show_bug.cgi?id=82774 --- Comment #20 from Prakash chitnis7...@gmail.com --- The files forwarded were from MYSQL export command. I am attaching zip file chitnis.zip. And Thanks for your attention and efforts. Prakash Chitnis On 20 August 2014 19:21, bugzilla-dae...@freedesktop.org wrote: *Comment # 19 https://bugs.freedesktop.org/show_bug.cgi?id=82774#c19 on bug 82774 https://bugs.freedesktop.org/show_bug.cgi?id=82774 from rob...@familiegrosskopf.de rob...@familiegrosskopf.de * (In reply to comment #2 https://bugs.freedesktop.org/show_bug.cgi?id=82774#c2) Created attachment 104943 https://bugs.freedesktop.org/attachment.cgi?id=104943 [details] https://bugs.freedesktop.org/attachment.cgi?id=104943action=edit attachment-832-0.html I can only send a copy of the base .ODB file and backup of the MySQL database I am using. Would that help analyse the problem? Prakash Chitnis Could you please add one copy (export of the data for the whole database) with mysqldump -u mysqlusername -l databasename /home/user/database.sql; or a command like this? Put the file together with the *.odb-file in a *.zip-package and it could well be downloaded and installed here. Regards Robert -- You are receiving this mail because: - You reported the bug. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80650] lower case greek alphabet missing in localized Math symbol table
https://bugs.freedesktop.org/show_bug.cgi?id=80650 Jean-Baptiste Faure jbfa...@libreoffice.org changed: What|Removed |Added CC||jbfa...@libreoffice.org --- Comment #15 from Jean-Baptiste Faure jbfa...@libreoffice.org --- Not reproducible for me under Ubuntu 14.04 x86-64: - Version: 4.3.2.0.0+ (Build ID: b2d54aa61607e477cb4b81f1a70e555ee3adb0af) - Version: 4.4.0.0.alpha0+ (Build ID: e6369973702286d92bfc34ab8305d4a9bcf5c27e) both versions build at home. Best regards. JBF -- 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 82801] FILESAVE: Missing data in cells after saving
https://bugs.freedesktop.org/show_bug.cgi?id=82801 --- Comment #5 from Sankar nwad...@raysoftindia.co.in --- Created attachment 105016 -- https://bugs.freedesktop.org/attachment.cgi?id=105016action=edit Missing files details -- 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 82874] image imported incorrectly in docx
https://bugs.freedesktop.org/show_bug.cgi?id=82874 Alexandr alexpik...@gmail.com changed: What|Removed |Added Attachment #104990|text/plain |application/vnd.openxmlform mime type||ats-officedocument.wordproc ||essingml.document -- 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 82777] EDITING: CRASH when select all on page with picture or object anchored to page
https://bugs.freedesktop.org/show_bug.cgi?id=82777 --- Comment #6 from Jean-Baptiste Faure jbfa...@libreoffice.org --- Two remarks from bug 82890 (duplicate): - under gdb session Ubuntu / Unity does not like the crash, I had difficulty to return to the terminal to continue the gdb session; changing from LO freezed window to the terminal window in the same workspace was impossible. It worked on a second try, if I moved first the LO window in another workspace. - on my bugdoc (attachment 105002), if I anchor the frame on the first page to the paragraph, LO does not crash. If I anchor the frame back to the page, the crash comes back. Hope this help to fix the bug. Best regards. JBF -- 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 45146] EDITING: references in formulas do not follow referenced values to new location during sort
https://bugs.freedesktop.org/show_bug.cgi?id=45146 Laurent BP jumbo4...@yahoo.fr changed: What|Removed |Added Resolution|WORKSFORME |FIXED --- Comment #38 from Laurent BP jumbo4...@yahoo.fr --- (In reply to comment #37) @Laurent BP: To clarify, did you verify this bug, or verify that the functionality is correct? How should the status be updated? I tested on the mentioned versions in comment #36 that references are correctly updated when sorted. Test with attachment 84629 (comment #14) and attachment 100089 (comment #16). So bug status should be RESOLVED FIXED. However in these versions, sort seems broken for references to other sheet (bug 79441). So tests should be made on more recent build before closing the bug. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82251] EDITING: Crash Draw upon past of graphic
https://bugs.freedesktop.org/show_bug.cgi?id=82251 Sun bug...@gmail.com changed: What|Removed |Added Hardware|Other |x86 (IA32) --- Comment #6 from Sun bug...@gmail.com --- I have the similar problem. To reproduce, just select an object and move it, Draw will crash. Here are different conditions: Crash: While moving (hold the left mouse button and move the object around), in about 5~10 sec, Draw will crash. Not Crash: But if you just move to a fix place (not moving, but still holding the left mouse button), Draw will not crash for a long time (60 sec.) Crash: Move the object in the attached file, Draw will crash. Not Crash: If just moving a simple object, like a rectangle, Draw will not crash. Hope this will help to reproduce the issue. (Note: I can't make the attachment work for some reason, I put the test file on the Google drive. Here is the link: https://drive.google.com/file/d/0BxFIZ2EIH0kHSFlHQ19hR18yWGc/edit?usp=sharing ) -- 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 80650] lower case greek alphabet missing in localized Math symbol table
https://bugs.freedesktop.org/show_bug.cgi?id=80650 --- Comment #16 from choffardet pierre.choffar...@free.fr --- Same problem with LO 4.3.1.1 french/Win Seven 64 -- 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 82899] New: Other: Latest PPA update breaks LibreOffice install, package management
https://bugs.freedesktop.org/show_bug.cgi?id=82899 Priority: medium Bug ID: 82899 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Other: Latest PPA update breaks LibreOffice install, package management Severity: normal Classification: Unclassified OS: Linux (All) Reporter: aelf...@web.de Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.3.0.4 release Component: BASIC Product: LibreOffice Problem description: the latest LibreOffice update from the PPA seems to have broken my package management system—dependency problems with libreoffice-base and libreoffice-base-core* can’t be fixed by apt, leaving me with no way to install or remove packages. * libreoffice-base depends on libreoffice-base-core (= 1:4.3.0-0ubuntu1~precise1); however: Version of libreoffice-base-core on system is 1:4.3.0-3ubuntu2~precise1. Operating System: Linux (Other) Version: 4.3.0.4 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 82902] New: EDITING: Automatic scale don't work anytime in graph
https://bugs.freedesktop.org/show_bug.cgi?id=82902 Priority: medium Bug ID: 82902 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING: Automatic scale don't work anytime in graph Severity: normal Classification: Unclassified OS: Windows (All) Reporter: marc.poli...@ac-versailles.fr Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.6.2 release Component: Spreadsheet Product: LibreOffice Created attachment 105023 -- https://bugs.freedesktop.org/attachment.cgi?id=105023action=edit Exemple of the bug Problem description: Automatic scale bug some times on Y axe in a graph Steps to reproduce: 1. Input 110 150 137 112 2. Sélect zone et get a graph 3. Look Y scale, it begin at zéro Current behavior: Y scale begin at zéro Expected behavior: Y scale begin arround 100 If you make the same process with 125 135 127 122 all work well !!! Operating System: Windows 7 Version: 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 82899] Other: Latest PPA update breaks LibreOffice install, package management
https://bugs.freedesktop.org/show_bug.cgi?id=82899 Jay Philips philip...@hotmail.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |NOTOURBUG CC||bjoern.michaelsen@canonical ||.com, philip...@hotmail.com --- Comment #1 from Jay Philips philip...@hotmail.com --- Hi Aelfinn, Thank you for reporting the bug. This is an ubuntu packaging issue, so you should submit it to launchpad.net. -- 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 82598] Use LibreOffice Dialogs setting is ignored in KDE (package from PPA)
https://bugs.freedesktop.org/show_bug.cgi?id=82598 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added See Also||https://launchpad.net/bugs/ ||1359486 -- 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 82861] Installation: Something did not work correctly
https://bugs.freedesktop.org/show_bug.cgi?id=82861 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added CC||0...@am-info.fr --- Comment #14 from Björn Michaelsen bjoern.michael...@canonical.com --- *** Bug 82806 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
