[Bug 92925] Remove export of old and obsolete graphic formats
https://bugs.documentfoundation.org/show_bug.cgi?id=92925 --- Comment #1 from Björn Michaelsen --- @Tomasz: please help out with https://gerrit.libreoffice.org/#/c/19788/ https://gerrit.libreoffice.org/#/c/19833/ -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/dpsave.cxx | 10 +-
sc/source/filter/xml/XMLExportDataPilot.cxx |2 +-
sc/source/ui/unoobj/dapiuno.cxx |4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit c337c48f9f5018ecfe48fa1c6649cd0c80620fa5
Author: Tor Lillqvist
Date: Sat Nov 7 01:52:11 2015 +0200
WaE: redundant const_cast [loplugin:redundantcast]
Change-Id: I0a4007231747360cabc24adf73a0c131d30dd5cd
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index e15dd88..4e01d4f 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -957,7 +957,7 @@ ScDPSaveDimension* ScDPSaveData::GetDimensionByName(const
OUString& rName)
for (auto const& iter : m_DimList)
{
if (iter->GetName() == rName && !iter->IsDataLayout() )
-return const_cast(&(*iter));
+return &(*iter);
}
return AppendNewDimension(rName, false);
@@ -968,7 +968,7 @@ ScDPSaveDimension*
ScDPSaveData::GetExistingDimensionByName(const OUString& rNam
for (auto const& iter : m_DimList)
{
if (iter->GetName() == rName && !iter->IsDataLayout() )
-return const_cast(&(*iter));
+return &(*iter);
}
return nullptr; // don't create new
}
@@ -998,7 +998,7 @@ ScDPSaveDimension*
ScDPSaveData::GetExistingDataLayoutDimension() const
for (auto const& iter : m_DimList)
{
if ( iter->IsDataLayout() )
-return const_cast(&(*iter));
+return &(*iter);
}
return nullptr;
}
@@ -1045,7 +1045,7 @@ ScDPSaveDimension*
ScDPSaveData::GetInnermostDimension(sal_uInt16 nOrientation)
for (auto const& iter : m_DimList)
{
if (iter->GetOrientation() == nOrientation && !iter->IsDataLayout())
-return const_cast(&(*iter));
+return &(*iter);
}
return nullptr;
@@ -1056,7 +1056,7 @@ ScDPSaveDimension*
ScDPSaveData::GetFirstDimension(sheet::DataPilotFieldOrientat
for (auto const& iter : m_DimList)
{
if (iter->GetOrientation() == eOrientation && !iter->IsDataLayout())
-return const_cast(&(*iter));
+return &(*iter);
}
return nullptr;
}
diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx
b/sc/source/filter/xml/XMLExportDataPilot.cxx
index eff5e31..da683d4 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -723,7 +723,7 @@ void ScXMLExportDataPilot::WriteDimensions(ScDPSaveData*
pDPSave)
const ScDPSaveData::DimsType& rDimensions = pDPSave->GetDimensions();
for (auto const& iter : rDimensions)
{
-WriteDimension(const_cast(iter.get()),
+WriteDimension(iter.get(),
pDPSave->GetExistingDimensionData());
}
}
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index f6422ca..b5e43b9 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1495,7 +1495,7 @@ ScDPSaveDimension*
ScDataPilotChildObjBase::GetDPDimension( ScDPObject** ppDPObj
if (aSrcName == maFieldId.maFieldName)
{
if( nFoundIdx == maFieldId.mnFieldIdx )
-return const_cast(it.get());
+return it.get();
++nFoundIdx;
}
}
@@ -2071,7 +2071,7 @@ void
ScDataPilotFieldObj::setOrientation(DataPilotFieldOrientation eNew)
if ( !it->IsDataLayout() && (it->GetName() ==
maFieldId.maFieldName) )
{
if ( it->GetOrientation() ==
DataPilotFieldOrientation_HIDDEN )
-pNewDim = const_cast(it.get()); //
use this one
+pNewDim = it.get(); // use this one
else
++nFound; // count existing non-hidden
occurrences
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: slideshow/opengl slideshow/source
slideshow/opengl/basicVertexShader.glsl |2
slideshow/opengl/dissolveFragmentShader.glsl |2
slideshow/opengl/rippleFragmentShader.glsl |2
slideshow/opengl/staticFragmentShader.glsl |2
slideshow/opengl/vortexFragmentShader.glsl |2
slideshow/opengl/vortexVertexShader.glsl | 17 +
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 107
+-
7 files changed, 40 insertions(+), 94 deletions(-)
New commits:
commit ef04c666591612bb222672de29a15be4515da040
Author: Tor Lillqvist
Date: Sat Nov 7 00:37:21 2015 +0200
Improve transition shader portability
Use #version 120 explicitly, and adapt the shader shader code
accordingly, to use strictly only GLSL 1.20 constructs. Also, use less
vertex attribute data in the Vortex vertex shader: We can pack the
per-vertex tile x and y index and in-tile vertex index information
into one float. Also, the shader can calculate the center of the tile
a vertex belongs to based on the knowledge of which tile it is.
Now the shader transitions work on OS X, too.
Change-Id: I93e8b5069a6d06d2e412ffee322b1eb32805e606
diff --git a/slideshow/opengl/basicVertexShader.glsl
b/slideshow/opengl/basicVertexShader.glsl
index 4ca615a..da83554 100644
--- a/slideshow/opengl/basicVertexShader.glsl
+++ b/slideshow/opengl/basicVertexShader.glsl
@@ -26,6 +26,8 @@
*
/
+#version 120
+
varying vec2 v_texturePosition;
void main( void )
diff --git a/slideshow/opengl/dissolveFragmentShader.glsl
b/slideshow/opengl/dissolveFragmentShader.glsl
index c6e80e2..6ce3d53 100644
--- a/slideshow/opengl/dissolveFragmentShader.glsl
+++ b/slideshow/opengl/dissolveFragmentShader.glsl
@@ -26,6 +26,8 @@
*
/
+#version 120
+
uniform sampler2D leavingSlideTexture;
uniform sampler2D enteringSlideTexture;
uniform sampler2D permTexture;
diff --git a/slideshow/opengl/rippleFragmentShader.glsl
b/slideshow/opengl/rippleFragmentShader.glsl
index 83677e4..ac6b8ac 100644
--- a/slideshow/opengl/rippleFragmentShader.glsl
+++ b/slideshow/opengl/rippleFragmentShader.glsl
@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#version 120
+
#define M_PI 3.1415926535897932384626433832795
uniform sampler2D leavingSlideTexture;
diff --git a/slideshow/opengl/staticFragmentShader.glsl
b/slideshow/opengl/staticFragmentShader.glsl
index cd47c5a..ab4913d 100644
--- a/slideshow/opengl/staticFragmentShader.glsl
+++ b/slideshow/opengl/staticFragmentShader.glsl
@@ -26,6 +26,8 @@
*
/
+#version 120
+
uniform sampler2D leavingSlideTexture;
uniform sampler2D enteringSlideTexture;
uniform sampler2D permTexture;
diff --git a/slideshow/opengl/vortexFragmentShader.glsl
b/slideshow/opengl/vortexFragmentShader.glsl
index a8a9767..9b7741a 100755
--- a/slideshow/opengl/vortexFragmentShader.glsl
+++ b/slideshow/opengl/vortexFragmentShader.glsl
@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#version 120
+
uniform sampler2D leavingSlideTexture;
uniform sampler2D enteringSlideTexture;
uniform float time;
diff --git a/slideshow/opengl/vortexVertexShader.glsl
b/slideshow/opengl/vortexVertexShader.glsl
index 532260d..1dffbbd 100755
--- a/slideshow/opengl/vortexVertexShader.glsl
+++ b/slideshow/opengl/vortexVertexShader.glsl
@@ -7,15 +7,14 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#version 120
+
#define M_PI 3.1415926535897932384626433832795
uniform float time;
uniform ivec2 numTiles;
uniform sampler2D permTexture;
-attribute vec2 tileCenter;
-attribute int tileXIndex;
-attribute int tileYIndex;
-attribute int vertexIndexInTile;
+attribute float tileInfo;
varying vec2 v_texturePosition;
varying float v_textureSelect;
@@ -52,9 +51,17 @@ void main( void )
// at time=0.5, when the tiles there (the rightmost ones) start
// moving.
+// In GLSL 1.20 we don't have any bitwise operators, sigh
+
+int tileXIndex = int(mod(int(tileInfo), 256));
+int tileYIndex = int(mod(int(tileInfo) / 256, 256));
+int vertexIndexInTile = int(mod(int(tileInfo) / (256*256), 256));
+
float startTime = float(tileXIndex)/(numTiles.x-1) * 0.5;
float endTime = startTime + 0.5;
+vec2 tileCenter = vec2(-1 + 1.5 * tileXIndex * (2.0/numTiles.x), -1 + 1.5
* tileYIndex * (2.0/numTiles.y));
+
if (time <= startTime)
{
// Still at start location, nothing needed
@@ -86,7 +93,7 @@ void main( void )
v.z += (fuzz < 0.5 ? -1 : 1) * tileCenter.x * sin(moveTime*M_PI);
// Perturb z a bit randomly
-v.z += (((
[Libreoffice-commits] core.git: Branch 'feature/fixes11' -
0 files changed New commits: commit 2df2631b624688b3b1ba48db9588e41dbcbf88e7 Author: László Németh Date: Sat Nov 7 00:23:58 2015 +0100 update ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: tools/source
tools/source/generic/gen.cxx | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
New commits:
commit d1c91627d9c7d117ee2e680f5c24844f7c4d8515
Author: Julien Nabet
Date: Fri Nov 6 23:47:42 2015 +0100
Return early
Change-Id: Ifef410c1495d1a2b99693f4669d81d6293f74f6a
Reviewed-on: https://gerrit.libreoffice.org/19834
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx
index 33a4ae4..8306ef8 100644
--- a/tools/source/generic/gen.cxx
+++ b/tools/source/generic/gen.cxx
@@ -133,28 +133,27 @@ bool Rectangle::IsInside( const Point& rPoint ) const
if ( IsEmpty() )
return false;
-bool bRet = true;
if ( nLeft <= nRight )
{
if ( (rPoint.X() < nLeft) || (rPoint.X() > nRight) )
-bRet = false;
+return false;
}
else
{
if ( (rPoint.X() > nLeft) || (rPoint.X() < nRight) )
-bRet = false;
+return false;
}
if ( nTop <= nBottom )
{
if ( (rPoint.Y() < nTop) || (rPoint.Y() > nBottom) )
-bRet = false;
+return false;
}
else
{
if ( (rPoint.Y() > nTop) || (rPoint.Y() < nBottom) )
-bRet = false;
+return false;
}
-return bRet;
+return true;
}
bool Rectangle::IsInside( const Rectangle& rRect ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d0/991ab96b863dfae89a6ce4e9ac90016681b61d
d0/991ab96b863dfae89a6ce4e9ac90016681b61d |1 + 1 file changed, 1 insertion(+) New commits: commit 627a095b3690dbaf3dce3af49ac694d5ac5cf1de Author: Caolán McNamara Date: Fri Nov 6 20:52:59 2015 + Notes added by 'git notes add' diff --git a/d0/991ab96b863dfae89a6ce4e9ac90016681b61d b/d0/991ab96b863dfae89a6ce4e9ac90016681b61d new file mode 100644 index 000..0f3f381 --- /dev/null +++ b/d0/991ab96b863dfae89a6ce4e9ac90016681b61d @@ -0,0 +1 @@ +prefer: b21f2439ad2681f906c63c2192ef141d9abb9e37 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - compilerplugins/clang sc/inc sc/source vcl/source
compilerplugins/clang/badstatics.cxx| 59 ++--
sc/inc/chartlis.hxx | 10 +-
sc/inc/datauno.hxx |3
sc/inc/detdata.hxx |4 -
sc/inc/dpobject.hxx |1
sc/inc/dpsave.hxx |9 +-
sc/source/core/data/documen5.cxx|5 -
sc/source/core/data/document.cxx|5 -
sc/source/core/data/dpsave.cxx | 89 ++--
sc/source/core/tool/chartlis.cxx| 103 +++-
sc/source/filter/excel/xepivot.cxx |9 +-
sc/source/filter/excel/xepivotxml.cxx |2
sc/source/filter/xml/XMLExportDataPilot.cxx | 10 +-
sc/source/ui/unoobj/cellsuno.cxx|5 -
sc/source/ui/unoobj/dapiuno.cxx | 17 +---
vcl/source/filter/wmf/winmtf.cxx| 10 +-
vcl/source/filter/wmf/winmtf.hxx|2
17 files changed, 193 insertions(+), 150 deletions(-)
New commits:
commit 7d68b8e52f0571bccff9c53df2bb65c1c8aee744
Author: Michael Stahl
Date: Fri Nov 6 17:52:52 2015 +0100
sc: replace boost::ptr_map with std::map
Change-Id: Ia2ac921664fd5b7336125a2f62bca932542b2286
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 64ff7c7..3bc0fb8 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -27,8 +27,8 @@
#include "token.hxx"
#include "externalrefmgr.hxx"
-#include
#include
+#include
#include
#include
#include
@@ -127,10 +127,10 @@ public:
class SC_DLLPUBLIC ScChartListenerCollection
{
public:
-typedef boost::ptr_map ListenersType;
+typedef std::map> ListenersType;
typedef std::unordered_set StringSetType;
private:
-ListenersType maListeners;
+ListenersType m_Listeners;
enum UpdateStatus
{
SC_CLCUPDATE_NONE,
@@ -164,8 +164,8 @@ public:
void removeByName(const OUString& rName);
-const ListenersType& getListeners() const { return maListeners;}
-ListenersType& getListeners() { return maListeners;}
+const ListenersType& getListeners() const { return m_Listeners; }
+ListenersType& getListeners() { return m_Listeners; }
StringSetType& getNonOleObjectNames() { return maNonOleObjectNames;}
/**
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index e7d554c..9345d20 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -487,10 +487,9 @@ void ScDocument::UpdateChartRef( UpdateRefMode
eUpdateRefMode,
return;
ScChartListenerCollection::ListenersType& rListeners =
pChartListenerCollection->getListeners();
-ScChartListenerCollection::ListenersType::iterator it =
rListeners.begin(), itEnd = rListeners.end();
-for (; it != itEnd; ++it)
+for (auto const& it : rListeners)
{
-ScChartListener* pChartListener = it->second;
+ScChartListener *const pChartListener = it.second.get();
ScRangeListRef aRLR( pChartListener->GetRangeList() );
ScRangeListRef aNewRLR( new ScRangeList );
bool bChanged = false;
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 054dc9f..06d0fd7 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3900,10 +3900,9 @@ void ScDocument::CalcAfterLoad( bool bStartListening )
if (pChartListenerCollection)
{
const ScChartListenerCollection::ListenersType& rListeners =
pChartListenerCollection->getListeners();
-ScChartListenerCollection::ListenersType::const_iterator it =
rListeners.begin(), itEnd = rListeners.end();
-for (; it != itEnd; ++it)
+for (auto const& it : rListeners)
{
-const ScChartListener* p = it->second;
+const ScChartListener *const p = it.second.get();
InterpretDirtyCells(*p->GetRangeList());
}
}
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index 5173a0f..d2e50bd 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -423,14 +423,15 @@ ScChartListenerCollection::~ScChartListenerCollection()
// ScChartListener::EndListeningTo may cause
ScChartListenerCollection::StartTimer
// to be called if an empty ScNoteCell is deleted
-maListeners.clear();
+m_Listeners.clear();
}
void ScChartListenerCollection::StartAllListeners()
{
-ListenersType::iterator it = maListeners.begin(), itEnd =
maListeners.end();
-for (; it != itEnd; ++it)
-it->second->StartListeningTo();
+for (auto const& it : m_Listeners)
+{
+it.second->StartListeningTo();
+}
}
void ScChartListenerCollection::insert(ScChartListener* pListener)
@@ -438,31 +439,31 @@ void ScChartListenerCollection::insert(ScChartListener*
pListener)
if (meModifiedDuringUpdate == SC_CLCUPDATE_RUNNING)
meModif
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/compat.hxx | 10 ++
compilerplugins/clang/stringconstant.cxx |2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 22fb58a6fa7764ec0045529c483693e1a81b488e
Author: Michael Stahl
Date: Fri Nov 6 14:23:56 2015 +0100
compilerplugins: getAsTagDecl doesn't exist in clang 3.5
Change-Id: If7277820227486e2eb578a167e0fd9f05c8f74ae
Reviewed-on: https://gerrit.libreoffice.org/19823
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index 0ca37fa..6b14510 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -255,6 +255,16 @@ inline bool isMacroBodyExpansion(clang::CompilerInstance&
compiler, clang::Sourc
#endif
}
+inline auto getAsTagDecl(clang::Type const& t) -> clang::TagDecl *
+{
+#if (__clang_major__ == 3 && __clang_minor__ > 5) || __clang_major__ > 3
+// TODO not sure if it works with clang 3.6, trunk is known to work
+return t.getAsTagDecl();
+#else
+return t.getAs()->getDecl();
+#endif
+}
+
}
#endif
diff --git a/compilerplugins/clang/stringconstant.cxx
b/compilerplugins/clang/stringconstant.cxx
index 8fbed25..56ae27c 100644
--- a/compilerplugins/clang/stringconstant.cxx
+++ b/compilerplugins/clang/stringconstant.cxx
@@ -235,7 +235,7 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) {
&& t->isClassType()
&& t->getAs() == nullptr)
{
-auto td = t->getAsTagDecl();
+auto td = compat::getAsTagDecl(*t);
auto id = td->getIdentifier();
if (id != nullptr && id->isStr("OUString")) {
auto nd = dyn_cast(td->getParent());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: slideshow/opengl slideshow/source
slideshow/opengl/vortexFragmentShader.glsl | 17 +-
slideshow/opengl/vortexVertexShader.glsl | 72
+++--
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 77
++
3 files changed, 113 insertions(+), 53 deletions(-)
New commits:
commit 24db02dc8d771b8aa722d0fa2a410635b5179e35
Author: Tor Lillqvist
Date: Fri Nov 6 17:44:52 2015 +0200
Make the Vortex transition a bit more interesting
Also some minor cleanups in the C++ code.
Change-Id: I106657130dd6e32b458cb416717806caac5031ce
diff --git a/slideshow/opengl/vortexFragmentShader.glsl
b/slideshow/opengl/vortexFragmentShader.glsl
index d4ff8fb..a8a9767 100755
--- a/slideshow/opengl/vortexFragmentShader.glsl
+++ b/slideshow/opengl/vortexFragmentShader.glsl
@@ -9,21 +9,22 @@
uniform sampler2D leavingSlideTexture;
uniform sampler2D enteringSlideTexture;
-uniform sampler2D permTexture;
uniform float time;
varying vec2 v_texturePosition;
-
-float snoise(vec2 p)
-{
-return texture2D(permTexture, p).r;
-}
+varying float v_textureSelect;
void main()
{
-if (time <= 0.5)
+if (v_textureSelect == 0)
+{
gl_FragColor = texture2D(leavingSlideTexture, v_texturePosition);
+}
else
-gl_FragColor = texture2D(enteringSlideTexture, v_texturePosition);
+{
+vec2 pos = v_texturePosition;
+pos.x = 1 - pos.x;
+gl_FragColor = texture2D(enteringSlideTexture, pos);
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/opengl/vortexVertexShader.glsl
b/slideshow/opengl/vortexVertexShader.glsl
index 588eda5..532260d 100755
--- a/slideshow/opengl/vortexVertexShader.glsl
+++ b/slideshow/opengl/vortexVertexShader.glsl
@@ -10,12 +10,14 @@
#define M_PI 3.1415926535897932384626433832795
uniform float time;
+uniform ivec2 numTiles;
uniform sampler2D permTexture;
-attribute vec2 center;
+attribute vec2 tileCenter;
attribute int tileXIndex;
attribute int tileYIndex;
attribute int vertexIndexInTile;
varying vec2 v_texturePosition;
+varying float v_textureSelect;
float snoise(vec2 p)
{
@@ -35,14 +37,6 @@ mat4 rotationMatrix(vec3 axis, float angle)
0.0,0.0,
0.0,1.0);
}
-mat4 translateMatrix(vec2 whereTo)
-{
-return mat4(1, 0, 0, whereTo.x,
-0, 1, 0, whereTo.y,
-0, 0, 1, 0,
-0, 0, 0, 1);
-}
-
void main( void )
{
vec4 v = gl_Vertex;
@@ -50,16 +44,62 @@ void main( void )
// Of course this is nothing like what it will eventually be; just
// experimenting to get at least something.
-v -= vec4(center, 0, 0);
-if (time <= 0.5)
-v = rotationMatrix(vec3(0, 1, 0), time*M_PI) * v;
+// Move the tile on a semicircular path so that it will end up at the
correct place
+// Move half the tiles one way, half the other.
+
+// Each tile moves during only half of the transition. The letmost
+// tiles start moving immediately and arrive at their end position
+// at time=0.5, when the tiles there (the rightmost ones) start
+// moving.
+
+float startTime = float(tileXIndex)/(numTiles.x-1) * 0.5;
+float endTime = startTime + 0.5;
+
+if (time <= startTime)
+{
+// Still at start location, nothing needed
+v_textureSelect = 0;
+}
+else if (time > startTime && time <= endTime)
+{
+// Moving
+float moveTime = (time - startTime) * 2;
+
+// First: Rotate the tile around its Y axis,
+// It rotates 180 degrees during the transition.
+// Translate to origin, rotate.
+
+v -= vec4(tileCenter, 0, 0);
+
+// A semi-random number 0..1, different for neighbouring tiles
+float fuzz = snoise(256*vec2(float(tileXIndex)/(numTiles.x-1),
float(tileYIndex)/(numTiles.y-1)));
+
+float rotation = moveTime;
+
+// experiment: perturb rotation a bit randomly
+// rotation = moveTime - fuzz*(0.5-abs(time - 0.5));
+
+v = rotationMatrix(vec3(0, 1, 0), rotation*M_PI) * v;
+
+v.x += tileCenter.x * cos(moveTime*M_PI);
+v.y += tileCenter.y;
+v.z += (fuzz < 0.5 ? -1 : 1) * tileCenter.x * sin(moveTime*M_PI);
+
+// Perturb z a bit randomly
+v.z += tileXIndex << 3) ^ tileYIndex) % 10) - 5) * (1 -
abs(time-0.5)*2);
+
+v_textureSelect = float(rotation > 0.5);
+}
else
-v = rotationMatrix(vec3(0, 1, 0), -(1-time)*M_PI) * v;
-v += vec4(center, 0, 0);
+{
+// At end location. Tile is 180 degrees rotated
-// v.z += 10 * (snoise(vec2(tileXIndex, tileYIndex))-0.5) * (1 -
abs(time-0.5)*2);
+v -= vec4(tileCenter, 0, 0);
+v = rotationMatrix(vec3(0, 1, 0), M_PI) * v;
+v += vec4(-tileCenter.x, tileCenter.y, 0, 0);
-v.z += tileXIndex << 3)
[Libreoffice-commits] core.git: 2 commits - libreofficekit/source sw/source
libreofficekit/source/gtk/lokdocview.cxx| 23 +++-
sw/source/core/objectpositioning/anchoredobjectposition.cxx |6 ++-
2 files changed, 26 insertions(+), 3 deletions(-)
New commits:
commit 16331514fd10d444bec89f892a106cbbba9e16c0
Author: László Németh
Date: Fri Nov 6 14:54:02 2015 +0100
tdf#92648 fix DOCX import regression (textbox shrinking in footers)
caused by the fix for tdf#91260
Change-Id: I4a5a27b51c4cb1304647b5432c06ca9c5a96590d
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index 1993919..a824989 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -484,8 +484,10 @@ SwTwips SwAnchoredObjectPosition::_ImplAdjustVertRelPos(
const SwTwips nTopOfAnc
SwFrameFormat* pFrameFormat = ::FindFrameFormat(&GetObject());
SwFormatFrmSize aSize(pFormat->GetFrmSize());
SwTwips nShrinked = aSize.GetHeight() - (nProposedRelPosY -
nAdjustedRelPosY);
-aSize.SetHeight( nShrinked > 0 ? nShrinked : 0 );
-pFrameFormat->SetFormatAttr(aSize);
+if (nShrinked >= 0) {
+aSize.SetHeight( nShrinked );
+pFrameFormat->SetFormatAttr(aSize);
+}
nAdjustedRelPosY = nProposedRelPosY;
} else if ( SwTextBoxHelper::findTextBox(pFormat) )
// when the shape has a textbox, use only the proposed
vertical position
commit 63d2d50ecb3f3a83374a1a01713edce14ba378ed
Author: László Németh
Date: Fri Nov 6 19:26:29 2015 +0100
gtktiledviewer: add Ctrl, Alt, Shift shortcut support
For example in Writer:
Ctrl-B for bold text
Ctrl-Shift-B/P for subscript/superscript
Ctrl-Alt-C insert comment
Ctrl-1 apply Heading 1 paragraph style
Change-Id: Iaeb8341f2cb273980b637ff2fed89585094e0d9d
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index 9aaa5ef..475f388 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -337,7 +337,7 @@ signalKey (GtkWidget* pWidget, GdkEventKey* pEvent)
return FALSE;
}
-priv->m_nKeyModifier = 0;
+priv->m_nKeyModifier &= KEY_MOD2;
switch (pEvent->keyval)
{
case GDK_KEY_BackSpace:
@@ -381,6 +381,8 @@ signalKey (GtkWidget* pWidget, GdkEventKey* pEvent)
case GDK_KEY_Alt_R:
if (pEvent->type == GDK_KEY_PRESS)
priv->m_nKeyModifier |= KEY_MOD2;
+else
+priv->m_nKeyModifier &= ~KEY_MOD2;
break;
default:
if (pEvent->keyval >= GDK_KEY_F1 && pEvent->keyval <= GDK_KEY_F26)
@@ -395,6 +397,25 @@ signalKey (GtkWidget* pWidget, GdkEventKey* pEvent)
if (pEvent->state & GDK_SHIFT_MASK)
nKeyCode |= KEY_SHIFT;
+if (pEvent->state & GDK_CONTROL_MASK)
+nKeyCode |= KEY_MOD1;
+
+if (priv->m_nKeyModifier & KEY_MOD2)
+nKeyCode |= KEY_MOD2;
+
+if (nKeyCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2)) {
+if (pEvent->keyval >= GDK_KEY_a && pEvent->keyval <= GDK_KEY_z)
+{
+nKeyCode |= 512 + (pEvent->keyval - GDK_KEY_a);
+}
+else if (pEvent->keyval >= GDK_KEY_A && pEvent->keyval <= GDK_KEY_Z) {
+nKeyCode |= 512 + (pEvent->keyval - GDK_KEY_A);
+}
+else if (pEvent->keyval >= GDK_KEY_0 && pEvent->keyval <= GDK_KEY_9) {
+nKeyCode |= 256 + (pEvent->keyval - GDK_KEY_0);
+}
+}
+
if (pEvent->type == GDK_KEY_RELEASE)
{
GTask* task = g_task_new(pDocView, NULL, NULL, NULL);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/backingwindow.cxx | 17 +
sfx2/source/dialog/backingwindow.hxx |1 -
2 files changed, 5 insertions(+), 13 deletions(-)
New commits:
commit 51c14b1c262bced0cb61c943caad044be9e95c15
Author: Jan Holesovsky
Date: Fri Nov 6 08:06:00 2015 +0100
tdf#92866 startcenter: Make the accellerators work again.
I still have no idea what is the root cause here (why the accellerators do
not
work 'automagically') - I suspect it is because we don't have a shell there,
and instead only a vcl::Window, or something like that :-)
Either way, when we handle the accellerators already in PreNotify(), it
works
as expected, so let's live with that for the time being.
Change-Id: Id050fd8f5fff38914821cb64eaa3ae7281fc6d50
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index c487880..54ac9a6 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -413,6 +413,7 @@ bool BackingWindow::PreNotify( NotifyEvent& rNEvt )
{
const KeyEvent* pEvt = rNEvt.GetKeyEvent();
const vcl::KeyCode& rKeyCode(pEvt->GetKeyCode());
+
// Subwindows of BackingWindow: Sidebar and Thumbnail view
if( rKeyCode.GetCode() == KEY_F6 )
{
@@ -438,28 +439,20 @@ bool BackingWindow::PreNotify( NotifyEvent& rNEvt )
}
}
}
-}
-return Window::PreNotify( rNEvt );
-}
-bool BackingWindow::Notify( NotifyEvent& rNEvt )
-{
-if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
-{
// try the 'normal' accelerators (so that eg. Ctrl+Q works)
-if( !mpAccExec )
+if (!mpAccExec)
{
mpAccExec = svt::AcceleratorExecute::createAcceleratorHelper();
mpAccExec->init( comphelper::getProcessComponentContext(),
mxFrame);
}
-const KeyEvent* pEvt = rNEvt.GetKeyEvent();
-const vcl::KeyCode& rKeyCode(pEvt->GetKeyCode());
+
const OUString aCommand =
mpAccExec->findCommand(svt::AcceleratorExecute::st_VCLKey2AWTKey(rKeyCode));
-if((aCommand != "vnd.sun.star.findbar:FocusToFindbar") && pEvt &&
mpAccExec->execute(rKeyCode))
+if ((aCommand != "vnd.sun.star.findbar:FocusToFindbar") && pEvt &&
mpAccExec->execute(rKeyCode))
return true;
}
-return Window::Notify( rNEvt );
+return Window::PreNotify( rNEvt );
}
void BackingWindow::GetFocus()
diff --git a/sfx2/source/dialog/backingwindow.hxx
b/sfx2/source/dialog/backingwindow.hxx
index f7d1d12..e31dacc 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -123,7 +123,6 @@ public:
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&
rRect) override;
virtual void Resize() override;
virtual bool PreNotify(NotifyEvent& rNEvt) override;
-virtual bool Notify(NotifyEvent& rNEvt) override;
virtual void GetFocus() override;
virtual Size GetOptimalSize() const override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 3 commits - loolwsd/LOOLSession.cpp loolwsd/LOOLWSD.cpp loolwsd/tsqueue.h loolwsd/Util.cpp
loolwsd/LOOLSession.cpp |3 +++
loolwsd/LOOLWSD.cpp |5 +++--
loolwsd/Util.cpp| 20 ++--
loolwsd/tsqueue.h |1 +
4 files changed, 17 insertions(+), 12 deletions(-)
New commits:
commit dfcaaf91aa673d542bcc8a5f13237a5e3b042d34
Author: Jan Holesovsky
Date: Fri Nov 6 18:24:22 2015 +0100
loolwsd: Remove the tiles also from the child's queue.
The commands leave the parent's queue very quickly, the child's queue is the
critical one, so remove them also from there. This speeds up the typing
experience very considerably.
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 3ca5c6f..e1cf3d0 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -404,7 +404,7 @@ public:
session->handleInput(buffer, n);
}
// Filter out duplicated tile messages.
-else if (firstLine.find("tile") != 0 ||
!queue.alreadyInQueue(firstLine))
+else if ((firstLine.compare(0, 5, "tile ") != 0)
|| !queue.alreadyInQueue(firstLine))
{
queue.put(firstLine);
}
@@ -958,7 +958,8 @@ void LOOLWSD::componentMain()
return (x.find("tile ") == 0 && x.find("id=") ==
std::string::npos);
});
}
-else
+// Filter out duplicated tile messages.
+else if ((firstLine.compare(0, 5, "tile ") != 0) ||
!queue.alreadyInQueue(firstLine))
{
queue.put(firstLine);
}
diff --git a/loolwsd/tsqueue.h b/loolwsd/tsqueue.h
index 25c2ac2..94a36cd 100644
--- a/loolwsd/tsqueue.h
+++ b/loolwsd/tsqueue.h
@@ -55,6 +55,7 @@ public:
}
bool alreadyInQueue(std::string cmd) {
+std::unique_lock lock(_mutex);
for (auto it = _queue.cbegin(); it != _queue.cend(); ++it) {
if (cmd == *it) {
return true;
commit c44e0a62664b96237d4707a8013959eab6cf772c
Author: Jan Holesovsky
Date: Fri Nov 6 13:33:11 2015 +0100
loolwsd: Log the tile rendering times.
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 8b6da93..63380bc 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -1045,7 +1045,10 @@ void ChildProcessSession::sendTile(const char*
/*buffer*/, int /*length*/, Strin
if (_docType != "text" && part !=
_loKitDocument->pClass->getPart(_loKitDocument)) {
_loKitDocument->pClass->setPart(_loKitDocument, part);
}
+
+Poco::Timestamp timestamp;
_loKitDocument->pClass->paintTile(_loKitDocument, pixmap, width, height,
tilePosX, tilePosY, tileWidth, tileHeight);
+std::cout << Util::logPrefix() << "paintTile called, tile at [" <<
tilePosX << ", " << tilePosY << "] rendered in " <<
double(timestamp.elapsed())/1000 << "ms" << std::endl;
if (!Util::encodePNGAndAppendToBuffer(pixmap, width, height, output))
{
commit 37cb3c247a17e94a0ca5c68b5761cd3a8ef952da
Author: Jan Holesovsky
Date: Fri Nov 6 13:31:06 2015 +0100
loolwsd: We have only ms resolution anyway, clean this up.
diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index cac9c33..c1836cd 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -50,23 +50,23 @@ extern "C"
namespace Util
{
-static const Poco::Int64 epochStart = Poco::Timestamp().utcTime();
+static const Poco::Int64 epochStart =
Poco::Timestamp().epochMicroseconds();
std::string logPrefix()
{
-Poco::Int64 nanosec100 = Poco::Timestamp().utcTime() - epochStart;
+Poco::Int64 usec = Poco::Timestamp().epochMicroseconds() - epochStart;
-const Poco::Int64 n100 = 1000;
-Poco::Int64 hours = nanosec100 / (n100*60*60);
-nanosec100 %= (n100*60*60);
-Poco::Int64 minutes = nanosec100 / (n100*60);
-nanosec100 %= (n100*60);
-Poco::Int64 seconds = nanosec100 / (n100);
-nanosec100 %= (n100);
+const Poco::Int64 one_s = 100;
+Poco::Int64 hours = usec / (one_s*60*60);
+usec %= (one_s*60*60);
+Poco::Int64 minutes = usec / (one_s*60);
+usec %= (one_s*60);
+Poco::Int64 seconds = usec / (one_s);
+usec %= (one_s);
std::ostringstream stream;
stream << Poco::Process::id() << "," << std::setw(2) <<
std::setfill('0') << (Poco::Thread::current() ? Poco::Thread::current()->id() :
0) << "," <<
-std::setw(2) << hours << ":" << std::setw(2) << minutes << ":" <<
std::setw(2) << seconds << "." << std::setw(7) << nanosec100 << ",";
+std::setw(2) << hours << ":" << std::setw(2) << minutes << ":" <<
std::setw(2) << seconds << "." << std::setw(6) << usec << ",";
return stream.str();
}
___
Libreoffice-commits mailing list
libre
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/gridwin.hxx |9 -
sc/source/ui/view/gridwin.cxx |4 +++-
sc/source/ui/view/gridwin4.cxx |6 +++---
3 files changed, 6 insertions(+), 13 deletions(-)
New commits:
commit 064fb1f73abbc103226a8fce8a46b7e8b8347dac
Author: Andrzej Hunt
Date: Fri Nov 6 17:36:18 2015 +0100
Revert "sc lok: Cache viewdata zoom and reuse for cursor callback"
This reverts fab3c48a0cd5a0517025993502a04358308fe5ef for now.
The correct solution is to have the client "hint" at the current
resolution, which is still being developed
(gerrit-id: I34b5afcdcc06a671a8ac92c03e87404e42adf4cd).
For now the cursor will be wrongly positioned when moved as the result
of a mouse click.
Change-Id: I68d56eac958e607e8e2e3ad16aff4e1a7dd0b6dd
Reviewed-on: https://gerrit.libreoffice.org/19827
Tested-by: Andrzej Hunt
Reviewed-by: Andrzej Hunt
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index f02d09a..4f82167 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -199,15 +199,6 @@ class ScGridWindow : public vcl::Window, public
DropTargetHelper, public DragSou
boolbAutoMarkVisible:1;
boolbListValButton:1;
-// We cache the tiled rendering zoom level in order to be able to
-// calculate the correct cell cursor position (which is dependent
-// on the zoom level). The caching is necessary since
-// ScModelObj::postMouseEvent resets the zoom level to the default,
-// which means we have the default zoom level set during the
-// cell cursor position calculations in updateLibreOfficeKitCellCursor().
-FractionmTiledZoomX;
-FractionmTiledZoomY;
-
DECL_LINK_TYPED( PopupModeEndHdl, FloatingWindow*, void );
DECL_LINK_TYPED( PopupSpellingHdl, SpellCallbackInfo&, void );
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 1636a34..3ab0f738 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5827,7 +5827,9 @@ void ScGridWindow::updateLibreOfficeKitCellCursor()
{
ScDocument* pDoc = pViewData->GetDocument();
ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
-OString aCursor = getCellCursor(mTiledZoomX, mTiledZoomY);
+// TODO: the zoom levels here should be replaced by the setClientZoom
values
+// in a patch currently in gerrit
(https://gerrit.libreoffice.org/#/c/19822/)
+OString aCursor = getCellCursor(pViewData->GetZoomX(),
pViewData->GetZoomY());
pDrawLayer->libreOfficeKitCallback(LOK_CALLBACK_CELL_CURSOR,
aCursor.getStr());
}
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index e0f0a51..51ae5fd 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -953,11 +953,11 @@ void ScGridWindow::PaintTile( VirtualDevice& rDevice,
// Similarly to Writer, we should set the mapmode once on the rDevice, and
// not care about any zoom settings.
-mTiledZoomX = Fraction(long(nOutputWidth * TWIPS_PER_PIXEL), nTileWidth);
-mTiledZoomY = Fraction(long(nOutputHeight * TWIPS_PER_PIXEL), nTileHeight);
+Fraction aFracX(long(nOutputWidth * TWIPS_PER_PIXEL), nTileWidth);
+Fraction aFracY(long(nOutputHeight * TWIPS_PER_PIXEL), nTileHeight);
// page break zoom, and aLogicMode in ScViewData
-pViewData->SetZoom(mTiledZoomX, mTiledZoomY, true);
+pViewData->SetZoom(aFracX, aFracY, true);
double fTilePosXPixel = static_cast(nTilePosX) * nOutputWidth /
nTileWidth;
double fTilePosYPixel = static_cast(nTilePosY) * nOutputHeight /
nTileHeight;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/mailmodel.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 77ff51623eab0c5908c84400c6eb8448ddb1e9c8
Author: Andras Timar
Date: Fri Nov 6 08:22:33 2015 -0800
tdf#89852 on Windows do not decode the filename for email subject
... because MAPISendMail does not accept Unicode
Change-Id: Id48a41d1cf25d1a991b0f83fd5daa1a65896e958
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 8c9ae26..95ff121 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -821,7 +821,11 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const
css::uno::Reference< css:
OUString subject(
url.getBase(
INetURLObject::LAST_SEGMENT, false,
+#ifdef WNT
+INetURLObject::NO_DECODE)); // MAPISendMail does
not accept Unicode
+#else
INetURLObject::DECODE_WITH_CHARSET));
+#endif
if (subject.isEmpty()) {
subject = maAttachedDocuments[0];
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/docvw/SidebarWin.cxx | 15 +++ 1 file changed, 15 insertions(+) New commits: commit 5f68759810496ff3fadf5a883203449772c7392f Author: Miklos Vajna Date: Fri Nov 6 17:12:46 2015 +0100 sc lok annotations: paint range and anchor overlay Change-Id: I16e51e074704026a45471e7a08c3b96846d44053 diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index 112a12d..f5c620a 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -262,6 +262,21 @@ void SwSidebarWin::PaintTile(vcl::RenderContext& rRenderContext, const Rectangle rRenderContext.Pop(); } + +const drawinglayer::geometry::ViewInformation2D aViewInformation; +std::unique_ptr pProcessor(drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(rRenderContext, aViewInformation)); + +// drawinglayer sets the map mode to pixels, not needed here. +rRenderContext.Pop(); +// Work in document-global twips. +rRenderContext.Pop(); +if (mpAnchor) +pProcessor->process(mpAnchor->getOverlayObjectPrimitive2DSequence()); +if (mpTextRangeOverlay) + pProcessor->process(mpTextRangeOverlay->getOverlayObjectPrimitive2DSequence()); +rRenderContext.Push(PushFlags::NONE); +pProcessor.reset(); +rRenderContext.Push(PushFlags::NONE); } void SwSidebarWin::Draw(OutputDevice* pDev, const Point& rPt, const Size& rSz, DrawFlags nInFlags) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: contributing to libreoffice
Hi. My name is Jan Iversen (you find me around as jani), I am glad to see you want to join a very lively project. You can (and should) for sure read you wiki about development, but it can be rather hard to read through all that material so I offer you another solution. I would be happy to mentor you, and help you submit the first vital patches. I am right now starting an initative to reduce our open report in coverity (do you know this tool?), and have a lot of simple java stuff that needs to be done. It would help you get started. If interested mail me directly at j...@documentfoundation.org The very first thing you need to do it to get a development environment up and running, please use this link https://wiki.documentfoundation.org/Development/lode And do let me know if you have any difficulties, or if you think some of the items are explained too difficult. Looking forward to help you work on LibreOffice. rgds jan I. On 6 November 2015 at 11:42, Sukant Kumar wrote: > Hi, i am sukant kumar pursuing B.tech from Bhagalpur college of > engineering. > i want to contribute for LIBREOFFICE community. > i have a prior knowledge of c , c++ and java . > i have no prior experience in contributing to open source development. > can any one please guide me for contributing to the community. > expecting a positive reply. > > thank you, > with regard. > > ___ > 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
Re: contributing to libreoffice
Hi. My name is Jan Iversen (you find me around as jani), I am glad to see you want to join a very lively project. You can (and should) for sure read you wiki about development, but it can be rather hard to read through all that material so I offer you another solution. I would be happy to mentor you, and help you submit the first vital patches. I am right now starting an initative to reduce our open report in coverity (do you know this tool?), and have a lot of simple java stuff that needs to be done. It would help you get started. If interested mail me directly at j...@documentfoundation.org The very first thing you need to do it to get a development environment up and running, please use this link https://wiki.documentfoundation.org/Development/lode And do let me know if you have any difficulties, or if you think some of the items are explained too difficult. Looking forward to help you work on LibreOffice. rgds jan I. -- View this message in context: http://nabble.documentfoundation.org/contributing-to-libreoffice-tp4165514p4165523.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: include/cppuhelper
include/cppuhelper/compbase.hxx |4
include/cppuhelper/implbase.hxx |8
2 files changed, 12 insertions(+)
New commits:
commit a0be15e5d4747bb335467dba7004e52eceb8fe2a
Author: Stephan Bergmann
Date: Fri Nov 6 16:32:27 2015 +0100
Note why certain replacements of odd functionality are not there by design
Change-Id: Iaa3110eaea5e295a193642555b7e14ab3fb6ff96
diff --git a/include/cppuhelper/compbase.hxx b/include/cppuhelper/compbase.hxx
index 767e302..0b67044 100644
--- a/include/cppuhelper/compbase.hxx
+++ b/include/cppuhelper/compbase.hxx
@@ -42,6 +42,10 @@ namespace osl { class Mutex; }
#if defined LIBO_INTERNAL_ONLY
+// A replacement for WeakAggComponentImplHelper1 has deliberately been left
out,
+// as the underlying aggregation mechanism is known broken in general and
should
+// not be used.
+
namespace cppu {
/** Implementation helper implementing interfaces
diff --git a/include/cppuhelper/implbase.hxx b/include/cppuhelper/implbase.hxx
index 37b6a1c..abf00f3 100644
--- a/include/cppuhelper/implbase.hxx
+++ b/include/cppuhelper/implbase.hxx
@@ -38,6 +38,14 @@
#if defined LIBO_INTERNAL_ONLY
+// A replacement for ImplHelperN has deliberately been left out, as ImplHelperN
+// is unlikely ever be a better choice htan WeakImplHelper, so all their
+// existing uses are probably confused and should use WeakImplHelper instead.
+//
+// Replacements for WeakAggImplHelperN and AggImplInheritanceHelper1 have
+// deliberately been left out, as the underlying aggregation mechanism is known
+// broken in general and should not be used.
+
namespace cppu {
/// @cond INTERNAL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: contributing to libreoffice
Hi Sukant, Am 06.11.2015 um 11:42 schrieb Sukant Kumar: > Hi, i am sukant kumar pursuing B.tech from Bhagalpur college of engineering. > i want to contribute for LIBREOFFICE community. > i have a prior knowledge of c , c++ and java . > i have no prior experience in contributing to open source development. > can any one please guide me for contributing to the community. > expecting a positive reply. Thanks for your interest in joining the LibreOffice development community. As a start have a look at https://wiki.documentfoundation.org/Development Please follow the "Getting Started with Development" section. This tells you how to compile LibreOffice and start diving into the code by solving an easy problem (Easy Hack). If you need more help or have questions, feel free to write to this list or consider to join the #libreoffice-dev IRC channel for conversations about bugs and code. ATB Jan-Marek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/CppunitTest_sal_rtl_ref.mk
sal/CppunitTest_sal_rtl_ref.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 6c4f3031b0b7e0b07df0991081728b0a1b7e28cd Author: Stephan Bergmann Date: Fri Nov 6 16:21:44 2015 +0100 Remove additional empty line from license header Change-Id: Ic185d7bc3dc6f8a41c71b83d8bfa293ed4236937 diff --git a/sal/CppunitTest_sal_rtl_ref.mk b/sal/CppunitTest_sal_rtl_ref.mk index f42bf92..a72930a 100644 --- a/sal/CppunitTest_sal_rtl_ref.mk +++ b/sal/CppunitTest_sal_rtl_ref.mk @@ -1,6 +1,5 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # -# # This file is part of the LibreOffice project. # # This Source Code Form is subject to the terms of the Mozilla Public ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/rtl
include/rtl/ref.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a7efdb18d264d4cadf470d2f355086cbd6f29ff4
Author: Stephan Bergmann
Date: Fri Nov 6 16:20:22 2015 +0100
Best avoid SAL_CALL cargo-cult for new inline functions
Change-Id: Ifeaddeac673366b4eacc55ce6f2a74a2553ac927
diff --git a/include/rtl/ref.hxx b/include/rtl/ref.hxx
index 82dda83..3ffcfc0 100644
--- a/include/rtl/ref.hxx
+++ b/include/rtl/ref.hxx
@@ -122,7 +122,7 @@ public:
* set the body represented by the handle to nullptr.
*/
inline Reference &
-SAL_CALL operator= (Reference && handle)
+operator= (Reference && handle)
{
// self-movement guts ourself
if (m_pBody)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/rtl sal/CppunitTest_sal_rtl_ref.mk sal/Module_sal.mk sal/qa
include/rtl/ref.hxx| 27 +
sal/CppunitTest_sal_rtl_ref.mk | 22
sal/Module_sal.mk |1
sal/qa/rtl/ref/rtl_ref.cxx | 112 +
4 files changed, 162 insertions(+)
New commits:
commit f15d11a9f8d6c783fd8c937256fa3372f8e4fe01
Author: Daniel Robertson
Date: Tue Nov 3 09:47:36 2015 -0500
rtl::Reference Add move construction/assignment
Add move constructor and appropriately overloaded assignment operator to
rtl::Reference, and add basic unit tests for the reference counting of
rtl::Reference.
Change-Id: Ia7ff5d786bdf3b17709cec06608c91e22379746c
Reviewed-on: https://gerrit.libreoffice.org/19762
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/rtl/ref.hxx b/include/rtl/ref.hxx
index 097584b..82dda83 100644
--- a/include/rtl/ref.hxx
+++ b/include/rtl/ref.hxx
@@ -72,6 +72,15 @@ public:
m_pBody->acquire();
}
+#ifdef LIBO_INTERNAL_ONLY
+/** Move constructor...
+ */
+inline Reference (Reference && handle)
+: m_pBody (handle.m_pBody)
+{
+handle.m_pBody = nullptr;
+}
+#endif
/** Destructor...
*/
@@ -106,6 +115,24 @@ public:
return set( handle.m_pBody );
}
+#ifdef LIBO_INTERNAL_ONLY
+/** Assignment.
+ * Unbinds this instance from its body (if bound),
+ * bind it to the body represented by the handle, and
+ * set the body represented by the handle to nullptr.
+ */
+inline Reference &
+SAL_CALL operator= (Reference && handle)
+{
+// self-movement guts ourself
+if (m_pBody)
+m_pBody->release();
+m_pBody = handle.m_pBody;
+handle.m_pBody = nullptr;
+return *this;
+}
+#endif
+
/** Assignment...
*/
inline Reference &
diff --git a/sal/CppunitTest_sal_rtl_ref.mk b/sal/CppunitTest_sal_rtl_ref.mk
new file mode 100644
index 000..f42bf92
--- /dev/null
+++ b/sal/CppunitTest_sal_rtl_ref.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_ref))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_ref,\
+ sal/qa/rtl/ref/rtl_ref \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_ref,\
+ sal \
+ $(gb_UWINAPI) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 192da93..0b02103 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_Module_add_check_targets,sal,\
CppunitTest_sal_rtl_oustring \
CppunitTest_sal_rtl_oustringbuffer \
CppunitTest_sal_rtl_process \
+ CppunitTest_sal_rtl_ref \
CppunitTest_sal_rtl_strings \
CppunitTest_sal_rtl_textenc \
CppunitTest_sal_rtl_uri \
diff --git a/sal/qa/rtl/ref/rtl_ref.cxx b/sal/qa/rtl/ref/rtl_ref.cxx
new file mode 100644
index 000..66d54e6
--- /dev/null
+++ b/sal/qa/rtl/ref/rtl_ref.cxx
@@ -0,0 +1,112 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+#include
+#include
+#include
+
+namespace rtl_ref
+{
+
+class MoveTestClass
+{
+private:
+bool m_bIncFlag;
+long m_nRef;
+public:
+MoveTestClass(): m_bIncFlag(false), m_nRef(0) { }
+
+// There should never be more than two references to this class as it
+// is used as a test class for move functions. One reference being the
+// original reference and the second being the test reference
+void acquire()
+{
+if(m_bIncFlag)
+{
+++m_nRef;
+m_bIncFlag = false;
+}
+else
+CPPUNIT_FAIL("RC was incremented when in should not have been");
+}
+
+void release() { --m_nRef; }
+
+long use_count() { return m_nRef; }
+
+void set_inc_flag() { m_bIncFlag = true; }
+};
+
+rtl::Reference< MoveTestClass > get_reference( MoveTestClass* pcTestClass )
+{
+// constructor will increment the reference count
+pcTestClass->set_inc_flag();
+rtl::Reference< MoveTestClass > tmp(pcTestClass);
+return tmp;
+}
+
+class TestReferenceRefCounting : public CppUnit::TestFixture
+{
+void testMove()
+{
+MoveTestClass cTestClass;
+
+// constructor will increment the reference count
+cTestClass.set_inc_flag();
+rtl::Reference< MoveTestClass > te
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/graphicfilter.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit c460ddb98317f1be0368eb197e338a4f8b44322d Author: Oliver Specht Date: Fri Nov 6 16:01:16 2015 +0100 unused warning in DISABLE_DYNLOADING fixed Change-Id: Ic5ae9d2c2c9a7ef95604d80134b0ff4de005db38 Reviewed-on: https://gerrit.libreoffice.org/19825 Reviewed-by: Oliver Specht Tested-by: Oliver Specht diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 3dad87b..5f19fa4 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -1875,8 +1875,9 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString FilterConfigItem aConfigItem( const_cast*>(pFilterData) ); OUString aFilterName( pConfig->GetExportFilterName( nFormat ) ); +#ifndef DISABLE_DYNLOADING OUString aExternalFilterName(pConfig->GetExternalFilterName(nFormat, true)); - +#endif bAbort = false; sal_uInt16 nStatus = GRFILTER_OK; GraphicType eType; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/fields/cellfml.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 0bd2a5eedd91466f97806e198b125546d256d1f8
Author: Oliver Specht
Date: Fri Nov 6 13:33:58 2015 +0100
tdf#94624 calculation of power operator fixed
cell values are added in parentheses to make sure negative values are
handled
correctly
Change-Id: I7366493e3cd6c25607e311d4b610ef8aa704a8bb
Reviewed-on: https://gerrit.libreoffice.org/19821
Tested-by: Jenkins
Reviewed-by: Oliver Specht
diff --git a/sw/source/core/fields/cellfml.cxx
b/sw/source/core/fields/cellfml.cxx
index 1eda37b..a6f2163 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -366,8 +366,10 @@ void SwTableFormula::_MakeFormula( const SwTable& rTable,
OUString& rNewStr,
// calculate the value of the box
if ( pSttBox->getRowSpan() >= 1 )
{
+rNewStr += "(";
rNewStr += pCalcPara->rCalc.GetStrResult(
pSttBox->GetValue( *pCalcPara ), false );
+rNewStr += ")";
}
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Bug 67400 (Missing quick buttons in slide pane of Impress)
Hi *, > I want to fix the following bug: > https://bugs.documentfoundation.org/show_bug.cgi?id=67400 But I need some > help. Can anybody write down a (hopefully) short list of classes/source > files that are relevant for fixing this bug? That would be very helpful to > me. Those quick buttons on Impress slides were removed on purpose in the following commit: http://cgit.freedesktop.org/libreoffice/core/commit/?id=504d3ed897915bff3b3794dc3f069cb4fb528719 more than 3 ys ago. The commit message says something along "Kill so much hated ButtonBar in slide sorter" line so presumably the users weren't so happy with that feature? Perhaps the ticket above should've then been closed as NOTABUG ... -- Katarina Behrens Softwareentwicklerin LibreOffice ––– CIB software GmbH Geschäftsstelle Hamburg Flachsland 10 22083 Hamburg ––– T +49 (40) / 28 48 42 -235 F +49 (40) / 28 48 42 -100 katarina.behr...@cib.de www.cib.de ––– Sitz: München Registergericht München, HRB 123286 Geschäftsführer: Dipl.-Ing. Ulrich Brandner ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dev-tools.git: 2 commits - export-validation/setup.sh
export-validation/setup.sh | 27 +--
1 file changed, 21 insertions(+), 6 deletions(-)
New commits:
commit 419956f775ead4422316cdaebff37da0939980df
Author: Katarina Behrens
Date: Fri Nov 6 14:12:52 2015 +0100
Improve help msg, mention absolute path
diff --git a/export-validation/setup.sh b/export-validation/setup.sh
index 69f31cb..0c6af26 100755
--- a/export-validation/setup.sh
+++ b/export-validation/setup.sh
@@ -24,6 +24,9 @@ print_SUSE_errormsg()
if [ -z "$1" -o -z "$2" ]; then
echo "Usage: $0 "
echo
+echo " where to download validator sources (absolute path)"
+echo " where to install validator wrappers (absolute path)"
+echo
echo "Example: $0 $HOME/scm/svn /opt/lo/bin"
exit 1
fi
commit 9201b13dcddb0903624a029e05ce32fb309c8f83
Author: Katarina Behrens
Date: Fri Nov 6 14:05:39 2015 +0100
Add check if subversion is in PATH
+ reduce some code duplication
diff --git a/export-validation/setup.sh b/export-validation/setup.sh
index 33921a1..69f31cb 100755
--- a/export-validation/setup.sh
+++ b/export-validation/setup.sh
@@ -9,6 +9,18 @@
# Run this script to download, build and install the validators.
+print_SUSE_errormsg()
+{
+package=$1
+
+if [ -e /etc/os-release ]; then
+. /etc/os-release
+if [ "$NAME" == "openSUSE" ]; then
+echo "Hint: type 'zypper in $1' to install it."
+fi
+fi
+}
+
if [ -z "$1" -o -z "$2" ]; then
echo "Usage: $0 "
echo
@@ -30,13 +42,13 @@ fi
if ! type -p ant >/dev/null; then
echo "Error: can't find ant in PATH"
+print_SUSE_errormsg 'ant'
+exit 1
+fi
-if [ -e /etc/os-release ]; then
-. /etc/os-release
-if [ "$NAME" == "openSUSE" ]; then
-echo "Hint: type 'zypper in ant-junit' to install it."
-fi
-fi
+if ! type -p svn >/dev/null; then
+echo "Error: can't find svn in PATH"
+print_SUSE_errormsg 'subversion'
exit 1
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
tdf#51165 -> code pointer needed
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi, I'm revisiting tdf#51165. It looks like rendering is the problem, not importing the SVG file. To continue I'd need some code pointers where rendering is implemented. Christina -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.22 (GNU/Linux) iQEbBAEBAgAGBQJWO8phAAoJEN/hiApPuw9SaGAH92VdZh8zvgNBm8mVUmbSMxbI Gz/JxmYT1wLCBPQoqsW+MLiHPE+haQcyPTOpDsd3w26DIprCa10IC4eNskW2MH2g 5X+RLumFEuFOCjZFogGar8zKOWaUUVCviaack4ioGVn9NFYsIlDPJv0j3PmZC3yK CxOF7M8tTGeq1sGSB2cm/mS3VMMfdPnYwT8wzS9NV4J/aJgTiMauH7ndjLqAd0Ad s4RSPaUktXYr9l6LtOCm+BykuuFz52skSbiO4oOquX/jcPAixdGXFdUk61Af2v5H 02AMGGUBFx8fHRJfq/s1cLNzU8J9el2tTtdpoDlSMlkB6hqPN5KhC6RbncHdqA== =yQ6o -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
contributing to libreoffice
Hi, i am sukant kumar pursuing B.tech from Bhagalpur college of engineering. i want to contribute for LIBREOFFICE community. i have a prior knowledge of c , c++ and java . i have no prior experience in contributing to open source development. can any one please guide me for contributing to the community. expecting a positive reply. thank you, with regard. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Bug 67400 (Missing quick buttons in slide pane of Impress)
Hi, I want to fix the following bug: https://bugs.documentfoundation.org/show_bug.cgi?id=67400 But I need some help. Can anybody write down a (hopefully) short list of classes/source files that are relevant for fixing this bug? That would be very helpful to me. Many thanks in advance! Regards, Sebastian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LibreOffice Bug
Thank you for telling the directory's names. I thought adding dialog because in this bug's page in Bugzilla, Daniel Naber who reported this bug and Urmas said there should be dialog asking for restart on comments. So now should I focus on just the menu updating and not restart? And is menu updating issue's solution related with desktop/source/deployment directory too? 2015-11-05 17:02 GMT+03:00 Stephan Bergmann : > On 11/05/2015 02:29 PM, İrem Şendur wrote: > >> I 'm working on this bug >> https://bugs.documentfoundation.org/show_bug.cgi?id=46279. >> I looked files under the extensions directory but I couldn't find where >> checking installation of extensions. I should add a dialog about >> installation extensions and user should restart LibreOffice. >> I asked this question on IRC and <@jmadero> suggested me that I might >> mail the LibreOffice mail list. >> Can anyone help me with finding the file or about what should I do ? >> > > The code of the "Tools - Extension Manager..." dialog is in > desktop/source/deployment/gui/dp_gui_theextmgr.cxx (all the > extension-related functionality is in desktop/source/deployment/), > TheExtensionManager::installPackage is the starting point for installing an > extension from within that dialog. > > However, what we probably want is something more elaborate than simply > urging the user to restart LO upon every extension installation (as well as > extension update, deinstallation, enabling, disabling?). > > The referenced bug quotes some issues (missing menu update for already > open documents) that can probably be addressed without needing a restart. > There might be other issues that cannot be resolved without a restart, but > then we should only urge the user to restart LO if the given extension > really triggers that issue. > > > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Tinderbox failure, MacOSX-x86_64@49-TDF, MASTER, last success: 2015-11-05 16:21:34
Hi guys, > /Users/cloph/source/libo-core/test/source/bootstrapfixture.cxx:222: > Assertion Test name: ScExportTest::testSheetRunParagraphProperty > equality assertion failed > - Expected: 0 > - Actual : 3 > - validation error in OOXML export: Errors: 3 I'm sorry about breaking Tinderbox by writing code that produces invalid OOXML, I'm not building w/ validation locally I plan to fix it tomorrow morning, but can't do much until then. Feel free to revert if you feel spammed by failure mails -- Katarina Behrens Softwareentwicklerin LibreOffice ––– CIB software GmbH Geschäftsstelle Hamburg Flachsland 10 22083 Hamburg ––– T +49 (40) / 28 48 42 -235 F +49 (40) / 28 48 42 -100 katarina.behr...@cib.de www.cib.de ––– Sitz: München Registergericht München, HRB 123286 Geschäftsführer: Dipl.-Ing. Ulrich Brandner ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/comphelper sc/source
include/comphelper/stl_types.hxx | 23 +++
sc/source/core/tool/dbdata.cxx | 24
2 files changed, 27 insertions(+), 20 deletions(-)
New commits:
commit eaf640d282dd2bd8f647a510e401323da506a810
Author: Michael Stahl
Date: Fri Nov 6 11:48:35 2015 +0100
comphelper: add a generic implementation of std container operator==
... that contain std::unique_ptr. With C++11 variadic templates this
apparently works for both std::vector and std::set; associative
containers like std::map have different iterators so need a different
implementation.
Change-Id: I6872445b007875c310d08fa7a8d7311075880b1d
Reviewed-on: https://gerrit.libreoffice.org/19818
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 84ea999..f154937 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -100,6 +100,29 @@ template struct UniquePtrValueLess
}
};
+/// by-value implementation of std::foo>::operator==
+template class C, typename T, typename... Etc>
+bool ContainerUniquePtrEquals(
+C, Etc...> const& lhs,
+C, Etc...> const& rhs)
+{
+if (lhs.size() != rhs.size())
+{
+return false;
+}
+for (auto iter1 = lhs.begin(), iter2 = rhs.begin();
+ iter1 != lhs.end();
+ ++iter1, ++iter2)
+{
+if (!(**iter1 == **iter2))
+{
+return false;
+}
+}
+return true;
+};
+
+
/** STL-compliant structure for comparing Reference< >
instances
*/
template < class IAFCE >
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index cdf0ff0..5f145fa 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -34,6 +34,8 @@
#include "dociter.hxx"
#include "brdcst.hxx"
+#include
+
#include
#include
@@ -1169,18 +1171,7 @@ size_t ScDBCollection::NamedDBs::size() const
bool ScDBCollection::NamedDBs::operator== (const NamedDBs& r) const
{
-if (m_DBs.size() != r.m_DBs.size())
-{
-return false;
-}
-for (auto iter1 = m_DBs.begin(), iter2 = r.m_DBs.begin(); iter1 !=
m_DBs.end(); ++iter1, ++iter2)
-{
-if (**iter1 != **iter2)
-{
-return false;
-}
-}
-return true;
+return ::comphelper::ContainerUniquePtrEquals(m_DBs, r.m_DBs);
}
ScDBCollection::AnonDBs::iterator ScDBCollection::AnonDBs::begin()
@@ -1257,14 +1248,7 @@ bool ScDBCollection::AnonDBs::has( const ScDBData* p )
const
bool ScDBCollection::AnonDBs::operator== (const AnonDBs& r) const
{
-if (m_DBs.size() != r.m_DBs.size())
-return false;
-for (auto iter1 = begin(), iter2 = r.begin(); iter1 != end(); ++iter1,
++iter2)
-{
-if (**iter1 != **iter2)
-return false;
-}
-return true;
+return ::comphelper::ContainerUniquePtrEquals(m_DBs, r.m_DBs);
}
ScDBCollection::AnonDBs::AnonDBs()
___
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/filter/graphicfilter.cxx | 84 ++--
1 file changed, 42 insertions(+), 42 deletions(-)
New commits:
commit 5c3ccc9e4a749a6358d29d20533ff11fa48aa602
Author: Michael Stahl
Date: Fri Nov 6 13:42:31 2015 +0100
vcl: [loplugin:stringconstant]
Change-Id: I973b6b68a225cc872aff2c0fe0e8a2e9108b3140
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index 2ed81cd..3dad87b 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -980,50 +980,50 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction()
if( !mpfnImport )
{
#ifndef DISABLE_DYNLOADING
-if (maFormatName.equalsAscii("icd"))
+if (maFormatName == "icd")
mpfnImport =
reinterpret_cast(maLibrary.getFunctionSymbol("icdGraphicImport"));
-else if (maFormatName.equalsAscii("idx"))
+else if (maFormatName == "idx")
mpfnImport =
reinterpret_cast(maLibrary.getFunctionSymbol("idxGraphicImport"));
-else if (maFormatName.equalsAscii("ime"))
+else if (maFormatName == "ime")
mpfnImport =
reinterpret_cast(maLibrary.getFunctionSymbol("imeGraphicImport"));
-else if (maFormatName.equalsAscii("ipb"))
+else if (maFormatName == "ipb")
mpfnImport =
reinterpret_cast(maLibrary.getFunctionSymbol("ipbGraphicImport"));
-else if (maFormatName.equalsAscii("ipd"))
+else if (maFormatName == "ipd")
mpfnImport =
reinterpret_cast(maLibrary.getFunctionSymbol("ipdGraphicImport"));
-else if (maFormatName.equalsAscii("ips"))
+else if (maFormatName == "ips")
mpfnImport =
reinterpret_cast(maLibrary.getFunctionSymbol("ipsGraphicImport"));
-else if (maFormatName.equalsAscii("ipt"))
+else if (maFormatName == "ipt")
mpfnImport =
reinterpret_cast(maLibrary.getFunctionSymbol("iptGraphicImport"));
-else if (maFormatName.equalsAscii("ipx"))
+else if (maFormatName == "ipx")
mpfnImport =
reinterpret_cast(maLibrary.getFunctionSymbol("ipxGraphicImport"));
-else if (maFormatName.equalsAscii("ira"))
+else if (maFormatName == "ira")
mpfnImport =
reinterpret_cast(maLibrary.getFunctionSymbol("iraGraphicImport"));
-else if (maFormatName.equalsAscii("itg"))
+else if (maFormatName == "itg")
mpfnImport =
reinterpret_cast(maLibrary.getFunctionSymbol("itgGraphicImport"));
-else if (maFormatName.equalsAscii("iti"))
+else if (maFormatName == "iti")
mpfnImport =
reinterpret_cast(maLibrary.getFunctionSymbol("itiGraphicImport"));
#else
-if( maFiltername.equalsAscii( "icd" ) )
+if (maFiltername == "icd")
mpfnImport = icdGraphicImport;
-else if( maFiltername.equalsAscii( "idx" ) )
+else if (maFiltername == "idx")
mpfnImport = idxGraphicImport;
-else if( maFiltername.equalsAscii( "ime" ) )
+else if (maFiltername == "ime")
mpfnImport = imeGraphicImport;
-else if( maFiltername.equalsAscii( "ipb" ) )
+else if (maFiltername == "ipb")
mpfnImport = ipbGraphicImport;
-else if( maFiltername.equalsAscii( "ipd" ) )
+else if (maFiltername == "ipd")
mpfnImport = ipdGraphicImport;
-else if( maFiltername.equalsAscii( "ips" ) )
+else if (maFiltername == "ips")
mpfnImport = ipsGraphicImport;
-else if( maFiltername.equalsAscii( "ipt" ) )
+else if (maFiltername == "ipt")
mpfnImport = iptGraphicImport;
-else if( maFiltername.equalsAscii( "ipx" ) )
+else if (maFiltername == "ipx")
mpfnImport = ipxGraphicImport;
-else if( maFiltername.equalsAscii( "ira" ) )
+else if (maFiltername == "ira")
mpfnImport = iraGraphicImport;
-else if( maFiltername.equalsAscii( "itg" ) )
+else if (maFiltername == "itg")
mpfnImport = itgGraphicImport;
-else if( maFiltername.equalsAscii( "iti" ) )
+else if (maFiltername == "iti")
mpfnImport = itiGraphicImport;
#endif
}
@@ -2119,48 +2119,48 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic&
rGraphic, const OUString
PFilterCall pFunc = NULL;
OUString tmpFilterName = aExternalFilterName;
-if (tmpFilterName.equalsAscii("egi"))
+if (tmpFilterName == "egi")
pFunc =
reinterpret_cast(aLibrary.getFunctionSymbol("egiGraphicExport"));
-else if (tmpFilterName.equalsAscii("eme"))
+else if (tmpFilterName == "eme")
pFunc =
reinterpret_cast(aLibrary.getFunctionSymbol("emeGraphicExport"));
-else if (tmpFilterName.equalsAscii("epb"))
+else if (tmpFilterName =
[Libreoffice-commits] core.git: 3 commits - libreofficekit/qa sw/source
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |2 +-
sw/source/uibase/docvw/PostItMgr.cxx| 11 +--
sw/source/uibase/docvw/SidebarTxtControl.cxx| 19 +++
sw/source/uibase/docvw/SidebarTxtControl.hxx|1 -
sw/source/uibase/docvw/SidebarWin.cxx | 19 +++
5 files changed, 28 insertions(+), 24 deletions(-)
New commits:
commit 8fc6aafcb4769271bc7b208e9b9b430b875b6104
Author: Miklos Vajna
Date: Fri Nov 6 13:30:54 2015 +0100
sw lok annotations: disable the scrollbar for now
Change-Id: I7493eaab55c23c79ca0878c34a97dfb4af857260
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx
b/sw/source/uibase/docvw/SidebarWin.cxx
index 064a735..112a12d 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -246,6 +246,12 @@ void SwSidebarWin::PaintTile(vcl::RenderContext&
rRenderContext, const Rectangle
for (sal_uInt16 i = 0; i < GetChildCount(); ++i)
{
vcl::Window* pChild = GetChild(i);
+
+// This would at the moment just draw a gray rectangle at the top right
+// corner, need to sort out later.
+if (pChild == mpVScrollbar.get())
+continue;
+
rRenderContext.Push(PushFlags::MAPMODE);
Point aOffset(PixelToLogic(pChild->GetPosPixel()));
MapMode aMapMode(rRenderContext.GetMapMode());
commit 2dba3c1b403e10f5725723193127c3e0fffd3d64
Author: Miklos Vajna
Date: Fri Nov 6 10:58:18 2015 +0100
gtktiledviewer: larger default window size
So comments in an otherwise empty Writer doc are immediately visible.
Change-Id: I189c4eff6e83274f609ce016f9610c307c47ff16
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index a0bf1f8..903dc9b 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -903,7 +903,7 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
{
GtkWidget *pWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(pWindow), "LibreOfficeKit GTK Tiled
Viewer");
-gtk_window_set_default_size(GTK_WINDOW(pWindow), 1024, 768);
+gtk_window_set_default_size(GTK_WINDOW(pWindow), 1280, 720);
g_signal_connect(pWindow, "destroy", G_CALLBACK(gtk_main_quit), 0);
rWindow.m_pVBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
commit 177e375d2e63f1c3db9f5ab41e4281af740625fb
Author: Miklos Vajna
Date: Fri Nov 6 10:29:38 2015 +0100
sw lok annotations: paint all child window
And use map modes to get the painting to the correct position instead of
manually adjusting each and every Paint() method.
Change-Id: I66798321b8bbf2c7968d6ac1edebb1f8df60bce8
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx
b/sw/source/uibase/docvw/PostItMgr.cxx
index d2d0214..5d0408a 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -855,10 +855,17 @@ void SwPostItMgr::PaintTile(OutputDevice& rRenderContext,
const Rectangle& /*rRe
if (!pPostIt)
continue;
-Point aPoint(mpEditWin->PixelToLogic(pPostIt->GetPosPixel()));
+rRenderContext.Push(PushFlags::MAPMODE);
+Point aOffset(mpEditWin->PixelToLogic(pPostIt->GetPosPixel()));
+MapMode aMapMode(rRenderContext.GetMapMode());
+aMapMode.SetOrigin(aMapMode.GetOrigin() + aOffset);
+rRenderContext.SetMapMode(aMapMode);
Size aSize(pPostIt->PixelToLogic(pPostIt->GetSizePixel()));
-Rectangle aRectangle(aPoint, aSize);
+Rectangle aRectangle(Point(0, 0), aSize);
+
pPostIt->PaintTile(rRenderContext, aRectangle);
+
+rRenderContext.Pop();
}
}
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx
b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index e8d1d28..d864b40 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -53,7 +53,6 @@
#include
#include
#include
-#include
namespace sw { namespace sidebarwindows {
@@ -152,37 +151,25 @@ void SidebarTextControl::Draw(OutputDevice* pDev, const
Point& rPt, const Size&
}
}
-void SidebarTextControl::PaintTile(vcl::RenderContext& rRenderContext, const
Rectangle& rRect)
-{
-Paint(rRenderContext, rRect);
-}
-
void SidebarTextControl::Paint(vcl::RenderContext& rRenderContext, const
Rectangle& rRect)
{
-Point aPoint(0, 0);
-if (comphelper::LibreOfficeKit::isActive())
-aPoint = rRect.TopLeft();
-
if (!rRenderContext.GetSettings().GetStyleSettings().GetHighContrastMode())
{
if (mrSidebarWin.IsMouseOverSidebarWin() || HasFocus())
{
-rRenderContext.DrawGradient(Rectangle(aPoint,
rRenderContext.PixelToLogic(GetSizePixel())),
+rRenderContext.DrawGradient(Rectangle(Point(0,0),
rRenderContext.PixelToLogic
[Libreoffice-commits] core.git: 36 commits - chart2/source codemaker/source connectivity/source desktop/source extensions/source filter/source forms/source helpcompiler/inc helpcompiler/source include
chart2/source/view/axes/VCoordinateSystem.cxx|2
chart2/source/view/inc/PlotterBase.hxx |2
chart2/source/view/inc/VCoordinateSystem.hxx |2
chart2/source/view/main/PlotterBase.cxx |2
codemaker/source/cppumaker/cppumaker.cxx |6
codemaker/source/javamaker/javamaker.cxx |4
connectivity/source/drivers/calc/CConnection.cxx |2
connectivity/source/drivers/file/FConnection.cxx |3
connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx |2
connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx |2
connectivity/source/inc/calc/CConnection.hxx |3
connectivity/source/inc/file/FConnection.hxx |3
desktop/source/app/app.cxx | 26
extensions/source/plugin/unx/npwrap.cxx | 306 +--
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx |2
filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx |2
filter/source/xsltdialog/xmlfilterjar.cxx|2
filter/source/xsltdialog/xmlfilterjar.hxx|2
forms/source/component/clickableimage.cxx|2
forms/source/component/clickableimage.hxx|2
helpcompiler/inc/HelpCompiler.hxx|2
helpcompiler/source/HelpCompiler.cxx |2
helpcompiler/source/HelpIndexer_main.cxx | 105 ++-
include/svx/unoshape.hxx |4
include/toolkit/controls/controlmodelcontainerbase.hxx |2
include/toolkit/controls/dialogcontrol.hxx |2
l10ntools/source/helpex.cxx | 126 ++--
l10ntools/source/localize.cxx| 34 -
l10ntools/source/pocheck.cxx | 38 -
l10ntools/source/uimerge.cxx | 35 -
qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java |2
qadevOOo/tests/java/ifc/container/_XNameContainer.java |5
qadevOOo/tests/java/ifc/document/_XEventsSupplier.java |2
qadevOOo/tests/java/ifc/document/_XLinkTargetSupplier.java |4
qadevOOo/tests/java/mod/_sw/SwXTextDocument.java | 20
registry/tools/regcompare.cxx| 174 +++---
registry/tools/regmerge.cxx | 111 ++-
registry/tools/regview.cxx | 90 +--
sc/source/ui/vba/vbaapplication.cxx |2
sc/source/ui/vba/vbaapplication.hxx |2
svx/source/gengal/gengal.cxx |5
svx/source/unodraw/unoshap2.cxx |4
svx/source/unodraw/unoshap4.cxx |3
toolkit/source/controls/controlmodelcontainerbase.cxx|2
toolkit/source/controls/dialogcontrol.cxx|2
ucb/source/ucp/file/bc.cxx |5
ucb/source/ucp/file/bc.hxx |2
unodevtools/source/skeletonmaker/skeletonmaker.cxx |3
unoidl/source/unoidl-check.cxx |3
unoidl/source/unoidl-read.cxx|3
unoidl/source/unoidl-write.cxx |6
vbahelper/source/vbahelper/vbadocumentsbase.cxx |2
52 files changed, 628 insertions(+), 551 deletions(-)
New commits:
commit cc68b830edb0ce15b6c1695d87e76d8968632744
Author: Caolán McNamara
Date: Fri Nov 6 11:12:44 2015 +
afl-event-testing: afl-1.93b has a new persistent pattern
some testing shows that I can reliably hit at least 1000 pseudo-restarts
without failures, so bump from 100 to 1000
Change-Id: Ib72c74068793ea1090a7b99a566372dc943641e6
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 4dbe67a..aa1a776 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1274,31 +1274,21 @@ struct ExecuteGlobals
static ExecuteGlobals* pExecGlobals = NULL;
-#define PERSIST_MAX 100
-unsigned int persist_cnt;
//This just calls Execute() for all normal uses of LibreOffice, but for
-//ui-testing if AFL_PERSISTENT is set then on exit it will pseudo-restart (up
-//to PERSIST_MAX times)
+//ui-testing if built with afl-clang-fast++ then on exit it will pseudo-restart
+//(up to 100 times)
void Desktop::DoExecute()
{
-try_again:
+#if !defined(__AFL_HAVE_MANUAL_CONTROL)
+Execute();
+#else
+while (__AFL_LOOP(1000))
{
Execute();
-/* To signal successful completion of a run, we need to deliver
- SIGSTOP to our own process, then loop to the very
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 81b2e040f44c657bc653458f4807d790f19a855a
Author: László Németh
Date: Fri Nov 6 13:14:36 2015 +0100
fix Writer/Impress work
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 3cdf098..203aa9a 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -124,7 +124,7 @@ L.TileLayer = L.GridLayer.extend({
// cell).
map.on('statusindicator',
function (e) {
-if (e.statusType === 'alltilesloaded') {
+if (e.statusType === 'alltilesloaded' && this._docType
=== 'spreadsheet') {
this._onCellCursorShift(true);
}
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/rangenam.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7ba3301b8fcefb80f657286d4439c06c339743e0 Author: Michael Stahl Date: Fri Nov 6 13:13:07 2015 +0100 sc: [loplugin:redundantcast] Change-Id: I12a823be0145a680af8fd5c95b55e461f207d2fc diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index 0b0f50b..40cadca 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -694,7 +694,7 @@ ScRangeName::ScRangeName(const ScRangeName& r) OSL_FAIL( "ScRangeName copy-ctor: maIndexToData size doesn't fit"); maIndexToData.resize(nPos+1, NULL); } -maIndexToData[nPos] = const_cast(itr.second.get()); +maIndexToData[nPos] = itr.second.get(); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/CppunitTest_filter_dxf_test.mk filter/CppunitTest_filter_eps_test.mk filter/CppunitTest_filter_met_test.mk filter/CppunitTest_filter_pcd_test.mk filter/CppunitTe
Repository.mk | 24 --- filter/CppunitTest_filter_dxf_test.mk |2 filter/CppunitTest_filter_eps_test.mk |2 filter/CppunitTest_filter_met_test.mk |2 filter/CppunitTest_filter_pcd_test.mk |2 filter/CppunitTest_filter_pcx_test.mk |2 filter/CppunitTest_filter_pict_test.mk |7 +- filter/CppunitTest_filter_ppm_test.mk |2 filter/CppunitTest_filter_psd_test.mk |2 filter/CppunitTest_filter_ras_test.mk |2 filter/CppunitTest_filter_tga_test.mk |2 filter/CppunitTest_filter_tiff_test.mk |2 filter/Library_egi.mk | 40 filter/Library_eme.mk | 39 --- filter/Library_epb.mk | 39 --- filter/Library_epg.mk | 39 --- filter/Library_epp.mk | 39 --- filter/Library_eps.mk | 41 filter/Library_ept.mk | 40 filter/Library_era.mk | 39 --- filter/Library_eti.mk | 39 --- filter/Library_exp.mk | 39 --- filter/Library_gie.mk | 75 ++ filter/Library_icd.mk | 38 --- filter/Library_idx.mk | 44 - filter/Library_ime.mk | 37 --- filter/Library_ipb.mk | 37 --- filter/Library_ipd.mk | 37 --- filter/Library_ips.mk | 38 --- filter/Library_ipt.mk | 39 --- filter/Library_ipx.mk | 37 --- filter/Library_ira.mk | 37 --- filter/Library_itg.mk | 37 --- filter/Library_iti.mk | 39 --- filter/Module_filter.mk | 25 --- filter/qa/cppunit/filters-dxf-test.cxx |4 - filter/qa/cppunit/filters-eps-test.cxx |4 - filter/qa/cppunit/filters-met-test.cxx |4 - filter/qa/cppunit/filters-pcd-test.cxx |4 - filter/qa/cppunit/filters-pcx-test.cxx |4 - filter/qa/cppunit/filters-pict-test.cxx |4 - filter/qa/cppunit/filters-ppm-test.cxx |4 - filter/qa/cppunit/filters-psd-test.cxx |4 - filter/qa/cppunit/filters-ras-test.cxx |4 - filter/qa/cppunit/filters-tga-test.cxx |4 - filter/qa/cppunit/filters-tiff-test.cxx |4 - filter/source/graphicfilter/egif/egif.cxx | 10 --- filter/source/graphicfilter/eos2met/eos2met.cxx |8 -- filter/source/graphicfilter/epbm/epbm.cxx |8 -- filter/source/graphicfilter/epgm/epgm.cxx |9 -- filter/source/graphicfilter/epict/epict.cxx |9 -- filter/source/graphicfilter/eppm/eppm.cxx |9 -- filter/source/graphicfilter/eps/eps.cxx |9 -- filter/source/graphicfilter/eras/eras.cxx |9 -- filter/source/graphicfilter/etiff/etiff.cxx |9 -- filter/source/graphicfilter/expm/expm.cxx | 10 --- filter/source/graphicfilter/idxf/idxf.cxx |9 -- filter/source/graphicfilter/ieps/ieps.cxx |8 -- filter/source/graphicfilter/ios2met/ios2met.cxx |9 -- filter/source/graphicfilter/ipbm/ipbm.cxx |9 -- filter/source/graphicfilter/ipcd/ipcd.cxx |9 -- filter/source/graphicfilter/ipcx/ipcx.cxx |9 -- filter/source/graphicfilter/ipict/ipict.cxx |9 -- filter/source/graphicfilter/ipsd/ipsd.cxx |9 -- filter/source/graphicfilter/iras/iras.cxx |9 -- filter/source/graphicfilter/itga/itga.cxx |9 -- filter/source/graphicfilter/itiff/itiff.cxx |9 -- vcl/source/filter/FilterConfigCache.cxx | 23 +- vcl/source/filter/FilterConfigCache.hxx |3 vcl/source/filter/graphicfilter.cxx | 80 ++-- 70 files changed, 221 insertions(+), 1082 deletions(-) New commits: commit 7f533e6cdac4557970f07c1d407999e3e8c44f2f Author: Oliver Specht Date: Wed Nov 4 13:58:41 2015 +0100 merged graphic import/export into a single library instead of egi, eme, epb, epg, epp, eps, ept, era, eti, exp, icd, idx, ime, ipb, ipd, ips, ipt, ipx, ira, itg, iti, there is now one graphic import export lib (gie) Change-Id: I20c0dd94e5857bb6e2e8cc8ac175ff500c6bbdfc Reviewed-on: https://gerrit.libreoffice.org/19756 Tested-by: Jenkins Reviewed-by: Oliver Specht diff --git a/Repository.mk b/Repository.mk index 4399aa5..5e
[Libreoffice-commits] core.git: 17 commits - compilerplugins/clang configmgr/qa cui/source desktop/source framework/inc framework/source oox/source sal/qa sc/qa scripting/source sc/source sd/source sf
compilerplugins/clang/stringconstant.cxx | 227 ++---
configmgr/qa/unit/test.cxx | 24 +-
cui/source/options/optsave.cxx |2
desktop/source/deployment/gui/dp_gui_theextmgr.cxx |2
framework/inc/properties.h | 11 -
framework/source/fwe/helper/titlehelper.cxx|2
framework/source/helper/titlebarupdate.cxx |4
framework/source/layoutmanager/layoutmanager.cxx | 10
framework/source/loadenv/loadenv.cxx |4
oox/source/export/drawingml.cxx|6
oox/source/export/shapes.cxx |4
sal/qa/rtl/strings/test_oustring_compare.cxx |6
sc/qa/unit/ucalc_formula.cxx |6
sc/source/filter/html/htmlexp.cxx |2
scripting/source/basprov/basmethnode.cxx |2
scripting/source/basprov/basscript.cxx |2
scripting/source/vbaevents/eventhelper.cxx |2
sd/source/filter/eppt/pptx-epptooxml.cxx |2
sfx2/source/dialog/basedlgs.cxx|2
sfx2/source/dialog/filedlghelper.cxx |2
sfx2/source/dialog/splitwin.cxx|2
sfx2/source/dialog/tabdlg.cxx |2
smoketest/smoketest.cxx|2
svx/source/dialog/imapdlg.cxx | 14 -
sw/source/filter/ww8/wrtww8.cxx|2
toolkit/source/awt/animatedimagespeer.cxx |2
toolkit/source/controls/dialogcontrol.cxx |6
toolkit/source/controls/geometrycontrolmodel.cxx | 18 -
unotest/source/cpp/officeconnection.cxx|4
unotools/source/config/dynamicmenuoptions.cxx |6
30 files changed, 232 insertions(+), 148 deletions(-)
New commits:
commit 938f670928683ae3251119c896a894d7204b24af
Author: Stephan Bergmann
Date: Fri Nov 6 12:33:41 2015 +0100
loplugin:stringconstant: elide explicit ctor usage
Change-Id: I962db9583ef9cada42a61b6a95eeea818fceeead
diff --git a/compilerplugins/clang/stringconstant.cxx
b/compilerplugins/clang/stringconstant.cxx
index 79d7c61..8fbed25 100644
--- a/compilerplugins/clang/stringconstant.cxx
+++ b/compilerplugins/clang/stringconstant.cxx
@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include
#include
#include
#include
@@ -48,6 +49,36 @@ SourceLocation getMemberLocation(Expr const * expr) {
return e2 == nullptr ? expr->getExprLoc()/*TODO*/ : e2->getMemberLoc();
}
+bool isLhsOfAssignment(FunctionDecl const * decl, unsigned parameter) {
+if (parameter != 0) {
+return false;
+}
+auto oo = decl->getOverloadedOperator();
+return oo == OO_Equal
+|| (oo >= OO_PlusEqual && oo <= OO_GreaterGreaterEqual);
+}
+
+bool hasOverloads(FunctionDecl const * decl, unsigned arguments) {
+int n = 0;
+auto ctx = decl->getDeclContext();
+if (ctx->getDeclKind() == Decl::LinkageSpec) {
+ctx = ctx->getParent();
+}
+auto res = ctx->lookup(decl->getDeclName());
+for (auto d = compat::begin(res); d != compat::end(res); ++d) {
+FunctionDecl const * f = dyn_cast(*d);
+if (f != nullptr && f->getMinRequiredArguments() <= arguments
+&& f->getNumParams() >= arguments)
+{
+++n;
+if (n == 2) {
+return true;
+}
+}
+}
+return false;
+}
+
class StringConstant:
public RecursiveASTVisitor, public loplugin::RewritePlugin
{
@@ -104,9 +135,8 @@ private:
TreatEmpty treatEmpty);
void handleOUStringCtor(
-CallExpr const * expr, unsigned arg, std::string const & qname);
-void handleOUStringCtor2(
-CallExpr const * expr, unsigned arg, std::string const & qname);
+CallExpr const * expr, unsigned arg, std::string const & qname,
+bool explicitFunctionalCastNotation);
std::stack calls_;
};
@@ -195,6 +225,35 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) {
return true;
}
std::string qname(fdecl->getQualifiedNameAsString());
+for (unsigned i = 0; i != fdecl->getNumParams(); ++i) {
+auto t = fdecl->getParamDecl(i)->getType();
+if (t->isLValueReferenceType()
+&& t->getAs() == nullptr)
+{
+t = t->getAs()->getPointeeType();
+if (t.isConstQualified() && !t.isVolatileQualified()
+&& t->isClassType()
+&& t->getAs() == nullptr)
+{
+auto td = t->getAsTagDecl();
+auto id = td->getIdentifier();
+if (id != nullptr && id->isStr("OUString")) {
+auto nd = dyn_cast(td->getParent());
+if (nd != nullptr) {
+id = nd->getIdentifier();
+if (id != nullptr && i
Re: LibreOffice Bug
On 11/05/2015 10:39 PM, İrem Şendur wrote: Thank you for telling the directory's names. I thought adding dialog because in this bug's page in Bugzilla, Daniel Naber who reported this bug and Urmas said there should be dialog asking for restart on comments. So now should I focus on just the menu updating and not restart? And is menu updating issue's solution related with desktop/source/deployment directory too? Yes, my (personal) opinion is that it would be more worthwhile to work on live updating of menus than on a blunt "please restart" dialog. However, the former is likely a far more difficult task than the latter. Extensions bring along menu and toolbar elements via configuration .xcu files that specify changes to the configuration's /org.openoffice.Office.Addons/AddonUI tree. Code can listen on changes to this part of the configuration, and then react to them. The code reading this configuration data when a newly opened document window's menu is created is AddonsOptions_Impl::ReadOfficeMenuBarSet in framework/source/fwe/classes/addonsoptions.cxx. However, that code does not currently listen on changes to the configuration data. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loolwsd/Util.cpp
loolwsd/Util.cpp | 21 ++---
1 file changed, 18 insertions(+), 3 deletions(-)
New commits:
commit fbb184d256397f665f01e3f6d86538e428c532dc
Author: Jan Holesovsky
Date: Fri Nov 6 11:46:31 2015 +0100
loolwsd: More readable timestamps, 100ns resolution.
Actually POCO doc claims 100ns resolution, but unfortunately it seems it is
ms
only; will improve later in case it is necessary.
diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index b6e0b64..cac9c33 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -9,6 +9,8 @@
#include
#include
+#include
+#include
#include
#include
@@ -48,12 +50,25 @@ extern "C"
namespace Util
{
+static const Poco::Int64 epochStart = Poco::Timestamp().utcTime();
std::string logPrefix()
{
-Poco::Timestamp timestamp;
-Poco::Int64 now = timestamp.epochMicroseconds();
-return std::to_string(Poco::Process::id()) + "," +
(Poco::Thread::current() ? std::to_string(Poco::Thread::current()->id()) : "0")
+ "," + std::to_string(now / 1000) + ",";
+Poco::Int64 nanosec100 = Poco::Timestamp().utcTime() - epochStart;
+
+const Poco::Int64 n100 = 1000;
+Poco::Int64 hours = nanosec100 / (n100*60*60);
+nanosec100 %= (n100*60*60);
+Poco::Int64 minutes = nanosec100 / (n100*60);
+nanosec100 %= (n100*60);
+Poco::Int64 seconds = nanosec100 / (n100);
+nanosec100 %= (n100);
+
+std::ostringstream stream;
+stream << Poco::Process::id() << "," << std::setw(2) <<
std::setfill('0') << (Poco::Thread::current() ? Poco::Thread::current()->id() :
0) << "," <<
+std::setw(2) << hours << ":" << std::setw(2) << minutes << ":" <<
std::setw(2) << seconds << "." << std::setw(7) << nanosec100 << ",";
+
+return stream.str();
}
bool windowingAvailable()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source
sc/inc/rangenam.hxx|8 -
sc/source/core/tool/dbdata.cxx | 13 ++-
sc/source/core/tool/rangenam.cxx | 119 +
sc/source/core/tool/tokenstringcontext.cxx |5 -
4 files changed, 89 insertions(+), 56 deletions(-)
New commits:
commit ca551694bdce36dfaa795ffa8910ec86db979c56
Author: Michael Stahl
Date: Thu Nov 5 23:27:17 2015 +0100
sc: actually std::set::operator== does not use Compare parameter
... but operator== of the Key type, so this no longer compares the
pointed-to objects.
(regression from b5ae7dbc871df57686a603dfa99e8179a0e3a4b8)
Change-Id: I5b0caa9abfa47362383776f7c1d44b73910f15ee
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 2552d40..cdf0ff0 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -1169,7 +1169,18 @@ size_t ScDBCollection::NamedDBs::size() const
bool ScDBCollection::NamedDBs::operator== (const NamedDBs& r) const
{
-return m_DBs == r.m_DBs;
+if (m_DBs.size() != r.m_DBs.size())
+{
+return false;
+}
+for (auto iter1 = m_DBs.begin(), iter2 = r.m_DBs.begin(); iter1 !=
m_DBs.end(); ++iter1, ++iter2)
+{
+if (**iter1 != **iter2)
+{
+return false;
+}
+}
+return true;
}
ScDBCollection::AnonDBs::iterator ScDBCollection::AnonDBs::begin()
commit df3ed9c8432359f6d539e2e4a1819dc68d885fdf
Author: Michael Stahl
Date: Thu Nov 5 22:59:20 2015 +0100
sc: replace boost::ptr_map with std::map
Change-Id: Id4f24d8aa3db4e569f3eafa6d4ab32b0a95bf3c9
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 812af42..426329a 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -26,9 +26,9 @@
#include "scdllapi.h"
#include "calcmacros.hxx"
+#include
#include
#include
-#include
class ScDocument;
class ScTokenArray;
@@ -170,8 +170,8 @@ class ScRangeName
{
private:
typedef std::vector IndexDataType;
-typedef ::boost::ptr_map DataType;
-DataType maData;
+typedef ::std::map> DataType;
+DataType m_Data;
IndexDataType maIndexToData;
public:
@@ -208,7 +208,7 @@ public:
bool empty() const;
/** Insert object into set.
-@ATTENTION: The underlying ::boost::ptr_map_adapter::insert(p) takes
+@ATTENTION: The underlying ::std::map::insert(p) takes
ownership of p and if it can't insert it deletes the object! So, if
this insert here returns false the object where p pointed to is gone!
*/
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index faf482d..0b0f50b 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include "token.hxx"
#include "tokenarray.hxx"
@@ -667,7 +668,7 @@ class MatchByRange : public unary_function
const ScRange& mrRange;
public:
explicit MatchByRange(const ScRange& rRange) : mrRange(rRange) {}
-bool operator() ( boost::ptr_container_detail::ref_pair const& r) const
+bool operator() (std::pair>
const& r) const
{
return r.second->IsRangeAtBlock(mrRange);
}
@@ -677,42 +678,43 @@ public:
ScRangeName::ScRangeName() {}
-ScRangeName::ScRangeName(const ScRangeName& r) :
-maData(r.maData)
+ScRangeName::ScRangeName(const ScRangeName& r)
{
-// boost::ptr_map clones and deletes, so each collection needs its own
-// index to data.
+for (auto const& it : r.m_Data)
+{
+m_Data.insert(std::make_pair(it.first,
o3tl::make_unique(*it.second)));
+}
+// std::map was cloned, so each collection needs its own index to data.
maIndexToData.resize( r.maIndexToData.size(), NULL);
-DataType::const_iterator itr = maData.begin(), itrEnd = maData.end();
-for (; itr != itrEnd; ++itr)
+for (auto const& itr : m_Data)
{
-size_t nPos = itr->second->GetIndex() - 1;
+size_t nPos = itr.second->GetIndex() - 1;
if (nPos >= maIndexToData.size())
{
OSL_FAIL( "ScRangeName copy-ctor: maIndexToData size doesn't fit");
maIndexToData.resize(nPos+1, NULL);
}
-maIndexToData[nPos] = const_cast(itr->second);
+maIndexToData[nPos] = const_cast(itr.second.get());
}
}
const ScRangeData* ScRangeName::findByRange(const ScRange& rRange) const
{
DataType::const_iterator itr = std::find_if(
-maData.begin(), maData.end(), MatchByRange(rRange));
-return itr == maData.end() ? NULL : itr->second;
+m_Data.begin(), m_Data.end(), MatchByRange(rRange));
+return itr == m_Data.end() ? nullptr : itr->second.get();
}
ScRangeData* ScRangeName::findByUpperName(const OUString& rName)
{
-DataType::iterator itr = maData.find(rName);
-return itr == maData.end() ? NULL : itr->second;
+DataType::iterator itr = m_Data.find(rName);
+
[Libreoffice-commits] core.git: svtools/uiconfig
svtools/uiconfig/ui/GraphicExportOptionsDialog.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 4d9f4af05f78e8c5126e011e89a172026021691a Author: Yousuf Philips Date: Thu Nov 5 22:25:39 2015 +0400 Add title to image export options dialog Change-Id: I79e6722f2cfa8aabe3b3cacefe97d34063965d5d Reviewed-on: https://gerrit.libreoffice.org/19812 Tested-by: Jenkins Reviewed-by: Katarina Behrens diff --git a/svtools/uiconfig/ui/GraphicExportOptionsDialog.ui b/svtools/uiconfig/ui/GraphicExportOptionsDialog.ui index 569e560..85917eb 100644 --- a/svtools/uiconfig/ui/GraphicExportOptionsDialog.ui +++ b/svtools/uiconfig/ui/GraphicExportOptionsDialog.ui @@ -15,6 +15,7 @@ False 6 +Image Options dialog ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes11' - sc/source
sc/source/core/tool/interpr6.cxx | 75 +++
1 file changed, 22 insertions(+), 53 deletions(-)
New commits:
commit 369a3f9cfa6738e8cd02fb41726f536694618ead
Author: László Németh
Date: Fri Nov 6 11:07:02 2015 +0100
Revert "Adapt FuncSum to vectorize better - potentially ..."
This reverts commit 14635e66cd1e948d1c7ff4e90973fc62567cb801.
diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index 50c0768a..694a403 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -203,11 +203,6 @@ double ScInterpreter::GetGammaDist( double fX, double
fAlpha, double fLambda )
namespace {
-// this is unpleasant - but ... we want raw access.
-struct puncture_mdds_encap : public sc::numeric_block {
-const double *getPtr(size_t nOffset) const { return &m_array[nOffset]; }
-};
-
class NumericCellAccumulator
{
double mfSum;
@@ -216,58 +211,32 @@ class NumericCellAccumulator
public:
NumericCellAccumulator() : mfSum(0.0), mnError(0) {}
-void operator() (const sc::CellStoreType::value_type& rNode, size_t
nOffset, size_t nDataSize)
+void operator() (size_t, double fVal)
{
-switch (rNode.type)
-{
-case sc::element_type_numeric:
-{
-const puncture_mdds_encap *pBlock = static_cast(rNode.data);
-const double *p = pBlock->getPtr(nOffset);
-size_t i, nUnrolled = (nDataSize & 0x3) >> 2;
-
-// Try to encourage the compiler/CPU to do something sensible
(?)
-for (i = 0; i < nUnrolled; i+=4)
-{
-mfSum += p[i];
-mfSum += p[i+1];
-mfSum += p[i+2];
-mfSum += p[i+3];
-}
-for (; i < nDataSize; ++i)
-mfSum += p[i];
-break;
-}
+mfSum += fVal;
+}
-case sc::element_type_formula:
-{
-sc::formula_block::const_iterator it =
sc::formula_block::begin(*rNode.data);
-std::advance(it, nOffset);
-sc::formula_block::const_iterator itEnd = it;
-std::advance(itEnd, nDataSize);
-for (; it != itEnd; ++it)
-{
-double fVal = 0.0;
-sal_uInt16 nErr = 0;
-ScFormulaCell& rCell = const_cast(*(*it));
-if (!rCell.GetErrorOrValue(nErr, fVal))
-// The cell has neither error nor value. Perhaps
string result.
-continue;
+void operator() (size_t, const ScFormulaCell* pCell)
+{
+if (mnError)
+// Skip all the rest if we have an error.
+return;
-if (nErr)
-{
-// Cell has error - skip all the rest
-mnError = nErr;
-return;
-}
+double fVal = 0.0;
+sal_uInt16 nErr = 0;
+ScFormulaCell& rCell = const_cast(*pCell);
+if (!rCell.GetErrorOrValue(nErr, fVal))
+// The cell has neither error nor value. Perhaps string result.
+return;
-mfSum += fVal;
-}
-}
-break;
-default:
-;
+if (nErr)
+{
+// Cell has error.
+mnError = nErr;
+return;
}
+
+mfSum += fVal;
}
sal_uInt16 getError() const { return mnError; }
@@ -366,7 +335,7 @@ public:
return;
NumericCellAccumulator aFunc;
-maPos.miCellPos = sc::ParseBlock(maPos.miCellPos,
mpCol->GetCellStore(), aFunc, nRow1, nRow2);
+maPos.miCellPos = sc::ParseFormulaNumeric(maPos.miCellPos,
mpCol->GetCellStore(), nRow1, nRow2, aFunc);
mnError = aFunc.getError();
if (mnError)
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - package/source
package/source/zipapi/ZipFile.cxx | 22 --
1 file changed, 8 insertions(+), 14 deletions(-)
New commits:
commit 7ae36d37b20c4948a3e4c68861816465a148c30a
Author: Jan-Marek Glogowski
Date: Wed Nov 4 10:33:09 2015 +0100
Don't check version field from local ZIP header
Our current Maven based Java toolchain produces JARs, which
have a different "version needed to extract" in the ZIP local
and central directory header.
I had a look at 7zip and unzip and they already ignore the version
but compare other data LO already ignores - sig. The "standard"
document from PKWARE doesn't help.
So just compare the file path and calculate the data offset and
otherwise ignore all (duplicated) information from the local index
and rely on a correct central directory entry. Various programs
produce(d) "broken" ZIP files; even LO at some point (see git log).
Change-Id: I8d63abb0d49a1087c7654f401b62355c147c3118
Reviewed-on: https://gerrit.libreoffice.org/19779
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Reviewed-by: Jan-Marek Glogowski
(cherry picked from commit 912c03445349330f3b82b9f6c66f4c8dc5783bdc)
Reviewed-on: https://gerrit.libreoffice.org/19809
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/package/source/zipapi/ZipFile.cxx
b/package/source/zipapi/ZipFile.cxx
index 71442c5..84774b2 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -639,10 +639,15 @@ bool ZipFile::readLOC( ZipEntry &rEntry )
aGrabber.seek(nPos);
sal_Int32 nTestSig = aGrabber.ReadInt32();
-
if (nTestSig != LOCSIG)
throw ZipIOException("Invalid LOC header (bad signature)" );
-sal_Int16 nVersion = aGrabber.ReadInt16();
+
+// Ignore all (duplicated) information from the local file header.
+// various programs produced "broken" zip files; even LO at some point.
+// Just verify the path and calculate the data offset and otherwise
+// rely on the central directory info.
+
+aGrabber.ReadInt16(); //version
aGrabber.ReadInt16(); //flag
aGrabber.ReadInt16(); //how
aGrabber.ReadInt32(); //time
@@ -682,18 +687,7 @@ bool ZipFile::readLOC( ZipEntry &rEntry )
rEntry.sPath = sLOCPath;
}
-// check basic local file header / entry consistency, just
-// plain ignore bits 1 & 2 of the flag field - they are either
-// purely informative, or even fully undefined (depending on
-// nMethod)
-// Do *not* compare nMethod / nHow, older versions with
-// encrypted streams write mismatching DEFLATE/STORE pairs
-// there.
-// Do *not* compare timestamps, since MSO 2010 can produce documents
-// with timestamp difference in the central directory entry and local
-// file header.
-bBroken = rEntry.nVersion != nVersion
-|| rEntry.nPathLen != nPathLen
+bBroken = rEntry.nPathLen != nPathLen
|| !rEntry.sPath.equals( sLOCPath );
}
catch(...)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc
sc/inc/scmatrix.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit 41d83eb8cd8e9544641182ff19a8c635760e75dc Author: David Tardon Date: Fri Nov 6 10:43:16 2015 +0100 drop unneeded include Change-Id: I0b4492d2db48f015d13be8472bf282b4554a2a4c diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx index affae03..ed3bd59 100644 --- a/sc/inc/scmatrix.hxx +++ b/sc/inc/scmatrix.hxx @@ -33,7 +33,6 @@ #include #include #include -#include #define DEBUG_MATRIX 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xestring.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0430450c3ea08765b1756f6cff8c6ef72a4b01cf Author: Katarina Behrens Date: Fri Nov 6 10:31:27 2015 +0100 Revert "Preserve whitespace also in formatted strings" for now let's see if it will appease the validator This reverts commit 825f8422bb2cce52bd3095a63de14b34b32ae37c. diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index 1a420b2..8c3bbd0 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -401,7 +401,7 @@ static sal_uInt16 lcl_WriteRun( XclExpXmlStream& rStrm, const ScfUInt16Vec& rBuf rWorksheet->endElement( XML_rPr ); } rWorksheet->startElement( XML_t, -FSNS(XML_xml, XML_space), "preserve", FSEND ); +FSEND ); rWorksheet->writeEscaped( XclXmlUtils::ToOUString( rBuffer, nStart, nLength ) ); rWorksheet->endElement( XML_t ); rWorksheet->endElement( XML_r ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - ucb/source
ucb/source/ucp/file/filrset.cxx |3 ++-
ucb/source/ucp/file/filrset.hxx |5 +++--
ucb/source/ucp/ftp/ftpurl.cxx |2 +-
ucb/source/ucp/ftp/ftpurl.hxx |2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 41155a364517fb674c1f76ea66005f27e34e6ef2
Author: Caolán McNamara
Date: Fri Nov 6 09:24:10 2015 +
coverity#1338237 Uncaught exception
Change-Id: I7a7604f250a571708225fa347e80585baaa2f03d
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index d843874..60bbfbb 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -217,7 +217,8 @@ bool SAL_CALL
XResultSet_impl::OneMore(
void )
throw( sdbc::SQLException,
- uno::RuntimeException )
+ uno::RuntimeException,
+ std::exception )
{
if( ! m_nIsOpen )
return false;
diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index 26758a4..7ffcd87 100644
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.hxx
@@ -622,8 +622,9 @@ class XResultSet_impl : public Notifier,
// Methods
bool SAL_CALL OneMore()
-throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException );
+throw( css::sdbc::SQLException,
+ css::uno::RuntimeException,
+ std::exception );
void rowCountChanged();
void isFinalChanged();
commit a04b96e49bbd8c2ca066accb46da6169fa348487
Author: Caolán McNamara
Date: Fri Nov 6 09:23:18 2015 +
coverity#1338236 Uncaught exception
Change-Id: Ia2fc54862dfc0f6367f52fd471d6066d915264b6
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 58c909b..8164ce3 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -387,7 +387,7 @@ namespace ftp {
urlParAscii.getStr());
oslFileHandle FTPURL::open()
-throw(curl_exception)
+throw(curl_exception, std::exception)
{
if(m_aPathSegmentVec.empty())
throw curl_exception(CURLE_FTP_COULDNT_RETR_FILE);
diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx
index 6034abf..1a18ed6 100644
--- a/ucb/source/ucp/ftp/ftpurl.hxx
+++ b/ucb/source/ucp/ftp/ftpurl.hxx
@@ -122,7 +122,7 @@ namespace ftp {
// returns a pointer to an open tempfile,
// sought to the beginning of.
-oslFileHandle open() throw(curl_exception);
+oslFileHandle open() throw(curl_exception, std::exception);
FTPDirentry direntry() const
throw(curl_exception, malformed_exception, std::exception);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - helpcompiler/inc helpcompiler/source i18npool/inc i18npool/source lotuswordpro/source sw/source vcl/source
helpcompiler/inc/HelpLinker.hxx |2 +-
helpcompiler/source/HelpLinker.cxx |2 +-
i18npool/inc/localedata.hxx |2 +-
i18npool/source/localedata/localedata.cxx |2 +-
lotuswordpro/source/filter/LotusWordProImportFilter.cxx |2 +-
lotuswordpro/source/filter/LotusWordProImportFilter.hxx |2 +-
sw/source/core/layout/calcmove.cxx |1 +
vcl/source/filter/sgvtext.cxx |2 +-
8 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 78f042b9ab83ac43e9e341486bb30660a4258a11
Author: Caolán McNamara
Date: Fri Nov 6 09:21:59 2015 +
coverity#1338235 Uncaught exception
Change-Id: I66bd63a75e9d75cb5d87be5e4573aec891994588
diff --git a/helpcompiler/inc/HelpLinker.hxx b/helpcompiler/inc/HelpLinker.hxx
index 17e4fcd..0a13f93 100644
--- a/helpcompiler/inc/HelpLinker.hxx
+++ b/helpcompiler/inc/HelpLinker.hxx
@@ -89,7 +89,7 @@ private:
bool m_bUseLangRoot;
bool m_bCreateIndex;
void initIndexerPreProcessor();
-void link() throw(HelpProcessingException,
BasicCodeTagger::TaggerException);
+void link() throw(HelpProcessingException,
BasicCodeTagger::TaggerException, std::exception);
static void addBookmark( FILE* pFile_DBHelp, std::string thishid,
const std::string& fileB, const std::string& anchorB,
const std::string& jarfileB, const std::string& titleB );
diff --git a/helpcompiler/source/HelpLinker.cxx
b/helpcompiler/source/HelpLinker.cxx
index 0218028..6c40d14 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -279,7 +279,7 @@ void HelpLinker::initIndexerPreProcessor()
/**
*
*/
-void HelpLinker::link() throw(HelpProcessingException,
BasicCodeTagger::TaggerException)
+void HelpLinker::link() throw(HelpProcessingException,
BasicCodeTagger::TaggerException, std::exception)
{
if( bExtensionMode )
commit f24b5132ebca9f1103de8cfc022d184ac59eb48e
Author: Caolán McNamara
Date: Fri Nov 6 09:20:56 2015 +
coverity#1338234 Uncaught exception
Change-Id: Ice269b722e219ae7b51aa6ea11dea93cfd31f413
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index b45ece5..a0e9c2b 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -128,7 +128,7 @@ private:
css::i18n::Calendar2 ref_cal;
OUString ref_name;
-oslGenericFunction SAL_CALL getFunctionSymbol( const css::lang::Locale&
rLocale, const sal_Char* pFunction ) throw( css::uno::RuntimeException );
+oslGenericFunction SAL_CALL getFunctionSymbol( const css::lang::Locale&
rLocale, const sal_Char* pFunction ) throw( css::uno::RuntimeException,
std::exception );
sal_Unicode ** SAL_CALL getIndexArray(const css::lang::Locale& rLocale,
sal_Int16& indexCount);
sal_Unicode ** SAL_CALL getIndexArrayForAlgorithm(const css::lang::Locale&
rLocale, const OUString& rAlgorithm);
css::uno::Sequence< css::i18n::CalendarItem2 > &
diff --git a/i18npool/source/localedata/localedata.cxx
b/i18npool/source/localedata/localedata.cxx
index a3ee8c1..f0ceb8b 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -1442,7 +1442,7 @@ LocaleDataImpl::getOutlineNumberingLevels( const
lang::Locale& rLocale ) throw(R
// helper functions
oslGenericFunction SAL_CALL LocaleDataImpl::getFunctionSymbol( const Locale&
rLocale, const sal_Char* pFunction )
-throw(RuntimeException)
+throw(RuntimeException, std::exception)
{
lcl_LookupTableHelper & rLookupTable = lcl_LookupTableStatic::get();
commit 455539173918650c163f814ffb93f5ede1f021a8
Author: Caolán McNamara
Date: Fri Nov 6 09:19:44 2015 +
coverity#1338233 Uncaught exception
Change-Id: I59ef31ff46b9eff2f4a2b73b7f1d13ff0b4407ae
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index c7fbada..ce185d2 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -61,7 +61,7 @@ using com::sun::star::xml::sax::XParser;
static const sal_Int8 header[] = { 0x57, 0x6f, 0x72, 0x64, 0x50, 0x72, 0x6f };
bool SAL_CALL LotusWordProImportFilter::importImpl( const Sequence<
css::beans::PropertyValue >& aDescriptor )
-throw (RuntimeException)
+throw (RuntimeException, std::exception)
{
sal_Int32 nLength = aDescriptor.getLength();
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
index f529875..e2a953c 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
@@ -51,7 +51,7 @@ protected:
css::uno::Reference< css::xml::sax::XDocumentHandler > mxHandler;
bool SAL_CALL importImp
[Libreoffice-commits] core.git: filter/source
filter/source/svg/test/svg2odf.cxx | 35 ++-
1 file changed, 18 insertions(+), 17 deletions(-)
New commits:
commit 82deca07b5ac9b0ed926635f20dfbc8401869bf5
Author: Caolán McNamara
Date: Fri Nov 6 09:14:28 2015 +
coverity#1309069 Uncaught exception
Change-Id: Ia4f39cecba80ef7761530670c14e1888decf4670
diff --git a/filter/source/svg/test/svg2odf.cxx
b/filter/source/svg/test/svg2odf.cxx
index a8620b1..5eab2b5 100644
--- a/filter/source/svg/test/svg2odf.cxx
+++ b/filter/source/svg/test/svg2odf.cxx
@@ -72,27 +72,28 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
return 1;
}
-OUString aBaseURL, aTmpURL, aSrcURL, aDstURL, aIniUrl;
+int nRet = 1;
-osl_getProcessWorkingDir(&aBaseURL.pData);
-osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[1]).pData,
- &aTmpURL.pData );
-osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aSrcURL.pData);
+try
+{
+OUString aBaseURL, aTmpURL, aSrcURL, aDstURL, aIniUrl;
-osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[2]).pData,
- &aTmpURL.pData );
-osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aDstURL.pData);
+osl_getProcessWorkingDir(&aBaseURL.pData);
+osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[1]).pData,
+ &aTmpURL.pData );
+osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aSrcURL.pData);
-osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[3]).pData,
-&aTmpURL.pData );
-osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aIniUrl.pData);
+osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[2]).pData,
+ &aTmpURL.pData );
+osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aDstURL.pData);
-// bootstrap UNO
-uno::Reference< lang::XMultiServiceFactory > xFactory;
-uno::Reference< uno::XComponentContext > xCtx;
-int nRet = 1;
-try
-{
+osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[3]).pData,
+&aTmpURL.pData );
+osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aIniUrl.pData);
+
+// bootstrap UNO
+uno::Reference< lang::XMultiServiceFactory > xFactory;
+uno::Reference< uno::XComponentContext > xCtx;
xCtx = ::cppu::defaultBootstrap_InitialComponentContext(aIniUrl);
xFactory.set(xCtx->getServiceManager(), uno::UNO_QUERY);
if (!xFactory.is())
___
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-5.0-8'
Tag 'cp-5.0-8' created by Andras Timar at 2015-11-06 09:13 -0800 cp-5.0-8 Changes since libreoffice-5-0-branch-point-2: --- 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-5.0-8'
Tag 'cp-5.0-8' created by Andras Timar at 2015-11-06 09:13 -0800 cp-5.0-8 Changes since cp-5.0-7-15: --- 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-5.0-8'
Tag 'cp-5.0-8' created by Andras Timar at 2015-11-06 09:13 -0800 cp-5.0-8 Changes since libreoffice-5-0-branch-point-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-5.0-8'
Tag 'cp-5.0-8' created by Andras Timar at 2015-11-06 09:13 -0800 cp-5.0-8 Changes since libreoffice-5-0-branch-point-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - editeng/source sw/qa
editeng/source/misc/svxacorr.cxx | 34 +-
sw/qa/extras/inc/swmodeltestbase.hxx | 12 +---
sw/qa/extras/uiwriter/uiwriter.cxx |5 +++--
3 files changed, 33 insertions(+), 18 deletions(-)
New commits:
commit de1cb4039756f71d848297981b757c1cfa4609b1
Author: Caolán McNamara
Date: Fri Oct 23 09:11:56 2015 +0100
Resolves: tdf#76964 fall back to primary language via getLanguage
instead of bittwiddling which ends up trying to resolve the
system language
(cherry picked from commit a1ff0745cc4f78777e8dba1e7bb52d18386d7394)
more tdf#76964 fall back to primary language via getLanguage
(cherry picked from commit 97893e56e61a466e56d12ee46d11f6e4c32a737b)
sw: fix SwUiWriterTest pointlessly loading an "empty.odt" ...
... instead of just creating a new document.
(cherry picked from commit 98ddd7a32fd0d5fa080fac368b9dc53a06659285)
Change-Id: I545bd5e39f99003ddedf3c90031e8b818edc1de2
Reviewed-on: https://gerrit.libreoffice.org/19545
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 10426e1..03b0733 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1729,10 +1729,8 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
}
// If it still could not be found here, then keep on searching
-
LanguageType eLang = aLanguageTag.getLanguageType();
-LanguageType nTmpKey1 = eLang & 0x7ff, // the main language in many cases
DE
- nTmpKey2 = eLang & 0x3ff; // otherwise for example EN
+LanguageType nTmpKey1 = eLang & 0x7ff; // the main language in many cases
DE
if(nTmpKey1 != eLang && (pLangTable->find(aLanguageTag.reset(nTmpKey1)) !=
pLangTable->end() ||
CreateLanguageFile(aLanguageTag, false)))
{
@@ -1746,8 +1744,12 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
}
}
-if(nTmpKey2 != eLang && (pLangTable->find(aLanguageTag.reset(nTmpKey2)) !=
pLangTable->end() ||
-CreateLanguageFile(aLanguageTag, false)))
+// otherwise for example EN
+aLanguageTag.reset(aLanguageTag.getLanguage());
+LanguageType nTmpKey2 = aLanguageTag.getLanguageType(false);
+if (nTmpKey2 != eLang && nTmpKey2 != LANGUAGE_UNDETERMINED &&
+(pLangTable->find(aLanguageTag) != pLangTable->end() ||
+ CreateLanguageFile(aLanguageTag, false)))
{
//the language is available - so bring it on
SvxAutoCorrectLanguageLists* pList =
pLangTable->find(aLanguageTag)->second;
@@ -1783,8 +1785,7 @@ bool SvxAutoCorrect::FindInWrdSttExceptList( LanguageType
eLang,
// First search for eLang, then US-English -> English
// and last in LANGUAGE_UNDETERMINED
-LanguageType nTmpKey1 = eLang & 0x7ff, // the main language in many cases
DE
- nTmpKey2 = eLang & 0x3ff; // otherwise for example EN
+LanguageType nTmpKey1 = eLang & 0x7ff; // the main language in many cases
DE
OUString sTemp(sWord);
if(pLangTable->find(aLanguageTag) != pLangTable->end() ||
CreateLanguageFile(aLanguageTag, false))
@@ -1806,8 +1807,12 @@ bool SvxAutoCorrect::FindInWrdSttExceptList(
LanguageType eLang,
return true;
}
-if(nTmpKey2 != eLang && (pLangTable->find(aLanguageTag.reset(nTmpKey2)) !=
pLangTable->end() ||
-CreateLanguageFile(aLanguageTag, false)))
+// otherwise for example EN
+aLanguageTag.reset(aLanguageTag.getLanguage());
+LanguageType nTmpKey2 = aLanguageTag.getLanguageType(false);
+if (nTmpKey2 != eLang && nTmpKey2 != LANGUAGE_UNDETERMINED &&
+(pLangTable->find(aLanguageTag) != pLangTable->end() ||
+ CreateLanguageFile(aLanguageTag, false)))
{
//the language is available - so bring it on
SvxAutoCorrectLanguageLists* pList =
pLangTable->find(aLanguageTag)->second;
@@ -1869,8 +1874,7 @@ bool SvxAutoCorrect::FindInCplSttExceptList(LanguageType
eLang,
// First search for eLang, then US-English -> English
// and last in LANGUAGE_UNDETERMINED
-LanguageType nTmpKey1 = eLang & 0x7ff, // the main language in many cases
DE
- nTmpKey2 = eLang & 0x3ff; // otherwise for example EN
+LanguageType nTmpKey1 = eLang & 0x7ff; // the main language in many cases
DE
OUString sTemp( sWord );
if(pLangTable->find(aLanguageTag) != pLangTable->end() ||
CreateLanguageFile(aLanguageTag, false))
@@ -1890,8 +1894,12 @@ bool SvxAutoCorrect::FindInCplSttExceptList(LanguageType
eLang,
return true;
}
-if(nTmpKey2 != eLang && (pLangTable->find(aLanguageTag.reset(nTmpKey2)) !=
pLangTable->end() ||
-CreateLanguageFile(aLanguageTag, false)))
+// otherwise for example EN
+aLanguageTag.reset(aLanguageTag.getLanguage());
+Langua
