[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on|49102 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 changed: What|Removed |Added Depends on||49102 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How to build an old version of LibO
Michael Stahl-2 wrote > there's a subtle problem here - that commit pre-dates the removal of > INPATH, so if you run ./instdir/program/soffice you get the result of a > previous build (which would not be cleaned by "make clean" on this > revision!); you need to run ./instdir/unxlng*/program/soffice (or > perhaps even "make dev-install" and run it from solver/*/installation) That sounds more logical with my problem. I failed to build but I will try again and search for the right soffice exe file. Thanks * for your help. Laurent BP - LibreOffice 4.2.4.1 -- View this message in context: http://nabble.documentfoundation.org/How-to-build-an-old-version-of-LibO-tp4106986p4107227.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: bug 77091: noob needs directions
Hi Marcel, On Fri, May 2, 2014 at 8:04 AM, Marcel Adriani wrote: > Hi, > > I would like to get involved in LibreOffice development, and selected bug > 77091 (https://bugs.freedesktop.org/show_bug.cgi?id=77091) as my first > attempt. After cloning the git, however, I find myself overwhelmed with the > number of files, and I did not manage to locate the right sourcefile to > edit. > > Any help en pointers in the right direction would be greatly appreciated. What did you clone? The bug 77091 is about Impress Remote mobile application. It lives in a separate repo. git clone git://anongit.freedesktop.org/libreoffice/impress_remote There you can find source code for android, ios, etc. Regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 --- Comment #155 from tommy27 --- please do not add new bugs here. the 4.1.x branch won't probably have other release after 4.1.6. new annoying bugs should be posted to the mab4.2 or mab4.3 lists. existing mab4.1 which are still reproducible in 4.2.x branch can be moved to the mab4.2 list. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
bug 77091: noob needs directions
Hi, I would like to get involved in LibreOffice development, and selected bug 77091 (https://bugs.freedesktop.org/show_bug.cgi?id=77091) as my first attempt. After cloning the git, however, I find myself overwhelmed with the number of files, and I did not manage to locate the right sourcefile to edit. Any help en pointers in the right direction would be greatly appreciated. Cheers! Marcel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2014-05-02
Moin!
* Open changes on master for project core changed in the last 25 hours:
First time contributors doing great things!
+ Speed up find-german-comments: speed up text_cat -s
in https://gerrit.libreoffice.org/9227 from Jeroen Nijhof
about module bin
+ Speed up find-german-comments
in https://gerrit.libreoffice.org/9226 from Jeroen Nijhof
about module bin
End of freshness
+ move INetContentTypes::scan() to INetURLObject::scanContentType()
in https://gerrit.libreoffice.org/9212 from Christina Roßmanith
about module include, svl, tools
+ sw/export docx: add unit test for document with header and section(s)
in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer
about module sw
* Merged changes on master for project core changed in the last 25 hours:
+ sw: iodetect is not a part of the type detector anymore
in https://gerrit.libreoffice.org/9223 from Maxim Monastirsky
+ Simplify type detectors
in https://gerrit.libreoffice.org/9222 from Maxim Monastirsky
+ Introduce centralized detection for storage-based files
in https://gerrit.libreoffice.org/9221 from Maxim Monastirsky
+ Git: ignore autogen, doxygen and gdb config files
in https://gerrit.libreoffice.org/8437 from Jan-Marek Glogowski
+ Resolves: fdo#78133 LibO crashes when in options dialog (Colors part)
in https://gerrit.libreoffice.org/9219 from Julien Nabet
* Abandoned changes on master for project core changed in the last 25 hours:
+ escape conditional formatting formulas during xlsx export, fdo#75168
in https://gerrit.libreoffice.org/9230 from Markus Mohrhard
+ be explicit about text rotations, fdo#70670
in https://gerrit.libreoffice.org/9229 from Markus Mohrhard
+ coverity#1209733 OOB access in DocxAttributeOutput::EmbedFontStyle
in https://gerrit.libreoffice.org/9224 from Chris Sherlock
+ sa/l add release_assert() and assert that stay even in release code
in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud
* Open changes needing tweaks, but being untouched for more than a week:
+ FDO#74886: Data labels are not preserved for Column Chart in RT file
in https://gerrit.libreoffice.org/8098 from Umesh Kadam
+ move inettype.{hc}xx from svl to tools
in https://gerrit.libreoffice.org/8926 from Christina Roßmanith
+ fdo#43157 Remove OSL_POSTCOND, prefer SAL_WARN_IF
in https://gerrit.libreoffice.org/8883 from Michaël Lefèvre
+ new method INetURLObject::getData() for data urls
in https://gerrit.libreoffice.org/8737 from Christina Roßmanith
+ fdo#67544 Slide transistion sound(other sound) is not included in present
in https://gerrit.libreoffice.org/8700 from Vishv Brahmbhatt
+ fdo#57950: Replace chained O(U)StringBuffer::append() with operator+
in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal
+ Refactored
in https://gerrit.libreoffice.org/8683 from Tharindu Lakmal
+ fdo#75757 Remove inheritance to std::map from PropertyMap
in https://gerrit.libreoffice.org/8656 from Krisztian Pinter
+ Remove visual noise from ios
in https://gerrit.libreoffice.org/8274 from Alexander Wilms
+ FDO#75205 : Charts - Up Down bars are getting added to Line Chart.
in https://gerrit.libreoffice.org/8360 from Umesh Kadam
+ WIP: Converting ExtensionUpdate dialog for new format
in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes
+ Refactored swooxmlexport tests cases. Added function to check contents.
in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar
+ fdo#71984 fix first line indentation in footnotes for MS Word documents
in https://gerrit.libreoffice.org/8160 from Andras Timar
+ Lots of changes to Tango icons
in https://gerrit.libreoffice.org/7987 from Miroslav Mazel
+ sw/docx export: fix handling of document with header and section(s)
in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer
+ fdo#51525 Fix duplicate "Paste Special" entries in Calc.
in https://gerrit.libreoffice.org/7784 from Andrzej Hunt
+ fdo#72661: Check ‘Hyphenation active’ automatically
in https://gerrit.libreoffice.org/7291 from Jiwoong Youn
+ WIP fdo#72987 Use firebird backup format for .odb
in https://gerrit.libreoffice.org/7299 from Andrzej Hunt
+ WIP: fdo#33980 Preserve selection across all slide sorters.
in https://gerrit.libreoffice.org/6633 from Andrzej Hunt
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 Gerrit News for core on 2014-05-01
Hello Le Thu, 01 May 2014 08:00:01 +0200, a écrit: Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Fix wrong value of 2 table-border styles in model.xml in https://gerrit.libreoffice.org/9213 from Adam CloudOn about module writerfilter End of freshness Just to say that Adam appears as a fresher because previous commits were registered as "Adam Co". :) But he's not the only one which has many identities in git. Lots of under-cover agents here :D Mat ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How to build an old version of LibO
On 01/05/14 10:11, Laurent BP wrote: > > I tried the following commands: >> git checkout -b myoldlibreofficebranch >> dace560b350346b9f9a102ee602bb129a008bcfe >> make distclean >> ./autogen.sh && make >> ./instdir/program/soffice > But About box says: Version: 4.3.0.0.alpha1+ > Build ID: c6c286f14468d341f5fd88edc39a37175a1b6caa > > However, "git log -1" returns > == > commit dace560b350346b9f9a102ee602bb129a008bcfe > Author: Caolán McNamara > Date: Fri Oct 11 20:45:22 2013 +0100 > > CID#736194 out of bounds there's a subtle problem here - that commit pre-dates the removal of INPATH, so if you run ./instdir/program/soffice you get the result of a previous build (which would not be cleaned by "make clean" on this revision!); you need to run ./instdir/unxlng*/program/soffice (or perhaps even "make dev-install" and run it from solver/*/installation) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/sidebaralignment.ui |1 - 1 file changed, 1 deletion(-) New commits: commit 417a9a4ad8cb19bc2da27d3d8c595eed6fac57fc Author: Maxim Monastirsky Date: Thu May 1 23:46:38 2014 +0300 Remove this width request I see no reason why this button should be wider than the others. Change-Id: Ibe7bc46d1e7a1d99d9d7dbc7bed8242d608efac2 diff --git a/sc/uiconfig/scalc/ui/sidebaralignment.ui b/sc/uiconfig/scalc/ui/sidebaralignment.ui index d65560e..a4716cd 100644 --- a/sc/uiconfig/scalc/ui/sidebaralignment.ui +++ b/sc/uiconfig/scalc/ui/sidebaralignment.ui @@ -131,7 +131,6 @@ False -30 True False .uno:AlignTop ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/address.hxx | 13 --
sc/inc/column.hxx | 20
sc/inc/refhint.hxx | 20
sc/inc/table.hxx|1
sc/inc/tokenarray.hxx | 20
sc/inc/types.hxx| 15 +++
sc/source/core/data/column.cxx | 60 -
sc/source/core/data/column4.cxx | 129 +
sc/source/core/data/formulacell.cxx | 24 -
sc/source/core/data/table3.cxx | 95 -
sc/source/core/tool/refhint.cxx | 25 +
sc/source/core/tool/token.cxx | 160 +---
12 files changed, 467 insertions(+), 115 deletions(-)
New commits:
commit 5797fd7662d09a9f0f1ee3bf06204b5c4a6397ac
Author: Kohei Yoshida
Date: Thu May 1 01:15:02 2014 -0400
fdo#78079: Re-work sort by column to get it to do the right thing.
Also fixed reference update problem.
(cherry picked from commit 3c4fb52d8fc89fe43983991ed2339295b2e0ef8c)
Conflicts:
sc/inc/column.hxx
Change-Id: I06e6115ef969a011fdd5c92d5eb1927fb7ae789b
Reviewed-on: https://gerrit.libreoffice.org/9220
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 608a505..b4ab629 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -27,6 +27,7 @@
#include
#include "scdllapi.h"
+#include
#include
#include
@@ -39,18 +40,6 @@ namespace com { namespace sun { namespace star {
class ScDocument;
-// The typedefs
-typedef sal_Int32 SCROW;
-typedef sal_Int16 SCCOL;
-typedef sal_Int16 SCTAB;
-typedef sal_Int32 SCCOLROW; ///< a type capable of holding either SCCOL or
SCROW
-
-// temporarily signed typedefs
-typedef sal_Int32 SCsROW;
-typedef sal_Int16 SCsCOL;
-typedef sal_Int16 SCsTAB;
-typedef sal_Int32 SCsCOLROW;
-
/** size_t typedef to be able to find places where code was changed from USHORT
to size_t and is used to read/write from/to streams. */
typedef size_t SCSIZE;
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 53ca5cc..bfc7a54 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -182,7 +182,7 @@ public:
voidDelete( SCROW nRow );
voidFreeAll();
-voidSwapCell( SCROW nRow, ScColumn& rCol);
+void Swap( ScColumn& rOther, SCROW nRow1, SCROW nRow2, bool bPattern );
boolHasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const;
boolHasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask )
const;
@@ -473,6 +473,7 @@ public:
void BroadcastRecalcOnRefMove();
void BroadcastRefMoved( const sc::RefMovedHint& rHint );
void TransferListeners( ScColumn& rDestCol, SCROW nRow1, SCROW nRow2,
SCROW nRowDelta );
+void CollectListeners( std::vector& rListeners, SCROW nRow1,
SCROW nRow2 );
void CompileDBFormula( sc::CompileFormulaContext& rCxt );
void CompileDBFormula( sc::CompileFormulaContext& rCxt, bool
bCreateFormulaString );
@@ -567,6 +568,23 @@ public:
*/
void RegroupFormulaCells();
+/**
+ * Reset column position of formula cells within specified row range.
+ * Reference positions are also adjusted to reflect the new position so
+ * that the formula cells still reference the same cells or ranges after
+ * the the position change. The position of a formula cell before the
+ * call is interpreted as the old position of that cell.
+ *
+ * Caller needs to ensure that no formula groups cross the top and bottom
+ * row boundaries.
+ *
+ * @param nRow1 top row boundary
+ * @param nRow2 bottom row boundary
+ */
+void ResetFormulaCellPositions( SCROW nRow1, SCROW nRow2 );
+
+void SplitFormulaGroupByRelativeRef( const ScRange& rBoundRange );
+
#if DEBUG_COLUMN_STORAGE
void DumpFormulaGroups() const;
#endif
diff --git a/sc/inc/refhint.hxx b/sc/inc/refhint.hxx
index ec56735..3ffe861 100644
--- a/sc/inc/refhint.hxx
+++ b/sc/inc/refhint.hxx
@@ -18,7 +18,7 @@ namespace sc {
class RefHint : public SfxSimpleHint
{
public:
-enum Type { Moved };
+enum Type { Moved, ColumnReordered };
private:
Type meType;
@@ -55,6 +55,24 @@ public:
const ScAddress& getDelta() const;
};
+class RefColReorderHint : public RefHint
+{
+const sc::ColReorderMapType& mrColMap;
+SCTAB mnTab;
+SCROW mnRow1;
+SCROW mnRow2;
+
+public:
+RefColReorderHint( const sc::ColReorderMapType& rColMap, SCTAB nTab, SCROW
nRow1, SCROW nRow2 );
+virtual ~RefColReorderHint();
+
+const sc::ColReorderMapType& getColMap() const;
+
+SCTAB getTab() const;
+SCROW getStartRow() const;
+SCROW getEndRow() const;
+};
+
}
#endif
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 108637b..ba7745d 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -988,7 +988,6 @@ private:
// use the global sort parameter:
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/inc/GL3DRenderer.hxx | 58 -
chart2/source/view/main/GL3DRenderer.cxx | 138 +++
2 files changed, 127 insertions(+), 69 deletions(-)
New commits:
commit 489b472d26d8ae080f4ba2c02c473952a006f47c
Author: xukai
Date: Tue Apr 29 17:44:16 2014 +0800
Format GL3DRenderer code
Add function Dynamic calculation of view matrix
Change-Id: I927cf9a8124ddf81830d8fef4508dae8697d7fc6
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx
b/chart2/source/view/inc/GL3DRenderer.hxx
index 09c904b..cc86bee 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -141,6 +141,17 @@ struct PackedVertex{
};
};
+typedef struct SceneBox
+{
+float maxXCoord;
+float minXCoord;
+float maxYCoord;
+float minYCoord;
+float maxZCoord;
+float minZCoord;
+}SceneBox;
+
+
class OpenGL3DRenderer : public IOpenGLInfoProvider
{
public:
@@ -167,34 +178,34 @@ public:
double GetTime();
void SetFPS(float fps);
void SetClickPos(Point aMPos);
-int RenderClickPos(Point aMPos);
+void RenderClickPos(Point aMPos);
private:
-int MoveModelf(PosVecf3 trans, PosVecf3 angle, PosVecf3 scale);
+void MoveModelf(PosVecf3& trans,PosVecf3& angle,PosVecf3& scale);
void GetFreq();
-int RenderPolygon3DObject();
-int RenderLine3D(Polygon3DInfo &polygon);
-int RenderPolygon3D(Polygon3DInfo &polygon);
-int Init3DUniformBlock();
-int Update3DUniformBlock();
-int RenderExtrude3DObject();
-int RenderFPS(float fps);
-int RenderText(const ::rtl::OUString& string, com::sun::star::awt::Point
aPos);
-int RenderExtrudeSurface(const Extrude3DInfo& extrude3D);
-int RenderExtrudeTopSurface(const Extrude3DInfo& extrude3D);
-int RenderExtrudeMiddleSurface(const Extrude3DInfo& extrude3D);
-int RenderExtrudeBottomSurface(const Extrude3DInfo& extrude3D);
-int RenderExtrudeFlatSurface(const Extrude3DInfo& extrude3D, int surIndex);
-int ProcessUnrenderedShape();
+void RenderPolygon3DObject();
+void RenderLine3D(Polygon3DInfo &polygon);
+void RenderPolygon3D(Polygon3DInfo &polygon);
+void Init3DUniformBlock();
+void Update3DUniformBlock();
+void RenderExtrude3DObject();
+void RenderFPS(float fps);
+void RenderText(const ::rtl::OUString& string, com::sun::star::awt::Point
aPos);
+void RenderExtrudeSurface(const Extrude3DInfo& extrude3D);
+void RenderExtrudeTopSurface(const Extrude3DInfo& extrude3D);
+void RenderExtrudeMiddleSurface(const Extrude3DInfo& extrude3D);
+void RenderExtrudeBottomSurface(const Extrude3DInfo& extrude3D);
+void RenderExtrudeFlatSurface(const Extrude3DInfo& extrude3D, int
surIndex);
+void ProcessUnrenderedShape();
glm::vec4 GetColorByIndex(int index);
sal_uInt32 GetIndexByColor(sal_uInt32 r, sal_uInt32 g, sal_uInt32 b);
-int ProcessPickingBox();
+void ProcessPickingBox();
int ProcessExtrude3DPickingBox();
void RenderCoordinateAxis();
-int AddVertexData(GLuint vertexBuf);
-int AddNormalData(GLuint normalBuf);
-int AddIndexData(GLuint indexBuf);
+void AddVertexData(GLuint vertexBuf);
+void AddNormalData(GLuint normalBuf);
+void AddIndexData(GLuint indexBuf);
bool GetSimilarVertexIndex(PackedVertex & packed,
std::map & VertexToOutIndex,
unsigned short & result
@@ -207,6 +218,7 @@ private:
void CreateActualRoundedCube(float fRadius, int iSubDivY, int iSubDivZ,
float width, float height, float depth);
int GenerateRoundCornerBar(std::vector &vertices,
std::vector &normals, float fRadius, int iSubDivY,
int iSubDivZ, float width, float height, float
depth);
+void CreateSceneBoxView();
private:
// Projection matrix : default 45 degree Field of View, 4:3 ratio, display
range : 0.1 unit <-> 100 units
glm::mat4 m_Projection;
@@ -316,6 +328,12 @@ private:
//TODO: moggi: kill the following parts
// don't add anything below or I will remove it
size_t m_iPointNum;
+
+SceneBox m_SenceBox;
+
+float m_fViewAngle;
+
+float m_fHeightWeight;
};
}
diff --git a/chart2/source/view/main/GL3DRenderer.cxx
b/chart2/source/view/main/GL3DRenderer.cxx
index e89ff49..b977654 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -87,8 +87,15 @@ OpenGL3DRenderer::OpenGL3DRenderer():
m_Extrude3DInfo.startIndex[i] = m_RoundBarMesh.iElementStartIndices[i];
m_Extrude3DInfo.size[i] = m_RoundBarMesh.iElementSizes[i];
}
-
+m_fViewAngle = 30.0f;
+m_SenceBox.maxXCoord = -1.0 * FLT_MAX;
+m_SenceBox.minXCoord = FLT_MAX;
+m_SenceBox.maxYCoord = -1.0 * FLT_MAX;
+m_SenceBox.minYCoord = FLT_MAX;
+m_SenceBox.maxZCoord = -1.0 * FLT_MAX;
+m_SenceBox.minZCoord = FLT_MAX;
m_uiSelectFrameCounter = 0;
+m_fHeightWeight = 1.0f;
}
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 77806, which changed state. Bug 77806 Summary: copy cells from calc and paste in writer makes libreoffice crashed in mdds https://bugs.freedesktop.org/show_bug.cgi?id=77806 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/listenercontext.hxx |7 +--
sc/source/core/data/column.cxx |9 +++--
sc/source/core/data/listenercontext.cxx |9 +
sc/source/core/tool/token.cxx |8 ++--
4 files changed, 27 insertions(+), 6 deletions(-)
New commits:
commit a7699355d355a1817fc16b4832f96a3a9e17d5df
Author: Kohei Yoshida
Date: Thu May 1 12:16:12 2014 -0400
fdo#77806: Use the common block position set for start and end listening.
Else an invalid iterator may result, which would eventually leads to a
crash.
Change-Id: Ie909de61244d661c72a3450cc69b29fbb218a248
(cherry picked from commit 7fbe0f56192f7e106c560646d37fbb93b69b0446)
Reviewed-on: https://gerrit.libreoffice.org/9225
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/sc/inc/listenercontext.hxx b/sc/inc/listenercontext.hxx
index 501f1d2..c485246 100644
--- a/sc/inc/listenercontext.hxx
+++ b/sc/inc/listenercontext.hxx
@@ -15,6 +15,7 @@
#include
#include
+#include
class ScDocument;
class ScTokenArray;
@@ -27,9 +28,10 @@ class ColumnBlockPositionSet;
class StartListeningContext : boost::noncopyable
{
ScDocument& mrDoc;
-boost::scoped_ptr mpSet;
+boost::shared_ptr mpSet;
public:
StartListeningContext(ScDocument& rDoc);
+StartListeningContext(ScDocument& rDoc, const
boost::shared_ptr& pSet);
ScDocument& getDoc();
ColumnBlockPosition* getBlockPosition(SCTAB nTab, SCCOL nCol);
@@ -39,12 +41,13 @@ class EndListeningContext : boost::noncopyable
{
ScDocument& mrDoc;
ColumnSpanSet maSet;
-boost::scoped_ptr mpPosSet;
+boost::shared_ptr mpPosSet;
ScTokenArray* mpOldCode;
ScAddress maPosDelta; // Add this to get the old position prior to the
move.
public:
EndListeningContext(ScDocument& rDoc, ScTokenArray* pOldCode = NULL);
+EndListeningContext(ScDocument& rDoc, const
boost::shared_ptr& pSet, ScTokenArray* pOldCode = NULL);
void setPositionDelta( const ScAddress& rDelta );
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 99d2626..6c3e2a9 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2239,9 +2239,14 @@ class UpdateRefOnNonCopy :
std::unary_function
// Perform end-listening, start-listening, and dirtying on all
// formula cells in the group.
-sc::StartListeningContext aStartCxt(mpCxt->mrDoc);
+// Make sure that the start and end listening contexts share the
+// same block position set, else an invalid iterator may ensue.
+boost::shared_ptr pPosSet(
+new sc::ColumnBlockPositionSet(mpCxt->mrDoc));
+
+sc::StartListeningContext aStartCxt(mpCxt->mrDoc, pPosSet);
+sc::EndListeningContext aEndCxt(mpCxt->mrDoc, pPosSet,
pOldCode.get());
-sc::EndListeningContext aEndCxt(mpCxt->mrDoc, pOldCode.get());
aEndCxt.setPositionDelta(
ScAddress(-mpCxt->mnColDelta, -mpCxt->mnRowDelta,
-mpCxt->mnTabDelta));
diff --git a/sc/source/core/data/listenercontext.cxx
b/sc/source/core/data/listenercontext.cxx
index add75a2..dcdffac 100644
--- a/sc/source/core/data/listenercontext.cxx
+++ b/sc/source/core/data/listenercontext.cxx
@@ -16,6 +16,10 @@ namespace sc {
StartListeningContext::StartListeningContext(ScDocument& rDoc) :
mrDoc(rDoc), mpSet(new ColumnBlockPositionSet(rDoc)) {}
+StartListeningContext::StartListeningContext(
+ScDocument& rDoc, const boost::shared_ptr& pSet) :
+mrDoc(rDoc), mpSet(pSet) {}
+
ScDocument& StartListeningContext::getDoc()
{
return mrDoc;
@@ -30,6 +34,11 @@ EndListeningContext::EndListeningContext(ScDocument& rDoc,
ScTokenArray* pOldCod
mrDoc(rDoc), maSet(false), mpPosSet(new ColumnBlockPositionSet(rDoc)),
mpOldCode(pOldCode), maPosDelta(0,0,0) {}
+EndListeningContext::EndListeningContext(
+ScDocument& rDoc, const boost::shared_ptr& pSet,
ScTokenArray* pOldCode) :
+mrDoc(rDoc), maSet(false), mpPosSet(pSet),
+mpOldCode(pOldCode), maPosDelta(0,0,0) {}
+
void EndListeningContext::setPositionDelta( const ScAddress& rDelta )
{
maPosDelta = rDelta;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 9089a62..65ed7ad 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2799,13 +2799,17 @@ sc::RefUpdateResult
ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon
sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove(
const sc::RefUpdateContext& rCxt, const ScAddress& rOldPos, const
ScAddress& rNewPos )
{
+sc::RefUpdateResult aRes;
+
+if (!rCxt.mnColDelta && !rCxt.mnRowDelta && !rCxt.mnTabDelta)
+// The cell hasn't moved at all.
+return aRes;
+
// When moving, the range is the destination range. We need to use the old
// range prior to the move for hit analysis.
ScRang
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 5 commits - chart2/source sc/inc sc/source xmloff/source
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx |2
chart2/source/tools/ErrorBar.cxx |2
sc/inc/globstr.hrc|5 +
sc/source/core/data/colorscale.cxx|2
sc/source/filter/excel/xecontent.cxx |4 -
sc/source/ui/docshell/docfunc.cxx | 40 ++
sc/source/ui/inc/undoblk.hxx | 22 +
sc/source/ui/src/globstr.src |4 +
sc/source/ui/undo/undoblk.cxx | 52 ++
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 15
10 files changed, 140 insertions(+), 8 deletions(-)
New commits:
commit 6a8d8c4bbd248816ce8d542c293e3db2f8df384c
Author: Markus Mohrhard
Date: Tue Apr 29 00:48:07 2014 +0200
the safety check was a bit too strict, fdo#77984
Change-Id: Idfc3b3dd1d9f4de428e43c515b13a8d7e40e347c
diff --git a/sc/source/core/data/colorscale.cxx
b/sc/source/core/data/colorscale.cxx
index 2eca97c..e1e203a 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -796,7 +796,7 @@ ScIconSetInfo* ScIconSetFormat::GetIconSetInfo(const
ScAddress& rAddr) const
double nMax = GetMaxValue();
// this check is for safety
-if(nMin >= nMax)
+if(nMin > nMax)
return NULL;
sal_Int32 nIndex = 0;
commit 85c73e11d81c067d7f604570dc6796108541d7ce
Author: Markus Mohrhard
Date: Tue Apr 29 20:37:36 2014 +0200
escape conditional formatting formulas during xlsx export, fdo#75168
Conflicts:
sc/source/filter/excel/xecontent.cxx
Change-Id: I9ebdb2315b51c2b53d8cfa0486b3ec22a8e0d88d
diff --git a/sc/source/filter/excel/xecontent.cxx
b/sc/source/filter/excel/xecontent.cxx
index 706f24c..7fe8b9a 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -941,13 +941,13 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
if(!IsTextRule(eOperation) && !IsTopBottomRule(eOperation))
{
rWorksheet->startElement( XML_formula, FSEND );
-rWorksheet->write(XclXmlUtils::ToOUString( GetRoot().GetDoc(),
mrFormatEntry.GetValidSrcPos(),
+rWorksheet->writeEscaped(XclXmlUtils::ToOUString( GetRoot().GetDoc(),
mrFormatEntry.GetValidSrcPos(),
mrFormatEntry.CreateTokenArry( 0 ),
GetRoot().GetOpCodeMap() ));
rWorksheet->endElement( XML_formula );
if (bFmla2)
{
rWorksheet->startElement( XML_formula, FSEND );
-rWorksheet->write(XclXmlUtils::ToOUString( GetRoot().GetDoc(),
mrFormatEntry.GetValidSrcPos(),
+rWorksheet->writeEscaped(XclXmlUtils::ToOUString(
GetRoot().GetDoc(), mrFormatEntry.GetValidSrcPos(),
mrFormatEntry.CreateTokenArry( 1 ),
GetRoot().GetOpCodeMap() ));
rWorksheet->endElement( XML_formula );
}
commit 66c2360491614597ba1e8b05dff33e6b142e382d
Author: Markus Mohrhard
Date: Wed Apr 30 01:20:36 2014 +0200
set graphic properties for error bars during import, fdo#78041
Change-Id: I43138745b074dcacdafa090d97eeb9aa2ccecf78
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 805b4e6..00fe6ed 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -165,7 +165,7 @@ void ErrorBar::setPropertyValue( const OUString& rPropName,
const uno::Any& rAny
else if(rPropName == "ShowNegativeError")
rAny >>= mbShowNegativeError;
else if(rPropName == "ErrorBarRangePositive" || rPropName ==
"ErrorBarRangeNegative")
-throw uno::RuntimeException("read-only property", static_cast<
uno::XWeak*>(this));
+throw beans::UnknownPropertyException("read-only property",
static_cast< uno::XWeak*>(this));
else
LineProperties::setPropertyValue(rPropName, rAny);
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index d8b56b2..b34e2af 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -1025,6 +1025,19 @@
SchXMLStatisticsObjectContext::~SchXMLStatisticsObjectContext()
namespace {
+void SetErrorBarStyleProperties( const OUString& rStyleName, uno::Reference<
beans::XPropertySet > xBarProp,
+SchXMLImportHelper& rImportHelper )
+{
+const SvXMLStylesContext* pStylesCtxt =
rImportHelper.GetAutoStylesContext();
+const SvXMLStyleContext* pStyle =
pStylesCtxt->FindStyleChildContext(rImportHelper.GetChartFamilyID(),
+rStyleName);
+
+XMLPropStyleContext * pSeriesStyleContext =
+const_cast< XMLPropStyleContext * >( dynamic_cast< const
XMLPropStyleContext * >( pStyle ));
+
+pSeriesStyleContext->FillPropertySet( xBarProp );
+}
+
void SetErrorBarPropertiesFromStyl
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sc/inc sc/source
sc/inc/globstr.hrc|4 ++
sc/source/ui/docshell/docfunc.cxx | 40 +++--
sc/source/ui/inc/undoblk.hxx | 22
sc/source/ui/src/globstr.src |4 ++
sc/source/ui/undo/undoblk.cxx | 52 ++
5 files changed, 119 insertions(+), 3 deletions(-)
New commits:
commit c5c5b68fbf8165ba0614fd1f8fd7f8a642e408a8
Author: Markus Mohrhard
Date: Wed Apr 23 05:23:50 2014 +0200
add undo action for conditional formatting, cp#150, fdo#77381
Conflicts:
sc/inc/globstr.hrc
sc/source/ui/src/globstr.src
Change-Id: I11db1e5824077135c4352ae43cc0e8d139244268
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index f02ef51..4f5b351 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -694,7 +694,9 @@
#define STR_CTRLCLICKHYPERLINK 526
#define STR_CLICKHYPERLINK 527
-#define SC_GLOBSTR_STR_COUNT528 /**< the count of permanently
resident strings */
+#define STR_UNDO_CONDFORMAT 528
+
+#define SC_GLOBSTR_STR_COUNT529 /**< the count of permanently
resident strings */
#endif
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index bcb45b6..2ce4ab8 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -5329,6 +5329,31 @@ void ScDocFunc::ReplaceConditionalFormat( sal_uLong
nOldFormat, ScConditionalFor
if(pDoc->IsTabProtected(nTab))
return;
+bool bUndo = pDoc->IsUndoEnabled();
+ScDocument* pUndoDoc = NULL;
+ScRange aCombinedRange = rRanges.Combine();
+ScRange aCompleteRange;
+if(bUndo)
+{
+pUndoDoc = new ScDocument(SCDOCMODE_UNDO);
+pUndoDoc->InitUndo( pDoc, nTab, nTab );
+
+if(pFormat)
+{
+aCompleteRange = aCombinedRange;
+}
+if(nOldFormat)
+{
+ScConditionalFormat* pOldFormat =
pDoc->GetCondFormList(nTab)->GetFormat(nOldFormat);
+if(pOldFormat)
+aCompleteRange.ExtendTo(pOldFormat->GetRange().Combine());
+}
+
+pDoc->CopyToDocument(
aCompleteRange.aStart.Col(),aCompleteRange.aStart.Row(),nTab,
+aCompleteRange.aEnd.Col(),aCompleteRange.aEnd.Row(),nTab,
+IDF_ALL, false, pUndoDoc );
+}
+
boost::scoped_ptr pRepaintRange;
if(nOldFormat)
{
@@ -5345,9 +5370,9 @@ void ScDocFunc::ReplaceConditionalFormat( sal_uLong
nOldFormat, ScConditionalFor
if(pFormat)
{
if(pRepaintRange)
-pRepaintRange->ExtendTo(rRanges.Combine());
+pRepaintRange->ExtendTo(aCombinedRange);
else
-pRepaintRange.reset(new ScRange(rRanges.Combine()));
+pRepaintRange.reset(new ScRange(aCombinedRange));
sal_uLong nIndex = pDoc->AddCondFormat(pFormat, nTab);
@@ -5355,6 +5380,17 @@ void ScDocFunc::ReplaceConditionalFormat( sal_uLong
nOldFormat, ScConditionalFor
pDoc->SetStreamValid(nTab, false);
}
+if(bUndo)
+{
+ScDocument* pRedoDoc = new ScDocument(SCDOCMODE_UNDO);
+pRedoDoc->InitUndo( pDoc, nTab, nTab );
+pDoc->CopyToDocument(
aCompleteRange.aStart.Col(),aCompleteRange.aStart.Row(),nTab,
+aCompleteRange.aEnd.Col(),aCompleteRange.aEnd.Row(),nTab,
+IDF_ALL, false, pRedoDoc );
+rDocShell.GetUndoManager()->AddUndoAction(
+new ScUndoConditionalFormat(&rDocShell, pUndoDoc, pRedoDoc,
aCompleteRange));
+}
+
if(pRepaintRange)
rDocShell.PostPaint(*pRepaintRange, PAINT_GRID);
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index 758e5bb..36bf058 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -637,6 +637,28 @@ private:
voidDoChange( ScDocument* pSrcDoc ) const;
};
+class ScUndoConditionalFormat : public ScSimpleUndo
+{
+public:
+TYPEINFO_OVERRIDE();
+ScUndoConditionalFormat( ScDocShell* pNewDocShell,
+ScDocument* pUndoDoc, ScDocument* pRedoDoc, const ScRange& rRange);
+virtual ~ScUndoConditionalFormat();
+
+virtual voidUndo() SAL_OVERRIDE;
+virtual voidRedo() SAL_OVERRIDE;
+virtual voidRepeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE;
+virtual boolCanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE;
+
+virtual OUString GetComment() const SAL_OVERRIDE;
+
+private:
+void DoChange(ScDocument* pDoc);
+boost::scoped_ptr mpUndoDoc;
+boost::scoped_ptr mpRedoDoc;
+ScRange maRange;
+};
+
class ScUndoUseScenario: public ScSimpleUndo
{
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index ee46a95..839ecdb 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -2081,6 +2081,10 @@ Resource RID_GLOBSTR
{
Text [ en-US ] = "click to open hyperlink:";
};
+String STR_
[Libreoffice-commits] core.git: formula/source include/formula
formula/source/core/api/FormulaCompiler.cxx | 21 +
include/formula/FormulaCompiler.hxx |1 +
2 files changed, 18 insertions(+), 4 deletions(-)
New commits:
commit 50d100f4acb2e62bac8b01c8071d089c6171843f
Author: Kohei Yoshida
Date: Thu May 1 15:16:27 2014 -0400
Make a separate method to detemine if an opcode is a jump command.
Jump to make it a bit more pleasant to follow the code...
Change-Id: Ie9bef122e8bb63a2d8cc54acc9c8ddc9ac9a2e8a
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index ce36065..58a8961 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -805,6 +805,21 @@ bool FormulaCompiler::IsOpCodeVolatile( OpCode eOp )
return bRet;
}
+bool FormulaCompiler::IsOpCodeJumpCommand( OpCode eOp )
+{
+switch (eOp)
+{
+case ocIf:
+case ocIfError:
+case ocIfNA:
+case ocChose:
+return true;
+default:
+;
+}
+return false;
+}
+
// Remove quotes, escaped quotes are unescaped.
bool FormulaCompiler::DeQuote( OUString& rStr )
{
@@ -1241,9 +1256,7 @@ void FormulaCompiler::Factor()
|| eOp == ocOr
|| eOp == ocBad
|| ( eOp >= ocInternalBegin && eOp <= ocInternalEnd )
-|| ( bCompileForFAP
- && ( eOp == ocIf || eOp == ocIfError || eOp == ocIfNA ||
eOp == ocChose ) )
-)
+|| (bCompileForFAP && IsOpCodeJumpCommand(eOp)))
{
pFacToken = mpToken;
OpCode eMyLastOp = eOp;
@@ -1291,7 +1304,7 @@ void FormulaCompiler::Factor()
pFacToken->SetByte( nSepCount );
PutCode( pFacToken );
}
-else if (eOp == ocIf || eOp == ocIfError || eOp == ocIfNA || eOp ==
ocChose)
+else if (IsOpCodeJumpCommand(eOp))
{
// the PC counters are -1
pFacToken = mpToken;
diff --git a/include/formula/FormulaCompiler.hxx
b/include/formula/FormulaCompiler.hxx
index a38798a..9df22ec 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -231,6 +231,7 @@ public:
{ bCompileForFAP = bVal; bIgnoreErrors = bVal; }
static bool IsOpCodeVolatile( OpCode eOp );
+static bool IsOpCodeJumpCommand( OpCode eOp );
static bool DeQuote( OUString& rStr );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 changed: What|Removed |Added Depends on||57433 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on|57433 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 m.a.riosv changed: What|Removed |Added Depends on|78154 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 m.a.riosv changed: What|Removed |Added Depends on||78154 Blocks|78154 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 m.a.riosv changed: What|Removed |Added Blocks||78154 --- Comment #154 from m.a.riosv --- Added https://bugs.freedesktop.org/show_bug.cgi?id=78154 Sample ods file crash at opening. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Improving type detection
Hi, On Thu, May 01, 2014 at 09:29:48AM -0400, Kohei Yoshida wrote: > Hi Maxim, > > On Thu, 2014-05-01 at 15:44 +0300, Maxim Monastirsky wrote: > > > https://gerrit.libreoffice.org/9221 > > https://gerrit.libreoffice.org/9222 > > https://gerrit.libreoffice.org/9223 > > > > Any kind of feedback would be appreciated! > > While we are on this subject, I've also received (quite some time ago) > some feedback from the developer & maintainer of some of the external > import filter libraries that we use. Those libraries do handle type > detection that are plugged into our type detection system, and they are > all zip-based formats. He was concerned about having to "detect" zip > storage over and over again which he rightly said was not great for > performance. > > So I was thinking about perhaps introducing an additional boolean > property with the MediaDescriptor - something like "ZipStorageDetected" > which, when true, the subsequent detection code can choose to skip > detecting for zip archive. Yes, that would actually help, but not until we switch the import libraries to librevenge. Currently the zip (and OLE2) detection must be done inside the libraries. Alternatively, I could pass the WPXSvInputStream instance in UserData, so subsequent detection functions for external libs could re-use it. That might save even more time... It would also be pretty well localized change: a few places in writerperfect module. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtffly.hxx | 288 ++---
writerfilter/source/rtftok/rtflistener.hxx | 98 +
2 files changed, 195 insertions(+), 191 deletions(-)
New commits:
commit 8d3295bdac2182d58e6ef3a1eeb3313a1ca19c0d
Author: Miklos Vajna
Date: Thu May 1 20:28:08 2014 +0200
writerfilter: fix indentation in rtf{fly,listener}
Change-Id: I6cbb7ee535cb3c6aab2968150feff9e80fd7e010
diff --git a/writerfilter/source/rtftok/rtffly.hxx
b/writerfilter/source/rtftok/rtffly.hxx
index 5a64559..5a9769d 100644
--- a/writerfilter/source/rtftok/rtffly.hxx
+++ b/writerfilter/source/rtftok/rtffly.hxx
@@ -10,151 +10,153 @@
#ifndef INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFFLY_HXX
#define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFFLY_HXX
-namespace writerfilter {
-namespace rtftok {
-/// Stores the vertical orientation properties of an RTF fly frame.
-class RTFVertOrient
+namespace writerfilter
+{
+namespace rtftok
+{
+/// Stores the vertical orientation properties of an RTF fly frame.
+class RTFVertOrient
+{
+public:
+RTFVertOrient(sal_uInt16 nValue)
+: nVal(nValue)
+{
+}
+
+sal_uInt16 GetOrient() const
+{
+return OSL_LONIBBLE(OSL_LOBYTE(nVal));
+}
+
+sal_uInt16 GetRelation() const
+{
+return OSL_HINIBBLE(OSL_LOBYTE(nVal));
+}
+
+sal_Int32 GetAlign() const
+{
+sal_Int32 nAlign = 0;
+switch (GetOrient())
{
-public:
-RTFVertOrient(sal_uInt16 nValue)
-: nVal(nValue)
-{
-}
-
-sal_uInt16 GetOrient() const
-{
-return OSL_LONIBBLE(OSL_LOBYTE(nVal));
-}
-
-sal_uInt16 GetRelation() const
-{
-return OSL_HINIBBLE(OSL_LOBYTE(nVal));
-}
-
-sal_Int32 GetAlign() const
-{
-sal_Int32 nAlign = 0;
-switch( GetOrient( ) )
-{
-case text::VertOrientation::CENTER:
-nAlign =
NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_center;
-break;
-case text::VertOrientation::TOP:
-nAlign =
NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_top;
-break;
-case text::VertOrientation::BOTTOM:
-nAlign =
NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_bottom;
-break;
-}
-
-return nAlign;
-}
-
-sal_Int32 GetAnchor() const
-{
-sal_Int32 nAnchor = 0;
-switch( GetRelation( ) )
-{
-case text::RelOrientation::FRAME:
-nAnchor =
NS_ooxml::LN_Value_wordprocessingml_ST_VAnchor_text;
-break;
-case text::RelOrientation::PAGE_FRAME:
-nAnchor =
NS_ooxml::LN_Value_wordprocessingml_ST_VAnchor_page;
-break;
-case text::RelOrientation::PAGE_PRINT_AREA:
-nAnchor =
NS_ooxml::LN_Value_wordprocessingml_ST_VAnchor_margin;
-break;
-}
-
-return nAnchor;
-}
-
-sal_uInt16 GetValue() const
-{
-return nVal;
-}
-
-private:
-sal_uInt16 nVal;
-};
-
-/// Stores the horizontal orientation properties of an RTF fly frame.
-class RTFHoriOrient
+case text::VertOrientation::CENTER:
+nAlign = NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_center;
+break;
+case text::VertOrientation::TOP:
+nAlign = NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_top;
+break;
+case text::VertOrientation::BOTTOM:
+nAlign = NS_ooxml::LN_Value_wordprocessingml_ST_YAlign_bottom;
+break;
+}
+
+return nAlign;
+}
+
+sal_Int32 GetAnchor() const
+{
+sal_Int32 nAnchor = 0;
+switch (GetRelation())
{
-public:
-RTFHoriOrient(sal_uInt16 nValue)
-: nVal(nValue)
-{
-}
-
-sal_uInt16 GetOrient() const
-{
-return OSL_LONIBBLE(OSL_LOBYTE(nVal));
-}
-
-sal_uInt16 GetRelation() const
-{
-return OSL_LONIBBLE(OSL_HIBYTE(nVal));
-}
-
-sal_uInt16 GetRelAnchor() const
-{
-return OSL_HINIBB
[Libreoffice-commits] mso-dumper.git: 4 commits - msodumper/emfrecord.py test/emf
msodumper/emfrecord.py | 28 --
test/emf/pass/fdo31814-2.emf |binary
test/emf/test.py | 46 +++
3 files changed, 72 insertions(+), 2 deletions(-)
New commits:
commit f69b2c1e24c711c7451a93cc30a317c113b09d6a
Author: Miklos Vajna
Date: Thu May 1 14:05:43 2014 +0200
add testcase for fdo31814-2.emf
diff --git a/test/emf/pass/fdo31814-2.emf b/test/emf/pass/fdo31814-2.emf
new file mode 100644
index 000..8b3923e
Binary files /dev/null and b/test/emf/pass/fdo31814-2.emf differ
diff --git a/test/emf/test.py b/test/emf/test.py
new file mode 100755
index 000..c4091f5
--- /dev/null
+++ b/test/emf/test.py
@@ -0,0 +1,46 @@
+#!/usr/bin/env python2
+# -*- encoding: UTF-8 -*-
+#
+# 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/.
+#
+
+import sys
+sys.path.append(sys.path[0] + "/../..")
+emf_dumper = __import__('emf-dump')
+from xml.etree import ElementTree
+import unittest
+import os
+
+
+class Test(unittest.TestCase):
+def dump(self, name):
+try:
+os.unlink("%s.emf.xml" % name)
+except OSError:
+pass
+sock = open("%s.emf.xml" % name, "w")
+saved = sys.stdout
+sys.stdout = sock
+emf_dumper.main(["emf-dumper", "%s.emf" % name])
+sys.stdout = saved
+sock.close()
+tree = ElementTree.parse('%s.emf.xml' % name)
+self.root = tree.getroot()
+# Make sure everything is dumped - so it can't happen that dump(a) ==
dump(b), but a != b.
+self.assertEqual(0, len(self.root.findall('todo')))
+
+def test_pass(self):
+"""This test just makes sure that all files in the 'pass' directory are
+dumped without problems."""
+
+for dirname, dirnames, filenames in os.walk('pass'):
+for filename in filenames:
+if filename.endswith(".emf"):
+self.dump(os.path.join(dirname, filename).replace('.emf',
''))
+
+if __name__ == '__main__':
+unittest.main()
+
+# vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab:
commit e110cc9eb66a5f1bc40a2f8864bd9977e614c5ad
Author: Miklos Vajna
Date: Thu May 1 14:01:11 2014 +0200
EMF: fix dumping of fdo31814-2.emf
diff --git a/msodumper/emfrecord.py b/msodumper/emfrecord.py
index b25218c..4ed10b1 100644
--- a/msodumper/emfrecord.py
+++ b/msodumper/emfrecord.py
@@ -52,6 +52,7 @@ PenStyle = {
0x0001: "PS_GEOMETRIC",
# Additional combinations
0x00010200: "PS_GEOMETRIC, PS_ENDCAP_FLAT",
+0x00011100: "PS_GEOMETRIC, PS_JOIN_BEVEL, PS_ENDCAP_SQUARE",
}
commit 2bf7f7eb23ba7fc9e94c9fb21b5cda12d336d550
Author: Miklos Vajna
Date: Thu May 1 13:56:25 2014 +0200
EmrComment: dump comment identifier value in case it's not a known one
diff --git a/msodumper/emfrecord.py b/msodumper/emfrecord.py
index 20502cb..b25218c 100644
--- a/msodumper/emfrecord.py
+++ b/msodumper/emfrecord.py
@@ -235,7 +235,7 @@ class EmrComment(EMFRecord):
elif commentIdentifier == 0x43494447: # EMR_COMMENT_PUBLIC
print ''
else:
-print ''
+print ''
% hex(commentIdentifier)
class EmrSetviewportorgex(EMFRecord):
commit 5c0096ada4e991a19a70d8e056c84617ed90c0fe
Author: Miklos Vajna
Date: Thu May 1 13:45:01 2014 +0200
dump EmrSetstretchbltmode
diff --git a/msodumper/emfrecord.py b/msodumper/emfrecord.py
index 1683b7f..20502cb 100644
--- a/msodumper/emfrecord.py
+++ b/msodumper/emfrecord.py
@@ -271,6 +271,29 @@ class EmrSetpolyfillmode(EMFRecord):
assert self.pos - posOrig == self.Size
+# Used to specify how color data is added to or removed from bitmaps that are
+# stretched or compressed.
+StretchMode = {
+0x01: "STRETCH_ANDSCANS",
+0x02: "STRETCH_ORSCANS",
+0x03: "STRETCH_DELETESCANS",
+0x04: "STRETCH_HALFTONE",
+}
+
+
+class EmrSetstretchbltmode(EMFRecord):
+"""Specifies bitmap stretch mode."""
+def __init__(self, parent):
+EMFRecord.__init__(self, parent)
+
+def dump(self):
+posOrig = self.pos
+self.printAndSet("Type", self.readuInt32())
+self.printAndSet("Size", self.readuInt32(), hexdump=False)
+self.printAndSet("StretchMode", self.readuInt32(), dict=StretchMode)
+assert self.pos - posOrig == self.Size
+
+
class EmrExtselectcliprgn(EMFRecord):
"""Combines the specified region with the current clip region using the
specified mode."""
def __init__(self, parent):
@@ -782,7 +805,7 @@ RecordType = {
0x0012: ['EMR_SETBKMODE'],
0x0013: ['EMR_SETPOLYFILLMODE', EmrSetpolyfillmode],
0x0014: ['EMR_SETROP2'],
-0x0015: ['EMR_SETSTRETCHBLTMODE'],
+0x0015: ['EMR_SETSTRETCHBLTMODE', EmrSetstretchbltmode],
0x0016: ['EMR_SETTEXTALIGN'],
0x0017: [
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu| 24 -- officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 24 -- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 24 ++ officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 24 -- 4 files changed, 24 insertions(+), 72 deletions(-) New commits: commit 36dfee00febfa51b73ac58655ba26fb56d020679 Author: Maxim Monastirsky Date: Thu May 1 21:50:28 2014 +0300 Keep only one instance of CellVert commands Change-Id: I623f47ec06924bf6355ea9531aab1c5286d18a17 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 3b8e357..18dc5d3 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -1701,30 +1701,6 @@ 1 - - - Top - - - 1 - - - - - Center ( vertical ) - - - 1 - - - - - Bottom - - - 1 - - diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index fbabdd3..b4b6366 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -1647,30 +1647,6 @@ 1 - - - Bottom - - - 1 - - - - - Center ( vertical ) - - - 1 - - - - - Top - - - 1 - - Insert Row diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index ad9275b..0704fa6 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -5328,6 +5328,30 @@ Delete Comment + + + Top + + + 1 + + + + + Center ( vertical ) + + + 1 + + + + + Bottom + + + 1 + + diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 247d2d1..2417301 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -1906,14 +1906,6 @@ To Previous Paragraph - - - Top - - - 1 - - Allow Row to Break Across Pages and Columns @@ -1932,27 +1924,11 @@ To Next Paragraph - - - Center ( vertical ) - - - 1 - - To Next Placeholder - - - Bottom - - - 1 - - To Previous Placeholder ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: How to build an old version of LibO
On Thu, May 1, 2014 at 7:23 PM, Laurent BP wrote: > Thanks Ruslan for your answer. > > Ruslan Kabatsayev wrote >> So you want to reset your local branch to libreoffice-4-2, right? I >> think what you need is switching to your local branch and doing >> >> git reset --hard origin/libreoffice-4-2 > > OK. It works. Now after make distclean and autogen and make > I've got a 4.2 version up to date: Version: 4.2.5.0.0+ > Build ID: d1d25c8cbc2962ce2501b4ed6034d2e4e4ccba9a > > And now, how can I revert to dace560b350346b9f9a102ee602bb129a008bcfe? If you reset to this commit, you'll appear somewhere in the master branch. Are you sure this is what you want? This would then explain why your version after build was 4.3. It seems you've picked the wrong sha1 of the commit. Also, note that when a commit is pushed to several branches, each its instance will have its own unique hash. Thus, you should check, which of all these sha1 sums you really want to switch to. (Although this one doesn't have copies of its commit message as I've searched.) > > Regards, > > Laurent BP > > > > > - > LibreOffice 4.2.4.1 > -- > View this message in context: > http://nabble.documentfoundation.org/How-to-build-an-old-version-of-LibO-tp4106986p4107154.html > Sent from the Dev mailing list archive at Nabble.com. > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/README svgio/README
filter/README |2 ++ svgio/README |1 + 2 files changed, 3 insertions(+) New commits: commit 1cb924de8a6f03827ae34aa2d66137b6b5e34112 Author: Julien Nabet Date: Thu May 1 19:31:59 2014 +0200 Update filter README and add a new one. See http://nabble.documentfoundation.org/About-Svgreader-td4107050.html Thank you Christina for these information Change-Id: I56c4f5fdeec91e7e35990bffcf19451baa541552 diff --git a/filter/README b/filter/README index 9ebd0fb..85dfb9b 100644 --- a/filter/README +++ b/filter/README @@ -9,3 +9,5 @@ and are loaded and used in a uniform fashion from code in svtools/source/filter/filter.cxx. Others have different API and are loaded from other places. For instance "icgm" has ImportCGM, and is loaded and used by sd/source/filter/cgm/sdcgmfilter.cxx (!). +Svgreader is used for "File->Open" and then to choose the svg file. +For "Insert->Picture->From File", see svgio/source/svgreader directory. diff --git a/svgio/README b/svgio/README new file mode 100644 index 000..722f6c0 --- /dev/null +++ b/svgio/README @@ -0,0 +1 @@ +It contains svgio/source/svgreader which is used for "Insert->Picture->From File". ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[SOLVED] Re: About Svgreader
Thank you Christina for your feedback, I used it for http://cgit.freedesktop.org/libreoffice/core/commit/?id=1cb924de8a6f03827ae34aa2d66137b6b5e34112 Julien -- View this message in context: http://nabble.documentfoundation.org/About-Svgreader-tp4107050p4107174.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/crsr/crsrsh.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f99f4dc93f44fa1cd799d0ad87ded7ee90d82848 Author: Chris Sherlock Date: Fri May 2 03:28:02 2014 +1000 Fix d0b3832bedf65d Turns out, my logic was wrong in any case. Remove errant not. Change-Id: I735ee1b4364060aa1476160777e196878a5a208e diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 9958ede..62c11d0 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -2511,7 +2511,7 @@ void SwCrsrShell::_ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing ) } pTmpDel = 0; } -if( bGoNext && !pTmp ) +if( bGoNext && pTmp ) pTmp = (SwPaM*)pTmp->GetNext(); } while( !bGoNext || *ppDelRing != pTmp ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source vcl/source
sw/source/core/crsr/crsrsh.cxx |2 +-
vcl/source/outdev/font.cxx | 12 +++-
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit d0b3832bedf65d466b37a69036b0b4ba550a849b
Author: Chris Sherlock
Date: Fri May 2 03:03:37 2014 +1000
Fix 6b431b1f0d397067504b5300d49e10e232936836
Pushed wrong branch. Oops, sorry.
Change-Id: I592cf16c7af3c5e37a03eee79e5822dcc0b39225
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index c2d2639..9958ede 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2511,7 +2511,7 @@ void SwCrsrShell::_ParkPams( SwPaM* pDelRg, SwShellCrsr**
ppDelRing )
}
pTmpDel = 0;
}
-if( bGoNext && !bDelete )
+if( bGoNext && !pTmp )
pTmp = (SwPaM*)pTmp->GetNext();
} while( !bGoNext || *ppDelRing != pTmp );
commit e97f19e96c094457ba98e3f89195cad4d814e8a3
Author: Chris Sherlock
Date: Fri May 2 02:34:14 2014 +1000
coverity#441827 Deference before null check
In OutputDevice::ImplGlyphFallbackLayout we should check to ensure that
mpFontEntry is valid, if not then return NULL early.
Change-Id: I946aa4d724a73a2ff85a4281c0df5f75e12104f7
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index e9ae02e..78f8204 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -2029,6 +2029,16 @@ SalLayout* OutputDevice::getFallbackFont(ImplFontEntry
&rFallbackFont,
SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout,
ImplLayoutArgs& rLayoutArgs ) const
{
+// This function relies on a valid mpFontEntry, if it doesn't exist bail
out
+// - we'd have crashed later on anyway. At least here we can catch the
error in debug
+// mode.
+if ( !mpFontEntry )
+{
+SAL_WARN ("vcl.gdi", "No font entry set in OutputDevice");
+assert(mpFontEntry);
+return NULL;
+}
+
// prepare multi level glyph fallback
MultiSalLayout* pMultiSalLayout = NULL;
ImplLayoutRuns aLayoutRuns = rLayoutArgs.maRuns;
@@ -2062,7 +2072,7 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout(
SalLayout* pSalLayout, ImplLay
aFontSelData.mpFontEntry = pFallbackFont;
aFontSelData.mpFontData = pFallbackFont->maFontSelData.mpFontData;
-if( mpFontEntry && nFallbackLevel < MAX_FALLBACK-1)
+if( nFallbackLevel < MAX_FALLBACK-1)
{
// ignore fallback font if it is the same as the original font
if( mpFontEntry->maFontSelData.mpFontData ==
aFontSelData.mpFontData )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/Library_swd.mk sw/Library_sw.mk sw/Library_swui.mk sw/source
sw/Library_sw.mk |2
sw/Library_swd.mk|9
sw/Library_swui.mk |1
sw/inc/iodetect.hxx | 21 ++
sw/inc/swddllapi.h | 33
sw/source/filter/basflt/iodetect.cxx | 71 ---
6 files changed, 7 insertions(+), 130 deletions(-)
New commits:
commit 4b7bdef4b1d1e4ff45a8816c038df38ce7995b3d
Author: Maxim Monastirsky
Date: Mon Apr 28 18:31:24 2014 +0300
sw: iodetect is not a part of the type detector anymore
and remove now unused IsFileFilter method.
Change-Id: I6b4559fdf6442b6baa869b2949142f8fc8c52f30
Reviewed-on: https://gerrit.libreoffice.org/9223
Reviewed-by: Maxim Monastirsky
Tested-by: Maxim Monastirsky
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index af465ca..839197b 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -65,7 +65,6 @@ $(eval $(call gb_Library_use_libraries,sw,\
svt \
svx \
svxcore \
- swd \
tk \
tl \
ucbhelper \
@@ -479,6 +478,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/filter/ascii/wrtasc \
sw/source/filter/basflt/docfact \
sw/source/filter/basflt/fltini \
+sw/source/filter/basflt/iodetect \
sw/source/filter/basflt/shellio \
sw/source/filter/html/SwAppletImpl \
sw/source/filter/html/css1atr \
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index cb92fe3..8657cf1 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -23,19 +23,12 @@ $(eval $(call gb_Library_set_componentfile,swd,sw/util/swd))
$(eval $(call gb_Library_set_include,swd,\
$$(INCLUDE) \
--I$(SRCDIR)/sw/inc \
--I$(SRCDIR)/sw/source/core/inc \
--I$(SRCDIR)/sw/source/filter/inc \
))
$(eval $(call gb_Library_use_external,swd,boost_headers))
$(eval $(call gb_Library_use_sdk_api,swd))
-$(eval $(call gb_Library_add_defs,swd,\
--DSWD_DLLIMPLEMENTATION \
-))
-
$(eval $(call gb_Library_use_libraries,swd,\
comphelper \
cppu \
@@ -43,14 +36,12 @@ $(eval $(call gb_Library_use_libraries,swd,\
sal \
sfx \
sot \
-svt \
tl \
utl \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,swd,\
-sw/source/filter/basflt/iodetect \
sw/source/ui/uno/detreg \
sw/source/ui/uno/swdetect \
))
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index 13ba3a5..009089a 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -62,7 +62,6 @@ $(eval $(call gb_Library_use_libraries,swui,\
svx \
svxcore \
sw \
-swd \
tk \
tl \
ucbhelper \
diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx
index e3e33cd..c3ed1e2 100644
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.hxx
@@ -25,7 +25,7 @@
#include
#include
#include
-#include
+#include
#define FILTER_RTF "RTF" ///< RTF filter
#define sRtfWH "WH_RTF"
@@ -76,7 +76,7 @@ enum ReaderWriterEnum {
MAXFILTER
};
-extern SWD_DLLPUBLIC SwIoDetect aFilterDetect[];
+extern SwIoDetect aFilterDetect[];
/** The following class is a wrapper for basic i/o functions of Writer 3.0.
Everything is static. All filter names mentioned are Writer-internal
@@ -87,33 +87,24 @@ class SwIoSystem
{
public:
/// find for an internal format name the corresponding filter entry
-SWD_DLLPUBLIC static const SfxFilter*
+SW_DLLPUBLIC static const SfxFilter*
GetFilterOfFormat( const OUString& rFormat,
const SfxFilterContainer* pCnt = 0 );
/** Detect for the given file which filter should be used. The filter name
is returned. If no filter could be found, the name of the ASCII filter
is returned! */
-SWD_DLLPUBLIC static const SfxFilter*
-GetFileFilter( const OUString& rFileName,
-const OUString& rPrefFltName,
-SfxMedium* pMedium = 0 );
-
-/** Detect whether the given file is in the given format.
- For now, only our own filters are supported! */
-static bool IsFileFilter(SfxMedium& rMedium, const OUString& rFmtName);
+static const SfxFilter* GetFileFilter( const OUString& rFileName, const
OUString& rPrefFltName, SfxMedium* pMedium = 0 );
static bool IsValidStgFilter( SotStorage& , const SfxFilter& );
static bool IsValidStgFilter( const com::sun::star::uno::Reference <
com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter);
-SWD_DLLPUBLIC static bool
-IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen,
+static bool IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen,
rtl_TextEncoding *pCharSet=0, bool *pSwap=0, LineEnd *pLineEnd=0,
bool bEncodedFilter = false );
static const SfxFilter* GetTextFilter( const sal_Char* pBuf, sal_uLong
nLen );
-SWD_DLLPUBLIC static const OUString
-GetSubStorageName( const SfxFilter& rFltr );
+static const OUString GetSubStorag
[Libreoffice-commits] core.git: filter/Library_storagefd.mk filter/Module_filter.mk filter/source postprocess/Rdb_services.mk Repository.mk solenv/gbuild
Repository.mk |1 filter/Library_storagefd.mk | 36 + filter/Module_filter.mk |1 filter/source/config/fragments/types/calc8.xcu |2 filter/source/config/fragments/types/calc8_template.xcu |2 filter/source/config/fragments/types/calc_StarOffice_XML_Calc.xcu |2 filter/source/config/fragments/types/calc_StarOffice_XML_Calc_Template.xcu |2 filter/source/config/fragments/types/chart8.xcu |2 filter/source/config/fragments/types/chart_StarOffice_XML_Chart.xcu |2 filter/source/config/fragments/types/draw8.xcu |2 filter/source/config/fragments/types/draw8_template.xcu |2 filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu |2 filter/source/config/fragments/types/draw_StarOffice_XML_Draw_Template.xcu |2 filter/source/config/fragments/types/impress8.xcu |2 filter/source/config/fragments/types/impress8_template.xcu |2 filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu |2 filter/source/config/fragments/types/impress_StarOffice_XML_Impress_Template.xcu |2 filter/source/config/fragments/types/math8.xcu |2 filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu |2 filter/source/config/fragments/types/writer8.xcu |2 filter/source/config/fragments/types/writer8_template.xcu |2 filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu |2 filter/source/config/fragments/types/writer_StarOffice_XML_Writer_Template.xcu |2 filter/source/config/fragments/types/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu |2 filter/source/config/fragments/types/writer_web_StarOffice_XML_Writer_Web_Template.xcu |2 filter/source/config/fragments/types/writerglobal8.xcu |2 filter/source/config/fragments/types/writerweb8_writer_template.xcu |2 filter/source/storagefilterdetect/fdcomp.cxx | 36 + filter/source/storagefilterdetect/filterdetect.cxx | 208 ++ filter/source/storagefilterdetect/filterdetect.hxx | 72 +++ filter/source/storagefilterdetect/storagefd.component | 15 postprocess/Rdb_services.mk |1 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 33 files changed, 395 insertions(+), 24 deletions(-) New commits: commit f82f7bf3dd5053049259f6933d1335f6c9e314dd Author: Maxim Monastirsky Date: Sun Apr 27 15:54:58 2014 +0300 Introduce centralized detection for storage-based files This will allow us to get rid of the duplicated code, and simplify the type detectors. Also this commit fixes fdo#46310 and fdo#74978. Change-Id: I08e958ab10d05e1036cdc2bed5ce14bf73b6245c Reviewed-on: https://gerrit.libreoffice.org/9221 Reviewed-by: Maxim Monastirsky Tested-by: Maxim Monastirsky diff --git a/Repository.mk b/Repository.mk index 46d2783..a02d3d6 100644 --- a/Repository.mk +++ b/Repository.mk @@ -327,6 +327,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ sot \ spell \ $(if $(ENABLE_HEADLESS),,spl) \ + storagefd \ $(if $(DISABLE_SCRIPTING),,stringresource) \ svgio \ svl \ diff --git a/filter/Library_storagefd.mk b/filter/Library_storagefd.mk new file mode 100644 index 000..5b05e7e --- /dev/null +++ b/filter/Library_storagefd.mk @@ -0,0 +1,36 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#* +# +# This file is part of the LibreOffice project. +# +# This So
Jeroen Nijhof license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Jeroen Nijhof ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 21 commits - chart2/qa cui/source hwpfilter/source include/vcl sc/qa sc/source sd/source sfx2/source svx/source sw/source unotools/source vcl/generic vcl/inc vcl/source
chart2/qa/extras/chart2import.cxx |2
cui/source/tabpages/labdlg.cxx | 15 +++--
cui/source/tabpages/textattr.cxx| 18 +++---
hwpfilter/source/hpara.cxx | 34 +++-
include/vcl/wmf.hxx |2
sc/qa/unit/rangelst_test.cxx|9 ++-
sc/source/filter/excel/xestyle.cxx |1
sd/source/ui/dlg/tpoption.cxx |8 +-
sfx2/source/view/impviewframe.hxx | 38 -
sfx2/source/view/viewfrm.cxx|1
svx/source/svdraw/svdmodel.cxx | 11 ---
sw/source/core/view/vprint.cxx | 68 +---
sw/source/ui/envelp/envprt.cxx |1
sw/source/ui/envelp/label1.cxx |1
sw/source/ui/misc/num.cxx |6 +-
sw/source/ui/misc/outline.cxx |5 +
sw/source/ui/misc/pgfnote.cxx |1
unotools/source/config/lingucfg.cxx | 100
vcl/generic/print/printerjob.cxx| 22 ++-
vcl/inc/sallayout.hxx |9 ++-
vcl/source/filter/graphicfilter.cxx |2
vcl/source/filter/wmf/emfwr.cxx |5 -
vcl/source/filter/wmf/emfwr.hxx | 23 ++--
vcl/source/filter/wmf/wmf.cxx |5 -
vcl/source/filter/wmf/wmfwr.cxx | 36 ++--
vcl/source/filter/wmf/wmfwr.hxx |7 --
vcl/source/window/dockwin.cxx | 40 +-
vcl/unx/generic/app/i18n_ic.cxx |8 ++
28 files changed, 308 insertions(+), 170 deletions(-)
New commits:
commit b44ca2f45e86abb62718534fad43cdd3741101ba
Author: Caolán McNamara
Date: Thu May 1 17:10:21 2014 +0100
Resolves: fdo#78128 go back to using an interim metafile
this time we know that the other varient of "Move" doesn't
handle pixel drawing stuff like the dpi-using one does.
and the move values have to be in 100TH_MM_MAP and
with the true numbers of the write page size
Change-Id: I15fdb78797d8744702bec649024fedbf3e39b342
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index f6a5c69..5898fbd 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -455,6 +455,28 @@ bool SwViewShell::PrintOrPDFExport(
// output device is now provided by a call from outside the Writer)
pOutDev->Push();
+// fdo#36815 for comments in margins print to a metafile
+// and then scale that metafile down so that the comments
+// will fit on the real page, and replay that scaled
+// output to the real outputdevice
+GDIMetaFile *pOrigRecorder(NULL);
+GDIMetaFile *pMetaFile(NULL);
+sal_Int16 nPostItMode = rPrintData.GetPrintPostIts();
+if (nPostItMode == POSTITS_INMARGINS)
+{
+//get and disable the existing recorder
+pOrigRecorder = pOutDev->GetConnectMetaFile();
+pOutDev->SetConnectMetaFile(NULL);
+// turn off output to the device
+pOutDev->EnableOutput(false);
+// just record the rendering commands to the metafile
+// instead
+pMetaFile = new GDIMetaFile;
+pMetaFile->SetPrefSize(pOutDev->GetOutputSize());
+pMetaFile->SetPrefMapMode(pOutDev->GetMapMode());
+pMetaFile->Record(pOutDev);
+}
+
// Print/PDF export for (multi-)selection has already generated a
// temporary document with the selected text.
// (see XRenderable implementation in unotxdoc.cxx)
@@ -470,8 +492,6 @@ bool SwViewShell::PrintOrPDFExport(
pDrawView->SetBufferedOverlayAllowed( false );
}
-sal_Int16 nPostItMode = rPrintData.GetPrintPostIts();
-
{ // additional scope so that the CurrShell is reset before destroying
the shell
SET_CURR_SHELL( pShell );
@@ -519,6 +539,32 @@ bool SwViewShell::PrintOrPDFExport(
pPostItManager->CalcRects();
pPostItManager->LayoutPostIts();
pPostItManager->DrawNotesForPage(pOutDev, nPage-1);
+
+//Stop recording now
+pMetaFile->Stop();
+pMetaFile->WindStart();
+//Enable output to the device again
+pOutDev->EnableOutput(true);
+//Restore the original recorder
+pOutDev->SetConnectMetaFile(pOrigRecorder);
+
+//Now scale the recorded page down so the notes
+//will fit in the final page
+double fScale = 0.75;
+long nOrigHeight = pStPage->Frm().Height();
+long nNewHeight = nOrigHeight*fScale;
+long nShiftY = (nOrigHeight-nNewHeight)/2;
+pMetaFile->Scale( fScale, fScale );
+pMetaFile->WindStart();
+//Move the scaled page down to center it
+//the other variant of Move does not map pixels
+//back to the logical units correctly
+pMetaFile->Move(0, convertTwipToMm100(nShiftY),
pOutDev->GetDPIX(), pOutDev->GetDPIY());
+pMetaFile->WindStart();
+
+//play back the scaled page
+pMetaFile->Play(pOutDev);
+
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/listenercontext.hxx |7 +--
sc/source/core/data/column.cxx |9 +++--
sc/source/core/data/listenercontext.cxx |9 +
sc/source/core/tool/token.cxx |8 ++--
4 files changed, 27 insertions(+), 6 deletions(-)
New commits:
commit 7fbe0f56192f7e106c560646d37fbb93b69b0446
Author: Kohei Yoshida
Date: Thu May 1 12:16:12 2014 -0400
fdo#77806: Use the common block position set for start and end listening.
Else an invalid iterator may result, which would eventually leads to a
crash.
Change-Id: Ie909de61244d661c72a3450cc69b29fbb218a248
diff --git a/sc/inc/listenercontext.hxx b/sc/inc/listenercontext.hxx
index 0e63b8d..7d66f924 100644
--- a/sc/inc/listenercontext.hxx
+++ b/sc/inc/listenercontext.hxx
@@ -15,6 +15,7 @@
#include
#include
+#include
class ScDocument;
class ScTokenArray;
@@ -27,9 +28,10 @@ class ColumnBlockPositionSet;
class StartListeningContext : boost::noncopyable
{
ScDocument& mrDoc;
-boost::scoped_ptr mpSet;
+boost::shared_ptr mpSet;
public:
StartListeningContext(ScDocument& rDoc);
+StartListeningContext(ScDocument& rDoc, const
boost::shared_ptr& pSet);
ScDocument& getDoc();
ColumnBlockPosition* getBlockPosition(SCTAB nTab, SCCOL nCol);
@@ -39,12 +41,13 @@ class EndListeningContext : boost::noncopyable
{
ScDocument& mrDoc;
ColumnSpanSet maSet;
-boost::scoped_ptr mpPosSet;
+boost::shared_ptr mpPosSet;
ScTokenArray* mpOldCode;
ScAddress maPosDelta; // Add this to get the old position prior to the
move.
public:
EndListeningContext(ScDocument& rDoc, ScTokenArray* pOldCode = NULL);
+EndListeningContext(ScDocument& rDoc, const
boost::shared_ptr& pSet, ScTokenArray* pOldCode = NULL);
void setPositionDelta( const ScAddress& rDelta );
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 208c046..a76e746 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2176,9 +2176,14 @@ class UpdateRefOnNonCopy :
std::unary_function
// Perform end-listening, start-listening, and dirtying on all
// formula cells in the group.
-sc::StartListeningContext aStartCxt(mpCxt->mrDoc);
+// Make sure that the start and end listening contexts share the
+// same block position set, else an invalid iterator may ensue.
+boost::shared_ptr pPosSet(
+new sc::ColumnBlockPositionSet(mpCxt->mrDoc));
+
+sc::StartListeningContext aStartCxt(mpCxt->mrDoc, pPosSet);
+sc::EndListeningContext aEndCxt(mpCxt->mrDoc, pPosSet,
pOldCode.get());
-sc::EndListeningContext aEndCxt(mpCxt->mrDoc, pOldCode.get());
aEndCxt.setPositionDelta(
ScAddress(-mpCxt->mnColDelta, -mpCxt->mnRowDelta,
-mpCxt->mnTabDelta));
diff --git a/sc/source/core/data/listenercontext.cxx
b/sc/source/core/data/listenercontext.cxx
index add75a2..dcdffac 100644
--- a/sc/source/core/data/listenercontext.cxx
+++ b/sc/source/core/data/listenercontext.cxx
@@ -16,6 +16,10 @@ namespace sc {
StartListeningContext::StartListeningContext(ScDocument& rDoc) :
mrDoc(rDoc), mpSet(new ColumnBlockPositionSet(rDoc)) {}
+StartListeningContext::StartListeningContext(
+ScDocument& rDoc, const boost::shared_ptr& pSet) :
+mrDoc(rDoc), mpSet(pSet) {}
+
ScDocument& StartListeningContext::getDoc()
{
return mrDoc;
@@ -30,6 +34,11 @@ EndListeningContext::EndListeningContext(ScDocument& rDoc,
ScTokenArray* pOldCod
mrDoc(rDoc), maSet(false), mpPosSet(new ColumnBlockPositionSet(rDoc)),
mpOldCode(pOldCode), maPosDelta(0,0,0) {}
+EndListeningContext::EndListeningContext(
+ScDocument& rDoc, const boost::shared_ptr& pSet,
ScTokenArray* pOldCode) :
+mrDoc(rDoc), maSet(false), mpPosSet(pSet),
+mpOldCode(pOldCode), maPosDelta(0,0,0) {}
+
void EndListeningContext::setPositionDelta( const ScAddress& rDelta )
{
maPosDelta = rDelta;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index bd884eb..b1f8e02 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2785,13 +2785,17 @@ sc::RefUpdateResult
ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon
sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove(
const sc::RefUpdateContext& rCxt, const ScAddress& rOldPos, const
ScAddress& rNewPos )
{
+sc::RefUpdateResult aRes;
+
+if (!rCxt.mnColDelta && !rCxt.mnRowDelta && !rCxt.mnTabDelta)
+// The cell hasn't moved at all.
+return aRes;
+
// When moving, the range is the destination range. We need to use the old
// range prior to the move for hit analysis.
ScRange aOldRange = rCxt.maRange;
aOldRange.Move(-rCxt.mnColDelta, -rCxt.mnRowDelta, -rCxt.mnTabDelta);
-sc::RefUpdateResult aRes;
-
FormulaToken** p = pCode;
FormulaToken** pE
[Libreoffice-commits] core.git: sw/source
sw/source/core/crsr/crsrsh.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 6b431b1f0d397067504b5300d49e10e232936836 Author: Chris Sherlock Date: Fri May 2 02:01:24 2014 +1000 coverity#708922 Use after free Change-Id: I54c098ca4744d33d2f8e1a7799ba6bd5620ed987 diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index fe86bd3..c2d2639 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -2511,8 +2511,9 @@ void SwCrsrShell::_ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing ) } pTmpDel = 0; } -if( bGoNext ) +if( bGoNext && !bDelete ) pTmp = (SwPaM*)pTmp->GetNext(); + } while( !bGoNext || *ppDelRing != pTmp ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: How to build an old version of LibO
Thanks Ruslan for your answer. Ruslan Kabatsayev wrote > So you want to reset your local branch to libreoffice-4-2, right? I > think what you need is switching to your local branch and doing > > git reset --hard origin/libreoffice-4-2 OK. It works. Now after make distclean and autogen and make I've got a 4.2 version up to date: Version: 4.2.5.0.0+ Build ID: d1d25c8cbc2962ce2501b4ed6034d2e4e4ccba9a And now, how can I revert to dace560b350346b9f9a102ee602bb129a008bcfe? Regards, Laurent BP - LibreOffice 4.2.4.1 -- View this message in context: http://nabble.documentfoundation.org/How-to-build-an-old-version-of-LibO-tp4106986p4107154.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - basic/qa o3tl/qa
basic/qa/cppunit/basictest.hxx |2 ++ o3tl/qa/test-sorted_vector.cxx |4 2 files changed, 6 insertions(+) New commits: commit f0bfee74d479f39d500d19c48380d88bdb3ad93d Author: Chris Sherlock Date: Thu May 1 23:49:05 2014 +1000 coverity#1209778 & coverity#1209777 Resource leak Have testBasics_FindPtr() cleanup after itself by deleting p2 and p4. Change-Id: I88b5efd25941d135b743f759a8f27c1cdbcb43c0 diff --git a/o3tl/qa/test-sorted_vector.cxx b/o3tl/qa/test-sorted_vector.cxx index e380355..059c1ba 100644 --- a/o3tl/qa/test-sorted_vector.cxx +++ b/o3tl/qa/test-sorted_vector.cxx @@ -193,6 +193,8 @@ public: CPPUNIT_ASSERT( aVec.size() == 3 ); aVec.DeleteAndDestroyAll(); +delete p2; +delete p4; } void testErase_FindPtr() commit 8bf0b9536cb33dfcce8a811b70c2ead285300f3f Author: Chris Sherlock Date: Thu May 1 23:42:49 2014 +1000 coverity#1209779 & coverity#1209780 Resource leak Have the testBasics() function clean up after itself - delete p2 and p4 at the end of the function. Change-Id: Ib0c732e1962da94fde0e0da307f610dd36f49eda diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx index 3cf5669..369f0df 100644 --- a/basic/qa/cppunit/basictest.hxx +++ b/basic/qa/cppunit/basictest.hxx @@ -78,6 +78,8 @@ class MacroSnippet sSource = sCode; } } + +free(buffer); } } CPPUNIT_ASSERT_MESSAGE( "Source is empty", ( sSource.getLength() > 0 ) ); diff --git a/o3tl/qa/test-sorted_vector.cxx b/o3tl/qa/test-sorted_vector.cxx index 5f068d9..e380355 100644 --- a/o3tl/qa/test-sorted_vector.cxx +++ b/o3tl/qa/test-sorted_vector.cxx @@ -68,6 +68,8 @@ public: CPPUNIT_ASSERT( aVec.erase(p2) == 0 ); aVec.DeleteAndDestroyAll(); +delete p2; +delete p4; } void testErase() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Improving type detection
Hi Maxim, On Thu, 2014-05-01 at 15:44 +0300, Maxim Monastirsky wrote: > https://gerrit.libreoffice.org/9221 > https://gerrit.libreoffice.org/9222 > https://gerrit.libreoffice.org/9223 > > Any kind of feedback would be appreciated! So, I looked over those changes, and I do like the changes. :-) I believe they will greatly improve the maintainability of the type detection code not to mention several bugs they fix. I believe these changes pass "make check"? If so, let's go ahead to push those changes in. While we are on this subject, I've also received (quite some time ago) some feedback from the developer & maintainer of some of the external import filter libraries that we use. Those libraries do handle type detection that are plugged into our type detection system, and they are all zip-based formats. He was concerned about having to "detect" zip storage over and over again which he rightly said was not great for performance. So I was thinking about perhaps introducing an additional boolean property with the MediaDescriptor - something like "ZipStorageDetected" which, when true, the subsequent detection code can choose to skip detecting for zip archive. Anyway, this is perhaps for a future project. I'd like to throw this in since you are working in this area, in case you can come up with a clever way to plug such functionality in for your next project. ;-) Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/txtfrm.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cedbbe2f78a6a07d79b43d71f36738b46cf62c38
Author: Miklos Vajna
Date: Thu May 1 14:30:12 2014 +0200
fdo#78153 SwTxtFrm::ManipOfst() requires a valid position
At least it seems that after setting the offset to the largest possible
value (instead of COMPLETE_STRING), things get back to normal.
Change-Id: I25fafd277eaf480f9ae232254ced3946589aa562
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 1da7fa4..bd4fc8c 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -831,7 +831,7 @@ static void lcl_ModifyOfst( SwTxtFrm* pFrm, sal_Int32 nPos,
sal_Int32 nLen )
while( pFrm )
{
if (nLen == COMPLETE_STRING)
-pFrm->ManipOfst( COMPLETE_STRING );
+pFrm->ManipOfst( pFrm->GetTxtNode()->GetTxt().getLength() );
else
pFrm->ManipOfst( pFrm->GetOfst() + nLen );
pFrm = pFrm->GetFollow();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/qa
sal/qa/osl/file/osl_File.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit bd22c1ca588147dd522542fcc39ba8b3f5c3b16c Author: Chris Sherlock Date: Thu May 1 23:19:43 2014 +1000 coverity#1209781 Resource leak We should free pTV_modify when we're done with it. Change-Id: I7eaf64df2f7bdf6bd899d3a31cad499c4066c990 diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 261..5e5093b 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -1860,7 +1860,7 @@ namespace osl_FileStatus CPPUNIT_ASSERT( nError == FileBase::E_None ); //get modify time -TimeValue *pTV_modify = NULL; +TimeValue* pTV_modify = NULL; CPPUNIT_ASSERT( ( pTV_modify = ( TimeValue* )malloc( sizeof( TimeValue ) ) ) != NULL ); *pTV_modify = rFileStatus.getModifyTime(); @@ -1868,6 +1868,7 @@ namespace osl_FileStatus //delete file deleteTestFile( aTypeURL ); free( pTV_current ); +free( pTV_modify ); CPPUNIT_ASSERT_MESSAGE( "test for getModifyTime function: This test turns out that UNX pricision is no more than 1 sec, don't know how to improve this function. ", bOK ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/nativecontrols.cxx | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 68bfb2a082cc8def86d9706f3328d39d585eecfb
Author: Chris Sherlock
Date: Thu May 1 22:56:17 2014 +1000
coverity#1209550 Unchecked dynamic_cast
Dynamic cast can be dangerous - if the cast fails then it returns NULL.
Coverity picked this up - it could effect
Window::IsNativeWidgetEndabled(). Hopefully I'll get rid of this when I
remove meOutDevType during work on fdo#74702.
Change-Id: Id6df1eeff716a6acd1b108b5e1e4674e819afe3d
diff --git a/vcl/source/outdev/nativecontrols.cxx
b/vcl/source/outdev/nativecontrols.cxx
index 28e2d35..325320c 100644
--- a/vcl/source/outdev/nativecontrols.cxx
+++ b/vcl/source/outdev/nativecontrols.cxx
@@ -32,7 +32,19 @@ static bool EnableNativeWidget( const OutputDevice&
i_rDevice )
{
case OUTDEV_WINDOW:
-return dynamic_cast< const Window* >( &i_rDevice
)->IsNativeWidgetEnabled();
+{
+const Window* pWindow = dynamic_cast< const Window* >( &i_rDevice
);
+if (pWindow)
+{
+return pWindow->IsNativeWidgetEnabled();
+}
+else
+{
+SAL_WARN ("vcl.gdi", "Could not cast i_rDevice to Window");
+assert (pWindow);
+return false;
+}
+}
case OUTDEV_VIRDEV:
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Improving type detection
Hi everybody, As some of you probably know, some of the type detection services aren't in very good shape. They share a lot of copy-pasted code (that deals with ZIP based formats), and also don't fit so well into the detection framework. Things like dealing with pre-selected filters, URL patterns, opening a stream, and selecting the best filter for a given type are already covered by the framework. Also such service doesn't necessarily need to check in each run against all supported types, just for one given type. Not to mention the Writer detection which is full of old hacks and hard to follow code. I'm trying to improve that situation. So I introduced a new centralized service which is responsible for detecting ZIP storage-based formats, and removed all the duplicated code from the other services. Later I cleaned those services from some hacks, and simplified them. I'm not feeling comfortable with doing such changes without a prior discussion, and I'd like first to receive a feedback on this. So I submitted what I have done so far to gerrit: https://gerrit.libreoffice.org/9221 https://gerrit.libreoffice.org/9222 https://gerrit.libreoffice.org/9223 Any kind of feedback would be appreciated! Maxim ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - chart2/source oox/source
chart2/source/view/main/OpenGLRender.cxx |2 --
oox/source/export/chartexport.cxx| 17 +++--
2 files changed, 7 insertions(+), 12 deletions(-)
New commits:
commit 0d0f80900db7854d31531861e0992459244d74ce
Author: Markus Mohrhard
Date: Sun Apr 20 00:02:01 2014 +0200
auto is not a valid value for c:symbol's val attribute
Change-Id: Idbdab90e100cbd2de83a2255e2554b5024a2f927
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 32abeb9..78c6ea9 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -3013,9 +3013,6 @@ void ChartExport::exportMarker(Reference<
chart2::XDataSeries > xSeries)
break;
}
-if( aSymbol.Style == chart2::SymbolStyle_AUTO )
-pSymbolType = "auto";
-
if( pSymbolType )
{
pFS->singleElement( FSNS( XML_c, XML_symbol ),
commit 8925abe25d4b426b091f23ec8e7f5e7d21d10583
Author: Markus Mohrhard
Date: Thu Apr 17 21:19:22 2014 +0200
early bail out
Change-Id: I342c49f968a921167c4da8b98e7e17e79b945491
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index ae7a926..32abeb9 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1555,13 +1555,13 @@ void ChartExport::exportHiLowLines()
return;
Reference< beans::XPropertySet > xStockPropSet =
xChartPropProvider->getMinMaxLine();
-if( xStockPropSet.is() )
-{
-pFS->startElement( FSNS( XML_c, XML_hiLowLines ),
-FSEND );
-exportShapeProps( xStockPropSet );
-pFS->endElement( FSNS( XML_c, XML_hiLowLines ) );
-}
+if( !xStockPropSet.is() )
+return;
+
+pFS->startElement( FSNS( XML_c, XML_hiLowLines ),
+FSEND );
+exportShapeProps( xStockPropSet );
+pFS->endElement( FSNS( XML_c, XML_hiLowLines ) );
}
void ChartExport::exportUpDownBars( Reference< chart2::XChartType > xChartType)
commit 078612f6c3ab62c6f7bb99625611dc791ab868da
Author: Markus Mohrhard
Date: Wed Apr 16 00:55:51 2014 +0200
no need for that using statement
Change-Id: Ide94e0e4909574b01e5d739be3e9f9dd7652ba86
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 1fe93f3..9bd8e72 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -43,8 +43,6 @@
using namespace com::sun::star;
-using namespace std;
-
#define DEBUG_PNG 0
#if RENDER_TO_FILE
#define BMP_HEADER_LEN 54
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: How to build an old version of LibO
Hi, So you want to reset your local branch to libreoffice-4-2, right? I think what you need is switching to your local branch and doing git reset --hard origin/libreoffice-4-2 This should ensure that you reset to the "real" libreoffice-4-2 branch from remote, not to anything you might have messed up in your local libreoffice-4-2 branch. Regards, Ruslan On Thu, May 1, 2014 at 12:11 PM, Laurent BP wrote: > Hello, > > Thanks for your comments. However I did not yet succeed. > > > Christian Lohmaier-3 wrote >> Hmm. I wouldn't do that (as I don't know what that would do), instead I'd >> do a >> >> git checkout -b myoldlibreofficebranch whatevergitcommityoupicked >> >> That should do the trick. > > I tried the following commands: >> git checkout -b myoldlibreofficebranch >> dace560b350346b9f9a102ee602bb129a008bcfe >> make distclean >> ./autogen.sh && make >> ./instdir/program/soffice > But About box says: Version: 4.3.0.0.alpha1+ > Build ID: c6c286f14468d341f5fd88edc39a37175a1b6caa > > However, "git log -1" returns > == > commit dace560b350346b9f9a102ee602bb129a008bcfe > Author: Caolán McNamara > Date: Fri Oct 11 20:45:22 2013 +0100 > > CID#736194 out of bounds > > Change-Id: I236c2f51716bfebd0c132bbaed50c1f1ec811ffa > == > > "git branch" returns > == > UITrendLineNbPoints > commandNameEnterGroup > importDrawAOO4 > libreoffice-4-2 > master > * myoldlibreofficebranch > == > > and "git status" returns (my own translation) > # On branch myoldlibreofficebranch > # Files not followed: > # (use "git add ..." to include in what will be validated) > # > # external/tarballs/ > # ios/lo.xcconfig > > I do not understand what is happening :( > "git" seems to be OK but "make" seems to build another branch (actually my > branch "master") > > > Christian Lohmaier-3 wrote >> btw: 4.1.1.2 in your signature: Really using that version? If so: why? :-) > > No, I did not update my signature for a long time. > > Many thanks in advance for your help. > > Laurent BP > > > > - > LibreOffice 4.2.4.1 > -- > View this message in context: > http://nabble.documentfoundation.org/How-to-build-an-old-version-of-LibO-tp4106986p4107083.html > Sent from the Dev mailing list archive at Nabble.com. > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 62461, which changed state. Bug 62461 Summary: LO-4.x.x creates new ODT, ODP and ODG file with fallback PNG graphic first, if an SVG picture inserted into the file https://bugs.freedesktop.org/show_bug.cgi?id=62461 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/font.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 24ec38a96fa33b75435786caaca04f9cef86c289
Author: Chris Sherlock
Date: Thu May 1 20:13:39 2014 +1000
coverity#1209003: Unchecked return value
When AcquireGraphics() is true, then it means that we got the graphics
context.
Change-Id: Id5f4a5fc4456f6ce649fdf3ee63ff6103ba65233
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index bba7c61..e9ae02e 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -292,8 +292,11 @@ SystemFontData OutputDevice::GetSysFontData(int
nFallbacklevel) const
SystemFontData aSysFontData;
aSysFontData.nSize = sizeof(aSysFontData);
-if (!mpGraphics) AcquireGraphics();
-if (mpGraphics) aSysFontData = mpGraphics->GetSysFontData(nFallbacklevel);
+if (!mpGraphics)
+{
+if (AcquireGraphics())
+aSysFontData = mpGraphics->GetSysFontData(nFallbacklevel);
+}
return aSysFontData;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/Library_vcl.mk vcl/source
include/vcl/outdev.hxx | 45
include/vcl/window.hxx | 49 -
vcl/Library_vcl.mk |2
vcl/source/outdev/nativecontrols.cxx | 329 +++
vcl/source/window/nativecontrols.cxx | 307
5 files changed, 377 insertions(+), 355 deletions(-)
New commits:
commit f2e4bb4b96a7c2176a0dd1dacd9930bf9b68d895
Author: Chris Sherlock
Date: Thu May 1 20:00:56 2014 +1000
Revert "VCL: move native widget rendering functions out of OutputDevice"
This reverts commit 5b86e33b5fb5f8250b88bf14e579cddd98fec36a.
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 7051f5a..9cc34e8 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1795,6 +1795,51 @@ private:
///@}
+/** @name Native Widget Rendering functions
+
+These all just call through to the private mpGraphics functions of the
same name.
+ */
+///@{
+
+public:
+
+/** Query the platform layer for control support
+ */
+boolIsNativeControlSupported( ControlType nType,
ControlPart nPart ) const;
+
+/** Query the native control to determine if it was acted upon
+ */
+boolHitTestNativeControl( ControlType nType,
+ControlPart nPart,
+const Rectangle&
rControlRegion,
+const Point& aPos,
+bool& rIsInside )
const;
+
+/** Request rendering of a particular control and/or part
+ */
+boolDrawNativeControl( ControlType nType,
+ControlPart nPart,
+const Rectangle&
rControlRegion,
+ControlState nState,
+const ImplControlValue&
aValue,
+const OUString& aCaption );
+
+/** Query the native control's actual drawing region (including adornment)
+ */
+boolGetNativeControlRegion( ControlType nType,
+ControlPart nPart,
+const Rectangle&
rControlRegion,
+ControlState nState,
+const
ImplControlValue& aValue,
+const OUString&
aCaption,
+Rectangle
&rNativeBoundingRegion,
+Rectangle
&rNativeContentRegion ) const;
+///@}
+
+/** @name EPS functions
+ */
+///@{
+
public:
/** Added return value to see if EPS could be painted directly.
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 19c20d01..001dfd5 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -970,7 +970,7 @@ public:
boolHasChildPathFocus( bool bSystemWindow = false ) const;
boolIsActive() const;
boolHasActiveChildFrame();
-sal_uInt16 GetGetFocusFlags() const;
+sal_uInt16 GetGetFocusFlags() const;
voidGrabFocusToDocument();
/**
@@ -1033,7 +1033,7 @@ public:
Window* FindWindow( const Point& rPos ) const;
-sal_uInt16 GetChildCount() const;
+sal_uInt16 GetChildCount() const;
Window* GetChild( sal_uInt16 nChild ) const;
Window* GetWindow( sal_uInt16 nType ) const;
boolIsChild( const Window* pWindow, bool bSystemWindow =
false ) const;
@@ -1076,51 +1076,6 @@ public:
voidSaveBackground( const Point& rPos, const Size& rSize,
const Point& rDestOff, VirtualDevice&
rSaveDevice );
-
-/** @name Native Widget Rendering functions
-
-These all just call through to the private mpGraphics functions of the
same name.
- */
-///@{
-
-/** Query the platform layer for control support
- */
-boolIsNativeControlSupported( ControlType nType,
ControlPart nPart ) const;
-
-/** @name EPS functions
- */
-///@{
-
-
-/** Query the native control to determine if it was acted upon
- */
-boolHitTestNativeControl( ControlType nType,
-ControlPart nPart,
-const Rectangle&
rControlRegion,
-
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-4.2-2'
Tag 'cp-4.2-2' created by Andras Timar at 2014-05-01 10:46 +0200 cp-4.2-2 Changes since libreoffice-4-2-branch-point-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-4.2-2'
Tag 'cp-4.2-2' created by Andras Timar at 2014-05-01 10:46 +0200 cp-4.2-2 Changes since libreoffice-4-2-branch-point-18: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.2-2'
Tag 'cp-4.2-2' created by Andras Timar at 2014-05-01 10:46 +0200 cp-4.2-2 Changes since cp-4.2-1-51: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-4.2-2'
Tag 'cp-4.2-2' created by Andras Timar at 2014-05-01 10:46 +0200 cp-4.2-2 Changes since libreoffice-4-2-branch-point-12: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/vcl vcl/Library_vcl.mk vcl/source
include/vcl/outdev.hxx | 45
include/vcl/window.hxx | 49 +
vcl/Library_vcl.mk |2
vcl/source/outdev/nativecontrols.cxx | 329 ---
vcl/source/outdev/text.cxx |4
vcl/source/window/nativecontrols.cxx | 307
6 files changed, 357 insertions(+), 379 deletions(-)
New commits:
commit 4f45ec19fc96e4471dc3fe342e5acd910068dd12
Author: Chris Sherlock
Date: Thu May 1 19:40:57 2014 +1000
VCL: sal_True -> true and sal_False -> false in outdev/text.cxx
Change-Id: I51e43962784dd21da4e9b2003c3b734026706282
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 4383e5e..bb9fbc1 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -742,7 +742,7 @@ void OutputDevice::SetTextFillColor( const Color& rColor )
{
Color aColor( rColor );
-bool bTransFill = ImplIsColorTransparent( aColor ) ? sal_True : sal_False;
+bool bTransFill = ImplIsColorTransparent( aColor ) ? true : false;
if ( !bTransFill )
{
@@ -1330,7 +1330,7 @@ bool OutputDevice::GetTextIsRTL( const OUString& rString,
sal_Int32 nIndex, sal_
bool bRTL = false;
int nCharPos = -1;
aArgs.GetNextPos( &nCharPos, &bRTL );
-return (nCharPos != nIndex) ? sal_True : sal_False;
+return (nCharPos != nIndex) ? true : false;
}
sal_Int32 OutputDevice::GetTextBreak( const OUString& rStr, long nTextWidth,
commit 5b86e33b5fb5f8250b88bf14e579cddd98fec36a
Author: Chris Sherlock
Date: Mon Apr 28 22:53:28 2014 +1000
VCL: move native widget rendering functions out of OutputDevice
The following functions should be in the Window class, not in
OutputDevice:
+ IsNativeControlSupported
+ HitTestNativeControl
+ DrawNativeControl
+ GetNativeControlRegion
Additionally, moved nativecontrols.cxx to vcl/source/window/ and whilst
we are about it, it turns out that VirtualDevice isn't used by these
functions. Therefore the 'orrible check to for the type of class can be
removed and in fact as VirtualDevice doesn't use it at all then we can
just remove the function and replace it with a call to
IsNativeWidgetEnabled().
Change-Id: Idd0bfb1cba1c2902f7a6d55d258efb38b67fb827
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 9cc34e8..7051f5a 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1795,51 +1795,6 @@ private:
///@}
-/** @name Native Widget Rendering functions
-
-These all just call through to the private mpGraphics functions of the
same name.
- */
-///@{
-
-public:
-
-/** Query the platform layer for control support
- */
-boolIsNativeControlSupported( ControlType nType,
ControlPart nPart ) const;
-
-/** Query the native control to determine if it was acted upon
- */
-boolHitTestNativeControl( ControlType nType,
-ControlPart nPart,
-const Rectangle&
rControlRegion,
-const Point& aPos,
-bool& rIsInside )
const;
-
-/** Request rendering of a particular control and/or part
- */
-boolDrawNativeControl( ControlType nType,
-ControlPart nPart,
-const Rectangle&
rControlRegion,
-ControlState nState,
-const ImplControlValue&
aValue,
-const OUString& aCaption );
-
-/** Query the native control's actual drawing region (including adornment)
- */
-boolGetNativeControlRegion( ControlType nType,
-ControlPart nPart,
-const Rectangle&
rControlRegion,
-ControlState nState,
-const
ImplControlValue& aValue,
-const OUString&
aCaption,
-Rectangle
&rNativeBoundingRegion,
-Rectangle
&rNativeContentRegion ) const;
-///@}
-
-/** @name EPS functions
- */
-///@{
-
public:
/** Added return value to see if EPS could be painted directly.
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 001dfd5..19c20d01 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -970,7
[Libreoffice-commits] core.git: .gitignore
.gitignore |8 1 file changed, 8 insertions(+) New commits: commit 5a6b71547ff8312960087e031fe2b25d20d64c2a Author: Jan-Marek Glogowski Date: Thu Feb 27 20:31:00 2014 + Git: ignore autogen, doxygen and gdb config files Adds some additional files to .gitignore. Change-Id: Ia5af298a91919fe00392282c0e5bb88fa2811a52 Reviewed-on: https://gerrit.libreoffice.org/8437 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/.gitignore b/.gitignore index 3d9bc63..93031b4 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,8 @@ /aclocal.m4 /autom4te.cache /autogen.input +/autogen.lastrun +/autogen.lastrun.bak /ChangeLog /config.Build.log /config.guess @@ -95,3 +97,9 @@ xcuserdata *.v11* *.vcxproj* *.opensdf + +# doxygen output +/docs + +# gdb config +/.gdbinit ___ 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' - offapi/com oox/source svtools/source
offapi/com/sun/star/graphic/XGraphicTransformer.idl | 10 +++
oox/source/drawingml/fillproperties.cxx | 26 ++--
svtools/source/graphic/transformer.cxx | 17 +
svtools/source/graphic/transformer.hxx |5 +++
4 files changed, 56 insertions(+), 2 deletions(-)
New commits:
commit 75a839188d1cac5f0ac602e59462b32879d2242a
Author: LuboÅ¡ LuÅák
Date: Wed Apr 30 22:19:08 2014 +0200
handle brightness+contrast from msoffice (bnc#875713)
This is the same like 1139d618b8bc6ab823a96184bd0f0257980aad24, for docx.
(cherry picked from commit 893fe88469dec5b727d96f8ea1b4edb9e88288a7)
Conflicts:
oox/source/drawingml/fillproperties.cxx
Change-Id: I1ef4e18444e8c60e9ae8f67249bcef1053f0d62d
Reviewed-on: https://gerrit.libreoffice.org/9217
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/offapi/com/sun/star/graphic/XGraphicTransformer.idl
b/offapi/com/sun/star/graphic/XGraphicTransformer.idl
index d1a6ddf..dbd9c8d 100644
--- a/offapi/com/sun/star/graphic/XGraphicTransformer.idl
+++ b/offapi/com/sun/star/graphic/XGraphicTransformer.idl
@@ -51,6 +51,16 @@ interface XGraphicTransformer :
::com::sun::star::uno::XInterface
com::sun::star::graphic::XGraphic applyDuotone( [ in ]
com::sun::star::graphic::XGraphic In,
[ in ] long ColorOne, [ in ] long ColorTwo )
raises( ::com::sun::star::lang::IllegalArgumentException );
+
+/** changes brightness/contrast
+
+@param mso whether to use MSOffice brightness/contrast formula
+@returns
+The modified graphic
+*/
+com::sun::star::graphic::XGraphic applyBrightnessContrast( [ in ]
com::sun::star::graphic::XGraphic In,
+[ in ] long brightness, [ in ] long contrast, [ in ] boolean mso )
+raises( ::com::sun::star::lang::IllegalArgumentException );
};
} ; } ; } ; } ;
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index c96c77a..99026a9 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -92,6 +92,18 @@ Reference< XGraphic > lclCheckAndApplyChangeColorTransform(
const BlipFillProper
return xGraphic;
}
+Reference< XGraphic > applyBrightnessContrast( Reference< XGraphic > xGraphic,
sal_Int32 brightness, sal_Int32 contrast )
+{
+try
+{
+Reference< XGraphicTransformer > xTransformer( xGraphic,
UNO_QUERY_THROW );
+xGraphic = xTransformer->applyBrightnessContrast( xGraphic,
brightness, contrast, true );
+}
+catch( Exception& )
+{
+}
+return xGraphic;
+}
BitmapMode lclGetBitmapMode( sal_Int32 nToken )
@@ -501,12 +513,24 @@ void FillProperties::pushToPropMap( ShapePropertyMap&
rPropMap,
void GraphicProperties::pushToPropMap( PropertyMap& rPropMap, const
GraphicHelper& rGraphicHelper, sal_Int32 nPhClr ) const
{
+sal_Int16 nBrightness = getLimitedValue< sal_Int16, sal_Int32 >(
maBlipProps.moBrightness.get( 0 ) / PER_PERCENT, -100, 100 );
+sal_Int16 nContrast = getLimitedValue< sal_Int16, sal_Int32 >(
maBlipProps.moContrast.get( 0 ) / PER_PERCENT, -100, 100 );
if( maBlipProps.mxGraphic.is() )
{
// created transformed graphic
Reference< XGraphic > xGraphic = lclCheckAndApplyDuotoneTransform(
maBlipProps, maBlipProps.mxGraphic, rGraphicHelper, nPhClr );
xGraphic = lclCheckAndApplyChangeColorTransform( maBlipProps,
xGraphic, rGraphicHelper, nPhClr );
+// MSO uses a different algorithm for contrast+brightness, LO applies
contrast before brightness,
+// while MSO apparently applies half of brightness before contrast and
half after. So if only
+// contrast or brightness need to be altered, the result is the same,
but if both are involved,
+// there's no way to map that, so just force a conversion of the image.
+if( nBrightness != 0 && nContrast != 0 )
+{
+xGraphic = applyBrightnessContrast( xGraphic, nBrightness,
nContrast );
+nBrightness = 0;
+nContrast = 0;
+}
rPropMap[ PROP_Graphic ] <<= xGraphic;
// do we still need to set GraphicURL as well? (TODO)
@@ -545,10 +569,8 @@ void GraphicProperties::pushToPropMap( PropertyMap&
rPropMap, const GraphicHelpe
rPropMap[ PROP_GraphicColorMode ] <<= eColorMode;
// brightness and contrast
-sal_Int16 nBrightness = getLimitedValue< sal_Int16, sal_Int32 >(
maBlipProps.moBrightness.get( 0 ) / PER_PERCENT, -100, 100 );
if( nBrightness != 0 )
rPropMap[ PROP_AdjustLuminance ] <<= nBrightness;
-sal_Int16 nContrast = getLimitedValue< sal_Int16, sal_Int32 >(
maBlipProps.moContrast.get( 0 ) / PER_PERCENT, -100, 100 );
if( nContrast != 0 )
rPropMap[ PROP_AdjustContrast ] <<= nContrast;
diff --git a/svtools/source/graphic/t
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 changed: What|Removed |Added Depends on||69593 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on|69593 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - desktop/source
desktop/source/deployment/misc/dp_dependencies.cxx | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
New commits:
commit f295a442e18db2f3bb647bf502dd60d87823c19f
Author: Bjoern Michaelsen
Date: Fri Apr 4 18:47:28 2014 +0200
ignore legacy OpenOffice.org-*-version, when a LibreOffice-*-version is
given
Change-Id: Ie5b6ffee07b6e5ebf922bad1b4a268ff636412c9
Reviewed-on: https://gerrit.libreoffice.org/8853
Reviewed-by: Björn Michaelsen
Tested-by: Björn Michaelsen
(cherry picked from commit 42905aecfcdee9eb2c184bceeec4f8688056cd73)
Reviewed-on: https://gerrit.libreoffice.org/9207
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx
b/desktop/source/deployment/misc/dp_dependencies.cxx
index 817c9b4..696d3a7 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -103,18 +103,29 @@ check(dp_misc::DescriptionInfoset const & infoset) {
css::uno::Sequence< css::uno::Reference< css::xml::dom::XElement > >
unsatisfied(n);
sal_Int32 unsat = 0;
+// check first if minimalVersionLibreOffice is specified -- in that case
ignore the legacy OOo dependencies
+bool bIgnoreOoo = false;
+for (sal_Int32 i = 0; i < n; ++i) {
+css::uno::Reference< css::xml::dom::XElement > e(
+deps->item(i), css::uno::UNO_QUERY_THROW);
+if ( e->getNamespaceURI() == namespaceLibreOffice && e->getTagName()
== minimalVersionLibreOffice)
+{
+bIgnoreOoo = true;
+break;
+}
+}
for (sal_Int32 i = 0; i < n; ++i) {
css::uno::Reference< css::xml::dom::XElement > e(
deps->item(i), css::uno::UNO_QUERY_THROW);
bool sat = false;
if ( e->getNamespaceURI() == namespaceOpenOfficeOrg && e->getTagName()
== minimalVersionOpenOfficeOrg )
{
-sat = satisfiesMinimalVersion(
+sat = bIgnoreOoo || satisfiesMinimalVersion(
getReferenceOpenOfficeOrgMajorMinor(),
e->getAttribute("value"));
} else if ( e->getNamespaceURI() == namespaceOpenOfficeOrg &&
e->getTagName() == maximalVersionOpenOfficeOrg )
{
-sat = satisfiesMaximalVersion(
+sat = bIgnoreOoo || satisfiesMaximalVersion(
getReferenceOpenOfficeOrgMajorMinor(),
e->getAttribute("value"));
} else if (e->getNamespaceURI() == namespaceLibreOffice &&
e->getTagName() == minimalVersionLibreOffice )
___
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' - instsetoo_native/CustomTarget_setup.mk
instsetoo_native/CustomTarget_setup.mk |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d3f920a51753643551b99ae15465ec9541ec518e
Author: Bjoern Michaelsen
Date: Fri Apr 4 18:17:57 2014 +0200
set OOo reference version to 4.1 for incompatible MessageBox changes
This commit:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=805c6101b3427cc98b53f1c48f22f705206c384d
make LibreOffice 4.2 (and AOO 4.1) widely incompatible to previous
versions. We should thus update the reference version to 4.1 as that is
the version we are least incompatible with. Extension developers are
encouraged to use LibreOffice-minimal-version instead anyway, instead of
the obsolete OOo versioning. see:
https://wiki.documentfoundation.org/Development/Extension_Development
https://gerrit.libreoffice.org/gitweb?p=sdk-examples.git;a=commitdiff;h=61f9ca7b18de1adc58cf5d7cb295ba81eb3e5d92;hp=20b8edc74b846db6d143a9e327fb7f7eb2c1fb77
Change-Id: I8275a8244d642100d7b3bc17aa0b12ae7d63e583
Reviewed-on: https://gerrit.libreoffice.org/8852
Reviewed-by: Björn Michaelsen
Tested-by: Björn Michaelsen
(cherry picked from commit ab67b79c7469cea7de82b6eb6ca1f690063c069c)
Reviewed-on: https://gerrit.libreoffice.org/9208
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index 81d48b6..3b73589 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -164,7 +164,7 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo
'ExtensionUpdateURL=http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update'
\
&& echo
'ProductMajor=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)$(LIBO_VERSION_MICRO)' \
&& echo 'ProductMinor=$(LIBO_VERSION_PATCH)' \
- && echo 'ReferenceOOoMajorMinor=3.4' \
+ && echo 'ReferenceOOoMajorMinor=4.1' \
&& echo 'UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US' \
&& echo 'UpdateURL=$(if
$(ENABLE_ONLINE_UPDATE),http://update.libreoffice.org/check.php$(if
$(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))' \
&& echo 'UpdateUserAgent= ($${buildid}; $${_OS};
$${_ARCH}; BundledLanguages=$${AllLanguages})' \
___
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' - i18npool/source
i18npool/source/collator/collator_unicode.cxx | 119 --
i18npool/source/collator/gencoll_rule.cxx |2
2 files changed, 115 insertions(+), 6 deletions(-)
New commits:
commit 1ce42d1001139a9168e9451dbd48a6daef95c691
Author: Eike Rathke
Date: Wed Apr 30 17:51:05 2014 +0100
resolve crashes with ICU 53.1 in locales with collator data, fdo#77071
ICU 53.1 changed API behavior:
https://ssl.icu-project.org/apiref/icu4c/classicu_1_1RuleBasedCollator.html#a2f4c7eeaf020ad68e3bd9722dd272357
isn't correct anymore:
length: size of the image. If negative, the API will try to figure out the
length of the image
NO, IT WILL NOT! It bails out with an error instead.
Introduced a function to obtain the length for each collator data.
base: collator, usually root. The base is required to be present through
the
lifetime of the collator. Currently it cannot be NULL.
NOT "usually root"! There's a check now that bails out if
if(base->tailoring != CollationRoot::getRoot(errorCode))
So using an instance created with icu::Locale::getRoot()
(cherry picked from commit a3c627fe38236e82bc6008075d862b3cbfbd9ce3)
Conflicts:
i18npool/source/collator/collator_unicode.cxx
Backported.
make DISABLE_DYNLOADING on Android happy, fdo#77071 related
(cherry picked from commit dc7ba1af236ec28d399eff833d56608fde9fb70d)
Change-Id: Ia9c4e27d5ef4f8083bbe57e4e2f4b3ff63bb42ed
Reviewed-on: https://gerrit.libreoffice.org/9215
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/i18npool/source/collator/collator_unicode.cxx
b/i18npool/source/collator/collator_unicode.cxx
index 90dd2f3b..42dfef3 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -84,6 +84,27 @@ const sal_uInt8* get_collator_data_zh_radical();
const sal_uInt8* get_collator_data_zh_stroke();
const sal_uInt8* get_collator_data_zh_zhuyin();
+size_t get_collator_data_ca_charset_length();
+size_t get_collator_data_dz_charset_length();
+size_t get_collator_data_hu_charset_length();
+size_t get_collator_data_ja_charset_length();
+size_t get_collator_data_ja_phonetic_alphanumeric_first_length();
+size_t get_collator_data_ja_phonetic_alphanumeric_last_length();
+size_t get_collator_data_ko_charset_length();
+size_t get_collator_data_ku_alphanumeric_length();
+size_t get_collator_data_ln_charset_length();
+size_t get_collator_data_my_dictionary_length();
+size_t get_collator_data_ne_charset_length();
+size_t get_collator_data_sid_charset_length();
+size_t get_collator_data_zh_TW_charset_length();
+size_t get_collator_data_zh_TW_radical_length();
+size_t get_collator_data_zh_TW_stroke_length();
+size_t get_collator_data_zh_charset_length();
+size_t get_collator_data_zh_pinyin_length();
+size_t get_collator_data_zh_radical_length();
+size_t get_collator_data_zh_stroke_length();
+size_t get_collator_data_zh_zhuyin_length();
+
}
#endif
@@ -120,6 +141,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString&
rAlgorithm, const lang::
}
if (!collator &&
OUString::createFromAscii(LOCAL_RULE_LANGS).indexOf(rLocale.Language) >= 0) {
const sal_uInt8* (*func)() = NULL;
+size_t (*funclen)() = NULL;
#ifndef DISABLE_DYNLOADING
OUStringBuffer aBuf;
@@ -132,11 +154,21 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString&
rAlgorithm, const lang::
aBuf.appendAscii("get_").append(rLocale.Language).appendAscii("_");
if ( rLocale.Language == "zh" ) {
OUString func_base = aBuf.makeStringAndClear();
+OUString funclen_base = func_base + "_length";
if (OUString("TW HK MO").indexOf(rLocale.Country) >= 0)
-func=(const sal_uInt8* (*)())
osl_getFunctionSymbol(hModule,
+{
+func = (const sal_uInt8* (*)())
osl_getFunctionSymbol(hModule,
OUString(func_base + "TW_" +
rAlgorithm).pData);
+funclen = (size_t (*)()) osl_getFunctionSymbol(hModule,
+OUString(funclen_base + "TW_" +
rAlgorithm).pData);
+}
if (!func)
-func=(const sal_uInt8* (*)())
osl_getFunctionSymbol(hModule, OUString(func_base + rAlgorithm).pData);
+{
+func = (const sal_uInt8* (*)()) osl_getFunctionSymbol(
+hModule, OUString(func_base +
rAlgorithm).pData);
+funclen = (size_t (*)()) osl_getFunctionSymbol(
+hModule, OUString(funclen_base +
rAlgorithm).pData);
+}
} else {
[Libreoffice-commits] core.git: sw/source
sw/source/core/uibase/app/docshdrw.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 4558064a31bcecd7cbdfde02b1c309a3b9d9813d Author: Julien Nabet Date: Thu May 1 00:37:15 2014 +0200 Resolves: fdo#78133 LibO crashes when in options dialog (Colors part) + Related: fdo#77934 It seems pDrDoc is always known now (related to 185c270e66d03d1f77beb8a8996393d023e818e7 ?) Change-Id: I5f984e0e53ec49d67c07a43159433fcc26524777 Reviewed-on: https://gerrit.libreoffice.org/9219 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/source/core/uibase/app/docshdrw.cxx b/sw/source/core/uibase/app/docshdrw.cxx index 12f31e8..90070c9 100644 --- a/sw/source/core/uibase/app/docshdrw.cxx +++ b/sw/source/core/uibase/app/docshdrw.cxx @@ -42,6 +42,7 @@ void SwDocShell::InitDraw() PutItem( SvxBitmapListItem( pDrDoc->GetBitmapList(), SID_BITMAP_LIST ) ); PutItem( SvxDashListItem( pDrDoc->GetDashList(), SID_DASH_LIST ) ); PutItem( SvxLineEndListItem( pDrDoc->GetLineEndList(), SID_LINEEND_LIST ) ); +PutItem( SvxColorListItem( pDrDoc->GetColorList(), SID_COLOR_TABLE )); Outliner& rOutliner = pDrDoc->GetDrawOutliner(); uno::Reference xHyphenator( ::GetHyphenator() ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - writerfilter/source
writerfilter/source/dmapper/GraphicImport.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 02dcf4a9b7387f6675324245ab2fa5b7eabf0d12
Author: LuboÅ¡ LuÅák
Date: Wed Apr 30 21:52:28 2014 +0200
actually read brightness/contrast when reading docx (bnc#875713)
It's read for the shape in oox/ , but it didn't make it any further
apparently.
Change-Id: I0885a675f72d63b3d262f1ef7e42f5d2e03588b6
(cherry picked from commit 804da2a977989ba1f046847b9e00f00c83749e30)
Reviewed-on: https://gerrit.libreoffice.org/9216
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 304a3d2..607d92b 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -924,6 +924,10 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
xShapeProps->getPropertyValue("ShadowTransparence") >>=
m_pImpl->nShadowTransparence;
}
+xShapeProps->getPropertyValue("GraphicColorMode") >>=
m_pImpl->eColorMode;
+xShapeProps->getPropertyValue("AdjustLuminance") >>=
m_pImpl->nBrightness;
+xShapeProps->getPropertyValue("AdjustContrast") >>=
m_pImpl->nContrast;
+
// fdo#70457: transform XShape into a
SwXTextGraphicObject only if there's no rotation
if ( nRotation == 0 )
m_xGraphicObject = createGraphicObject(
aMediaProperties );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 changed: What|Removed |Added Depends on||34467 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on|34467 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on|51550 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 changed: What|Removed |Added Depends on||51550 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on|50430 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 changed: What|Removed |Added Depends on||50430 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 changed: What|Removed |Added Depends on||44621 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on|44621 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How to build an old version of LibO
Hello, Thanks for your comments. However I did not yet succeed. Christian Lohmaier-3 wrote > Hmm. I wouldn't do that (as I don't know what that would do), instead I'd > do a > > git checkout -b myoldlibreofficebranch whatevergitcommityoupicked > > That should do the trick. I tried the following commands: > git checkout -b myoldlibreofficebranch > dace560b350346b9f9a102ee602bb129a008bcfe > make distclean > ./autogen.sh && make > ./instdir/program/soffice But About box says: Version: 4.3.0.0.alpha1+ Build ID: c6c286f14468d341f5fd88edc39a37175a1b6caa However, "git log -1" returns == commit dace560b350346b9f9a102ee602bb129a008bcfe Author: Caolán McNamara Date: Fri Oct 11 20:45:22 2013 +0100 CID#736194 out of bounds Change-Id: I236c2f51716bfebd0c132bbaed50c1f1ec811ffa == "git branch" returns == UITrendLineNbPoints commandNameEnterGroup importDrawAOO4 libreoffice-4-2 master * myoldlibreofficebranch == and "git status" returns (my own translation) # On branch myoldlibreofficebranch # Files not followed: # (use "git add ..." to include in what will be validated) # # external/tarballs/ # ios/lo.xcconfig I do not understand what is happening :( "git" seems to be OK but "make" seems to build another branch (actually my branch "master") Christian Lohmaier-3 wrote > btw: 4.1.1.2 in your signature: Really using that version? If so: why? :-) No, I did not update my signature for a long time. Many thanks in advance for your help. Laurent BP - LibreOffice 4.2.4.1 -- View this message in context: http://nabble.documentfoundation.org/How-to-build-an-old-version-of-LibO-tp4106986p4107083.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 28/206a7cb43aff5adb10f8235ad1680c3941ee3e
28/206a7cb43aff5adb10f8235ad1680c3941ee3e |1 + 1 file changed, 1 insertion(+) New commits: commit 3ae2a1da5175337d30b87971d7be16bce71e4ee3 Author: Caolán McNamara Date: Thu May 1 09:10:28 2014 +0100 Notes added by 'git notes add' diff --git a/28/206a7cb43aff5adb10f8235ad1680c3941ee3e b/28/206a7cb43aff5adb10f8235ad1680c3941ee3e new file mode 100644 index 000..7bda886 --- /dev/null +++ b/28/206a7cb43aff5adb10f8235ad1680c3941ee3e @@ -0,0 +1 @@ +merged as: 820a29950b3085a713026995fdc43e32b6ded5f7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 jl...@mail.com changed: What|Removed |Added Depends on||71248 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #133 from jl...@mail.com --- moving bug 71248 from 4.1 MAB to 4.2 since 4.1 development is closed. VBA macro "ActiveDocument" doesn't always apply to the document that the user is working in. -- 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: 2 commits - include/cppuhelper include/osl
include/cppuhelper/weak.hxx |1 +
include/osl/file.hxx|9 -
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 66a777c3d4c926aa2bd3d40da4852e769ad6ddc2
Author: Caolán McNamara
Date: Wed Apr 30 21:12:09 2014 +0100
coverity#707976 Uninitialized pointer field
Change-Id: I6e62d97dc1c7020320aa9a0b58a692ca2dc6f617
diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index a797da0..7dfafdc 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -680,16 +680,15 @@ public:
@param nMask
Set of flags decribing the demanded information.
*/
-
-FileStatus( sal_uInt32 nMask ): _nMask( nMask )
+FileStatus(sal_uInt32 nMask)
+: _nMask(nMask)
{
-_aStatus.uStructSize = sizeof( oslFileStatus );
-memset( &_aStatus.uValidFields, 0, sizeof( oslFileStatus ) - sizeof(
sal_uInt32 ) );
+memset(&_aStatus, 0, sizeof(_aStatus));
+_aStatus.uStructSize = sizeof(_aStatus);
}
/** Destructor.
*/
-
~FileStatus()
{
if ( _aStatus.ustrFileURL )
commit aa668984f6a1f6e5c4d3d23dc89bab59f66baa5c
Author: Caolán McNamara
Date: Wed Apr 30 21:04:14 2014 +0100
coverity#707714: Uninitialized pointer
Change-Id: I98e21ad28ea31bae41894d1804cbafe0c247035d
diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx
index dcddbb6..03399fe 100644
--- a/include/cppuhelper/weak.hxx
+++ b/include/cppuhelper/weak.hxx
@@ -102,6 +102,7 @@ public:
inline OWeakObject() SAL_THROW(())
: m_refCount( 0 )
, m_pWeakConnectionPoint( 0 )
+, m_pReserved(0)
{}
#endif
/** Dummy copy constructor. Set the reference count to zero.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
